From c04fd1b9dbdc56ea0b64939e6d62f685b28ecea3 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Tue, 10 Aug 2010 23:02:00 +0000 Subject: Remove the arbitrary (and undocumented) limit on the number of parameter=value pairs that can be handled by xslt_process(). There is much else to do here, but this patch seems useful in its own right for as long as this code survives. Pavel Stehule, reviewed by Mike Fowler --- contrib/xml2/expected/xml2.out | 68 ++++++++++++++++++++++++++++++++++++++++ contrib/xml2/expected/xml2_1.out | 50 +++++++++++++++++++++++++++++ contrib/xml2/sql/xml2.sql | 50 +++++++++++++++++++++++++++++ contrib/xml2/xslt_proc.c | 51 +++++++++++++++++++----------- 4 files changed, 200 insertions(+), 19 deletions(-) (limited to 'contrib/xml2') diff --git a/contrib/xml2/expected/xml2.out b/contrib/xml2/expected/xml2.out index 74896b0802..53b8064cc3 100644 --- a/contrib/xml2/expected/xml2.out +++ b/contrib/xml2/expected/xml2.out @@ -145,3 +145,71 @@ values Value'); create index idx_xpath on t1 ( xpath_string ('/attributes/attribute[@name="attr_1"]/text()', xml_data::text)); +SELECT xslt_process('cim30400'::text, $$ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +$$::text, 'n1="v1",n2="v2",n3="v3",n4="v4",n5="v5",n6="v6",n7="v7",n8="v8",n9="v9",n10="v10",n11="v11",n12="v12"'::text); + xslt_process +------------------------ + + + v1 + + v2 + + v3 + + v4 + + v5 + + v6 + + v7 + + v8 + + v9 + + v10+ + v11+ + v12+ + + + +(1 row) + diff --git a/contrib/xml2/expected/xml2_1.out b/contrib/xml2/expected/xml2_1.out index 083fc3b2ca..b465ea27b6 100644 --- a/contrib/xml2/expected/xml2_1.out +++ b/contrib/xml2/expected/xml2_1.out @@ -107,3 +107,53 @@ values Value'); create index idx_xpath on t1 ( xpath_string ('/attributes/attribute[@name="attr_1"]/text()', xml_data::text)); +SELECT xslt_process('cim30400'::text, $$ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +$$::text, 'n1="v1",n2="v2",n3="v3",n4="v4",n5="v5",n6="v6",n7="v7",n8="v8",n9="v9",n10="v10",n11="v11",n12="v12"'::text); +ERROR: xslt_process() is not available without libxslt diff --git a/contrib/xml2/sql/xml2.sql b/contrib/xml2/sql/xml2.sql index 73723b6be1..202a72baed 100644 --- a/contrib/xml2/sql/xml2.sql +++ b/contrib/xml2/sql/xml2.sql @@ -80,3 +80,53 @@ Value'); create index idx_xpath on t1 ( xpath_string ('/attributes/attribute[@name="attr_1"]/text()', xml_data::text)); + +SELECT xslt_process('cim30400'::text, $$ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +$$::text, 'n1="v1",n2="v2",n3="v3",n4="v4",n5="v5",n6="v6",n7="v7",n8="v8",n9="v9",n10="v10",n11="v11",n12="v12"'::text); diff --git a/contrib/xml2/xslt_proc.c b/contrib/xml2/xslt_proc.c index 4c80732bb8..158345b20b 100644 --- a/contrib/xml2/xslt_proc.c +++ b/contrib/xml2/xslt_proc.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/xml2/xslt_proc.c,v 1.21 2010/07/06 19:18:55 momjian Exp $ + * $PostgreSQL: pgsql/contrib/xml2/xslt_proc.c,v 1.22 2010/08/10 23:02:00 tgl Exp $ * * XSLT processing functions (requiring libxslt) * @@ -41,9 +41,8 @@ Datum xslt_process(PG_FUNCTION_ARGS); extern void pgxml_parser_init(void); /* local defs */ -static void parse_params(const char **params, text *paramstr); +static const char **parse_params(text *paramstr); -#define MAXPARAMS 20 /* must be even, see parse_params() */ #endif /* USE_LIBXSLT */ @@ -57,7 +56,7 @@ xslt_process(PG_FUNCTION_ARGS) text *doct = PG_GETARG_TEXT_P(0); text *ssheet = PG_GETARG_TEXT_P(1); text *paramstr; - const char *params[MAXPARAMS + 1]; /* +1 for the terminator */ + const char **params; xsltStylesheetPtr stylesheet = NULL; xmlDocPtr doctree; xmlDocPtr restree; @@ -69,11 +68,14 @@ xslt_process(PG_FUNCTION_ARGS) if (fcinfo->nargs == 3) { paramstr = PG_GETARG_TEXT_P(2); - parse_params(params, paramstr); + params = parse_params(paramstr); } else + { /* No parameters */ + params = (const char **) palloc(sizeof(char *)); params[0] = NULL; + } /* Setup parser */ pgxml_parser_init(); @@ -139,22 +141,34 @@ xslt_process(PG_FUNCTION_ARGS) #ifdef USE_LIBXSLT -static void -parse_params(const char **params, text *paramstr) +static const char ** +parse_params(text *paramstr) { char *pos; char *pstr; - int i; char *nvsep = "="; char *itsep = ","; + const char **params; + int max_params; + int nparams; pstr = text_to_cstring(paramstr); + max_params = 20; /* must be even! */ + params = (const char **) palloc((max_params + 1) * sizeof(char *)); + nparams = 0; + pos = pstr; - for (i = 0; i < MAXPARAMS; i++) + while (*pos != '\0') { - params[i] = pos; + if (nparams >= max_params) + { + max_params *= 2; + params = (const char **) repalloc(params, + (max_params + 1) * sizeof(char *)); + } + params[nparams++] = pos; pos = strstr(pos, nvsep); if (pos != NULL) { @@ -164,13 +178,12 @@ parse_params(const char **params, text *paramstr) else { /* No equal sign, so ignore this "parameter" */ - /* We'll reset params[i] to NULL below the loop */ + nparams--; break; } - /* Value */ - i++; - /* since MAXPARAMS is even, we still have i < MAXPARAMS */ - params[i] = pos; + + /* since max_params is even, we still have nparams < max_params */ + params[nparams++] = pos; pos = strstr(pos, itsep); if (pos != NULL) { @@ -178,13 +191,13 @@ parse_params(const char **params, text *paramstr) pos++; } else - { - i++; break; - } } - params[i] = NULL; + /* Add the terminator marker; we left room for it in the palloc's */ + params[nparams] = NULL; + + return params; } #endif /* USE_LIBXSLT */ -- cgit v1.2.3 From a0b7b717a4324f573d3a7651a06037557066eb77 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Fri, 13 Aug 2010 18:36:26 +0000 Subject: Add xml_is_well_formed, xml_is_well_formed_document, xml_is_well_formed_content functions to the core XML code. Per discussion, the former depends on XMLOPTION while the others do not. These supersede a version previously offered by contrib/xml2. Mike Fowler, reviewed by Pavel Stehule --- contrib/xml2/pgxml.sql.in | 10 ++--- contrib/xml2/uninstall_pgxml.sql | 4 +- contrib/xml2/xpath.c | 11 ++++- doc/src/sgml/func.sgml | 80 +++++++++++++++++++++++++++++++++- src/backend/utils/adt/xml.c | 72 +++++++++++++++++++++++++++++- src/include/catalog/catversion.h | 4 +- src/include/catalog/pg_proc.h | 8 +++- src/include/utils/xml.h | 5 ++- src/test/regress/expected/xml.out | 87 +++++++++++++++++++++++++++++++++++++ src/test/regress/expected/xml_1.out | 59 +++++++++++++++++++++++++ src/test/regress/sql/xml.sql | 21 +++++++++ 11 files changed, 343 insertions(+), 18 deletions(-) (limited to 'contrib/xml2') diff --git a/contrib/xml2/pgxml.sql.in b/contrib/xml2/pgxml.sql.in index 98d8f81b57..0a52561135 100644 --- a/contrib/xml2/pgxml.sql.in +++ b/contrib/xml2/pgxml.sql.in @@ -1,18 +1,14 @@ -/* $PostgreSQL: pgsql/contrib/xml2/pgxml.sql.in,v 1.12 2010/03/01 18:07:59 tgl Exp $ */ +/* $PostgreSQL: pgsql/contrib/xml2/pgxml.sql.in,v 1.13 2010/08/13 18:36:23 tgl Exp $ */ -- Adjust this setting to control where the objects get created. SET search_path = public; --SQL for XML parser -CREATE OR REPLACE FUNCTION xml_is_well_formed(text) RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -- deprecated old name for xml_is_well_formed CREATE OR REPLACE FUNCTION xml_valid(text) RETURNS bool -AS 'MODULE_PATHNAME', 'xml_is_well_formed' -LANGUAGE C STRICT IMMUTABLE; +AS 'xml_is_well_formed' +LANGUAGE INTERNAL STRICT STABLE; CREATE OR REPLACE FUNCTION xml_encode_special_chars(text) RETURNS text AS 'MODULE_PATHNAME' diff --git a/contrib/xml2/uninstall_pgxml.sql b/contrib/xml2/uninstall_pgxml.sql index 09441ef01f..016658dc7f 100644 --- a/contrib/xml2/uninstall_pgxml.sql +++ b/contrib/xml2/uninstall_pgxml.sql @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/xml2/uninstall_pgxml.sql,v 1.4 2007/11/13 04:24:29 momjian Exp $ */ +/* $PostgreSQL: pgsql/contrib/xml2/uninstall_pgxml.sql,v 1.5 2010/08/13 18:36:23 tgl Exp $ */ -- Adjust this setting to control where the objects get dropped. SET search_path = public; @@ -29,5 +29,3 @@ DROP FUNCTION xml_encode_special_chars(text); -- deprecated old name for xml_is_well_formed DROP FUNCTION xml_valid(text); - -DROP FUNCTION xml_is_well_formed(text); diff --git a/contrib/xml2/xpath.c b/contrib/xml2/xpath.c index dbf0b76f92..8ee949ce4e 100644 --- a/contrib/xml2/xpath.c +++ b/contrib/xml2/xpath.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/xml2/xpath.c,v 1.30 2010/07/06 19:18:55 momjian Exp $ + * $PostgreSQL: pgsql/contrib/xml2/xpath.c,v 1.31 2010/08/13 18:36:23 tgl Exp $ * * Parser interface for DOM-based parser (libxml) rather than * stream-based SAX-type parser @@ -71,7 +71,14 @@ pgxml_parser_init(void) } -/* Returns true if document is well-formed */ +/* + * Returns true if document is well-formed + * + * Note: this has been superseded by a core function. We still have to + * have it in the contrib module so that existing SQL-level references + * to the function won't fail; but in normal usage with up-to-date SQL + * definitions for the contrib module, this won't be called. + */ PG_FUNCTION_INFO_V1(xml_is_well_formed); diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml index de6ba61650..562ba485d2 100644 --- a/doc/src/sgml/func.sgml +++ b/doc/src/sgml/func.sgml @@ -1,4 +1,4 @@ - + Functions and Operators @@ -8625,6 +8625,84 @@ SELECT xmlexists('//town[text() = ''Toronto'']' PASSING BY REF 'Tor supports XPath, which is a subset of XQuery. + + + xml_is_well_formed + + + xml_is_well_formed + + + + xml_is_well_formed_document + + + + xml_is_well_formed_content + + + +xml_is_well_formed(text) +xml_is_well_formed_document(text) +xml_is_well_formed_content(text) + + + + These functions check whether a text string is well-formed XML, + returning a boolean result. + xml_is_well_formed_document checks for a well-formed + document, while xml_is_well_formed_content checks + for well-formed content. xml_is_well_formed does + the former if the configuration + parameter is set to DOCUMENT, or the latter if it is set to + CONTENT. This means that + xml_is_well_formed is useful for seeing whether + a simple cast to type xml will succeed, whereas the other two + functions are useful for seeing whether the corresponding variants of + XMLPARSE will succeed. + + + + Examples: + +'); + xml_is_well_formed +-------------------- + f +(1 row) + +SELECT xml_is_well_formed(''); + xml_is_well_formed +-------------------- + t +(1 row) + +SET xmloption TO CONTENT; +SELECT xml_is_well_formed('abc'); + xml_is_well_formed +-------------------- + t +(1 row) + +SELECT xml_is_well_formed_document('bar'); + xml_is_well_formed_document +----------------------------- + t +(1 row) + +SELECT xml_is_well_formed_document('bar'); + xml_is_well_formed_document +----------------------------- + f +(1 row) +]]> + + The last example shows that the checks include whether + namespaces are correctly matched. + + diff --git a/src/backend/utils/adt/xml.c b/src/backend/utils/adt/xml.c index 520668cf40..756390530a 100644 --- a/src/backend/utils/adt/xml.c +++ b/src/backend/utils/adt/xml.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/utils/adt/xml.c,v 1.100 2010/08/08 19:15:27 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/xml.c,v 1.101 2010/08/13 18:36:24 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -3565,3 +3565,73 @@ xpath_exists(PG_FUNCTION_ARGS) return 0; #endif } + +/* + * Functions for checking well-formed-ness + */ + +#ifdef USE_LIBXML +static bool +wellformed_xml(text *data, XmlOptionType xmloption_arg) +{ + bool result; + xmlDocPtr doc = NULL; + + /* We want to catch any exceptions and return false */ + PG_TRY(); + { + doc = xml_parse(data, xmloption_arg, true, GetDatabaseEncoding()); + result = true; + } + PG_CATCH(); + { + FlushErrorState(); + result = false; + } + PG_END_TRY(); + + if (doc) + xmlFreeDoc(doc); + + return result; +} +#endif + +Datum +xml_is_well_formed(PG_FUNCTION_ARGS) +{ +#ifdef USE_LIBXML + text *data = PG_GETARG_TEXT_P(0); + + PG_RETURN_BOOL(wellformed_xml(data, xmloption)); +#else + NO_XML_SUPPORT(); + return 0; +#endif /* not USE_LIBXML */ +} + +Datum +xml_is_well_formed_document(PG_FUNCTION_ARGS) +{ +#ifdef USE_LIBXML + text *data = PG_GETARG_TEXT_P(0); + + PG_RETURN_BOOL(wellformed_xml(data, XMLOPTION_DOCUMENT)); +#else + NO_XML_SUPPORT(); + return 0; +#endif /* not USE_LIBXML */ +} + +Datum +xml_is_well_formed_content(PG_FUNCTION_ARGS) +{ +#ifdef USE_LIBXML + text *data = PG_GETARG_TEXT_P(0); + + PG_RETURN_BOOL(wellformed_xml(data, XMLOPTION_CONTENT)); +#else + NO_XML_SUPPORT(); + return 0; +#endif /* not USE_LIBXML */ +} diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h index a7739db82d..db5f3c67b3 100644 --- a/src/include/catalog/catversion.h +++ b/src/include/catalog/catversion.h @@ -37,7 +37,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.594 2010/08/10 21:51:00 tgl Exp $ + * $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.595 2010/08/13 18:36:24 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -53,6 +53,6 @@ */ /* yyyymmddN */ -#define CATALOG_VERSION_NO 201008101 +#define CATALOG_VERSION_NO 201008131 #endif diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h index 0ba9435b0a..7531b7ab5e 100644 --- a/src/include/catalog/pg_proc.h +++ b/src/include/catalog/pg_proc.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_proc.h,v 1.578 2010/08/10 21:51:00 tgl Exp $ + * $PostgreSQL: pgsql/src/include/catalog/pg_proc.h,v 1.579 2010/08/13 18:36:25 tgl Exp $ * * NOTES * The script catalog/genbki.pl reads this file and generates .bki @@ -4423,6 +4423,12 @@ DATA(insert OID = 3049 ( xpath_exists PGNSP PGUID 12 1 0 0 f f f t f i 3 0 16 DESCR("test XML value against XPath expression, with namespace support"); DATA(insert OID = 3050 ( xpath_exists PGNSP PGUID 14 1 0 0 f f f t f i 2 0 16 "25 142" _null_ _null_ _null_ _null_ "select pg_catalog.xpath_exists($1, $2, ''{}''::pg_catalog.text[])" _null_ _null_ _null_ )); DESCR("test XML value against XPath expression"); +DATA(insert OID = 3051 ( xml_is_well_formed PGNSP PGUID 12 1 0 0 f f f t f s 1 0 16 "25" _null_ _null_ _null_ _null_ xml_is_well_formed _null_ _null_ _null_ )); +DESCR("determine if a string is well formed XML"); +DATA(insert OID = 3052 ( xml_is_well_formed_document PGNSP PGUID 12 1 0 0 f f f t f i 1 0 16 "25" _null_ _null_ _null_ _null_ xml_is_well_formed_document _null_ _null_ _null_ )); +DESCR("determine if a string is well formed XML document"); +DATA(insert OID = 3053 ( xml_is_well_formed_content PGNSP PGUID 12 1 0 0 f f f t f i 1 0 16 "25" _null_ _null_ _null_ _null_ xml_is_well_formed_content _null_ _null_ _null_ )); +DESCR("determine if a string is well formed XML content"); /* uuid */ DATA(insert OID = 2952 ( uuid_in PGNSP PGUID 12 1 0 0 f f f t f i 1 0 2950 "2275" _null_ _null_ _null_ _null_ uuid_in _null_ _null_ _null_ )); diff --git a/src/include/utils/xml.h b/src/include/utils/xml.h index 807bb08485..96029c2ebd 100644 --- a/src/include/utils/xml.h +++ b/src/include/utils/xml.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/xml.h,v 1.33 2010/08/08 19:15:27 tgl Exp $ + * $PostgreSQL: pgsql/src/include/utils/xml.h,v 1.34 2010/08/13 18:36:26 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -39,6 +39,9 @@ extern Datum xmlvalidate(PG_FUNCTION_ARGS); extern Datum xpath(PG_FUNCTION_ARGS); extern Datum xpath_exists(PG_FUNCTION_ARGS); extern Datum xmlexists(PG_FUNCTION_ARGS); +extern Datum xml_is_well_formed(PG_FUNCTION_ARGS); +extern Datum xml_is_well_formed_document(PG_FUNCTION_ARGS); +extern Datum xml_is_well_formed_content(PG_FUNCTION_ARGS); extern Datum table_to_xml(PG_FUNCTION_ARGS); extern Datum query_to_xml(PG_FUNCTION_ARGS); diff --git a/src/test/regress/expected/xml.out b/src/test/regress/expected/xml.out index 435331dcc3..eaa5a74ef0 100644 --- a/src/test/regress/expected/xml.out +++ b/src/test/regress/expected/xml.out @@ -599,3 +599,90 @@ SELECT COUNT(id) FROM xmltest, query WHERE xmlexists(expr PASSING BY REF data); 2 (1 row) +-- Test xml_is_well_formed and variants +SELECT xml_is_well_formed_document('bar'); + xml_is_well_formed_document +----------------------------- + t +(1 row) + +SELECT xml_is_well_formed_document('abc'); + xml_is_well_formed_document +----------------------------- + f +(1 row) + +SELECT xml_is_well_formed_content('bar'); + xml_is_well_formed_content +---------------------------- + t +(1 row) + +SELECT xml_is_well_formed_content('abc'); + xml_is_well_formed_content +---------------------------- + t +(1 row) + +SET xmloption TO DOCUMENT; +SELECT xml_is_well_formed('abc'); + xml_is_well_formed +-------------------- + f +(1 row) + +SELECT xml_is_well_formed('<>'); + xml_is_well_formed +-------------------- + f +(1 row) + +SELECT xml_is_well_formed(''); + xml_is_well_formed +-------------------- + t +(1 row) + +SELECT xml_is_well_formed('bar'); + xml_is_well_formed +-------------------- + t +(1 row) + +SELECT xml_is_well_formed('barbaz'); + xml_is_well_formed +-------------------- + f +(1 row) + +SELECT xml_is_well_formed('number one'); + xml_is_well_formed +-------------------- + t +(1 row) + +SELECT xml_is_well_formed('bar'); + xml_is_well_formed +-------------------- + f +(1 row) + +SELECT xml_is_well_formed('bar'); + xml_is_well_formed +-------------------- + t +(1 row) + +SET xmloption TO CONTENT; +SELECT xml_is_well_formed('abc'); + xml_is_well_formed +-------------------- + t +(1 row) + diff --git a/src/test/regress/expected/xml_1.out b/src/test/regress/expected/xml_1.out index 2ce543aeaa..711b4358a2 100644 --- a/src/test/regress/expected/xml_1.out +++ b/src/test/regress/expected/xml_1.out @@ -573,3 +573,62 @@ SELECT COUNT(id) FROM xmltest, query WHERE xmlexists(expr PASSING BY REF data); 0 (1 row) +-- Test xml_is_well_formed and variants +SELECT xml_is_well_formed_document('bar'); +ERROR: unsupported XML feature +DETAIL: This functionality requires the server to be built with libxml support. +HINT: You need to rebuild PostgreSQL using --with-libxml. +SELECT xml_is_well_formed_document('abc'); +ERROR: unsupported XML feature +DETAIL: This functionality requires the server to be built with libxml support. +HINT: You need to rebuild PostgreSQL using --with-libxml. +SELECT xml_is_well_formed_content('bar'); +ERROR: unsupported XML feature +DETAIL: This functionality requires the server to be built with libxml support. +HINT: You need to rebuild PostgreSQL using --with-libxml. +SELECT xml_is_well_formed_content('abc'); +ERROR: unsupported XML feature +DETAIL: This functionality requires the server to be built with libxml support. +HINT: You need to rebuild PostgreSQL using --with-libxml. +SET xmloption TO DOCUMENT; +SELECT xml_is_well_formed('abc'); +ERROR: unsupported XML feature +DETAIL: This functionality requires the server to be built with libxml support. +HINT: You need to rebuild PostgreSQL using --with-libxml. +SELECT xml_is_well_formed('<>'); +ERROR: unsupported XML feature +DETAIL: This functionality requires the server to be built with libxml support. +HINT: You need to rebuild PostgreSQL using --with-libxml. +SELECT xml_is_well_formed(''); +ERROR: unsupported XML feature +DETAIL: This functionality requires the server to be built with libxml support. +HINT: You need to rebuild PostgreSQL using --with-libxml. +SELECT xml_is_well_formed('bar'); +ERROR: unsupported XML feature +DETAIL: This functionality requires the server to be built with libxml support. +HINT: You need to rebuild PostgreSQL using --with-libxml. +SELECT xml_is_well_formed('barbaz'); +ERROR: unsupported XML feature +DETAIL: This functionality requires the server to be built with libxml support. +HINT: You need to rebuild PostgreSQL using --with-libxml. +SELECT xml_is_well_formed('number one'); +ERROR: unsupported XML feature +DETAIL: This functionality requires the server to be built with libxml support. +HINT: You need to rebuild PostgreSQL using --with-libxml. +SELECT xml_is_well_formed('bar'); +ERROR: unsupported XML feature +DETAIL: This functionality requires the server to be built with libxml support. +HINT: You need to rebuild PostgreSQL using --with-libxml. +SELECT xml_is_well_formed('bar'); +ERROR: unsupported XML feature +DETAIL: This functionality requires the server to be built with libxml support. +HINT: You need to rebuild PostgreSQL using --with-libxml. +SET xmloption TO CONTENT; +SELECT xml_is_well_formed('abc'); +ERROR: unsupported XML feature +DETAIL: This functionality requires the server to be built with libxml support. +HINT: You need to rebuild PostgreSQL using --with-libxml. diff --git a/src/test/regress/sql/xml.sql b/src/test/regress/sql/xml.sql index 0e8c0fb227..717a1e7170 100644 --- a/src/test/regress/sql/xml.sql +++ b/src/test/regress/sql/xml.sql @@ -190,3 +190,24 @@ SELECT COUNT(id) FROM xmltest WHERE xpath_exists('/myns:menu/myns:beers/myns:nam CREATE TABLE query ( expr TEXT ); INSERT INTO query VALUES ('/menu/beers/cost[text() = ''lots'']'); SELECT COUNT(id) FROM xmltest, query WHERE xmlexists(expr PASSING BY REF data); + +-- Test xml_is_well_formed and variants + +SELECT xml_is_well_formed_document('bar'); +SELECT xml_is_well_formed_document('abc'); +SELECT xml_is_well_formed_content('bar'); +SELECT xml_is_well_formed_content('abc'); + +SET xmloption TO DOCUMENT; +SELECT xml_is_well_formed('abc'); +SELECT xml_is_well_formed('<>'); +SELECT xml_is_well_formed(''); +SELECT xml_is_well_formed('bar'); +SELECT xml_is_well_formed('barbaz'); +SELECT xml_is_well_formed('number one'); +SELECT xml_is_well_formed('bar'); +SELECT xml_is_well_formed('bar'); + +SET xmloption TO CONTENT; +SELECT xml_is_well_formed('abc'); -- cgit v1.2.3 From 9f2e211386931f7aee48ffbc2fcaef1632d8329f Mon Sep 17 00:00:00 2001 From: Magnus Hagander Date: Mon, 20 Sep 2010 22:08:53 +0200 Subject: Remove cvs keywords from all files. --- GNUmakefile.in | 2 +- aclocal.m4 | 2 +- config/Makefile | 2 +- config/ac_func_accept_argtypes.m4 | 2 +- config/c-compiler.m4 | 2 +- config/c-library.m4 | 2 +- config/docbook.m4 | 2 +- config/general.m4 | 2 +- config/install-sh | 2 +- config/missing | 2 +- config/perl.m4 | 2 +- config/programs.m4 | 2 +- config/python.m4 | 2 +- config/tcl.m4 | 2 +- configure.in | 2 +- contrib/Makefile | 2 +- contrib/adminpack/Makefile | 2 +- contrib/adminpack/adminpack.c | 2 +- contrib/adminpack/adminpack.sql.in | 2 +- contrib/adminpack/uninstall_adminpack.sql | 2 +- contrib/auto_explain/Makefile | 2 +- contrib/auto_explain/auto_explain.c | 2 +- contrib/btree_gin/Makefile | 2 +- contrib/btree_gin/btree_gin.c | 2 +- contrib/btree_gin/btree_gin.sql.in | 2 +- contrib/btree_gin/uninstall_btree_gin.sql | 2 +- contrib/btree_gist/Makefile | 2 +- contrib/btree_gist/btree_bit.c | 2 +- contrib/btree_gist/btree_bytea.c | 2 +- contrib/btree_gist/btree_cash.c | 2 +- contrib/btree_gist/btree_date.c | 2 +- contrib/btree_gist/btree_float4.c | 2 +- contrib/btree_gist/btree_float8.c | 2 +- contrib/btree_gist/btree_gist.c | 2 +- contrib/btree_gist/btree_gist.h | 2 +- contrib/btree_gist/btree_gist.sql.in | 2 +- contrib/btree_gist/btree_inet.c | 2 +- contrib/btree_gist/btree_int2.c | 2 +- contrib/btree_gist/btree_int4.c | 2 +- contrib/btree_gist/btree_int8.c | 2 +- contrib/btree_gist/btree_interval.c | 2 +- contrib/btree_gist/btree_macaddr.c | 2 +- contrib/btree_gist/btree_numeric.c | 2 +- contrib/btree_gist/btree_oid.c | 2 +- contrib/btree_gist/btree_text.c | 2 +- contrib/btree_gist/btree_time.c | 2 +- contrib/btree_gist/btree_ts.c | 2 +- contrib/btree_gist/btree_utils_num.c | 2 +- contrib/btree_gist/btree_utils_num.h | 2 +- contrib/btree_gist/btree_utils_var.c | 2 +- contrib/btree_gist/btree_utils_var.h | 2 +- contrib/btree_gist/uninstall_btree_gist.sql | 2 +- contrib/chkpass/Makefile | 2 +- contrib/chkpass/chkpass.c | 2 +- contrib/chkpass/chkpass.sql.in | 2 +- contrib/chkpass/uninstall_chkpass.sql | 2 +- contrib/citext/Makefile | 2 +- contrib/citext/citext.c | 2 +- contrib/citext/citext.sql.in | 2 +- contrib/citext/uninstall_citext.sql | 2 +- contrib/contrib-global.mk | 2 +- contrib/cube/Makefile | 2 +- contrib/cube/cube.c | 2 +- contrib/cube/cube.sql.in | 2 +- contrib/cube/cubedata.h | 2 +- contrib/cube/cubeparse.y | 2 +- contrib/cube/cubescan.l | 2 +- contrib/cube/uninstall_cube.sql | 2 +- contrib/dblink/Makefile | 2 +- contrib/dblink/dblink.c | 2 +- contrib/dblink/dblink.h | 2 +- contrib/dblink/dblink.sql.in | 2 +- contrib/dblink/uninstall_dblink.sql | 2 +- contrib/dict_int/Makefile | 2 +- contrib/dict_int/dict_int.c | 2 +- contrib/dict_int/dict_int.sql.in | 2 +- contrib/dict_int/uninstall_dict_int.sql | 2 +- contrib/dict_xsyn/Makefile | 2 +- contrib/dict_xsyn/dict_xsyn.c | 2 +- contrib/dict_xsyn/dict_xsyn.sql.in | 2 +- contrib/dict_xsyn/uninstall_dict_xsyn.sql | 2 +- contrib/earthdistance/Makefile | 2 +- contrib/earthdistance/earthdistance.c | 2 +- contrib/earthdistance/earthdistance.sql.in | 2 +- contrib/earthdistance/uninstall_earthdistance.sql | 2 +- contrib/fuzzystrmatch/Makefile | 2 +- contrib/fuzzystrmatch/dmetaphone.c | 2 +- contrib/fuzzystrmatch/fuzzystrmatch.c | 2 +- contrib/fuzzystrmatch/fuzzystrmatch.sql.in | 2 +- contrib/fuzzystrmatch/uninstall_fuzzystrmatch.sql | 2 +- contrib/hstore/Makefile | 2 +- contrib/hstore/crc32.c | 2 +- contrib/hstore/crc32.h | 2 +- contrib/hstore/hstore.h | 2 +- contrib/hstore/hstore.sql.in | 2 +- contrib/hstore/hstore_compat.c | 2 +- contrib/hstore/hstore_gin.c | 2 +- contrib/hstore/hstore_gist.c | 2 +- contrib/hstore/hstore_io.c | 2 +- contrib/hstore/hstore_op.c | 2 +- contrib/hstore/uninstall_hstore.sql | 2 +- contrib/intagg/Makefile | 2 +- contrib/intagg/int_aggregate.sql | 2 +- contrib/intagg/uninstall_int_aggregate.sql | 2 +- contrib/intarray/Makefile | 2 +- contrib/intarray/_int.h | 2 +- contrib/intarray/_int.sql.in | 2 +- contrib/intarray/_int_bool.c | 2 +- contrib/intarray/_int_gin.c | 2 +- contrib/intarray/_int_gist.c | 2 +- contrib/intarray/_int_op.c | 2 +- contrib/intarray/_int_tool.c | 2 +- contrib/intarray/_intbig_gist.c | 2 +- contrib/intarray/bench/create_test.pl | 2 +- contrib/intarray/uninstall__int.sql | 2 +- contrib/isn/EAN13.h | 2 +- contrib/isn/ISBN.h | 2 +- contrib/isn/ISMN.h | 2 +- contrib/isn/ISSN.h | 2 +- contrib/isn/Makefile | 2 +- contrib/isn/UPC.h | 2 +- contrib/isn/isn.c | 2 +- contrib/isn/isn.h | 2 +- contrib/isn/isn.sql.in | 2 +- contrib/isn/uninstall_isn.sql | 2 +- contrib/lo/Makefile | 2 +- contrib/lo/lo.c | 2 +- contrib/lo/lo.sql.in | 2 +- contrib/lo/lo_test.sql | 2 +- contrib/lo/uninstall_lo.sql | 2 +- contrib/ltree/Makefile | 2 +- contrib/ltree/_ltree_gist.c | 2 +- contrib/ltree/_ltree_op.c | 2 +- contrib/ltree/crc32.c | 2 +- contrib/ltree/crc32.h | 2 +- contrib/ltree/lquery_op.c | 2 +- contrib/ltree/ltree.h | 2 +- contrib/ltree/ltree.sql.in | 2 +- contrib/ltree/ltree_gist.c | 2 +- contrib/ltree/ltree_io.c | 2 +- contrib/ltree/ltree_op.c | 2 +- contrib/ltree/ltreetest.sql | 2 +- contrib/ltree/ltxtquery_io.c | 2 +- contrib/ltree/ltxtquery_op.c | 2 +- contrib/ltree/uninstall_ltree.sql | 2 +- contrib/oid2name/Makefile | 2 +- contrib/oid2name/oid2name.c | 2 +- contrib/pageinspect/Makefile | 2 +- contrib/pageinspect/btreefuncs.c | 2 +- contrib/pageinspect/fsmfuncs.c | 2 +- contrib/pageinspect/heapfuncs.c | 2 +- contrib/pageinspect/pageinspect.sql.in | 2 +- contrib/pageinspect/rawpage.c | 2 +- contrib/pageinspect/uninstall_pageinspect.sql | 2 +- contrib/passwordcheck/Makefile | 2 +- contrib/passwordcheck/passwordcheck.c | 2 +- contrib/pg_archivecleanup/Makefile | 2 +- contrib/pg_archivecleanup/pg_archivecleanup.c | 2 +- contrib/pg_buffercache/Makefile | 2 +- contrib/pg_buffercache/pg_buffercache.sql.in | 2 +- contrib/pg_buffercache/pg_buffercache_pages.c | 2 +- contrib/pg_buffercache/uninstall_pg_buffercache.sql | 2 +- contrib/pg_freespacemap/Makefile | 2 +- contrib/pg_freespacemap/pg_freespacemap.c | 2 +- contrib/pg_freespacemap/pg_freespacemap.sql.in | 2 +- contrib/pg_freespacemap/uninstall_pg_freespacemap.sql | 2 +- contrib/pg_standby/Makefile | 2 +- contrib/pg_standby/pg_standby.c | 2 +- contrib/pg_stat_statements/Makefile | 2 +- contrib/pg_stat_statements/pg_stat_statements.c | 2 +- contrib/pg_stat_statements/pg_stat_statements.sql.in | 2 +- contrib/pg_stat_statements/uninstall_pg_stat_statements.sql | 2 +- contrib/pg_trgm/Makefile | 2 +- contrib/pg_trgm/pg_trgm.sql.in | 2 +- contrib/pg_trgm/trgm.h | 2 +- contrib/pg_trgm/trgm_gin.c | 2 +- contrib/pg_trgm/trgm_gist.c | 2 +- contrib/pg_trgm/trgm_op.c | 2 +- contrib/pg_trgm/uninstall_pg_trgm.sql | 2 +- contrib/pg_upgrade/IMPLEMENTATION | 2 +- contrib/pg_upgrade/Makefile | 2 +- contrib/pg_upgrade/TESTING | 2 +- contrib/pg_upgrade/check.c | 2 +- contrib/pg_upgrade/controldata.c | 2 +- contrib/pg_upgrade/dump.c | 2 +- contrib/pg_upgrade/exec.c | 2 +- contrib/pg_upgrade/file.c | 2 +- contrib/pg_upgrade/function.c | 2 +- contrib/pg_upgrade/info.c | 2 +- contrib/pg_upgrade/option.c | 2 +- contrib/pg_upgrade/page.c | 2 +- contrib/pg_upgrade/pg_upgrade.c | 2 +- contrib/pg_upgrade/pg_upgrade.h | 2 +- contrib/pg_upgrade/relfilenode.c | 2 +- contrib/pg_upgrade/server.c | 2 +- contrib/pg_upgrade/tablespace.c | 2 +- contrib/pg_upgrade/util.c | 2 +- contrib/pg_upgrade/version.c | 2 +- contrib/pg_upgrade/version_old_8_3.c | 2 +- contrib/pg_upgrade_support/Makefile | 2 +- contrib/pg_upgrade_support/pg_upgrade_support.c | 2 +- contrib/pgbench/Makefile | 2 +- contrib/pgbench/pgbench.c | 2 +- contrib/pgcrypto/Makefile | 2 +- contrib/pgcrypto/blf.c | 2 +- contrib/pgcrypto/blf.h | 2 +- contrib/pgcrypto/crypt-blowfish.c | 2 +- contrib/pgcrypto/crypt-des.c | 2 +- contrib/pgcrypto/crypt-gensalt.c | 2 +- contrib/pgcrypto/crypt-md5.c | 2 +- contrib/pgcrypto/fortuna.c | 2 +- contrib/pgcrypto/fortuna.h | 2 +- contrib/pgcrypto/imath.c | 2 +- contrib/pgcrypto/imath.h | 2 +- contrib/pgcrypto/internal-sha2.c | 2 +- contrib/pgcrypto/internal.c | 2 +- contrib/pgcrypto/mbuf.c | 2 +- contrib/pgcrypto/mbuf.h | 2 +- contrib/pgcrypto/md5.c | 2 +- contrib/pgcrypto/md5.h | 2 +- contrib/pgcrypto/openssl.c | 2 +- contrib/pgcrypto/pgcrypto.c | 2 +- contrib/pgcrypto/pgcrypto.h | 2 +- contrib/pgcrypto/pgcrypto.sql.in | 2 +- contrib/pgcrypto/pgp-armor.c | 2 +- contrib/pgcrypto/pgp-cfb.c | 2 +- contrib/pgcrypto/pgp-compress.c | 2 +- contrib/pgcrypto/pgp-decrypt.c | 2 +- contrib/pgcrypto/pgp-encrypt.c | 2 +- contrib/pgcrypto/pgp-info.c | 2 +- contrib/pgcrypto/pgp-mpi-internal.c | 2 +- contrib/pgcrypto/pgp-mpi-openssl.c | 2 +- contrib/pgcrypto/pgp-mpi.c | 2 +- contrib/pgcrypto/pgp-pgsql.c | 2 +- contrib/pgcrypto/pgp-pubdec.c | 2 +- contrib/pgcrypto/pgp-pubenc.c | 2 +- contrib/pgcrypto/pgp-pubkey.c | 2 +- contrib/pgcrypto/pgp-s2k.c | 2 +- contrib/pgcrypto/pgp.c | 2 +- contrib/pgcrypto/pgp.h | 2 +- contrib/pgcrypto/px-crypt.c | 2 +- contrib/pgcrypto/px-crypt.h | 2 +- contrib/pgcrypto/px-hmac.c | 2 +- contrib/pgcrypto/px.c | 2 +- contrib/pgcrypto/px.h | 2 +- contrib/pgcrypto/random.c | 2 +- contrib/pgcrypto/rijndael.c | 2 +- contrib/pgcrypto/rijndael.h | 2 +- contrib/pgcrypto/sha1.c | 2 +- contrib/pgcrypto/sha1.h | 2 +- contrib/pgcrypto/sha2.c | 2 +- contrib/pgcrypto/sha2.h | 2 +- contrib/pgcrypto/uninstall_pgcrypto.sql | 2 +- contrib/pgrowlocks/Makefile | 2 +- contrib/pgrowlocks/pgrowlocks.c | 2 +- contrib/pgrowlocks/pgrowlocks.sql.in | 2 +- contrib/pgrowlocks/uninstall_pgrowlocks.sql | 2 +- contrib/pgstattuple/Makefile | 2 +- contrib/pgstattuple/pgstatindex.c | 2 +- contrib/pgstattuple/pgstattuple.c | 2 +- contrib/pgstattuple/pgstattuple.sql.in | 2 +- contrib/pgstattuple/uninstall_pgstattuple.sql | 2 +- contrib/seg/Makefile | 2 +- contrib/seg/seg.c | 2 +- contrib/seg/seg.sql.in | 2 +- contrib/seg/segdata.h | 2 +- contrib/seg/uninstall_seg.sql | 2 +- contrib/spi/Makefile | 2 +- contrib/spi/autoinc.c | 2 +- contrib/spi/autoinc.sql.in | 2 +- contrib/spi/insert_username.c | 2 +- contrib/spi/insert_username.sql.in | 2 +- contrib/spi/moddatetime.c | 2 +- contrib/spi/moddatetime.sql.in | 2 +- contrib/spi/refint.c | 2 +- contrib/spi/refint.sql.in | 2 +- contrib/spi/timetravel.c | 2 +- contrib/spi/timetravel.sql.in | 2 +- contrib/sslinfo/Makefile | 2 +- contrib/sslinfo/sslinfo.c | 2 +- contrib/sslinfo/sslinfo.sql.in | 2 +- contrib/sslinfo/uninstall_sslinfo.sql | 2 +- contrib/start-scripts/freebsd | 2 +- contrib/start-scripts/linux | 2 +- contrib/tablefunc/Makefile | 2 +- contrib/tablefunc/tablefunc.c | 2 +- contrib/tablefunc/tablefunc.h | 2 +- contrib/tablefunc/tablefunc.sql.in | 2 +- contrib/tablefunc/uninstall_tablefunc.sql | 2 +- contrib/test_parser/Makefile | 2 +- contrib/test_parser/test_parser.c | 2 +- contrib/test_parser/test_parser.sql.in | 2 +- contrib/test_parser/uninstall_test_parser.sql | 2 +- contrib/tsearch2/Makefile | 2 +- contrib/tsearch2/tsearch2.c | 2 +- contrib/tsearch2/tsearch2.sql.in | 2 +- contrib/tsearch2/uninstall_tsearch2.sql | 2 +- contrib/unaccent/Makefile | 2 +- contrib/unaccent/unaccent.c | 2 +- contrib/unaccent/unaccent.sql.in | 2 +- contrib/unaccent/uninstall_unaccent.sql | 2 +- contrib/uuid-ossp/Makefile | 2 +- contrib/uuid-ossp/uninstall_uuid-ossp.sql | 2 +- contrib/uuid-ossp/uuid-ossp.c | 2 +- contrib/uuid-ossp/uuid-ossp.sql.in | 2 +- contrib/vacuumlo/Makefile | 2 +- contrib/vacuumlo/vacuumlo.c | 2 +- contrib/xml2/Makefile | 2 +- contrib/xml2/pgxml.sql.in | 2 +- contrib/xml2/uninstall_pgxml.sql | 2 +- contrib/xml2/xpath.c | 2 +- contrib/xml2/xslt_proc.c | 2 +- doc/Makefile | 2 +- doc/src/Makefile | 2 +- doc/src/sgml/Makefile | 2 +- doc/src/sgml/README.links | 2 +- doc/src/sgml/acronyms.sgml | 2 +- doc/src/sgml/adminpack.sgml | 2 +- doc/src/sgml/advanced.sgml | 2 +- doc/src/sgml/arch-dev.sgml | 2 +- doc/src/sgml/array.sgml | 2 +- doc/src/sgml/auto-explain.sgml | 2 +- doc/src/sgml/backup.sgml | 2 +- doc/src/sgml/biblio.sgml | 2 +- doc/src/sgml/bki.sgml | 2 +- doc/src/sgml/btree-gin.sgml | 2 +- doc/src/sgml/btree-gist.sgml | 2 +- doc/src/sgml/catalogs.sgml | 2 +- doc/src/sgml/charset.sgml | 2 +- doc/src/sgml/chkpass.sgml | 2 +- doc/src/sgml/citext.sgml | 2 +- doc/src/sgml/client-auth.sgml | 2 +- doc/src/sgml/config.sgml | 2 +- doc/src/sgml/contacts.sgml | 2 +- doc/src/sgml/contrib-spi.sgml | 2 +- doc/src/sgml/contrib.sgml | 2 +- doc/src/sgml/cube.sgml | 2 +- doc/src/sgml/cvs.sgml | 2 +- doc/src/sgml/datatype.sgml | 2 +- doc/src/sgml/datetime.sgml | 2 +- doc/src/sgml/dblink.sgml | 2 +- doc/src/sgml/ddl.sgml | 2 +- doc/src/sgml/dfunc.sgml | 2 +- doc/src/sgml/dict-int.sgml | 2 +- doc/src/sgml/dict-xsyn.sgml | 2 +- doc/src/sgml/diskusage.sgml | 2 +- doc/src/sgml/dml.sgml | 2 +- doc/src/sgml/docguide.sgml | 2 +- doc/src/sgml/earthdistance.sgml | 2 +- doc/src/sgml/ecpg.sgml | 2 +- doc/src/sgml/errcodes.sgml | 2 +- doc/src/sgml/extend.sgml | 2 +- doc/src/sgml/external-projects.sgml | 2 +- doc/src/sgml/features.sgml | 2 +- doc/src/sgml/filelist.sgml | 2 +- doc/src/sgml/fixrtf | 2 +- doc/src/sgml/func.sgml | 2 +- doc/src/sgml/fuzzystrmatch.sgml | 2 +- doc/src/sgml/generate_history.pl | 2 +- doc/src/sgml/geqo.sgml | 2 +- doc/src/sgml/gin.sgml | 2 +- doc/src/sgml/gist.sgml | 2 +- doc/src/sgml/high-availability.sgml | 2 +- doc/src/sgml/history.sgml | 2 +- doc/src/sgml/hstore.sgml | 2 +- doc/src/sgml/indexam.sgml | 2 +- doc/src/sgml/indices.sgml | 2 +- doc/src/sgml/info.sgml | 2 +- doc/src/sgml/information_schema.sgml | 2 +- doc/src/sgml/install-win32.sgml | 2 +- doc/src/sgml/installation.sgml | 2 +- doc/src/sgml/intagg.sgml | 2 +- doc/src/sgml/intarray.sgml | 2 +- doc/src/sgml/intro.sgml | 2 +- doc/src/sgml/isn.sgml | 2 +- doc/src/sgml/jadetex.cfg | 2 +- doc/src/sgml/keywords.sgml | 2 +- doc/src/sgml/legal.sgml | 2 +- doc/src/sgml/libpq.sgml | 2 +- doc/src/sgml/lo.sgml | 2 +- doc/src/sgml/lobj.sgml | 2 +- doc/src/sgml/ltree.sgml | 2 +- doc/src/sgml/maintenance.sgml | 2 +- doc/src/sgml/manage-ag.sgml | 2 +- doc/src/sgml/mk_feature_tables.pl | 2 +- doc/src/sgml/monitoring.sgml | 2 +- doc/src/sgml/mvcc.sgml | 2 +- doc/src/sgml/nls.sgml | 2 +- doc/src/sgml/notation.sgml | 2 +- doc/src/sgml/oid2name.sgml | 2 +- doc/src/sgml/pageinspect.sgml | 2 +- doc/src/sgml/passwordcheck.sgml | 2 +- doc/src/sgml/perform.sgml | 2 +- doc/src/sgml/pgarchivecleanup.sgml | 2 +- doc/src/sgml/pgbench.sgml | 2 +- doc/src/sgml/pgbuffercache.sgml | 2 +- doc/src/sgml/pgcrypto.sgml | 2 +- doc/src/sgml/pgfreespacemap.sgml | 2 +- doc/src/sgml/pgrowlocks.sgml | 2 +- doc/src/sgml/pgstandby.sgml | 2 +- doc/src/sgml/pgstatstatements.sgml | 2 +- doc/src/sgml/pgstattuple.sgml | 2 +- doc/src/sgml/pgtrgm.sgml | 2 +- doc/src/sgml/pgupgrade.sgml | 2 +- doc/src/sgml/planstats.sgml | 2 +- doc/src/sgml/plhandler.sgml | 2 +- doc/src/sgml/plperl.sgml | 2 +- doc/src/sgml/plpgsql.sgml | 2 +- doc/src/sgml/plpython.sgml | 2 +- doc/src/sgml/pltcl.sgml | 2 +- doc/src/sgml/postgres.sgml | 2 +- doc/src/sgml/problems.sgml | 2 +- doc/src/sgml/protocol.sgml | 2 +- doc/src/sgml/queries.sgml | 2 +- doc/src/sgml/query.sgml | 2 +- doc/src/sgml/recovery-config.sgml | 2 +- doc/src/sgml/ref/abort.sgml | 2 +- doc/src/sgml/ref/allfiles.sgml | 2 +- doc/src/sgml/ref/alter_aggregate.sgml | 2 +- doc/src/sgml/ref/alter_conversion.sgml | 2 +- doc/src/sgml/ref/alter_database.sgml | 2 +- doc/src/sgml/ref/alter_default_privileges.sgml | 2 +- doc/src/sgml/ref/alter_domain.sgml | 2 +- doc/src/sgml/ref/alter_foreign_data_wrapper.sgml | 2 +- doc/src/sgml/ref/alter_function.sgml | 2 +- doc/src/sgml/ref/alter_group.sgml | 2 +- doc/src/sgml/ref/alter_index.sgml | 2 +- doc/src/sgml/ref/alter_language.sgml | 2 +- doc/src/sgml/ref/alter_large_object.sgml | 2 +- doc/src/sgml/ref/alter_opclass.sgml | 2 +- doc/src/sgml/ref/alter_operator.sgml | 2 +- doc/src/sgml/ref/alter_opfamily.sgml | 2 +- doc/src/sgml/ref/alter_role.sgml | 2 +- doc/src/sgml/ref/alter_schema.sgml | 2 +- doc/src/sgml/ref/alter_sequence.sgml | 2 +- doc/src/sgml/ref/alter_server.sgml | 2 +- doc/src/sgml/ref/alter_table.sgml | 2 +- doc/src/sgml/ref/alter_tablespace.sgml | 2 +- doc/src/sgml/ref/alter_trigger.sgml | 2 +- doc/src/sgml/ref/alter_tsconfig.sgml | 2 +- doc/src/sgml/ref/alter_tsdictionary.sgml | 2 +- doc/src/sgml/ref/alter_tsparser.sgml | 2 +- doc/src/sgml/ref/alter_tstemplate.sgml | 2 +- doc/src/sgml/ref/alter_type.sgml | 2 +- doc/src/sgml/ref/alter_user.sgml | 2 +- doc/src/sgml/ref/alter_user_mapping.sgml | 2 +- doc/src/sgml/ref/alter_view.sgml | 2 +- doc/src/sgml/ref/analyze.sgml | 2 +- doc/src/sgml/ref/begin.sgml | 2 +- doc/src/sgml/ref/checkpoint.sgml | 2 +- doc/src/sgml/ref/close.sgml | 2 +- doc/src/sgml/ref/cluster.sgml | 2 +- doc/src/sgml/ref/clusterdb.sgml | 2 +- doc/src/sgml/ref/comment.sgml | 2 +- doc/src/sgml/ref/commit.sgml | 2 +- doc/src/sgml/ref/commit_prepared.sgml | 2 +- doc/src/sgml/ref/copy.sgml | 2 +- doc/src/sgml/ref/create_aggregate.sgml | 2 +- doc/src/sgml/ref/create_cast.sgml | 2 +- doc/src/sgml/ref/create_constraint.sgml | 2 +- doc/src/sgml/ref/create_conversion.sgml | 2 +- doc/src/sgml/ref/create_database.sgml | 2 +- doc/src/sgml/ref/create_domain.sgml | 2 +- doc/src/sgml/ref/create_foreign_data_wrapper.sgml | 2 +- doc/src/sgml/ref/create_function.sgml | 2 +- doc/src/sgml/ref/create_group.sgml | 2 +- doc/src/sgml/ref/create_index.sgml | 2 +- doc/src/sgml/ref/create_language.sgml | 2 +- doc/src/sgml/ref/create_opclass.sgml | 2 +- doc/src/sgml/ref/create_operator.sgml | 2 +- doc/src/sgml/ref/create_opfamily.sgml | 2 +- doc/src/sgml/ref/create_role.sgml | 2 +- doc/src/sgml/ref/create_rule.sgml | 2 +- doc/src/sgml/ref/create_schema.sgml | 2 +- doc/src/sgml/ref/create_sequence.sgml | 2 +- doc/src/sgml/ref/create_server.sgml | 2 +- doc/src/sgml/ref/create_table.sgml | 2 +- doc/src/sgml/ref/create_table_as.sgml | 2 +- doc/src/sgml/ref/create_tablespace.sgml | 2 +- doc/src/sgml/ref/create_trigger.sgml | 2 +- doc/src/sgml/ref/create_tsconfig.sgml | 2 +- doc/src/sgml/ref/create_tsdictionary.sgml | 2 +- doc/src/sgml/ref/create_tsparser.sgml | 2 +- doc/src/sgml/ref/create_tstemplate.sgml | 2 +- doc/src/sgml/ref/create_type.sgml | 2 +- doc/src/sgml/ref/create_user.sgml | 2 +- doc/src/sgml/ref/create_user_mapping.sgml | 2 +- doc/src/sgml/ref/create_view.sgml | 2 +- doc/src/sgml/ref/createdb.sgml | 2 +- doc/src/sgml/ref/createlang.sgml | 2 +- doc/src/sgml/ref/createuser.sgml | 2 +- doc/src/sgml/ref/deallocate.sgml | 2 +- doc/src/sgml/ref/declare.sgml | 2 +- doc/src/sgml/ref/delete.sgml | 2 +- doc/src/sgml/ref/discard.sgml | 2 +- doc/src/sgml/ref/do.sgml | 2 +- doc/src/sgml/ref/drop_aggregate.sgml | 2 +- doc/src/sgml/ref/drop_cast.sgml | 2 +- doc/src/sgml/ref/drop_conversion.sgml | 2 +- doc/src/sgml/ref/drop_database.sgml | 2 +- doc/src/sgml/ref/drop_domain.sgml | 2 +- doc/src/sgml/ref/drop_foreign_data_wrapper.sgml | 2 +- doc/src/sgml/ref/drop_function.sgml | 2 +- doc/src/sgml/ref/drop_group.sgml | 2 +- doc/src/sgml/ref/drop_index.sgml | 2 +- doc/src/sgml/ref/drop_language.sgml | 2 +- doc/src/sgml/ref/drop_opclass.sgml | 2 +- doc/src/sgml/ref/drop_operator.sgml | 2 +- doc/src/sgml/ref/drop_opfamily.sgml | 2 +- doc/src/sgml/ref/drop_owned.sgml | 2 +- doc/src/sgml/ref/drop_role.sgml | 2 +- doc/src/sgml/ref/drop_rule.sgml | 2 +- doc/src/sgml/ref/drop_schema.sgml | 2 +- doc/src/sgml/ref/drop_sequence.sgml | 2 +- doc/src/sgml/ref/drop_server.sgml | 2 +- doc/src/sgml/ref/drop_table.sgml | 2 +- doc/src/sgml/ref/drop_tablespace.sgml | 2 +- doc/src/sgml/ref/drop_trigger.sgml | 2 +- doc/src/sgml/ref/drop_tsconfig.sgml | 2 +- doc/src/sgml/ref/drop_tsdictionary.sgml | 2 +- doc/src/sgml/ref/drop_tsparser.sgml | 2 +- doc/src/sgml/ref/drop_tstemplate.sgml | 2 +- doc/src/sgml/ref/drop_type.sgml | 2 +- doc/src/sgml/ref/drop_user.sgml | 2 +- doc/src/sgml/ref/drop_user_mapping.sgml | 2 +- doc/src/sgml/ref/drop_view.sgml | 2 +- doc/src/sgml/ref/dropdb.sgml | 2 +- doc/src/sgml/ref/droplang.sgml | 2 +- doc/src/sgml/ref/dropuser.sgml | 2 +- doc/src/sgml/ref/ecpg-ref.sgml | 2 +- doc/src/sgml/ref/end.sgml | 2 +- doc/src/sgml/ref/execute.sgml | 2 +- doc/src/sgml/ref/explain.sgml | 2 +- doc/src/sgml/ref/fetch.sgml | 2 +- doc/src/sgml/ref/grant.sgml | 2 +- doc/src/sgml/ref/initdb.sgml | 2 +- doc/src/sgml/ref/insert.sgml | 2 +- doc/src/sgml/ref/listen.sgml | 2 +- doc/src/sgml/ref/load.sgml | 2 +- doc/src/sgml/ref/lock.sgml | 2 +- doc/src/sgml/ref/move.sgml | 2 +- doc/src/sgml/ref/notify.sgml | 2 +- doc/src/sgml/ref/pg_config-ref.sgml | 2 +- doc/src/sgml/ref/pg_controldata.sgml | 2 +- doc/src/sgml/ref/pg_ctl-ref.sgml | 2 +- doc/src/sgml/ref/pg_dump.sgml | 2 +- doc/src/sgml/ref/pg_dumpall.sgml | 2 +- doc/src/sgml/ref/pg_resetxlog.sgml | 2 +- doc/src/sgml/ref/pg_restore.sgml | 2 +- doc/src/sgml/ref/postgres-ref.sgml | 2 +- doc/src/sgml/ref/postmaster.sgml | 2 +- doc/src/sgml/ref/prepare.sgml | 2 +- doc/src/sgml/ref/prepare_transaction.sgml | 2 +- doc/src/sgml/ref/psql-ref.sgml | 2 +- doc/src/sgml/ref/reassign_owned.sgml | 2 +- doc/src/sgml/ref/reindex.sgml | 2 +- doc/src/sgml/ref/reindexdb.sgml | 2 +- doc/src/sgml/ref/release_savepoint.sgml | 2 +- doc/src/sgml/ref/reset.sgml | 2 +- doc/src/sgml/ref/revoke.sgml | 2 +- doc/src/sgml/ref/rollback.sgml | 2 +- doc/src/sgml/ref/rollback_prepared.sgml | 2 +- doc/src/sgml/ref/rollback_to.sgml | 2 +- doc/src/sgml/ref/savepoint.sgml | 2 +- doc/src/sgml/ref/select.sgml | 2 +- doc/src/sgml/ref/select_into.sgml | 2 +- doc/src/sgml/ref/set.sgml | 2 +- doc/src/sgml/ref/set_constraints.sgml | 2 +- doc/src/sgml/ref/set_role.sgml | 2 +- doc/src/sgml/ref/set_session_auth.sgml | 2 +- doc/src/sgml/ref/set_transaction.sgml | 2 +- doc/src/sgml/ref/show.sgml | 2 +- doc/src/sgml/ref/start_transaction.sgml | 2 +- doc/src/sgml/ref/truncate.sgml | 2 +- doc/src/sgml/ref/unlisten.sgml | 2 +- doc/src/sgml/ref/update.sgml | 2 +- doc/src/sgml/ref/vacuum.sgml | 2 +- doc/src/sgml/ref/vacuumdb.sgml | 2 +- doc/src/sgml/ref/values.sgml | 2 +- doc/src/sgml/reference.sgml | 2 +- doc/src/sgml/regress.sgml | 2 +- doc/src/sgml/release-7.4.sgml | 2 +- doc/src/sgml/release-8.0.sgml | 2 +- doc/src/sgml/release-8.1.sgml | 2 +- doc/src/sgml/release-8.2.sgml | 2 +- doc/src/sgml/release-8.3.sgml | 2 +- doc/src/sgml/release-8.4.sgml | 2 +- doc/src/sgml/release-9.0.sgml | 2 +- doc/src/sgml/release-9.1.sgml | 2 +- doc/src/sgml/release-alpha.sgml | 2 +- doc/src/sgml/release-old.sgml | 2 +- doc/src/sgml/release.sgml | 2 +- doc/src/sgml/rowtypes.sgml | 2 +- doc/src/sgml/rules.sgml | 2 +- doc/src/sgml/runtime.sgml | 2 +- doc/src/sgml/seg.sgml | 2 +- doc/src/sgml/sources.sgml | 2 +- doc/src/sgml/spi.sgml | 2 +- doc/src/sgml/sql.sgml | 2 +- doc/src/sgml/sslinfo.sgml | 2 +- doc/src/sgml/standalone-install.sgml | 2 +- doc/src/sgml/start.sgml | 2 +- doc/src/sgml/storage.sgml | 2 +- doc/src/sgml/stylesheet.css | 2 +- doc/src/sgml/stylesheet.dsl | 2 +- doc/src/sgml/syntax.sgml | 2 +- doc/src/sgml/tablefunc.sgml | 2 +- doc/src/sgml/test-parser.sgml | 2 +- doc/src/sgml/textsearch.sgml | 2 +- doc/src/sgml/trigger.sgml | 2 +- doc/src/sgml/tsearch2.sgml | 2 +- doc/src/sgml/typeconv.sgml | 2 +- doc/src/sgml/unaccent.sgml | 2 +- doc/src/sgml/user-manag.sgml | 2 +- doc/src/sgml/uuid-ossp.sgml | 2 +- doc/src/sgml/vacuumlo.sgml | 2 +- doc/src/sgml/wal.sgml | 2 +- doc/src/sgml/xaggr.sgml | 2 +- doc/src/sgml/xfunc.sgml | 2 +- doc/src/sgml/xindex.sgml | 2 +- doc/src/sgml/xml2.sgml | 2 +- doc/src/sgml/xoper.sgml | 2 +- doc/src/sgml/xplang.sgml | 2 +- doc/src/sgml/xtypes.sgml | 2 +- src/Makefile | 2 +- src/Makefile.global.in | 2 +- src/Makefile.shlib | 2 +- src/backend/Makefile | 2 +- src/backend/access/Makefile | 2 +- src/backend/access/common/Makefile | 2 +- src/backend/access/common/heaptuple.c | 2 +- src/backend/access/common/indextuple.c | 2 +- src/backend/access/common/printtup.c | 2 +- src/backend/access/common/reloptions.c | 2 +- src/backend/access/common/scankey.c | 2 +- src/backend/access/common/tupconvert.c | 2 +- src/backend/access/common/tupdesc.c | 2 +- src/backend/access/gin/Makefile | 2 +- src/backend/access/gin/README | 2 +- src/backend/access/gin/ginarrayproc.c | 2 +- src/backend/access/gin/ginbtree.c | 2 +- src/backend/access/gin/ginbulk.c | 2 +- src/backend/access/gin/gindatapage.c | 2 +- src/backend/access/gin/ginentrypage.c | 2 +- src/backend/access/gin/ginfast.c | 2 +- src/backend/access/gin/ginget.c | 2 +- src/backend/access/gin/gininsert.c | 2 +- src/backend/access/gin/ginscan.c | 2 +- src/backend/access/gin/ginutil.c | 2 +- src/backend/access/gin/ginvacuum.c | 2 +- src/backend/access/gin/ginxlog.c | 2 +- src/backend/access/gist/Makefile | 2 +- src/backend/access/gist/README | 2 +- src/backend/access/gist/gist.c | 2 +- src/backend/access/gist/gistget.c | 2 +- src/backend/access/gist/gistproc.c | 2 +- src/backend/access/gist/gistscan.c | 2 +- src/backend/access/gist/gistsplit.c | 2 +- src/backend/access/gist/gistutil.c | 2 +- src/backend/access/gist/gistvacuum.c | 2 +- src/backend/access/gist/gistxlog.c | 2 +- src/backend/access/hash/Makefile | 2 +- src/backend/access/hash/README | 2 +- src/backend/access/hash/hash.c | 2 +- src/backend/access/hash/hashfunc.c | 2 +- src/backend/access/hash/hashinsert.c | 2 +- src/backend/access/hash/hashovfl.c | 2 +- src/backend/access/hash/hashpage.c | 2 +- src/backend/access/hash/hashscan.c | 2 +- src/backend/access/hash/hashsearch.c | 2 +- src/backend/access/hash/hashsort.c | 2 +- src/backend/access/hash/hashutil.c | 2 +- src/backend/access/heap/Makefile | 2 +- src/backend/access/heap/README.HOT | 2 +- src/backend/access/heap/heapam.c | 2 +- src/backend/access/heap/hio.c | 2 +- src/backend/access/heap/pruneheap.c | 2 +- src/backend/access/heap/rewriteheap.c | 2 +- src/backend/access/heap/syncscan.c | 2 +- src/backend/access/heap/tuptoaster.c | 2 +- src/backend/access/heap/visibilitymap.c | 2 +- src/backend/access/index/Makefile | 2 +- src/backend/access/index/genam.c | 2 +- src/backend/access/index/indexam.c | 2 +- src/backend/access/nbtree/Makefile | 2 +- src/backend/access/nbtree/README | 2 +- src/backend/access/nbtree/nbtcompare.c | 2 +- src/backend/access/nbtree/nbtinsert.c | 2 +- src/backend/access/nbtree/nbtpage.c | 2 +- src/backend/access/nbtree/nbtree.c | 2 +- src/backend/access/nbtree/nbtsearch.c | 2 +- src/backend/access/nbtree/nbtsort.c | 2 +- src/backend/access/nbtree/nbtutils.c | 2 +- src/backend/access/nbtree/nbtxlog.c | 2 +- src/backend/access/transam/Makefile | 2 +- src/backend/access/transam/README | 2 +- src/backend/access/transam/clog.c | 2 +- src/backend/access/transam/multixact.c | 2 +- src/backend/access/transam/rmgr.c | 2 +- src/backend/access/transam/slru.c | 2 +- src/backend/access/transam/subtrans.c | 2 +- src/backend/access/transam/transam.c | 2 +- src/backend/access/transam/twophase.c | 2 +- src/backend/access/transam/twophase_rmgr.c | 2 +- src/backend/access/transam/varsup.c | 2 +- src/backend/access/transam/xact.c | 2 +- src/backend/access/transam/xlog.c | 2 +- src/backend/access/transam/xlogutils.c | 2 +- src/backend/bootstrap/Makefile | 2 +- src/backend/bootstrap/bootparse.y | 2 +- src/backend/bootstrap/bootscanner.l | 2 +- src/backend/bootstrap/bootstrap.c | 2 +- src/backend/catalog/Catalog.pm | 2 +- src/backend/catalog/Makefile | 2 +- src/backend/catalog/README | 2 +- src/backend/catalog/aclchk.c | 2 +- src/backend/catalog/catalog.c | 2 +- src/backend/catalog/dependency.c | 2 +- src/backend/catalog/genbki.pl | 2 +- src/backend/catalog/heap.c | 2 +- src/backend/catalog/index.c | 2 +- src/backend/catalog/indexing.c | 2 +- src/backend/catalog/information_schema.sql | 2 +- src/backend/catalog/namespace.c | 2 +- src/backend/catalog/objectaddress.c | 2 +- src/backend/catalog/pg_aggregate.c | 2 +- src/backend/catalog/pg_constraint.c | 2 +- src/backend/catalog/pg_conversion.c | 2 +- src/backend/catalog/pg_db_role_setting.c | 2 +- src/backend/catalog/pg_depend.c | 2 +- src/backend/catalog/pg_enum.c | 2 +- src/backend/catalog/pg_inherits.c | 2 +- src/backend/catalog/pg_largeobject.c | 2 +- src/backend/catalog/pg_namespace.c | 2 +- src/backend/catalog/pg_operator.c | 2 +- src/backend/catalog/pg_proc.c | 2 +- src/backend/catalog/pg_shdepend.c | 2 +- src/backend/catalog/pg_type.c | 2 +- src/backend/catalog/storage.c | 2 +- src/backend/catalog/system_views.sql | 2 +- src/backend/catalog/toasting.c | 2 +- src/backend/commands/Makefile | 2 +- src/backend/commands/aggregatecmds.c | 2 +- src/backend/commands/alter.c | 2 +- src/backend/commands/analyze.c | 2 +- src/backend/commands/async.c | 2 +- src/backend/commands/cluster.c | 2 +- src/backend/commands/comment.c | 2 +- src/backend/commands/constraint.c | 2 +- src/backend/commands/conversioncmds.c | 2 +- src/backend/commands/copy.c | 2 +- src/backend/commands/dbcommands.c | 2 +- src/backend/commands/define.c | 2 +- src/backend/commands/discard.c | 2 +- src/backend/commands/explain.c | 2 +- src/backend/commands/foreigncmds.c | 2 +- src/backend/commands/functioncmds.c | 2 +- src/backend/commands/indexcmds.c | 2 +- src/backend/commands/lockcmds.c | 2 +- src/backend/commands/opclasscmds.c | 2 +- src/backend/commands/operatorcmds.c | 2 +- src/backend/commands/portalcmds.c | 2 +- src/backend/commands/prepare.c | 2 +- src/backend/commands/proclang.c | 2 +- src/backend/commands/schemacmds.c | 2 +- src/backend/commands/sequence.c | 2 +- src/backend/commands/tablecmds.c | 2 +- src/backend/commands/tablespace.c | 2 +- src/backend/commands/trigger.c | 2 +- src/backend/commands/tsearchcmds.c | 2 +- src/backend/commands/typecmds.c | 2 +- src/backend/commands/user.c | 2 +- src/backend/commands/vacuum.c | 2 +- src/backend/commands/vacuumlazy.c | 2 +- src/backend/commands/variable.c | 2 +- src/backend/commands/view.c | 2 +- src/backend/common.mk | 2 +- src/backend/executor/Makefile | 2 +- src/backend/executor/README | 2 +- src/backend/executor/execAmi.c | 2 +- src/backend/executor/execCurrent.c | 2 +- src/backend/executor/execGrouping.c | 2 +- src/backend/executor/execJunk.c | 2 +- src/backend/executor/execMain.c | 2 +- src/backend/executor/execProcnode.c | 2 +- src/backend/executor/execQual.c | 2 +- src/backend/executor/execScan.c | 2 +- src/backend/executor/execTuples.c | 2 +- src/backend/executor/execUtils.c | 2 +- src/backend/executor/functions.c | 2 +- src/backend/executor/instrument.c | 2 +- src/backend/executor/nodeAgg.c | 2 +- src/backend/executor/nodeAppend.c | 2 +- src/backend/executor/nodeBitmapAnd.c | 2 +- src/backend/executor/nodeBitmapHeapscan.c | 2 +- src/backend/executor/nodeBitmapIndexscan.c | 2 +- src/backend/executor/nodeBitmapOr.c | 2 +- src/backend/executor/nodeCtescan.c | 2 +- src/backend/executor/nodeFunctionscan.c | 2 +- src/backend/executor/nodeGroup.c | 2 +- src/backend/executor/nodeHash.c | 2 +- src/backend/executor/nodeHashjoin.c | 2 +- src/backend/executor/nodeIndexscan.c | 2 +- src/backend/executor/nodeLimit.c | 2 +- src/backend/executor/nodeLockRows.c | 2 +- src/backend/executor/nodeMaterial.c | 2 +- src/backend/executor/nodeMergejoin.c | 2 +- src/backend/executor/nodeModifyTable.c | 2 +- src/backend/executor/nodeNestloop.c | 2 +- src/backend/executor/nodeRecursiveunion.c | 2 +- src/backend/executor/nodeResult.c | 2 +- src/backend/executor/nodeSeqscan.c | 2 +- src/backend/executor/nodeSetOp.c | 2 +- src/backend/executor/nodeSort.c | 2 +- src/backend/executor/nodeSubplan.c | 2 +- src/backend/executor/nodeSubqueryscan.c | 2 +- src/backend/executor/nodeTidscan.c | 2 +- src/backend/executor/nodeUnique.c | 2 +- src/backend/executor/nodeValuesscan.c | 2 +- src/backend/executor/nodeWindowAgg.c | 2 +- src/backend/executor/nodeWorktablescan.c | 2 +- src/backend/executor/spi.c | 2 +- src/backend/executor/tstoreReceiver.c | 2 +- src/backend/foreign/Makefile | 2 +- src/backend/foreign/foreign.c | 2 +- src/backend/lib/Makefile | 2 +- src/backend/lib/dllist.c | 2 +- src/backend/lib/stringinfo.c | 2 +- src/backend/libpq/Makefile | 2 +- src/backend/libpq/README.SSL | 2 +- src/backend/libpq/auth.c | 2 +- src/backend/libpq/be-fsstubs.c | 2 +- src/backend/libpq/be-secure.c | 2 +- src/backend/libpq/crypt.c | 2 +- src/backend/libpq/hba.c | 2 +- src/backend/libpq/ip.c | 2 +- src/backend/libpq/md5.c | 2 +- src/backend/libpq/pqcomm.c | 2 +- src/backend/libpq/pqformat.c | 2 +- src/backend/libpq/pqsignal.c | 2 +- src/backend/main/Makefile | 2 +- src/backend/main/main.c | 2 +- src/backend/nls.mk | 2 +- src/backend/nodes/Makefile | 2 +- src/backend/nodes/README | 2 +- src/backend/nodes/bitmapset.c | 2 +- src/backend/nodes/copyfuncs.c | 2 +- src/backend/nodes/equalfuncs.c | 2 +- src/backend/nodes/list.c | 2 +- src/backend/nodes/makefuncs.c | 2 +- src/backend/nodes/nodeFuncs.c | 2 +- src/backend/nodes/nodes.c | 2 +- src/backend/nodes/outfuncs.c | 2 +- src/backend/nodes/params.c | 2 +- src/backend/nodes/print.c | 2 +- src/backend/nodes/read.c | 2 +- src/backend/nodes/readfuncs.c | 2 +- src/backend/nodes/tidbitmap.c | 2 +- src/backend/nodes/value.c | 2 +- src/backend/optimizer/Makefile | 2 +- src/backend/optimizer/README | 2 +- src/backend/optimizer/geqo/Makefile | 2 +- src/backend/optimizer/geqo/geqo_copy.c | 2 +- src/backend/optimizer/geqo/geqo_cx.c | 2 +- src/backend/optimizer/geqo/geqo_erx.c | 2 +- src/backend/optimizer/geqo/geqo_eval.c | 2 +- src/backend/optimizer/geqo/geqo_main.c | 2 +- src/backend/optimizer/geqo/geqo_misc.c | 2 +- src/backend/optimizer/geqo/geqo_mutation.c | 2 +- src/backend/optimizer/geqo/geqo_ox1.c | 2 +- src/backend/optimizer/geqo/geqo_ox2.c | 2 +- src/backend/optimizer/geqo/geqo_pmx.c | 2 +- src/backend/optimizer/geqo/geqo_pool.c | 2 +- src/backend/optimizer/geqo/geqo_px.c | 2 +- src/backend/optimizer/geqo/geqo_random.c | 2 +- src/backend/optimizer/geqo/geqo_recombination.c | 2 +- src/backend/optimizer/geqo/geqo_selection.c | 2 +- src/backend/optimizer/path/Makefile | 2 +- src/backend/optimizer/path/allpaths.c | 2 +- src/backend/optimizer/path/clausesel.c | 2 +- src/backend/optimizer/path/costsize.c | 2 +- src/backend/optimizer/path/equivclass.c | 2 +- src/backend/optimizer/path/indxpath.c | 2 +- src/backend/optimizer/path/joinpath.c | 2 +- src/backend/optimizer/path/joinrels.c | 2 +- src/backend/optimizer/path/orindxpath.c | 2 +- src/backend/optimizer/path/pathkeys.c | 2 +- src/backend/optimizer/path/tidpath.c | 2 +- src/backend/optimizer/plan/Makefile | 2 +- src/backend/optimizer/plan/README | 2 +- src/backend/optimizer/plan/analyzejoins.c | 2 +- src/backend/optimizer/plan/createplan.c | 2 +- src/backend/optimizer/plan/initsplan.c | 2 +- src/backend/optimizer/plan/planagg.c | 2 +- src/backend/optimizer/plan/planmain.c | 2 +- src/backend/optimizer/plan/planner.c | 2 +- src/backend/optimizer/plan/setrefs.c | 2 +- src/backend/optimizer/plan/subselect.c | 2 +- src/backend/optimizer/prep/Makefile | 2 +- src/backend/optimizer/prep/prepjointree.c | 2 +- src/backend/optimizer/prep/prepqual.c | 2 +- src/backend/optimizer/prep/preptlist.c | 2 +- src/backend/optimizer/prep/prepunion.c | 2 +- src/backend/optimizer/util/Makefile | 2 +- src/backend/optimizer/util/clauses.c | 2 +- src/backend/optimizer/util/joininfo.c | 2 +- src/backend/optimizer/util/pathnode.c | 2 +- src/backend/optimizer/util/placeholder.c | 2 +- src/backend/optimizer/util/plancat.c | 2 +- src/backend/optimizer/util/predtest.c | 2 +- src/backend/optimizer/util/relnode.c | 2 +- src/backend/optimizer/util/restrictinfo.c | 2 +- src/backend/optimizer/util/tlist.c | 2 +- src/backend/optimizer/util/var.c | 2 +- src/backend/parser/Makefile | 2 +- src/backend/parser/README | 2 +- src/backend/parser/analyze.c | 2 +- src/backend/parser/gram.y | 2 +- src/backend/parser/keywords.c | 2 +- src/backend/parser/kwlookup.c | 2 +- src/backend/parser/parse_agg.c | 2 +- src/backend/parser/parse_clause.c | 2 +- src/backend/parser/parse_coerce.c | 2 +- src/backend/parser/parse_cte.c | 2 +- src/backend/parser/parse_expr.c | 2 +- src/backend/parser/parse_func.c | 2 +- src/backend/parser/parse_node.c | 2 +- src/backend/parser/parse_oper.c | 2 +- src/backend/parser/parse_param.c | 2 +- src/backend/parser/parse_relation.c | 2 +- src/backend/parser/parse_target.c | 2 +- src/backend/parser/parse_type.c | 2 +- src/backend/parser/parse_utilcmd.c | 2 +- src/backend/parser/parser.c | 2 +- src/backend/parser/scan.l | 2 +- src/backend/parser/scansup.c | 2 +- src/backend/po/fr.po | 2 +- src/backend/port/Makefile | 2 +- src/backend/port/aix/mkldexport.sh | 2 +- src/backend/port/darwin/Makefile | 2 +- src/backend/port/darwin/README | 2 +- src/backend/port/darwin/system.c | 2 +- src/backend/port/dynloader/aix.c | 2 +- src/backend/port/dynloader/aix.h | 2 +- src/backend/port/dynloader/bsdi.c | 2 +- src/backend/port/dynloader/bsdi.h | 2 +- src/backend/port/dynloader/cygwin.c | 2 +- src/backend/port/dynloader/cygwin.h | 2 +- src/backend/port/dynloader/darwin.c | 2 +- src/backend/port/dynloader/darwin.h | 2 +- src/backend/port/dynloader/dgux.c | 2 +- src/backend/port/dynloader/dgux.h | 2 +- src/backend/port/dynloader/freebsd.c | 2 +- src/backend/port/dynloader/freebsd.h | 2 +- src/backend/port/dynloader/hpux.c | 2 +- src/backend/port/dynloader/hpux.h | 2 +- src/backend/port/dynloader/irix.c | 2 +- src/backend/port/dynloader/irix.h | 2 +- src/backend/port/dynloader/linux.c | 2 +- src/backend/port/dynloader/linux.h | 2 +- src/backend/port/dynloader/netbsd.c | 2 +- src/backend/port/dynloader/netbsd.h | 2 +- src/backend/port/dynloader/nextstep.c | 2 +- src/backend/port/dynloader/nextstep.h | 2 +- src/backend/port/dynloader/openbsd.c | 2 +- src/backend/port/dynloader/openbsd.h | 2 +- src/backend/port/dynloader/osf.c | 2 +- src/backend/port/dynloader/osf.h | 2 +- src/backend/port/dynloader/sco.c | 2 +- src/backend/port/dynloader/sco.h | 2 +- src/backend/port/dynloader/solaris.c | 2 +- src/backend/port/dynloader/solaris.h | 2 +- src/backend/port/dynloader/sunos4.c | 2 +- src/backend/port/dynloader/sunos4.h | 2 +- src/backend/port/dynloader/svr4.c | 2 +- src/backend/port/dynloader/svr4.h | 2 +- src/backend/port/dynloader/ultrix4.c | 2 +- src/backend/port/dynloader/ultrix4.h | 2 +- src/backend/port/dynloader/univel.c | 2 +- src/backend/port/dynloader/univel.h | 2 +- src/backend/port/dynloader/unixware.c | 2 +- src/backend/port/dynloader/unixware.h | 2 +- src/backend/port/dynloader/win32.c | 2 +- src/backend/port/dynloader/win32.h | 2 +- src/backend/port/ipc_test.c | 2 +- src/backend/port/nextstep/Makefile | 2 +- src/backend/port/nextstep/port.c | 2 +- src/backend/port/posix_sema.c | 2 +- src/backend/port/sysv_sema.c | 2 +- src/backend/port/sysv_shmem.c | 2 +- src/backend/port/tas/sunstudio_sparc.s | 2 +- src/backend/port/tas/sunstudio_x86.s | 2 +- src/backend/port/unix_latch.c | 2 +- src/backend/port/win32/Makefile | 2 +- src/backend/port/win32/mingwcompat.c | 2 +- src/backend/port/win32/security.c | 2 +- src/backend/port/win32/signal.c | 2 +- src/backend/port/win32/socket.c | 2 +- src/backend/port/win32/timer.c | 2 +- src/backend/port/win32_latch.c | 2 +- src/backend/port/win32_sema.c | 2 +- src/backend/port/win32_shmem.c | 2 +- src/backend/postmaster/Makefile | 2 +- src/backend/postmaster/autovacuum.c | 2 +- src/backend/postmaster/bgwriter.c | 2 +- src/backend/postmaster/fork_process.c | 2 +- src/backend/postmaster/pgarch.c | 2 +- src/backend/postmaster/pgstat.c | 2 +- src/backend/postmaster/postmaster.c | 2 +- src/backend/postmaster/syslogger.c | 2 +- src/backend/postmaster/walwriter.c | 2 +- src/backend/regex/Makefile | 2 +- src/backend/regex/regc_color.c | 2 +- src/backend/regex/regc_cvec.c | 2 +- src/backend/regex/regc_lex.c | 2 +- src/backend/regex/regc_locale.c | 2 +- src/backend/regex/regc_nfa.c | 2 +- src/backend/regex/regcomp.c | 2 +- src/backend/regex/rege_dfa.c | 2 +- src/backend/regex/regerror.c | 2 +- src/backend/regex/regexec.c | 2 +- src/backend/regex/regfree.c | 2 +- src/backend/replication/Makefile | 2 +- src/backend/replication/README | 2 +- src/backend/replication/libpqwalreceiver/Makefile | 2 +- src/backend/replication/libpqwalreceiver/libpqwalreceiver.c | 2 +- src/backend/replication/walreceiver.c | 2 +- src/backend/replication/walreceiverfuncs.c | 2 +- src/backend/replication/walsender.c | 2 +- src/backend/rewrite/Makefile | 2 +- src/backend/rewrite/rewriteDefine.c | 2 +- src/backend/rewrite/rewriteHandler.c | 2 +- src/backend/rewrite/rewriteManip.c | 2 +- src/backend/rewrite/rewriteRemove.c | 2 +- src/backend/rewrite/rewriteSupport.c | 2 +- src/backend/snowball/Makefile | 2 +- src/backend/snowball/README | 2 +- src/backend/snowball/dict_snowball.c | 2 +- src/backend/snowball/snowball.sql.in | 2 +- src/backend/snowball/snowball_func.sql.in | 2 +- src/backend/storage/Makefile | 2 +- src/backend/storage/buffer/Makefile | 2 +- src/backend/storage/buffer/README | 2 +- src/backend/storage/buffer/buf_init.c | 2 +- src/backend/storage/buffer/buf_table.c | 2 +- src/backend/storage/buffer/bufmgr.c | 2 +- src/backend/storage/buffer/freelist.c | 2 +- src/backend/storage/buffer/localbuf.c | 2 +- src/backend/storage/file/Makefile | 2 +- src/backend/storage/file/buffile.c | 2 +- src/backend/storage/file/copydir.c | 2 +- src/backend/storage/file/fd.c | 2 +- src/backend/storage/freespace/Makefile | 2 +- src/backend/storage/freespace/README | 2 +- src/backend/storage/freespace/freespace.c | 2 +- src/backend/storage/freespace/fsmpage.c | 2 +- src/backend/storage/freespace/indexfsm.c | 2 +- src/backend/storage/ipc/Makefile | 2 +- src/backend/storage/ipc/README | 2 +- src/backend/storage/ipc/ipc.c | 2 +- src/backend/storage/ipc/ipci.c | 2 +- src/backend/storage/ipc/pmsignal.c | 2 +- src/backend/storage/ipc/procarray.c | 2 +- src/backend/storage/ipc/procsignal.c | 2 +- src/backend/storage/ipc/shmem.c | 2 +- src/backend/storage/ipc/shmqueue.c | 2 +- src/backend/storage/ipc/sinval.c | 2 +- src/backend/storage/ipc/sinvaladt.c | 2 +- src/backend/storage/ipc/standby.c | 2 +- src/backend/storage/large_object/Makefile | 2 +- src/backend/storage/large_object/inv_api.c | 2 +- src/backend/storage/lmgr/Makefile | 2 +- src/backend/storage/lmgr/README | 2 +- src/backend/storage/lmgr/deadlock.c | 2 +- src/backend/storage/lmgr/lmgr.c | 2 +- src/backend/storage/lmgr/lock.c | 2 +- src/backend/storage/lmgr/lwlock.c | 2 +- src/backend/storage/lmgr/proc.c | 2 +- src/backend/storage/lmgr/s_lock.c | 2 +- src/backend/storage/lmgr/spin.c | 2 +- src/backend/storage/page/Makefile | 2 +- src/backend/storage/page/bufpage.c | 2 +- src/backend/storage/page/itemptr.c | 2 +- src/backend/storage/smgr/Makefile | 2 +- src/backend/storage/smgr/README | 2 +- src/backend/storage/smgr/md.c | 2 +- src/backend/storage/smgr/smgr.c | 2 +- src/backend/storage/smgr/smgrtype.c | 2 +- src/backend/tcop/Makefile | 2 +- src/backend/tcop/dest.c | 2 +- src/backend/tcop/fastpath.c | 2 +- src/backend/tcop/postgres.c | 2 +- src/backend/tcop/pquery.c | 2 +- src/backend/tcop/utility.c | 2 +- src/backend/tsearch/Makefile | 2 +- src/backend/tsearch/dict.c | 2 +- src/backend/tsearch/dict_ispell.c | 2 +- src/backend/tsearch/dict_simple.c | 2 +- src/backend/tsearch/dict_synonym.c | 2 +- src/backend/tsearch/dict_thesaurus.c | 2 +- src/backend/tsearch/regis.c | 2 +- src/backend/tsearch/spell.c | 2 +- src/backend/tsearch/to_tsany.c | 2 +- src/backend/tsearch/ts_locale.c | 2 +- src/backend/tsearch/ts_parse.c | 2 +- src/backend/tsearch/ts_selfuncs.c | 2 +- src/backend/tsearch/ts_typanalyze.c | 2 +- src/backend/tsearch/ts_utils.c | 2 +- src/backend/tsearch/wparser.c | 2 +- src/backend/tsearch/wparser_def.c | 2 +- src/backend/utils/Gen_dummy_probes.sed | 2 +- src/backend/utils/Gen_fmgrtab.pl | 2 +- src/backend/utils/Makefile | 2 +- src/backend/utils/adt/Makefile | 2 +- src/backend/utils/adt/acl.c | 2 +- src/backend/utils/adt/array_userfuncs.c | 2 +- src/backend/utils/adt/arrayfuncs.c | 2 +- src/backend/utils/adt/arrayutils.c | 2 +- src/backend/utils/adt/ascii.c | 2 +- src/backend/utils/adt/bool.c | 2 +- src/backend/utils/adt/cash.c | 2 +- src/backend/utils/adt/char.c | 2 +- src/backend/utils/adt/date.c | 2 +- src/backend/utils/adt/datetime.c | 2 +- src/backend/utils/adt/datum.c | 2 +- src/backend/utils/adt/dbsize.c | 2 +- src/backend/utils/adt/domains.c | 2 +- src/backend/utils/adt/encode.c | 2 +- src/backend/utils/adt/enum.c | 2 +- src/backend/utils/adt/float.c | 2 +- src/backend/utils/adt/format_type.c | 2 +- src/backend/utils/adt/formatting.c | 2 +- src/backend/utils/adt/genfile.c | 2 +- src/backend/utils/adt/geo_ops.c | 2 +- src/backend/utils/adt/geo_selfuncs.c | 2 +- src/backend/utils/adt/inet_net_ntop.c | 2 +- src/backend/utils/adt/inet_net_pton.c | 2 +- src/backend/utils/adt/int.c | 2 +- src/backend/utils/adt/int8.c | 2 +- src/backend/utils/adt/like.c | 2 +- src/backend/utils/adt/like_match.c | 2 +- src/backend/utils/adt/lockfuncs.c | 2 +- src/backend/utils/adt/mac.c | 2 +- src/backend/utils/adt/misc.c | 2 +- src/backend/utils/adt/nabstime.c | 2 +- src/backend/utils/adt/name.c | 2 +- src/backend/utils/adt/network.c | 2 +- src/backend/utils/adt/numeric.c | 2 +- src/backend/utils/adt/numutils.c | 2 +- src/backend/utils/adt/oid.c | 2 +- src/backend/utils/adt/oracle_compat.c | 2 +- src/backend/utils/adt/pg_locale.c | 2 +- src/backend/utils/adt/pg_lzcompress.c | 2 +- src/backend/utils/adt/pgstatfuncs.c | 2 +- src/backend/utils/adt/pseudotypes.c | 2 +- src/backend/utils/adt/quote.c | 2 +- src/backend/utils/adt/regexp.c | 2 +- src/backend/utils/adt/regproc.c | 2 +- src/backend/utils/adt/ri_triggers.c | 2 +- src/backend/utils/adt/rowtypes.c | 2 +- src/backend/utils/adt/ruleutils.c | 2 +- src/backend/utils/adt/selfuncs.c | 2 +- src/backend/utils/adt/tid.c | 2 +- src/backend/utils/adt/timestamp.c | 2 +- src/backend/utils/adt/trigfuncs.c | 2 +- src/backend/utils/adt/tsginidx.c | 2 +- src/backend/utils/adt/tsgistidx.c | 2 +- src/backend/utils/adt/tsquery.c | 2 +- src/backend/utils/adt/tsquery_cleanup.c | 2 +- src/backend/utils/adt/tsquery_gist.c | 2 +- src/backend/utils/adt/tsquery_op.c | 2 +- src/backend/utils/adt/tsquery_rewrite.c | 2 +- src/backend/utils/adt/tsquery_util.c | 2 +- src/backend/utils/adt/tsrank.c | 2 +- src/backend/utils/adt/tsvector.c | 2 +- src/backend/utils/adt/tsvector_op.c | 2 +- src/backend/utils/adt/tsvector_parser.c | 2 +- src/backend/utils/adt/txid.c | 2 +- src/backend/utils/adt/uuid.c | 2 +- src/backend/utils/adt/varbit.c | 2 +- src/backend/utils/adt/varchar.c | 2 +- src/backend/utils/adt/varlena.c | 2 +- src/backend/utils/adt/version.c | 2 +- src/backend/utils/adt/windowfuncs.c | 2 +- src/backend/utils/adt/xid.c | 2 +- src/backend/utils/adt/xml.c | 2 +- src/backend/utils/cache/Makefile | 2 +- src/backend/utils/cache/attoptcache.c | 2 +- src/backend/utils/cache/catcache.c | 2 +- src/backend/utils/cache/inval.c | 2 +- src/backend/utils/cache/lsyscache.c | 2 +- src/backend/utils/cache/plancache.c | 2 +- src/backend/utils/cache/relcache.c | 2 +- src/backend/utils/cache/relmapper.c | 2 +- src/backend/utils/cache/spccache.c | 2 +- src/backend/utils/cache/syscache.c | 2 +- src/backend/utils/cache/ts_cache.c | 2 +- src/backend/utils/cache/typcache.c | 2 +- src/backend/utils/error/Makefile | 2 +- src/backend/utils/error/assert.c | 2 +- src/backend/utils/error/elog.c | 2 +- src/backend/utils/fmgr/Makefile | 2 +- src/backend/utils/fmgr/README | 2 +- src/backend/utils/fmgr/dfmgr.c | 2 +- src/backend/utils/fmgr/fmgr.c | 2 +- src/backend/utils/fmgr/funcapi.c | 2 +- src/backend/utils/hash/Makefile | 2 +- src/backend/utils/hash/dynahash.c | 2 +- src/backend/utils/hash/hashfn.c | 2 +- src/backend/utils/hash/pg_crc.c | 2 +- src/backend/utils/init/Makefile | 2 +- src/backend/utils/init/globals.c | 2 +- src/backend/utils/init/miscinit.c | 2 +- src/backend/utils/init/postinit.c | 2 +- src/backend/utils/mb/Makefile | 2 +- src/backend/utils/mb/README | 2 +- src/backend/utils/mb/Unicode/Makefile | 2 +- src/backend/utils/mb/Unicode/UCS_to_BIG5.pl | 2 +- src/backend/utils/mb/Unicode/UCS_to_EUC_CN.pl | 2 +- src/backend/utils/mb/Unicode/UCS_to_EUC_JIS_2004.pl | 2 +- src/backend/utils/mb/Unicode/UCS_to_EUC_JP.pl | 2 +- src/backend/utils/mb/Unicode/UCS_to_EUC_KR.pl | 2 +- src/backend/utils/mb/Unicode/UCS_to_EUC_TW.pl | 2 +- src/backend/utils/mb/Unicode/UCS_to_GB18030.pl | 2 +- src/backend/utils/mb/Unicode/UCS_to_SHIFT_JIS_2004.pl | 2 +- src/backend/utils/mb/Unicode/UCS_to_SJIS.pl | 2 +- src/backend/utils/mb/Unicode/UCS_to_most.pl | 2 +- src/backend/utils/mb/Unicode/euc_cn_to_utf8.map | 2 +- src/backend/utils/mb/Unicode/euc_jp_to_utf8.map | 2 +- src/backend/utils/mb/Unicode/euc_tw_to_utf8.map | 2 +- src/backend/utils/mb/Unicode/gb18030_to_utf8.map | 2 +- src/backend/utils/mb/Unicode/gbk_to_utf8.map | 2 +- src/backend/utils/mb/Unicode/iso8859_10_to_utf8.map | 2 +- src/backend/utils/mb/Unicode/iso8859_13_to_utf8.map | 2 +- src/backend/utils/mb/Unicode/iso8859_14_to_utf8.map | 2 +- src/backend/utils/mb/Unicode/iso8859_15_to_utf8.map | 2 +- src/backend/utils/mb/Unicode/iso8859_16_to_utf8.map | 2 +- src/backend/utils/mb/Unicode/iso8859_2_to_utf8.map | 2 +- src/backend/utils/mb/Unicode/iso8859_3_to_utf8.map | 2 +- src/backend/utils/mb/Unicode/iso8859_4_to_utf8.map | 2 +- src/backend/utils/mb/Unicode/iso8859_5_to_utf8.map | 2 +- src/backend/utils/mb/Unicode/iso8859_6_to_utf8.map | 2 +- src/backend/utils/mb/Unicode/iso8859_7_to_utf8.map | 2 +- src/backend/utils/mb/Unicode/iso8859_8_to_utf8.map | 2 +- src/backend/utils/mb/Unicode/iso8859_9_to_utf8.map | 2 +- src/backend/utils/mb/Unicode/koi8r_to_utf8.map | 2 +- src/backend/utils/mb/Unicode/ucs2utf.pl | 2 +- src/backend/utils/mb/conv.c | 2 +- src/backend/utils/mb/conversion_procs/Makefile | 2 +- src/backend/utils/mb/conversion_procs/ascii_and_mic/Makefile | 2 +- src/backend/utils/mb/conversion_procs/ascii_and_mic/ascii_and_mic.c | 2 +- src/backend/utils/mb/conversion_procs/cyrillic_and_mic/Makefile | 2 +- .../utils/mb/conversion_procs/cyrillic_and_mic/cyrillic_and_mic.c | 2 +- src/backend/utils/mb/conversion_procs/euc2004_sjis2004/Makefile | 2 +- .../utils/mb/conversion_procs/euc2004_sjis2004/euc2004_sjis2004.c | 2 +- src/backend/utils/mb/conversion_procs/euc_cn_and_mic/Makefile | 2 +- src/backend/utils/mb/conversion_procs/euc_cn_and_mic/euc_cn_and_mic.c | 2 +- src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/Makefile | 2 +- src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/euc_jp_and_sjis.c | 2 +- src/backend/utils/mb/conversion_procs/euc_kr_and_mic/Makefile | 2 +- src/backend/utils/mb/conversion_procs/euc_kr_and_mic/euc_kr_and_mic.c | 2 +- src/backend/utils/mb/conversion_procs/euc_tw_and_big5/Makefile | 2 +- src/backend/utils/mb/conversion_procs/euc_tw_and_big5/big5.c | 2 +- src/backend/utils/mb/conversion_procs/euc_tw_and_big5/euc_tw_and_big5.c | 2 +- src/backend/utils/mb/conversion_procs/latin2_and_win1250/Makefile | 2 +- .../utils/mb/conversion_procs/latin2_and_win1250/latin2_and_win1250.c | 2 +- src/backend/utils/mb/conversion_procs/latin_and_mic/Makefile | 2 +- src/backend/utils/mb/conversion_procs/latin_and_mic/latin_and_mic.c | 2 +- src/backend/utils/mb/conversion_procs/utf8_and_ascii/Makefile | 2 +- src/backend/utils/mb/conversion_procs/utf8_and_ascii/utf8_and_ascii.c | 2 +- src/backend/utils/mb/conversion_procs/utf8_and_big5/Makefile | 2 +- src/backend/utils/mb/conversion_procs/utf8_and_big5/utf8_and_big5.c | 2 +- src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/Makefile | 2 +- .../utils/mb/conversion_procs/utf8_and_cyrillic/utf8_and_cyrillic.c | 2 +- src/backend/utils/mb/conversion_procs/utf8_and_euc2004/Makefile | 2 +- .../utils/mb/conversion_procs/utf8_and_euc2004/utf8_and_euc2004.c | 2 +- src/backend/utils/mb/conversion_procs/utf8_and_euc_cn/Makefile | 2 +- src/backend/utils/mb/conversion_procs/utf8_and_euc_cn/utf8_and_euc_cn.c | 2 +- src/backend/utils/mb/conversion_procs/utf8_and_euc_jp/Makefile | 2 +- src/backend/utils/mb/conversion_procs/utf8_and_euc_jp/utf8_and_euc_jp.c | 2 +- src/backend/utils/mb/conversion_procs/utf8_and_euc_kr/Makefile | 2 +- src/backend/utils/mb/conversion_procs/utf8_and_euc_kr/utf8_and_euc_kr.c | 2 +- src/backend/utils/mb/conversion_procs/utf8_and_euc_tw/Makefile | 2 +- src/backend/utils/mb/conversion_procs/utf8_and_euc_tw/utf8_and_euc_tw.c | 2 +- src/backend/utils/mb/conversion_procs/utf8_and_gb18030/Makefile | 2 +- .../utils/mb/conversion_procs/utf8_and_gb18030/utf8_and_gb18030.c | 2 +- src/backend/utils/mb/conversion_procs/utf8_and_gbk/Makefile | 2 +- src/backend/utils/mb/conversion_procs/utf8_and_gbk/utf8_and_gbk.c | 2 +- src/backend/utils/mb/conversion_procs/utf8_and_iso8859/Makefile | 2 +- .../utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c | 2 +- src/backend/utils/mb/conversion_procs/utf8_and_iso8859_1/Makefile | 2 +- .../utils/mb/conversion_procs/utf8_and_iso8859_1/utf8_and_iso8859_1.c | 2 +- src/backend/utils/mb/conversion_procs/utf8_and_johab/Makefile | 2 +- src/backend/utils/mb/conversion_procs/utf8_and_johab/utf8_and_johab.c | 2 +- src/backend/utils/mb/conversion_procs/utf8_and_sjis/Makefile | 2 +- src/backend/utils/mb/conversion_procs/utf8_and_sjis/utf8_and_sjis.c | 2 +- src/backend/utils/mb/conversion_procs/utf8_and_sjis2004/Makefile | 2 +- .../utils/mb/conversion_procs/utf8_and_sjis2004/utf8_and_sjis2004.c | 2 +- src/backend/utils/mb/conversion_procs/utf8_and_uhc/Makefile | 2 +- src/backend/utils/mb/conversion_procs/utf8_and_uhc/utf8_and_uhc.c | 2 +- src/backend/utils/mb/conversion_procs/utf8_and_win/Makefile | 2 +- src/backend/utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c | 2 +- src/backend/utils/mb/encnames.c | 2 +- src/backend/utils/mb/iso.c | 2 +- src/backend/utils/mb/mbutils.c | 2 +- src/backend/utils/mb/wchar.c | 2 +- src/backend/utils/mb/win1251.c | 2 +- src/backend/utils/mb/win866.c | 2 +- src/backend/utils/mb/wstrcmp.c | 2 +- src/backend/utils/mb/wstrncmp.c | 2 +- src/backend/utils/misc/Makefile | 2 +- src/backend/utils/misc/README | 2 +- src/backend/utils/misc/guc-file.l | 2 +- src/backend/utils/misc/guc.c | 2 +- src/backend/utils/misc/help_config.c | 2 +- src/backend/utils/misc/pg_rusage.c | 2 +- src/backend/utils/misc/ps_status.c | 2 +- src/backend/utils/misc/rbtree.c | 2 +- src/backend/utils/misc/superuser.c | 2 +- src/backend/utils/misc/tzparser.c | 2 +- src/backend/utils/mmgr/Makefile | 2 +- src/backend/utils/mmgr/README | 2 +- src/backend/utils/mmgr/aset.c | 2 +- src/backend/utils/mmgr/mcxt.c | 2 +- src/backend/utils/mmgr/portalmem.c | 2 +- src/backend/utils/probes.d | 2 +- src/backend/utils/resowner/Makefile | 2 +- src/backend/utils/resowner/README | 2 +- src/backend/utils/resowner/resowner.c | 2 +- src/backend/utils/sort/Makefile | 2 +- src/backend/utils/sort/logtape.c | 2 +- src/backend/utils/sort/tuplesort.c | 2 +- src/backend/utils/sort/tuplestore.c | 2 +- src/backend/utils/time/Makefile | 2 +- src/backend/utils/time/combocid.c | 2 +- src/backend/utils/time/snapmgr.c | 2 +- src/backend/utils/time/tqual.c | 2 +- src/bcc32.mak | 2 +- src/bin/Makefile | 2 +- src/bin/initdb/Makefile | 2 +- src/bin/initdb/initdb.c | 2 +- src/bin/initdb/nls.mk | 2 +- src/bin/initdb/po/fr.po | 2 +- src/bin/initdb/po/ru.po | 2 +- src/bin/pg_config/Makefile | 2 +- src/bin/pg_config/nls.mk | 2 +- src/bin/pg_config/pg_config.c | 2 +- src/bin/pg_config/po/fr.po | 2 +- src/bin/pg_config/po/ru.po | 2 +- src/bin/pg_controldata/Makefile | 2 +- src/bin/pg_controldata/nls.mk | 2 +- src/bin/pg_controldata/pg_controldata.c | 2 +- src/bin/pg_controldata/po/fr.po | 2 +- src/bin/pg_ctl/Makefile | 2 +- src/bin/pg_ctl/nls.mk | 2 +- src/bin/pg_ctl/pg_ctl.c | 2 +- src/bin/pg_ctl/po/fr.po | 2 +- src/bin/pg_ctl/po/ru.po | 2 +- src/bin/pg_dump/Makefile | 2 +- src/bin/pg_dump/README | 2 +- src/bin/pg_dump/common.c | 2 +- src/bin/pg_dump/dumputils.c | 2 +- src/bin/pg_dump/dumputils.h | 2 +- src/bin/pg_dump/keywords.c | 2 +- src/bin/pg_dump/nls.mk | 2 +- src/bin/pg_dump/pg_backup.h | 2 +- src/bin/pg_dump/pg_backup_archiver.c | 2 +- src/bin/pg_dump/pg_backup_archiver.h | 2 +- src/bin/pg_dump/pg_backup_custom.c | 2 +- src/bin/pg_dump/pg_backup_db.c | 2 +- src/bin/pg_dump/pg_backup_db.h | 2 +- src/bin/pg_dump/pg_backup_files.c | 2 +- src/bin/pg_dump/pg_backup_null.c | 2 +- src/bin/pg_dump/pg_backup_tar.c | 2 +- src/bin/pg_dump/pg_backup_tar.h | 2 +- src/bin/pg_dump/pg_dump.c | 2 +- src/bin/pg_dump/pg_dump.h | 2 +- src/bin/pg_dump/pg_dump_sort.c | 2 +- src/bin/pg_dump/pg_dumpall.c | 2 +- src/bin/pg_dump/pg_restore.c | 2 +- src/bin/pg_dump/po/fr.po | 2 +- src/bin/pg_dump/po/zh_CN.po | 2 +- src/bin/pg_resetxlog/Makefile | 2 +- src/bin/pg_resetxlog/nls.mk | 2 +- src/bin/pg_resetxlog/pg_resetxlog.c | 2 +- src/bin/pg_resetxlog/po/fr.po | 2 +- src/bin/pg_resetxlog/po/ru.po | 2 +- src/bin/pgevent/README | 2 +- src/bin/pgevent/pgevent.c | 2 +- src/bin/pgevent/pgmsgevent.h | 2 +- src/bin/psql/Makefile | 2 +- src/bin/psql/command.c | 2 +- src/bin/psql/command.h | 2 +- src/bin/psql/common.c | 2 +- src/bin/psql/common.h | 2 +- src/bin/psql/copy.c | 2 +- src/bin/psql/copy.h | 2 +- src/bin/psql/create_help.pl | 2 +- src/bin/psql/describe.c | 2 +- src/bin/psql/describe.h | 2 +- src/bin/psql/help.c | 2 +- src/bin/psql/help.h | 2 +- src/bin/psql/input.c | 2 +- src/bin/psql/input.h | 2 +- src/bin/psql/large_obj.c | 2 +- src/bin/psql/large_obj.h | 2 +- src/bin/psql/mainloop.c | 2 +- src/bin/psql/mainloop.h | 2 +- src/bin/psql/mbprint.c | 2 +- src/bin/psql/mbprint.h | 2 +- src/bin/psql/nls.mk | 2 +- src/bin/psql/po/cs.po | 2 +- src/bin/psql/po/fr.po | 2 +- src/bin/psql/print.c | 2 +- src/bin/psql/print.h | 2 +- src/bin/psql/prompt.c | 2 +- src/bin/psql/prompt.h | 2 +- src/bin/psql/psqlscan.h | 2 +- src/bin/psql/psqlscan.l | 2 +- src/bin/psql/settings.h | 2 +- src/bin/psql/startup.c | 2 +- src/bin/psql/stringutils.c | 2 +- src/bin/psql/stringutils.h | 2 +- src/bin/psql/tab-complete.c | 2 +- src/bin/psql/tab-complete.h | 2 +- src/bin/psql/variables.c | 2 +- src/bin/psql/variables.h | 2 +- src/bin/scripts/Makefile | 2 +- src/bin/scripts/clusterdb.c | 2 +- src/bin/scripts/common.c | 2 +- src/bin/scripts/common.h | 2 +- src/bin/scripts/createdb.c | 2 +- src/bin/scripts/createlang.c | 2 +- src/bin/scripts/createuser.c | 2 +- src/bin/scripts/dropdb.c | 2 +- src/bin/scripts/droplang.c | 2 +- src/bin/scripts/dropuser.c | 2 +- src/bin/scripts/nls.mk | 2 +- src/bin/scripts/po/cs.po | 2 +- src/bin/scripts/po/fr.po | 2 +- src/bin/scripts/reindexdb.c | 2 +- src/bin/scripts/vacuumdb.c | 2 +- src/include/Makefile | 2 +- src/include/access/attnum.h | 2 +- src/include/access/clog.h | 2 +- src/include/access/genam.h | 2 +- src/include/access/gin.h | 2 +- src/include/access/gist.h | 2 +- src/include/access/gist_private.h | 2 +- src/include/access/gistscan.h | 2 +- src/include/access/hash.h | 2 +- src/include/access/heapam.h | 2 +- src/include/access/hio.h | 2 +- src/include/access/htup.h | 2 +- src/include/access/itup.h | 2 +- src/include/access/multixact.h | 2 +- src/include/access/nbtree.h | 2 +- src/include/access/printtup.h | 2 +- src/include/access/reloptions.h | 2 +- src/include/access/relscan.h | 2 +- src/include/access/rewriteheap.h | 2 +- src/include/access/rmgr.h | 2 +- src/include/access/sdir.h | 2 +- src/include/access/skey.h | 2 +- src/include/access/slru.h | 2 +- src/include/access/subtrans.h | 2 +- src/include/access/sysattr.h | 2 +- src/include/access/transam.h | 2 +- src/include/access/tupconvert.h | 2 +- src/include/access/tupdesc.h | 2 +- src/include/access/tupmacs.h | 2 +- src/include/access/tuptoaster.h | 2 +- src/include/access/twophase.h | 2 +- src/include/access/twophase_rmgr.h | 2 +- src/include/access/valid.h | 2 +- src/include/access/visibilitymap.h | 2 +- src/include/access/xact.h | 2 +- src/include/access/xlog.h | 2 +- src/include/access/xlog_internal.h | 2 +- src/include/access/xlogdefs.h | 2 +- src/include/access/xlogutils.h | 2 +- src/include/bootstrap/bootstrap.h | 2 +- src/include/c.h | 2 +- src/include/catalog/catalog.h | 2 +- src/include/catalog/catversion.h | 2 +- src/include/catalog/dependency.h | 2 +- src/include/catalog/duplicate_oids | 2 +- src/include/catalog/genbki.h | 2 +- src/include/catalog/heap.h | 2 +- src/include/catalog/index.h | 2 +- src/include/catalog/indexing.h | 2 +- src/include/catalog/namespace.h | 2 +- src/include/catalog/objectaddress.h | 2 +- src/include/catalog/pg_aggregate.h | 2 +- src/include/catalog/pg_am.h | 2 +- src/include/catalog/pg_amop.h | 2 +- src/include/catalog/pg_amproc.h | 2 +- src/include/catalog/pg_attrdef.h | 2 +- src/include/catalog/pg_attribute.h | 2 +- src/include/catalog/pg_auth_members.h | 2 +- src/include/catalog/pg_authid.h | 2 +- src/include/catalog/pg_cast.h | 2 +- src/include/catalog/pg_class.h | 2 +- src/include/catalog/pg_constraint.h | 2 +- src/include/catalog/pg_control.h | 2 +- src/include/catalog/pg_conversion.h | 2 +- src/include/catalog/pg_conversion_fn.h | 2 +- src/include/catalog/pg_database.h | 2 +- src/include/catalog/pg_db_role_setting.h | 2 +- src/include/catalog/pg_default_acl.h | 2 +- src/include/catalog/pg_depend.h | 2 +- src/include/catalog/pg_description.h | 2 +- src/include/catalog/pg_enum.h | 2 +- src/include/catalog/pg_foreign_data_wrapper.h | 2 +- src/include/catalog/pg_foreign_server.h | 2 +- src/include/catalog/pg_index.h | 2 +- src/include/catalog/pg_inherits.h | 2 +- src/include/catalog/pg_inherits_fn.h | 2 +- src/include/catalog/pg_language.h | 2 +- src/include/catalog/pg_largeobject.h | 2 +- src/include/catalog/pg_largeobject_metadata.h | 2 +- src/include/catalog/pg_namespace.h | 2 +- src/include/catalog/pg_opclass.h | 2 +- src/include/catalog/pg_operator.h | 2 +- src/include/catalog/pg_opfamily.h | 2 +- src/include/catalog/pg_pltemplate.h | 2 +- src/include/catalog/pg_proc.h | 2 +- src/include/catalog/pg_proc_fn.h | 2 +- src/include/catalog/pg_rewrite.h | 2 +- src/include/catalog/pg_shdepend.h | 2 +- src/include/catalog/pg_shdescription.h | 2 +- src/include/catalog/pg_statistic.h | 2 +- src/include/catalog/pg_tablespace.h | 2 +- src/include/catalog/pg_trigger.h | 2 +- src/include/catalog/pg_ts_config.h | 2 +- src/include/catalog/pg_ts_config_map.h | 2 +- src/include/catalog/pg_ts_dict.h | 2 +- src/include/catalog/pg_ts_parser.h | 2 +- src/include/catalog/pg_ts_template.h | 2 +- src/include/catalog/pg_type.h | 2 +- src/include/catalog/pg_type_fn.h | 2 +- src/include/catalog/pg_user_mapping.h | 2 +- src/include/catalog/storage.h | 2 +- src/include/catalog/toasting.h | 2 +- src/include/catalog/unused_oids | 2 +- src/include/commands/alter.h | 2 +- src/include/commands/async.h | 2 +- src/include/commands/cluster.h | 2 +- src/include/commands/comment.h | 2 +- src/include/commands/conversioncmds.h | 2 +- src/include/commands/copy.h | 2 +- src/include/commands/dbcommands.h | 2 +- src/include/commands/defrem.h | 2 +- src/include/commands/discard.h | 2 +- src/include/commands/explain.h | 2 +- src/include/commands/lockcmds.h | 2 +- src/include/commands/portalcmds.h | 2 +- src/include/commands/prepare.h | 2 +- src/include/commands/proclang.h | 2 +- src/include/commands/schemacmds.h | 2 +- src/include/commands/sequence.h | 2 +- src/include/commands/tablecmds.h | 2 +- src/include/commands/tablespace.h | 2 +- src/include/commands/trigger.h | 2 +- src/include/commands/typecmds.h | 2 +- src/include/commands/user.h | 2 +- src/include/commands/vacuum.h | 2 +- src/include/commands/variable.h | 2 +- src/include/commands/view.h | 2 +- src/include/executor/execdebug.h | 2 +- src/include/executor/execdefs.h | 2 +- src/include/executor/execdesc.h | 2 +- src/include/executor/executor.h | 2 +- src/include/executor/functions.h | 2 +- src/include/executor/hashjoin.h | 2 +- src/include/executor/instrument.h | 2 +- src/include/executor/nodeAgg.h | 2 +- src/include/executor/nodeAppend.h | 2 +- src/include/executor/nodeBitmapAnd.h | 2 +- src/include/executor/nodeBitmapHeapscan.h | 2 +- src/include/executor/nodeBitmapIndexscan.h | 2 +- src/include/executor/nodeBitmapOr.h | 2 +- src/include/executor/nodeCtescan.h | 2 +- src/include/executor/nodeFunctionscan.h | 2 +- src/include/executor/nodeGroup.h | 2 +- src/include/executor/nodeHash.h | 2 +- src/include/executor/nodeHashjoin.h | 2 +- src/include/executor/nodeIndexscan.h | 2 +- src/include/executor/nodeLimit.h | 2 +- src/include/executor/nodeLockRows.h | 2 +- src/include/executor/nodeMaterial.h | 2 +- src/include/executor/nodeMergejoin.h | 2 +- src/include/executor/nodeModifyTable.h | 2 +- src/include/executor/nodeNestloop.h | 2 +- src/include/executor/nodeRecursiveunion.h | 2 +- src/include/executor/nodeResult.h | 2 +- src/include/executor/nodeSeqscan.h | 2 +- src/include/executor/nodeSetOp.h | 2 +- src/include/executor/nodeSort.h | 2 +- src/include/executor/nodeSubplan.h | 2 +- src/include/executor/nodeSubqueryscan.h | 2 +- src/include/executor/nodeTidscan.h | 2 +- src/include/executor/nodeUnique.h | 2 +- src/include/executor/nodeValuesscan.h | 2 +- src/include/executor/nodeWindowAgg.h | 2 +- src/include/executor/nodeWorktablescan.h | 2 +- src/include/executor/spi.h | 2 +- src/include/executor/spi_priv.h | 2 +- src/include/executor/tstoreReceiver.h | 2 +- src/include/executor/tuptable.h | 2 +- src/include/fmgr.h | 2 +- src/include/foreign/foreign.h | 2 +- src/include/funcapi.h | 2 +- src/include/getaddrinfo.h | 2 +- src/include/getopt_long.h | 2 +- src/include/lib/dllist.h | 2 +- src/include/lib/stringinfo.h | 2 +- src/include/libpq/auth.h | 2 +- src/include/libpq/be-fsstubs.h | 2 +- src/include/libpq/crypt.h | 2 +- src/include/libpq/hba.h | 2 +- src/include/libpq/ip.h | 2 +- src/include/libpq/libpq-be.h | 2 +- src/include/libpq/libpq-fs.h | 2 +- src/include/libpq/libpq.h | 2 +- src/include/libpq/md5.h | 2 +- src/include/libpq/pqcomm.h | 2 +- src/include/libpq/pqformat.h | 2 +- src/include/libpq/pqsignal.h | 2 +- src/include/mb/pg_wchar.h | 2 +- src/include/miscadmin.h | 2 +- src/include/nodes/bitmapset.h | 2 +- src/include/nodes/execnodes.h | 2 +- src/include/nodes/makefuncs.h | 2 +- src/include/nodes/memnodes.h | 2 +- src/include/nodes/nodeFuncs.h | 2 +- src/include/nodes/nodes.h | 2 +- src/include/nodes/params.h | 2 +- src/include/nodes/parsenodes.h | 2 +- src/include/nodes/pg_list.h | 2 +- src/include/nodes/plannodes.h | 2 +- src/include/nodes/primnodes.h | 2 +- src/include/nodes/print.h | 2 +- src/include/nodes/readfuncs.h | 2 +- src/include/nodes/relation.h | 2 +- src/include/nodes/tidbitmap.h | 2 +- src/include/nodes/value.h | 2 +- src/include/optimizer/clauses.h | 2 +- src/include/optimizer/cost.h | 2 +- src/include/optimizer/geqo.h | 2 +- src/include/optimizer/geqo_copy.h | 2 +- src/include/optimizer/geqo_gene.h | 2 +- src/include/optimizer/geqo_misc.h | 2 +- src/include/optimizer/geqo_mutation.h | 2 +- src/include/optimizer/geqo_pool.h | 2 +- src/include/optimizer/geqo_random.h | 2 +- src/include/optimizer/geqo_recombination.h | 2 +- src/include/optimizer/geqo_selection.h | 2 +- src/include/optimizer/joininfo.h | 2 +- src/include/optimizer/pathnode.h | 2 +- src/include/optimizer/paths.h | 2 +- src/include/optimizer/placeholder.h | 2 +- src/include/optimizer/plancat.h | 2 +- src/include/optimizer/planmain.h | 2 +- src/include/optimizer/planner.h | 2 +- src/include/optimizer/predtest.h | 2 +- src/include/optimizer/prep.h | 2 +- src/include/optimizer/restrictinfo.h | 2 +- src/include/optimizer/subselect.h | 2 +- src/include/optimizer/tlist.h | 2 +- src/include/optimizer/var.h | 2 +- src/include/parser/analyze.h | 2 +- src/include/parser/gramparse.h | 2 +- src/include/parser/keywords.h | 2 +- src/include/parser/kwlist.h | 2 +- src/include/parser/parse_agg.h | 2 +- src/include/parser/parse_clause.h | 2 +- src/include/parser/parse_coerce.h | 2 +- src/include/parser/parse_cte.h | 2 +- src/include/parser/parse_expr.h | 2 +- src/include/parser/parse_func.h | 2 +- src/include/parser/parse_node.h | 2 +- src/include/parser/parse_oper.h | 2 +- src/include/parser/parse_param.h | 2 +- src/include/parser/parse_relation.h | 2 +- src/include/parser/parse_target.h | 2 +- src/include/parser/parse_type.h | 2 +- src/include/parser/parse_utilcmd.h | 2 +- src/include/parser/parser.h | 2 +- src/include/parser/parsetree.h | 2 +- src/include/parser/scanner.h | 2 +- src/include/parser/scansup.h | 2 +- src/include/pg_config_manual.h | 2 +- src/include/pg_trace.h | 2 +- src/include/pgstat.h | 2 +- src/include/pgtime.h | 2 +- src/include/port.h | 2 +- src/include/port/aix.h | 2 +- src/include/port/bsdi.h | 2 +- src/include/port/cygwin.h | 2 +- src/include/port/darwin.h | 2 +- src/include/port/dgux.h | 2 +- src/include/port/freebsd.h | 2 +- src/include/port/hpux.h | 2 +- src/include/port/irix.h | 2 +- src/include/port/linux.h | 2 +- src/include/port/netbsd.h | 2 +- src/include/port/nextstep.h | 2 +- src/include/port/openbsd.h | 2 +- src/include/port/osf.h | 2 +- src/include/port/sco.h | 2 +- src/include/port/solaris.h | 2 +- src/include/port/sunos4.h | 2 +- src/include/port/svr4.h | 2 +- src/include/port/ultrix4.h | 2 +- src/include/port/univel.h | 2 +- src/include/port/unixware.h | 2 +- src/include/port/win32.h | 2 +- src/include/port/win32/arpa/inet.h | 2 +- src/include/port/win32/dlfcn.h | 2 +- src/include/port/win32/grp.h | 2 +- src/include/port/win32/netdb.h | 2 +- src/include/port/win32/netinet/in.h | 2 +- src/include/port/win32/pwd.h | 2 +- src/include/port/win32/sys/socket.h | 2 +- src/include/port/win32/sys/wait.h | 2 +- src/include/port/win32_msvc/dirent.h | 2 +- src/include/port/win32_msvc/sys/file.h | 2 +- src/include/port/win32_msvc/sys/param.h | 2 +- src/include/port/win32_msvc/sys/time.h | 2 +- src/include/port/win32_msvc/unistd.h | 2 +- src/include/port/win32_msvc/utime.h | 2 +- src/include/portability/instr_time.h | 2 +- src/include/postgres.h | 2 +- src/include/postgres_ext.h | 2 +- src/include/postgres_fe.h | 2 +- src/include/postmaster/autovacuum.h | 2 +- src/include/postmaster/bgwriter.h | 2 +- src/include/postmaster/fork_process.h | 2 +- src/include/postmaster/pgarch.h | 2 +- src/include/postmaster/postmaster.h | 2 +- src/include/postmaster/syslogger.h | 2 +- src/include/postmaster/walwriter.h | 2 +- src/include/regex/regcustom.h | 2 +- src/include/regex/regerrs.h | 2 +- src/include/regex/regex.h | 2 +- src/include/regex/regguts.h | 2 +- src/include/replication/walprotocol.h | 2 +- src/include/replication/walreceiver.h | 2 +- src/include/replication/walsender.h | 2 +- src/include/rewrite/prs2lock.h | 2 +- src/include/rewrite/rewriteDefine.h | 2 +- src/include/rewrite/rewriteHandler.h | 2 +- src/include/rewrite/rewriteManip.h | 2 +- src/include/rewrite/rewriteRemove.h | 2 +- src/include/rewrite/rewriteSupport.h | 2 +- src/include/rusagestub.h | 2 +- src/include/snowball/header.h | 2 +- src/include/storage/backendid.h | 2 +- src/include/storage/block.h | 2 +- src/include/storage/buf.h | 2 +- src/include/storage/buf_internals.h | 2 +- src/include/storage/buffile.h | 2 +- src/include/storage/bufmgr.h | 2 +- src/include/storage/bufpage.h | 2 +- src/include/storage/fd.h | 2 +- src/include/storage/freespace.h | 2 +- src/include/storage/fsm_internals.h | 2 +- src/include/storage/indexfsm.h | 2 +- src/include/storage/ipc.h | 2 +- src/include/storage/item.h | 2 +- src/include/storage/itemid.h | 2 +- src/include/storage/itemptr.h | 2 +- src/include/storage/large_object.h | 2 +- src/include/storage/latch.h | 2 +- src/include/storage/lmgr.h | 2 +- src/include/storage/lock.h | 2 +- src/include/storage/lwlock.h | 2 +- src/include/storage/off.h | 2 +- src/include/storage/pg_sema.h | 2 +- src/include/storage/pg_shmem.h | 2 +- src/include/storage/pmsignal.h | 2 +- src/include/storage/pos.h | 2 +- src/include/storage/proc.h | 2 +- src/include/storage/procarray.h | 2 +- src/include/storage/procsignal.h | 2 +- src/include/storage/relfilenode.h | 2 +- src/include/storage/s_lock.h | 2 +- src/include/storage/shmem.h | 2 +- src/include/storage/sinval.h | 2 +- src/include/storage/sinvaladt.h | 2 +- src/include/storage/smgr.h | 2 +- src/include/storage/spin.h | 2 +- src/include/storage/standby.h | 2 +- src/include/tcop/dest.h | 2 +- src/include/tcop/fastpath.h | 2 +- src/include/tcop/pquery.h | 2 +- src/include/tcop/tcopdebug.h | 2 +- src/include/tcop/tcopprot.h | 2 +- src/include/tcop/utility.h | 2 +- src/include/tsearch/dicts/regis.h | 2 +- src/include/tsearch/dicts/spell.h | 2 +- src/include/tsearch/ts_cache.h | 2 +- src/include/tsearch/ts_locale.h | 2 +- src/include/tsearch/ts_public.h | 2 +- src/include/tsearch/ts_type.h | 2 +- src/include/tsearch/ts_utils.h | 2 +- src/include/utils/acl.h | 2 +- src/include/utils/array.h | 2 +- src/include/utils/ascii.h | 2 +- src/include/utils/attoptcache.h | 2 +- src/include/utils/builtins.h | 2 +- src/include/utils/bytea.h | 2 +- src/include/utils/cash.h | 2 +- src/include/utils/catcache.h | 2 +- src/include/utils/combocid.h | 2 +- src/include/utils/date.h | 2 +- src/include/utils/datetime.h | 2 +- src/include/utils/datum.h | 2 +- src/include/utils/dynahash.h | 2 +- src/include/utils/dynamic_loader.h | 2 +- src/include/utils/elog.h | 2 +- src/include/utils/errcodes.h | 2 +- src/include/utils/fmgrtab.h | 2 +- src/include/utils/formatting.h | 2 +- src/include/utils/geo_decls.h | 2 +- src/include/utils/guc.h | 2 +- src/include/utils/guc_tables.h | 2 +- src/include/utils/help_config.h | 2 +- src/include/utils/hsearch.h | 2 +- src/include/utils/inet.h | 2 +- src/include/utils/int8.h | 2 +- src/include/utils/inval.h | 2 +- src/include/utils/logtape.h | 2 +- src/include/utils/lsyscache.h | 2 +- src/include/utils/memutils.h | 2 +- src/include/utils/nabstime.h | 2 +- src/include/utils/numeric.h | 2 +- src/include/utils/palloc.h | 2 +- src/include/utils/pg_crc.h | 2 +- src/include/utils/pg_locale.h | 2 +- src/include/utils/pg_lzcompress.h | 2 +- src/include/utils/pg_rusage.h | 2 +- src/include/utils/plancache.h | 2 +- src/include/utils/portal.h | 2 +- src/include/utils/ps_status.h | 2 +- src/include/utils/rbtree.h | 2 +- src/include/utils/rel.h | 2 +- src/include/utils/relcache.h | 2 +- src/include/utils/relmapper.h | 2 +- src/include/utils/resowner.h | 2 +- src/include/utils/selfuncs.h | 2 +- src/include/utils/snapmgr.h | 2 +- src/include/utils/snapshot.h | 2 +- src/include/utils/spccache.h | 2 +- src/include/utils/syscache.h | 2 +- src/include/utils/timestamp.h | 2 +- src/include/utils/tqual.h | 2 +- src/include/utils/tuplesort.h | 2 +- src/include/utils/tuplestore.h | 2 +- src/include/utils/typcache.h | 2 +- src/include/utils/tzparser.h | 2 +- src/include/utils/uuid.h | 2 +- src/include/utils/varbit.h | 2 +- src/include/utils/xml.h | 2 +- src/include/windowapi.h | 2 +- src/interfaces/Makefile | 2 +- src/interfaces/ecpg/README.dynSQL | 2 +- src/interfaces/ecpg/compatlib/Makefile | 2 +- src/interfaces/ecpg/compatlib/exports.txt | 2 +- src/interfaces/ecpg/compatlib/informix.c | 2 +- src/interfaces/ecpg/ecpglib/Makefile | 2 +- src/interfaces/ecpg/ecpglib/connect.c | 2 +- src/interfaces/ecpg/ecpglib/data.c | 2 +- src/interfaces/ecpg/ecpglib/descriptor.c | 2 +- src/interfaces/ecpg/ecpglib/error.c | 2 +- src/interfaces/ecpg/ecpglib/execute.c | 2 +- src/interfaces/ecpg/ecpglib/exports.txt | 2 +- src/interfaces/ecpg/ecpglib/extern.h | 2 +- src/interfaces/ecpg/ecpglib/memory.c | 2 +- src/interfaces/ecpg/ecpglib/misc.c | 2 +- src/interfaces/ecpg/ecpglib/nls.mk | 2 +- src/interfaces/ecpg/ecpglib/pg_type.h | 2 +- src/interfaces/ecpg/ecpglib/po/fr.po | 2 +- src/interfaces/ecpg/ecpglib/prepare.c | 2 +- src/interfaces/ecpg/ecpglib/typename.c | 2 +- src/interfaces/ecpg/include/datetime.h | 2 +- src/interfaces/ecpg/include/decimal.h | 2 +- src/interfaces/ecpg/include/ecpg-pthread-win32.h | 2 +- src/interfaces/ecpg/include/ecpg_informix.h | 2 +- src/interfaces/ecpg/include/ecpgerrno.h | 2 +- src/interfaces/ecpg/include/ecpglib.h | 2 +- src/interfaces/ecpg/include/ecpgtype.h | 2 +- src/interfaces/ecpg/include/pgtypes_date.h | 2 +- src/interfaces/ecpg/include/pgtypes_error.h | 2 +- src/interfaces/ecpg/include/pgtypes_interval.h | 2 +- src/interfaces/ecpg/include/pgtypes_timestamp.h | 2 +- src/interfaces/ecpg/include/sqlda-native.h | 2 +- src/interfaces/ecpg/pgtypeslib/Makefile | 2 +- src/interfaces/ecpg/pgtypeslib/common.c | 2 +- src/interfaces/ecpg/pgtypeslib/datetime.c | 2 +- src/interfaces/ecpg/pgtypeslib/dt.h | 2 +- src/interfaces/ecpg/pgtypeslib/dt_common.c | 2 +- src/interfaces/ecpg/pgtypeslib/exports.txt | 2 +- src/interfaces/ecpg/pgtypeslib/extern.h | 2 +- src/interfaces/ecpg/pgtypeslib/interval.c | 2 +- src/interfaces/ecpg/pgtypeslib/numeric.c | 2 +- src/interfaces/ecpg/pgtypeslib/timestamp.c | 2 +- src/interfaces/ecpg/preproc/Makefile | 2 +- src/interfaces/ecpg/preproc/c_keywords.c | 2 +- src/interfaces/ecpg/preproc/check_rules.pl | 2 +- src/interfaces/ecpg/preproc/descriptor.c | 2 +- src/interfaces/ecpg/preproc/ecpg.addons | 2 +- src/interfaces/ecpg/preproc/ecpg.c | 2 +- src/interfaces/ecpg/preproc/ecpg.header | 2 +- src/interfaces/ecpg/preproc/ecpg.tokens | 2 +- src/interfaces/ecpg/preproc/ecpg.trailer | 2 +- src/interfaces/ecpg/preproc/ecpg.type | 2 +- src/interfaces/ecpg/preproc/ecpg_keywords.c | 2 +- src/interfaces/ecpg/preproc/extern.h | 2 +- src/interfaces/ecpg/preproc/keywords.c | 2 +- src/interfaces/ecpg/preproc/nls.mk | 2 +- src/interfaces/ecpg/preproc/output.c | 2 +- src/interfaces/ecpg/preproc/parse.pl | 2 +- src/interfaces/ecpg/preproc/parser.c | 2 +- src/interfaces/ecpg/preproc/pgc.l | 2 +- src/interfaces/ecpg/preproc/type.c | 2 +- src/interfaces/ecpg/preproc/type.h | 2 +- src/interfaces/ecpg/preproc/variable.c | 2 +- src/interfaces/ecpg/test/Makefile | 2 +- src/interfaces/ecpg/test/connect/README | 2 +- src/interfaces/ecpg/test/pg_regress_ecpg.c | 2 +- src/interfaces/libpq/Makefile | 2 +- src/interfaces/libpq/README | 2 +- src/interfaces/libpq/exports.txt | 2 +- src/interfaces/libpq/fe-auth.c | 2 +- src/interfaces/libpq/fe-auth.h | 2 +- src/interfaces/libpq/fe-connect.c | 2 +- src/interfaces/libpq/fe-exec.c | 2 +- src/interfaces/libpq/fe-lobj.c | 2 +- src/interfaces/libpq/fe-misc.c | 2 +- src/interfaces/libpq/fe-print.c | 2 +- src/interfaces/libpq/fe-protocol2.c | 2 +- src/interfaces/libpq/fe-protocol3.c | 2 +- src/interfaces/libpq/fe-secure.c | 2 +- src/interfaces/libpq/libpq-events.c | 2 +- src/interfaces/libpq/libpq-events.h | 2 +- src/interfaces/libpq/libpq-fe.h | 2 +- src/interfaces/libpq/libpq-int.h | 2 +- src/interfaces/libpq/nls.mk | 2 +- src/interfaces/libpq/po/cs.po | 2 +- src/interfaces/libpq/po/fr.po | 2 +- src/interfaces/libpq/po/ru.po | 2 +- src/interfaces/libpq/po/zh_CN.po | 2 +- src/interfaces/libpq/pqexpbuffer.c | 2 +- src/interfaces/libpq/pqexpbuffer.h | 2 +- src/interfaces/libpq/pqsignal.c | 2 +- src/interfaces/libpq/pqsignal.h | 2 +- src/interfaces/libpq/pthread-win32.c | 2 +- src/interfaces/libpq/win32.c | 2 +- src/interfaces/libpq/win32.h | 2 +- src/makefiles/Makefile | 2 +- src/makefiles/Makefile.cygwin | 2 +- src/makefiles/Makefile.solaris | 2 +- src/makefiles/Makefile.win32 | 2 +- src/makefiles/pgxs.mk | 2 +- src/nls-global.mk | 2 +- src/pl/Makefile | 2 +- src/pl/plperl/GNUmakefile | 2 +- src/pl/plperl/README | 2 +- src/pl/plperl/SPI.xs | 2 +- src/pl/plperl/Util.xs | 2 +- src/pl/plperl/nls.mk | 2 +- src/pl/plperl/plc_perlboot.pl | 2 +- src/pl/plperl/plc_trusted.pl | 2 +- src/pl/plperl/plperl.c | 2 +- src/pl/plperl/plperl.h | 2 +- src/pl/plperl/po/fr.po | 2 +- src/pl/plperl/text2macro.pl | 2 +- src/pl/plpgsql/Makefile | 2 +- src/pl/plpgsql/src/Makefile | 2 +- src/pl/plpgsql/src/gram.y | 2 +- src/pl/plpgsql/src/nls.mk | 2 +- src/pl/plpgsql/src/pl_comp.c | 2 +- src/pl/plpgsql/src/pl_exec.c | 2 +- src/pl/plpgsql/src/pl_funcs.c | 2 +- src/pl/plpgsql/src/pl_handler.c | 2 +- src/pl/plpgsql/src/pl_scanner.c | 2 +- src/pl/plpgsql/src/plerrcodes.h | 2 +- src/pl/plpgsql/src/plpgsql.h | 2 +- src/pl/plpgsql/src/po/fr.po | 2 +- src/pl/plpython/Makefile | 2 +- src/pl/plpython/nls.mk | 2 +- src/pl/plpython/plpython.c | 2 +- src/pl/plpython/po/fr.po | 2 +- src/pl/tcl/Makefile | 2 +- src/pl/tcl/modules/Makefile | 2 +- src/pl/tcl/modules/README | 2 +- src/pl/tcl/modules/pltcl_delmod.in | 2 +- src/pl/tcl/modules/pltcl_listmod.in | 2 +- src/pl/tcl/nls.mk | 2 +- src/pl/tcl/pltcl.c | 2 +- src/pl/tcl/po/fr.po | 2 +- src/port/Makefile | 2 +- src/port/README | 2 +- src/port/chklocale.c | 2 +- src/port/crypt.c | 2 +- src/port/dirent.c | 2 +- src/port/dirmod.c | 2 +- src/port/erand48.c | 2 +- src/port/exec.c | 2 +- src/port/fseeko.c | 2 +- src/port/getaddrinfo.c | 2 +- src/port/gethostname.c | 2 +- src/port/getopt.c | 2 +- src/port/getopt_long.c | 2 +- src/port/getrusage.c | 2 +- src/port/gettimeofday.c | 2 +- src/port/inet_aton.c | 2 +- src/port/isinf.c | 2 +- src/port/kill.c | 2 +- src/port/memcmp.c | 2 +- src/port/noblock.c | 2 +- src/port/open.c | 2 +- src/port/path.c | 2 +- src/port/pgsleep.c | 2 +- src/port/pgstrcasecmp.c | 2 +- src/port/pipe.c | 2 +- src/port/pthread-win32.h | 2 +- src/port/qsort.c | 2 +- src/port/qsort_arg.c | 2 +- src/port/random.c | 2 +- src/port/rint.c | 2 +- src/port/snprintf.c | 2 +- src/port/sprompt.c | 2 +- src/port/srandom.c | 2 +- src/port/strdup.c | 2 +- src/port/strerror.c | 2 +- src/port/strlcat.c | 2 +- src/port/strlcpy.c | 2 +- src/port/strtol.c | 2 +- src/port/strtoul.c | 2 +- src/port/thread.c | 2 +- src/port/unsetenv.c | 2 +- src/port/win32env.c | 2 +- src/port/win32error.c | 2 +- src/template/cygwin | 2 +- src/template/darwin | 2 +- src/template/dgux | 2 +- src/template/freebsd | 2 +- src/template/hpux | 2 +- src/template/linux | 2 +- src/template/netbsd | 2 +- src/template/nextstep | 2 +- src/template/osf | 2 +- src/test/Makefile | 2 +- src/test/examples/testlibpq.c | 2 +- src/test/examples/testlibpq2.c | 2 +- src/test/examples/testlibpq3.c | 2 +- src/test/examples/testlibpq4.c | 2 +- src/test/examples/testlo.c | 2 +- src/test/locale/Makefile | 2 +- src/test/locale/README | 2 +- src/test/locale/de_DE.ISO8859-1/README | 2 +- src/test/locale/gr_GR.ISO8859-7/README | 2 +- src/test/locale/koi8-to-win1251/README | 2 +- src/test/locale/test-ctype.c | 2 +- src/test/mb/README | 2 +- src/test/mb/mbregress.sh | 2 +- src/test/performance/sqls/inssimple | 2 +- src/test/regress/GNUmakefile | 2 +- src/test/regress/parallel_schedule | 2 +- src/test/regress/pg_regress.c | 2 +- src/test/regress/pg_regress.h | 2 +- src/test/regress/pg_regress_main.c | 2 +- src/test/regress/regress.c | 2 +- src/test/regress/serial_schedule | 2 +- src/test/regress/standby_schedule | 2 +- src/test/thread/Makefile | 2 +- src/test/thread/README | 2 +- src/test/thread/thread_test.c | 2 +- src/timezone/Makefile | 2 +- src/timezone/README | 2 +- src/timezone/ialloc.c | 2 +- src/timezone/localtime.c | 2 +- src/timezone/pgtz.c | 2 +- src/timezone/pgtz.h | 2 +- src/timezone/private.h | 2 +- src/timezone/scheck.c | 2 +- src/timezone/strftime.c | 2 +- src/timezone/tzfile.h | 2 +- src/timezone/tznames/Africa.txt | 2 +- src/timezone/tznames/America.txt | 2 +- src/timezone/tznames/Antarctica.txt | 2 +- src/timezone/tznames/Asia.txt | 2 +- src/timezone/tznames/Atlantic.txt | 2 +- src/timezone/tznames/Australia | 2 +- src/timezone/tznames/Australia.txt | 2 +- src/timezone/tznames/Default | 2 +- src/timezone/tznames/Etc.txt | 2 +- src/timezone/tznames/Europe.txt | 2 +- src/timezone/tznames/India | 2 +- src/timezone/tznames/Indian.txt | 2 +- src/timezone/tznames/Makefile | 2 +- src/timezone/tznames/Pacific.txt | 2 +- src/timezone/tznames/README | 2 +- src/timezone/zic.c | 2 +- src/tools/FAQ2txt | 2 +- src/tools/add_cvs_markers | 2 +- src/tools/backend/README | 2 +- src/tools/backend/index.html | 2 +- src/tools/ccsym | 2 +- src/tools/check_keywords.pl | 2 +- src/tools/codelines | 2 +- src/tools/copyright | 2 +- src/tools/entab/entab.c | 2 +- src/tools/entab/entab.man | 2 +- src/tools/entab/halt.c | 2 +- src/tools/find_badmacros | 2 +- src/tools/find_gt_lt | 2 +- src/tools/find_static | 2 +- src/tools/find_typedef | 2 +- src/tools/findoidjoins/Makefile | 2 +- src/tools/findoidjoins/README | 2 +- src/tools/findoidjoins/findoidjoins.c | 2 +- src/tools/findoidjoins/make_oidjoins_check | 2 +- src/tools/fsync/Makefile | 2 +- src/tools/fsync/README | 2 +- src/tools/fsync/test_fsync.c | 2 +- src/tools/ifaddrs/Makefile | 2 +- src/tools/ifaddrs/README | 2 +- src/tools/ifaddrs/test_ifaddrs.c | 2 +- src/tools/make_ctags | 2 +- src/tools/make_diff/README | 2 +- src/tools/make_diff/cporig | 2 +- src/tools/make_diff/difforig | 2 +- src/tools/make_diff/rmorig | 2 +- src/tools/make_etags | 2 +- src/tools/make_keywords | 2 +- src/tools/make_mkid | 2 +- src/tools/msvc/Install.pm | 2 +- src/tools/msvc/Mkvcbuild.pm | 2 +- src/tools/msvc/Project.pm | 2 +- src/tools/msvc/README | 2 +- src/tools/msvc/Solution.pm | 2 +- src/tools/msvc/build.bat | 2 +- src/tools/msvc/build.pl | 2 +- src/tools/msvc/builddoc.bat | 2 +- src/tools/msvc/clean.bat | 2 +- src/tools/msvc/gendef.pl | 2 +- src/tools/msvc/install.bat | 2 +- src/tools/msvc/install.pl | 2 +- src/tools/msvc/mkvcbuild.pl | 2 +- src/tools/msvc/pgbison.bat | 2 +- src/tools/msvc/pgflex.bat | 2 +- src/tools/msvc/vcregress.bat | 2 +- src/tools/msvc/vcregress.pl | 2 +- src/tools/pgcvslog | 2 +- src/tools/pginclude/README | 2 +- src/tools/pginclude/pgcheckdefines | 2 +- src/tools/pginclude/pgcompinclude | 2 +- src/tools/pginclude/pgdefine | 2 +- src/tools/pginclude/pgfixinclude | 2 +- src/tools/pginclude/pgrminclude | 2 +- src/tools/pgindent/README | 2 +- src/tools/pgindent/indent.bsd.patch | 2 +- src/tools/pgindent/pgcppindent | 2 +- src/tools/pgindent/pgindent | 2 +- src/tools/pgtest | 2 +- src/tools/version_stamp.pl | 2 +- src/tools/win32tzlist.pl | 2 +- src/tutorial/Makefile | 2 +- src/tutorial/README | 2 +- src/tutorial/advanced.source | 2 +- src/tutorial/basics.source | 2 +- src/tutorial/complex.c | 2 +- src/tutorial/complex.source | 2 +- src/tutorial/funcs.c | 2 +- src/tutorial/funcs.source | 2 +- src/tutorial/funcs_new.c | 2 +- src/tutorial/syscat.source | 2 +- src/win32.mak | 2 +- 2182 files changed, 2182 insertions(+), 2182 deletions(-) (limited to 'contrib/xml2') diff --git a/GNUmakefile.in b/GNUmakefile.in index 86623a3854..8355b9be93 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -1,7 +1,7 @@ # # PostgreSQL top level makefile # -# $PostgreSQL: pgsql/GNUmakefile.in,v 1.58 2010/03/30 00:10:46 petere Exp $ +# GNUmakefile.in # subdir = diff --git a/aclocal.m4 b/aclocal.m4 index b007cd0a48..eaf98007e5 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -dnl $PostgreSQL: pgsql/aclocal.m4,v 1.18 2004/04/23 18:15:47 momjian Exp $ +dnl aclocal.m4 m4_include([config/ac_func_accept_argtypes.m4]) m4_include([config/acx_pthread.m4]) m4_include([config/c-compiler.m4]) diff --git a/config/Makefile b/config/Makefile index 2e881b7704..da1283868e 100644 --- a/config/Makefile +++ b/config/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/config/Makefile,v 1.3 2009/08/26 22:24:42 petere Exp $ +# config/Makefile subdir = config top_builddir = .. diff --git a/config/ac_func_accept_argtypes.m4 b/config/ac_func_accept_argtypes.m4 index 917d59ab86..d1017998eb 100644 --- a/config/ac_func_accept_argtypes.m4 +++ b/config/ac_func_accept_argtypes.m4 @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/config/ac_func_accept_argtypes.m4,v 1.6 2003/11/29 19:51:17 pgsql Exp $ +# config/ac_func_accept_argtypes.m4 # This comes from the official Autoconf macro archive at # # (I removed the $ before the Id CVS keyword below.) diff --git a/config/c-compiler.m4 b/config/c-compiler.m4 index 78edf44944..f17a52a116 100644 --- a/config/c-compiler.m4 +++ b/config/c-compiler.m4 @@ -1,5 +1,5 @@ # Macros to detect C compiler features -# $PostgreSQL: pgsql/config/c-compiler.m4,v 1.23 2010/08/19 05:57:33 petere Exp $ +# config/c-compiler.m4 # PGAC_C_SIGNED diff --git a/config/c-library.m4 b/config/c-library.m4 index 5d44685ec0..98e03e3d18 100644 --- a/config/c-library.m4 +++ b/config/c-library.m4 @@ -1,5 +1,5 @@ # Macros that test various C library quirks -# $PostgreSQL: pgsql/config/c-library.m4,v 1.34 2009/07/02 18:55:40 petere Exp $ +# config/c-library.m4 # PGAC_VAR_INT_TIMEZONE diff --git a/config/docbook.m4 b/config/docbook.m4 index 0d8c1fad7e..636aefed4c 100644 --- a/config/docbook.m4 +++ b/config/docbook.m4 @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/config/docbook.m4,v 1.11 2009/08/04 22:04:37 petere Exp $ +# config/docbook.m4 # PGAC_PROG_JADE # -------------- diff --git a/config/general.m4 b/config/general.m4 index 52f850ea25..eb83815931 100644 --- a/config/general.m4 +++ b/config/general.m4 @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/config/general.m4,v 1.11 2009/07/02 18:55:40 petere Exp $ +# config/general.m4 # This file defines new macros to process configure command line # arguments, to replace the brain-dead AC_ARG_WITH and AC_ARG_ENABLE. diff --git a/config/install-sh b/config/install-sh index bdcfd39c63..fdca6338c2 100755 --- a/config/install-sh +++ b/config/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -# $PostgreSQL: pgsql/config/install-sh,v 1.8 2009/08/26 22:24:42 petere Exp $ +# config/install-sh scriptversion=2009-08-26.20 diff --git a/config/missing b/config/missing index 5426c6d2ec..6df77e9473 100755 --- a/config/missing +++ b/config/missing @@ -1,6 +1,6 @@ #! /bin/sh -# $PostgreSQL: pgsql/config/missing,v 1.7 2010/02/22 21:16:50 momjian Exp $ +# config/missing # This is *not* the GNU `missing' script, although it is similar in # concept. You can call it from the makefiles to get consistent diff --git a/config/perl.m4 b/config/perl.m4 index 165034b0fd..5c31229a81 100644 --- a/config/perl.m4 +++ b/config/perl.m4 @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/config/perl.m4,v 1.9 2010/02/23 18:35:06 tgl Exp $ +# config/perl.m4 # PGAC_PATH_PERL diff --git a/config/programs.m4 b/config/programs.m4 index 594729cbb1..e2eb7e6dbd 100644 --- a/config/programs.m4 +++ b/config/programs.m4 @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/config/programs.m4,v 1.28 2010/02/22 21:16:50 momjian Exp $ +# config/programs.m4 # PGAC_PATH_BISON diff --git a/config/python.m4 b/config/python.m4 index 7b6a14ed21..ec357c2e48 100644 --- a/config/python.m4 +++ b/config/python.m4 @@ -1,7 +1,7 @@ # # Autoconf macros for configuring the build of Python extension modules # -# $PostgreSQL: pgsql/config/python.m4,v 1.18 2010/03/17 22:02:44 petere Exp $ +# config/python.m4 # # PGAC_PATH_PYTHON diff --git a/config/tcl.m4 b/config/tcl.m4 index ae0d3b78be..e8860573a6 100644 --- a/config/tcl.m4 +++ b/config/tcl.m4 @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/config/tcl.m4,v 1.8 2009/02/03 01:24:57 adunstan Exp $ +# config/tcl.m4 # Autoconf macros to check for Tcl related things diff --git a/configure.in b/configure.in index a4ba42e7dc..854afbfa09 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -dnl $PostgreSQL: pgsql/configure.in,v 1.634 2010/09/11 15:48:04 heikki Exp $ +dnl configure.in dnl dnl Developers, please strive to achieve this order: dnl diff --git a/contrib/Makefile b/contrib/Makefile index a1b7d913f5..c1d3317c2d 100644 --- a/contrib/Makefile +++ b/contrib/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/contrib/Makefile,v 1.93 2010/06/14 16:17:56 sriggs Exp $ +# contrib/Makefile subdir = contrib top_builddir = .. diff --git a/contrib/adminpack/Makefile b/contrib/adminpack/Makefile index e1262fb2e9..d4413ad133 100644 --- a/contrib/adminpack/Makefile +++ b/contrib/adminpack/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/contrib/adminpack/Makefile,v 1.6 2007/11/10 23:59:50 momjian Exp $ +# contrib/adminpack/Makefile MODULE_big = adminpack PG_CPPFLAGS = -I$(libpq_srcdir) diff --git a/contrib/adminpack/adminpack.c b/contrib/adminpack/adminpack.c index 5271ef6ea2..4f7eedaa26 100644 --- a/contrib/adminpack/adminpack.c +++ b/contrib/adminpack/adminpack.c @@ -8,7 +8,7 @@ * Author: Andreas Pflug * * IDENTIFICATION - * $PostgreSQL: pgsql/contrib/adminpack/adminpack.c,v 1.13 2010/01/02 16:57:32 momjian Exp $ + * contrib/adminpack/adminpack.c * *------------------------------------------------------------------------- */ diff --git a/contrib/adminpack/adminpack.sql.in b/contrib/adminpack/adminpack.sql.in index de29bacd51..6e389975d0 100644 --- a/contrib/adminpack/adminpack.sql.in +++ b/contrib/adminpack/adminpack.sql.in @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/adminpack/adminpack.sql.in,v 1.6 2007/11/13 04:24:27 momjian Exp $ */ +/* contrib/adminpack/adminpack.sql.in */ /* *********************************************** * Administrative functions for PostgreSQL diff --git a/contrib/adminpack/uninstall_adminpack.sql b/contrib/adminpack/uninstall_adminpack.sql index 893f081461..682cf67760 100644 --- a/contrib/adminpack/uninstall_adminpack.sql +++ b/contrib/adminpack/uninstall_adminpack.sql @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/adminpack/uninstall_adminpack.sql,v 1.4 2007/11/13 04:24:27 momjian Exp $ */ +/* contrib/adminpack/uninstall_adminpack.sql */ DROP FUNCTION pg_catalog.pg_file_write(text, text, bool) ; DROP FUNCTION pg_catalog.pg_file_rename(text, text, text) ; diff --git a/contrib/auto_explain/Makefile b/contrib/auto_explain/Makefile index e9eaae0ece..2d1443fe48 100644 --- a/contrib/auto_explain/Makefile +++ b/contrib/auto_explain/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/contrib/auto_explain/Makefile,v 1.1 2008/11/19 02:59:28 tgl Exp $ +# contrib/auto_explain/Makefile MODULE_big = auto_explain OBJS = auto_explain.o diff --git a/contrib/auto_explain/auto_explain.c b/contrib/auto_explain/auto_explain.c index ffc1a4a106..b165d68d79 100644 --- a/contrib/auto_explain/auto_explain.c +++ b/contrib/auto_explain/auto_explain.c @@ -6,7 +6,7 @@ * Copyright (c) 2008-2010, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/contrib/auto_explain/auto_explain.c,v 1.14 2010/02/26 02:00:31 momjian Exp $ + * contrib/auto_explain/auto_explain.c * *------------------------------------------------------------------------- */ diff --git a/contrib/btree_gin/Makefile b/contrib/btree_gin/Makefile index e6b6394c23..cba68af595 100644 --- a/contrib/btree_gin/Makefile +++ b/contrib/btree_gin/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/contrib/btree_gin/Makefile,v 1.1 2009/03/25 23:20:01 tgl Exp $ +# contrib/btree_gin/Makefile MODULE_big = btree_gin OBJS = btree_gin.o diff --git a/contrib/btree_gin/btree_gin.c b/contrib/btree_gin/btree_gin.c index c05f8ebbfc..f8fae18eaf 100644 --- a/contrib/btree_gin/btree_gin.c +++ b/contrib/btree_gin/btree_gin.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/btree_gin/btree_gin.c,v 1.4 2010/01/07 04:53:34 tgl Exp $ + * contrib/btree_gin/btree_gin.c */ #include "postgres.h" diff --git a/contrib/btree_gin/btree_gin.sql.in b/contrib/btree_gin/btree_gin.sql.in index bc7ec3bbcb..19cc0b3df4 100644 --- a/contrib/btree_gin/btree_gin.sql.in +++ b/contrib/btree_gin/btree_gin.sql.in @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/btree_gin/btree_gin.sql.in,v 1.1 2009/03/25 23:20:01 tgl Exp $ */ +/* contrib/btree_gin/btree_gin.sql.in */ -- Adjust this setting to control where the objects get created. SET search_path = public; diff --git a/contrib/btree_gin/uninstall_btree_gin.sql b/contrib/btree_gin/uninstall_btree_gin.sql index 0b79c6037b..30324dc709 100644 --- a/contrib/btree_gin/uninstall_btree_gin.sql +++ b/contrib/btree_gin/uninstall_btree_gin.sql @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/btree_gin/uninstall_btree_gin.sql,v 1.1 2009/03/25 23:20:01 tgl Exp $ */ +/* contrib/btree_gin/uninstall_btree_gin.sql */ -- Adjust this setting to control where the objects get dropped. SET search_path = public; diff --git a/contrib/btree_gist/Makefile b/contrib/btree_gist/Makefile index 3889d947c1..e152cd881d 100644 --- a/contrib/btree_gist/Makefile +++ b/contrib/btree_gist/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/contrib/btree_gist/Makefile,v 1.13 2010/08/03 19:53:19 rhaas Exp $ +# contrib/btree_gist/Makefile MODULE_big = btree_gist diff --git a/contrib/btree_gist/btree_bit.c b/contrib/btree_gist/btree_bit.c index f78134f443..9884d0fb96 100644 --- a/contrib/btree_gist/btree_bit.c +++ b/contrib/btree_gist/btree_bit.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/btree_gist/btree_bit.c,v 1.11 2009/08/04 18:49:50 tgl Exp $ + * contrib/btree_gist/btree_bit.c */ #include "btree_gist.h" #include "btree_utils_var.h" diff --git a/contrib/btree_gist/btree_bytea.c b/contrib/btree_gist/btree_bytea.c index 88b4a380e8..8430464612 100644 --- a/contrib/btree_gist/btree_bytea.c +++ b/contrib/btree_gist/btree_bytea.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/btree_gist/btree_bytea.c,v 1.10 2009/08/04 18:49:50 tgl Exp $ + * contrib/btree_gist/btree_bytea.c */ #include "btree_gist.h" #include "btree_utils_var.h" diff --git a/contrib/btree_gist/btree_cash.c b/contrib/btree_gist/btree_cash.c index a1efde6146..bfda21b058 100644 --- a/contrib/btree_gist/btree_cash.c +++ b/contrib/btree_gist/btree_cash.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/btree_gist/btree_cash.c,v 1.11 2010/02/26 02:00:31 momjian Exp $ + * contrib/btree_gist/btree_cash.c */ #include "btree_gist.h" #include "btree_utils_num.h" diff --git a/contrib/btree_gist/btree_date.c b/contrib/btree_gist/btree_date.c index d8dce91535..11904af257 100644 --- a/contrib/btree_gist/btree_date.c +++ b/contrib/btree_gist/btree_date.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/btree_gist/btree_date.c,v 1.9 2010/02/26 02:00:31 momjian Exp $ + * contrib/btree_gist/btree_date.c */ #include "btree_gist.h" #include "btree_utils_num.h" diff --git a/contrib/btree_gist/btree_float4.c b/contrib/btree_gist/btree_float4.c index 7ece9ea220..4cfeddfc68 100644 --- a/contrib/btree_gist/btree_float4.c +++ b/contrib/btree_gist/btree_float4.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/btree_gist/btree_float4.c,v 1.10 2010/02/26 02:00:31 momjian Exp $ + * contrib/btree_gist/btree_float4.c */ #include "btree_gist.h" #include "btree_utils_num.h" diff --git a/contrib/btree_gist/btree_float8.c b/contrib/btree_gist/btree_float8.c index ab4912883d..1386983272 100644 --- a/contrib/btree_gist/btree_float8.c +++ b/contrib/btree_gist/btree_float8.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/btree_gist/btree_float8.c,v 1.10 2010/02/26 02:00:31 momjian Exp $ + * contrib/btree_gist/btree_float8.c */ #include "btree_gist.h" #include "btree_utils_num.h" diff --git a/contrib/btree_gist/btree_gist.c b/contrib/btree_gist/btree_gist.c index f109de4a64..7e1c7e054c 100644 --- a/contrib/btree_gist/btree_gist.c +++ b/contrib/btree_gist/btree_gist.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/btree_gist/btree_gist.c,v 1.13 2009/06/11 14:48:50 momjian Exp $ + * contrib/btree_gist/btree_gist.c */ #include "btree_gist.h" diff --git a/contrib/btree_gist/btree_gist.h b/contrib/btree_gist/btree_gist.h index db5c5713b5..058a3f99e9 100644 --- a/contrib/btree_gist/btree_gist.h +++ b/contrib/btree_gist/btree_gist.h @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/btree_gist/btree_gist.h,v 1.10 2010/08/02 16:26:48 rhaas Exp $ + * contrib/btree_gist/btree_gist.h */ #ifndef __BTREE_GIST_H__ #define __BTREE_GIST_H__ diff --git a/contrib/btree_gist/btree_gist.sql.in b/contrib/btree_gist/btree_gist.sql.in index 0a285a71c1..339087018a 100644 --- a/contrib/btree_gist/btree_gist.sql.in +++ b/contrib/btree_gist/btree_gist.sql.in @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/btree_gist/btree_gist.sql.in,v 1.22 2010/08/02 16:26:48 rhaas Exp $ */ +/* contrib/btree_gist/btree_gist.sql.in */ -- Adjust this setting to control where the objects get created. SET search_path = public; diff --git a/contrib/btree_gist/btree_inet.c b/contrib/btree_gist/btree_inet.c index a8d18c578b..dcc934d156 100644 --- a/contrib/btree_gist/btree_inet.c +++ b/contrib/btree_gist/btree_inet.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/btree_gist/btree_inet.c,v 1.12 2010/02/26 02:00:31 momjian Exp $ + * contrib/btree_gist/btree_inet.c */ #include "btree_gist.h" #include "btree_utils_num.h" diff --git a/contrib/btree_gist/btree_int2.c b/contrib/btree_gist/btree_int2.c index 2be4c40aa8..2e98117452 100644 --- a/contrib/btree_gist/btree_int2.c +++ b/contrib/btree_gist/btree_int2.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/btree_gist/btree_int2.c,v 1.10 2010/02/26 02:00:31 momjian Exp $ + * contrib/btree_gist/btree_int2.c */ #include "btree_gist.h" #include "btree_utils_num.h" diff --git a/contrib/btree_gist/btree_int4.c b/contrib/btree_gist/btree_int4.c index aa0d4ac33f..678d653fd0 100644 --- a/contrib/btree_gist/btree_int4.c +++ b/contrib/btree_gist/btree_int4.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/btree_gist/btree_int4.c,v 1.10 2010/02/26 02:00:31 momjian Exp $ + * contrib/btree_gist/btree_int4.c */ #include "btree_gist.h" #include "btree_utils_num.h" diff --git a/contrib/btree_gist/btree_int8.c b/contrib/btree_gist/btree_int8.c index 4cf36a07fa..8afa5b0af2 100644 --- a/contrib/btree_gist/btree_int8.c +++ b/contrib/btree_gist/btree_int8.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/btree_gist/btree_int8.c,v 1.10 2010/02/26 02:00:31 momjian Exp $ + * contrib/btree_gist/btree_int8.c */ #include "btree_gist.h" #include "btree_utils_num.h" diff --git a/contrib/btree_gist/btree_interval.c b/contrib/btree_gist/btree_interval.c index 32b9ddbad7..0715346f23 100644 --- a/contrib/btree_gist/btree_interval.c +++ b/contrib/btree_gist/btree_interval.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/btree_gist/btree_interval.c,v 1.14 2010/02/26 02:00:31 momjian Exp $ + * contrib/btree_gist/btree_interval.c */ #include "btree_gist.h" #include "btree_utils_num.h" diff --git a/contrib/btree_gist/btree_macaddr.c b/contrib/btree_gist/btree_macaddr.c index 60092b4e9e..fb440c3f19 100644 --- a/contrib/btree_gist/btree_macaddr.c +++ b/contrib/btree_gist/btree_macaddr.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/btree_gist/btree_macaddr.c,v 1.10 2010/02/26 02:00:31 momjian Exp $ + * contrib/btree_gist/btree_macaddr.c */ #include "btree_gist.h" #include "btree_utils_num.h" diff --git a/contrib/btree_gist/btree_numeric.c b/contrib/btree_gist/btree_numeric.c index 6331109b10..fa82497e2b 100644 --- a/contrib/btree_gist/btree_numeric.c +++ b/contrib/btree_gist/btree_numeric.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/btree_gist/btree_numeric.c,v 1.14 2010/07/30 04:30:23 rhaas Exp $ + * contrib/btree_gist/btree_numeric.c */ #include "btree_gist.h" diff --git a/contrib/btree_gist/btree_oid.c b/contrib/btree_gist/btree_oid.c index 96e4be54d4..4927448258 100644 --- a/contrib/btree_gist/btree_oid.c +++ b/contrib/btree_gist/btree_oid.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/btree_gist/btree_oid.c,v 1.10 2010/02/26 02:00:31 momjian Exp $ + * contrib/btree_gist/btree_oid.c */ #include "btree_gist.h" #include "btree_utils_num.h" diff --git a/contrib/btree_gist/btree_text.c b/contrib/btree_gist/btree_text.c index 8b01eb7aac..40d0b9ad79 100644 --- a/contrib/btree_gist/btree_text.c +++ b/contrib/btree_gist/btree_text.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/btree_gist/btree_text.c,v 1.12 2009/06/11 14:48:50 momjian Exp $ + * contrib/btree_gist/btree_text.c */ #include "btree_gist.h" #include "btree_utils_var.h" diff --git a/contrib/btree_gist/btree_time.c b/contrib/btree_gist/btree_time.c index 8566a8efb7..01163e906a 100644 --- a/contrib/btree_gist/btree_time.c +++ b/contrib/btree_gist/btree_time.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/btree_gist/btree_time.c,v 1.18 2010/02/26 02:00:31 momjian Exp $ + * contrib/btree_gist/btree_time.c */ #include "btree_gist.h" #include "btree_utils_num.h" diff --git a/contrib/btree_gist/btree_ts.c b/contrib/btree_gist/btree_ts.c index 543f2129b0..2b13d14ad1 100644 --- a/contrib/btree_gist/btree_ts.c +++ b/contrib/btree_gist/btree_ts.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/btree_gist/btree_ts.c,v 1.19 2010/02/26 02:00:32 momjian Exp $ + * contrib/btree_gist/btree_ts.c */ #include "btree_gist.h" #include "btree_utils_num.h" diff --git a/contrib/btree_gist/btree_utils_num.c b/contrib/btree_gist/btree_utils_num.c index e4b4824769..0df22f2133 100644 --- a/contrib/btree_gist/btree_utils_num.c +++ b/contrib/btree_gist/btree_utils_num.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/btree_gist/btree_utils_num.c,v 1.13 2010/08/02 16:26:48 rhaas Exp $ + * contrib/btree_gist/btree_utils_num.c */ #include "btree_gist.h" #include "btree_utils_num.h" diff --git a/contrib/btree_gist/btree_utils_num.h b/contrib/btree_gist/btree_utils_num.h index dcd17bc430..091784bd5a 100644 --- a/contrib/btree_gist/btree_utils_num.h +++ b/contrib/btree_gist/btree_utils_num.h @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/btree_gist/btree_utils_num.h,v 1.14 2009/06/11 14:48:50 momjian Exp $ + * contrib/btree_gist/btree_utils_num.h */ #ifndef __BTREE_UTILS_NUM_H__ #define __BTREE_UTILS_NUM_H__ diff --git a/contrib/btree_gist/btree_utils_var.c b/contrib/btree_gist/btree_utils_var.c index 447ba59efb..5fc93cfbff 100644 --- a/contrib/btree_gist/btree_utils_var.c +++ b/contrib/btree_gist/btree_utils_var.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/btree_gist/btree_utils_var.c,v 1.24 2010/08/02 16:26:48 rhaas Exp $ + * contrib/btree_gist/btree_utils_var.c */ #include "btree_gist.h" diff --git a/contrib/btree_gist/btree_utils_var.h b/contrib/btree_gist/btree_utils_var.h index 49f5d59ee2..2c1012f323 100644 --- a/contrib/btree_gist/btree_utils_var.h +++ b/contrib/btree_gist/btree_utils_var.h @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/btree_gist/btree_utils_var.h,v 1.9 2009/06/11 14:48:50 momjian Exp $ + * contrib/btree_gist/btree_utils_var.h */ #ifndef __BTREE_UTILS_VAR_H__ #define __BTREE_UTILS_VAR_H__ diff --git a/contrib/btree_gist/uninstall_btree_gist.sql b/contrib/btree_gist/uninstall_btree_gist.sql index 9e71819e1a..4163730e85 100644 --- a/contrib/btree_gist/uninstall_btree_gist.sql +++ b/contrib/btree_gist/uninstall_btree_gist.sql @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/btree_gist/uninstall_btree_gist.sql,v 1.5 2008/04/14 17:05:32 tgl Exp $ */ +/* contrib/btree_gist/uninstall_btree_gist.sql */ -- Adjust this setting to control where the objects get dropped. SET search_path = public; diff --git a/contrib/chkpass/Makefile b/contrib/chkpass/Makefile index f106b6dcfe..3677dfcb56 100644 --- a/contrib/chkpass/Makefile +++ b/contrib/chkpass/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/contrib/chkpass/Makefile,v 1.10 2007/11/10 23:59:50 momjian Exp $ +# contrib/chkpass/Makefile MODULE_big = chkpass OBJS = chkpass.o diff --git a/contrib/chkpass/chkpass.c b/contrib/chkpass/chkpass.c index 56a998ec83..0c9fec0e67 100644 --- a/contrib/chkpass/chkpass.c +++ b/contrib/chkpass/chkpass.c @@ -4,7 +4,7 @@ * darcy@druid.net * http://www.druid.net/darcy/ * - * $PostgreSQL: pgsql/contrib/chkpass/chkpass.c,v 1.21 2009/06/11 14:48:50 momjian Exp $ + * contrib/chkpass/chkpass.c * best viewed with tabs set to 4 */ diff --git a/contrib/chkpass/chkpass.sql.in b/contrib/chkpass/chkpass.sql.in index 31722f33c4..3cec0224b0 100644 --- a/contrib/chkpass/chkpass.sql.in +++ b/contrib/chkpass/chkpass.sql.in @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/chkpass/chkpass.sql.in,v 1.10 2010/07/28 20:34:34 petere Exp $ */ +/* contrib/chkpass/chkpass.sql.in */ -- Adjust this setting to control where the objects get created. SET search_path = public; diff --git a/contrib/chkpass/uninstall_chkpass.sql b/contrib/chkpass/uninstall_chkpass.sql index 386fc95c5f..93ab6eb4eb 100644 --- a/contrib/chkpass/uninstall_chkpass.sql +++ b/contrib/chkpass/uninstall_chkpass.sql @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/chkpass/uninstall_chkpass.sql,v 1.5 2007/11/13 04:24:27 momjian Exp $ */ +/* contrib/chkpass/uninstall_chkpass.sql */ -- Adjust this setting to control where the objects get dropped. SET search_path = public; diff --git a/contrib/citext/Makefile b/contrib/citext/Makefile index d38e2762dd..c868eca884 100644 --- a/contrib/citext/Makefile +++ b/contrib/citext/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/contrib/citext/Makefile,v 1.1 2008/07/29 18:31:20 tgl Exp $ +# contrib/citext/Makefile MODULES = citext DATA_built = citext.sql diff --git a/contrib/citext/citext.c b/contrib/citext/citext.c index 371e70f74d..9991825853 100644 --- a/contrib/citext/citext.c +++ b/contrib/citext/citext.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/citext/citext.c,v 1.2 2009/06/11 14:48:50 momjian Exp $ + * contrib/citext/citext.c */ #include "postgres.h" diff --git a/contrib/citext/citext.sql.in b/contrib/citext/citext.sql.in index bd781e6168..0aef0ad947 100644 --- a/contrib/citext/citext.sql.in +++ b/contrib/citext/citext.sql.in @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/citext/citext.sql.in,v 1.3 2008/09/05 18:25:16 tgl Exp $ */ +/* contrib/citext/citext.sql.in */ -- Adjust this setting to control where the objects get created. SET search_path = public; diff --git a/contrib/citext/uninstall_citext.sql b/contrib/citext/uninstall_citext.sql index 2d1ecbed09..468987ad82 100644 --- a/contrib/citext/uninstall_citext.sql +++ b/contrib/citext/uninstall_citext.sql @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/citext/uninstall_citext.sql,v 1.3 2008/09/05 18:25:16 tgl Exp $ */ +/* contrib/citext/uninstall_citext.sql */ -- Adjust this setting to control where the objects get dropped. SET search_path = public; diff --git a/contrib/contrib-global.mk b/contrib/contrib-global.mk index 13c76b82b6..6ac8e9b13d 100644 --- a/contrib/contrib-global.mk +++ b/contrib/contrib-global.mk @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/contrib/contrib-global.mk,v 1.10 2005/09/27 17:43:31 tgl Exp $ +# contrib/contrib-global.mk NO_PGXS = 1 include $(top_srcdir)/src/makefiles/pgxs.mk diff --git a/contrib/cube/Makefile b/contrib/cube/Makefile index 2f3da437e5..4fee79f84e 100644 --- a/contrib/cube/Makefile +++ b/contrib/cube/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/contrib/cube/Makefile,v 1.23 2009/08/28 20:26:18 petere Exp $ +# contrib/cube/Makefile MODULE_big = cube OBJS= cube.o cubeparse.o diff --git a/contrib/cube/cube.c b/contrib/cube/cube.c index 62cd3a2d02..832c099f04 100644 --- a/contrib/cube/cube.c +++ b/contrib/cube/cube.c @@ -1,5 +1,5 @@ /****************************************************************************** - $PostgreSQL: pgsql/contrib/cube/cube.c,v 1.37 2009/06/11 14:48:50 momjian Exp $ + contrib/cube/cube.c This file contains routines that can be bound to a Postgres backend and called by the backend in the process of processing queries. The calling diff --git a/contrib/cube/cube.sql.in b/contrib/cube/cube.sql.in index 41f493ed41..3cd199530a 100644 --- a/contrib/cube/cube.sql.in +++ b/contrib/cube/cube.sql.in @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/cube/cube.sql.in,v 1.25 2009/06/11 18:30:03 tgl Exp $ */ +/* contrib/cube/cube.sql.in */ -- Adjust this setting to control where the objects get created. SET search_path = public; diff --git a/contrib/cube/cubedata.h b/contrib/cube/cubedata.h index 1100602cfc..fd0c26a381 100644 --- a/contrib/cube/cubedata.h +++ b/contrib/cube/cubedata.h @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/cube/cubedata.h,v 1.10 2009/06/11 14:48:50 momjian Exp $ */ +/* contrib/cube/cubedata.h */ #define CUBE_MAX_DIM (100) diff --git a/contrib/cube/cubeparse.y b/contrib/cube/cubeparse.y index 13dc4f55b0..d02941dd8c 100644 --- a/contrib/cube/cubeparse.y +++ b/contrib/cube/cubeparse.y @@ -2,7 +2,7 @@ /* NdBox = [(lowerleft),(upperright)] */ /* [(xLL(1)...xLL(N)),(xUR(1)...xUR(n))] */ -/* $PostgreSQL: pgsql/contrib/cube/cubeparse.y,v 1.19 2008/11/26 08:45:11 petere Exp $ */ +/* contrib/cube/cubeparse.y */ #define YYPARSE_PARAM result /* need this to pass a pointer (void *) to yyparse */ #define YYSTYPE char * diff --git a/contrib/cube/cubescan.l b/contrib/cube/cubescan.l index f373d353f2..b0e477bf1e 100644 --- a/contrib/cube/cubescan.l +++ b/contrib/cube/cubescan.l @@ -1,7 +1,7 @@ %{ /* ** A scanner for EMP-style numeric ranges - * $PostgreSQL: pgsql/contrib/cube/cubescan.l,v 1.12 2008/08/25 23:12:45 tgl Exp $ + * contrib/cube/cubescan.l */ #include "postgres.h" diff --git a/contrib/cube/uninstall_cube.sql b/contrib/cube/uninstall_cube.sql index abdb5a2db3..aa7119e0d0 100644 --- a/contrib/cube/uninstall_cube.sql +++ b/contrib/cube/uninstall_cube.sql @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/cube/uninstall_cube.sql,v 1.8 2008/04/14 17:05:32 tgl Exp $ */ +/* contrib/cube/uninstall_cube.sql */ -- Adjust this setting to control where the objects get dropped. SET search_path = public; diff --git a/contrib/dblink/Makefile b/contrib/dblink/Makefile index 519c73b68f..148961e6c9 100644 --- a/contrib/dblink/Makefile +++ b/contrib/dblink/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/contrib/dblink/Makefile,v 1.15 2007/11/10 23:59:50 momjian Exp $ +# contrib/dblink/Makefile MODULE_big = dblink PG_CPPFLAGS = -I$(libpq_srcdir) diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c index 4bfa7670fd..ce86829210 100644 --- a/contrib/dblink/dblink.c +++ b/contrib/dblink/dblink.c @@ -8,7 +8,7 @@ * Darko Prenosil * Shridhar Daithankar * - * $PostgreSQL: pgsql/contrib/dblink/dblink.c,v 1.99 2010/07/06 19:18:54 momjian Exp $ + * contrib/dblink/dblink.c * Copyright (c) 2001-2010, PostgreSQL Global Development Group * ALL RIGHTS RESERVED; * diff --git a/contrib/dblink/dblink.h b/contrib/dblink/dblink.h index 1918fdee44..3d097ac1de 100644 --- a/contrib/dblink/dblink.h +++ b/contrib/dblink/dblink.h @@ -8,7 +8,7 @@ * Darko Prenosil * Shridhar Daithankar * - * $PostgreSQL: pgsql/contrib/dblink/dblink.h,v 1.24 2010/01/02 16:57:32 momjian Exp $ + * contrib/dblink/dblink.h * Copyright (c) 2001-2010, PostgreSQL Global Development Group * ALL RIGHTS RESERVED; * diff --git a/contrib/dblink/dblink.sql.in b/contrib/dblink/dblink.sql.in index ff656736a4..acad2c94d0 100644 --- a/contrib/dblink/dblink.sql.in +++ b/contrib/dblink/dblink.sql.in @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/dblink/dblink.sql.in,v 1.19 2009/08/05 16:11:07 joe Exp $ */ +/* contrib/dblink/dblink.sql.in */ -- Adjust this setting to control where the objects get created. SET search_path = public; diff --git a/contrib/dblink/uninstall_dblink.sql b/contrib/dblink/uninstall_dblink.sql index 98478115f1..365728a6d7 100644 --- a/contrib/dblink/uninstall_dblink.sql +++ b/contrib/dblink/uninstall_dblink.sql @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/dblink/uninstall_dblink.sql,v 1.9 2010/06/07 15:14:36 teodor Exp $ */ +/* contrib/dblink/uninstall_dblink.sql */ -- Adjust this setting to control where the objects get dropped. SET search_path = public; diff --git a/contrib/dict_int/Makefile b/contrib/dict_int/Makefile index adf7b685b5..17d9eaa5f7 100644 --- a/contrib/dict_int/Makefile +++ b/contrib/dict_int/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/contrib/dict_int/Makefile,v 1.2 2007/12/02 21:15:38 tgl Exp $ +# contrib/dict_int/Makefile MODULE_big = dict_int OBJS = dict_int.o diff --git a/contrib/dict_int/dict_int.c b/contrib/dict_int/dict_int.c index 8e1918613f..174eec6e1c 100644 --- a/contrib/dict_int/dict_int.c +++ b/contrib/dict_int/dict_int.c @@ -6,7 +6,7 @@ * Copyright (c) 2007-2010, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/contrib/dict_int/dict_int.c,v 1.6 2010/01/02 16:57:32 momjian Exp $ + * contrib/dict_int/dict_int.c * *------------------------------------------------------------------------- */ diff --git a/contrib/dict_int/dict_int.sql.in b/contrib/dict_int/dict_int.sql.in index 5245349ae1..9d7ef7d9c1 100644 --- a/contrib/dict_int/dict_int.sql.in +++ b/contrib/dict_int/dict_int.sql.in @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/dict_int/dict_int.sql.in,v 1.3 2007/11/13 04:24:27 momjian Exp $ */ +/* contrib/dict_int/dict_int.sql.in */ -- Adjust this setting to control where the objects get created. SET search_path = public; diff --git a/contrib/dict_int/uninstall_dict_int.sql b/contrib/dict_int/uninstall_dict_int.sql index d94343fd36..0467fa22ba 100644 --- a/contrib/dict_int/uninstall_dict_int.sql +++ b/contrib/dict_int/uninstall_dict_int.sql @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/dict_int/uninstall_dict_int.sql,v 1.3 2007/11/13 04:24:27 momjian Exp $ */ +/* contrib/dict_int/uninstall_dict_int.sql */ -- Adjust this setting to control where the objects get dropped. SET search_path = public; diff --git a/contrib/dict_xsyn/Makefile b/contrib/dict_xsyn/Makefile index 2a879b7eff..8b737f09fc 100644 --- a/contrib/dict_xsyn/Makefile +++ b/contrib/dict_xsyn/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/contrib/dict_xsyn/Makefile,v 1.3 2007/12/02 21:15:38 tgl Exp $ +# contrib/dict_xsyn/Makefile MODULE_big = dict_xsyn OBJS = dict_xsyn.o diff --git a/contrib/dict_xsyn/dict_xsyn.c b/contrib/dict_xsyn/dict_xsyn.c index dc16d9583e..4fe0ac6db2 100644 --- a/contrib/dict_xsyn/dict_xsyn.c +++ b/contrib/dict_xsyn/dict_xsyn.c @@ -6,7 +6,7 @@ * Copyright (c) 2007-2010, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/contrib/dict_xsyn/dict_xsyn.c,v 1.9 2010/02/26 02:00:32 momjian Exp $ + * contrib/dict_xsyn/dict_xsyn.c * *------------------------------------------------------------------------- */ diff --git a/contrib/dict_xsyn/dict_xsyn.sql.in b/contrib/dict_xsyn/dict_xsyn.sql.in index ac014a757d..7d48c9209f 100644 --- a/contrib/dict_xsyn/dict_xsyn.sql.in +++ b/contrib/dict_xsyn/dict_xsyn.sql.in @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/dict_xsyn/dict_xsyn.sql.in,v 1.3 2007/11/13 04:24:27 momjian Exp $ */ +/* contrib/dict_xsyn/dict_xsyn.sql.in */ -- Adjust this setting to control where the objects get created. SET search_path = public; diff --git a/contrib/dict_xsyn/uninstall_dict_xsyn.sql b/contrib/dict_xsyn/uninstall_dict_xsyn.sql index 844d2e9997..68f9579c05 100644 --- a/contrib/dict_xsyn/uninstall_dict_xsyn.sql +++ b/contrib/dict_xsyn/uninstall_dict_xsyn.sql @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/dict_xsyn/uninstall_dict_xsyn.sql,v 1.3 2007/11/13 04:24:27 momjian Exp $ */ +/* contrib/dict_xsyn/uninstall_dict_xsyn.sql */ -- Adjust this setting to control where the objects get dropped. SET search_path = public; diff --git a/contrib/earthdistance/Makefile b/contrib/earthdistance/Makefile index ab72ac7fc9..8328e5f828 100644 --- a/contrib/earthdistance/Makefile +++ b/contrib/earthdistance/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/contrib/earthdistance/Makefile,v 1.20 2010/07/05 23:15:55 tgl Exp $ +# contrib/earthdistance/Makefile MODULES = earthdistance DATA_built = earthdistance.sql diff --git a/contrib/earthdistance/earthdistance.c b/contrib/earthdistance/earthdistance.c index 4dce1f828e..2f344a7011 100644 --- a/contrib/earthdistance/earthdistance.c +++ b/contrib/earthdistance/earthdistance.c @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/earthdistance/earthdistance.c,v 1.16 2009/06/11 14:48:51 momjian Exp $ */ +/* contrib/earthdistance/earthdistance.c */ #include "postgres.h" diff --git a/contrib/earthdistance/earthdistance.sql.in b/contrib/earthdistance/earthdistance.sql.in index 2b8041b131..a4799914bd 100644 --- a/contrib/earthdistance/earthdistance.sql.in +++ b/contrib/earthdistance/earthdistance.sql.in @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/earthdistance/earthdistance.sql.in,v 1.11 2007/11/13 04:24:27 momjian Exp $ */ +/* contrib/earthdistance/earthdistance.sql.in */ -- Adjust this setting to control where the objects get created. SET search_path = public; diff --git a/contrib/earthdistance/uninstall_earthdistance.sql b/contrib/earthdistance/uninstall_earthdistance.sql index dfad24aa4f..dfd7d524ab 100644 --- a/contrib/earthdistance/uninstall_earthdistance.sql +++ b/contrib/earthdistance/uninstall_earthdistance.sql @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/earthdistance/uninstall_earthdistance.sql,v 1.3 2007/11/13 04:24:27 momjian Exp $ */ +/* contrib/earthdistance/uninstall_earthdistance.sql */ -- Adjust this setting to control where the objects get dropped. SET search_path = public; diff --git a/contrib/fuzzystrmatch/Makefile b/contrib/fuzzystrmatch/Makefile index 723830950d..9cdf3f87e3 100644 --- a/contrib/fuzzystrmatch/Makefile +++ b/contrib/fuzzystrmatch/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/contrib/fuzzystrmatch/Makefile,v 1.10 2007/11/10 23:59:50 momjian Exp $ +# contrib/fuzzystrmatch/Makefile MODULE_big = fuzzystrmatch OBJS = fuzzystrmatch.o dmetaphone.o diff --git a/contrib/fuzzystrmatch/dmetaphone.c b/contrib/fuzzystrmatch/dmetaphone.c index f23a3a2aa6..6721e58f22 100644 --- a/contrib/fuzzystrmatch/dmetaphone.c +++ b/contrib/fuzzystrmatch/dmetaphone.c @@ -1,7 +1,7 @@ /* * This is a port of the Double Metaphone algorithm for use in PostgreSQL. * - * $PostgreSQL: pgsql/contrib/fuzzystrmatch/dmetaphone.c,v 1.15 2010/07/06 19:18:55 momjian Exp $ + * contrib/fuzzystrmatch/dmetaphone.c * * Double Metaphone computes 2 "sounds like" strings - a primary and an * alternate. In most cases they are the same, but for foreign names diff --git a/contrib/fuzzystrmatch/fuzzystrmatch.c b/contrib/fuzzystrmatch/fuzzystrmatch.c index c752b2dfda..63921d9271 100644 --- a/contrib/fuzzystrmatch/fuzzystrmatch.c +++ b/contrib/fuzzystrmatch/fuzzystrmatch.c @@ -5,7 +5,7 @@ * * Joe Conway * - * $PostgreSQL: pgsql/contrib/fuzzystrmatch/fuzzystrmatch.c,v 1.34 2010/08/02 23:20:23 rhaas Exp $ + * contrib/fuzzystrmatch/fuzzystrmatch.c * Copyright (c) 2001-2010, PostgreSQL Global Development Group * ALL RIGHTS RESERVED; * diff --git a/contrib/fuzzystrmatch/fuzzystrmatch.sql.in b/contrib/fuzzystrmatch/fuzzystrmatch.sql.in index cab78997fa..05a347d6b8 100644 --- a/contrib/fuzzystrmatch/fuzzystrmatch.sql.in +++ b/contrib/fuzzystrmatch/fuzzystrmatch.sql.in @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/fuzzystrmatch/fuzzystrmatch.sql.in,v 1.10 2008/04/03 21:13:07 tgl Exp $ */ +/* contrib/fuzzystrmatch/fuzzystrmatch.sql.in */ -- Adjust this setting to control where the objects get created. SET search_path = public; diff --git a/contrib/fuzzystrmatch/uninstall_fuzzystrmatch.sql b/contrib/fuzzystrmatch/uninstall_fuzzystrmatch.sql index bcf05da132..99d2548569 100644 --- a/contrib/fuzzystrmatch/uninstall_fuzzystrmatch.sql +++ b/contrib/fuzzystrmatch/uninstall_fuzzystrmatch.sql @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/fuzzystrmatch/uninstall_fuzzystrmatch.sql,v 1.4 2008/04/03 21:13:07 tgl Exp $ */ +/* contrib/fuzzystrmatch/uninstall_fuzzystrmatch.sql */ -- Adjust this setting to control where the objects get dropped. SET search_path = public; diff --git a/contrib/hstore/Makefile b/contrib/hstore/Makefile index bb69d70805..e466b6f706 100644 --- a/contrib/hstore/Makefile +++ b/contrib/hstore/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/contrib/hstore/Makefile,v 1.7 2009/09/30 19:50:22 tgl Exp $ +# contrib/hstore/Makefile subdir = contrib/hstore top_builddir = ../.. diff --git a/contrib/hstore/crc32.c b/contrib/hstore/crc32.c index dc5765d056..d541d0cc95 100644 --- a/contrib/hstore/crc32.c +++ b/contrib/hstore/crc32.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/hstore/crc32.c,v 1.4 2009/06/11 14:48:51 momjian Exp $ + * contrib/hstore/crc32.c * * Both POSIX and CRC32 checksums */ diff --git a/contrib/hstore/crc32.h b/contrib/hstore/crc32.h index e008b1a664..f5bfd82517 100644 --- a/contrib/hstore/crc32.h +++ b/contrib/hstore/crc32.h @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/hstore/crc32.h,v 1.3 2009/06/11 14:48:51 momjian Exp $ + * contrib/hstore/crc32.h */ #ifndef _CRC32_H #define _CRC32_H diff --git a/contrib/hstore/hstore.h b/contrib/hstore/hstore.h index 796dce575e..8906397ad2 100644 --- a/contrib/hstore/hstore.h +++ b/contrib/hstore/hstore.h @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/hstore/hstore.h,v 1.10 2010/02/26 02:00:32 momjian Exp $ + * contrib/hstore/hstore.h */ #ifndef __HSTORE_H__ #define __HSTORE_H__ diff --git a/contrib/hstore/hstore.sql.in b/contrib/hstore/hstore.sql.in index c7a5e8e556..5b39c189e1 100644 --- a/contrib/hstore/hstore.sql.in +++ b/contrib/hstore/hstore.sql.in @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/hstore/hstore.sql.in,v 1.15 2010/07/02 20:36:48 rhaas Exp $ */ +/* contrib/hstore/hstore.sql.in */ -- Adjust this setting to control where the objects get created. SET search_path = public; diff --git a/contrib/hstore/hstore_compat.c b/contrib/hstore/hstore_compat.c index ca2777cd8d..5778f74a80 100644 --- a/contrib/hstore/hstore_compat.c +++ b/contrib/hstore/hstore_compat.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/hstore/hstore_compat.c,v 1.3 2010/09/16 02:54:01 tgl Exp $ + * contrib/hstore/hstore_compat.c * * Notes on old/new hstore format disambiguation. * diff --git a/contrib/hstore/hstore_gin.c b/contrib/hstore/hstore_gin.c index f5056f53ec..da9b79d8de 100644 --- a/contrib/hstore/hstore_gin.c +++ b/contrib/hstore/hstore_gin.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/hstore/hstore_gin.c,v 1.8 2010/02/26 02:00:32 momjian Exp $ + * contrib/hstore/hstore_gin.c */ #include "postgres.h" diff --git a/contrib/hstore/hstore_gist.c b/contrib/hstore/hstore_gist.c index 6fe1860f3b..88d89ece23 100644 --- a/contrib/hstore/hstore_gist.c +++ b/contrib/hstore/hstore_gist.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/hstore/hstore_gist.c,v 1.13 2010/09/16 02:54:01 tgl Exp $ + * contrib/hstore/hstore_gist.c */ #include "postgres.h" diff --git a/contrib/hstore/hstore_io.c b/contrib/hstore/hstore_io.c index fa6da693e9..0058f5c1b3 100644 --- a/contrib/hstore/hstore_io.c +++ b/contrib/hstore/hstore_io.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/hstore/hstore_io.c,v 1.13 2010/02/26 02:00:32 momjian Exp $ + * contrib/hstore/hstore_io.c */ #include "postgres.h" diff --git a/contrib/hstore/hstore_op.c b/contrib/hstore/hstore_op.c index ebee60a1db..8d73a463ab 100644 --- a/contrib/hstore/hstore_op.c +++ b/contrib/hstore/hstore_op.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/hstore/hstore_op.c,v 1.16 2010/02/26 02:00:32 momjian Exp $ + * contrib/hstore/hstore_op.c */ #include "postgres.h" diff --git a/contrib/hstore/uninstall_hstore.sql b/contrib/hstore/uninstall_hstore.sql index ca2b05aa83..a03e43164f 100644 --- a/contrib/hstore/uninstall_hstore.sql +++ b/contrib/hstore/uninstall_hstore.sql @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/hstore/uninstall_hstore.sql,v 1.11 2010/07/02 20:36:48 rhaas Exp $ */ +/* contrib/hstore/uninstall_hstore.sql */ -- Adjust this setting to control where the objects get dropped. SET search_path = public; diff --git a/contrib/intagg/Makefile b/contrib/intagg/Makefile index 73ce7e4173..9bb1866e78 100644 --- a/contrib/intagg/Makefile +++ b/contrib/intagg/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/contrib/intagg/Makefile,v 1.11 2010/02/05 03:06:30 momjian Exp $ +# contrib/intagg/Makefile DATA = int_aggregate.sql uninstall_int_aggregate.sql diff --git a/contrib/intagg/int_aggregate.sql b/contrib/intagg/int_aggregate.sql index 7ed7c5ddd2..289e41b671 100644 --- a/contrib/intagg/int_aggregate.sql +++ b/contrib/intagg/int_aggregate.sql @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/intagg/int_aggregate.sql,v 1.1 2008/11/14 19:58:45 tgl Exp $ */ +/* contrib/intagg/int_aggregate.sql */ -- Adjust this setting to control where the objects get created. SET search_path = public; diff --git a/contrib/intagg/uninstall_int_aggregate.sql b/contrib/intagg/uninstall_int_aggregate.sql index fe0f4c7df4..2e55345325 100644 --- a/contrib/intagg/uninstall_int_aggregate.sql +++ b/contrib/intagg/uninstall_int_aggregate.sql @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/intagg/uninstall_int_aggregate.sql,v 1.4 2008/11/14 19:58:45 tgl Exp $ */ +/* contrib/intagg/uninstall_int_aggregate.sql */ -- Adjust this setting to control where the objects get dropped. SET search_path = public; diff --git a/contrib/intarray/Makefile b/contrib/intarray/Makefile index 09d7cb0bb5..18340f9d71 100644 --- a/contrib/intarray/Makefile +++ b/contrib/intarray/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/contrib/intarray/Makefile,v 1.16 2007/11/10 23:59:51 momjian Exp $ +# contrib/intarray/Makefile MODULE_big = _int OBJS = _int_bool.o _int_gist.o _int_op.o _int_tool.o _intbig_gist.o _int_gin.o diff --git a/contrib/intarray/_int.h b/contrib/intarray/_int.h index 35dbb54796..dd50b37d2e 100644 --- a/contrib/intarray/_int.h +++ b/contrib/intarray/_int.h @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/intarray/_int.h,v 1.17 2009/06/11 14:48:51 momjian Exp $ + * contrib/intarray/_int.h */ #ifndef ___INT_H__ #define ___INT_H__ diff --git a/contrib/intarray/_int.sql.in b/contrib/intarray/_int.sql.in index 960d81a638..2a6ed911ad 100644 --- a/contrib/intarray/_int.sql.in +++ b/contrib/intarray/_int.sql.in @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/intarray/_int.sql.in,v 1.32 2009/06/11 18:30:03 tgl Exp $ */ +/* contrib/intarray/_int.sql.in */ -- Adjust this setting to control where the objects get created. SET search_path = public; diff --git a/contrib/intarray/_int_bool.c b/contrib/intarray/_int_bool.c index 438db2ca95..7557c6acb7 100644 --- a/contrib/intarray/_int_bool.c +++ b/contrib/intarray/_int_bool.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/intarray/_int_bool.c,v 1.16 2009/06/11 14:48:51 momjian Exp $ + * contrib/intarray/_int_bool.c */ #include "postgres.h" diff --git a/contrib/intarray/_int_gin.c b/contrib/intarray/_int_gin.c index 375ff3ae25..b5ad69eba3 100644 --- a/contrib/intarray/_int_gin.c +++ b/contrib/intarray/_int_gin.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/intarray/_int_gin.c,v 1.11 2010/03/25 15:50:10 tgl Exp $ + * contrib/intarray/_int_gin.c */ #include "postgres.h" diff --git a/contrib/intarray/_int_gist.c b/contrib/intarray/_int_gist.c index 29e08eda66..65c9bf2e74 100644 --- a/contrib/intarray/_int_gist.c +++ b/contrib/intarray/_int_gist.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/intarray/_int_gist.c,v 1.23 2009/06/11 14:48:51 momjian Exp $ + * contrib/intarray/_int_gist.c */ #include "postgres.h" diff --git a/contrib/intarray/_int_op.c b/contrib/intarray/_int_op.c index 54858322a2..1d99c6905e 100644 --- a/contrib/intarray/_int_op.c +++ b/contrib/intarray/_int_op.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/intarray/_int_op.c,v 1.9 2009/06/11 14:48:51 momjian Exp $ + * contrib/intarray/_int_op.c */ #include "postgres.h" diff --git a/contrib/intarray/_int_tool.c b/contrib/intarray/_int_tool.c index 8c0ec29c31..8093103ba4 100644 --- a/contrib/intarray/_int_tool.c +++ b/contrib/intarray/_int_tool.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/intarray/_int_tool.c,v 1.12 2009/06/11 14:48:51 momjian Exp $ + * contrib/intarray/_int_tool.c */ #include "postgres.h" diff --git a/contrib/intarray/_intbig_gist.c b/contrib/intarray/_intbig_gist.c index f9c5986db2..d9557a6b11 100644 --- a/contrib/intarray/_intbig_gist.c +++ b/contrib/intarray/_intbig_gist.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/intarray/_intbig_gist.c,v 1.20 2009/06/11 14:48:51 momjian Exp $ + * contrib/intarray/_intbig_gist.c */ #include "postgres.h" diff --git a/contrib/intarray/bench/create_test.pl b/contrib/intarray/bench/create_test.pl index 01671bf5a2..3a5e96301b 100755 --- a/contrib/intarray/bench/create_test.pl +++ b/contrib/intarray/bench/create_test.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl -# $PostgreSQL: pgsql/contrib/intarray/bench/create_test.pl,v 1.4 2006/03/11 04:38:29 momjian Exp $ +# contrib/intarray/bench/create_test.pl use strict; print < 039304002(X) <=> 039304002 <=> (978)039304002 <=> 978039304002(9) <=> 978-0-393-04002-9 * diff --git a/contrib/isn/ISMN.h b/contrib/isn/ISMN.h index 1d7b2af8fd..281f2cdefc 100644 --- a/contrib/isn/ISMN.h +++ b/contrib/isn/ISMN.h @@ -6,7 +6,7 @@ * http://www.ismn-international.org * * IDENTIFICATION - * $PostgreSQL: pgsql/contrib/isn/ISMN.h,v 1.2 2006/10/04 00:29:45 momjian Exp $ + * contrib/isn/ISMN.h * * M-3452-4680-5 <=> (0)-3452-4680-5 <=> 0345246805 <=> 9790345246805 <=> 979-0-3452-4680-5 * diff --git a/contrib/isn/ISSN.h b/contrib/isn/ISSN.h index 063a5d97f1..082efcff7c 100644 --- a/contrib/isn/ISSN.h +++ b/contrib/isn/ISSN.h @@ -6,7 +6,7 @@ * http://www.issn.org/ * * IDENTIFICATION - * $PostgreSQL: pgsql/contrib/isn/ISSN.h,v 1.2 2006/10/04 00:29:45 momjian Exp $ + * contrib/isn/ISSN.h * * 1144-875X <=> 1144875(X) <=> 1144875 <=> (977)1144875 <=> 9771144875(00) <=> 977114487500(7) <=> 977-1144-875-00-7 * diff --git a/contrib/isn/Makefile b/contrib/isn/Makefile index 8431921d83..ae33b758fb 100644 --- a/contrib/isn/Makefile +++ b/contrib/isn/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/contrib/isn/Makefile,v 1.3 2007/11/10 23:59:51 momjian Exp $ +# contrib/isn/Makefile MODULES = isn DATA_built = isn.sql diff --git a/contrib/isn/UPC.h b/contrib/isn/UPC.h index 2b58a6b566..b95473e12d 100644 --- a/contrib/isn/UPC.h +++ b/contrib/isn/UPC.h @@ -6,7 +6,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/contrib/isn/UPC.h,v 1.2 2006/10/04 00:29:45 momjian Exp $ + * contrib/isn/UPC.h * */ diff --git a/contrib/isn/isn.c b/contrib/isn/isn.c index dac760b111..979358f9a6 100644 --- a/contrib/isn/isn.c +++ b/contrib/isn/isn.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/contrib/isn/isn.c,v 1.14 2010/02/26 02:00:32 momjian Exp $ + * contrib/isn/isn.c * *------------------------------------------------------------------------- */ diff --git a/contrib/isn/isn.h b/contrib/isn/isn.h index fdc72d9b53..e9d6f4df87 100644 --- a/contrib/isn/isn.h +++ b/contrib/isn/isn.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/contrib/isn/isn.h,v 1.10 2010/02/26 02:00:32 momjian Exp $ + * contrib/isn/isn.h * *------------------------------------------------------------------------- */ diff --git a/contrib/isn/isn.sql.in b/contrib/isn/isn.sql.in index 1963fbbee3..8f73c5c497 100644 --- a/contrib/isn/isn.sql.in +++ b/contrib/isn/isn.sql.in @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/isn/isn.sql.in,v 1.9 2008/11/30 19:01:29 tgl Exp $ */ +/* contrib/isn/isn.sql.in */ -- Adjust this setting to control where the objects get created. SET search_path = public; diff --git a/contrib/isn/uninstall_isn.sql b/contrib/isn/uninstall_isn.sql index cc7b573b04..bf866b4748 100644 --- a/contrib/isn/uninstall_isn.sql +++ b/contrib/isn/uninstall_isn.sql @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/isn/uninstall_isn.sql,v 1.4 2008/11/28 21:19:13 tgl Exp $ */ +/* contrib/isn/uninstall_isn.sql */ -- Adjust this setting to control where the objects get dropped. SET search_path = public; diff --git a/contrib/lo/Makefile b/contrib/lo/Makefile index 336cb5685e..43c01f57c0 100644 --- a/contrib/lo/Makefile +++ b/contrib/lo/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/contrib/lo/Makefile,v 1.17 2007/11/10 23:59:51 momjian Exp $ +# contrib/lo/Makefile MODULES = lo DATA_built = lo.sql diff --git a/contrib/lo/lo.c b/contrib/lo/lo.c index 2e37a28591..0e3559c020 100644 --- a/contrib/lo/lo.c +++ b/contrib/lo/lo.c @@ -1,7 +1,7 @@ /* * PostgreSQL definitions for managed Large Objects. * - * $PostgreSQL: pgsql/contrib/lo/lo.c,v 1.17 2006/07/11 17:04:12 momjian Exp $ + * contrib/lo/lo.c * */ diff --git a/contrib/lo/lo.sql.in b/contrib/lo/lo.sql.in index 6dcf6659c5..8c7afbe5e3 100644 --- a/contrib/lo/lo.sql.in +++ b/contrib/lo/lo.sql.in @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/lo/lo.sql.in,v 1.15 2007/11/13 04:24:28 momjian Exp $ */ +/* contrib/lo/lo.sql.in */ -- Adjust this setting to control where the objects get created. SET search_path = public; diff --git a/contrib/lo/lo_test.sql b/contrib/lo/lo_test.sql index 73022b2535..7e52362f81 100644 --- a/contrib/lo/lo_test.sql +++ b/contrib/lo/lo_test.sql @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/lo/lo_test.sql,v 1.6 2009/12/14 00:39:10 itagaki Exp $ */ +/* contrib/lo/lo_test.sql */ -- Adjust this setting to control where the objects get created. SET search_path = public; diff --git a/contrib/lo/uninstall_lo.sql b/contrib/lo/uninstall_lo.sql index 7cbc796a3d..77deb1d550 100644 --- a/contrib/lo/uninstall_lo.sql +++ b/contrib/lo/uninstall_lo.sql @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/lo/uninstall_lo.sql,v 1.3 2007/11/13 04:24:28 momjian Exp $ */ +/* contrib/lo/uninstall_lo.sql */ -- Adjust this setting to control where the objects get dropped. SET search_path = public; diff --git a/contrib/ltree/Makefile b/contrib/ltree/Makefile index 130658a2a7..bad3cbfe85 100644 --- a/contrib/ltree/Makefile +++ b/contrib/ltree/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/contrib/ltree/Makefile,v 1.8 2007/11/10 23:59:51 momjian Exp $ +# contrib/ltree/Makefile PG_CPPFLAGS = -DLOWER_NODE MODULE_big = ltree diff --git a/contrib/ltree/_ltree_gist.c b/contrib/ltree/_ltree_gist.c index 4c0e7c25c0..f221c2de54 100644 --- a/contrib/ltree/_ltree_gist.c +++ b/contrib/ltree/_ltree_gist.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/ltree/_ltree_gist.c,v 1.27 2010/02/24 18:02:24 tgl Exp $ + * contrib/ltree/_ltree_gist.c * * * GiST support for ltree[] diff --git a/contrib/ltree/_ltree_op.c b/contrib/ltree/_ltree_op.c index 02c96c05d4..096a748c51 100644 --- a/contrib/ltree/_ltree_op.c +++ b/contrib/ltree/_ltree_op.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/ltree/_ltree_op.c,v 1.14 2010/02/24 18:02:24 tgl Exp $ + * contrib/ltree/_ltree_op.c * * * op function for ltree[] diff --git a/contrib/ltree/crc32.c b/contrib/ltree/crc32.c index f0078d6e42..c736defc73 100644 --- a/contrib/ltree/crc32.c +++ b/contrib/ltree/crc32.c @@ -1,6 +1,6 @@ /* Both POSIX and CRC32 checksums */ -/* $PostgreSQL: pgsql/contrib/ltree/crc32.c,v 1.8 2007/07/15 22:40:28 tgl Exp $ */ +/* contrib/ltree/crc32.c */ #include #include diff --git a/contrib/ltree/crc32.h b/contrib/ltree/crc32.h index 69d9eee3e1..269d05d0c1 100644 --- a/contrib/ltree/crc32.h +++ b/contrib/ltree/crc32.h @@ -1,7 +1,7 @@ #ifndef _CRC32_H #define _CRC32_H -/* $PostgreSQL: pgsql/contrib/ltree/crc32.h,v 1.3 2006/03/11 04:38:29 momjian Exp $ */ +/* contrib/ltree/crc32.h */ /* Returns crc32 of data block */ extern unsigned int ltree_crc32_sz(char *buf, int size); diff --git a/contrib/ltree/lquery_op.c b/contrib/ltree/lquery_op.c index 1059417e77..1fbed78157 100644 --- a/contrib/ltree/lquery_op.c +++ b/contrib/ltree/lquery_op.c @@ -1,7 +1,7 @@ /* * op function for ltree and lquery * Teodor Sigaev - * $PostgreSQL: pgsql/contrib/ltree/lquery_op.c,v 1.15 2010/02/24 18:02:24 tgl Exp $ + * contrib/ltree/lquery_op.c */ #include "postgres.h" diff --git a/contrib/ltree/ltree.h b/contrib/ltree/ltree.h index f16c6f9a32..8e4ea4c151 100644 --- a/contrib/ltree/ltree.h +++ b/contrib/ltree/ltree.h @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/ltree/ltree.h,v 1.22 2009/06/11 14:48:51 momjian Exp $ */ +/* contrib/ltree/ltree.h */ #ifndef __LTREE_H__ #define __LTREE_H__ diff --git a/contrib/ltree/ltree.sql.in b/contrib/ltree/ltree.sql.in index 364c44db1b..4ea6277c57 100644 --- a/contrib/ltree/ltree.sql.in +++ b/contrib/ltree/ltree.sql.in @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/ltree/ltree.sql.in,v 1.18 2009/06/11 18:30:03 tgl Exp $ */ +/* contrib/ltree/ltree.sql.in */ -- Adjust this setting to control where the objects get created. SET search_path = public; diff --git a/contrib/ltree/ltree_gist.c b/contrib/ltree/ltree_gist.c index 46fccb1ee1..5fa7b59d32 100644 --- a/contrib/ltree/ltree_gist.c +++ b/contrib/ltree/ltree_gist.c @@ -1,7 +1,7 @@ /* * GiST support for ltree * Teodor Sigaev - * $PostgreSQL: pgsql/contrib/ltree/ltree_gist.c,v 1.26 2010/02/24 18:02:24 tgl Exp $ + * contrib/ltree/ltree_gist.c */ #include "postgres.h" diff --git a/contrib/ltree/ltree_io.c b/contrib/ltree/ltree_io.c index a88eb16cb9..3e88b81c16 100644 --- a/contrib/ltree/ltree_io.c +++ b/contrib/ltree/ltree_io.c @@ -1,7 +1,7 @@ /* * in/out function for ltree and lquery * Teodor Sigaev - * $PostgreSQL: pgsql/contrib/ltree/ltree_io.c,v 1.18 2009/06/11 14:48:51 momjian Exp $ + * contrib/ltree/ltree_io.c */ #include "postgres.h" diff --git a/contrib/ltree/ltree_op.c b/contrib/ltree/ltree_op.c index 2e6d5367d8..2ddfdec7eb 100644 --- a/contrib/ltree/ltree_op.c +++ b/contrib/ltree/ltree_op.c @@ -1,7 +1,7 @@ /* * op function for ltree * Teodor Sigaev - * $PostgreSQL: pgsql/contrib/ltree/ltree_op.c,v 1.20 2009/06/11 14:48:51 momjian Exp $ + * contrib/ltree/ltree_op.c */ #include "postgres.h" diff --git a/contrib/ltree/ltreetest.sql b/contrib/ltree/ltreetest.sql index 8621188b7f..d6996caf3c 100644 --- a/contrib/ltree/ltreetest.sql +++ b/contrib/ltree/ltreetest.sql @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/ltree/ltreetest.sql,v 1.4 2007/11/13 04:24:28 momjian Exp $ */ +/* contrib/ltree/ltreetest.sql */ -- Adjust this setting to control where the objects get created. SET search_path = public; diff --git a/contrib/ltree/ltxtquery_io.c b/contrib/ltree/ltxtquery_io.c index b158c4b441..e1240c3d2f 100644 --- a/contrib/ltree/ltxtquery_io.c +++ b/contrib/ltree/ltxtquery_io.c @@ -1,7 +1,7 @@ /* * txtquery io * Teodor Sigaev - * $PostgreSQL: pgsql/contrib/ltree/ltxtquery_io.c,v 1.17 2009/06/11 14:48:51 momjian Exp $ + * contrib/ltree/ltxtquery_io.c */ #include "postgres.h" diff --git a/contrib/ltree/ltxtquery_op.c b/contrib/ltree/ltxtquery_op.c index 559c05e2bf..1c13888605 100644 --- a/contrib/ltree/ltxtquery_op.c +++ b/contrib/ltree/ltxtquery_op.c @@ -1,7 +1,7 @@ /* * txtquery operations with ltree * Teodor Sigaev - * $PostgreSQL: pgsql/contrib/ltree/ltxtquery_op.c,v 1.10 2009/06/11 14:48:51 momjian Exp $ + * contrib/ltree/ltxtquery_op.c */ #include "postgres.h" diff --git a/contrib/ltree/uninstall_ltree.sql b/contrib/ltree/uninstall_ltree.sql index acd07df1e8..07ce1189b5 100644 --- a/contrib/ltree/uninstall_ltree.sql +++ b/contrib/ltree/uninstall_ltree.sql @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/ltree/uninstall_ltree.sql,v 1.6 2008/04/14 17:05:32 tgl Exp $ */ +/* contrib/ltree/uninstall_ltree.sql */ -- Adjust this setting to control where the objects get dropped. SET search_path = public; diff --git a/contrib/oid2name/Makefile b/contrib/oid2name/Makefile index ce043550af..f6f890ecd5 100644 --- a/contrib/oid2name/Makefile +++ b/contrib/oid2name/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/contrib/oid2name/Makefile,v 1.11 2010/05/12 11:33:07 momjian Exp $ +# contrib/oid2name/Makefile PGFILEDESC = "oid2name - examine the file structure" PGAPPICON=win32 diff --git a/contrib/oid2name/oid2name.c b/contrib/oid2name/oid2name.c index ff824278aa..05c06ccc68 100644 --- a/contrib/oid2name/oid2name.c +++ b/contrib/oid2name/oid2name.c @@ -5,7 +5,7 @@ * Originally by * B. Palmer, bpalmer@crimelabs.net 1-17-2001 * - * $PostgreSQL: pgsql/contrib/oid2name/oid2name.c,v 1.38 2010/02/26 02:00:32 momjian Exp $ + * contrib/oid2name/oid2name.c */ #include "postgres_fe.h" diff --git a/contrib/pageinspect/Makefile b/contrib/pageinspect/Makefile index dd53194840..a8ae51dfd1 100644 --- a/contrib/pageinspect/Makefile +++ b/contrib/pageinspect/Makefile @@ -2,7 +2,7 @@ # # pageinspect Makefile # -# $PostgreSQL: pgsql/contrib/pageinspect/Makefile,v 1.5 2010/08/19 05:57:33 petere Exp $ +# contrib/pageinspect/Makefile # #------------------------------------------------------------------------- diff --git a/contrib/pageinspect/btreefuncs.c b/contrib/pageinspect/btreefuncs.c index 4f56864d2e..ef27cd4080 100644 --- a/contrib/pageinspect/btreefuncs.c +++ b/contrib/pageinspect/btreefuncs.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/pageinspect/btreefuncs.c,v 1.10 2009/06/11 14:48:51 momjian Exp $ + * contrib/pageinspect/btreefuncs.c * * * btreefuncs.c diff --git a/contrib/pageinspect/fsmfuncs.c b/contrib/pageinspect/fsmfuncs.c index 5fbf93ba2f..0a22971b9b 100644 --- a/contrib/pageinspect/fsmfuncs.c +++ b/contrib/pageinspect/fsmfuncs.c @@ -12,7 +12,7 @@ * Copyright (c) 2007-2010, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/contrib/pageinspect/fsmfuncs.c,v 1.4 2010/01/02 16:57:32 momjian Exp $ + * contrib/pageinspect/fsmfuncs.c * *------------------------------------------------------------------------- */ diff --git a/contrib/pageinspect/heapfuncs.c b/contrib/pageinspect/heapfuncs.c index 143a47cb80..3ed77118b4 100644 --- a/contrib/pageinspect/heapfuncs.c +++ b/contrib/pageinspect/heapfuncs.c @@ -18,7 +18,7 @@ * Copyright (c) 2007-2010, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/contrib/pageinspect/heapfuncs.c,v 1.9 2010/04/02 15:19:22 mha Exp $ + * contrib/pageinspect/heapfuncs.c * *------------------------------------------------------------------------- */ diff --git a/contrib/pageinspect/pageinspect.sql.in b/contrib/pageinspect/pageinspect.sql.in index abf1ddc57c..d6058d409f 100644 --- a/contrib/pageinspect/pageinspect.sql.in +++ b/contrib/pageinspect/pageinspect.sql.in @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/pageinspect/pageinspect.sql.in,v 1.7 2009/06/08 16:22:44 tgl Exp $ */ +/* contrib/pageinspect/pageinspect.sql.in */ -- Adjust this setting to control where the objects get created. SET search_path = public; diff --git a/contrib/pageinspect/rawpage.c b/contrib/pageinspect/rawpage.c index 9043fa37bd..f341a7247d 100644 --- a/contrib/pageinspect/rawpage.c +++ b/contrib/pageinspect/rawpage.c @@ -8,7 +8,7 @@ * Copyright (c) 2007-2010, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/contrib/pageinspect/rawpage.c,v 1.14 2010/01/02 16:57:32 momjian Exp $ + * contrib/pageinspect/rawpage.c * *------------------------------------------------------------------------- */ diff --git a/contrib/pageinspect/uninstall_pageinspect.sql b/contrib/pageinspect/uninstall_pageinspect.sql index 8c0a7f7f37..a980fd7d01 100644 --- a/contrib/pageinspect/uninstall_pageinspect.sql +++ b/contrib/pageinspect/uninstall_pageinspect.sql @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/pageinspect/uninstall_pageinspect.sql,v 1.5 2009/06/08 16:22:44 tgl Exp $ */ +/* contrib/pageinspect/uninstall_pageinspect.sql */ -- Adjust this setting to control where the objects get dropped. SET search_path = public; diff --git a/contrib/passwordcheck/Makefile b/contrib/passwordcheck/Makefile index 1d2c8b1c34..4829bfd1f3 100644 --- a/contrib/passwordcheck/Makefile +++ b/contrib/passwordcheck/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/contrib/passwordcheck/Makefile,v 1.1 2009/11/18 21:57:56 tgl Exp $ +# contrib/passwordcheck/Makefile MODULE_big = passwordcheck OBJS = passwordcheck.o diff --git a/contrib/passwordcheck/passwordcheck.c b/contrib/passwordcheck/passwordcheck.c index adf417769e..32b7c9a5c1 100644 --- a/contrib/passwordcheck/passwordcheck.c +++ b/contrib/passwordcheck/passwordcheck.c @@ -8,7 +8,7 @@ * Author: Laurenz Albe * * IDENTIFICATION - * $PostgreSQL: pgsql/contrib/passwordcheck/passwordcheck.c,v 1.3 2010/02/26 02:00:32 momjian Exp $ + * contrib/passwordcheck/passwordcheck.c * *------------------------------------------------------------------------- */ diff --git a/contrib/pg_archivecleanup/Makefile b/contrib/pg_archivecleanup/Makefile index d858b5bcd3..2011c145ce 100644 --- a/contrib/pg_archivecleanup/Makefile +++ b/contrib/pg_archivecleanup/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/contrib/pg_archivecleanup/Makefile,v 1.1 2010/06/14 16:19:24 sriggs Exp $ +# contrib/pg_archivecleanup/Makefile PGFILEDESC = "pg_archivecleanup - cleans archive when used with streaming replication" PGAPPICON=win32 diff --git a/contrib/pg_archivecleanup/pg_archivecleanup.c b/contrib/pg_archivecleanup/pg_archivecleanup.c index 3d12acbdb0..79892077c8 100644 --- a/contrib/pg_archivecleanup/pg_archivecleanup.c +++ b/contrib/pg_archivecleanup/pg_archivecleanup.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/pg_archivecleanup/pg_archivecleanup.c,v 1.4 2010/08/23 02:56:24 tgl Exp $ + * contrib/pg_archivecleanup/pg_archivecleanup.c * * pg_archivecleanup.c * diff --git a/contrib/pg_buffercache/Makefile b/contrib/pg_buffercache/Makefile index 83aee70de1..6a47a2241e 100644 --- a/contrib/pg_buffercache/Makefile +++ b/contrib/pg_buffercache/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/contrib/pg_buffercache/Makefile,v 1.5 2007/11/10 23:59:51 momjian Exp $ +# contrib/pg_buffercache/Makefile MODULE_big = pg_buffercache OBJS = pg_buffercache_pages.o diff --git a/contrib/pg_buffercache/pg_buffercache.sql.in b/contrib/pg_buffercache/pg_buffercache.sql.in index 59ada02e4c..b23e94ed12 100644 --- a/contrib/pg_buffercache/pg_buffercache.sql.in +++ b/contrib/pg_buffercache/pg_buffercache.sql.in @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/pg_buffercache/pg_buffercache.sql.in,v 1.8 2008/08/14 12:56:41 heikki Exp $ */ +/* contrib/pg_buffercache/pg_buffercache.sql.in */ -- Adjust this setting to control where the objects get created. SET search_path = public; diff --git a/contrib/pg_buffercache/pg_buffercache_pages.c b/contrib/pg_buffercache/pg_buffercache_pages.c index 5939f52a04..ed882881ab 100644 --- a/contrib/pg_buffercache/pg_buffercache_pages.c +++ b/contrib/pg_buffercache/pg_buffercache_pages.c @@ -3,7 +3,7 @@ * pg_buffercache_pages.c * display some contents of the buffer cache * - * $PostgreSQL: pgsql/contrib/pg_buffercache/pg_buffercache_pages.c,v 1.16 2009/06/11 14:48:51 momjian Exp $ + * contrib/pg_buffercache/pg_buffercache_pages.c *------------------------------------------------------------------------- */ #include "postgres.h" diff --git a/contrib/pg_buffercache/uninstall_pg_buffercache.sql b/contrib/pg_buffercache/uninstall_pg_buffercache.sql index 19dc9301ca..62617cd20d 100644 --- a/contrib/pg_buffercache/uninstall_pg_buffercache.sql +++ b/contrib/pg_buffercache/uninstall_pg_buffercache.sql @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/pg_buffercache/uninstall_pg_buffercache.sql,v 1.3 2007/11/13 04:24:28 momjian Exp $ */ +/* contrib/pg_buffercache/uninstall_pg_buffercache.sql */ -- Adjust this setting to control where the objects get dropped. SET search_path = public; diff --git a/contrib/pg_freespacemap/Makefile b/contrib/pg_freespacemap/Makefile index daeab59d46..da335a86ca 100644 --- a/contrib/pg_freespacemap/Makefile +++ b/contrib/pg_freespacemap/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/contrib/pg_freespacemap/Makefile,v 1.5 2008/09/30 11:17:07 heikki Exp $ +# contrib/pg_freespacemap/Makefile MODULE_big = pg_freespacemap OBJS = pg_freespacemap.o diff --git a/contrib/pg_freespacemap/pg_freespacemap.c b/contrib/pg_freespacemap/pg_freespacemap.c index 4b1dece12a..bf6b0df8f9 100644 --- a/contrib/pg_freespacemap/pg_freespacemap.c +++ b/contrib/pg_freespacemap/pg_freespacemap.c @@ -3,7 +3,7 @@ * pg_freespacemap.c * display contents of a free space map * - * $PostgreSQL: pgsql/contrib/pg_freespacemap/pg_freespacemap.c,v 1.14 2009/06/11 14:48:51 momjian Exp $ + * contrib/pg_freespacemap/pg_freespacemap.c *------------------------------------------------------------------------- */ #include "postgres.h" diff --git a/contrib/pg_freespacemap/pg_freespacemap.sql.in b/contrib/pg_freespacemap/pg_freespacemap.sql.in index 7054380386..5ef8ba46ad 100644 --- a/contrib/pg_freespacemap/pg_freespacemap.sql.in +++ b/contrib/pg_freespacemap/pg_freespacemap.sql.in @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/pg_freespacemap/pg_freespacemap.sql.in,v 1.12 2009/06/10 22:12:28 tgl Exp $ */ +/* contrib/pg_freespacemap/pg_freespacemap.sql.in */ -- Adjust this setting to control where the objects get created. SET search_path = public; diff --git a/contrib/pg_freespacemap/uninstall_pg_freespacemap.sql b/contrib/pg_freespacemap/uninstall_pg_freespacemap.sql index e9bf0ad7d1..168506708a 100644 --- a/contrib/pg_freespacemap/uninstall_pg_freespacemap.sql +++ b/contrib/pg_freespacemap/uninstall_pg_freespacemap.sql @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/pg_freespacemap/uninstall_pg_freespacemap.sql,v 1.5 2009/06/10 22:12:28 tgl Exp $ */ +/* contrib/pg_freespacemap/uninstall_pg_freespacemap.sql */ -- Adjust this setting to control where the objects get dropped. SET search_path = public; diff --git a/contrib/pg_standby/Makefile b/contrib/pg_standby/Makefile index 5e6bbd9145..43300245cb 100644 --- a/contrib/pg_standby/Makefile +++ b/contrib/pg_standby/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/contrib/pg_standby/Makefile,v 1.6 2010/05/12 11:33:07 momjian Exp $ +# contrib/pg_standby/Makefile PGFILEDESC = "pg_standby - supports creation of a warm standby" PGAPPICON=win32 diff --git a/contrib/pg_standby/pg_standby.c b/contrib/pg_standby/pg_standby.c index 70680e762d..f25015fd14 100644 --- a/contrib/pg_standby/pg_standby.c +++ b/contrib/pg_standby/pg_standby.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/pg_standby/pg_standby.c,v 1.29 2010/05/15 09:31:57 heikki Exp $ + * contrib/pg_standby/pg_standby.c * * * pg_standby.c diff --git a/contrib/pg_stat_statements/Makefile b/contrib/pg_stat_statements/Makefile index ce335a656e..efb26a90f6 100644 --- a/contrib/pg_stat_statements/Makefile +++ b/contrib/pg_stat_statements/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/contrib/pg_stat_statements/Makefile,v 1.1 2009/01/04 22:19:59 tgl Exp $ +# contrib/pg_stat_statements/Makefile MODULE_big = pg_stat_statements DATA_built = pg_stat_statements.sql diff --git a/contrib/pg_stat_statements/pg_stat_statements.c b/contrib/pg_stat_statements/pg_stat_statements.c index eb89aeca80..6db6cc0ea2 100644 --- a/contrib/pg_stat_statements/pg_stat_statements.c +++ b/contrib/pg_stat_statements/pg_stat_statements.c @@ -14,7 +14,7 @@ * Copyright (c) 2008-2010, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/contrib/pg_stat_statements/pg_stat_statements.c,v 1.14 2010/04/28 16:54:15 tgl Exp $ + * contrib/pg_stat_statements/pg_stat_statements.c * *------------------------------------------------------------------------- */ diff --git a/contrib/pg_stat_statements/pg_stat_statements.sql.in b/contrib/pg_stat_statements/pg_stat_statements.sql.in index cf82a0e3dc..56d5fd591a 100644 --- a/contrib/pg_stat_statements/pg_stat_statements.sql.in +++ b/contrib/pg_stat_statements/pg_stat_statements.sql.in @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/pg_stat_statements/pg_stat_statements.sql.in,v 1.2 2010/01/08 00:38:19 itagaki Exp $ */ +/* contrib/pg_stat_statements/pg_stat_statements.sql.in */ -- Adjust this setting to control where the objects get created. SET search_path = public; diff --git a/contrib/pg_stat_statements/uninstall_pg_stat_statements.sql b/contrib/pg_stat_statements/uninstall_pg_stat_statements.sql index 31fd0af39d..d2832a2986 100644 --- a/contrib/pg_stat_statements/uninstall_pg_stat_statements.sql +++ b/contrib/pg_stat_statements/uninstall_pg_stat_statements.sql @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/pg_stat_statements/uninstall_pg_stat_statements.sql,v 1.1 2009/01/04 22:19:59 tgl Exp $ */ +/* contrib/pg_stat_statements/uninstall_pg_stat_statements.sql */ -- Adjust this setting to control where the objects get dropped. SET search_path = public; diff --git a/contrib/pg_trgm/Makefile b/contrib/pg_trgm/Makefile index c9f139e9b6..cf2dec795c 100644 --- a/contrib/pg_trgm/Makefile +++ b/contrib/pg_trgm/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/contrib/pg_trgm/Makefile,v 1.10 2009/04/28 17:07:50 momjian Exp $ +# contrib/pg_trgm/Makefile MODULE_big = pg_trgm OBJS = trgm_op.o trgm_gist.o trgm_gin.o diff --git a/contrib/pg_trgm/pg_trgm.sql.in b/contrib/pg_trgm/pg_trgm.sql.in index 5396b52b1b..b1f094ab40 100644 --- a/contrib/pg_trgm/pg_trgm.sql.in +++ b/contrib/pg_trgm/pg_trgm.sql.in @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/pg_trgm/pg_trgm.sql.in,v 1.10 2009/06/11 18:30:03 tgl Exp $ */ +/* contrib/pg_trgm/pg_trgm.sql.in */ -- Adjust this setting to control where the objects get created. SET search_path = public; diff --git a/contrib/pg_trgm/trgm.h b/contrib/pg_trgm/trgm.h index 4a89760d71..85826733f5 100644 --- a/contrib/pg_trgm/trgm.h +++ b/contrib/pg_trgm/trgm.h @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/pg_trgm/trgm.h,v 1.11 2009/06/11 14:48:51 momjian Exp $ + * contrib/pg_trgm/trgm.h */ #ifndef __TRGM_H__ #define __TRGM_H__ diff --git a/contrib/pg_trgm/trgm_gin.c b/contrib/pg_trgm/trgm_gin.c index a150f8843e..3ce0b2deb5 100644 --- a/contrib/pg_trgm/trgm_gin.c +++ b/contrib/pg_trgm/trgm_gin.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/pg_trgm/trgm_gin.c,v 1.8 2009/06/11 14:48:51 momjian Exp $ + * contrib/pg_trgm/trgm_gin.c */ #include "trgm.h" diff --git a/contrib/pg_trgm/trgm_gist.c b/contrib/pg_trgm/trgm_gist.c index 7014394bb2..567b2f878f 100644 --- a/contrib/pg_trgm/trgm_gist.c +++ b/contrib/pg_trgm/trgm_gist.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/pg_trgm/trgm_gist.c,v 1.16 2009/06/11 14:48:51 momjian Exp $ + * contrib/pg_trgm/trgm_gist.c */ #include "trgm.h" diff --git a/contrib/pg_trgm/trgm_op.c b/contrib/pg_trgm/trgm_op.c index 19b6747d68..e15c826e18 100644 --- a/contrib/pg_trgm/trgm_op.c +++ b/contrib/pg_trgm/trgm_op.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/pg_trgm/trgm_op.c,v 1.12 2009/06/11 14:48:51 momjian Exp $ + * contrib/pg_trgm/trgm_op.c */ #include "trgm.h" #include diff --git a/contrib/pg_trgm/uninstall_pg_trgm.sql b/contrib/pg_trgm/uninstall_pg_trgm.sql index 42c1d741f9..239cd85b5b 100644 --- a/contrib/pg_trgm/uninstall_pg_trgm.sql +++ b/contrib/pg_trgm/uninstall_pg_trgm.sql @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/pg_trgm/uninstall_pg_trgm.sql,v 1.7 2009/03/25 22:19:01 tgl Exp $ */ +/* contrib/pg_trgm/uninstall_pg_trgm.sql */ -- Adjust this setting to control where the objects get dropped. SET search_path = public; diff --git a/contrib/pg_upgrade/IMPLEMENTATION b/contrib/pg_upgrade/IMPLEMENTATION index 91bee727b4..bbd36ac9e9 100644 --- a/contrib/pg_upgrade/IMPLEMENTATION +++ b/contrib/pg_upgrade/IMPLEMENTATION @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/contrib/pg_upgrade/IMPLEMENTATION,v 1.3 2010/07/03 14:23:13 momjian Exp $ +contrib/pg_upgrade/IMPLEMENTATION ------------------------------------------------------------------------------ PG_UPGRADE: IN-PLACE UPGRADES FOR POSTGRESQL diff --git a/contrib/pg_upgrade/Makefile b/contrib/pg_upgrade/Makefile index 1998ffe899..79ac234b5e 100644 --- a/contrib/pg_upgrade/Makefile +++ b/contrib/pg_upgrade/Makefile @@ -1,7 +1,7 @@ # # Makefile for pg_upgrade # -# $PostgreSQL: pgsql/contrib/pg_upgrade/Makefile,v 1.4 2010/07/03 14:23:13 momjian Exp $ +# contrib/pg_upgrade/Makefile PGFILEDESC = "pg_upgrade - an in-place binary upgrade utility" PGAPPICON = win32 diff --git a/contrib/pg_upgrade/TESTING b/contrib/pg_upgrade/TESTING index 5cb60b177f..88adfea276 100644 --- a/contrib/pg_upgrade/TESTING +++ b/contrib/pg_upgrade/TESTING @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/contrib/pg_upgrade/TESTING,v 1.4 2010/08/19 05:57:33 petere Exp $ +contrib/pg_upgrade/TESTING The most effective way to test pg_upgrade, aside from testing on user data, is by upgrading the PostgreSQL regression database. diff --git a/contrib/pg_upgrade/check.c b/contrib/pg_upgrade/check.c index 62cf55602a..144fcdc817 100644 --- a/contrib/pg_upgrade/check.c +++ b/contrib/pg_upgrade/check.c @@ -4,7 +4,7 @@ * server checks and output routines * * Copyright (c) 2010, PostgreSQL Global Development Group - * $PostgreSQL: pgsql/contrib/pg_upgrade/check.c,v 1.14 2010/07/25 03:47:29 momjian Exp $ + * contrib/pg_upgrade/check.c */ #include "pg_upgrade.h" diff --git a/contrib/pg_upgrade/controldata.c b/contrib/pg_upgrade/controldata.c index cb0b01994e..f36c2c179d 100644 --- a/contrib/pg_upgrade/controldata.c +++ b/contrib/pg_upgrade/controldata.c @@ -4,7 +4,7 @@ * controldata functions * * Copyright (c) 2010, PostgreSQL Global Development Group - * $PostgreSQL: pgsql/contrib/pg_upgrade/controldata.c,v 1.10 2010/09/07 14:10:30 momjian Exp $ + * contrib/pg_upgrade/controldata.c */ #include "pg_upgrade.h" diff --git a/contrib/pg_upgrade/dump.c b/contrib/pg_upgrade/dump.c index 3a2ded629c..9572f076be 100644 --- a/contrib/pg_upgrade/dump.c +++ b/contrib/pg_upgrade/dump.c @@ -4,7 +4,7 @@ * dump functions * * Copyright (c) 2010, PostgreSQL Global Development Group - * $PostgreSQL: pgsql/contrib/pg_upgrade/dump.c,v 1.7 2010/07/06 19:18:55 momjian Exp $ + * contrib/pg_upgrade/dump.c */ #include "pg_upgrade.h" diff --git a/contrib/pg_upgrade/exec.c b/contrib/pg_upgrade/exec.c index 1e024cb81e..a7f2c3873d 100644 --- a/contrib/pg_upgrade/exec.c +++ b/contrib/pg_upgrade/exec.c @@ -4,7 +4,7 @@ * execution functions * * Copyright (c) 2010, PostgreSQL Global Development Group - * $PostgreSQL: pgsql/contrib/pg_upgrade/exec.c,v 1.9 2010/07/13 18:09:55 momjian Exp $ + * contrib/pg_upgrade/exec.c */ #include "pg_upgrade.h" diff --git a/contrib/pg_upgrade/file.c b/contrib/pg_upgrade/file.c index 4274646dff..11f1d4bbcb 100644 --- a/contrib/pg_upgrade/file.c +++ b/contrib/pg_upgrade/file.c @@ -4,7 +4,7 @@ * file system operations * * Copyright (c) 2010, PostgreSQL Global Development Group - * $PostgreSQL: pgsql/contrib/pg_upgrade/file.c,v 1.14 2010/07/09 16:51:23 momjian Exp $ + * contrib/pg_upgrade/file.c */ #include "pg_upgrade.h" diff --git a/contrib/pg_upgrade/function.c b/contrib/pg_upgrade/function.c index 261e63b729..c70f23f499 100644 --- a/contrib/pg_upgrade/function.c +++ b/contrib/pg_upgrade/function.c @@ -4,7 +4,7 @@ * server-side function support * * Copyright (c) 2010, PostgreSQL Global Development Group - * $PostgreSQL: pgsql/contrib/pg_upgrade/function.c,v 1.7 2010/07/25 03:28:32 momjian Exp $ + * contrib/pg_upgrade/function.c */ #include "pg_upgrade.h" diff --git a/contrib/pg_upgrade/info.c b/contrib/pg_upgrade/info.c index dad2a5f8d1..1601d56b08 100644 --- a/contrib/pg_upgrade/info.c +++ b/contrib/pg_upgrade/info.c @@ -4,7 +4,7 @@ * information support functions * * Copyright (c) 2010, PostgreSQL Global Development Group - * $PostgreSQL: pgsql/contrib/pg_upgrade/info.c,v 1.11 2010/07/06 19:18:55 momjian Exp $ + * contrib/pg_upgrade/info.c */ #include "pg_upgrade.h" diff --git a/contrib/pg_upgrade/option.c b/contrib/pg_upgrade/option.c index 520a20c6a0..945889016e 100644 --- a/contrib/pg_upgrade/option.c +++ b/contrib/pg_upgrade/option.c @@ -4,7 +4,7 @@ * options functions * * Copyright (c) 2010, PostgreSQL Global Development Group - * $PostgreSQL: pgsql/contrib/pg_upgrade/option.c,v 1.13 2010/07/13 18:14:14 momjian Exp $ + * contrib/pg_upgrade/option.c */ #include "pg_upgrade.h" diff --git a/contrib/pg_upgrade/page.c b/contrib/pg_upgrade/page.c index de19a0023e..e732e22bbc 100644 --- a/contrib/pg_upgrade/page.c +++ b/contrib/pg_upgrade/page.c @@ -4,7 +4,7 @@ * per-page conversion operations * * Copyright (c) 2010, PostgreSQL Global Development Group - * $PostgreSQL: pgsql/contrib/pg_upgrade/page.c,v 1.5 2010/07/03 16:33:14 momjian Exp $ + * contrib/pg_upgrade/page.c */ #include "pg_upgrade.h" diff --git a/contrib/pg_upgrade/pg_upgrade.c b/contrib/pg_upgrade/pg_upgrade.c index 414ac090bd..e6ea813c91 100644 --- a/contrib/pg_upgrade/pg_upgrade.c +++ b/contrib/pg_upgrade/pg_upgrade.c @@ -4,7 +4,7 @@ * main source file * * Copyright (c) 2010, PostgreSQL Global Development Group - * $PostgreSQL: pgsql/contrib/pg_upgrade/pg_upgrade.c,v 1.11 2010/07/13 15:56:53 momjian Exp $ + * contrib/pg_upgrade/pg_upgrade.c */ #include "pg_upgrade.h" diff --git a/contrib/pg_upgrade/pg_upgrade.h b/contrib/pg_upgrade/pg_upgrade.h index a80fff7851..a7d46cf2bc 100644 --- a/contrib/pg_upgrade/pg_upgrade.h +++ b/contrib/pg_upgrade/pg_upgrade.h @@ -2,7 +2,7 @@ * pg_upgrade.h * * Copyright (c) 2010, PostgreSQL Global Development Group - * $PostgreSQL: pgsql/contrib/pg_upgrade/pg_upgrade.h,v 1.16 2010/07/25 03:47:29 momjian Exp $ + * contrib/pg_upgrade/pg_upgrade.h */ #include "postgres.h" diff --git a/contrib/pg_upgrade/relfilenode.c b/contrib/pg_upgrade/relfilenode.c index 1ef176a041..a69548b68c 100644 --- a/contrib/pg_upgrade/relfilenode.c +++ b/contrib/pg_upgrade/relfilenode.c @@ -4,7 +4,7 @@ * relfilenode functions * * Copyright (c) 2010, PostgreSQL Global Development Group - * $PostgreSQL: pgsql/contrib/pg_upgrade/relfilenode.c,v 1.8 2010/07/06 19:18:55 momjian Exp $ + * contrib/pg_upgrade/relfilenode.c */ #include "pg_upgrade.h" diff --git a/contrib/pg_upgrade/server.c b/contrib/pg_upgrade/server.c index 3cc5469787..a617583564 100644 --- a/contrib/pg_upgrade/server.c +++ b/contrib/pg_upgrade/server.c @@ -4,7 +4,7 @@ * database server functions * * Copyright (c) 2010, PostgreSQL Global Development Group - * $PostgreSQL: pgsql/contrib/pg_upgrade/server.c,v 1.9 2010/07/13 20:03:32 momjian Exp $ + * contrib/pg_upgrade/server.c */ #include "pg_upgrade.h" diff --git a/contrib/pg_upgrade/tablespace.c b/contrib/pg_upgrade/tablespace.c index 11caaa3e89..045ef7effa 100644 --- a/contrib/pg_upgrade/tablespace.c +++ b/contrib/pg_upgrade/tablespace.c @@ -4,7 +4,7 @@ * tablespace functions * * Copyright (c) 2010, PostgreSQL Global Development Group - * $PostgreSQL: pgsql/contrib/pg_upgrade/tablespace.c,v 1.6 2010/07/06 19:18:55 momjian Exp $ + * contrib/pg_upgrade/tablespace.c */ #include "pg_upgrade.h" diff --git a/contrib/pg_upgrade/util.c b/contrib/pg_upgrade/util.c index 24fc08ef70..b9968e9132 100644 --- a/contrib/pg_upgrade/util.c +++ b/contrib/pg_upgrade/util.c @@ -4,7 +4,7 @@ * utility functions * * Copyright (c) 2010, PostgreSQL Global Development Group - * $PostgreSQL: pgsql/contrib/pg_upgrade/util.c,v 1.5 2010/07/06 19:18:55 momjian Exp $ + * contrib/pg_upgrade/util.c */ #include "pg_upgrade.h" diff --git a/contrib/pg_upgrade/version.c b/contrib/pg_upgrade/version.c index 59e61767fc..7a7757c8a5 100644 --- a/contrib/pg_upgrade/version.c +++ b/contrib/pg_upgrade/version.c @@ -4,7 +4,7 @@ * Postgres-version-specific routines * * Copyright (c) 2010, PostgreSQL Global Development Group - * $PostgreSQL: pgsql/contrib/pg_upgrade/version.c,v 1.5 2010/07/03 16:33:14 momjian Exp $ + * contrib/pg_upgrade/version.c */ #include "pg_upgrade.h" diff --git a/contrib/pg_upgrade/version_old_8_3.c b/contrib/pg_upgrade/version_old_8_3.c index cca5891726..34760b11da 100644 --- a/contrib/pg_upgrade/version_old_8_3.c +++ b/contrib/pg_upgrade/version_old_8_3.c @@ -4,7 +4,7 @@ * Postgres-version-specific routines * * Copyright (c) 2010, PostgreSQL Global Development Group - * $PostgreSQL: pgsql/contrib/pg_upgrade/version_old_8_3.c,v 1.8 2010/07/25 03:47:29 momjian Exp $ + * contrib/pg_upgrade/version_old_8_3.c */ #include "pg_upgrade.h" diff --git a/contrib/pg_upgrade_support/Makefile b/contrib/pg_upgrade_support/Makefile index bd43c5093e..e23c9bebcb 100644 --- a/contrib/pg_upgrade_support/Makefile +++ b/contrib/pg_upgrade_support/Makefile @@ -1,7 +1,7 @@ # # Makefile for pg_upgrade_support # -# $PostgreSQL: pgsql/contrib/pg_upgrade_support/Makefile,v 1.3 2010/07/03 14:23:14 momjian Exp $ +# contrib/pg_upgrade_support/Makefile PGFILEDESC = "pg_upgrade_support - server-side functions for pg_upgrade" diff --git a/contrib/pg_upgrade_support/pg_upgrade_support.c b/contrib/pg_upgrade_support/pg_upgrade_support.c index 08050ac6e8..c956be187a 100644 --- a/contrib/pg_upgrade_support/pg_upgrade_support.c +++ b/contrib/pg_upgrade_support/pg_upgrade_support.c @@ -5,7 +5,7 @@ * to control oid and relfilenode assignment * * Copyright (c) 2010, PostgreSQL Global Development Group - * $PostgreSQL: pgsql/contrib/pg_upgrade_support/pg_upgrade_support.c,v 1.5 2010/07/06 19:18:55 momjian Exp $ + * contrib/pg_upgrade_support/pg_upgrade_support.c */ #include "postgres.h" diff --git a/contrib/pgbench/Makefile b/contrib/pgbench/Makefile index 786ba10fd9..5a2b211a7c 100644 --- a/contrib/pgbench/Makefile +++ b/contrib/pgbench/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/contrib/pgbench/Makefile,v 1.18 2010/05/12 11:33:08 momjian Exp $ +# contrib/pgbench/Makefile PGFILEDESC = "pgbench - a simple program for running benchmark tests" PGAPPICON=win32 diff --git a/contrib/pgbench/pgbench.c b/contrib/pgbench/pgbench.c index 27ea731f3c..55ca1e82e6 100644 --- a/contrib/pgbench/pgbench.c +++ b/contrib/pgbench/pgbench.c @@ -4,7 +4,7 @@ * A simple benchmark program for PostgreSQL * Originally written by Tatsuo Ishii and enhanced by many contributors. * - * $PostgreSQL: pgsql/contrib/pgbench/pgbench.c,v 1.101 2010/08/12 21:10:59 tgl Exp $ + * contrib/pgbench/pgbench.c * Copyright (c) 2000-2010, PostgreSQL Global Development Group * ALL RIGHTS RESERVED; * diff --git a/contrib/pgcrypto/Makefile b/contrib/pgcrypto/Makefile index cfb586ba49..f429fab4ed 100644 --- a/contrib/pgcrypto/Makefile +++ b/contrib/pgcrypto/Makefile @@ -1,5 +1,5 @@ # -# $PostgreSQL: pgsql/contrib/pgcrypto/Makefile,v 1.27 2007/11/10 23:59:51 momjian Exp $ +# contrib/pgcrypto/Makefile # INT_SRCS = md5.c sha1.c sha2.c internal.c internal-sha2.c blf.c rijndael.c \ diff --git a/contrib/pgcrypto/blf.c b/contrib/pgcrypto/blf.c index e03c542c0d..f8a2c63c9f 100644 --- a/contrib/pgcrypto/blf.c +++ b/contrib/pgcrypto/blf.c @@ -1,7 +1,7 @@ /* * Butchered version of sshblowf.c from putty-0.59. * - * $PostgreSQL: pgsql/contrib/pgcrypto/blf.c,v 1.10 2009/06/11 14:48:52 momjian Exp $ + * contrib/pgcrypto/blf.c */ /* diff --git a/contrib/pgcrypto/blf.h b/contrib/pgcrypto/blf.h index 507d7f9055..84aba37ba8 100644 --- a/contrib/pgcrypto/blf.h +++ b/contrib/pgcrypto/blf.h @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/pgcrypto/blf.h,v 1.8 2009/06/11 14:48:52 momjian Exp $ */ +/* contrib/pgcrypto/blf.h */ /* * PuTTY is copyright 1997-2007 Simon Tatham. * diff --git a/contrib/pgcrypto/crypt-blowfish.c b/contrib/pgcrypto/crypt-blowfish.c index 9c1d2d4706..a7b7e758ff 100644 --- a/contrib/pgcrypto/crypt-blowfish.c +++ b/contrib/pgcrypto/crypt-blowfish.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/pgcrypto/crypt-blowfish.c,v 1.14 2009/06/11 14:48:52 momjian Exp $ + * contrib/pgcrypto/crypt-blowfish.c * * This code comes from John the Ripper password cracker, with reentrant * and crypt(3) interfaces added, but optimizations specific to password diff --git a/contrib/pgcrypto/crypt-des.c b/contrib/pgcrypto/crypt-des.c index a907626d39..1f497432da 100644 --- a/contrib/pgcrypto/crypt-des.c +++ b/contrib/pgcrypto/crypt-des.c @@ -1,7 +1,7 @@ /* * FreeSec: libcrypt for NetBSD * - * $PostgreSQL: pgsql/contrib/pgcrypto/crypt-des.c,v 1.15 2006/07/13 04:15:24 neilc Exp $ + * contrib/pgcrypto/crypt-des.c * * Copyright (c) 1994 David Burren * All rights reserved. diff --git a/contrib/pgcrypto/crypt-gensalt.c b/contrib/pgcrypto/crypt-gensalt.c index b2ec3da828..84bf27bedb 100644 --- a/contrib/pgcrypto/crypt-gensalt.c +++ b/contrib/pgcrypto/crypt-gensalt.c @@ -2,7 +2,7 @@ * Written by Solar Designer and placed in the public domain. * See crypt_blowfish.c for more information. * - * $PostgreSQL: pgsql/contrib/pgcrypto/crypt-gensalt.c,v 1.11 2009/06/11 14:48:52 momjian Exp $ + * contrib/pgcrypto/crypt-gensalt.c * * This file contains salt generation functions for the traditional and * other common crypt(3) algorithms, except for bcrypt which is defined diff --git a/contrib/pgcrypto/crypt-md5.c b/contrib/pgcrypto/crypt-md5.c index d70fc341af..30eb8bf5a2 100644 --- a/contrib/pgcrypto/crypt-md5.c +++ b/contrib/pgcrypto/crypt-md5.c @@ -3,7 +3,7 @@ * * $FreeBSD: src/lib/libcrypt/crypt-md5.c,v 1.5 1999/12/17 20:21:45 peter Exp $ * - * $PostgreSQL: pgsql/contrib/pgcrypto/crypt-md5.c,v 1.9 2009/04/15 18:58:24 mha Exp $ + * contrib/pgcrypto/crypt-md5.c */ #include "postgres.h" diff --git a/contrib/pgcrypto/fortuna.c b/contrib/pgcrypto/fortuna.c index 4e97946ab3..1228fb4ad0 100644 --- a/contrib/pgcrypto/fortuna.c +++ b/contrib/pgcrypto/fortuna.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $PostgreSQL: pgsql/contrib/pgcrypto/fortuna.c,v 1.9 2009/06/11 14:48:52 momjian Exp $ + * contrib/pgcrypto/fortuna.c */ #include "postgres.h" diff --git a/contrib/pgcrypto/fortuna.h b/contrib/pgcrypto/fortuna.h index b4d7064dec..2e49f8aab8 100644 --- a/contrib/pgcrypto/fortuna.h +++ b/contrib/pgcrypto/fortuna.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $PostgreSQL: pgsql/contrib/pgcrypto/fortuna.h,v 1.3 2005/10/15 02:49:06 momjian Exp $ + * contrib/pgcrypto/fortuna.h */ #ifndef __FORTUNA_H diff --git a/contrib/pgcrypto/imath.c b/contrib/pgcrypto/imath.c index 51f1f00e30..de24076322 100644 --- a/contrib/pgcrypto/imath.c +++ b/contrib/pgcrypto/imath.c @@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $PostgreSQL: pgsql/contrib/pgcrypto/imath.c,v 1.9 2010/04/02 15:21:20 mha Exp $ */ +/* contrib/pgcrypto/imath.c */ #include "postgres.h" #include "px.h" diff --git a/contrib/pgcrypto/imath.h b/contrib/pgcrypto/imath.h index c7b29cf3a5..f2b02d0cd7 100644 --- a/contrib/pgcrypto/imath.h +++ b/contrib/pgcrypto/imath.h @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $PostgreSQL: pgsql/contrib/pgcrypto/imath.h,v 1.8 2010/04/02 15:21:20 mha Exp $ */ +/* contrib/pgcrypto/imath.h */ #ifndef IMATH_H_ #define IMATH_H_ diff --git a/contrib/pgcrypto/internal-sha2.c b/contrib/pgcrypto/internal-sha2.c index 1e36a369e0..f86b47816b 100644 --- a/contrib/pgcrypto/internal-sha2.c +++ b/contrib/pgcrypto/internal-sha2.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $PostgreSQL: pgsql/contrib/pgcrypto/internal-sha2.c,v 1.3 2009/06/11 14:48:52 momjian Exp $ + * contrib/pgcrypto/internal-sha2.c */ #include "postgres.h" diff --git a/contrib/pgcrypto/internal.c b/contrib/pgcrypto/internal.c index 84bda624a4..fedfe2dd03 100644 --- a/contrib/pgcrypto/internal.c +++ b/contrib/pgcrypto/internal.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $PostgreSQL: pgsql/contrib/pgcrypto/internal.c,v 1.29 2009/06/11 14:48:52 momjian Exp $ + * contrib/pgcrypto/internal.c */ #include "postgres.h" diff --git a/contrib/pgcrypto/mbuf.c b/contrib/pgcrypto/mbuf.c index d3eee2ee4f..6246900c7a 100644 --- a/contrib/pgcrypto/mbuf.c +++ b/contrib/pgcrypto/mbuf.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $PostgreSQL: pgsql/contrib/pgcrypto/mbuf.c,v 1.5 2009/06/11 14:48:52 momjian Exp $ + * contrib/pgcrypto/mbuf.c */ #include "postgres.h" diff --git a/contrib/pgcrypto/mbuf.h b/contrib/pgcrypto/mbuf.h index aa2b5596ee..37d2db5337 100644 --- a/contrib/pgcrypto/mbuf.h +++ b/contrib/pgcrypto/mbuf.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $PostgreSQL: pgsql/contrib/pgcrypto/mbuf.h,v 1.3 2009/06/11 14:48:52 momjian Exp $ + * contrib/pgcrypto/mbuf.h */ #ifndef __PX_MBUF_H diff --git a/contrib/pgcrypto/md5.c b/contrib/pgcrypto/md5.c index 8083d1f280..b5071fba43 100644 --- a/contrib/pgcrypto/md5.c +++ b/contrib/pgcrypto/md5.c @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $PostgreSQL: pgsql/contrib/pgcrypto/md5.c,v 1.15 2009/06/11 14:48:52 momjian Exp $ + * contrib/pgcrypto/md5.c */ #include "postgres.h" diff --git a/contrib/pgcrypto/md5.h b/contrib/pgcrypto/md5.h index eb7c620b48..03b9ab58ba 100644 --- a/contrib/pgcrypto/md5.h +++ b/contrib/pgcrypto/md5.h @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/pgcrypto/md5.h,v 1.10 2009/06/11 14:48:52 momjian Exp $ */ +/* contrib/pgcrypto/md5.h */ /* $KAME: md5.h,v 1.3 2000/02/22 14:01:18 itojun Exp $ */ /* diff --git a/contrib/pgcrypto/openssl.c b/contrib/pgcrypto/openssl.c index bb0b4eefd3..dc25acea5d 100644 --- a/contrib/pgcrypto/openssl.c +++ b/contrib/pgcrypto/openssl.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $PostgreSQL: pgsql/contrib/pgcrypto/openssl.c,v 1.33 2009/06/11 14:48:52 momjian Exp $ + * contrib/pgcrypto/openssl.c */ #include "postgres.h" diff --git a/contrib/pgcrypto/pgcrypto.c b/contrib/pgcrypto/pgcrypto.c index 04c90d8672..d271ddc302 100644 --- a/contrib/pgcrypto/pgcrypto.c +++ b/contrib/pgcrypto/pgcrypto.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $PostgreSQL: pgsql/contrib/pgcrypto/pgcrypto.c,v 1.27 2008/03/25 22:42:41 tgl Exp $ + * contrib/pgcrypto/pgcrypto.c */ #include "postgres.h" diff --git a/contrib/pgcrypto/pgcrypto.h b/contrib/pgcrypto/pgcrypto.h index b011b06062..6284ba2406 100644 --- a/contrib/pgcrypto/pgcrypto.h +++ b/contrib/pgcrypto/pgcrypto.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $PostgreSQL: pgsql/contrib/pgcrypto/pgcrypto.h,v 1.11 2006/09/05 21:26:48 tgl Exp $ + * contrib/pgcrypto/pgcrypto.h */ #ifndef _PG_CRYPTO_H diff --git a/contrib/pgcrypto/pgcrypto.sql.in b/contrib/pgcrypto/pgcrypto.sql.in index bb1e26a086..37ae100412 100644 --- a/contrib/pgcrypto/pgcrypto.sql.in +++ b/contrib/pgcrypto/pgcrypto.sql.in @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/pgcrypto/pgcrypto.sql.in,v 1.16 2010/08/19 05:57:33 petere Exp $ */ +/* contrib/pgcrypto/pgcrypto.sql.in */ -- Adjust this setting to control where the objects get created. SET search_path = public; diff --git a/contrib/pgcrypto/pgp-armor.c b/contrib/pgcrypto/pgp-armor.c index 7963ccc329..87adf91125 100644 --- a/contrib/pgcrypto/pgp-armor.c +++ b/contrib/pgcrypto/pgp-armor.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $PostgreSQL: pgsql/contrib/pgcrypto/pgp-armor.c,v 1.3 2005/10/15 02:49:06 momjian Exp $ + * contrib/pgcrypto/pgp-armor.c */ #include "postgres.h" diff --git a/contrib/pgcrypto/pgp-cfb.c b/contrib/pgcrypto/pgp-cfb.c index bd05ccc94e..7cf9bf0b8c 100644 --- a/contrib/pgcrypto/pgp-cfb.c +++ b/contrib/pgcrypto/pgp-cfb.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $PostgreSQL: pgsql/contrib/pgcrypto/pgp-cfb.c,v 1.4 2009/06/11 14:48:52 momjian Exp $ + * contrib/pgcrypto/pgp-cfb.c */ #include "postgres.h" diff --git a/contrib/pgcrypto/pgp-compress.c b/contrib/pgcrypto/pgp-compress.c index 41f5855247..7a9516b070 100644 --- a/contrib/pgcrypto/pgp-compress.c +++ b/contrib/pgcrypto/pgp-compress.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $PostgreSQL: pgsql/contrib/pgcrypto/pgp-compress.c,v 1.8 2009/06/11 14:48:52 momjian Exp $ + * contrib/pgcrypto/pgp-compress.c */ #include "postgres.h" diff --git a/contrib/pgcrypto/pgp-decrypt.c b/contrib/pgcrypto/pgp-decrypt.c index 9df5c717f2..c9aa6cd66a 100644 --- a/contrib/pgcrypto/pgp-decrypt.c +++ b/contrib/pgcrypto/pgp-decrypt.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $PostgreSQL: pgsql/contrib/pgcrypto/pgp-decrypt.c,v 1.8 2009/06/11 14:48:52 momjian Exp $ + * contrib/pgcrypto/pgp-decrypt.c */ #include "postgres.h" diff --git a/contrib/pgcrypto/pgp-encrypt.c b/contrib/pgcrypto/pgp-encrypt.c index 48f2f01f62..3b9b5d20ed 100644 --- a/contrib/pgcrypto/pgp-encrypt.c +++ b/contrib/pgcrypto/pgp-encrypt.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $PostgreSQL: pgsql/contrib/pgcrypto/pgp-encrypt.c,v 1.4 2009/06/11 14:48:52 momjian Exp $ + * contrib/pgcrypto/pgp-encrypt.c */ #include "postgres.h" diff --git a/contrib/pgcrypto/pgp-info.c b/contrib/pgcrypto/pgp-info.c index a51a553236..b75266f18c 100644 --- a/contrib/pgcrypto/pgp-info.c +++ b/contrib/pgcrypto/pgp-info.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $PostgreSQL: pgsql/contrib/pgcrypto/pgp-info.c,v 1.5 2009/06/11 14:48:52 momjian Exp $ + * contrib/pgcrypto/pgp-info.c */ #include "postgres.h" diff --git a/contrib/pgcrypto/pgp-mpi-internal.c b/contrib/pgcrypto/pgp-mpi-internal.c index 283946b17d..d0e5830fe0 100644 --- a/contrib/pgcrypto/pgp-mpi-internal.c +++ b/contrib/pgcrypto/pgp-mpi-internal.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $PostgreSQL: pgsql/contrib/pgcrypto/pgp-mpi-internal.c,v 1.8 2009/06/11 14:48:52 momjian Exp $ + * contrib/pgcrypto/pgp-mpi-internal.c */ #include "postgres.h" diff --git a/contrib/pgcrypto/pgp-mpi-openssl.c b/contrib/pgcrypto/pgp-mpi-openssl.c index f2b25de090..ed41e1151c 100644 --- a/contrib/pgcrypto/pgp-mpi-openssl.c +++ b/contrib/pgcrypto/pgp-mpi-openssl.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $PostgreSQL: pgsql/contrib/pgcrypto/pgp-mpi-openssl.c,v 1.5 2009/06/11 14:48:52 momjian Exp $ + * contrib/pgcrypto/pgp-mpi-openssl.c */ #include "postgres.h" diff --git a/contrib/pgcrypto/pgp-mpi.c b/contrib/pgcrypto/pgp-mpi.c index 3f2ec0f5c7..c8765b6d14 100644 --- a/contrib/pgcrypto/pgp-mpi.c +++ b/contrib/pgcrypto/pgp-mpi.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $PostgreSQL: pgsql/contrib/pgcrypto/pgp-mpi.c,v 1.5 2009/06/11 14:48:52 momjian Exp $ + * contrib/pgcrypto/pgp-mpi.c */ #include "postgres.h" diff --git a/contrib/pgcrypto/pgp-pgsql.c b/contrib/pgcrypto/pgp-pgsql.c index 530a3d38d8..f1f09cd83b 100644 --- a/contrib/pgcrypto/pgp-pgsql.c +++ b/contrib/pgcrypto/pgp-pgsql.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $PostgreSQL: pgsql/contrib/pgcrypto/pgp-pgsql.c,v 1.11 2009/06/11 14:48:52 momjian Exp $ + * contrib/pgcrypto/pgp-pgsql.c */ #include "postgres.h" diff --git a/contrib/pgcrypto/pgp-pubdec.c b/contrib/pgcrypto/pgp-pubdec.c index cb32708fee..fe5fae0c42 100644 --- a/contrib/pgcrypto/pgp-pubdec.c +++ b/contrib/pgcrypto/pgp-pubdec.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $PostgreSQL: pgsql/contrib/pgcrypto/pgp-pubdec.c,v 1.6 2009/06/11 14:48:52 momjian Exp $ + * contrib/pgcrypto/pgp-pubdec.c */ #include "postgres.h" diff --git a/contrib/pgcrypto/pgp-pubenc.c b/contrib/pgcrypto/pgp-pubenc.c index 0e9ebb4285..4b4d1bfb44 100644 --- a/contrib/pgcrypto/pgp-pubenc.c +++ b/contrib/pgcrypto/pgp-pubenc.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $PostgreSQL: pgsql/contrib/pgcrypto/pgp-pubenc.c,v 1.5 2009/06/11 14:48:52 momjian Exp $ + * contrib/pgcrypto/pgp-pubenc.c */ #include "postgres.h" diff --git a/contrib/pgcrypto/pgp-pubkey.c b/contrib/pgcrypto/pgp-pubkey.c index 62b6e1ab0e..283e0ec17e 100644 --- a/contrib/pgcrypto/pgp-pubkey.c +++ b/contrib/pgcrypto/pgp-pubkey.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $PostgreSQL: pgsql/contrib/pgcrypto/pgp-pubkey.c,v 1.5 2009/06/11 14:48:52 momjian Exp $ + * contrib/pgcrypto/pgp-pubkey.c */ #include "postgres.h" diff --git a/contrib/pgcrypto/pgp-s2k.c b/contrib/pgcrypto/pgp-s2k.c index 326b1bbf31..ef16caf685 100644 --- a/contrib/pgcrypto/pgp-s2k.c +++ b/contrib/pgcrypto/pgp-s2k.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $PostgreSQL: pgsql/contrib/pgcrypto/pgp-s2k.c,v 1.5 2009/06/11 14:48:52 momjian Exp $ + * contrib/pgcrypto/pgp-s2k.c */ #include "postgres.h" diff --git a/contrib/pgcrypto/pgp.c b/contrib/pgcrypto/pgp.c index ce6f199a9e..b8a6bc49b4 100644 --- a/contrib/pgcrypto/pgp.c +++ b/contrib/pgcrypto/pgp.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $PostgreSQL: pgsql/contrib/pgcrypto/pgp.c,v 1.4 2009/06/11 14:48:52 momjian Exp $ + * contrib/pgcrypto/pgp.c */ #include "postgres.h" diff --git a/contrib/pgcrypto/pgp.h b/contrib/pgcrypto/pgp.h index 7860d830c4..7ae01ccc4d 100644 --- a/contrib/pgcrypto/pgp.h +++ b/contrib/pgcrypto/pgp.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $PostgreSQL: pgsql/contrib/pgcrypto/pgp.h,v 1.6 2009/06/11 14:48:52 momjian Exp $ + * contrib/pgcrypto/pgp.h */ enum PGP_S2K_TYPE diff --git a/contrib/pgcrypto/px-crypt.c b/contrib/pgcrypto/px-crypt.c index e21acb73c6..ab12e2a6e7 100644 --- a/contrib/pgcrypto/px-crypt.c +++ b/contrib/pgcrypto/px-crypt.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $PostgreSQL: pgsql/contrib/pgcrypto/px-crypt.c,v 1.15 2005/10/15 02:49:06 momjian Exp $ + * contrib/pgcrypto/px-crypt.c */ #include "postgres.h" diff --git a/contrib/pgcrypto/px-crypt.h b/contrib/pgcrypto/px-crypt.h index c2460cb9f9..7dde9ab77b 100644 --- a/contrib/pgcrypto/px-crypt.h +++ b/contrib/pgcrypto/px-crypt.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $PostgreSQL: pgsql/contrib/pgcrypto/px-crypt.h,v 1.10 2006/07/13 04:15:25 neilc Exp $ + * contrib/pgcrypto/px-crypt.h */ #ifndef _PX_CRYPT_H diff --git a/contrib/pgcrypto/px-hmac.c b/contrib/pgcrypto/px-hmac.c index 3b2016190e..16abc4347c 100644 --- a/contrib/pgcrypto/px-hmac.c +++ b/contrib/pgcrypto/px-hmac.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $PostgreSQL: pgsql/contrib/pgcrypto/px-hmac.c,v 1.8 2009/06/11 14:48:52 momjian Exp $ + * contrib/pgcrypto/px-hmac.c */ #include "postgres.h" diff --git a/contrib/pgcrypto/px.c b/contrib/pgcrypto/px.c index f2db06a898..768c7c333a 100644 --- a/contrib/pgcrypto/px.c +++ b/contrib/pgcrypto/px.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $PostgreSQL: pgsql/contrib/pgcrypto/px.c,v 1.18 2009/06/11 14:48:52 momjian Exp $ + * contrib/pgcrypto/px.c */ #include "postgres.h" diff --git a/contrib/pgcrypto/px.h b/contrib/pgcrypto/px.h index c916e9361c..9709f9bdb6 100644 --- a/contrib/pgcrypto/px.h +++ b/contrib/pgcrypto/px.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $PostgreSQL: pgsql/contrib/pgcrypto/px.h,v 1.19 2009/06/11 14:48:52 momjian Exp $ + * contrib/pgcrypto/px.h */ #ifndef __PX_H diff --git a/contrib/pgcrypto/random.c b/contrib/pgcrypto/random.c index b22e029d2c..393a0be983 100644 --- a/contrib/pgcrypto/random.c +++ b/contrib/pgcrypto/random.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $PostgreSQL: pgsql/contrib/pgcrypto/random.c,v 1.17 2006/06/08 03:29:30 momjian Exp $ + * contrib/pgcrypto/random.c */ #include "postgres.h" diff --git a/contrib/pgcrypto/rijndael.c b/contrib/pgcrypto/rijndael.c index cf9eca91dc..5651d03750 100644 --- a/contrib/pgcrypto/rijndael.c +++ b/contrib/pgcrypto/rijndael.c @@ -1,6 +1,6 @@ /* $OpenBSD: rijndael.c,v 1.6 2000/12/09 18:51:34 markus Exp $ */ -/* $PostgreSQL: pgsql/contrib/pgcrypto/rijndael.c,v 1.14 2009/06/11 14:48:52 momjian Exp $ */ +/* contrib/pgcrypto/rijndael.c */ /* This is an independent implementation of the encryption algorithm: */ /* */ diff --git a/contrib/pgcrypto/rijndael.h b/contrib/pgcrypto/rijndael.h index e4c4229170..fb30e46c14 100644 --- a/contrib/pgcrypto/rijndael.h +++ b/contrib/pgcrypto/rijndael.h @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/pgcrypto/rijndael.h,v 1.7 2009/06/11 14:48:52 momjian Exp $ + * contrib/pgcrypto/rijndael.h * * $OpenBSD: rijndael.h,v 1.3 2001/05/09 23:01:32 markus Exp $ */ diff --git a/contrib/pgcrypto/sha1.c b/contrib/pgcrypto/sha1.c index 94849a78c5..4ee4f24559 100644 --- a/contrib/pgcrypto/sha1.c +++ b/contrib/pgcrypto/sha1.c @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $PostgreSQL: pgsql/contrib/pgcrypto/sha1.c,v 1.18 2010/04/02 15:21:20 mha Exp $ + * contrib/pgcrypto/sha1.c */ /* * FIPS pub 180-1: Secure Hash Algorithm (SHA-1) diff --git a/contrib/pgcrypto/sha1.h b/contrib/pgcrypto/sha1.h index ccd925b75e..3e0931efbc 100644 --- a/contrib/pgcrypto/sha1.h +++ b/contrib/pgcrypto/sha1.h @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/pgcrypto/sha1.h,v 1.10 2010/04/02 15:21:20 mha Exp $ */ +/* contrib/pgcrypto/sha1.h */ /* $KAME: sha1.h,v 1.4 2000/02/22 14:01:18 itojun Exp $ */ /* diff --git a/contrib/pgcrypto/sha2.c b/contrib/pgcrypto/sha2.c index d65995456c..5de94b2fcd 100644 --- a/contrib/pgcrypto/sha2.c +++ b/contrib/pgcrypto/sha2.c @@ -33,7 +33,7 @@ * * $From: sha2.c,v 1.1 2001/11/08 00:01:51 adg Exp adg $ * - * $PostgreSQL: pgsql/contrib/pgcrypto/sha2.c,v 1.13 2010/07/06 19:18:55 momjian Exp $ + * contrib/pgcrypto/sha2.c */ #include "postgres.h" diff --git a/contrib/pgcrypto/sha2.h b/contrib/pgcrypto/sha2.h index 8d593c60e5..df77a7a659 100644 --- a/contrib/pgcrypto/sha2.h +++ b/contrib/pgcrypto/sha2.h @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/pgcrypto/sha2.h,v 1.5 2009/06/11 14:48:52 momjian Exp $ */ +/* contrib/pgcrypto/sha2.h */ /* $OpenBSD: sha2.h,v 1.2 2004/04/28 23:11:57 millert Exp $ */ /* diff --git a/contrib/pgcrypto/uninstall_pgcrypto.sql b/contrib/pgcrypto/uninstall_pgcrypto.sql index 1bffb33ce7..3005c50333 100644 --- a/contrib/pgcrypto/uninstall_pgcrypto.sql +++ b/contrib/pgcrypto/uninstall_pgcrypto.sql @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/pgcrypto/uninstall_pgcrypto.sql,v 1.5 2010/08/19 05:57:33 petere Exp $ */ +/* contrib/pgcrypto/uninstall_pgcrypto.sql */ -- Adjust this setting to control where the objects get dropped. SET search_path = public; diff --git a/contrib/pgrowlocks/Makefile b/contrib/pgrowlocks/Makefile index dca7f22d26..fd338d75d7 100644 --- a/contrib/pgrowlocks/Makefile +++ b/contrib/pgrowlocks/Makefile @@ -2,7 +2,7 @@ # # pgrowlocks Makefile # -# $PostgreSQL: pgsql/contrib/pgrowlocks/Makefile,v 1.6 2009/04/28 17:07:50 momjian Exp $ +# contrib/pgrowlocks/Makefile # #------------------------------------------------------------------------- diff --git a/contrib/pgrowlocks/pgrowlocks.c b/contrib/pgrowlocks/pgrowlocks.c index e0d21a8926..302bb5c39c 100644 --- a/contrib/pgrowlocks/pgrowlocks.c +++ b/contrib/pgrowlocks/pgrowlocks.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/pgrowlocks/pgrowlocks.c,v 1.12 2009/06/11 14:48:52 momjian Exp $ + * contrib/pgrowlocks/pgrowlocks.c * * Copyright (c) 2005-2006 Tatsuo Ishii * diff --git a/contrib/pgrowlocks/pgrowlocks.sql.in b/contrib/pgrowlocks/pgrowlocks.sql.in index 405d1cb0d0..3bcb3ee7ea 100644 --- a/contrib/pgrowlocks/pgrowlocks.sql.in +++ b/contrib/pgrowlocks/pgrowlocks.sql.in @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/pgrowlocks/pgrowlocks.sql.in,v 1.3 2007/11/13 04:24:28 momjian Exp $ */ +/* contrib/pgrowlocks/pgrowlocks.sql.in */ -- Adjust this setting to control where the objects get created. SET search_path = public; diff --git a/contrib/pgrowlocks/uninstall_pgrowlocks.sql b/contrib/pgrowlocks/uninstall_pgrowlocks.sql index 6bfae44f33..004e97c0e9 100644 --- a/contrib/pgrowlocks/uninstall_pgrowlocks.sql +++ b/contrib/pgrowlocks/uninstall_pgrowlocks.sql @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/pgrowlocks/uninstall_pgrowlocks.sql,v 1.4 2007/11/13 04:24:28 momjian Exp $ */ +/* contrib/pgrowlocks/uninstall_pgrowlocks.sql */ -- Adjust this setting to control where the objects get dropped. SET search_path = public; diff --git a/contrib/pgstattuple/Makefile b/contrib/pgstattuple/Makefile index ab960de9c4..33386cdf17 100644 --- a/contrib/pgstattuple/Makefile +++ b/contrib/pgstattuple/Makefile @@ -2,7 +2,7 @@ # # pgstattuple Makefile # -# $PostgreSQL: pgsql/contrib/pgstattuple/Makefile,v 1.10 2009/04/28 17:07:50 momjian Exp $ +# contrib/pgstattuple/Makefile # #------------------------------------------------------------------------- diff --git a/contrib/pgstattuple/pgstatindex.c b/contrib/pgstattuple/pgstatindex.c index 83b50bb432..fd2cc9246b 100644 --- a/contrib/pgstattuple/pgstatindex.c +++ b/contrib/pgstattuple/pgstatindex.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/pgstattuple/pgstatindex.c,v 1.13 2009/06/11 14:48:52 momjian Exp $ + * contrib/pgstattuple/pgstatindex.c * * * pgstatindex diff --git a/contrib/pgstattuple/pgstattuple.c b/contrib/pgstattuple/pgstattuple.c index 994773a9d7..3a5d9c27b4 100644 --- a/contrib/pgstattuple/pgstattuple.c +++ b/contrib/pgstattuple/pgstattuple.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/pgstattuple/pgstattuple.c,v 1.39 2010/04/02 16:16:51 tgl Exp $ + * contrib/pgstattuple/pgstattuple.c * * Copyright (c) 2001,2002 Tatsuo Ishii * diff --git a/contrib/pgstattuple/pgstattuple.sql.in b/contrib/pgstattuple/pgstattuple.sql.in index 0d18f19dd0..6a09136596 100644 --- a/contrib/pgstattuple/pgstattuple.sql.in +++ b/contrib/pgstattuple/pgstattuple.sql.in @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/pgstattuple/pgstattuple.sql.in,v 1.16 2008/03/21 03:23:30 tgl Exp $ */ +/* contrib/pgstattuple/pgstattuple.sql.in */ -- Adjust this setting to control where the objects get created. SET search_path = public; diff --git a/contrib/pgstattuple/uninstall_pgstattuple.sql b/contrib/pgstattuple/uninstall_pgstattuple.sql index ae0ae90295..29eac40f29 100644 --- a/contrib/pgstattuple/uninstall_pgstattuple.sql +++ b/contrib/pgstattuple/uninstall_pgstattuple.sql @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/pgstattuple/uninstall_pgstattuple.sql,v 1.6 2007/11/13 04:24:28 momjian Exp $ */ +/* contrib/pgstattuple/uninstall_pgstattuple.sql */ -- Adjust this setting to control where the objects get dropped. SET search_path = public; diff --git a/contrib/seg/Makefile b/contrib/seg/Makefile index c6a5ef4efe..e8c7a44845 100644 --- a/contrib/seg/Makefile +++ b/contrib/seg/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/contrib/seg/Makefile,v 1.22 2009/08/28 20:26:18 petere Exp $ +# contrib/seg/Makefile MODULE_big = seg OBJS = seg.o segparse.o diff --git a/contrib/seg/seg.c b/contrib/seg/seg.c index 930a35b009..8de5092fc4 100644 --- a/contrib/seg/seg.c +++ b/contrib/seg/seg.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/seg/seg.c,v 1.25 2009/06/11 14:48:52 momjian Exp $ + * contrib/seg/seg.c * ****************************************************************************** This file contains routines that can be bound to a Postgres backend and diff --git a/contrib/seg/seg.sql.in b/contrib/seg/seg.sql.in index 5dac75374b..2713c4a8dc 100644 --- a/contrib/seg/seg.sql.in +++ b/contrib/seg/seg.sql.in @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/seg/seg.sql.in,v 1.19 2009/06/11 18:30:03 tgl Exp $ */ +/* contrib/seg/seg.sql.in */ -- Adjust this setting to control where the objects get created. SET search_path = public; diff --git a/contrib/seg/segdata.h b/contrib/seg/segdata.h index c92854da83..90be6e27aa 100644 --- a/contrib/seg/segdata.h +++ b/contrib/seg/segdata.h @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/seg/segdata.h,v 1.6 2009/06/11 14:48:52 momjian Exp $ + * contrib/seg/segdata.h */ typedef struct SEG { diff --git a/contrib/seg/uninstall_seg.sql b/contrib/seg/uninstall_seg.sql index 785de03950..27e8ba901a 100644 --- a/contrib/seg/uninstall_seg.sql +++ b/contrib/seg/uninstall_seg.sql @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/seg/uninstall_seg.sql,v 1.8 2008/04/18 20:51:17 tgl Exp $ */ +/* contrib/seg/uninstall_seg.sql */ -- Adjust this setting to control where the objects get dropped. SET search_path = public; diff --git a/contrib/spi/Makefile b/contrib/spi/Makefile index 7a078a9b0e..531d406605 100644 --- a/contrib/spi/Makefile +++ b/contrib/spi/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/contrib/spi/Makefile,v 1.29 2010/07/05 23:15:56 tgl Exp $ +# contrib/spi/Makefile MODULES = autoinc insert_username moddatetime refint timetravel DATA_built = $(addsuffix .sql, $(MODULES)) diff --git a/contrib/spi/autoinc.c b/contrib/spi/autoinc.c index f79317a1b1..4552fc3b59 100644 --- a/contrib/spi/autoinc.c +++ b/contrib/spi/autoinc.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/spi/autoinc.c,v 1.17 2009/06/11 14:48:52 momjian Exp $ + * contrib/spi/autoinc.c */ #include "postgres.h" diff --git a/contrib/spi/autoinc.sql.in b/contrib/spi/autoinc.sql.in index 5daed21140..d38c9df2d4 100644 --- a/contrib/spi/autoinc.sql.in +++ b/contrib/spi/autoinc.sql.in @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/spi/autoinc.sql.in,v 1.7 2007/11/13 04:24:28 momjian Exp $ */ +/* contrib/spi/autoinc.sql.in */ -- Adjust this setting to control where the objects get created. SET search_path = public; diff --git a/contrib/spi/insert_username.c b/contrib/spi/insert_username.c index 377284a613..da6764faf6 100644 --- a/contrib/spi/insert_username.c +++ b/contrib/spi/insert_username.c @@ -1,7 +1,7 @@ /* * insert_username.c * $Modified: Thu Oct 16 08:13:42 1997 by brook $ - * $PostgreSQL: pgsql/contrib/spi/insert_username.c,v 1.17 2009/01/07 13:44:36 tgl Exp $ + * contrib/spi/insert_username.c * * insert user name in response to a trigger * usage: insert_username (column_name) diff --git a/contrib/spi/insert_username.sql.in b/contrib/spi/insert_username.sql.in index 4d73d9b546..f06cc0cb5a 100644 --- a/contrib/spi/insert_username.sql.in +++ b/contrib/spi/insert_username.sql.in @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/spi/insert_username.sql.in,v 1.7 2007/11/13 04:24:28 momjian Exp $ */ +/* contrib/spi/insert_username.sql.in */ -- Adjust this setting to control where the objects get created. SET search_path = public; diff --git a/contrib/spi/moddatetime.c b/contrib/spi/moddatetime.c index 0b4d3ba351..e90c0b5cc2 100644 --- a/contrib/spi/moddatetime.c +++ b/contrib/spi/moddatetime.c @@ -1,7 +1,7 @@ /* moddatetime.c -$PostgreSQL: pgsql/contrib/spi/moddatetime.c,v 1.15 2009/01/07 13:44:36 tgl Exp $ +contrib/spi/moddatetime.c What is this? It is a function to be called from a trigger for the purpose of updating diff --git a/contrib/spi/moddatetime.sql.in b/contrib/spi/moddatetime.sql.in index 793c703ac0..e4ca6a6653 100644 --- a/contrib/spi/moddatetime.sql.in +++ b/contrib/spi/moddatetime.sql.in @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/spi/moddatetime.sql.in,v 1.7 2007/11/13 04:24:28 momjian Exp $ */ +/* contrib/spi/moddatetime.sql.in */ -- Adjust this setting to control where the objects get created. SET search_path = public; diff --git a/contrib/spi/refint.c b/contrib/spi/refint.c index 5a446c3709..cbd08d491d 100644 --- a/contrib/spi/refint.c +++ b/contrib/spi/refint.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/spi/refint.c,v 1.35 2009/06/11 14:48:52 momjian Exp $ + * contrib/spi/refint.c * * * refint.c -- set of functions to define referential integrity diff --git a/contrib/spi/refint.sql.in b/contrib/spi/refint.sql.in index 08ee7f98cf..2525b70006 100644 --- a/contrib/spi/refint.sql.in +++ b/contrib/spi/refint.sql.in @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/spi/refint.sql.in,v 1.7 2007/11/13 04:24:28 momjian Exp $ */ +/* contrib/spi/refint.sql.in */ -- Adjust this setting to control where the objects get created. SET search_path = public; diff --git a/contrib/spi/timetravel.c b/contrib/spi/timetravel.c index 577767d81f..8bae3131dc 100644 --- a/contrib/spi/timetravel.c +++ b/contrib/spi/timetravel.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/spi/timetravel.c,v 1.31 2009/06/11 14:48:52 momjian Exp $ + * contrib/spi/timetravel.c * * * timetravel.c -- function to get time travel feature diff --git a/contrib/spi/timetravel.sql.in b/contrib/spi/timetravel.sql.in index a78b1d52cf..4c64f211d9 100644 --- a/contrib/spi/timetravel.sql.in +++ b/contrib/spi/timetravel.sql.in @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/spi/timetravel.sql.in,v 1.8 2007/11/13 04:24:28 momjian Exp $ */ +/* contrib/spi/timetravel.sql.in */ -- Adjust this setting to control where the objects get created. SET search_path = public; diff --git a/contrib/sslinfo/Makefile b/contrib/sslinfo/Makefile index 722eacd349..a4c3d84297 100644 --- a/contrib/sslinfo/Makefile +++ b/contrib/sslinfo/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/contrib/sslinfo/Makefile,v 1.10 2007/11/10 23:59:51 momjian Exp $ +# contrib/sslinfo/Makefile MODULE_big = sslinfo OBJS = sslinfo.o diff --git a/contrib/sslinfo/sslinfo.c b/contrib/sslinfo/sslinfo.c index 1d0aa321bb..b5fd7ec987 100644 --- a/contrib/sslinfo/sslinfo.c +++ b/contrib/sslinfo/sslinfo.c @@ -4,7 +4,7 @@ * Written by Victor B. Wagner , Cryptocom LTD * This file is distributed under BSD-style license. * - * $PostgreSQL: pgsql/contrib/sslinfo/sslinfo.c,v 1.9 2010/07/27 23:43:42 rhaas Exp $ + * contrib/sslinfo/sslinfo.c */ #include "postgres.h" diff --git a/contrib/sslinfo/sslinfo.sql.in b/contrib/sslinfo/sslinfo.sql.in index 7e93419e94..66cbe3ea66 100644 --- a/contrib/sslinfo/sslinfo.sql.in +++ b/contrib/sslinfo/sslinfo.sql.in @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/sslinfo/sslinfo.sql.in,v 1.5 2010/07/27 23:43:42 rhaas Exp $ */ +/* contrib/sslinfo/sslinfo.sql.in */ -- Adjust this setting to control where the objects get created. SET search_path = public; diff --git a/contrib/sslinfo/uninstall_sslinfo.sql b/contrib/sslinfo/uninstall_sslinfo.sql index 7ffbc7d0c7..9ac572c8f9 100644 --- a/contrib/sslinfo/uninstall_sslinfo.sql +++ b/contrib/sslinfo/uninstall_sslinfo.sql @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/sslinfo/uninstall_sslinfo.sql,v 1.4 2010/07/27 23:43:42 rhaas Exp $ */ +/* contrib/sslinfo/uninstall_sslinfo.sql */ -- Adjust this setting to control where the objects get dropped. SET search_path = public; diff --git a/contrib/start-scripts/freebsd b/contrib/start-scripts/freebsd index e7338c0332..758574b427 100644 --- a/contrib/start-scripts/freebsd +++ b/contrib/start-scripts/freebsd @@ -6,7 +6,7 @@ # Created through merger of the Linux start script by Ryan Kirkpatrick # and the script in the FreeBSD ports collection. -# $PostgreSQL: pgsql/contrib/start-scripts/freebsd,v 1.7 2010/02/23 22:17:25 momjian Exp $ +# contrib/start-scripts/freebsd ## EDIT FROM HERE diff --git a/contrib/start-scripts/linux b/contrib/start-scripts/linux index dd73e42d17..4ad66917e6 100644 --- a/contrib/start-scripts/linux +++ b/contrib/start-scripts/linux @@ -24,7 +24,7 @@ # Original author: Ryan Kirkpatrick -# $PostgreSQL: pgsql/contrib/start-scripts/linux,v 1.11 2010/02/23 22:15:35 momjian Exp $ +# contrib/start-scripts/linux ## EDIT FROM HERE diff --git a/contrib/tablefunc/Makefile b/contrib/tablefunc/Makefile index 1207c62ef7..a5c2882866 100644 --- a/contrib/tablefunc/Makefile +++ b/contrib/tablefunc/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/contrib/tablefunc/Makefile,v 1.10 2010/07/05 23:15:56 tgl Exp $ +# contrib/tablefunc/Makefile MODULES = tablefunc DATA_built = tablefunc.sql diff --git a/contrib/tablefunc/tablefunc.c b/contrib/tablefunc/tablefunc.c index 609ab48c7c..ea2f2e15b0 100644 --- a/contrib/tablefunc/tablefunc.c +++ b/contrib/tablefunc/tablefunc.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/tablefunc/tablefunc.c,v 1.62 2010/01/02 16:57:32 momjian Exp $ + * contrib/tablefunc/tablefunc.c * * * tablefunc diff --git a/contrib/tablefunc/tablefunc.h b/contrib/tablefunc/tablefunc.h index 2870299bd4..267a8d1eeb 100644 --- a/contrib/tablefunc/tablefunc.h +++ b/contrib/tablefunc/tablefunc.h @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/tablefunc/tablefunc.h,v 1.17 2010/01/02 16:57:32 momjian Exp $ + * contrib/tablefunc/tablefunc.h * * * tablefunc diff --git a/contrib/tablefunc/tablefunc.sql.in b/contrib/tablefunc/tablefunc.sql.in index f4864c4558..54cba5ed3e 100644 --- a/contrib/tablefunc/tablefunc.sql.in +++ b/contrib/tablefunc/tablefunc.sql.in @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/tablefunc/tablefunc.sql.in,v 1.12 2007/11/13 04:24:29 momjian Exp $ */ +/* contrib/tablefunc/tablefunc.sql.in */ -- Adjust this setting to control where the objects get created. SET search_path = public; diff --git a/contrib/tablefunc/uninstall_tablefunc.sql b/contrib/tablefunc/uninstall_tablefunc.sql index cb58df89bb..b1ec916447 100644 --- a/contrib/tablefunc/uninstall_tablefunc.sql +++ b/contrib/tablefunc/uninstall_tablefunc.sql @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/tablefunc/uninstall_tablefunc.sql,v 1.3 2007/11/13 04:24:29 momjian Exp $ */ +/* contrib/tablefunc/uninstall_tablefunc.sql */ -- Adjust this setting to control where the objects get dropped. SET search_path = public; diff --git a/contrib/test_parser/Makefile b/contrib/test_parser/Makefile index 4499069548..ad4e0ec9b8 100644 --- a/contrib/test_parser/Makefile +++ b/contrib/test_parser/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/contrib/test_parser/Makefile,v 1.2 2007/12/03 04:22:54 tgl Exp $ +# contrib/test_parser/Makefile MODULE_big = test_parser OBJS = test_parser.o diff --git a/contrib/test_parser/test_parser.c b/contrib/test_parser/test_parser.c index da4f9be781..58b1c67970 100644 --- a/contrib/test_parser/test_parser.c +++ b/contrib/test_parser/test_parser.c @@ -6,7 +6,7 @@ * Copyright (c) 2007-2010, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/contrib/test_parser/test_parser.c,v 1.7 2010/01/02 16:57:32 momjian Exp $ + * contrib/test_parser/test_parser.c * *------------------------------------------------------------------------- */ diff --git a/contrib/test_parser/test_parser.sql.in b/contrib/test_parser/test_parser.sql.in index 4fd9b0796e..bab97a2987 100644 --- a/contrib/test_parser/test_parser.sql.in +++ b/contrib/test_parser/test_parser.sql.in @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/test_parser/test_parser.sql.in,v 1.3 2007/11/13 04:24:29 momjian Exp $ */ +/* contrib/test_parser/test_parser.sql.in */ -- Adjust this setting to control where the objects get created. SET search_path = public; diff --git a/contrib/test_parser/uninstall_test_parser.sql b/contrib/test_parser/uninstall_test_parser.sql index 66686d2004..042f46b251 100644 --- a/contrib/test_parser/uninstall_test_parser.sql +++ b/contrib/test_parser/uninstall_test_parser.sql @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/test_parser/uninstall_test_parser.sql,v 1.3 2007/11/13 04:24:29 momjian Exp $ */ +/* contrib/test_parser/uninstall_test_parser.sql */ -- Adjust this setting to control where the objects get dropped. SET search_path = public; diff --git a/contrib/tsearch2/Makefile b/contrib/tsearch2/Makefile index 8ab634323f..8748d30b19 100644 --- a/contrib/tsearch2/Makefile +++ b/contrib/tsearch2/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/contrib/tsearch2/Makefile,v 1.20 2007/11/13 21:02:28 tgl Exp $ +# contrib/tsearch2/Makefile MODULES = tsearch2 DATA_built = tsearch2.sql diff --git a/contrib/tsearch2/tsearch2.c b/contrib/tsearch2/tsearch2.c index 24c02aa45d..030a84c73b 100644 --- a/contrib/tsearch2/tsearch2.c +++ b/contrib/tsearch2/tsearch2.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/contrib/tsearch2/tsearch2.c,v 1.13 2010/08/05 15:25:35 rhaas Exp $ + * contrib/tsearch2/tsearch2.c * *------------------------------------------------------------------------- */ diff --git a/contrib/tsearch2/tsearch2.sql.in b/contrib/tsearch2/tsearch2.sql.in index fc19037578..739d57eaa9 100644 --- a/contrib/tsearch2/tsearch2.sql.in +++ b/contrib/tsearch2/tsearch2.sql.in @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/tsearch2/tsearch2.sql.in,v 1.7 2009/03/25 22:19:01 tgl Exp $ */ +/* contrib/tsearch2/tsearch2.sql.in */ -- Adjust this setting to control where the objects get created. SET search_path = public; diff --git a/contrib/tsearch2/uninstall_tsearch2.sql b/contrib/tsearch2/uninstall_tsearch2.sql index 180b021d2c..f444a218e6 100644 --- a/contrib/tsearch2/uninstall_tsearch2.sql +++ b/contrib/tsearch2/uninstall_tsearch2.sql @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/tsearch2/uninstall_tsearch2.sql,v 1.2 2007/11/16 00:34:54 tgl Exp $ */ +/* contrib/tsearch2/uninstall_tsearch2.sql */ -- Adjust this setting to control where the objects get dropped. SET search_path = public, pg_catalog; diff --git a/contrib/unaccent/Makefile b/contrib/unaccent/Makefile index 401f523283..36415fef77 100644 --- a/contrib/unaccent/Makefile +++ b/contrib/unaccent/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/contrib/unaccent/Makefile,v 1.2 2009/08/18 15:51:16 tgl Exp $ +# contrib/unaccent/Makefile MODULE_big = unaccent OBJS = unaccent.o diff --git a/contrib/unaccent/unaccent.c b/contrib/unaccent/unaccent.c index ce0085ffe5..2097d18a1b 100644 --- a/contrib/unaccent/unaccent.c +++ b/contrib/unaccent/unaccent.c @@ -6,7 +6,7 @@ * Copyright (c) 2009-2010, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/contrib/unaccent/unaccent.c,v 1.6 2010/08/05 15:25:35 rhaas Exp $ + * contrib/unaccent/unaccent.c * *------------------------------------------------------------------------- */ diff --git a/contrib/unaccent/unaccent.sql.in b/contrib/unaccent/unaccent.sql.in index 1f3c3c8a4a..7e397cc8d2 100644 --- a/contrib/unaccent/unaccent.sql.in +++ b/contrib/unaccent/unaccent.sql.in @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/unaccent/unaccent.sql.in,v 1.2 2009/11/14 18:24:32 tgl Exp $ */ +/* contrib/unaccent/unaccent.sql.in */ -- Adjust this setting to control where the objects get created. SET search_path = public; diff --git a/contrib/unaccent/uninstall_unaccent.sql b/contrib/unaccent/uninstall_unaccent.sql index f60ab564da..6879d4f74c 100644 --- a/contrib/unaccent/uninstall_unaccent.sql +++ b/contrib/unaccent/uninstall_unaccent.sql @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/unaccent/uninstall_unaccent.sql,v 1.2 2009/11/14 18:24:32 tgl Exp $ */ +/* contrib/unaccent/uninstall_unaccent.sql */ -- Adjust this setting to control where the objects get dropped. SET search_path = public; diff --git a/contrib/uuid-ossp/Makefile b/contrib/uuid-ossp/Makefile index 4ed83537dd..77ea87409f 100644 --- a/contrib/uuid-ossp/Makefile +++ b/contrib/uuid-ossp/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/contrib/uuid-ossp/Makefile,v 1.4 2007/11/13 00:13:19 tgl Exp $ +# contrib/uuid-ossp/Makefile MODULE_big = uuid-ossp OBJS = uuid-ossp.o diff --git a/contrib/uuid-ossp/uninstall_uuid-ossp.sql b/contrib/uuid-ossp/uninstall_uuid-ossp.sql index 75c9f3678f..0fafb2721f 100644 --- a/contrib/uuid-ossp/uninstall_uuid-ossp.sql +++ b/contrib/uuid-ossp/uninstall_uuid-ossp.sql @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/uuid-ossp/uninstall_uuid-ossp.sql,v 1.3 2007/11/13 04:24:29 momjian Exp $ */ +/* contrib/uuid-ossp/uninstall_uuid-ossp.sql */ -- Adjust this setting to control where the objects get dropped. SET search_path = public; diff --git a/contrib/uuid-ossp/uuid-ossp.c b/contrib/uuid-ossp/uuid-ossp.c index a7d8f509bc..f89c9fafba 100644 --- a/contrib/uuid-ossp/uuid-ossp.c +++ b/contrib/uuid-ossp/uuid-ossp.c @@ -4,7 +4,7 @@ * * Copyright (c) 2007-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/contrib/uuid-ossp/uuid-ossp.c,v 1.12 2010/01/02 16:57:33 momjian Exp $ + * contrib/uuid-ossp/uuid-ossp.c * *------------------------------------------------------------------------- */ diff --git a/contrib/uuid-ossp/uuid-ossp.sql.in b/contrib/uuid-ossp/uuid-ossp.sql.in index e59882f456..71212cde48 100644 --- a/contrib/uuid-ossp/uuid-ossp.sql.in +++ b/contrib/uuid-ossp/uuid-ossp.sql.in @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/uuid-ossp/uuid-ossp.sql.in,v 1.6 2007/11/13 04:24:29 momjian Exp $ */ +/* contrib/uuid-ossp/uuid-ossp.sql.in */ -- Adjust this setting to control where the objects get created. SET search_path = public; diff --git a/contrib/vacuumlo/Makefile b/contrib/vacuumlo/Makefile index 4c68e69578..4dd2ebc03e 100644 --- a/contrib/vacuumlo/Makefile +++ b/contrib/vacuumlo/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/contrib/vacuumlo/Makefile,v 1.18 2010/05/12 11:33:08 momjian Exp $ +# contrib/vacuumlo/Makefile PGFILEDESC = "vacuumlo - removes orphaned large objects" PGAPPICON=win32 diff --git a/contrib/vacuumlo/vacuumlo.c b/contrib/vacuumlo/vacuumlo.c index 2ed1cbeb93..07da355e84 100644 --- a/contrib/vacuumlo/vacuumlo.c +++ b/contrib/vacuumlo/vacuumlo.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/contrib/vacuumlo/vacuumlo.c,v 1.45 2010/02/17 04:19:37 tgl Exp $ + * contrib/vacuumlo/vacuumlo.c * *------------------------------------------------------------------------- */ diff --git a/contrib/xml2/Makefile b/contrib/xml2/Makefile index dd45a914c9..57b4cbfac5 100644 --- a/contrib/xml2/Makefile +++ b/contrib/xml2/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/contrib/xml2/Makefile,v 1.14 2010/03/01 18:07:59 tgl Exp $ +# contrib/xml2/Makefile MODULE_big = pgxml diff --git a/contrib/xml2/pgxml.sql.in b/contrib/xml2/pgxml.sql.in index 0a52561135..8c3d420afd 100644 --- a/contrib/xml2/pgxml.sql.in +++ b/contrib/xml2/pgxml.sql.in @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/xml2/pgxml.sql.in,v 1.13 2010/08/13 18:36:23 tgl Exp $ */ +/* contrib/xml2/pgxml.sql.in */ -- Adjust this setting to control where the objects get created. SET search_path = public; diff --git a/contrib/xml2/uninstall_pgxml.sql b/contrib/xml2/uninstall_pgxml.sql index 016658dc7f..1696390f80 100644 --- a/contrib/xml2/uninstall_pgxml.sql +++ b/contrib/xml2/uninstall_pgxml.sql @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/contrib/xml2/uninstall_pgxml.sql,v 1.5 2010/08/13 18:36:23 tgl Exp $ */ +/* contrib/xml2/uninstall_pgxml.sql */ -- Adjust this setting to control where the objects get dropped. SET search_path = public; diff --git a/contrib/xml2/xpath.c b/contrib/xml2/xpath.c index 8ee949ce4e..0df764770b 100644 --- a/contrib/xml2/xpath.c +++ b/contrib/xml2/xpath.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/xml2/xpath.c,v 1.31 2010/08/13 18:36:23 tgl Exp $ + * contrib/xml2/xpath.c * * Parser interface for DOM-based parser (libxml) rather than * stream-based SAX-type parser diff --git a/contrib/xml2/xslt_proc.c b/contrib/xml2/xslt_proc.c index 158345b20b..a90104d17a 100644 --- a/contrib/xml2/xslt_proc.c +++ b/contrib/xml2/xslt_proc.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/xml2/xslt_proc.c,v 1.22 2010/08/10 23:02:00 tgl Exp $ + * contrib/xml2/xslt_proc.c * * XSLT processing functions (requiring libxslt) * diff --git a/doc/Makefile b/doc/Makefile index 32ef320b4d..aee3cc0965 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/doc/Makefile,v 1.39 2009/08/09 22:47:59 petere Exp $ +# doc/Makefile # #---------------------------------------------------------------------------- diff --git a/doc/src/Makefile b/doc/src/Makefile index 57da994476..30d883815a 100644 --- a/doc/src/Makefile +++ b/doc/src/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/doc/src/Makefile,v 1.37 2009/08/09 22:47:59 petere Exp $ +# doc/src/Makefile subdir = doc/src top_builddir = ../.. diff --git a/doc/src/sgml/Makefile b/doc/src/sgml/Makefile index 5745362214..622aa4fe74 100644 --- a/doc/src/sgml/Makefile +++ b/doc/src/sgml/Makefile @@ -2,7 +2,7 @@ # # PostgreSQL documentation makefile # -# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.148 2010/06/12 21:40:31 tgl Exp $ +# doc/src/sgml/Makefile # #---------------------------------------------------------------------------- diff --git a/doc/src/sgml/README.links b/doc/src/sgml/README.links index 1991c20b23..8608859eac 100644 --- a/doc/src/sgml/README.links +++ b/doc/src/sgml/README.links @@ -1,4 +1,4 @@ - + Linking within SGML documents can be confusing, so here is a summary: diff --git a/doc/src/sgml/acronyms.sgml b/doc/src/sgml/acronyms.sgml index 8bcad311d2..9a759d11b7 100644 --- a/doc/src/sgml/acronyms.sgml +++ b/doc/src/sgml/acronyms.sgml @@ -1,4 +1,4 @@ - + Acronyms diff --git a/doc/src/sgml/adminpack.sgml b/doc/src/sgml/adminpack.sgml index b097000281..76ff6f5394 100644 --- a/doc/src/sgml/adminpack.sgml +++ b/doc/src/sgml/adminpack.sgml @@ -1,4 +1,4 @@ - + adminpack diff --git a/doc/src/sgml/advanced.sgml b/doc/src/sgml/advanced.sgml index 38045b51fd..784b40a362 100644 --- a/doc/src/sgml/advanced.sgml +++ b/doc/src/sgml/advanced.sgml @@ -1,4 +1,4 @@ - + Advanced Features diff --git a/doc/src/sgml/arch-dev.sgml b/doc/src/sgml/arch-dev.sgml index ffee776c38..c1d9043f7d 100644 --- a/doc/src/sgml/arch-dev.sgml +++ b/doc/src/sgml/arch-dev.sgml @@ -1,4 +1,4 @@ - + Overview of PostgreSQL Internals diff --git a/doc/src/sgml/array.sgml b/doc/src/sgml/array.sgml index bfc373ac05..bb4657e33c 100644 --- a/doc/src/sgml/array.sgml +++ b/doc/src/sgml/array.sgml @@ -1,4 +1,4 @@ - + Arrays diff --git a/doc/src/sgml/auto-explain.sgml b/doc/src/sgml/auto-explain.sgml index ede38cd91a..82b209f9c6 100644 --- a/doc/src/sgml/auto-explain.sgml +++ b/doc/src/sgml/auto-explain.sgml @@ -1,4 +1,4 @@ - + auto_explain diff --git a/doc/src/sgml/backup.sgml b/doc/src/sgml/backup.sgml index edfdba7342..3ce6fffb05 100644 --- a/doc/src/sgml/backup.sgml +++ b/doc/src/sgml/backup.sgml @@ -1,4 +1,4 @@ - + Backup and Restore diff --git a/doc/src/sgml/biblio.sgml b/doc/src/sgml/biblio.sgml index 859b888a5c..e02f443566 100644 --- a/doc/src/sgml/biblio.sgml +++ b/doc/src/sgml/biblio.sgml @@ -1,4 +1,4 @@ - + Bibliography diff --git a/doc/src/sgml/bki.sgml b/doc/src/sgml/bki.sgml index 442113bbf1..aaf500ad08 100644 --- a/doc/src/sgml/bki.sgml +++ b/doc/src/sgml/bki.sgml @@ -1,4 +1,4 @@ - + <acronym>BKI</acronym> Backend Interface diff --git a/doc/src/sgml/btree-gin.sgml b/doc/src/sgml/btree-gin.sgml index 8c3cb02696..b55c89395d 100644 --- a/doc/src/sgml/btree-gin.sgml +++ b/doc/src/sgml/btree-gin.sgml @@ -1,4 +1,4 @@ - + btree_gin diff --git a/doc/src/sgml/btree-gist.sgml b/doc/src/sgml/btree-gist.sgml index 697f168b55..482d47d41e 100644 --- a/doc/src/sgml/btree-gist.sgml +++ b/doc/src/sgml/btree-gist.sgml @@ -1,4 +1,4 @@ - + btree_gist diff --git a/doc/src/sgml/catalogs.sgml b/doc/src/sgml/catalogs.sgml index 43776029eb..ab11b15065 100644 --- a/doc/src/sgml/catalogs.sgml +++ b/doc/src/sgml/catalogs.sgml @@ -1,4 +1,4 @@ - + diff --git a/doc/src/sgml/charset.sgml b/doc/src/sgml/charset.sgml index f7b9c5dd24..e94922124c 100644 --- a/doc/src/sgml/charset.sgml +++ b/doc/src/sgml/charset.sgml @@ -1,4 +1,4 @@ - + Localization</> diff --git a/doc/src/sgml/chkpass.sgml b/doc/src/sgml/chkpass.sgml index 9aab5139c8..b9b3c08c25 100644 --- a/doc/src/sgml/chkpass.sgml +++ b/doc/src/sgml/chkpass.sgml @@ -1,4 +1,4 @@ -<!-- $PostgreSQL: pgsql/doc/src/sgml/chkpass.sgml,v 1.3 2010/08/17 04:37:20 petere Exp $ --> +<!-- doc/src/sgml/chkpass.sgml --> <sect1 id="chkpass"> <title>chkpass diff --git a/doc/src/sgml/citext.sgml b/doc/src/sgml/citext.sgml index d0b4f2fefd..68a2aa4cd3 100644 --- a/doc/src/sgml/citext.sgml +++ b/doc/src/sgml/citext.sgml @@ -1,4 +1,4 @@ - + citext diff --git a/doc/src/sgml/client-auth.sgml b/doc/src/sgml/client-auth.sgml index 236b0a5ff9..5cf2f29db9 100644 --- a/doc/src/sgml/client-auth.sgml +++ b/doc/src/sgml/client-auth.sgml @@ -1,4 +1,4 @@ - + Client Authentication diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml index 1b8183f9fe..affce37d0d 100644 --- a/doc/src/sgml/config.sgml +++ b/doc/src/sgml/config.sgml @@ -1,4 +1,4 @@ - + Server Configuration diff --git a/doc/src/sgml/contacts.sgml b/doc/src/sgml/contacts.sgml index 6b15de3968..996c0771bb 100644 --- a/doc/src/sgml/contacts.sgml +++ b/doc/src/sgml/contacts.sgml @@ -1,4 +1,4 @@ - + Contacts diff --git a/doc/src/sgml/contrib-spi.sgml b/doc/src/sgml/contrib-spi.sgml index 205bbcd09b..0f5a1f6787 100644 --- a/doc/src/sgml/contrib-spi.sgml +++ b/doc/src/sgml/contrib-spi.sgml @@ -1,4 +1,4 @@ - + spi diff --git a/doc/src/sgml/contrib.sgml b/doc/src/sgml/contrib.sgml index b801c40443..c31041614b 100644 --- a/doc/src/sgml/contrib.sgml +++ b/doc/src/sgml/contrib.sgml @@ -1,4 +1,4 @@ - + Additional Supplied Modules diff --git a/doc/src/sgml/cube.sgml b/doc/src/sgml/cube.sgml index 6f0b252d2e..deb0109d13 100644 --- a/doc/src/sgml/cube.sgml +++ b/doc/src/sgml/cube.sgml @@ -1,4 +1,4 @@ - + cube diff --git a/doc/src/sgml/cvs.sgml b/doc/src/sgml/cvs.sgml index b8116b98ce..55de20cd8c 100644 --- a/doc/src/sgml/cvs.sgml +++ b/doc/src/sgml/cvs.sgml @@ -1,4 +1,4 @@ - + diff --git a/doc/src/sgml/datatype.sgml b/doc/src/sgml/datatype.sgml index d14c7595c8..02eaedf943 100644 --- a/doc/src/sgml/datatype.sgml +++ b/doc/src/sgml/datatype.sgml @@ -1,4 +1,4 @@ - + Data Types diff --git a/doc/src/sgml/datetime.sgml b/doc/src/sgml/datetime.sgml index d072118869..fb75a1e8b0 100644 --- a/doc/src/sgml/datetime.sgml +++ b/doc/src/sgml/datetime.sgml @@ -1,4 +1,4 @@ - + Date/Time Support diff --git a/doc/src/sgml/dblink.sgml b/doc/src/sgml/dblink.sgml index 128867ebe2..0e9cd22026 100644 --- a/doc/src/sgml/dblink.sgml +++ b/doc/src/sgml/dblink.sgml @@ -1,4 +1,4 @@ - + dblink diff --git a/doc/src/sgml/ddl.sgml b/doc/src/sgml/ddl.sgml index 261f675368..6bfcbcc894 100644 --- a/doc/src/sgml/ddl.sgml +++ b/doc/src/sgml/ddl.sgml @@ -1,4 +1,4 @@ - + Data Definition diff --git a/doc/src/sgml/dfunc.sgml b/doc/src/sgml/dfunc.sgml index 310787aa12..689b14ffa5 100644 --- a/doc/src/sgml/dfunc.sgml +++ b/doc/src/sgml/dfunc.sgml @@ -1,4 +1,4 @@ - + Compiling and Linking Dynamically-Loaded Functions diff --git a/doc/src/sgml/dict-int.sgml b/doc/src/sgml/dict-int.sgml index d19487f789..b1d69e1a4c 100644 --- a/doc/src/sgml/dict-int.sgml +++ b/doc/src/sgml/dict-int.sgml @@ -1,4 +1,4 @@ - + dict_int diff --git a/doc/src/sgml/dict-xsyn.sgml b/doc/src/sgml/dict-xsyn.sgml index 0ac839403f..e77889e388 100644 --- a/doc/src/sgml/dict-xsyn.sgml +++ b/doc/src/sgml/dict-xsyn.sgml @@ -1,4 +1,4 @@ - + dict_xsyn diff --git a/doc/src/sgml/diskusage.sgml b/doc/src/sgml/diskusage.sgml index 18e627d4fe..0f390f3d35 100644 --- a/doc/src/sgml/diskusage.sgml +++ b/doc/src/sgml/diskusage.sgml @@ -1,4 +1,4 @@ - + Monitoring Disk Usage diff --git a/doc/src/sgml/dml.sgml b/doc/src/sgml/dml.sgml index 69d162efe7..cd36a73811 100644 --- a/doc/src/sgml/dml.sgml +++ b/doc/src/sgml/dml.sgml @@ -1,4 +1,4 @@ - + Data Manipulation diff --git a/doc/src/sgml/docguide.sgml b/doc/src/sgml/docguide.sgml index 79d15310ff..87c7ddf2b0 100644 --- a/doc/src/sgml/docguide.sgml +++ b/doc/src/sgml/docguide.sgml @@ -1,4 +1,4 @@ - + Documentation diff --git a/doc/src/sgml/earthdistance.sgml b/doc/src/sgml/earthdistance.sgml index 989f6f06c4..08f6357830 100644 --- a/doc/src/sgml/earthdistance.sgml +++ b/doc/src/sgml/earthdistance.sgml @@ -1,4 +1,4 @@ - + earthdistance diff --git a/doc/src/sgml/ecpg.sgml b/doc/src/sgml/ecpg.sgml index 6f4e021fa7..3245064375 100644 --- a/doc/src/sgml/ecpg.sgml +++ b/doc/src/sgml/ecpg.sgml @@ -1,4 +1,4 @@ - + <application>ECPG</application> - Embedded <acronym>SQL</acronym> in C diff --git a/doc/src/sgml/errcodes.sgml b/doc/src/sgml/errcodes.sgml index b5962f98cd..3288687172 100644 --- a/doc/src/sgml/errcodes.sgml +++ b/doc/src/sgml/errcodes.sgml @@ -1,4 +1,4 @@ - + <productname>PostgreSQL</productname> Error Codes diff --git a/doc/src/sgml/extend.sgml b/doc/src/sgml/extend.sgml index d3b93dbe34..2e8f77cf4f 100644 --- a/doc/src/sgml/extend.sgml +++ b/doc/src/sgml/extend.sgml @@ -1,4 +1,4 @@ - + Extending <acronym>SQL</acronym> diff --git a/doc/src/sgml/external-projects.sgml b/doc/src/sgml/external-projects.sgml index ca09e83c5a..8fb3cbf08c 100644 --- a/doc/src/sgml/external-projects.sgml +++ b/doc/src/sgml/external-projects.sgml @@ -1,4 +1,4 @@ - + External Projects diff --git a/doc/src/sgml/features.sgml b/doc/src/sgml/features.sgml index 56b5be3318..fbaeca6ed3 100644 --- a/doc/src/sgml/features.sgml +++ b/doc/src/sgml/features.sgml @@ -1,4 +1,4 @@ - + SQL Conformance diff --git a/doc/src/sgml/filelist.sgml b/doc/src/sgml/filelist.sgml index f0da8adc72..ef86190ef5 100644 --- a/doc/src/sgml/filelist.sgml +++ b/doc/src/sgml/filelist.sgml @@ -1,4 +1,4 @@ - + diff --git a/doc/src/sgml/fixrtf b/doc/src/sgml/fixrtf index d5beeea4e6..31cb5f85c0 100755 --- a/doc/src/sgml/fixrtf +++ b/doc/src/sgml/fixrtf @@ -1,7 +1,7 @@ #!/bin/sh # fixrtf -# $PostgreSQL: pgsql/doc/src/sgml/fixrtf,v 2.3 2006/03/11 04:38:30 momjian Exp $ +# doc/src/sgml/fixrtf # Repair (slightly) damaged RTF generated by jade # Applixware wants the s0 stylesheet defined, whereas diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml index 9dc67e27d0..3ed0e3553a 100644 --- a/doc/src/sgml/func.sgml +++ b/doc/src/sgml/func.sgml @@ -1,4 +1,4 @@ - + Functions and Operators diff --git a/doc/src/sgml/fuzzystrmatch.sgml b/doc/src/sgml/fuzzystrmatch.sgml index 32e39bdcf6..69777e4935 100644 --- a/doc/src/sgml/fuzzystrmatch.sgml +++ b/doc/src/sgml/fuzzystrmatch.sgml @@ -1,4 +1,4 @@ - + fuzzystrmatch diff --git a/doc/src/sgml/generate_history.pl b/doc/src/sgml/generate_history.pl index 20f3d0e87c..2b81569b9a 100644 --- a/doc/src/sgml/generate_history.pl +++ b/doc/src/sgml/generate_history.pl @@ -9,7 +9,7 @@ # in a standalone build of the release notes. To make sure this is done # everywhere, we have to fold in the sub-files of the release notes. # -# $PostgreSQL: pgsql/doc/src/sgml/generate_history.pl,v 1.1 2009/05/02 20:17:19 tgl Exp $ +# doc/src/sgml/generate_history.pl use strict; diff --git a/doc/src/sgml/geqo.sgml b/doc/src/sgml/geqo.sgml index 75ebdaa4c9..92276fcd76 100644 --- a/doc/src/sgml/geqo.sgml +++ b/doc/src/sgml/geqo.sgml @@ -1,4 +1,4 @@ - + diff --git a/doc/src/sgml/gin.sgml b/doc/src/sgml/gin.sgml index 06bdc03dcb..a1838e6266 100644 --- a/doc/src/sgml/gin.sgml +++ b/doc/src/sgml/gin.sgml @@ -1,4 +1,4 @@ - + GIN Indexes diff --git a/doc/src/sgml/gist.sgml b/doc/src/sgml/gist.sgml index 8c9f8c5e26..74afae69f1 100644 --- a/doc/src/sgml/gist.sgml +++ b/doc/src/sgml/gist.sgml @@ -1,4 +1,4 @@ - + GiST Indexes diff --git a/doc/src/sgml/high-availability.sgml b/doc/src/sgml/high-availability.sgml index 3674dd319f..211cc25d82 100644 --- a/doc/src/sgml/high-availability.sgml +++ b/doc/src/sgml/high-availability.sgml @@ -1,4 +1,4 @@ - + High Availability, Load Balancing, and Replication diff --git a/doc/src/sgml/history.sgml b/doc/src/sgml/history.sgml index c2ae854d8f..62e2b29122 100644 --- a/doc/src/sgml/history.sgml +++ b/doc/src/sgml/history.sgml @@ -1,4 +1,4 @@ - + A Brief History of <productname>PostgreSQL</productname> diff --git a/doc/src/sgml/hstore.sgml b/doc/src/sgml/hstore.sgml index ad084c6ffb..6ccc9d664b 100644 --- a/doc/src/sgml/hstore.sgml +++ b/doc/src/sgml/hstore.sgml @@ -1,4 +1,4 @@ - + hstore diff --git a/doc/src/sgml/indexam.sgml b/doc/src/sgml/indexam.sgml index 8eda21a4b3..925aac4571 100644 --- a/doc/src/sgml/indexam.sgml +++ b/doc/src/sgml/indexam.sgml @@ -1,4 +1,4 @@ - + Index Access Method Interface Definition diff --git a/doc/src/sgml/indices.sgml b/doc/src/sgml/indices.sgml index b647c93dd6..15c3320e2f 100644 --- a/doc/src/sgml/indices.sgml +++ b/doc/src/sgml/indices.sgml @@ -1,4 +1,4 @@ - + Indexes diff --git a/doc/src/sgml/info.sgml b/doc/src/sgml/info.sgml index 6e358e7719..263085474a 100644 --- a/doc/src/sgml/info.sgml +++ b/doc/src/sgml/info.sgml @@ -1,4 +1,4 @@ - + Further Information diff --git a/doc/src/sgml/information_schema.sgml b/doc/src/sgml/information_schema.sgml index 124bbc3ac2..509efea8e1 100644 --- a/doc/src/sgml/information_schema.sgml +++ b/doc/src/sgml/information_schema.sgml @@ -1,4 +1,4 @@ - + The Information Schema diff --git a/doc/src/sgml/install-win32.sgml b/doc/src/sgml/install-win32.sgml index d88f6ef14d..a1fea05c67 100644 --- a/doc/src/sgml/install-win32.sgml +++ b/doc/src/sgml/install-win32.sgml @@ -1,4 +1,4 @@ - + Installation from Source Code on <productname>Windows</productname> diff --git a/doc/src/sgml/installation.sgml b/doc/src/sgml/installation.sgml index 8089d6c3a4..e09ff1842f 100644 --- a/doc/src/sgml/installation.sgml +++ b/doc/src/sgml/installation.sgml @@ -1,4 +1,4 @@ - + <![%standalone-include[<productname>PostgreSQL</>]]> diff --git a/doc/src/sgml/intagg.sgml b/doc/src/sgml/intagg.sgml index 84dcace335..43e36fb348 100644 --- a/doc/src/sgml/intagg.sgml +++ b/doc/src/sgml/intagg.sgml @@ -1,4 +1,4 @@ -<!-- $PostgreSQL: pgsql/doc/src/sgml/intagg.sgml,v 1.5 2010/07/29 19:34:40 petere Exp $ --> +<!-- doc/src/sgml/intagg.sgml --> <sect1 id="intagg"> <title>intagg diff --git a/doc/src/sgml/intarray.sgml b/doc/src/sgml/intarray.sgml index f89c585ce9..1cf72a1201 100644 --- a/doc/src/sgml/intarray.sgml +++ b/doc/src/sgml/intarray.sgml @@ -1,4 +1,4 @@ - + intarray diff --git a/doc/src/sgml/intro.sgml b/doc/src/sgml/intro.sgml index b5945dacac..4d3f93f317 100644 --- a/doc/src/sgml/intro.sgml +++ b/doc/src/sgml/intro.sgml @@ -1,4 +1,4 @@ - + Preface diff --git a/doc/src/sgml/isn.sgml b/doc/src/sgml/isn.sgml index 358c490aa9..d1d98fe1b8 100644 --- a/doc/src/sgml/isn.sgml +++ b/doc/src/sgml/isn.sgml @@ -1,4 +1,4 @@ - + isn diff --git a/doc/src/sgml/jadetex.cfg b/doc/src/sgml/jadetex.cfg index 45ff76ffbb..25b79312eb 100644 --- a/doc/src/sgml/jadetex.cfg +++ b/doc/src/sgml/jadetex.cfg @@ -1,4 +1,4 @@ -% $PostgreSQL: pgsql/doc/src/sgml/jadetex.cfg,v 1.1 2010/04/29 16:32:41 tgl Exp $ +% doc/src/sgml/jadetex.cfg % % This file redefines FlowObjectSetup to eliminate one of the two control % sequences it normally creates, thereby substantially reducing string usage diff --git a/doc/src/sgml/keywords.sgml b/doc/src/sgml/keywords.sgml index 2fc180ae86..8052627b2b 100644 --- a/doc/src/sgml/keywords.sgml +++ b/doc/src/sgml/keywords.sgml @@ -1,4 +1,4 @@ - + <acronym>SQL</acronym> Key Words diff --git a/doc/src/sgml/legal.sgml b/doc/src/sgml/legal.sgml index cbd1ae0d32..e2ca5b2df7 100644 --- a/doc/src/sgml/legal.sgml +++ b/doc/src/sgml/legal.sgml @@ -1,4 +1,4 @@ - + 1996-2010 diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml index 141ff10a4b..70d9202e50 100644 --- a/doc/src/sgml/libpq.sgml +++ b/doc/src/sgml/libpq.sgml @@ -1,4 +1,4 @@ - + <application>libpq</application> - C Library diff --git a/doc/src/sgml/lo.sgml b/doc/src/sgml/lo.sgml index 3415105cdf..ab43a53263 100644 --- a/doc/src/sgml/lo.sgml +++ b/doc/src/sgml/lo.sgml @@ -1,4 +1,4 @@ - + lo diff --git a/doc/src/sgml/lobj.sgml b/doc/src/sgml/lobj.sgml index 91a5c24341..23e910f30e 100644 --- a/doc/src/sgml/lobj.sgml +++ b/doc/src/sgml/lobj.sgml @@ -1,4 +1,4 @@ - + Large Objects diff --git a/doc/src/sgml/ltree.sgml b/doc/src/sgml/ltree.sgml index 5e0b01b5e7..d6b58c17d7 100644 --- a/doc/src/sgml/ltree.sgml +++ b/doc/src/sgml/ltree.sgml @@ -1,4 +1,4 @@ - + ltree diff --git a/doc/src/sgml/maintenance.sgml b/doc/src/sgml/maintenance.sgml index 8f7fb6d346..70b99e8732 100644 --- a/doc/src/sgml/maintenance.sgml +++ b/doc/src/sgml/maintenance.sgml @@ -1,4 +1,4 @@ - + Routine Database Maintenance Tasks diff --git a/doc/src/sgml/manage-ag.sgml b/doc/src/sgml/manage-ag.sgml index e2321d125e..d4f40a2c40 100644 --- a/doc/src/sgml/manage-ag.sgml +++ b/doc/src/sgml/manage-ag.sgml @@ -1,4 +1,4 @@ - + Managing Databases diff --git a/doc/src/sgml/mk_feature_tables.pl b/doc/src/sgml/mk_feature_tables.pl index 5dad68b809..7c78e0e3aa 100644 --- a/doc/src/sgml/mk_feature_tables.pl +++ b/doc/src/sgml/mk_feature_tables.pl @@ -1,6 +1,6 @@ # /usr/bin/perl -w -# $PostgreSQL: pgsql/doc/src/sgml/mk_feature_tables.pl,v 2.3 2008/10/18 00:35:32 petere Exp $ +# doc/src/sgml/mk_feature_tables.pl my $yesno = $ARGV[0]; diff --git a/doc/src/sgml/monitoring.sgml b/doc/src/sgml/monitoring.sgml index a2a80d10a2..8c73f39fb8 100644 --- a/doc/src/sgml/monitoring.sgml +++ b/doc/src/sgml/monitoring.sgml @@ -1,4 +1,4 @@ - + Monitoring Database Activity diff --git a/doc/src/sgml/mvcc.sgml b/doc/src/sgml/mvcc.sgml index e72a32c58e..57156329a6 100644 --- a/doc/src/sgml/mvcc.sgml +++ b/doc/src/sgml/mvcc.sgml @@ -1,4 +1,4 @@ - + Concurrency Control diff --git a/doc/src/sgml/nls.sgml b/doc/src/sgml/nls.sgml index da8902a584..a911337418 100644 --- a/doc/src/sgml/nls.sgml +++ b/doc/src/sgml/nls.sgml @@ -1,4 +1,4 @@ - + diff --git a/doc/src/sgml/notation.sgml b/doc/src/sgml/notation.sgml index 7620156b07..48a82ca376 100644 --- a/doc/src/sgml/notation.sgml +++ b/doc/src/sgml/notation.sgml @@ -1,4 +1,4 @@ - + Conventions diff --git a/doc/src/sgml/oid2name.sgml b/doc/src/sgml/oid2name.sgml index f6fbea8a57..36fcfd5cda 100644 --- a/doc/src/sgml/oid2name.sgml +++ b/doc/src/sgml/oid2name.sgml @@ -1,4 +1,4 @@ - + oid2name diff --git a/doc/src/sgml/pageinspect.sgml b/doc/src/sgml/pageinspect.sgml index 3572e990f7..a5fbadb731 100644 --- a/doc/src/sgml/pageinspect.sgml +++ b/doc/src/sgml/pageinspect.sgml @@ -1,4 +1,4 @@ - + pageinspect diff --git a/doc/src/sgml/passwordcheck.sgml b/doc/src/sgml/passwordcheck.sgml index 2da1f52650..11107fb6dd 100644 --- a/doc/src/sgml/passwordcheck.sgml +++ b/doc/src/sgml/passwordcheck.sgml @@ -1,4 +1,4 @@ - + passwordcheck diff --git a/doc/src/sgml/perform.sgml b/doc/src/sgml/perform.sgml index b8504227dc..26998283d8 100644 --- a/doc/src/sgml/perform.sgml +++ b/doc/src/sgml/perform.sgml @@ -1,4 +1,4 @@ - + Performance Tips diff --git a/doc/src/sgml/pgarchivecleanup.sgml b/doc/src/sgml/pgarchivecleanup.sgml index 49f8b82784..abe18ea465 100644 --- a/doc/src/sgml/pgarchivecleanup.sgml +++ b/doc/src/sgml/pgarchivecleanup.sgml @@ -1,4 +1,4 @@ - + pg_archivecleanup diff --git a/doc/src/sgml/pgbench.sgml b/doc/src/sgml/pgbench.sgml index 552c12f526..a33ac1760c 100644 --- a/doc/src/sgml/pgbench.sgml +++ b/doc/src/sgml/pgbench.sgml @@ -1,4 +1,4 @@ - + pgbench diff --git a/doc/src/sgml/pgbuffercache.sgml b/doc/src/sgml/pgbuffercache.sgml index dc402ed490..1ecb63e811 100644 --- a/doc/src/sgml/pgbuffercache.sgml +++ b/doc/src/sgml/pgbuffercache.sgml @@ -1,4 +1,4 @@ - + pg_buffercache diff --git a/doc/src/sgml/pgcrypto.sgml b/doc/src/sgml/pgcrypto.sgml index b56d841c64..a6575bdac2 100644 --- a/doc/src/sgml/pgcrypto.sgml +++ b/doc/src/sgml/pgcrypto.sgml @@ -1,4 +1,4 @@ - + pgcrypto diff --git a/doc/src/sgml/pgfreespacemap.sgml b/doc/src/sgml/pgfreespacemap.sgml index 87554380f9..f6cee39b54 100644 --- a/doc/src/sgml/pgfreespacemap.sgml +++ b/doc/src/sgml/pgfreespacemap.sgml @@ -1,4 +1,4 @@ - + pg_freespacemap diff --git a/doc/src/sgml/pgrowlocks.sgml b/doc/src/sgml/pgrowlocks.sgml index 51c6088a74..d8bbca5ba1 100644 --- a/doc/src/sgml/pgrowlocks.sgml +++ b/doc/src/sgml/pgrowlocks.sgml @@ -1,4 +1,4 @@ - + pgrowlocks diff --git a/doc/src/sgml/pgstandby.sgml b/doc/src/sgml/pgstandby.sgml index d8a4fffd69..9ee0e7b94b 100644 --- a/doc/src/sgml/pgstandby.sgml +++ b/doc/src/sgml/pgstandby.sgml @@ -1,4 +1,4 @@ - + pg_standby diff --git a/doc/src/sgml/pgstatstatements.sgml b/doc/src/sgml/pgstatstatements.sgml index abd811ad4d..c1738ffa89 100644 --- a/doc/src/sgml/pgstatstatements.sgml +++ b/doc/src/sgml/pgstatstatements.sgml @@ -1,4 +1,4 @@ - + pg_stat_statements diff --git a/doc/src/sgml/pgstattuple.sgml b/doc/src/sgml/pgstattuple.sgml index 597ddb6411..a3aab30044 100644 --- a/doc/src/sgml/pgstattuple.sgml +++ b/doc/src/sgml/pgstattuple.sgml @@ -1,4 +1,4 @@ - + pgstattuple diff --git a/doc/src/sgml/pgtrgm.sgml b/doc/src/sgml/pgtrgm.sgml index 38f0287933..376ab85823 100644 --- a/doc/src/sgml/pgtrgm.sgml +++ b/doc/src/sgml/pgtrgm.sgml @@ -1,4 +1,4 @@ - + pg_trgm diff --git a/doc/src/sgml/pgupgrade.sgml b/doc/src/sgml/pgupgrade.sgml index 3b3c00b8e1..2a806b52af 100644 --- a/doc/src/sgml/pgupgrade.sgml +++ b/doc/src/sgml/pgupgrade.sgml @@ -1,4 +1,4 @@ - + pg_upgrade diff --git a/doc/src/sgml/planstats.sgml b/doc/src/sgml/planstats.sgml index 1ba4101117..e7171ffb9b 100644 --- a/doc/src/sgml/planstats.sgml +++ b/doc/src/sgml/planstats.sgml @@ -1,4 +1,4 @@ - + How the Planner Uses Statistics diff --git a/doc/src/sgml/plhandler.sgml b/doc/src/sgml/plhandler.sgml index 8be93ac1ac..6cddf002fb 100644 --- a/doc/src/sgml/plhandler.sgml +++ b/doc/src/sgml/plhandler.sgml @@ -1,4 +1,4 @@ - + Writing A Procedural Language Handler diff --git a/doc/src/sgml/plperl.sgml b/doc/src/sgml/plperl.sgml index 7671aaa0a1..864b53d67a 100644 --- a/doc/src/sgml/plperl.sgml +++ b/doc/src/sgml/plperl.sgml @@ -1,4 +1,4 @@ - + PL/Perl - Perl Procedural Language diff --git a/doc/src/sgml/plpgsql.sgml b/doc/src/sgml/plpgsql.sgml index e18a287924..da831a0971 100644 --- a/doc/src/sgml/plpgsql.sgml +++ b/doc/src/sgml/plpgsql.sgml @@ -1,4 +1,4 @@ - + <application>PL/pgSQL</application> - <acronym>SQL</acronym> Procedural Language diff --git a/doc/src/sgml/plpython.sgml b/doc/src/sgml/plpython.sgml index 62673724cf..c5445637f1 100644 --- a/doc/src/sgml/plpython.sgml +++ b/doc/src/sgml/plpython.sgml @@ -1,4 +1,4 @@ - + PL/Python - Python Procedural Language diff --git a/doc/src/sgml/pltcl.sgml b/doc/src/sgml/pltcl.sgml index 5a425a8cb4..eb29a8fd03 100644 --- a/doc/src/sgml/pltcl.sgml +++ b/doc/src/sgml/pltcl.sgml @@ -1,4 +1,4 @@ - + PL/Tcl - Tcl Procedural Language diff --git a/doc/src/sgml/postgres.sgml b/doc/src/sgml/postgres.sgml index 3f2a6e0efc..79cd44fbd1 100644 --- a/doc/src/sgml/postgres.sgml +++ b/doc/src/sgml/postgres.sgml @@ -1,4 +1,4 @@ - + + Bug Reporting Guidelines diff --git a/doc/src/sgml/protocol.sgml b/doc/src/sgml/protocol.sgml index dc165f7253..7b2482be5a 100644 --- a/doc/src/sgml/protocol.sgml +++ b/doc/src/sgml/protocol.sgml @@ -1,4 +1,4 @@ - + Frontend/Backend Protocol diff --git a/doc/src/sgml/queries.sgml b/doc/src/sgml/queries.sgml index 9cffbd7071..d16824eddd 100644 --- a/doc/src/sgml/queries.sgml +++ b/doc/src/sgml/queries.sgml @@ -1,4 +1,4 @@ - + Queries diff --git a/doc/src/sgml/query.sgml b/doc/src/sgml/query.sgml index 0fd711368f..005ab581fa 100644 --- a/doc/src/sgml/query.sgml +++ b/doc/src/sgml/query.sgml @@ -1,4 +1,4 @@ - + The <acronym>SQL</acronym> Language diff --git a/doc/src/sgml/recovery-config.sgml b/doc/src/sgml/recovery-config.sgml index d555960b80..baddf59de6 100644 --- a/doc/src/sgml/recovery-config.sgml +++ b/doc/src/sgml/recovery-config.sgml @@ -1,4 +1,4 @@ - + Recovery Configuration diff --git a/doc/src/sgml/ref/abort.sgml b/doc/src/sgml/ref/abort.sgml index 4261cafe9b..4f5d401ae8 100644 --- a/doc/src/sgml/ref/abort.sgml +++ b/doc/src/sgml/ref/abort.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/allfiles.sgml b/doc/src/sgml/ref/allfiles.sgml index 1754aae58b..7b97883d1b 100644 --- a/doc/src/sgml/ref/allfiles.sgml +++ b/doc/src/sgml/ref/allfiles.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/alter_aggregate.sgml b/doc/src/sgml/ref/alter_aggregate.sgml index 9c9cc464c3..ae99f89856 100644 --- a/doc/src/sgml/ref/alter_aggregate.sgml +++ b/doc/src/sgml/ref/alter_aggregate.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/alter_conversion.sgml b/doc/src/sgml/ref/alter_conversion.sgml index 0576fd4eda..63ff3b2ad2 100644 --- a/doc/src/sgml/ref/alter_conversion.sgml +++ b/doc/src/sgml/ref/alter_conversion.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/alter_database.sgml b/doc/src/sgml/ref/alter_database.sgml index f150fbb755..cd36d52467 100644 --- a/doc/src/sgml/ref/alter_database.sgml +++ b/doc/src/sgml/ref/alter_database.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/alter_default_privileges.sgml b/doc/src/sgml/ref/alter_default_privileges.sgml index 2099c3471e..e1aa293c7f 100644 --- a/doc/src/sgml/ref/alter_default_privileges.sgml +++ b/doc/src/sgml/ref/alter_default_privileges.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/alter_domain.sgml b/doc/src/sgml/ref/alter_domain.sgml index 3033ba15f2..3720791449 100644 --- a/doc/src/sgml/ref/alter_domain.sgml +++ b/doc/src/sgml/ref/alter_domain.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/alter_foreign_data_wrapper.sgml b/doc/src/sgml/ref/alter_foreign_data_wrapper.sgml index 41a195db4c..4e9e8a2e28 100644 --- a/doc/src/sgml/ref/alter_foreign_data_wrapper.sgml +++ b/doc/src/sgml/ref/alter_foreign_data_wrapper.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/alter_function.sgml b/doc/src/sgml/ref/alter_function.sgml index 23145932f4..fd716b9667 100644 --- a/doc/src/sgml/ref/alter_function.sgml +++ b/doc/src/sgml/ref/alter_function.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/alter_group.sgml b/doc/src/sgml/ref/alter_group.sgml index 64e5da8d0f..55f43df0c5 100644 --- a/doc/src/sgml/ref/alter_group.sgml +++ b/doc/src/sgml/ref/alter_group.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/alter_index.sgml b/doc/src/sgml/ref/alter_index.sgml index 6d04b108f0..bccc76fe23 100644 --- a/doc/src/sgml/ref/alter_index.sgml +++ b/doc/src/sgml/ref/alter_index.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/alter_language.sgml b/doc/src/sgml/ref/alter_language.sgml index 362b3411fb..f7da530d2d 100644 --- a/doc/src/sgml/ref/alter_language.sgml +++ b/doc/src/sgml/ref/alter_language.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/alter_large_object.sgml b/doc/src/sgml/ref/alter_large_object.sgml index 1e90a165a9..6590a8ce2c 100755 --- a/doc/src/sgml/ref/alter_large_object.sgml +++ b/doc/src/sgml/ref/alter_large_object.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/alter_opclass.sgml b/doc/src/sgml/ref/alter_opclass.sgml index ef3078bfe4..0cdeed573a 100644 --- a/doc/src/sgml/ref/alter_opclass.sgml +++ b/doc/src/sgml/ref/alter_opclass.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/alter_operator.sgml b/doc/src/sgml/ref/alter_operator.sgml index d67ae302d0..22866424c5 100644 --- a/doc/src/sgml/ref/alter_operator.sgml +++ b/doc/src/sgml/ref/alter_operator.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/alter_opfamily.sgml b/doc/src/sgml/ref/alter_opfamily.sgml index 51c0a758e1..ed4877d333 100644 --- a/doc/src/sgml/ref/alter_opfamily.sgml +++ b/doc/src/sgml/ref/alter_opfamily.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/alter_role.sgml b/doc/src/sgml/ref/alter_role.sgml index 6945d76f71..8c832d56d6 100644 --- a/doc/src/sgml/ref/alter_role.sgml +++ b/doc/src/sgml/ref/alter_role.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/alter_schema.sgml b/doc/src/sgml/ref/alter_schema.sgml index 7f510e9ad4..4d67965e50 100644 --- a/doc/src/sgml/ref/alter_schema.sgml +++ b/doc/src/sgml/ref/alter_schema.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/alter_sequence.sgml b/doc/src/sgml/ref/alter_sequence.sgml index db13e9f70c..aa2b0ebc89 100644 --- a/doc/src/sgml/ref/alter_sequence.sgml +++ b/doc/src/sgml/ref/alter_sequence.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/alter_server.sgml b/doc/src/sgml/ref/alter_server.sgml index dfd72431b2..ab4731a434 100644 --- a/doc/src/sgml/ref/alter_server.sgml +++ b/doc/src/sgml/ref/alter_server.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/alter_table.sgml b/doc/src/sgml/ref/alter_table.sgml index 717a4c47f3..784feaef54 100644 --- a/doc/src/sgml/ref/alter_table.sgml +++ b/doc/src/sgml/ref/alter_table.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/alter_tablespace.sgml b/doc/src/sgml/ref/alter_tablespace.sgml index d778992bae..0a9a658125 100644 --- a/doc/src/sgml/ref/alter_tablespace.sgml +++ b/doc/src/sgml/ref/alter_tablespace.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/alter_trigger.sgml b/doc/src/sgml/ref/alter_trigger.sgml index 1e508d2401..2f943ee9c2 100644 --- a/doc/src/sgml/ref/alter_trigger.sgml +++ b/doc/src/sgml/ref/alter_trigger.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/alter_tsconfig.sgml b/doc/src/sgml/ref/alter_tsconfig.sgml index 7f70ca9e02..a832cba546 100644 --- a/doc/src/sgml/ref/alter_tsconfig.sgml +++ b/doc/src/sgml/ref/alter_tsconfig.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/alter_tsdictionary.sgml b/doc/src/sgml/ref/alter_tsdictionary.sgml index 458e4c48f5..3a591f8d90 100644 --- a/doc/src/sgml/ref/alter_tsdictionary.sgml +++ b/doc/src/sgml/ref/alter_tsdictionary.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/alter_tsparser.sgml b/doc/src/sgml/ref/alter_tsparser.sgml index eed1b58e8a..02382aa2c7 100644 --- a/doc/src/sgml/ref/alter_tsparser.sgml +++ b/doc/src/sgml/ref/alter_tsparser.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/alter_tstemplate.sgml b/doc/src/sgml/ref/alter_tstemplate.sgml index cb4b97b030..bdfe18b414 100644 --- a/doc/src/sgml/ref/alter_tstemplate.sgml +++ b/doc/src/sgml/ref/alter_tstemplate.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/alter_type.sgml b/doc/src/sgml/ref/alter_type.sgml index 5b8d2c0cc6..d76feb48c3 100644 --- a/doc/src/sgml/ref/alter_type.sgml +++ b/doc/src/sgml/ref/alter_type.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/alter_user.sgml b/doc/src/sgml/ref/alter_user.sgml index 6046155be4..e22934d8cc 100644 --- a/doc/src/sgml/ref/alter_user.sgml +++ b/doc/src/sgml/ref/alter_user.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/alter_user_mapping.sgml b/doc/src/sgml/ref/alter_user_mapping.sgml index 99e489e49c..d18fe36199 100644 --- a/doc/src/sgml/ref/alter_user_mapping.sgml +++ b/doc/src/sgml/ref/alter_user_mapping.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/alter_view.sgml b/doc/src/sgml/ref/alter_view.sgml index 6f175c97b9..9bedbb0e6b 100644 --- a/doc/src/sgml/ref/alter_view.sgml +++ b/doc/src/sgml/ref/alter_view.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/analyze.sgml b/doc/src/sgml/ref/analyze.sgml index 98dcbf0ed8..d5f2528eb9 100644 --- a/doc/src/sgml/ref/analyze.sgml +++ b/doc/src/sgml/ref/analyze.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/begin.sgml b/doc/src/sgml/ref/begin.sgml index 67dd49cd1b..dad8d5f351 100644 --- a/doc/src/sgml/ref/begin.sgml +++ b/doc/src/sgml/ref/begin.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/checkpoint.sgml b/doc/src/sgml/ref/checkpoint.sgml index 1725210449..7ffd40a605 100644 --- a/doc/src/sgml/ref/checkpoint.sgml +++ b/doc/src/sgml/ref/checkpoint.sgml @@ -1,4 +1,4 @@ - + diff --git a/doc/src/sgml/ref/close.sgml b/doc/src/sgml/ref/close.sgml index a36bbf8583..402d681837 100644 --- a/doc/src/sgml/ref/close.sgml +++ b/doc/src/sgml/ref/close.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/cluster.sgml b/doc/src/sgml/ref/cluster.sgml index e7ac6c7967..4b641954ef 100644 --- a/doc/src/sgml/ref/cluster.sgml +++ b/doc/src/sgml/ref/cluster.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/clusterdb.sgml b/doc/src/sgml/ref/clusterdb.sgml index f9b4c7a8c0..4a3a339557 100644 --- a/doc/src/sgml/ref/clusterdb.sgml +++ b/doc/src/sgml/ref/clusterdb.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/comment.sgml b/doc/src/sgml/ref/comment.sgml index 53c6b0fcbc..b5f7e3196c 100644 --- a/doc/src/sgml/ref/comment.sgml +++ b/doc/src/sgml/ref/comment.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/commit.sgml b/doc/src/sgml/ref/commit.sgml index 6cc7af5e07..5e03b81b93 100644 --- a/doc/src/sgml/ref/commit.sgml +++ b/doc/src/sgml/ref/commit.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/commit_prepared.sgml b/doc/src/sgml/ref/commit_prepared.sgml index 2c9b558d61..e5eaa4b1e9 100644 --- a/doc/src/sgml/ref/commit_prepared.sgml +++ b/doc/src/sgml/ref/commit_prepared.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/copy.sgml b/doc/src/sgml/ref/copy.sgml index 9f4335a00d..38424ad04b 100644 --- a/doc/src/sgml/ref/copy.sgml +++ b/doc/src/sgml/ref/copy.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/create_aggregate.sgml b/doc/src/sgml/ref/create_aggregate.sgml index 2f30c0ec1d..73244dc577 100644 --- a/doc/src/sgml/ref/create_aggregate.sgml +++ b/doc/src/sgml/ref/create_aggregate.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/create_cast.sgml b/doc/src/sgml/ref/create_cast.sgml index 317cdb64f8..5e74efdcac 100644 --- a/doc/src/sgml/ref/create_cast.sgml +++ b/doc/src/sgml/ref/create_cast.sgml @@ -1,4 +1,4 @@ - + diff --git a/doc/src/sgml/ref/create_constraint.sgml b/doc/src/sgml/ref/create_constraint.sgml index 779f427c57..3ec3f746ee 100644 --- a/doc/src/sgml/ref/create_constraint.sgml +++ b/doc/src/sgml/ref/create_constraint.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/create_conversion.sgml b/doc/src/sgml/ref/create_conversion.sgml index 5c51d370dc..3623b935cf 100644 --- a/doc/src/sgml/ref/create_conversion.sgml +++ b/doc/src/sgml/ref/create_conversion.sgml @@ -1,4 +1,4 @@ - + diff --git a/doc/src/sgml/ref/create_database.sgml b/doc/src/sgml/ref/create_database.sgml index c3e691a4ad..2c34c11cae 100644 --- a/doc/src/sgml/ref/create_database.sgml +++ b/doc/src/sgml/ref/create_database.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/create_domain.sgml b/doc/src/sgml/ref/create_domain.sgml index eb3bb3d982..87a7654d6c 100644 --- a/doc/src/sgml/ref/create_domain.sgml +++ b/doc/src/sgml/ref/create_domain.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/create_foreign_data_wrapper.sgml b/doc/src/sgml/ref/create_foreign_data_wrapper.sgml index 4880588b15..f626d56665 100644 --- a/doc/src/sgml/ref/create_foreign_data_wrapper.sgml +++ b/doc/src/sgml/ref/create_foreign_data_wrapper.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/create_function.sgml b/doc/src/sgml/ref/create_function.sgml index 06df45ab96..4efc48deb5 100644 --- a/doc/src/sgml/ref/create_function.sgml +++ b/doc/src/sgml/ref/create_function.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/create_group.sgml b/doc/src/sgml/ref/create_group.sgml index 996bc15042..9456fc2683 100644 --- a/doc/src/sgml/ref/create_group.sgml +++ b/doc/src/sgml/ref/create_group.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/create_index.sgml b/doc/src/sgml/ref/create_index.sgml index 0692e77c64..45c298e371 100644 --- a/doc/src/sgml/ref/create_index.sgml +++ b/doc/src/sgml/ref/create_index.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/create_language.sgml b/doc/src/sgml/ref/create_language.sgml index 54245641e1..c9cb95cae5 100644 --- a/doc/src/sgml/ref/create_language.sgml +++ b/doc/src/sgml/ref/create_language.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/create_opclass.sgml b/doc/src/sgml/ref/create_opclass.sgml index e6d66310fa..d7372aabca 100644 --- a/doc/src/sgml/ref/create_opclass.sgml +++ b/doc/src/sgml/ref/create_opclass.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/create_operator.sgml b/doc/src/sgml/ref/create_operator.sgml index faaf1b55b5..b7c40d4834 100644 --- a/doc/src/sgml/ref/create_operator.sgml +++ b/doc/src/sgml/ref/create_operator.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/create_opfamily.sgml b/doc/src/sgml/ref/create_opfamily.sgml index 4b1a3ee2a7..8b03932e44 100644 --- a/doc/src/sgml/ref/create_opfamily.sgml +++ b/doc/src/sgml/ref/create_opfamily.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/create_role.sgml b/doc/src/sgml/ref/create_role.sgml index a1c7ad61c2..9e7f64118a 100644 --- a/doc/src/sgml/ref/create_role.sgml +++ b/doc/src/sgml/ref/create_role.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/create_rule.sgml b/doc/src/sgml/ref/create_rule.sgml index afe5f82e1c..5d2182c2ca 100644 --- a/doc/src/sgml/ref/create_rule.sgml +++ b/doc/src/sgml/ref/create_rule.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/create_schema.sgml b/doc/src/sgml/ref/create_schema.sgml index 0df736877f..89a624eda2 100644 --- a/doc/src/sgml/ref/create_schema.sgml +++ b/doc/src/sgml/ref/create_schema.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/create_sequence.sgml b/doc/src/sgml/ref/create_sequence.sgml index 318718e1a8..3298c0ad27 100644 --- a/doc/src/sgml/ref/create_sequence.sgml +++ b/doc/src/sgml/ref/create_sequence.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/create_server.sgml b/doc/src/sgml/ref/create_server.sgml index 319f1f6fe2..f923dc84c8 100644 --- a/doc/src/sgml/ref/create_server.sgml +++ b/doc/src/sgml/ref/create_server.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/create_table.sgml b/doc/src/sgml/ref/create_table.sgml index 08070f8d1c..8635e80faf 100644 --- a/doc/src/sgml/ref/create_table.sgml +++ b/doc/src/sgml/ref/create_table.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/create_table_as.sgml b/doc/src/sgml/ref/create_table_as.sgml index 1b59722586..86da68b8a5 100644 --- a/doc/src/sgml/ref/create_table_as.sgml +++ b/doc/src/sgml/ref/create_table_as.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/create_tablespace.sgml b/doc/src/sgml/ref/create_tablespace.sgml index 8b212361fb..24fb79e539 100644 --- a/doc/src/sgml/ref/create_tablespace.sgml +++ b/doc/src/sgml/ref/create_tablespace.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/create_trigger.sgml b/doc/src/sgml/ref/create_trigger.sgml index ec5d961519..1934113181 100644 --- a/doc/src/sgml/ref/create_trigger.sgml +++ b/doc/src/sgml/ref/create_trigger.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/create_tsconfig.sgml b/doc/src/sgml/ref/create_tsconfig.sgml index 64d6eedc99..35490ac38b 100644 --- a/doc/src/sgml/ref/create_tsconfig.sgml +++ b/doc/src/sgml/ref/create_tsconfig.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/create_tsdictionary.sgml b/doc/src/sgml/ref/create_tsdictionary.sgml index 5da02490dd..9cd711c4d2 100644 --- a/doc/src/sgml/ref/create_tsdictionary.sgml +++ b/doc/src/sgml/ref/create_tsdictionary.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/create_tsparser.sgml b/doc/src/sgml/ref/create_tsparser.sgml index c04b636993..2f0fc4ea6c 100644 --- a/doc/src/sgml/ref/create_tsparser.sgml +++ b/doc/src/sgml/ref/create_tsparser.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/create_tstemplate.sgml b/doc/src/sgml/ref/create_tstemplate.sgml index 84b61c8a87..6a4a7fcb5f 100644 --- a/doc/src/sgml/ref/create_tstemplate.sgml +++ b/doc/src/sgml/ref/create_tstemplate.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/create_type.sgml b/doc/src/sgml/ref/create_type.sgml index 319410e31c..ca521b387b 100644 --- a/doc/src/sgml/ref/create_type.sgml +++ b/doc/src/sgml/ref/create_type.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/create_user.sgml b/doc/src/sgml/ref/create_user.sgml index a54ece612b..a4aaa3adc2 100644 --- a/doc/src/sgml/ref/create_user.sgml +++ b/doc/src/sgml/ref/create_user.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/create_user_mapping.sgml b/doc/src/sgml/ref/create_user_mapping.sgml index 471a19f1c5..3094442cc6 100644 --- a/doc/src/sgml/ref/create_user_mapping.sgml +++ b/doc/src/sgml/ref/create_user_mapping.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/create_view.sgml b/doc/src/sgml/ref/create_view.sgml index d80daa9807..48e2e0b963 100644 --- a/doc/src/sgml/ref/create_view.sgml +++ b/doc/src/sgml/ref/create_view.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/createdb.sgml b/doc/src/sgml/ref/createdb.sgml index 3f4ee6487a..520a108638 100644 --- a/doc/src/sgml/ref/createdb.sgml +++ b/doc/src/sgml/ref/createdb.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/createlang.sgml b/doc/src/sgml/ref/createlang.sgml index eef50e2e46..5db5e6cd41 100644 --- a/doc/src/sgml/ref/createlang.sgml +++ b/doc/src/sgml/ref/createlang.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/createuser.sgml b/doc/src/sgml/ref/createuser.sgml index 043b490f5d..681482e458 100644 --- a/doc/src/sgml/ref/createuser.sgml +++ b/doc/src/sgml/ref/createuser.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/deallocate.sgml b/doc/src/sgml/ref/deallocate.sgml index f6b46d936f..950c4e835d 100644 --- a/doc/src/sgml/ref/deallocate.sgml +++ b/doc/src/sgml/ref/deallocate.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/declare.sgml b/doc/src/sgml/ref/declare.sgml index 8ad39280ee..f2b75b7aca 100644 --- a/doc/src/sgml/ref/declare.sgml +++ b/doc/src/sgml/ref/declare.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/delete.sgml b/doc/src/sgml/ref/delete.sgml index 84bf6bd23f..c87f35c9b4 100644 --- a/doc/src/sgml/ref/delete.sgml +++ b/doc/src/sgml/ref/delete.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/discard.sgml b/doc/src/sgml/ref/discard.sgml index d3436a303b..74a2ce3b4e 100644 --- a/doc/src/sgml/ref/discard.sgml +++ b/doc/src/sgml/ref/discard.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/do.sgml b/doc/src/sgml/ref/do.sgml index 8b77d13a81..47f144f795 100644 --- a/doc/src/sgml/ref/do.sgml +++ b/doc/src/sgml/ref/do.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/drop_aggregate.sgml b/doc/src/sgml/ref/drop_aggregate.sgml index 406050e142..400b4d70eb 100644 --- a/doc/src/sgml/ref/drop_aggregate.sgml +++ b/doc/src/sgml/ref/drop_aggregate.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/drop_cast.sgml b/doc/src/sgml/ref/drop_cast.sgml index fde6dc3b03..22d3ad5839 100644 --- a/doc/src/sgml/ref/drop_cast.sgml +++ b/doc/src/sgml/ref/drop_cast.sgml @@ -1,4 +1,4 @@ - + diff --git a/doc/src/sgml/ref/drop_conversion.sgml b/doc/src/sgml/ref/drop_conversion.sgml index 64ccf4e3a9..2d51be1c99 100644 --- a/doc/src/sgml/ref/drop_conversion.sgml +++ b/doc/src/sgml/ref/drop_conversion.sgml @@ -1,4 +1,4 @@ - + diff --git a/doc/src/sgml/ref/drop_database.sgml b/doc/src/sgml/ref/drop_database.sgml index 2deb6996cc..e6b641a72b 100644 --- a/doc/src/sgml/ref/drop_database.sgml +++ b/doc/src/sgml/ref/drop_database.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/drop_domain.sgml b/doc/src/sgml/ref/drop_domain.sgml index b8e5189bba..6fc2f51186 100644 --- a/doc/src/sgml/ref/drop_domain.sgml +++ b/doc/src/sgml/ref/drop_domain.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/drop_foreign_data_wrapper.sgml b/doc/src/sgml/ref/drop_foreign_data_wrapper.sgml index f3e8334316..0ac0722f3d 100644 --- a/doc/src/sgml/ref/drop_foreign_data_wrapper.sgml +++ b/doc/src/sgml/ref/drop_foreign_data_wrapper.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/drop_function.sgml b/doc/src/sgml/ref/drop_function.sgml index 78fe3f7d78..c8a3eec713 100644 --- a/doc/src/sgml/ref/drop_function.sgml +++ b/doc/src/sgml/ref/drop_function.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/drop_group.sgml b/doc/src/sgml/ref/drop_group.sgml index 8899a94297..57f686497e 100644 --- a/doc/src/sgml/ref/drop_group.sgml +++ b/doc/src/sgml/ref/drop_group.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/drop_index.sgml b/doc/src/sgml/ref/drop_index.sgml index 3e831d3c9b..75b6c6ba79 100644 --- a/doc/src/sgml/ref/drop_index.sgml +++ b/doc/src/sgml/ref/drop_index.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/drop_language.sgml b/doc/src/sgml/ref/drop_language.sgml index 5564e00972..0406f95f1d 100644 --- a/doc/src/sgml/ref/drop_language.sgml +++ b/doc/src/sgml/ref/drop_language.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/drop_opclass.sgml b/doc/src/sgml/ref/drop_opclass.sgml index f1c89cd698..071eed003b 100644 --- a/doc/src/sgml/ref/drop_opclass.sgml +++ b/doc/src/sgml/ref/drop_opclass.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/drop_operator.sgml b/doc/src/sgml/ref/drop_operator.sgml index 0b82cf442b..886946a22a 100644 --- a/doc/src/sgml/ref/drop_operator.sgml +++ b/doc/src/sgml/ref/drop_operator.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/drop_opfamily.sgml b/doc/src/sgml/ref/drop_opfamily.sgml index 5f377b2af2..ea8a6b76f7 100644 --- a/doc/src/sgml/ref/drop_opfamily.sgml +++ b/doc/src/sgml/ref/drop_opfamily.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/drop_owned.sgml b/doc/src/sgml/ref/drop_owned.sgml index 4d7355925a..a453af58d1 100644 --- a/doc/src/sgml/ref/drop_owned.sgml +++ b/doc/src/sgml/ref/drop_owned.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/drop_role.sgml b/doc/src/sgml/ref/drop_role.sgml index ffe37b317e..c990fa4018 100644 --- a/doc/src/sgml/ref/drop_role.sgml +++ b/doc/src/sgml/ref/drop_role.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/drop_rule.sgml b/doc/src/sgml/ref/drop_rule.sgml index 7a2bb34664..d948efdfd0 100644 --- a/doc/src/sgml/ref/drop_rule.sgml +++ b/doc/src/sgml/ref/drop_rule.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/drop_schema.sgml b/doc/src/sgml/ref/drop_schema.sgml index ac10801477..1e2e2b7562 100644 --- a/doc/src/sgml/ref/drop_schema.sgml +++ b/doc/src/sgml/ref/drop_schema.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/drop_sequence.sgml b/doc/src/sgml/ref/drop_sequence.sgml index d6011bd4e7..53e7834bed 100644 --- a/doc/src/sgml/ref/drop_sequence.sgml +++ b/doc/src/sgml/ref/drop_sequence.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/drop_server.sgml b/doc/src/sgml/ref/drop_server.sgml index d6a939dccf..af08655a1d 100644 --- a/doc/src/sgml/ref/drop_server.sgml +++ b/doc/src/sgml/ref/drop_server.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/drop_table.sgml b/doc/src/sgml/ref/drop_table.sgml index d75868bdcf..4b47ea74f7 100644 --- a/doc/src/sgml/ref/drop_table.sgml +++ b/doc/src/sgml/ref/drop_table.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/drop_tablespace.sgml b/doc/src/sgml/ref/drop_tablespace.sgml index 505894506d..4c5302968d 100644 --- a/doc/src/sgml/ref/drop_tablespace.sgml +++ b/doc/src/sgml/ref/drop_tablespace.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/drop_trigger.sgml b/doc/src/sgml/ref/drop_trigger.sgml index 692c49ace4..dcabff4291 100644 --- a/doc/src/sgml/ref/drop_trigger.sgml +++ b/doc/src/sgml/ref/drop_trigger.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/drop_tsconfig.sgml b/doc/src/sgml/ref/drop_tsconfig.sgml index 087698c760..4d7ef37595 100644 --- a/doc/src/sgml/ref/drop_tsconfig.sgml +++ b/doc/src/sgml/ref/drop_tsconfig.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/drop_tsdictionary.sgml b/doc/src/sgml/ref/drop_tsdictionary.sgml index 9f8a54e3e3..70e237028a 100644 --- a/doc/src/sgml/ref/drop_tsdictionary.sgml +++ b/doc/src/sgml/ref/drop_tsdictionary.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/drop_tsparser.sgml b/doc/src/sgml/ref/drop_tsparser.sgml index 5384a103d5..b5ff9336cf 100644 --- a/doc/src/sgml/ref/drop_tsparser.sgml +++ b/doc/src/sgml/ref/drop_tsparser.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/drop_tstemplate.sgml b/doc/src/sgml/ref/drop_tstemplate.sgml index f0876a72c9..4bb246ce6c 100644 --- a/doc/src/sgml/ref/drop_tstemplate.sgml +++ b/doc/src/sgml/ref/drop_tstemplate.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/drop_type.sgml b/doc/src/sgml/ref/drop_type.sgml index 5b320360c1..10e3e143bc 100644 --- a/doc/src/sgml/ref/drop_type.sgml +++ b/doc/src/sgml/ref/drop_type.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/drop_user.sgml b/doc/src/sgml/ref/drop_user.sgml index bcd410a4b0..1bdf03c515 100644 --- a/doc/src/sgml/ref/drop_user.sgml +++ b/doc/src/sgml/ref/drop_user.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/drop_user_mapping.sgml b/doc/src/sgml/ref/drop_user_mapping.sgml index 41dbd7b49d..747d7cbd2e 100644 --- a/doc/src/sgml/ref/drop_user_mapping.sgml +++ b/doc/src/sgml/ref/drop_user_mapping.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/drop_view.sgml b/doc/src/sgml/ref/drop_view.sgml index 9718ee5d9c..5f44076c52 100644 --- a/doc/src/sgml/ref/drop_view.sgml +++ b/doc/src/sgml/ref/drop_view.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/dropdb.sgml b/doc/src/sgml/ref/dropdb.sgml index 40b0864338..ef75c35fcf 100644 --- a/doc/src/sgml/ref/dropdb.sgml +++ b/doc/src/sgml/ref/dropdb.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/droplang.sgml b/doc/src/sgml/ref/droplang.sgml index f455b56431..a92cd932eb 100644 --- a/doc/src/sgml/ref/droplang.sgml +++ b/doc/src/sgml/ref/droplang.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/dropuser.sgml b/doc/src/sgml/ref/dropuser.sgml index 4dc5e43b7d..ecf6d49563 100644 --- a/doc/src/sgml/ref/dropuser.sgml +++ b/doc/src/sgml/ref/dropuser.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/ecpg-ref.sgml b/doc/src/sgml/ref/ecpg-ref.sgml index 8e71c27768..a97041a06e 100644 --- a/doc/src/sgml/ref/ecpg-ref.sgml +++ b/doc/src/sgml/ref/ecpg-ref.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/end.sgml b/doc/src/sgml/ref/end.sgml index 267f9b9f0c..7de7232419 100644 --- a/doc/src/sgml/ref/end.sgml +++ b/doc/src/sgml/ref/end.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/execute.sgml b/doc/src/sgml/ref/execute.sgml index 8d8989c9ca..2c7308eaa5 100644 --- a/doc/src/sgml/ref/execute.sgml +++ b/doc/src/sgml/ref/execute.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/explain.sgml b/doc/src/sgml/ref/explain.sgml index 044aba71a8..8b98e42e33 100644 --- a/doc/src/sgml/ref/explain.sgml +++ b/doc/src/sgml/ref/explain.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/fetch.sgml b/doc/src/sgml/ref/fetch.sgml index 46a9d4de8e..40b515a208 100644 --- a/doc/src/sgml/ref/fetch.sgml +++ b/doc/src/sgml/ref/fetch.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/grant.sgml b/doc/src/sgml/ref/grant.sgml index 78ef0b7b33..b8ee017a97 100644 --- a/doc/src/sgml/ref/grant.sgml +++ b/doc/src/sgml/ref/grant.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/initdb.sgml b/doc/src/sgml/ref/initdb.sgml index 153eceb293..8ecacaada2 100644 --- a/doc/src/sgml/ref/initdb.sgml +++ b/doc/src/sgml/ref/initdb.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/insert.sgml b/doc/src/sgml/ref/insert.sgml index a17577b0e5..6d17ef05f7 100644 --- a/doc/src/sgml/ref/insert.sgml +++ b/doc/src/sgml/ref/insert.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/listen.sgml b/doc/src/sgml/ref/listen.sgml index 4f8b603bd2..98091c2856 100644 --- a/doc/src/sgml/ref/listen.sgml +++ b/doc/src/sgml/ref/listen.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/load.sgml b/doc/src/sgml/ref/load.sgml index ef74a0fbd4..f44f313b5e 100644 --- a/doc/src/sgml/ref/load.sgml +++ b/doc/src/sgml/ref/load.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/lock.sgml b/doc/src/sgml/ref/lock.sgml index a61cb98c7a..baaf31ad8a 100644 --- a/doc/src/sgml/ref/lock.sgml +++ b/doc/src/sgml/ref/lock.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/move.sgml b/doc/src/sgml/ref/move.sgml index 09083d834b..deffbe6fa8 100644 --- a/doc/src/sgml/ref/move.sgml +++ b/doc/src/sgml/ref/move.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/notify.sgml b/doc/src/sgml/ref/notify.sgml index ccdbe3da51..330b2cd56d 100644 --- a/doc/src/sgml/ref/notify.sgml +++ b/doc/src/sgml/ref/notify.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/pg_config-ref.sgml b/doc/src/sgml/ref/pg_config-ref.sgml index 66cf79b2f4..7af2a4e31a 100644 --- a/doc/src/sgml/ref/pg_config-ref.sgml +++ b/doc/src/sgml/ref/pg_config-ref.sgml @@ -1,4 +1,4 @@ - + diff --git a/doc/src/sgml/ref/pg_controldata.sgml b/doc/src/sgml/ref/pg_controldata.sgml index 79f74d7050..2cc0dd58d5 100644 --- a/doc/src/sgml/ref/pg_controldata.sgml +++ b/doc/src/sgml/ref/pg_controldata.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/pg_ctl-ref.sgml b/doc/src/sgml/ref/pg_ctl-ref.sgml index 02a82a1db4..7494b5debb 100644 --- a/doc/src/sgml/ref/pg_ctl-ref.sgml +++ b/doc/src/sgml/ref/pg_ctl-ref.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/pg_dump.sgml b/doc/src/sgml/ref/pg_dump.sgml index f0498df50c..1b8402e78c 100644 --- a/doc/src/sgml/ref/pg_dump.sgml +++ b/doc/src/sgml/ref/pg_dump.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/pg_dumpall.sgml b/doc/src/sgml/ref/pg_dumpall.sgml index 6b89991015..14fa109112 100644 --- a/doc/src/sgml/ref/pg_dumpall.sgml +++ b/doc/src/sgml/ref/pg_dumpall.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/pg_resetxlog.sgml b/doc/src/sgml/ref/pg_resetxlog.sgml index ba7de65ff4..2d9f205345 100644 --- a/doc/src/sgml/ref/pg_resetxlog.sgml +++ b/doc/src/sgml/ref/pg_resetxlog.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/pg_restore.sgml b/doc/src/sgml/ref/pg_restore.sgml index 81bc8bc481..9dc2511f5f 100644 --- a/doc/src/sgml/ref/pg_restore.sgml +++ b/doc/src/sgml/ref/pg_restore.sgml @@ -1,4 +1,4 @@ - + diff --git a/doc/src/sgml/ref/postgres-ref.sgml b/doc/src/sgml/ref/postgres-ref.sgml index 636782a17d..fb1910a2dc 100644 --- a/doc/src/sgml/ref/postgres-ref.sgml +++ b/doc/src/sgml/ref/postgres-ref.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/postmaster.sgml b/doc/src/sgml/ref/postmaster.sgml index 43de7a0994..d66fe1c3de 100644 --- a/doc/src/sgml/ref/postmaster.sgml +++ b/doc/src/sgml/ref/postmaster.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/prepare.sgml b/doc/src/sgml/ref/prepare.sgml index 4f961cde65..e6c8ef3b10 100644 --- a/doc/src/sgml/ref/prepare.sgml +++ b/doc/src/sgml/ref/prepare.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/prepare_transaction.sgml b/doc/src/sgml/ref/prepare_transaction.sgml index 9792bedcb5..6744dd6803 100644 --- a/doc/src/sgml/ref/prepare_transaction.sgml +++ b/doc/src/sgml/ref/prepare_transaction.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml index 4c6944fbd0..eb716cf6f0 100644 --- a/doc/src/sgml/ref/psql-ref.sgml +++ b/doc/src/sgml/ref/psql-ref.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/reassign_owned.sgml b/doc/src/sgml/ref/reassign_owned.sgml index 84d7a9796b..57f2e59996 100644 --- a/doc/src/sgml/ref/reassign_owned.sgml +++ b/doc/src/sgml/ref/reassign_owned.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/reindex.sgml b/doc/src/sgml/ref/reindex.sgml index e54253106a..c9514f95ae 100644 --- a/doc/src/sgml/ref/reindex.sgml +++ b/doc/src/sgml/ref/reindex.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/reindexdb.sgml b/doc/src/sgml/ref/reindexdb.sgml index c928d3d75b..fb680ece70 100644 --- a/doc/src/sgml/ref/reindexdb.sgml +++ b/doc/src/sgml/ref/reindexdb.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/release_savepoint.sgml b/doc/src/sgml/ref/release_savepoint.sgml index c0f9d51885..3c2fff7d2a 100644 --- a/doc/src/sgml/ref/release_savepoint.sgml +++ b/doc/src/sgml/ref/release_savepoint.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/reset.sgml b/doc/src/sgml/ref/reset.sgml index c7900f7113..3e31a6c186 100644 --- a/doc/src/sgml/ref/reset.sgml +++ b/doc/src/sgml/ref/reset.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/revoke.sgml b/doc/src/sgml/ref/revoke.sgml index af93b90bb2..8f8bd43440 100644 --- a/doc/src/sgml/ref/revoke.sgml +++ b/doc/src/sgml/ref/revoke.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/rollback.sgml b/doc/src/sgml/ref/rollback.sgml index 721ee69033..49989c01bf 100644 --- a/doc/src/sgml/ref/rollback.sgml +++ b/doc/src/sgml/ref/rollback.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/rollback_prepared.sgml b/doc/src/sgml/ref/rollback_prepared.sgml index d6d01d2f06..265b483024 100644 --- a/doc/src/sgml/ref/rollback_prepared.sgml +++ b/doc/src/sgml/ref/rollback_prepared.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/rollback_to.sgml b/doc/src/sgml/ref/rollback_to.sgml index 488378b0c3..bf83822378 100644 --- a/doc/src/sgml/ref/rollback_to.sgml +++ b/doc/src/sgml/ref/rollback_to.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/savepoint.sgml b/doc/src/sgml/ref/savepoint.sgml index d2c58e5b66..d51cc7b4a7 100644 --- a/doc/src/sgml/ref/savepoint.sgml +++ b/doc/src/sgml/ref/savepoint.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/select.sgml b/doc/src/sgml/ref/select.sgml index 916146df73..e840070873 100644 --- a/doc/src/sgml/ref/select.sgml +++ b/doc/src/sgml/ref/select.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/select_into.sgml b/doc/src/sgml/ref/select_into.sgml index fc726c6684..715d64097e 100644 --- a/doc/src/sgml/ref/select_into.sgml +++ b/doc/src/sgml/ref/select_into.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/set.sgml b/doc/src/sgml/ref/set.sgml index 7c60d7ae5d..d55760f189 100644 --- a/doc/src/sgml/ref/set.sgml +++ b/doc/src/sgml/ref/set.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/set_constraints.sgml b/doc/src/sgml/ref/set_constraints.sgml index ffadfd7475..8098b7b667 100644 --- a/doc/src/sgml/ref/set_constraints.sgml +++ b/doc/src/sgml/ref/set_constraints.sgml @@ -1,4 +1,4 @@ - + SET CONSTRAINTS diff --git a/doc/src/sgml/ref/set_role.sgml b/doc/src/sgml/ref/set_role.sgml index c7a4b0d68e..bb6ea5179f 100644 --- a/doc/src/sgml/ref/set_role.sgml +++ b/doc/src/sgml/ref/set_role.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/set_session_auth.sgml b/doc/src/sgml/ref/set_session_auth.sgml index 35d93c23e6..856b030127 100644 --- a/doc/src/sgml/ref/set_session_auth.sgml +++ b/doc/src/sgml/ref/set_session_auth.sgml @@ -1,4 +1,4 @@ - + SET SESSION AUTHORIZATION diff --git a/doc/src/sgml/ref/set_transaction.sgml b/doc/src/sgml/ref/set_transaction.sgml index ecf24eac63..57ab38b685 100644 --- a/doc/src/sgml/ref/set_transaction.sgml +++ b/doc/src/sgml/ref/set_transaction.sgml @@ -1,4 +1,4 @@ - + SET TRANSACTION diff --git a/doc/src/sgml/ref/show.sgml b/doc/src/sgml/ref/show.sgml index d4fdb65144..ca26bb2687 100644 --- a/doc/src/sgml/ref/show.sgml +++ b/doc/src/sgml/ref/show.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/start_transaction.sgml b/doc/src/sgml/ref/start_transaction.sgml index c87a1c0b6a..ffa4976279 100644 --- a/doc/src/sgml/ref/start_transaction.sgml +++ b/doc/src/sgml/ref/start_transaction.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/truncate.sgml b/doc/src/sgml/ref/truncate.sgml index 08dc670843..f32d255c74 100644 --- a/doc/src/sgml/ref/truncate.sgml +++ b/doc/src/sgml/ref/truncate.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/unlisten.sgml b/doc/src/sgml/ref/unlisten.sgml index 774858063a..ad3b9a12af 100644 --- a/doc/src/sgml/ref/unlisten.sgml +++ b/doc/src/sgml/ref/unlisten.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/update.sgml b/doc/src/sgml/ref/update.sgml index 8673df18ff..c89763492f 100644 --- a/doc/src/sgml/ref/update.sgml +++ b/doc/src/sgml/ref/update.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/vacuum.sgml b/doc/src/sgml/ref/vacuum.sgml index aece3e02d1..dee1cc35ee 100644 --- a/doc/src/sgml/ref/vacuum.sgml +++ b/doc/src/sgml/ref/vacuum.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/vacuumdb.sgml b/doc/src/sgml/ref/vacuumdb.sgml index c6f576772e..43e6d5effc 100644 --- a/doc/src/sgml/ref/vacuumdb.sgml +++ b/doc/src/sgml/ref/vacuumdb.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/ref/values.sgml b/doc/src/sgml/ref/values.sgml index d6d2c0cf60..23638c766f 100644 --- a/doc/src/sgml/ref/values.sgml +++ b/doc/src/sgml/ref/values.sgml @@ -1,5 +1,5 @@ diff --git a/doc/src/sgml/reference.sgml b/doc/src/sgml/reference.sgml index 50f1d93d8b..052fe0e8fb 100644 --- a/doc/src/sgml/reference.sgml +++ b/doc/src/sgml/reference.sgml @@ -1,4 +1,4 @@ - + Reference diff --git a/doc/src/sgml/regress.sgml b/doc/src/sgml/regress.sgml index 028446c02b..74bea960e5 100644 --- a/doc/src/sgml/regress.sgml +++ b/doc/src/sgml/regress.sgml @@ -1,4 +1,4 @@ - + Regression Tests diff --git a/doc/src/sgml/release-7.4.sgml b/doc/src/sgml/release-7.4.sgml index edc184b219..ce1fb039da 100644 --- a/doc/src/sgml/release-7.4.sgml +++ b/doc/src/sgml/release-7.4.sgml @@ -1,4 +1,4 @@ - + diff --git a/doc/src/sgml/release-8.0.sgml b/doc/src/sgml/release-8.0.sgml index b1aeba0d6a..0174b8e3e8 100644 --- a/doc/src/sgml/release-8.0.sgml +++ b/doc/src/sgml/release-8.0.sgml @@ -1,4 +1,4 @@ - + diff --git a/doc/src/sgml/release-8.1.sgml b/doc/src/sgml/release-8.1.sgml index ac77d1974a..c4ea448499 100644 --- a/doc/src/sgml/release-8.1.sgml +++ b/doc/src/sgml/release-8.1.sgml @@ -1,4 +1,4 @@ - + diff --git a/doc/src/sgml/release-8.2.sgml b/doc/src/sgml/release-8.2.sgml index 5fdc8362e0..7a552bc106 100644 --- a/doc/src/sgml/release-8.2.sgml +++ b/doc/src/sgml/release-8.2.sgml @@ -1,4 +1,4 @@ - + diff --git a/doc/src/sgml/release-8.3.sgml b/doc/src/sgml/release-8.3.sgml index 82d35b2e63..9827b932cb 100644 --- a/doc/src/sgml/release-8.3.sgml +++ b/doc/src/sgml/release-8.3.sgml @@ -1,4 +1,4 @@ - + diff --git a/doc/src/sgml/release-8.4.sgml b/doc/src/sgml/release-8.4.sgml index 94571b7289..9c88d24d29 100644 --- a/doc/src/sgml/release-8.4.sgml +++ b/doc/src/sgml/release-8.4.sgml @@ -1,4 +1,4 @@ - + diff --git a/doc/src/sgml/release-9.0.sgml b/doc/src/sgml/release-9.0.sgml index d1f081fa83..d425c00326 100644 --- a/doc/src/sgml/release-9.0.sgml +++ b/doc/src/sgml/release-9.0.sgml @@ -1,4 +1,4 @@ - + diff --git a/doc/src/sgml/release-9.1.sgml b/doc/src/sgml/release-9.1.sgml index dd9bd689bb..5a51fc54d3 100644 --- a/doc/src/sgml/release-9.1.sgml +++ b/doc/src/sgml/release-9.1.sgml @@ -1,4 +1,4 @@ - + diff --git a/doc/src/sgml/release-alpha.sgml b/doc/src/sgml/release-alpha.sgml index 9cc7e8d59f..8ca7a2ffe0 100644 --- a/doc/src/sgml/release-alpha.sgml +++ b/doc/src/sgml/release-alpha.sgml @@ -1,4 +1,4 @@ - + Release 9.0alpha4 diff --git a/doc/src/sgml/release-old.sgml b/doc/src/sgml/release-old.sgml index b781e8cf97..25c3f2e6fa 100644 --- a/doc/src/sgml/release-old.sgml +++ b/doc/src/sgml/release-old.sgml @@ -1,4 +1,4 @@ - + diff --git a/doc/src/sgml/release.sgml b/doc/src/sgml/release.sgml index 748b8fada8..1a1ad3d9fe 100644 --- a/doc/src/sgml/release.sgml +++ b/doc/src/sgml/release.sgml @@ -1,4 +1,4 @@ - + + Composite Types diff --git a/doc/src/sgml/rules.sgml b/doc/src/sgml/rules.sgml index c7091df560..c42ff2937b 100644 --- a/doc/src/sgml/rules.sgml +++ b/doc/src/sgml/rules.sgml @@ -1,4 +1,4 @@ - + The Rule System diff --git a/doc/src/sgml/runtime.sgml b/doc/src/sgml/runtime.sgml index 3b4609f377..db15cc982c 100644 --- a/doc/src/sgml/runtime.sgml +++ b/doc/src/sgml/runtime.sgml @@ -1,4 +1,4 @@ - + Server Setup and Operation diff --git a/doc/src/sgml/seg.sgml b/doc/src/sgml/seg.sgml index 75eb85f1ec..5d5e8f7789 100644 --- a/doc/src/sgml/seg.sgml +++ b/doc/src/sgml/seg.sgml @@ -1,4 +1,4 @@ - + seg diff --git a/doc/src/sgml/sources.sgml b/doc/src/sgml/sources.sgml index 9d72abce8f..70ad4574f9 100644 --- a/doc/src/sgml/sources.sgml +++ b/doc/src/sgml/sources.sgml @@ -1,4 +1,4 @@ - + PostgreSQL Coding Conventions diff --git a/doc/src/sgml/spi.sgml b/doc/src/sgml/spi.sgml index 1c09727fb5..1ca930846a 100644 --- a/doc/src/sgml/spi.sgml +++ b/doc/src/sgml/spi.sgml @@ -1,4 +1,4 @@ - + Server Programming Interface diff --git a/doc/src/sgml/sql.sgml b/doc/src/sgml/sql.sgml index f2f925be10..0cab19a57f 100644 --- a/doc/src/sgml/sql.sgml +++ b/doc/src/sgml/sql.sgml @@ -1,4 +1,4 @@ - + SQL diff --git a/doc/src/sgml/sslinfo.sgml b/doc/src/sgml/sslinfo.sgml index d56e66e3ee..f7ccb8c56c 100644 --- a/doc/src/sgml/sslinfo.sgml +++ b/doc/src/sgml/sslinfo.sgml @@ -1,4 +1,4 @@ - + sslinfo diff --git a/doc/src/sgml/standalone-install.sgml b/doc/src/sgml/standalone-install.sgml index 7328ef1553..87f9779c79 100644 --- a/doc/src/sgml/standalone-install.sgml +++ b/doc/src/sgml/standalone-install.sgml @@ -1,4 +1,4 @@ - + + Getting Started diff --git a/doc/src/sgml/storage.sgml b/doc/src/sgml/storage.sgml index b4d682fa2f..dd6f55ad63 100644 --- a/doc/src/sgml/storage.sgml +++ b/doc/src/sgml/storage.sgml @@ -1,4 +1,4 @@ - + diff --git a/doc/src/sgml/stylesheet.css b/doc/src/sgml/stylesheet.css index fd8e2ad659..f73e5eba48 100644 --- a/doc/src/sgml/stylesheet.css +++ b/doc/src/sgml/stylesheet.css @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/doc/src/sgml/stylesheet.css,v 1.10 2010/07/29 19:34:40 petere Exp $ */ +/* doc/src/sgml/stylesheet.css */ /* color scheme similar to www.postgresql.org */ diff --git a/doc/src/sgml/stylesheet.dsl b/doc/src/sgml/stylesheet.dsl index 553c80f339..b7cf735d60 100644 --- a/doc/src/sgml/stylesheet.dsl +++ b/doc/src/sgml/stylesheet.dsl @@ -1,4 +1,4 @@ - + diff --git a/doc/src/sgml/syntax.sgml b/doc/src/sgml/syntax.sgml index 18582b9216..008706e26a 100644 --- a/doc/src/sgml/syntax.sgml +++ b/doc/src/sgml/syntax.sgml @@ -1,4 +1,4 @@ - + SQL Syntax diff --git a/doc/src/sgml/tablefunc.sgml b/doc/src/sgml/tablefunc.sgml index c969fff5bf..5e738f92d4 100644 --- a/doc/src/sgml/tablefunc.sgml +++ b/doc/src/sgml/tablefunc.sgml @@ -1,4 +1,4 @@ - + tablefunc diff --git a/doc/src/sgml/test-parser.sgml b/doc/src/sgml/test-parser.sgml index 367a95cce6..0c53a3a413 100644 --- a/doc/src/sgml/test-parser.sgml +++ b/doc/src/sgml/test-parser.sgml @@ -1,4 +1,4 @@ - + test_parser diff --git a/doc/src/sgml/textsearch.sgml b/doc/src/sgml/textsearch.sgml index 60fac102df..b3e4b8e9af 100644 --- a/doc/src/sgml/textsearch.sgml +++ b/doc/src/sgml/textsearch.sgml @@ -1,4 +1,4 @@ - + Full Text Search diff --git a/doc/src/sgml/trigger.sgml b/doc/src/sgml/trigger.sgml index 70c7209830..3565bffe53 100644 --- a/doc/src/sgml/trigger.sgml +++ b/doc/src/sgml/trigger.sgml @@ -1,4 +1,4 @@ - + Triggers diff --git a/doc/src/sgml/tsearch2.sgml b/doc/src/sgml/tsearch2.sgml index 9e1e2cc2bf..3f4f559dc0 100644 --- a/doc/src/sgml/tsearch2.sgml +++ b/doc/src/sgml/tsearch2.sgml @@ -1,4 +1,4 @@ - + tsearch2 diff --git a/doc/src/sgml/typeconv.sgml b/doc/src/sgml/typeconv.sgml index fffd2aa985..71ddc0f30b 100644 --- a/doc/src/sgml/typeconv.sgml +++ b/doc/src/sgml/typeconv.sgml @@ -1,4 +1,4 @@ - + Type Conversion diff --git a/doc/src/sgml/unaccent.sgml b/doc/src/sgml/unaccent.sgml index 135fcdb6dc..2ad66f7ee1 100644 --- a/doc/src/sgml/unaccent.sgml +++ b/doc/src/sgml/unaccent.sgml @@ -1,4 +1,4 @@ - + unaccent diff --git a/doc/src/sgml/user-manag.sgml b/doc/src/sgml/user-manag.sgml index 16130b6191..6787859f8f 100644 --- a/doc/src/sgml/user-manag.sgml +++ b/doc/src/sgml/user-manag.sgml @@ -1,4 +1,4 @@ - + Database Roles and Privileges diff --git a/doc/src/sgml/uuid-ossp.sgml b/doc/src/sgml/uuid-ossp.sgml index 83c5d186ad..3dd89903fa 100644 --- a/doc/src/sgml/uuid-ossp.sgml +++ b/doc/src/sgml/uuid-ossp.sgml @@ -1,4 +1,4 @@ - + uuid-ossp diff --git a/doc/src/sgml/vacuumlo.sgml b/doc/src/sgml/vacuumlo.sgml index a57c61c1ea..76e2282ad6 100644 --- a/doc/src/sgml/vacuumlo.sgml +++ b/doc/src/sgml/vacuumlo.sgml @@ -1,4 +1,4 @@ - + vacuumlo diff --git a/doc/src/sgml/wal.sgml b/doc/src/sgml/wal.sgml index 60a1df7272..6730c9328e 100644 --- a/doc/src/sgml/wal.sgml +++ b/doc/src/sgml/wal.sgml @@ -1,4 +1,4 @@ - + Reliability and the Write-Ahead Log diff --git a/doc/src/sgml/xaggr.sgml b/doc/src/sgml/xaggr.sgml index bcbfde9c37..2dce97fe30 100644 --- a/doc/src/sgml/xaggr.sgml +++ b/doc/src/sgml/xaggr.sgml @@ -1,4 +1,4 @@ - + User-Defined Aggregates diff --git a/doc/src/sgml/xfunc.sgml b/doc/src/sgml/xfunc.sgml index 4ad0694d65..9fb2be4aec 100644 --- a/doc/src/sgml/xfunc.sgml +++ b/doc/src/sgml/xfunc.sgml @@ -1,4 +1,4 @@ - + User-Defined Functions diff --git a/doc/src/sgml/xindex.sgml b/doc/src/sgml/xindex.sgml index 29998652fc..8c829a9df7 100644 --- a/doc/src/sgml/xindex.sgml +++ b/doc/src/sgml/xindex.sgml @@ -1,4 +1,4 @@ - + Interfacing Extensions To Indexes diff --git a/doc/src/sgml/xml2.sgml b/doc/src/sgml/xml2.sgml index b978b4ce9c..cf8cc76aae 100644 --- a/doc/src/sgml/xml2.sgml +++ b/doc/src/sgml/xml2.sgml @@ -1,4 +1,4 @@ - + xml2 diff --git a/doc/src/sgml/xoper.sgml b/doc/src/sgml/xoper.sgml index 5231a7bce0..a2592c304d 100644 --- a/doc/src/sgml/xoper.sgml +++ b/doc/src/sgml/xoper.sgml @@ -1,4 +1,4 @@ - + User-Defined Operators diff --git a/doc/src/sgml/xplang.sgml b/doc/src/sgml/xplang.sgml index 78daa40ff1..0aef3bf4b3 100644 --- a/doc/src/sgml/xplang.sgml +++ b/doc/src/sgml/xplang.sgml @@ -1,4 +1,4 @@ - + Procedural Languages diff --git a/doc/src/sgml/xtypes.sgml b/doc/src/sgml/xtypes.sgml index 96e030ce7c..b020f28e87 100644 --- a/doc/src/sgml/xtypes.sgml +++ b/doc/src/sgml/xtypes.sgml @@ -1,4 +1,4 @@ - + User-Defined Types diff --git a/src/Makefile b/src/Makefile index 93b2d17a82..0e1e43197a 100644 --- a/src/Makefile +++ b/src/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/Makefile,v 1.50 2010/01/20 09:16:23 heikki Exp $ +# src/Makefile # #------------------------------------------------------------------------- diff --git a/src/Makefile.global.in b/src/Makefile.global.in index 4fe2d75b03..5d308453ce 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -1,5 +1,5 @@ # -*-makefile-*- -# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.265 2010/08/24 18:06:12 petere Exp $ +# src/Makefile.global.in #------------------------------------------------------------------------------ # All PostgreSQL makefiles include this file and use the variables it sets, diff --git a/src/Makefile.shlib b/src/Makefile.shlib index f3dc2409b9..3e5387fb71 100644 --- a/src/Makefile.shlib +++ b/src/Makefile.shlib @@ -6,7 +6,7 @@ # Copyright (c) 1998, Regents of the University of California # # IDENTIFICATION -# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.125 2010/07/06 03:55:33 tgl Exp $ +# src/Makefile.shlib # #------------------------------------------------------------------------- diff --git a/src/backend/Makefile b/src/backend/Makefile index a11b2b503c..6adfa3fc14 100644 --- a/src/backend/Makefile +++ b/src/backend/Makefile @@ -5,7 +5,7 @@ # Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group # Portions Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/backend/Makefile,v 1.145 2010/07/05 18:54:37 tgl Exp $ +# src/backend/Makefile # #------------------------------------------------------------------------- diff --git a/src/backend/access/Makefile b/src/backend/access/Makefile index cfbb5a5d35..a4c4ca7da9 100644 --- a/src/backend/access/Makefile +++ b/src/backend/access/Makefile @@ -1,7 +1,7 @@ # # Makefile for the access methods module # -# $PostgreSQL: pgsql/src/backend/access/Makefile,v 1.14 2008/02/19 10:30:06 petere Exp $ +# src/backend/access/Makefile # subdir = src/backend/access diff --git a/src/backend/access/common/Makefile b/src/backend/access/common/Makefile index 011c60fce5..1fa6de0823 100644 --- a/src/backend/access/common/Makefile +++ b/src/backend/access/common/Makefile @@ -4,7 +4,7 @@ # Makefile for access/common # # IDENTIFICATION -# $PostgreSQL: pgsql/src/backend/access/common/Makefile,v 1.26 2009/08/06 20:44:31 tgl Exp $ +# src/backend/access/common/Makefile # #------------------------------------------------------------------------- diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c index 8d770a368b..9ac43be09b 100644 --- a/src/backend/access/common/heaptuple.c +++ b/src/backend/access/common/heaptuple.c @@ -50,7 +50,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/common/heaptuple.c,v 1.130 2010/01/10 04:26:36 rhaas Exp $ + * src/backend/access/common/heaptuple.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/access/common/indextuple.c b/src/backend/access/common/indextuple.c index 3ce377b854..c33f587806 100644 --- a/src/backend/access/common/indextuple.c +++ b/src/backend/access/common/indextuple.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/common/indextuple.c,v 1.91 2010/01/10 04:26:36 rhaas Exp $ + * src/backend/access/common/indextuple.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/access/common/printtup.c b/src/backend/access/common/printtup.c index dee2a5a008..0c51e470fd 100644 --- a/src/backend/access/common/printtup.c +++ b/src/backend/access/common/printtup.c @@ -9,7 +9,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/common/printtup.c,v 1.106 2010/01/02 16:57:33 momjian Exp $ + * src/backend/access/common/printtup.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/access/common/reloptions.c b/src/backend/access/common/reloptions.c index cd4f59005a..438e8b007a 100644 --- a/src/backend/access/common/reloptions.c +++ b/src/backend/access/common/reloptions.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/common/reloptions.c,v 1.35 2010/06/07 02:59:02 itagaki Exp $ + * src/backend/access/common/reloptions.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/access/common/scankey.c b/src/backend/access/common/scankey.c index 23d6b88d41..1b6ac8be64 100644 --- a/src/backend/access/common/scankey.c +++ b/src/backend/access/common/scankey.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/common/scankey.c,v 1.34 2010/01/02 16:57:33 momjian Exp $ + * src/backend/access/common/scankey.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/access/common/tupconvert.c b/src/backend/access/common/tupconvert.c index fec3b3ef58..21026d437b 100644 --- a/src/backend/access/common/tupconvert.c +++ b/src/backend/access/common/tupconvert.c @@ -14,7 +14,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/common/tupconvert.c,v 1.4 2010/02/26 02:00:33 momjian Exp $ + * src/backend/access/common/tupconvert.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/access/common/tupdesc.c b/src/backend/access/common/tupdesc.c index 2125fdfb0b..33e5b192fc 100644 --- a/src/backend/access/common/tupdesc.c +++ b/src/backend/access/common/tupdesc.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/common/tupdesc.c,v 1.133 2010/02/14 18:42:12 rhaas Exp $ + * src/backend/access/common/tupdesc.c * * NOTES * some of the executor utility code such as "ExecTypeFromTL" should be diff --git a/src/backend/access/gin/Makefile b/src/backend/access/gin/Makefile index 23b75fc1d8..889dde6a27 100644 --- a/src/backend/access/gin/Makefile +++ b/src/backend/access/gin/Makefile @@ -4,7 +4,7 @@ # Makefile for access/gin # # IDENTIFICATION -# $PostgreSQL: pgsql/src/backend/access/gin/Makefile,v 1.4 2009/03/24 20:17:10 tgl Exp $ +# src/backend/access/gin/Makefile # #------------------------------------------------------------------------- diff --git a/src/backend/access/gin/README b/src/backend/access/gin/README index cd406935e0..69d5a31941 100644 --- a/src/backend/access/gin/README +++ b/src/backend/access/gin/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/backend/access/gin/README,v 1.7 2010/02/08 04:33:52 tgl Exp $ +src/backend/access/gin/README Gin for PostgreSQL ================== diff --git a/src/backend/access/gin/ginarrayproc.c b/src/backend/access/gin/ginarrayproc.c index db5c9e3d19..c62d54ed42 100644 --- a/src/backend/access/gin/ginarrayproc.c +++ b/src/backend/access/gin/ginarrayproc.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/gin/ginarrayproc.c,v 1.17 2010/01/02 16:57:33 momjian Exp $ + * src/backend/access/gin/ginarrayproc.c *------------------------------------------------------------------------- */ #include "postgres.h" diff --git a/src/backend/access/gin/ginbtree.c b/src/backend/access/gin/ginbtree.c index 94e3ceadd6..82d7dd18a8 100644 --- a/src/backend/access/gin/ginbtree.c +++ b/src/backend/access/gin/ginbtree.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/gin/ginbtree.c,v 1.16 2010/08/01 02:12:42 tgl Exp $ + * src/backend/access/gin/ginbtree.c *------------------------------------------------------------------------- */ diff --git a/src/backend/access/gin/ginbulk.c b/src/backend/access/gin/ginbulk.c index 6ea37349dc..5d2dcbd31f 100644 --- a/src/backend/access/gin/ginbulk.c +++ b/src/backend/access/gin/ginbulk.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/gin/ginbulk.c,v 1.20 2010/08/01 02:12:42 tgl Exp $ + * src/backend/access/gin/ginbulk.c *------------------------------------------------------------------------- */ diff --git a/src/backend/access/gin/gindatapage.c b/src/backend/access/gin/gindatapage.c index b456e167ce..c590d56f7c 100644 --- a/src/backend/access/gin/gindatapage.c +++ b/src/backend/access/gin/gindatapage.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/gin/gindatapage.c,v 1.17 2010/01/02 16:57:33 momjian Exp $ + * src/backend/access/gin/gindatapage.c *------------------------------------------------------------------------- */ diff --git a/src/backend/access/gin/ginentrypage.c b/src/backend/access/gin/ginentrypage.c index aaacea185a..d60282f204 100644 --- a/src/backend/access/gin/ginentrypage.c +++ b/src/backend/access/gin/ginentrypage.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/gin/ginentrypage.c,v 1.25 2010/08/01 02:12:42 tgl Exp $ + * src/backend/access/gin/ginentrypage.c *------------------------------------------------------------------------- */ diff --git a/src/backend/access/gin/ginfast.c b/src/backend/access/gin/ginfast.c index 62d3101ff1..eacac507e4 100644 --- a/src/backend/access/gin/ginfast.c +++ b/src/backend/access/gin/ginfast.c @@ -11,7 +11,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/gin/ginfast.c,v 1.8 2010/08/01 02:12:42 tgl Exp $ + * src/backend/access/gin/ginfast.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/access/gin/ginget.c b/src/backend/access/gin/ginget.c index eb6f5d1eb0..cf5710b655 100644 --- a/src/backend/access/gin/ginget.c +++ b/src/backend/access/gin/ginget.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/gin/ginget.c,v 1.32 2010/08/01 19:16:39 tgl Exp $ + * src/backend/access/gin/ginget.c *------------------------------------------------------------------------- */ diff --git a/src/backend/access/gin/gininsert.c b/src/backend/access/gin/gininsert.c index 132edc9175..640d3acde9 100644 --- a/src/backend/access/gin/gininsert.c +++ b/src/backend/access/gin/gininsert.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/gin/gininsert.c,v 1.27 2010/08/01 02:12:42 tgl Exp $ + * src/backend/access/gin/gininsert.c *------------------------------------------------------------------------- */ diff --git a/src/backend/access/gin/ginscan.c b/src/backend/access/gin/ginscan.c index c9cefa8e80..9e22ed48a8 100644 --- a/src/backend/access/gin/ginscan.c +++ b/src/backend/access/gin/ginscan.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/gin/ginscan.c,v 1.27 2010/07/31 00:30:54 tgl Exp $ + * src/backend/access/gin/ginscan.c *------------------------------------------------------------------------- */ diff --git a/src/backend/access/gin/ginutil.c b/src/backend/access/gin/ginutil.c index 2a75820e22..c128e5b330 100644 --- a/src/backend/access/gin/ginutil.c +++ b/src/backend/access/gin/ginutil.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/gin/ginutil.c,v 1.23 2010/01/02 16:57:33 momjian Exp $ + * src/backend/access/gin/ginutil.c *------------------------------------------------------------------------- */ diff --git a/src/backend/access/gin/ginvacuum.c b/src/backend/access/gin/ginvacuum.c index a13b99cdfa..f074299622 100644 --- a/src/backend/access/gin/ginvacuum.c +++ b/src/backend/access/gin/ginvacuum.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/gin/ginvacuum.c,v 1.33 2010/02/08 04:33:52 tgl Exp $ + * src/backend/access/gin/ginvacuum.c *------------------------------------------------------------------------- */ diff --git a/src/backend/access/gin/ginxlog.c b/src/backend/access/gin/ginxlog.c index cff5bc8bd5..7a581334f1 100644 --- a/src/backend/access/gin/ginxlog.c +++ b/src/backend/access/gin/ginxlog.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/gin/ginxlog.c,v 1.22 2010/02/09 20:31:24 heikki Exp $ + * src/backend/access/gin/ginxlog.c *------------------------------------------------------------------------- */ #include "postgres.h" diff --git a/src/backend/access/gist/Makefile b/src/backend/access/gist/Makefile index 298e9309f5..f8051a2b45 100644 --- a/src/backend/access/gist/Makefile +++ b/src/backend/access/gist/Makefile @@ -4,7 +4,7 @@ # Makefile for access/gist # # IDENTIFICATION -# $PostgreSQL: pgsql/src/backend/access/gist/Makefile,v 1.18 2008/02/19 10:30:06 petere Exp $ +# src/backend/access/gist/Makefile # #------------------------------------------------------------------------- diff --git a/src/backend/access/gist/README b/src/backend/access/gist/README index 6c90e508bf..b613a4831f 100644 --- a/src/backend/access/gist/README +++ b/src/backend/access/gist/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/backend/access/gist/README,v 1.5 2010/04/14 20:17:26 rhaas Exp $ +src/backend/access/gist/README GiST Indexing ============= diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c index cec08c7226..3054f98c9e 100644 --- a/src/backend/access/gist/gist.c +++ b/src/backend/access/gist/gist.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/gist/gist.c,v 1.158 2010/01/02 16:57:33 momjian Exp $ + * src/backend/access/gist/gist.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/access/gist/gistget.c b/src/backend/access/gist/gistget.c index 216910307a..fab13eed52 100644 --- a/src/backend/access/gist/gistget.c +++ b/src/backend/access/gist/gistget.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/gist/gistget.c,v 1.85 2010/02/26 02:00:33 momjian Exp $ + * src/backend/access/gist/gistget.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/access/gist/gistproc.c b/src/backend/access/gist/gistproc.c index cb34b26113..9f6fb34280 100644 --- a/src/backend/access/gist/gistproc.c +++ b/src/backend/access/gist/gistproc.c @@ -10,7 +10,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/gist/gistproc.c,v 1.21 2010/02/26 02:00:33 momjian Exp $ + * src/backend/access/gist/gistproc.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/access/gist/gistscan.c b/src/backend/access/gist/gistscan.c index a53d8cd087..21f4ea54b7 100644 --- a/src/backend/access/gist/gistscan.c +++ b/src/backend/access/gist/gistscan.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/gist/gistscan.c,v 1.79 2010/02/26 02:00:33 momjian Exp $ + * src/backend/access/gist/gistscan.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/access/gist/gistsplit.c b/src/backend/access/gist/gistsplit.c index 5700e530fe..0ce317cdbc 100644 --- a/src/backend/access/gist/gistsplit.c +++ b/src/backend/access/gist/gistsplit.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/gist/gistsplit.c,v 1.12 2010/01/02 16:57:34 momjian Exp $ + * src/backend/access/gist/gistsplit.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/access/gist/gistutil.c b/src/backend/access/gist/gistutil.c index 03c5773d4d..28ab575425 100644 --- a/src/backend/access/gist/gistutil.c +++ b/src/backend/access/gist/gistutil.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/gist/gistutil.c,v 1.35 2010/01/02 16:57:34 momjian Exp $ + * src/backend/access/gist/gistutil.c *------------------------------------------------------------------------- */ #include "postgres.h" diff --git a/src/backend/access/gist/gistvacuum.c b/src/backend/access/gist/gistvacuum.c index abd3d99956..0ff5ba840e 100644 --- a/src/backend/access/gist/gistvacuum.c +++ b/src/backend/access/gist/gistvacuum.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/gist/gistvacuum.c,v 1.48 2010/02/08 05:17:31 tgl Exp $ + * src/backend/access/gist/gistvacuum.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/access/gist/gistxlog.c b/src/backend/access/gist/gistxlog.c index 7f5dd990c8..a90303e547 100644 --- a/src/backend/access/gist/gistxlog.c +++ b/src/backend/access/gist/gistxlog.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/gist/gistxlog.c,v 1.35 2010/01/02 16:57:34 momjian Exp $ + * src/backend/access/gist/gistxlog.c *------------------------------------------------------------------------- */ #include "postgres.h" diff --git a/src/backend/access/hash/Makefile b/src/backend/access/hash/Makefile index 80f9ea61e9..82297606dc 100644 --- a/src/backend/access/hash/Makefile +++ b/src/backend/access/hash/Makefile @@ -4,7 +4,7 @@ # Makefile for access/hash # # IDENTIFICATION -# $PostgreSQL: pgsql/src/backend/access/hash/Makefile,v 1.15 2008/03/16 23:15:08 tgl Exp $ +# src/backend/access/hash/Makefile # #------------------------------------------------------------------------- diff --git a/src/backend/access/hash/README b/src/backend/access/hash/README index 026ad40bfb..cd4e058389 100644 --- a/src/backend/access/hash/README +++ b/src/backend/access/hash/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/backend/access/hash/README,v 1.9 2009/11/01 21:25:25 tgl Exp $ +src/backend/access/hash/README Hash Indexing ============= diff --git a/src/backend/access/hash/hash.c b/src/backend/access/hash/hash.c index 6474f45940..bb46446d71 100644 --- a/src/backend/access/hash/hash.c +++ b/src/backend/access/hash/hash.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/hash/hash.c,v 1.117 2010/02/26 02:00:33 momjian Exp $ + * src/backend/access/hash/hash.c * * NOTES * This file contains only the public interface routines. diff --git a/src/backend/access/hash/hashfunc.c b/src/backend/access/hash/hashfunc.c index 872c9f0f26..577873b5cd 100644 --- a/src/backend/access/hash/hashfunc.c +++ b/src/backend/access/hash/hashfunc.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/hash/hashfunc.c,v 1.62 2010/01/07 04:53:34 tgl Exp $ + * src/backend/access/hash/hashfunc.c * * NOTES * These functions are stored in pg_amproc. For each operator class diff --git a/src/backend/access/hash/hashinsert.c b/src/backend/access/hash/hashinsert.c index 4d1cbbc8da..4eb57ca826 100644 --- a/src/backend/access/hash/hashinsert.c +++ b/src/backend/access/hash/hashinsert.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/hash/hashinsert.c,v 1.54 2010/01/02 16:57:34 momjian Exp $ + * src/backend/access/hash/hashinsert.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/access/hash/hashovfl.c b/src/backend/access/hash/hashovfl.c index 3ca8d733ad..7c6e902ea9 100644 --- a/src/backend/access/hash/hashovfl.c +++ b/src/backend/access/hash/hashovfl.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/hash/hashovfl.c,v 1.69 2010/02/26 02:00:33 momjian Exp $ + * src/backend/access/hash/hashovfl.c * * NOTES * Overflow pages look like ordinary relation pages. diff --git a/src/backend/access/hash/hashpage.c b/src/backend/access/hash/hashpage.c index d7df3d2391..2ebeda98b5 100644 --- a/src/backend/access/hash/hashpage.c +++ b/src/backend/access/hash/hashpage.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/hash/hashpage.c,v 1.84 2010/08/19 02:58:37 rhaas Exp $ + * src/backend/access/hash/hashpage.c * * NOTES * Postgres hash pages look like ordinary relation pages. The opaque diff --git a/src/backend/access/hash/hashscan.c b/src/backend/access/hash/hashscan.c index fd2486a556..9e4e93dcc2 100644 --- a/src/backend/access/hash/hashscan.c +++ b/src/backend/access/hash/hashscan.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/hash/hashscan.c,v 1.48 2010/01/02 16:57:34 momjian Exp $ + * src/backend/access/hash/hashscan.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/access/hash/hashsearch.c b/src/backend/access/hash/hashsearch.c index b1ccff673e..11df41eedb 100644 --- a/src/backend/access/hash/hashsearch.c +++ b/src/backend/access/hash/hashsearch.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/hash/hashsearch.c,v 1.59 2010/01/02 16:57:34 momjian Exp $ + * src/backend/access/hash/hashsearch.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/access/hash/hashsort.c b/src/backend/access/hash/hashsort.c index b250e814f9..a06663aa2a 100644 --- a/src/backend/access/hash/hashsort.c +++ b/src/backend/access/hash/hashsort.c @@ -18,7 +18,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/hash/hashsort.c,v 1.4 2010/01/02 16:57:34 momjian Exp $ + * src/backend/access/hash/hashsort.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/access/hash/hashutil.c b/src/backend/access/hash/hashutil.c index d6676702cd..c2e2cb2703 100644 --- a/src/backend/access/hash/hashutil.c +++ b/src/backend/access/hash/hashutil.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/hash/hashutil.c,v 1.62 2010/01/02 16:57:34 momjian Exp $ + * src/backend/access/hash/hashutil.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/access/heap/Makefile b/src/backend/access/heap/Makefile index dc33054641..b83d496bcd 100644 --- a/src/backend/access/heap/Makefile +++ b/src/backend/access/heap/Makefile @@ -4,7 +4,7 @@ # Makefile for access/heap # # IDENTIFICATION -# $PostgreSQL: pgsql/src/backend/access/heap/Makefile,v 1.19 2008/12/03 13:05:22 heikki Exp $ +# src/backend/access/heap/Makefile # #------------------------------------------------------------------------- diff --git a/src/backend/access/heap/README.HOT b/src/backend/access/heap/README.HOT index d32b7f59ab..f12cad44e5 100644 --- a/src/backend/access/heap/README.HOT +++ b/src/backend/access/heap/README.HOT @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/backend/access/heap/README.HOT,v 1.7 2010/09/19 17:51:44 momjian Exp $ +src/backend/access/heap/README.HOT Heap Only Tuples (HOT) ====================== diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c index 56eb4b5953..8b064bcff2 100644 --- a/src/backend/access/heap/heapam.c +++ b/src/backend/access/heap/heapam.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/heap/heapam.c,v 1.294 2010/09/11 18:38:55 joe Exp $ + * src/backend/access/heap/heapam.c * * * INTERFACE ROUTINES diff --git a/src/backend/access/heap/hio.c b/src/backend/access/heap/hio.c index 83915ba33d..01d71a1df9 100644 --- a/src/backend/access/heap/hio.c +++ b/src/backend/access/heap/hio.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/heap/hio.c,v 1.78 2010/02/09 21:43:29 tgl Exp $ + * src/backend/access/heap/hio.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/access/heap/pruneheap.c b/src/backend/access/heap/pruneheap.c index 3332e085b8..b8c4027a9e 100644 --- a/src/backend/access/heap/pruneheap.c +++ b/src/backend/access/heap/pruneheap.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/heap/pruneheap.c,v 1.25 2010/07/06 19:18:55 momjian Exp $ + * src/backend/access/heap/pruneheap.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/access/heap/rewriteheap.c b/src/backend/access/heap/rewriteheap.c index e35fbeb9b1..a5150363f9 100644 --- a/src/backend/access/heap/rewriteheap.c +++ b/src/backend/access/heap/rewriteheap.c @@ -96,7 +96,7 @@ * Portions Copyright (c) 1994-5, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/heap/rewriteheap.c,v 1.22 2010/04/28 16:10:40 heikki Exp $ + * src/backend/access/heap/rewriteheap.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/access/heap/syncscan.c b/src/backend/access/heap/syncscan.c index 8dc2bb476d..05497ace12 100644 --- a/src/backend/access/heap/syncscan.c +++ b/src/backend/access/heap/syncscan.c @@ -40,7 +40,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/heap/syncscan.c,v 1.7 2010/01/02 16:57:35 momjian Exp $ + * src/backend/access/heap/syncscan.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/access/heap/tuptoaster.c b/src/backend/access/heap/tuptoaster.c index 7518db16c8..c83aed2e39 100644 --- a/src/backend/access/heap/tuptoaster.c +++ b/src/backend/access/heap/tuptoaster.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/heap/tuptoaster.c,v 1.98 2010/02/26 02:00:33 momjian Exp $ + * src/backend/access/heap/tuptoaster.c * * * INTERFACE ROUTINES diff --git a/src/backend/access/heap/visibilitymap.c b/src/backend/access/heap/visibilitymap.c index 3276b2b5c6..ab941debcb 100644 --- a/src/backend/access/heap/visibilitymap.c +++ b/src/backend/access/heap/visibilitymap.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/heap/visibilitymap.c,v 1.12 2010/08/19 02:58:37 rhaas Exp $ + * src/backend/access/heap/visibilitymap.c * * INTERFACE ROUTINES * visibilitymap_clear - clear a bit in the visibility map diff --git a/src/backend/access/index/Makefile b/src/backend/access/index/Makefile index 6357a43f89..96490db032 100644 --- a/src/backend/access/index/Makefile +++ b/src/backend/access/index/Makefile @@ -4,7 +4,7 @@ # Makefile for access/index # # IDENTIFICATION -# $PostgreSQL: pgsql/src/backend/access/index/Makefile,v 1.14 2008/02/19 10:30:06 petere Exp $ +# src/backend/access/index/Makefile # #------------------------------------------------------------------------- diff --git a/src/backend/access/index/genam.c b/src/backend/access/index/genam.c index d95fd90a42..cd0212aa94 100644 --- a/src/backend/access/index/genam.c +++ b/src/backend/access/index/genam.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/index/genam.c,v 1.81 2010/02/26 02:00:33 momjian Exp $ + * src/backend/access/index/genam.c * * NOTES * many of the old access method routines have been turned into diff --git a/src/backend/access/index/indexam.c b/src/backend/access/index/indexam.c index 3e7331ae7b..d151ffda8c 100644 --- a/src/backend/access/index/indexam.c +++ b/src/backend/access/index/indexam.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/index/indexam.c,v 1.118 2010/02/26 02:00:34 momjian Exp $ + * src/backend/access/index/indexam.c * * INTERFACE ROUTINES * index_open - open an index relation by relation OID diff --git a/src/backend/access/nbtree/Makefile b/src/backend/access/nbtree/Makefile index 676ae3c270..2d76d648e0 100644 --- a/src/backend/access/nbtree/Makefile +++ b/src/backend/access/nbtree/Makefile @@ -4,7 +4,7 @@ # Makefile for access/nbtree # # IDENTIFICATION -# $PostgreSQL: pgsql/src/backend/access/nbtree/Makefile,v 1.16 2008/02/19 10:30:06 petere Exp $ +# src/backend/access/nbtree/Makefile # #------------------------------------------------------------------------- diff --git a/src/backend/access/nbtree/README b/src/backend/access/nbtree/README index 57d6308ada..de0da704a3 100644 --- a/src/backend/access/nbtree/README +++ b/src/backend/access/nbtree/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/backend/access/nbtree/README,v 1.22 2010/02/08 04:33:53 tgl Exp $ +src/backend/access/nbtree/README Btree Indexing ============== diff --git a/src/backend/access/nbtree/nbtcompare.c b/src/backend/access/nbtree/nbtcompare.c index 13c127a93c..8849a0244d 100644 --- a/src/backend/access/nbtree/nbtcompare.c +++ b/src/backend/access/nbtree/nbtcompare.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtcompare.c,v 1.58 2010/01/02 16:57:35 momjian Exp $ + * src/backend/access/nbtree/nbtcompare.c * * NOTES * diff --git a/src/backend/access/nbtree/nbtinsert.c b/src/backend/access/nbtree/nbtinsert.c index 37c7bd1f88..eaad8122b1 100644 --- a/src/backend/access/nbtree/nbtinsert.c +++ b/src/backend/access/nbtree/nbtinsert.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.179 2010/08/29 19:33:14 tgl Exp $ + * src/backend/access/nbtree/nbtinsert.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/access/nbtree/nbtpage.c b/src/backend/access/nbtree/nbtpage.c index 25fdcd289c..e0c0f21f4e 100644 --- a/src/backend/access/nbtree/nbtpage.c +++ b/src/backend/access/nbtree/nbtpage.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtpage.c,v 1.124 2010/08/29 19:33:14 tgl Exp $ + * src/backend/access/nbtree/nbtpage.c * * NOTES * Postgres btree pages look like ordinary relation pages. The opaque diff --git a/src/backend/access/nbtree/nbtree.c b/src/backend/access/nbtree/nbtree.c index 0fcde95ccd..46aeb9e6ad 100644 --- a/src/backend/access/nbtree/nbtree.c +++ b/src/backend/access/nbtree/nbtree.c @@ -12,7 +12,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtree.c,v 1.177 2010/03/28 09:27:01 sriggs Exp $ + * src/backend/access/nbtree/nbtree.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/access/nbtree/nbtsearch.c b/src/backend/access/nbtree/nbtsearch.c index fc11829495..b3bb273b30 100644 --- a/src/backend/access/nbtree/nbtsearch.c +++ b/src/backend/access/nbtree/nbtsearch.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.121 2010/01/02 16:57:35 momjian Exp $ + * src/backend/access/nbtree/nbtsearch.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/access/nbtree/nbtsort.c b/src/backend/access/nbtree/nbtsort.c index e7048e7211..a1d3aef353 100644 --- a/src/backend/access/nbtree/nbtsort.c +++ b/src/backend/access/nbtree/nbtsort.c @@ -59,7 +59,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtsort.c,v 1.126 2010/08/13 20:10:50 rhaas Exp $ + * src/backend/access/nbtree/nbtsort.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/access/nbtree/nbtutils.c b/src/backend/access/nbtree/nbtutils.c index 6b399d34a6..8f0f226113 100644 --- a/src/backend/access/nbtree/nbtutils.c +++ b/src/backend/access/nbtree/nbtutils.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtutils.c,v 1.98 2010/02/26 02:00:34 momjian Exp $ + * src/backend/access/nbtree/nbtutils.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/access/nbtree/nbtxlog.c b/src/backend/access/nbtree/nbtxlog.c index 3261483475..0822f5cb11 100644 --- a/src/backend/access/nbtree/nbtxlog.c +++ b/src/backend/access/nbtree/nbtxlog.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/nbtree/nbtxlog.c,v 1.69 2010/07/06 19:18:55 momjian Exp $ + * src/backend/access/nbtree/nbtxlog.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/access/transam/Makefile b/src/backend/access/transam/Makefile index 38cfe1a277..4179433bc1 100644 --- a/src/backend/access/transam/Makefile +++ b/src/backend/access/transam/Makefile @@ -4,7 +4,7 @@ # Makefile for access/transam # # IDENTIFICATION -# $PostgreSQL: pgsql/src/backend/access/transam/Makefile,v 1.22 2008/02/19 10:30:07 petere Exp $ +# src/backend/access/transam/Makefile # #------------------------------------------------------------------------- diff --git a/src/backend/access/transam/README b/src/backend/access/transam/README index 08794cdf8a..eaac1393b8 100644 --- a/src/backend/access/transam/README +++ b/src/backend/access/transam/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/backend/access/transam/README,v 1.14 2010/09/17 00:42:39 tgl Exp $ +src/backend/access/transam/README The Transaction System ====================== diff --git a/src/backend/access/transam/clog.c b/src/backend/access/transam/clog.c index cb3f91a76b..63d0ae6f63 100644 --- a/src/backend/access/transam/clog.c +++ b/src/backend/access/transam/clog.c @@ -26,7 +26,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/access/transam/clog.c,v 1.55 2010/01/02 16:57:35 momjian Exp $ + * src/backend/access/transam/clog.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/access/transam/multixact.c b/src/backend/access/transam/multixact.c index 3f3bdc0335..9422ef3994 100644 --- a/src/backend/access/transam/multixact.c +++ b/src/backend/access/transam/multixact.c @@ -42,7 +42,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/access/transam/multixact.c,v 1.35 2010/02/26 02:00:34 momjian Exp $ + * src/backend/access/transam/multixact.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/access/transam/rmgr.c b/src/backend/access/transam/rmgr.c index 8038b25d1d..c706e97956 100644 --- a/src/backend/access/transam/rmgr.c +++ b/src/backend/access/transam/rmgr.c @@ -3,7 +3,7 @@ * * Resource managers definition * - * $PostgreSQL: pgsql/src/backend/access/transam/rmgr.c,v 1.29 2010/02/07 20:48:09 tgl Exp $ + * src/backend/access/transam/rmgr.c */ #include "postgres.h" diff --git a/src/backend/access/transam/slru.c b/src/backend/access/transam/slru.c index 846d1b8a94..95c388fc83 100644 --- a/src/backend/access/transam/slru.c +++ b/src/backend/access/transam/slru.c @@ -41,7 +41,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/access/transam/slru.c,v 1.50 2010/04/28 16:54:15 tgl Exp $ + * src/backend/access/transam/slru.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/access/transam/subtrans.c b/src/backend/access/transam/subtrans.c index 4ccb0c239b..44e33b2b94 100644 --- a/src/backend/access/transam/subtrans.c +++ b/src/backend/access/transam/subtrans.c @@ -22,7 +22,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/access/transam/subtrans.c,v 1.27 2010/02/26 02:00:34 momjian Exp $ + * src/backend/access/transam/subtrans.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/access/transam/transam.c b/src/backend/access/transam/transam.c index 0c2e2dd824..799780af73 100644 --- a/src/backend/access/transam/transam.c +++ b/src/backend/access/transam/transam.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/transam/transam.c,v 1.80 2010/01/02 16:57:35 momjian Exp $ + * src/backend/access/transam/transam.c * * NOTES * This file contains the high level access-method interface to the diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c index 3a3302e8b8..cc8afc5bdf 100644 --- a/src/backend/access/transam/twophase.c +++ b/src/backend/access/transam/twophase.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/transam/twophase.c,v 1.64 2010/09/11 15:48:04 heikki Exp $ + * src/backend/access/transam/twophase.c * * NOTES * Each global transaction is associated with a global transaction diff --git a/src/backend/access/transam/twophase_rmgr.c b/src/backend/access/transam/twophase_rmgr.c index d8f7fb6a03..bb2c33c173 100644 --- a/src/backend/access/transam/twophase_rmgr.c +++ b/src/backend/access/transam/twophase_rmgr.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/transam/twophase_rmgr.c,v 1.14 2010/02/26 02:00:34 momjian Exp $ + * src/backend/access/transam/twophase_rmgr.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/access/transam/varsup.c b/src/backend/access/transam/varsup.c index 4f3c0ae452..391724ea0f 100644 --- a/src/backend/access/transam/varsup.c +++ b/src/backend/access/transam/varsup.c @@ -6,7 +6,7 @@ * Copyright (c) 2000-2010, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/transam/varsup.c,v 1.91 2010/02/26 02:00:34 momjian Exp $ + * src/backend/access/transam/varsup.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c index 89f17a9d16..b02db9eb60 100644 --- a/src/backend/access/transam/xact.c +++ b/src/backend/access/transam/xact.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.299 2010/09/11 15:48:04 heikki Exp $ + * src/backend/access/transam/xact.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index 7fb0bdaee7..5aae282acd 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.436 2010/09/15 13:58:22 heikki Exp $ + * src/backend/access/transam/xlog.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/access/transam/xlogutils.c b/src/backend/access/transam/xlogutils.c index 30e120a251..a3ec4259ee 100644 --- a/src/backend/access/transam/xlogutils.c +++ b/src/backend/access/transam/xlogutils.c @@ -11,7 +11,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/access/transam/xlogutils.c,v 1.73 2010/08/30 16:46:23 tgl Exp $ + * src/backend/access/transam/xlogutils.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/bootstrap/Makefile b/src/backend/bootstrap/Makefile index f1dd7e12c3..4d68649ccc 100644 --- a/src/backend/bootstrap/Makefile +++ b/src/backend/bootstrap/Makefile @@ -2,7 +2,7 @@ # # Makefile for the bootstrap module # -# $PostgreSQL: pgsql/src/backend/bootstrap/Makefile,v 1.39 2010/01/05 03:56:52 tgl Exp $ +# src/backend/bootstrap/Makefile # #------------------------------------------------------------------------- diff --git a/src/backend/bootstrap/bootparse.y b/src/backend/bootstrap/bootparse.y index 70cad32915..e475403b9e 100644 --- a/src/backend/bootstrap/bootparse.y +++ b/src/backend/bootstrap/bootparse.y @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/bootstrap/bootparse.y,v 1.106 2010/07/25 23:21:21 rhaas Exp $ + * src/backend/bootstrap/bootparse.y * *------------------------------------------------------------------------- */ diff --git a/src/backend/bootstrap/bootscanner.l b/src/backend/bootstrap/bootscanner.l index f2c8f824bd..146110270a 100644 --- a/src/backend/bootstrap/bootscanner.l +++ b/src/backend/bootstrap/bootscanner.l @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/bootstrap/bootscanner.l,v 1.51 2010/01/02 16:57:36 momjian Exp $ + * src/backend/bootstrap/bootscanner.l * *------------------------------------------------------------------------- */ diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c index c4744966ca..a082ed807a 100644 --- a/src/backend/bootstrap/bootstrap.c +++ b/src/backend/bootstrap/bootstrap.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/bootstrap/bootstrap.c,v 1.262 2010/09/03 01:34:55 tgl Exp $ + * src/backend/bootstrap/bootstrap.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/catalog/Catalog.pm b/src/backend/catalog/Catalog.pm index bcd4e31fb9..f6f5cd1215 100644 --- a/src/backend/catalog/Catalog.pm +++ b/src/backend/catalog/Catalog.pm @@ -7,7 +7,7 @@ # Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group # Portions Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/backend/catalog/Catalog.pm,v 1.3 2010/01/05 20:23:32 tgl Exp $ +# src/backend/catalog/Catalog.pm # #---------------------------------------------------------------------- diff --git a/src/backend/catalog/Makefile b/src/backend/catalog/Makefile index 0a1546bfa7..f4a7eb09dc 100644 --- a/src/backend/catalog/Makefile +++ b/src/backend/catalog/Makefile @@ -2,7 +2,7 @@ # # Makefile for backend/catalog # -# $PostgreSQL: pgsql/src/backend/catalog/Makefile,v 1.79 2010/08/27 11:47:41 rhaas Exp $ +# src/backend/catalog/Makefile # #------------------------------------------------------------------------- diff --git a/src/backend/catalog/README b/src/backend/catalog/README index d0f43d9f04..fce01ea431 100644 --- a/src/backend/catalog/README +++ b/src/backend/catalog/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/backend/catalog/README,v 1.15 2010/07/20 18:38:53 momjian Exp $ +src/backend/catalog/README System Catalog ============== diff --git a/src/backend/catalog/aclchk.c b/src/backend/catalog/aclchk.c index bc3985be69..fb080e9298 100644 --- a/src/backend/catalog/aclchk.c +++ b/src/backend/catalog/aclchk.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/aclchk.c,v 1.169 2010/08/05 14:44:58 rhaas Exp $ + * src/backend/catalog/aclchk.c * * NOTES * See acl.h. diff --git a/src/backend/catalog/catalog.c b/src/backend/catalog/catalog.c index 016081a7bf..63225127f7 100644 --- a/src/backend/catalog/catalog.c +++ b/src/backend/catalog/catalog.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/catalog.c,v 1.91 2010/08/13 20:10:50 rhaas Exp $ + * src/backend/catalog/catalog.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/catalog/dependency.c b/src/backend/catalog/dependency.c index aeffbf4d74..62598ee8f8 100644 --- a/src/backend/catalog/dependency.c +++ b/src/backend/catalog/dependency.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/dependency.c,v 1.97 2010/08/07 02:44:06 tgl Exp $ + * src/backend/catalog/dependency.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/catalog/genbki.pl b/src/backend/catalog/genbki.pl index 85d1d717a2..a3b8e7ba4c 100644 --- a/src/backend/catalog/genbki.pl +++ b/src/backend/catalog/genbki.pl @@ -10,7 +10,7 @@ # Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group # Portions Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/backend/catalog/genbki.pl,v 1.8 2010/04/20 23:48:47 tgl Exp $ +# src/backend/catalog/genbki.pl # #---------------------------------------------------------------------- diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c index 7754b73d73..dcc53e13a1 100644 --- a/src/backend/catalog/heap.c +++ b/src/backend/catalog/heap.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/heap.c,v 1.375 2010/08/13 20:10:50 rhaas Exp $ + * src/backend/catalog/heap.c * * * INTERFACE ROUTINES diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c index effc9c3bef..2b92e46253 100644 --- a/src/backend/catalog/index.c +++ b/src/backend/catalog/index.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/index.c,v 1.339 2010/09/11 18:38:56 joe Exp $ + * src/backend/catalog/index.c * * * INTERFACE ROUTINES diff --git a/src/backend/catalog/indexing.c b/src/backend/catalog/indexing.c index 52701199f8..4cc58bb709 100644 --- a/src/backend/catalog/indexing.c +++ b/src/backend/catalog/indexing.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/indexing.c,v 1.120 2010/01/02 16:57:36 momjian Exp $ + * src/backend/catalog/indexing.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/catalog/information_schema.sql b/src/backend/catalog/information_schema.sql index f576490749..bd812220f1 100644 --- a/src/backend/catalog/information_schema.sql +++ b/src/backend/catalog/information_schema.sql @@ -4,7 +4,7 @@ * * Copyright (c) 2003-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/backend/catalog/information_schema.sql,v 1.66 2010/04/28 21:18:07 tgl Exp $ + * src/backend/catalog/information_schema.sql */ /* diff --git a/src/backend/catalog/namespace.c b/src/backend/catalog/namespace.c index 624c8337b0..3727146ea0 100644 --- a/src/backend/catalog/namespace.c +++ b/src/backend/catalog/namespace.c @@ -13,7 +13,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/namespace.c,v 1.129 2010/08/13 20:10:50 rhaas Exp $ + * src/backend/catalog/namespace.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index 64313144ea..93f5ac6bee 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/objectaddress.c,v 1.3 2010/09/02 02:52:14 rhaas Exp $ + * src/backend/catalog/objectaddress.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/catalog/pg_aggregate.c b/src/backend/catalog/pg_aggregate.c index 9672ecf0aa..eadf41fa3a 100644 --- a/src/backend/catalog/pg_aggregate.c +++ b/src/backend/catalog/pg_aggregate.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/pg_aggregate.c,v 1.106 2010/02/26 02:00:37 momjian Exp $ + * src/backend/catalog/pg_aggregate.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/catalog/pg_constraint.c b/src/backend/catalog/pg_constraint.c index 42d7d6caca..8b4f8c636f 100644 --- a/src/backend/catalog/pg_constraint.c +++ b/src/backend/catalog/pg_constraint.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/pg_constraint.c,v 1.56 2010/09/05 15:45:42 tgl Exp $ + * src/backend/catalog/pg_constraint.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/catalog/pg_conversion.c b/src/backend/catalog/pg_conversion.c index 574eef56e1..957818403f 100644 --- a/src/backend/catalog/pg_conversion.c +++ b/src/backend/catalog/pg_conversion.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/pg_conversion.c,v 1.50 2010/02/14 18:42:13 rhaas Exp $ + * src/backend/catalog/pg_conversion.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/catalog/pg_db_role_setting.c b/src/backend/catalog/pg_db_role_setting.c index a545095d02..ba2b7b26b5 100644 --- a/src/backend/catalog/pg_db_role_setting.c +++ b/src/backend/catalog/pg_db_role_setting.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/pg_db_role_setting.c,v 1.4 2010/03/25 14:44:33 alvherre Exp $ + * src/backend/catalog/pg_db_role_setting.c */ #include "postgres.h" diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index bc5a8d4f9a..eb3d26f592 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/pg_depend.c,v 1.33 2010/01/02 16:57:36 momjian Exp $ + * src/backend/catalog/pg_depend.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/catalog/pg_enum.c b/src/backend/catalog/pg_enum.c index dba215f612..d544c1f477 100644 --- a/src/backend/catalog/pg_enum.c +++ b/src/backend/catalog/pg_enum.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/pg_enum.c,v 1.14 2010/02/26 02:00:37 momjian Exp $ + * src/backend/catalog/pg_enum.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/catalog/pg_inherits.c b/src/backend/catalog/pg_inherits.c index d852e3554b..96a304c80b 100644 --- a/src/backend/catalog/pg_inherits.c +++ b/src/backend/catalog/pg_inherits.c @@ -13,7 +13,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/pg_inherits.c,v 1.8 2010/02/26 02:00:37 momjian Exp $ + * src/backend/catalog/pg_inherits.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/catalog/pg_largeobject.c b/src/backend/catalog/pg_largeobject.c index 7c5f56ffc6..c8086fb5fe 100644 --- a/src/backend/catalog/pg_largeobject.c +++ b/src/backend/catalog/pg_largeobject.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/pg_largeobject.c,v 1.40 2010/06/09 21:14:28 rhaas Exp $ + * src/backend/catalog/pg_largeobject.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/catalog/pg_namespace.c b/src/backend/catalog/pg_namespace.c index 79d03b317a..71ebd7aa82 100644 --- a/src/backend/catalog/pg_namespace.c +++ b/src/backend/catalog/pg_namespace.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/pg_namespace.c,v 1.23 2010/02/14 18:42:13 rhaas Exp $ + * src/backend/catalog/pg_namespace.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/catalog/pg_operator.c b/src/backend/catalog/pg_operator.c index 8eebb1d496..73de672520 100644 --- a/src/backend/catalog/pg_operator.c +++ b/src/backend/catalog/pg_operator.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/pg_operator.c,v 1.111 2010/02/14 18:42:13 rhaas Exp $ + * src/backend/catalog/pg_operator.c * * NOTES * these routines moved here from commands/define.c and somewhat cleaned up. diff --git a/src/backend/catalog/pg_proc.c b/src/backend/catalog/pg_proc.c index f60cc6106a..34cd862d27 100644 --- a/src/backend/catalog/pg_proc.c +++ b/src/backend/catalog/pg_proc.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/pg_proc.c,v 1.176 2010/07/06 19:18:56 momjian Exp $ + * src/backend/catalog/pg_proc.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/catalog/pg_shdepend.c b/src/backend/catalog/pg_shdepend.c index 9faeff1bfe..48cbbb1a7d 100644 --- a/src/backend/catalog/pg_shdepend.c +++ b/src/backend/catalog/pg_shdepend.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/pg_shdepend.c,v 1.45 2010/08/26 19:49:08 alvherre Exp $ + * src/backend/catalog/pg_shdepend.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/catalog/pg_type.c b/src/backend/catalog/pg_type.c index d4fdea91aa..d7fccdf07b 100644 --- a/src/backend/catalog/pg_type.c +++ b/src/backend/catalog/pg_type.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/pg_type.c,v 1.133 2010/02/26 02:00:37 momjian Exp $ + * src/backend/catalog/pg_type.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/catalog/storage.c b/src/backend/catalog/storage.c index 5a1131945c..0ce2051b6b 100644 --- a/src/backend/catalog/storage.c +++ b/src/backend/catalog/storage.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/storage.c,v 1.11 2010/08/13 20:10:50 rhaas Exp $ + * src/backend/catalog/storage.c * * NOTES * Some of this code used to be in storage/smgr/smgr.c, and the diff --git a/src/backend/catalog/system_views.sql b/src/backend/catalog/system_views.sql index a160480289..651ffc61b9 100644 --- a/src/backend/catalog/system_views.sql +++ b/src/backend/catalog/system_views.sql @@ -3,7 +3,7 @@ * * Copyright (c) 1996-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/backend/catalog/system_views.sql,v 1.68 2010/08/21 10:59:17 mha Exp $ + * src/backend/catalog/system_views.sql */ CREATE VIEW pg_roles AS diff --git a/src/backend/catalog/toasting.c b/src/backend/catalog/toasting.c index 14757eed52..7bf64e22ee 100644 --- a/src/backend/catalog/toasting.c +++ b/src/backend/catalog/toasting.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/toasting.c,v 1.34 2010/08/13 20:10:50 rhaas Exp $ + * src/backend/catalog/toasting.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/commands/Makefile b/src/backend/commands/Makefile index 29a29ab7f4..4e9bf43ad5 100644 --- a/src/backend/commands/Makefile +++ b/src/backend/commands/Makefile @@ -4,7 +4,7 @@ # Makefile for backend/commands # # IDENTIFICATION -# $PostgreSQL: pgsql/src/backend/commands/Makefile,v 1.40 2009/07/29 20:56:18 tgl Exp $ +# src/backend/commands/Makefile # #------------------------------------------------------------------------- diff --git a/src/backend/commands/aggregatecmds.c b/src/backend/commands/aggregatecmds.c index 2c6ce59222..fd6dd9fe1e 100644 --- a/src/backend/commands/aggregatecmds.c +++ b/src/backend/commands/aggregatecmds.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/aggregatecmds.c,v 1.52 2010/02/14 18:42:13 rhaas Exp $ + * src/backend/commands/aggregatecmds.c * * DESCRIPTION * The "DefineFoo" routines take the parse tree and pick out the diff --git a/src/backend/commands/alter.c b/src/backend/commands/alter.c index 498d7b45c4..a315096fa4 100644 --- a/src/backend/commands/alter.c +++ b/src/backend/commands/alter.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/alter.c,v 1.38 2010/08/05 14:44:58 rhaas Exp $ + * src/backend/commands/alter.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c index 9d36427ad9..812384e349 100644 --- a/src/backend/commands/analyze.c +++ b/src/backend/commands/analyze.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/analyze.c,v 1.153 2010/08/01 22:38:11 tgl Exp $ + * src/backend/commands/analyze.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/commands/async.c b/src/backend/commands/async.c index c3e783a8ca..9ff00b768c 100644 --- a/src/backend/commands/async.c +++ b/src/backend/commands/async.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/async.c,v 1.157 2010/04/28 16:54:15 tgl Exp $ + * src/backend/commands/async.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c index 48132b43e5..a2a2bbfa75 100644 --- a/src/backend/commands/cluster.c +++ b/src/backend/commands/cluster.c @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/cluster.c,v 1.205 2010/07/29 11:06:34 sriggs Exp $ + * src/backend/commands/cluster.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/commands/comment.c b/src/backend/commands/comment.c index c4addf7f80..456e8a2b37 100644 --- a/src/backend/commands/comment.c +++ b/src/backend/commands/comment.c @@ -7,7 +7,7 @@ * Copyright (c) 1996-2010, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/comment.c,v 1.119 2010/09/17 02:49:10 rhaas Exp $ + * src/backend/commands/comment.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/commands/constraint.c b/src/backend/commands/constraint.c index 5f18cf7f2a..9924d4e731 100644 --- a/src/backend/commands/constraint.c +++ b/src/backend/commands/constraint.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/constraint.c,v 1.4 2010/02/26 02:00:38 momjian Exp $ + * src/backend/commands/constraint.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/commands/conversioncmds.c b/src/backend/commands/conversioncmds.c index 8673302584..73a3d026e1 100644 --- a/src/backend/commands/conversioncmds.c +++ b/src/backend/commands/conversioncmds.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/conversioncmds.c,v 1.42 2010/08/05 15:25:35 rhaas Exp $ + * src/backend/commands/conversioncmds.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c index 472c8828eb..d13313a1a1 100644 --- a/src/backend/commands/copy.c +++ b/src/backend/commands/copy.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/copy.c,v 1.330 2010/09/18 20:10:15 tgl Exp $ + * src/backend/commands/copy.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c index e9caeb05e8..6193aa2884 100644 --- a/src/backend/commands/dbcommands.c +++ b/src/backend/commands/dbcommands.c @@ -13,7 +13,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/dbcommands.c,v 1.237 2010/08/05 14:45:00 rhaas Exp $ + * src/backend/commands/dbcommands.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/commands/define.c b/src/backend/commands/define.c index cf029cd539..486330d1a2 100644 --- a/src/backend/commands/define.c +++ b/src/backend/commands/define.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/define.c,v 1.108 2010/02/26 02:00:38 momjian Exp $ + * src/backend/commands/define.c * * DESCRIPTION * The "DefineFoo" routines take the parse tree and pick out the diff --git a/src/backend/commands/discard.c b/src/backend/commands/discard.c index 06d07b75a3..de8d75bce2 100644 --- a/src/backend/commands/discard.c +++ b/src/backend/commands/discard.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/discard.c,v 1.7 2010/01/02 16:57:37 momjian Exp $ + * src/backend/commands/discard.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c index 96088a2fba..b66caa4c08 100644 --- a/src/backend/commands/explain.c +++ b/src/backend/commands/explain.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994-5, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/explain.c,v 1.208 2010/08/24 21:20:36 tgl Exp $ + * src/backend/commands/explain.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/commands/foreigncmds.c b/src/backend/commands/foreigncmds.c index 08593f0a48..4e6367c526 100644 --- a/src/backend/commands/foreigncmds.c +++ b/src/backend/commands/foreigncmds.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/foreigncmds.c,v 1.12 2010/08/05 14:45:00 rhaas Exp $ + * src/backend/commands/foreigncmds.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/commands/functioncmds.c b/src/backend/commands/functioncmds.c index 7ea316db16..bd977d2b3c 100644 --- a/src/backend/commands/functioncmds.c +++ b/src/backend/commands/functioncmds.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/functioncmds.c,v 1.119 2010/08/05 15:25:35 rhaas Exp $ + * src/backend/commands/functioncmds.c * * DESCRIPTION * These routines take the parse tree and pick out the diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c index e1ae6b2a13..9407d0f02d 100644 --- a/src/backend/commands/indexcmds.c +++ b/src/backend/commands/indexcmds.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/indexcmds.c,v 1.199 2010/08/05 14:45:00 rhaas Exp $ + * src/backend/commands/indexcmds.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/commands/lockcmds.c b/src/backend/commands/lockcmds.c index 34d657c031..35fc1b3880 100644 --- a/src/backend/commands/lockcmds.c +++ b/src/backend/commands/lockcmds.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/lockcmds.c,v 1.29 2010/02/26 02:00:39 momjian Exp $ + * src/backend/commands/lockcmds.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/commands/opclasscmds.c b/src/backend/commands/opclasscmds.c index e495afd4ce..ea66e95ec7 100644 --- a/src/backend/commands/opclasscmds.c +++ b/src/backend/commands/opclasscmds.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/opclasscmds.c,v 1.71 2010/08/05 15:25:35 rhaas Exp $ + * src/backend/commands/opclasscmds.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/commands/operatorcmds.c b/src/backend/commands/operatorcmds.c index fa84a9b9c8..36bedf4f48 100644 --- a/src/backend/commands/operatorcmds.c +++ b/src/backend/commands/operatorcmds.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/operatorcmds.c,v 1.47 2010/07/06 19:18:56 momjian Exp $ + * src/backend/commands/operatorcmds.c * * DESCRIPTION * The "DefineFoo" routines take the parse tree and pick out the diff --git a/src/backend/commands/portalcmds.c b/src/backend/commands/portalcmds.c index abe445358d..54bac57694 100644 --- a/src/backend/commands/portalcmds.c +++ b/src/backend/commands/portalcmds.c @@ -14,7 +14,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/portalcmds.c,v 1.82 2010/01/02 16:57:37 momjian Exp $ + * src/backend/commands/portalcmds.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/commands/prepare.c b/src/backend/commands/prepare.c index 7fa8278a66..8b4f838997 100644 --- a/src/backend/commands/prepare.c +++ b/src/backend/commands/prepare.c @@ -10,7 +10,7 @@ * Copyright (c) 2002-2010, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/prepare.c,v 1.102 2010/01/02 16:57:37 momjian Exp $ + * src/backend/commands/prepare.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/commands/proclang.c b/src/backend/commands/proclang.c index 4fcc9dd809..a2e653af80 100644 --- a/src/backend/commands/proclang.c +++ b/src/backend/commands/proclang.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/proclang.c,v 1.92 2010/08/05 14:45:01 rhaas Exp $ + * src/backend/commands/proclang.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/commands/schemacmds.c b/src/backend/commands/schemacmds.c index f678cda902..d184448248 100644 --- a/src/backend/commands/schemacmds.c +++ b/src/backend/commands/schemacmds.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/schemacmds.c,v 1.58 2010/08/05 14:45:01 rhaas Exp $ + * src/backend/commands/schemacmds.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/commands/sequence.c b/src/backend/commands/sequence.c index 2c07835b95..04b0c71c53 100644 --- a/src/backend/commands/sequence.c +++ b/src/backend/commands/sequence.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/sequence.c,v 1.171 2010/08/18 18:35:19 tgl Exp $ + * src/backend/commands/sequence.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index 2766238f5f..82143682d5 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.341 2010/08/18 18:35:19 tgl Exp $ + * src/backend/commands/tablecmds.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/commands/tablespace.c b/src/backend/commands/tablespace.c index 569b814e1f..590eee5dec 100644 --- a/src/backend/commands/tablespace.c +++ b/src/backend/commands/tablespace.c @@ -40,7 +40,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/tablespace.c,v 1.79 2010/08/05 14:45:01 rhaas Exp $ + * src/backend/commands/tablespace.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c index 2a7d5cb5ac..f0b32ddd37 100644 --- a/src/backend/commands/trigger.c +++ b/src/backend/commands/trigger.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/trigger.c,v 1.266 2010/09/11 18:38:56 joe Exp $ + * src/backend/commands/trigger.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/commands/tsearchcmds.c b/src/backend/commands/tsearchcmds.c index 21f38098d1..73b8c9248b 100644 --- a/src/backend/commands/tsearchcmds.c +++ b/src/backend/commands/tsearchcmds.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/tsearchcmds.c,v 1.21 2010/08/05 15:25:35 rhaas Exp $ + * src/backend/commands/tsearchcmds.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/commands/typecmds.c b/src/backend/commands/typecmds.c index 7652420c3e..87fcf29bf2 100644 --- a/src/backend/commands/typecmds.c +++ b/src/backend/commands/typecmds.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/typecmds.c,v 1.151 2010/08/18 18:35:19 tgl Exp $ + * src/backend/commands/typecmds.c * * DESCRIPTION * The "DefineFoo" routines take the parse tree and pick out the diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c index 6ada0f7c3c..f1ff839877 100644 --- a/src/backend/commands/user.c +++ b/src/backend/commands/user.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/commands/user.c,v 1.194 2010/08/05 14:45:01 rhaas Exp $ + * src/backend/commands/user.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c index e77430e6e4..2e829bcb45 100644 --- a/src/backend/commands/vacuum.c +++ b/src/backend/commands/vacuum.c @@ -14,7 +14,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/vacuum.c,v 1.410 2010/02/26 02:00:40 momjian Exp $ + * src/backend/commands/vacuum.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/commands/vacuumlazy.c b/src/backend/commands/vacuumlazy.c index b3e74a6217..0ac993f957 100644 --- a/src/backend/commands/vacuumlazy.c +++ b/src/backend/commands/vacuumlazy.c @@ -29,7 +29,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/vacuumlazy.c,v 1.136 2010/07/06 19:18:56 momjian Exp $ + * src/backend/commands/vacuumlazy.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c index 835b548235..219ceba7ce 100644 --- a/src/backend/commands/variable.c +++ b/src/backend/commands/variable.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/variable.c,v 1.133 2010/02/14 18:42:14 rhaas Exp $ + * src/backend/commands/variable.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/commands/view.c b/src/backend/commands/view.c index e67d377418..09ab24b011 100644 --- a/src/backend/commands/view.c +++ b/src/backend/commands/view.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/view.c,v 1.122 2010/08/18 18:35:19 tgl Exp $ + * src/backend/commands/view.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/common.mk b/src/backend/common.mk index f4de2fe53d..5ba8822b4f 100644 --- a/src/backend/common.mk +++ b/src/backend/common.mk @@ -1,7 +1,7 @@ # # Common make rules for backend # -# $PostgreSQL: pgsql/src/backend/common.mk,v 1.9 2009/08/07 20:50:22 petere Exp $ +# src/backend/common.mk # # When including this file, set OBJS to the object files created in diff --git a/src/backend/executor/Makefile b/src/backend/executor/Makefile index 8fd13fc3dc..f260bcfd64 100644 --- a/src/backend/executor/Makefile +++ b/src/backend/executor/Makefile @@ -4,7 +4,7 @@ # Makefile for executor # # IDENTIFICATION -# $PostgreSQL: pgsql/src/backend/executor/Makefile,v 1.31 2009/10/12 18:10:41 tgl Exp $ +# src/backend/executor/Makefile # #------------------------------------------------------------------------- diff --git a/src/backend/executor/README b/src/backend/executor/README index c928186e06..fec191d9b0 100644 --- a/src/backend/executor/README +++ b/src/backend/executor/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/backend/executor/README,v 1.11 2009/10/26 02:26:29 tgl Exp $ +src/backend/executor/README The Postgres Executor ===================== diff --git a/src/backend/executor/execAmi.c b/src/backend/executor/execAmi.c index f37a7602ef..20a50192e0 100644 --- a/src/backend/executor/execAmi.c +++ b/src/backend/executor/execAmi.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/executor/execAmi.c,v 1.109 2010/07/12 17:01:05 tgl Exp $ + * src/backend/executor/execAmi.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/executor/execCurrent.c b/src/backend/executor/execCurrent.c index e7735a1bbd..79a1425a97 100644 --- a/src/backend/executor/execCurrent.c +++ b/src/backend/executor/execCurrent.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/executor/execCurrent.c,v 1.15 2010/01/02 16:57:40 momjian Exp $ + * src/backend/executor/execCurrent.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/executor/execGrouping.c b/src/backend/executor/execGrouping.c index a6f1d339ac..25dbaf5f83 100644 --- a/src/backend/executor/execGrouping.c +++ b/src/backend/executor/execGrouping.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/execGrouping.c,v 1.28 2010/01/02 16:57:40 momjian Exp $ + * src/backend/executor/execGrouping.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/executor/execJunk.c b/src/backend/executor/execJunk.c index 2fa7e68a8e..0707c68263 100644 --- a/src/backend/executor/execJunk.c +++ b/src/backend/executor/execJunk.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/execJunk.c,v 1.60 2010/01/02 16:57:40 momjian Exp $ + * src/backend/executor/execJunk.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c index f89f85d14c..20af966ddb 100644 --- a/src/backend/executor/execMain.c +++ b/src/backend/executor/execMain.c @@ -26,7 +26,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/execMain.c,v 1.355 2010/09/11 18:38:56 joe Exp $ + * src/backend/executor/execMain.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/executor/execProcnode.c b/src/backend/executor/execProcnode.c index 2830bff871..64cb701e41 100644 --- a/src/backend/executor/execProcnode.c +++ b/src/backend/executor/execProcnode.c @@ -12,7 +12,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/execProcnode.c,v 1.71 2010/07/12 17:01:05 tgl Exp $ + * src/backend/executor/execProcnode.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c index e88ae58d2b..7d7c1a1a2a 100644 --- a/src/backend/executor/execQual.c +++ b/src/backend/executor/execQual.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/execQual.c,v 1.265 2010/08/26 18:54:37 tgl Exp $ + * src/backend/executor/execQual.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/executor/execScan.c b/src/backend/executor/execScan.c index fa5ff2d0e0..82e7e8b779 100644 --- a/src/backend/executor/execScan.c +++ b/src/backend/executor/execScan.c @@ -12,7 +12,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/execScan.c,v 1.49 2010/02/26 02:00:41 momjian Exp $ + * src/backend/executor/execScan.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/executor/execTuples.c b/src/backend/executor/execTuples.c index e2ee706c6d..88044a14b8 100644 --- a/src/backend/executor/execTuples.c +++ b/src/backend/executor/execTuples.c @@ -17,7 +17,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/execTuples.c,v 1.112 2010/02/26 02:00:41 momjian Exp $ + * src/backend/executor/execTuples.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/executor/execUtils.c b/src/backend/executor/execUtils.c index 7710488cc3..57806ca8f0 100644 --- a/src/backend/executor/execUtils.c +++ b/src/backend/executor/execUtils.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/execUtils.c,v 1.174 2010/07/16 00:45:30 tgl Exp $ + * src/backend/executor/execUtils.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/executor/functions.c b/src/backend/executor/functions.c index ea2cfc9e66..498bcba581 100644 --- a/src/backend/executor/functions.c +++ b/src/backend/executor/functions.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/functions.c,v 1.144 2010/07/06 19:18:56 momjian Exp $ + * src/backend/executor/functions.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/executor/instrument.c b/src/backend/executor/instrument.c index 55aace9a82..1b1169098f 100644 --- a/src/backend/executor/instrument.c +++ b/src/backend/executor/instrument.c @@ -7,7 +7,7 @@ * Copyright (c) 2001-2010, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/instrument.c,v 1.25 2010/02/26 02:00:41 momjian Exp $ + * src/backend/executor/instrument.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c index a28d73fd32..a7dafeba30 100644 --- a/src/backend/executor/nodeAgg.c +++ b/src/backend/executor/nodeAgg.c @@ -71,7 +71,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeAgg.c,v 1.176 2010/07/12 17:01:05 tgl Exp $ + * src/backend/executor/nodeAgg.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/executor/nodeAppend.c b/src/backend/executor/nodeAppend.c index 4a40b831dd..4f3d899bcb 100644 --- a/src/backend/executor/nodeAppend.c +++ b/src/backend/executor/nodeAppend.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeAppend.c,v 1.78 2010/07/12 17:01:05 tgl Exp $ + * src/backend/executor/nodeAppend.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/executor/nodeBitmapAnd.c b/src/backend/executor/nodeBitmapAnd.c index 9ae2df76af..ce4e82c377 100644 --- a/src/backend/executor/nodeBitmapAnd.c +++ b/src/backend/executor/nodeBitmapAnd.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeBitmapAnd.c,v 1.14 2010/07/12 17:01:05 tgl Exp $ + * src/backend/executor/nodeBitmapAnd.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/executor/nodeBitmapHeapscan.c b/src/backend/executor/nodeBitmapHeapscan.c index 0ea3a88e45..09a842e0c0 100644 --- a/src/backend/executor/nodeBitmapHeapscan.c +++ b/src/backend/executor/nodeBitmapHeapscan.c @@ -21,7 +21,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeBitmapHeapscan.c,v 1.39 2010/07/12 17:01:05 tgl Exp $ + * src/backend/executor/nodeBitmapHeapscan.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/executor/nodeBitmapIndexscan.c b/src/backend/executor/nodeBitmapIndexscan.c index 73b569458d..97ce0dde29 100644 --- a/src/backend/executor/nodeBitmapIndexscan.c +++ b/src/backend/executor/nodeBitmapIndexscan.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeBitmapIndexscan.c,v 1.34 2010/07/12 17:01:05 tgl Exp $ + * src/backend/executor/nodeBitmapIndexscan.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/executor/nodeBitmapOr.c b/src/backend/executor/nodeBitmapOr.c index 8faba8b300..a9a7630583 100644 --- a/src/backend/executor/nodeBitmapOr.c +++ b/src/backend/executor/nodeBitmapOr.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeBitmapOr.c,v 1.13 2010/07/12 17:01:05 tgl Exp $ + * src/backend/executor/nodeBitmapOr.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/executor/nodeCtescan.c b/src/backend/executor/nodeCtescan.c index 408cd05120..243c9f03c3 100644 --- a/src/backend/executor/nodeCtescan.c +++ b/src/backend/executor/nodeCtescan.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeCtescan.c,v 1.9 2010/07/12 17:01:05 tgl Exp $ + * src/backend/executor/nodeCtescan.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/executor/nodeFunctionscan.c b/src/backend/executor/nodeFunctionscan.c index e64b57d09a..b93b55d09e 100644 --- a/src/backend/executor/nodeFunctionscan.c +++ b/src/backend/executor/nodeFunctionscan.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeFunctionscan.c,v 1.56 2010/07/12 17:01:05 tgl Exp $ + * src/backend/executor/nodeFunctionscan.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/executor/nodeGroup.c b/src/backend/executor/nodeGroup.c index e56fddadd8..b2cad37089 100644 --- a/src/backend/executor/nodeGroup.c +++ b/src/backend/executor/nodeGroup.c @@ -15,7 +15,7 @@ * locate group boundaries. * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeGroup.c,v 1.78 2010/07/12 17:01:05 tgl Exp $ + * src/backend/executor/nodeGroup.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/executor/nodeHash.c b/src/backend/executor/nodeHash.c index 0fa8b33606..5cd7332237 100644 --- a/src/backend/executor/nodeHash.c +++ b/src/backend/executor/nodeHash.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeHash.c,v 1.130 2010/07/12 17:01:05 tgl Exp $ + * src/backend/executor/nodeHash.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/executor/nodeHashjoin.c b/src/backend/executor/nodeHashjoin.c index a6cd481f7e..dfca8cac52 100644 --- a/src/backend/executor/nodeHashjoin.c +++ b/src/backend/executor/nodeHashjoin.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeHashjoin.c,v 1.104 2010/07/12 17:01:05 tgl Exp $ + * src/backend/executor/nodeHashjoin.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/executor/nodeIndexscan.c b/src/backend/executor/nodeIndexscan.c index ad64c14824..ee5fc72c20 100644 --- a/src/backend/executor/nodeIndexscan.c +++ b/src/backend/executor/nodeIndexscan.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeIndexscan.c,v 1.140 2010/07/12 17:01:05 tgl Exp $ + * src/backend/executor/nodeIndexscan.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/executor/nodeLimit.c b/src/backend/executor/nodeLimit.c index a873ab88f6..ce24f1b00a 100644 --- a/src/backend/executor/nodeLimit.c +++ b/src/backend/executor/nodeLimit.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeLimit.c,v 1.42 2010/07/12 17:01:05 tgl Exp $ + * src/backend/executor/nodeLimit.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/executor/nodeLockRows.c b/src/backend/executor/nodeLockRows.c index fc0415a7a9..440a601d31 100644 --- a/src/backend/executor/nodeLockRows.c +++ b/src/backend/executor/nodeLockRows.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeLockRows.c,v 1.7 2010/09/11 18:38:56 joe Exp $ + * src/backend/executor/nodeLockRows.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/executor/nodeMaterial.c b/src/backend/executor/nodeMaterial.c index 78f29d872e..2fde1e5005 100644 --- a/src/backend/executor/nodeMaterial.c +++ b/src/backend/executor/nodeMaterial.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeMaterial.c,v 1.72 2010/07/12 17:01:05 tgl Exp $ + * src/backend/executor/nodeMaterial.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/executor/nodeMergejoin.c b/src/backend/executor/nodeMergejoin.c index 104482a633..e8ce5bc02b 100644 --- a/src/backend/executor/nodeMergejoin.c +++ b/src/backend/executor/nodeMergejoin.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeMergejoin.c,v 1.104 2010/07/12 17:01:05 tgl Exp $ + * src/backend/executor/nodeMergejoin.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/executor/nodeModifyTable.c b/src/backend/executor/nodeModifyTable.c index 86fc016b50..a9958ebf39 100644 --- a/src/backend/executor/nodeModifyTable.c +++ b/src/backend/executor/nodeModifyTable.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeModifyTable.c,v 1.10 2010/09/11 18:38:56 joe Exp $ + * src/backend/executor/nodeModifyTable.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/executor/nodeNestloop.c b/src/backend/executor/nodeNestloop.c index d59ed92f01..2d91d4bea7 100644 --- a/src/backend/executor/nodeNestloop.c +++ b/src/backend/executor/nodeNestloop.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeNestloop.c,v 1.56 2010/07/12 17:01:05 tgl Exp $ + * src/backend/executor/nodeNestloop.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/executor/nodeRecursiveunion.c b/src/backend/executor/nodeRecursiveunion.c index 3cd9495f8a..faaccacf36 100644 --- a/src/backend/executor/nodeRecursiveunion.c +++ b/src/backend/executor/nodeRecursiveunion.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeRecursiveunion.c,v 1.7 2010/07/12 17:01:05 tgl Exp $ + * src/backend/executor/nodeRecursiveunion.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/executor/nodeResult.c b/src/backend/executor/nodeResult.c index a9ad0dca87..f0189030af 100644 --- a/src/backend/executor/nodeResult.c +++ b/src/backend/executor/nodeResult.c @@ -38,7 +38,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeResult.c,v 1.46 2010/07/12 17:01:05 tgl Exp $ + * src/backend/executor/nodeResult.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/executor/nodeSeqscan.c b/src/backend/executor/nodeSeqscan.c index f65a79310f..6f7684d3d0 100644 --- a/src/backend/executor/nodeSeqscan.c +++ b/src/backend/executor/nodeSeqscan.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeSeqscan.c,v 1.71 2010/07/12 17:01:05 tgl Exp $ + * src/backend/executor/nodeSeqscan.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/executor/nodeSetOp.c b/src/backend/executor/nodeSetOp.c index 1063ff701b..ce36f6c4cf 100644 --- a/src/backend/executor/nodeSetOp.c +++ b/src/backend/executor/nodeSetOp.c @@ -37,7 +37,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeSetOp.c,v 1.34 2010/07/12 17:01:05 tgl Exp $ + * src/backend/executor/nodeSetOp.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/executor/nodeSort.c b/src/backend/executor/nodeSort.c index 5b993c199b..1f5ae9893f 100644 --- a/src/backend/executor/nodeSort.c +++ b/src/backend/executor/nodeSort.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeSort.c,v 1.68 2010/07/12 17:01:05 tgl Exp $ + * src/backend/executor/nodeSort.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/executor/nodeSubplan.c b/src/backend/executor/nodeSubplan.c index c02bd70d88..495f09355b 100644 --- a/src/backend/executor/nodeSubplan.c +++ b/src/backend/executor/nodeSubplan.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeSubplan.c,v 1.103 2010/07/28 04:50:50 tgl Exp $ + * src/backend/executor/nodeSubplan.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/executor/nodeSubqueryscan.c b/src/backend/executor/nodeSubqueryscan.c index 9741a103b5..0d16c38946 100644 --- a/src/backend/executor/nodeSubqueryscan.c +++ b/src/backend/executor/nodeSubqueryscan.c @@ -12,7 +12,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeSubqueryscan.c,v 1.46 2010/07/12 17:01:05 tgl Exp $ + * src/backend/executor/nodeSubqueryscan.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/executor/nodeTidscan.c b/src/backend/executor/nodeTidscan.c index 7a8c7479aa..6058a9ccd5 100644 --- a/src/backend/executor/nodeTidscan.c +++ b/src/backend/executor/nodeTidscan.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeTidscan.c,v 1.66 2010/07/12 17:01:05 tgl Exp $ + * src/backend/executor/nodeTidscan.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/executor/nodeUnique.c b/src/backend/executor/nodeUnique.c index 1fd1109051..1af981378c 100644 --- a/src/backend/executor/nodeUnique.c +++ b/src/backend/executor/nodeUnique.c @@ -16,7 +16,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeUnique.c,v 1.64 2010/07/12 17:01:05 tgl Exp $ + * src/backend/executor/nodeUnique.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/executor/nodeValuesscan.c b/src/backend/executor/nodeValuesscan.c index 79d41ecc27..9bf4a10e60 100644 --- a/src/backend/executor/nodeValuesscan.c +++ b/src/backend/executor/nodeValuesscan.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeValuesscan.c,v 1.13 2010/07/12 17:01:05 tgl Exp $ + * src/backend/executor/nodeValuesscan.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/executor/nodeWindowAgg.c b/src/backend/executor/nodeWindowAgg.c index ad20c3cca1..c3efe129c2 100644 --- a/src/backend/executor/nodeWindowAgg.c +++ b/src/backend/executor/nodeWindowAgg.c @@ -27,7 +27,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeWindowAgg.c,v 1.14 2010/07/12 17:01:05 tgl Exp $ + * src/backend/executor/nodeWindowAgg.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/executor/nodeWorktablescan.c b/src/backend/executor/nodeWorktablescan.c index d0d22e6481..586de13865 100644 --- a/src/backend/executor/nodeWorktablescan.c +++ b/src/backend/executor/nodeWorktablescan.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeWorktablescan.c,v 1.11 2010/07/12 17:01:05 tgl Exp $ + * src/backend/executor/nodeWorktablescan.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c index 1ffb1b2fee..c579017afb 100644 --- a/src/backend/executor/spi.c +++ b/src/backend/executor/spi.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/spi.c,v 1.215 2010/02/26 02:00:42 momjian Exp $ + * src/backend/executor/spi.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/executor/tstoreReceiver.c b/src/backend/executor/tstoreReceiver.c index 5e58d9072e..3307d65c13 100644 --- a/src/backend/executor/tstoreReceiver.c +++ b/src/backend/executor/tstoreReceiver.c @@ -13,7 +13,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/tstoreReceiver.c,v 1.25 2010/01/02 16:57:45 momjian Exp $ + * src/backend/executor/tstoreReceiver.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/foreign/Makefile b/src/backend/foreign/Makefile index dff0c77540..85aa857d3a 100644 --- a/src/backend/foreign/Makefile +++ b/src/backend/foreign/Makefile @@ -4,7 +4,7 @@ # Makefile for foreign # # IDENTIFICATION -# $PostgreSQL: pgsql/src/backend/foreign/Makefile,v 1.2 2009/02/24 10:06:32 petere Exp $ +# src/backend/foreign/Makefile # #------------------------------------------------------------------------- diff --git a/src/backend/foreign/foreign.c b/src/backend/foreign/foreign.c index 042dbed13d..cc67bcb5a5 100644 --- a/src/backend/foreign/foreign.c +++ b/src/backend/foreign/foreign.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/foreign/foreign.c,v 1.8 2010/02/14 18:42:14 rhaas Exp $ + * src/backend/foreign/foreign.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/lib/Makefile b/src/backend/lib/Makefile index d25fcc7a8a..2e1061e24a 100644 --- a/src/backend/lib/Makefile +++ b/src/backend/lib/Makefile @@ -4,7 +4,7 @@ # Makefile for lib (miscellaneous stuff) # # IDENTIFICATION -# $PostgreSQL: pgsql/src/backend/lib/Makefile,v 1.21 2008/02/19 10:30:07 petere Exp $ +# src/backend/lib/Makefile # #------------------------------------------------------------------------- diff --git a/src/backend/lib/dllist.c b/src/backend/lib/dllist.c index e4bafcd043..bc04c41fb1 100644 --- a/src/backend/lib/dllist.c +++ b/src/backend/lib/dllist.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/lib/dllist.c,v 1.38 2010/01/02 16:57:45 momjian Exp $ + * src/backend/lib/dllist.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/lib/stringinfo.c b/src/backend/lib/stringinfo.c index ea0c5f052c..73ceeaf382 100644 --- a/src/backend/lib/stringinfo.c +++ b/src/backend/lib/stringinfo.c @@ -9,7 +9,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/lib/stringinfo.c,v 1.54 2010/07/06 19:18:56 momjian Exp $ + * src/backend/lib/stringinfo.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/libpq/Makefile b/src/backend/libpq/Makefile index d881d569c4..e929864646 100644 --- a/src/backend/libpq/Makefile +++ b/src/backend/libpq/Makefile @@ -4,7 +4,7 @@ # Makefile for libpq subsystem (backend half of libpq interface) # # IDENTIFICATION -# $PostgreSQL: pgsql/src/backend/libpq/Makefile,v 1.39 2008/02/19 10:30:07 petere Exp $ +# src/backend/libpq/Makefile # #------------------------------------------------------------------------- diff --git a/src/backend/libpq/README.SSL b/src/backend/libpq/README.SSL index 8fae93d4cf..d3b6e831ce 100644 --- a/src/backend/libpq/README.SSL +++ b/src/backend/libpq/README.SSL @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/backend/libpq/README.SSL,v 1.7 2008/10/24 11:48:29 mha Exp $ +src/backend/libpq/README.SSL SSL === diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c index ec75945e85..5d82ad12c9 100644 --- a/src/backend/libpq/auth.c +++ b/src/backend/libpq/auth.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/libpq/auth.c,v 1.203 2010/07/06 19:18:56 momjian Exp $ + * src/backend/libpq/auth.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/libpq/be-fsstubs.c b/src/backend/libpq/be-fsstubs.c index 464183da78..ac6f56155f 100644 --- a/src/backend/libpq/be-fsstubs.c +++ b/src/backend/libpq/be-fsstubs.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/libpq/be-fsstubs.c,v 1.94 2010/02/26 02:00:42 momjian Exp $ + * src/backend/libpq/be-fsstubs.c * * NOTES * This should be moved to a more appropriate place. It is here diff --git a/src/backend/libpq/be-secure.c b/src/backend/libpq/be-secure.c index b7000a653a..618b2bd272 100644 --- a/src/backend/libpq/be-secure.c +++ b/src/backend/libpq/be-secure.c @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/libpq/be-secure.c,v 1.102 2010/07/06 19:18:56 momjian Exp $ + * src/backend/libpq/be-secure.c * * Since the server static private key ($DataDir/server.key) * will normally be stored unencrypted so that the database diff --git a/src/backend/libpq/crypt.c b/src/backend/libpq/crypt.c index c956bf10a4..75150bbe1d 100644 --- a/src/backend/libpq/crypt.c +++ b/src/backend/libpq/crypt.c @@ -9,7 +9,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/libpq/crypt.c,v 1.81 2010/02/26 02:00:42 momjian Exp $ + * src/backend/libpq/crypt.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c index 3aa718b356..0227f9b67c 100644 --- a/src/backend/libpq/hba.c +++ b/src/backend/libpq/hba.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/libpq/hba.c,v 1.210 2010/08/05 14:45:03 rhaas Exp $ + * src/backend/libpq/hba.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/libpq/ip.c b/src/backend/libpq/ip.c index 7c17210cbe..020bef70b4 100644 --- a/src/backend/libpq/ip.c +++ b/src/backend/libpq/ip.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/libpq/ip.c,v 1.51 2010/02/26 02:00:43 momjian Exp $ + * src/backend/libpq/ip.c * * This file and the IPV6 implementation were initially provided by * Nigel Kukard , Linux Based Systems Design diff --git a/src/backend/libpq/md5.c b/src/backend/libpq/md5.c index ff4f9eaebf..5fa52d2f88 100644 --- a/src/backend/libpq/md5.c +++ b/src/backend/libpq/md5.c @@ -14,7 +14,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/libpq/md5.c,v 1.40 2010/02/26 02:00:43 momjian Exp $ + * src/backend/libpq/md5.c */ /* This is intended to be used in both frontend and backend, so use c.h */ diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c index b524d262e0..711fa8299c 100644 --- a/src/backend/libpq/pqcomm.c +++ b/src/backend/libpq/pqcomm.c @@ -30,7 +30,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/libpq/pqcomm.c,v 1.213 2010/08/26 22:00:19 tgl Exp $ + * src/backend/libpq/pqcomm.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/libpq/pqformat.c b/src/backend/libpq/pqformat.c index f9cefdc11c..e24482915e 100644 --- a/src/backend/libpq/pqformat.c +++ b/src/backend/libpq/pqformat.c @@ -24,7 +24,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/libpq/pqformat.c,v 1.52 2010/01/07 04:53:34 tgl Exp $ + * src/backend/libpq/pqformat.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/libpq/pqsignal.c b/src/backend/libpq/pqsignal.c index 6f129e4b82..2d7e78af4a 100644 --- a/src/backend/libpq/pqsignal.c +++ b/src/backend/libpq/pqsignal.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/libpq/pqsignal.c,v 1.47 2010/01/02 16:57:45 momjian Exp $ + * src/backend/libpq/pqsignal.c * * NOTES * This shouldn't be in libpq, but the monitor and some other diff --git a/src/backend/main/Makefile b/src/backend/main/Makefile index 7c16a15c76..198098e9cb 100644 --- a/src/backend/main/Makefile +++ b/src/backend/main/Makefile @@ -4,7 +4,7 @@ # Makefile for main # # IDENTIFICATION -# $PostgreSQL: pgsql/src/backend/main/Makefile,v 1.12 2008/02/19 10:30:07 petere Exp $ +# src/backend/main/Makefile # #------------------------------------------------------------------------- diff --git a/src/backend/main/main.c b/src/backend/main/main.c index ff8e87b668..6cb70f2d04 100644 --- a/src/backend/main/main.c +++ b/src/backend/main/main.c @@ -13,7 +13,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/main/main.c,v 1.113 2010/01/02 16:57:45 momjian Exp $ + * src/backend/main/main.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/nls.mk b/src/backend/nls.mk index 45c51b3b73..eec8a5e2b0 100644 --- a/src/backend/nls.mk +++ b/src/backend/nls.mk @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/src/backend/nls.mk,v 1.28 2009/07/13 02:02:19 tgl Exp $ +# src/backend/nls.mk CATALOG_NAME := postgres AVAIL_LANGUAGES := de es fr ja pt_BR tr GETTEXT_FILES := + gettext-files diff --git a/src/backend/nodes/Makefile b/src/backend/nodes/Makefile index 8c3cc54b85..fe2e46053e 100644 --- a/src/backend/nodes/Makefile +++ b/src/backend/nodes/Makefile @@ -4,7 +4,7 @@ # Makefile for backend/nodes # # IDENTIFICATION -# $PostgreSQL: pgsql/src/backend/nodes/Makefile,v 1.20 2008/02/19 10:30:07 petere Exp $ +# src/backend/nodes/Makefile # #------------------------------------------------------------------------- diff --git a/src/backend/nodes/README b/src/backend/nodes/README index 67e7badc1f..f4034be276 100644 --- a/src/backend/nodes/README +++ b/src/backend/nodes/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/backend/nodes/README,v 1.4 2008/08/25 22:42:32 tgl Exp $ +src/backend/nodes/README Node Structures =============== diff --git a/src/backend/nodes/bitmapset.c b/src/backend/nodes/bitmapset.c index fcf6e0241e..48ccc703ed 100644 --- a/src/backend/nodes/bitmapset.c +++ b/src/backend/nodes/bitmapset.c @@ -14,7 +14,7 @@ * Copyright (c) 2003-2010, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/nodes/bitmapset.c,v 1.16 2010/01/02 16:57:45 momjian Exp $ + * src/backend/nodes/bitmapset.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c index d33b119801..deaeb761d4 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 - * $PostgreSQL: pgsql/src/backend/nodes/copyfuncs.c,v 1.469 2010/08/18 18:35:20 tgl Exp $ + * src/backend/nodes/copyfuncs.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/nodes/equalfuncs.c b/src/backend/nodes/equalfuncs.c index 06cdbf5185..6b6cd9966c 100644 --- a/src/backend/nodes/equalfuncs.c +++ b/src/backend/nodes/equalfuncs.c @@ -22,7 +22,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/nodes/equalfuncs.c,v 1.388 2010/08/18 18:35:20 tgl Exp $ + * src/backend/nodes/equalfuncs.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/nodes/list.c b/src/backend/nodes/list.c index 24fcffd22f..37e46ec677 100644 --- a/src/backend/nodes/list.c +++ b/src/backend/nodes/list.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/nodes/list.c,v 1.74 2010/02/13 02:34:11 tgl Exp $ + * src/backend/nodes/list.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/nodes/makefuncs.c b/src/backend/nodes/makefuncs.c index 60c9a63a13..ee15695b91 100644 --- a/src/backend/nodes/makefuncs.c +++ b/src/backend/nodes/makefuncs.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/nodes/makefuncs.c,v 1.67 2010/08/27 20:30:07 petere Exp $ + * src/backend/nodes/makefuncs.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/nodes/nodeFuncs.c b/src/backend/nodes/nodeFuncs.c index c8c3202df4..a7d1ff4913 100644 --- a/src/backend/nodes/nodeFuncs.c +++ b/src/backend/nodes/nodeFuncs.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/nodes/nodeFuncs.c,v 1.46 2010/02/12 17:33:20 tgl Exp $ + * src/backend/nodes/nodeFuncs.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/nodes/nodes.c b/src/backend/nodes/nodes.c index ab7ad054c4..76a0c29579 100644 --- a/src/backend/nodes/nodes.c +++ b/src/backend/nodes/nodes.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/nodes/nodes.c,v 1.31 2010/01/02 16:57:46 momjian Exp $ + * src/backend/nodes/nodes.c * * HISTORY * Andrew Yu Oct 20, 1994 file creation diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c index bfa34ed14c..e62fe81882 100644 --- a/src/backend/nodes/outfuncs.c +++ b/src/backend/nodes/outfuncs.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/nodes/outfuncs.c,v 1.389 2010/08/18 15:21:54 tgl Exp $ + * src/backend/nodes/outfuncs.c * * NOTES * Every node type that can appear in stored rules' parsetrees *must* diff --git a/src/backend/nodes/params.c b/src/backend/nodes/params.c index a4deebf896..0c6ed71383 100644 --- a/src/backend/nodes/params.c +++ b/src/backend/nodes/params.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/nodes/params.c,v 1.15 2010/02/26 02:00:43 momjian Exp $ + * src/backend/nodes/params.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/nodes/print.c b/src/backend/nodes/print.c index 46c4964f7c..bf5bd70bee 100644 --- a/src/backend/nodes/print.c +++ b/src/backend/nodes/print.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/nodes/print.c,v 1.92 2010/01/02 16:57:46 momjian Exp $ + * src/backend/nodes/print.c * * HISTORY * AUTHOR DATE MAJOR EVENT diff --git a/src/backend/nodes/read.c b/src/backend/nodes/read.c index 482bd18fbc..81a2781fce 100644 --- a/src/backend/nodes/read.c +++ b/src/backend/nodes/read.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/nodes/read.c,v 1.54 2010/01/18 22:19:34 petere Exp $ + * src/backend/nodes/read.c * * HISTORY * AUTHOR DATE MAJOR EVENT diff --git a/src/backend/nodes/readfuncs.c b/src/backend/nodes/readfuncs.c index 4d85d67697..9a4e03e54a 100644 --- a/src/backend/nodes/readfuncs.c +++ b/src/backend/nodes/readfuncs.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/nodes/readfuncs.c,v 1.233 2010/08/07 02:44:07 tgl Exp $ + * src/backend/nodes/readfuncs.c * * NOTES * Path and Plan nodes do not have any readfuncs support, because we diff --git a/src/backend/nodes/tidbitmap.c b/src/backend/nodes/tidbitmap.c index ae29bd9970..9f60439ee7 100644 --- a/src/backend/nodes/tidbitmap.c +++ b/src/backend/nodes/tidbitmap.c @@ -32,7 +32,7 @@ * Copyright (c) 2003-2010, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/nodes/tidbitmap.c,v 1.20 2010/01/02 16:57:46 momjian Exp $ + * src/backend/nodes/tidbitmap.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/nodes/value.c b/src/backend/nodes/value.c index ad73407547..43cfd79375 100644 --- a/src/backend/nodes/value.c +++ b/src/backend/nodes/value.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/nodes/value.c,v 1.7 2010/01/02 16:57:46 momjian Exp $ + * src/backend/nodes/value.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/optimizer/Makefile b/src/backend/optimizer/Makefile index d134f90735..f523e5e33e 100644 --- a/src/backend/optimizer/Makefile +++ b/src/backend/optimizer/Makefile @@ -1,7 +1,7 @@ # # Makefile for optimizer # -# $PostgreSQL: pgsql/src/backend/optimizer/Makefile,v 1.14 2008/02/19 10:30:07 petere Exp $ +# src/backend/optimizer/Makefile # subdir = src/backend/optimizer diff --git a/src/backend/optimizer/README b/src/backend/optimizer/README index a5299ee8fd..fc793ac8ae 100644 --- a/src/backend/optimizer/README +++ b/src/backend/optimizer/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/backend/optimizer/README,v 1.54 2010/08/19 05:57:34 petere Exp $ +src/backend/optimizer/README Optimizer ========= diff --git a/src/backend/optimizer/geqo/Makefile b/src/backend/optimizer/geqo/Makefile index 9ccfd9e60c..3be7d7d450 100644 --- a/src/backend/optimizer/geqo/Makefile +++ b/src/backend/optimizer/geqo/Makefile @@ -5,7 +5,7 @@ # # Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/backend/optimizer/geqo/Makefile,v 1.21 2009/07/16 20:55:44 tgl Exp $ +# src/backend/optimizer/geqo/Makefile # #------------------------------------------------------------------------- diff --git a/src/backend/optimizer/geqo/geqo_copy.c b/src/backend/optimizer/geqo/geqo_copy.c index 2a3b30232b..17218e5d22 100644 --- a/src/backend/optimizer/geqo/geqo_copy.c +++ b/src/backend/optimizer/geqo/geqo_copy.c @@ -5,7 +5,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/optimizer/geqo/geqo_copy.c,v 1.21 2010/01/02 16:57:46 momjian Exp $ + * src/backend/optimizer/geqo/geqo_copy.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/optimizer/geqo/geqo_cx.c b/src/backend/optimizer/geqo/geqo_cx.c index 9f3dfe216e..afae948a61 100644 --- a/src/backend/optimizer/geqo/geqo_cx.c +++ b/src/backend/optimizer/geqo/geqo_cx.c @@ -6,7 +6,7 @@ * CX operator according to Oliver et al * (Proc 2nd Int'l Conf on GA's) * -* $PostgreSQL: pgsql/src/backend/optimizer/geqo/geqo_cx.c,v 1.11 2009/07/16 20:55:44 tgl Exp $ +* src/backend/optimizer/geqo/geqo_cx.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/optimizer/geqo/geqo_erx.c b/src/backend/optimizer/geqo/geqo_erx.c index 45effbdad9..69ac077616 100644 --- a/src/backend/optimizer/geqo/geqo_erx.c +++ b/src/backend/optimizer/geqo/geqo_erx.c @@ -3,7 +3,7 @@ * geqo_erx.c * edge recombination crossover [ER] * -* $PostgreSQL: pgsql/src/backend/optimizer/geqo/geqo_erx.c,v 1.21 2009/07/16 20:55:44 tgl Exp $ +* src/backend/optimizer/geqo/geqo_erx.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/optimizer/geqo/geqo_eval.c b/src/backend/optimizer/geqo/geqo_eval.c index 353ed1aa1a..1692264d31 100644 --- a/src/backend/optimizer/geqo/geqo_eval.c +++ b/src/backend/optimizer/geqo/geqo_eval.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/optimizer/geqo/geqo_eval.c,v 1.93 2010/02/26 02:00:43 momjian Exp $ + * src/backend/optimizer/geqo/geqo_eval.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/optimizer/geqo/geqo_main.c b/src/backend/optimizer/geqo/geqo_main.c index f66c18ceeb..c5f93ce787 100644 --- a/src/backend/optimizer/geqo/geqo_main.c +++ b/src/backend/optimizer/geqo/geqo_main.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/optimizer/geqo/geqo_main.c,v 1.59 2010/01/02 16:57:46 momjian Exp $ + * src/backend/optimizer/geqo/geqo_main.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/optimizer/geqo/geqo_misc.c b/src/backend/optimizer/geqo/geqo_misc.c index 70ad623abe..bec69a595d 100644 --- a/src/backend/optimizer/geqo/geqo_misc.c +++ b/src/backend/optimizer/geqo/geqo_misc.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/optimizer/geqo/geqo_misc.c,v 1.50 2010/01/02 16:57:46 momjian Exp $ + * src/backend/optimizer/geqo/geqo_misc.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/optimizer/geqo/geqo_mutation.c b/src/backend/optimizer/geqo/geqo_mutation.c index bd527324f5..1a06d49775 100644 --- a/src/backend/optimizer/geqo/geqo_mutation.c +++ b/src/backend/optimizer/geqo/geqo_mutation.c @@ -4,7 +4,7 @@ * * TSP mutation routines * -* $PostgreSQL: pgsql/src/backend/optimizer/geqo/geqo_mutation.c,v 1.10 2009/07/16 20:55:44 tgl Exp $ +* src/backend/optimizer/geqo/geqo_mutation.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/optimizer/geqo/geqo_ox1.c b/src/backend/optimizer/geqo/geqo_ox1.c index d11d3cd9c3..fbf15282ad 100644 --- a/src/backend/optimizer/geqo/geqo_ox1.c +++ b/src/backend/optimizer/geqo/geqo_ox1.c @@ -6,7 +6,7 @@ * OX1 operator according to Davis * (Proc Int'l Joint Conf on AI) * -* $PostgreSQL: pgsql/src/backend/optimizer/geqo/geqo_ox1.c,v 1.10 2009/07/16 20:55:44 tgl Exp $ +* src/backend/optimizer/geqo/geqo_ox1.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/optimizer/geqo/geqo_ox2.c b/src/backend/optimizer/geqo/geqo_ox2.c index 48ed359a63..01c55bea41 100644 --- a/src/backend/optimizer/geqo/geqo_ox2.c +++ b/src/backend/optimizer/geqo/geqo_ox2.c @@ -6,7 +6,7 @@ * OX2 operator according to Syswerda * (The Genetic Algorithms Handbook, ed L Davis) * -* $PostgreSQL: pgsql/src/backend/optimizer/geqo/geqo_ox2.c,v 1.11 2009/07/16 20:55:44 tgl Exp $ +* src/backend/optimizer/geqo/geqo_ox2.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/optimizer/geqo/geqo_pmx.c b/src/backend/optimizer/geqo/geqo_pmx.c index a1f3d1019e..deb0f7b353 100644 --- a/src/backend/optimizer/geqo/geqo_pmx.c +++ b/src/backend/optimizer/geqo/geqo_pmx.c @@ -6,7 +6,7 @@ * PMX operator according to Goldberg & Lingle * (Proc Int'l Conf on GA's) * -* $PostgreSQL: pgsql/src/backend/optimizer/geqo/geqo_pmx.c,v 1.11 2009/07/16 20:55:44 tgl Exp $ +* src/backend/optimizer/geqo/geqo_pmx.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/optimizer/geqo/geqo_pool.c b/src/backend/optimizer/geqo/geqo_pool.c index 372096818b..b8e13f93d0 100644 --- a/src/backend/optimizer/geqo/geqo_pool.c +++ b/src/backend/optimizer/geqo/geqo_pool.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/optimizer/geqo/geqo_pool.c,v 1.36 2010/01/02 16:57:46 momjian Exp $ + * src/backend/optimizer/geqo/geqo_pool.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/optimizer/geqo/geqo_px.c b/src/backend/optimizer/geqo/geqo_px.c index 674529313a..808ff6a14c 100644 --- a/src/backend/optimizer/geqo/geqo_px.c +++ b/src/backend/optimizer/geqo/geqo_px.c @@ -6,7 +6,7 @@ * PX operator according to Syswerda * (The Genetic Algorithms Handbook, L Davis, ed) * -* $PostgreSQL: pgsql/src/backend/optimizer/geqo/geqo_px.c,v 1.11 2009/07/16 20:55:44 tgl Exp $ +* src/backend/optimizer/geqo/geqo_px.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/optimizer/geqo/geqo_random.c b/src/backend/optimizer/geqo/geqo_random.c index 9ff5b40ecd..273b4ec3b5 100644 --- a/src/backend/optimizer/geqo/geqo_random.c +++ b/src/backend/optimizer/geqo/geqo_random.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/optimizer/geqo/geqo_random.c,v 1.3 2010/02/26 02:00:44 momjian Exp $ + * src/backend/optimizer/geqo/geqo_random.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/optimizer/geqo/geqo_recombination.c b/src/backend/optimizer/geqo/geqo_recombination.c index b31c7634b0..652fadc745 100644 --- a/src/backend/optimizer/geqo/geqo_recombination.c +++ b/src/backend/optimizer/geqo/geqo_recombination.c @@ -3,7 +3,7 @@ * geqo_recombination.c * misc recombination procedures * -* $PostgreSQL: pgsql/src/backend/optimizer/geqo/geqo_recombination.c,v 1.17 2009/07/19 21:00:43 tgl Exp $ +* src/backend/optimizer/geqo/geqo_recombination.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/optimizer/geqo/geqo_selection.c b/src/backend/optimizer/geqo/geqo_selection.c index c727b90680..0bcfe0bb9d 100644 --- a/src/backend/optimizer/geqo/geqo_selection.c +++ b/src/backend/optimizer/geqo/geqo_selection.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/optimizer/geqo/geqo_selection.c,v 1.27 2010/01/02 16:57:46 momjian Exp $ + * src/backend/optimizer/geqo/geqo_selection.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/optimizer/path/Makefile b/src/backend/optimizer/path/Makefile index 77be4e4d17..07938dbe57 100644 --- a/src/backend/optimizer/path/Makefile +++ b/src/backend/optimizer/path/Makefile @@ -4,7 +4,7 @@ # Makefile for optimizer/path # # IDENTIFICATION -# $PostgreSQL: pgsql/src/backend/optimizer/path/Makefile,v 1.19 2008/02/19 10:30:07 petere Exp $ +# src/backend/optimizer/path/Makefile # #------------------------------------------------------------------------- diff --git a/src/backend/optimizer/path/allpaths.c b/src/backend/optimizer/path/allpaths.c index b2412b7c3b..2d86da3835 100644 --- a/src/backend/optimizer/path/allpaths.c +++ b/src/backend/optimizer/path/allpaths.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/path/allpaths.c,v 1.194 2010/03/28 22:59:32 tgl Exp $ + * src/backend/optimizer/path/allpaths.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/optimizer/path/clausesel.c b/src/backend/optimizer/path/clausesel.c index c4bc1ee7e4..2eb17afda2 100644 --- a/src/backend/optimizer/path/clausesel.c +++ b/src/backend/optimizer/path/clausesel.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/path/clausesel.c,v 1.99 2010/01/02 16:57:46 momjian Exp $ + * src/backend/optimizer/path/clausesel.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/optimizer/path/costsize.c b/src/backend/optimizer/path/costsize.c index 6f16eb81dc..53aa62fb81 100644 --- a/src/backend/optimizer/path/costsize.c +++ b/src/backend/optimizer/path/costsize.c @@ -59,7 +59,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/path/costsize.c,v 1.218 2010/07/06 19:18:56 momjian Exp $ + * src/backend/optimizer/path/costsize.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/optimizer/path/equivclass.c b/src/backend/optimizer/path/equivclass.c index 75219d0f33..a20ed5f36c 100644 --- a/src/backend/optimizer/path/equivclass.c +++ b/src/backend/optimizer/path/equivclass.c @@ -10,7 +10,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/path/equivclass.c,v 1.23 2010/02/26 02:00:44 momjian Exp $ + * src/backend/optimizer/path/equivclass.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/optimizer/path/indxpath.c b/src/backend/optimizer/path/indxpath.c index 2c97bea3fa..38b09300a0 100644 --- a/src/backend/optimizer/path/indxpath.c +++ b/src/backend/optimizer/path/indxpath.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/path/indxpath.c,v 1.246 2010/02/26 02:00:44 momjian Exp $ + * src/backend/optimizer/path/indxpath.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/optimizer/path/joinpath.c b/src/backend/optimizer/path/joinpath.c index 1fbb2a4fe9..ab3b9cd394 100644 --- a/src/backend/optimizer/path/joinpath.c +++ b/src/backend/optimizer/path/joinpath.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/path/joinpath.c,v 1.133 2010/04/19 00:55:25 rhaas Exp $ + * src/backend/optimizer/path/joinpath.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/optimizer/path/joinrels.c b/src/backend/optimizer/path/joinrels.c index ddecff5533..197c49d774 100644 --- a/src/backend/optimizer/path/joinrels.c +++ b/src/backend/optimizer/path/joinrels.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/path/joinrels.c,v 1.106 2010/09/14 23:15:29 tgl Exp $ + * src/backend/optimizer/path/joinrels.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/optimizer/path/orindxpath.c b/src/backend/optimizer/path/orindxpath.c index c47fc97063..2573809f30 100644 --- a/src/backend/optimizer/path/orindxpath.c +++ b/src/backend/optimizer/path/orindxpath.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/path/orindxpath.c,v 1.91 2010/01/02 16:57:47 momjian Exp $ + * src/backend/optimizer/path/orindxpath.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/optimizer/path/pathkeys.c b/src/backend/optimizer/path/pathkeys.c index fa7ad6544b..643d57a92d 100644 --- a/src/backend/optimizer/path/pathkeys.c +++ b/src/backend/optimizer/path/pathkeys.c @@ -11,7 +11,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/path/pathkeys.c,v 1.102 2010/08/27 20:30:08 petere Exp $ + * src/backend/optimizer/path/pathkeys.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/optimizer/path/tidpath.c b/src/backend/optimizer/path/tidpath.c index 6ea0b2f96f..82f144d5ed 100644 --- a/src/backend/optimizer/path/tidpath.c +++ b/src/backend/optimizer/path/tidpath.c @@ -30,7 +30,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/path/tidpath.c,v 1.35 2010/01/02 16:57:47 momjian Exp $ + * src/backend/optimizer/path/tidpath.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/optimizer/plan/Makefile b/src/backend/optimizer/plan/Makefile index 3c11972155..88a9f7ff8c 100644 --- a/src/backend/optimizer/plan/Makefile +++ b/src/backend/optimizer/plan/Makefile @@ -4,7 +4,7 @@ # Makefile for optimizer/plan # # IDENTIFICATION -# $PostgreSQL: pgsql/src/backend/optimizer/plan/Makefile,v 1.16 2010/03/28 22:59:32 tgl Exp $ +# src/backend/optimizer/plan/Makefile # #------------------------------------------------------------------------- diff --git a/src/backend/optimizer/plan/README b/src/backend/optimizer/plan/README index 71582d9642..e3cd2d83be 100644 --- a/src/backend/optimizer/plan/README +++ b/src/backend/optimizer/plan/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/backend/optimizer/plan/README,v 1.4 2010/08/19 05:57:34 petere Exp $ +src/backend/optimizer/plan/README Subselects ========== diff --git a/src/backend/optimizer/plan/analyzejoins.c b/src/backend/optimizer/plan/analyzejoins.c index c0860beb3c..97f8839ff2 100644 --- a/src/backend/optimizer/plan/analyzejoins.c +++ b/src/backend/optimizer/plan/analyzejoins.c @@ -16,7 +16,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/plan/analyzejoins.c,v 1.4 2010/09/14 23:15:29 tgl Exp $ + * src/backend/optimizer/plan/analyzejoins.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c index 434babc5d8..fa7b29f7d4 100644 --- a/src/backend/optimizer/plan/createplan.c +++ b/src/backend/optimizer/plan/createplan.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/plan/createplan.c,v 1.276 2010/07/12 17:01:05 tgl Exp $ + * src/backend/optimizer/plan/createplan.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/optimizer/plan/initsplan.c b/src/backend/optimizer/plan/initsplan.c index f8e1d523bb..2c61795ff2 100644 --- a/src/backend/optimizer/plan/initsplan.c +++ b/src/backend/optimizer/plan/initsplan.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/plan/initsplan.c,v 1.158 2010/02/26 02:00:45 momjian Exp $ + * src/backend/optimizer/plan/initsplan.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/optimizer/plan/planagg.c b/src/backend/optimizer/plan/planagg.c index 369ed9c929..e590ee048f 100644 --- a/src/backend/optimizer/plan/planagg.c +++ b/src/backend/optimizer/plan/planagg.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/plan/planagg.c,v 1.53 2010/07/06 19:18:56 momjian Exp $ + * src/backend/optimizer/plan/planagg.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/optimizer/plan/planmain.c b/src/backend/optimizer/plan/planmain.c index ad6c6f5858..e82c3404b5 100644 --- a/src/backend/optimizer/plan/planmain.c +++ b/src/backend/optimizer/plan/planmain.c @@ -14,7 +14,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/plan/planmain.c,v 1.119 2010/07/06 19:18:56 momjian Exp $ + * src/backend/optimizer/plan/planmain.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c index 317a7e87f3..9cf5995ce3 100644 --- a/src/backend/optimizer/plan/planner.c +++ b/src/backend/optimizer/plan/planner.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/plan/planner.c,v 1.267 2010/03/30 21:58:10 tgl Exp $ + * src/backend/optimizer/plan/planner.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/optimizer/plan/setrefs.c b/src/backend/optimizer/plan/setrefs.c index 3fda3fbb1c..d5e9212f6a 100644 --- a/src/backend/optimizer/plan/setrefs.c +++ b/src/backend/optimizer/plan/setrefs.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/plan/setrefs.c,v 1.162 2010/08/27 20:30:08 petere Exp $ + * src/backend/optimizer/plan/setrefs.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/optimizer/plan/subselect.c b/src/backend/optimizer/plan/subselect.c index 18336ca726..ab62e2a234 100644 --- a/src/backend/optimizer/plan/subselect.c +++ b/src/backend/optimizer/plan/subselect.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/plan/subselect.c,v 1.164 2010/08/27 20:30:08 petere Exp $ + * src/backend/optimizer/plan/subselect.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/optimizer/prep/Makefile b/src/backend/optimizer/prep/Makefile index 13bd3394c6..86301bfbd3 100644 --- a/src/backend/optimizer/prep/Makefile +++ b/src/backend/optimizer/prep/Makefile @@ -4,7 +4,7 @@ # Makefile for optimizer/prep # # IDENTIFICATION -# $PostgreSQL: pgsql/src/backend/optimizer/prep/Makefile,v 1.17 2008/02/19 10:30:07 petere Exp $ +# src/backend/optimizer/prep/Makefile # #------------------------------------------------------------------------- diff --git a/src/backend/optimizer/prep/prepjointree.c b/src/backend/optimizer/prep/prepjointree.c index c2eff7ae06..cc8059c937 100644 --- a/src/backend/optimizer/prep/prepjointree.c +++ b/src/backend/optimizer/prep/prepjointree.c @@ -16,7 +16,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/prep/prepjointree.c,v 1.74 2010/08/27 20:30:08 petere Exp $ + * src/backend/optimizer/prep/prepjointree.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/optimizer/prep/prepqual.c b/src/backend/optimizer/prep/prepqual.c index 33c77d81bf..bda23937da 100644 --- a/src/backend/optimizer/prep/prepqual.c +++ b/src/backend/optimizer/prep/prepqual.c @@ -25,7 +25,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/prep/prepqual.c,v 1.61 2010/01/02 16:57:47 momjian Exp $ + * src/backend/optimizer/prep/prepqual.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/optimizer/prep/preptlist.c b/src/backend/optimizer/prep/preptlist.c index abbf42cb62..a8464a7aa0 100644 --- a/src/backend/optimizer/prep/preptlist.c +++ b/src/backend/optimizer/prep/preptlist.c @@ -17,7 +17,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/prep/preptlist.c,v 1.100 2010/02/26 02:00:46 momjian Exp $ + * src/backend/optimizer/prep/preptlist.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/optimizer/prep/prepunion.c b/src/backend/optimizer/prep/prepunion.c index 3cb5ed977b..f904258280 100644 --- a/src/backend/optimizer/prep/prepunion.c +++ b/src/backend/optimizer/prep/prepunion.c @@ -22,7 +22,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/prep/prepunion.c,v 1.183 2010/07/06 19:18:56 momjian Exp $ + * src/backend/optimizer/prep/prepunion.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/optimizer/util/Makefile b/src/backend/optimizer/util/Makefile index d13b18c53f..3b2d16b635 100644 --- a/src/backend/optimizer/util/Makefile +++ b/src/backend/optimizer/util/Makefile @@ -4,7 +4,7 @@ # Makefile for optimizer/util # # IDENTIFICATION -# $PostgreSQL: pgsql/src/backend/optimizer/util/Makefile,v 1.19 2008/10/21 20:42:53 tgl Exp $ +# src/backend/optimizer/util/Makefile # #------------------------------------------------------------------------- diff --git a/src/backend/optimizer/util/clauses.c b/src/backend/optimizer/util/clauses.c index dec753b3a3..16aaf87650 100644 --- a/src/backend/optimizer/util/clauses.c +++ b/src/backend/optimizer/util/clauses.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/util/clauses.c,v 1.288 2010/08/14 15:47:13 tgl Exp $ + * src/backend/optimizer/util/clauses.c * * HISTORY * AUTHOR DATE MAJOR EVENT diff --git a/src/backend/optimizer/util/joininfo.c b/src/backend/optimizer/util/joininfo.c index eccff14791..0c02181901 100644 --- a/src/backend/optimizer/util/joininfo.c +++ b/src/backend/optimizer/util/joininfo.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/util/joininfo.c,v 1.53 2010/09/14 23:15:29 tgl Exp $ + * src/backend/optimizer/util/joininfo.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/optimizer/util/pathnode.c b/src/backend/optimizer/util/pathnode.c index 61716e464d..f8aa745fef 100644 --- a/src/backend/optimizer/util/pathnode.c +++ b/src/backend/optimizer/util/pathnode.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/util/pathnode.c,v 1.158 2010/03/28 22:59:33 tgl Exp $ + * src/backend/optimizer/util/pathnode.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/optimizer/util/placeholder.c b/src/backend/optimizer/util/placeholder.c index 837a0c64b3..06bd6f2d01 100644 --- a/src/backend/optimizer/util/placeholder.c +++ b/src/backend/optimizer/util/placeholder.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/util/placeholder.c,v 1.8 2010/07/06 19:18:57 momjian Exp $ + * src/backend/optimizer/util/placeholder.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c index f39b4de71f..ad71d3a4f9 100644 --- a/src/backend/optimizer/util/plancat.c +++ b/src/backend/optimizer/util/plancat.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/util/plancat.c,v 1.164 2010/08/27 20:30:08 petere Exp $ + * src/backend/optimizer/util/plancat.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/optimizer/util/predtest.c b/src/backend/optimizer/util/predtest.c index 66d3a7498f..5ab4a31e15 100644 --- a/src/backend/optimizer/util/predtest.c +++ b/src/backend/optimizer/util/predtest.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/util/predtest.c,v 1.33 2010/02/26 02:00:47 momjian Exp $ + * src/backend/optimizer/util/predtest.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/optimizer/util/relnode.c b/src/backend/optimizer/util/relnode.c index f99d0ad1fb..bffd705f18 100644 --- a/src/backend/optimizer/util/relnode.c +++ b/src/backend/optimizer/util/relnode.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/util/relnode.c,v 1.98 2010/02/26 02:00:47 momjian Exp $ + * src/backend/optimizer/util/relnode.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/optimizer/util/restrictinfo.c b/src/backend/optimizer/util/restrictinfo.c index caa3cd77c0..aa5861ea44 100644 --- a/src/backend/optimizer/util/restrictinfo.c +++ b/src/backend/optimizer/util/restrictinfo.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/util/restrictinfo.c,v 1.63 2010/02/26 02:00:49 momjian Exp $ + * src/backend/optimizer/util/restrictinfo.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/optimizer/util/tlist.c b/src/backend/optimizer/util/tlist.c index 37ac8aaea2..0220aa0e5f 100644 --- a/src/backend/optimizer/util/tlist.c +++ b/src/backend/optimizer/util/tlist.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/util/tlist.c,v 1.87 2010/01/02 16:57:48 momjian Exp $ + * src/backend/optimizer/util/tlist.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/optimizer/util/var.c b/src/backend/optimizer/util/var.c index fdd1239274..399f3a95e8 100644 --- a/src/backend/optimizer/util/var.c +++ b/src/backend/optimizer/util/var.c @@ -14,7 +14,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/util/var.c,v 1.88 2010/07/08 00:14:03 tgl Exp $ + * src/backend/optimizer/util/var.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/parser/Makefile b/src/backend/parser/Makefile index 7c26a70440..ee92a8ca46 100644 --- a/src/backend/parser/Makefile +++ b/src/backend/parser/Makefile @@ -2,7 +2,7 @@ # # Makefile for parser # -# $PostgreSQL: pgsql/src/backend/parser/Makefile,v 1.53 2010/01/05 03:56:52 tgl Exp $ +# src/backend/parser/Makefile # #------------------------------------------------------------------------- diff --git a/src/backend/parser/README b/src/backend/parser/README index 10a5be652c..59cc32fef3 100644 --- a/src/backend/parser/README +++ b/src/backend/parser/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/backend/parser/README,v 1.11 2009/10/31 01:41:31 tgl Exp $ +src/backend/parser/README Parser ====== diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c index a1ad3e20e5..0a93ec70b0 100644 --- a/src/backend/parser/analyze.c +++ b/src/backend/parser/analyze.c @@ -17,7 +17,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/parser/analyze.c,v 1.404 2010/09/18 18:37:01 tgl Exp $ + * src/backend/parser/analyze.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index 1aa7d2b11c..22ce35382b 100644 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.717 2010/08/20 14:55:05 tgl Exp $ + * src/backend/parser/gram.y * * HISTORY * AUTHOR DATE MAJOR EVENT diff --git a/src/backend/parser/keywords.c b/src/backend/parser/keywords.c index ff2d331500..8fa4c97cb9 100644 --- a/src/backend/parser/keywords.c +++ b/src/backend/parser/keywords.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/parser/keywords.c,v 1.215 2010/01/02 16:57:49 momjian Exp $ + * src/backend/parser/keywords.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/parser/kwlookup.c b/src/backend/parser/kwlookup.c index 9bbbe673cd..2b06023611 100644 --- a/src/backend/parser/kwlookup.c +++ b/src/backend/parser/kwlookup.c @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/parser/kwlookup.c,v 2.4 2010/01/02 16:57:49 momjian Exp $ + * src/backend/parser/kwlookup.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/parser/parse_agg.c b/src/backend/parser/parse_agg.c index a7c34bc893..70e60ab716 100644 --- a/src/backend/parser/parse_agg.c +++ b/src/backend/parser/parse_agg.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/parser/parse_agg.c,v 1.94 2010/08/07 02:44:07 tgl Exp $ + * src/backend/parser/parse_agg.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c index 2c66a4ead5..5e13fa4934 100644 --- a/src/backend/parser/parse_clause.c +++ b/src/backend/parser/parse_clause.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/parser/parse_clause.c,v 1.199 2010/07/18 19:37:48 tgl Exp $ + * src/backend/parser/parse_clause.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/parser/parse_coerce.c b/src/backend/parser/parse_coerce.c index 45d2c35fa6..eddbd31977 100644 --- a/src/backend/parser/parse_coerce.c +++ b/src/backend/parser/parse_coerce.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/parser/parse_coerce.c,v 2.182 2010/03/04 09:39:53 heikki Exp $ + * src/backend/parser/parse_coerce.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/parser/parse_cte.c b/src/backend/parser/parse_cte.c index a66726364e..bd8e6a1a30 100644 --- a/src/backend/parser/parse_cte.c +++ b/src/backend/parser/parse_cte.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/parser/parse_cte.c,v 2.9 2010/01/02 16:57:49 momjian Exp $ + * src/backend/parser/parse_cte.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c index 02db1cd20a..e49473cc81 100644 --- a/src/backend/parser/parse_expr.c +++ b/src/backend/parser/parse_expr.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/parser/parse_expr.c,v 1.257 2010/07/29 23:16:33 tgl Exp $ + * src/backend/parser/parse_expr.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/parser/parse_func.c b/src/backend/parser/parse_func.c index 9b869c14c8..b50bce4487 100644 --- a/src/backend/parser/parse_func.c +++ b/src/backend/parser/parse_func.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/parser/parse_func.c,v 1.227 2010/09/03 01:26:52 tgl Exp $ + * src/backend/parser/parse_func.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/parser/parse_node.c b/src/backend/parser/parse_node.c index 59f1245fd6..8f7b8dc8fb 100644 --- a/src/backend/parser/parse_node.c +++ b/src/backend/parser/parse_node.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/parser/parse_node.c,v 1.108 2010/02/14 18:42:15 rhaas Exp $ + * src/backend/parser/parse_node.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/parser/parse_oper.c b/src/backend/parser/parse_oper.c index f72b692db5..1f9742b3ad 100644 --- a/src/backend/parser/parse_oper.c +++ b/src/backend/parser/parse_oper.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/parser/parse_oper.c,v 1.115 2010/09/03 01:26:52 tgl Exp $ + * src/backend/parser/parse_oper.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/parser/parse_param.c b/src/backend/parser/parse_param.c index 2a6bff63fa..205c42b924 100644 --- a/src/backend/parser/parse_param.c +++ b/src/backend/parser/parse_param.c @@ -17,7 +17,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/parser/parse_param.c,v 2.6 2010/08/19 16:54:43 heikki Exp $ + * src/backend/parser/parse_param.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/parser/parse_relation.c b/src/backend/parser/parse_relation.c index 1d0fc82bba..aa71709b43 100644 --- a/src/backend/parser/parse_relation.c +++ b/src/backend/parser/parse_relation.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/parser/parse_relation.c,v 1.151 2010/04/28 00:46:33 tgl Exp $ + * src/backend/parser/parse_relation.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/parser/parse_target.c b/src/backend/parser/parse_target.c index 7e04a94783..e93c0afe91 100644 --- a/src/backend/parser/parse_target.c +++ b/src/backend/parser/parse_target.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/parser/parse_target.c,v 1.177 2010/02/26 02:00:52 momjian Exp $ + * src/backend/parser/parse_target.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/parser/parse_type.c b/src/backend/parser/parse_type.c index 006f406455..dfa6a9a92d 100644 --- a/src/backend/parser/parse_type.c +++ b/src/backend/parser/parse_type.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/parser/parse_type.c,v 1.106 2010/02/14 18:42:15 rhaas Exp $ + * src/backend/parser/parse_type.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/parser/parse_utilcmd.c b/src/backend/parser/parse_utilcmd.c index bf680a2948..552a6af8f8 100644 --- a/src/backend/parser/parse_utilcmd.c +++ b/src/backend/parser/parse_utilcmd.c @@ -19,7 +19,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/parser/parse_utilcmd.c,v 2.43 2010/08/18 18:35:20 tgl Exp $ + * src/backend/parser/parse_utilcmd.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/parser/parser.c b/src/backend/parser/parser.c index 9792ab16f1..d0a1d85ace 100644 --- a/src/backend/parser/parser.c +++ b/src/backend/parser/parser.c @@ -14,7 +14,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/parser/parser.c,v 1.84 2010/01/02 16:57:50 momjian Exp $ + * src/backend/parser/parser.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/parser/scan.l b/src/backend/parser/scan.l index 433ebb3a28..09eac791c3 100644 --- a/src/backend/parser/scan.l +++ b/src/backend/parser/scan.l @@ -24,7 +24,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/parser/scan.l,v 1.168 2010/07/20 00:34:44 rhaas Exp $ + * src/backend/parser/scan.l * *------------------------------------------------------------------------- */ diff --git a/src/backend/parser/scansup.c b/src/backend/parser/scansup.c index f1bb4370fe..1d8453e7fd 100644 --- a/src/backend/parser/scansup.c +++ b/src/backend/parser/scansup.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/parser/scansup.c,v 1.42 2010/07/06 19:18:57 momjian Exp $ + * src/backend/parser/scansup.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/po/fr.po b/src/backend/po/fr.po index f3b05a2857..e43d8aa3b4 100644 --- a/src/backend/po/fr.po +++ b/src/backend/po/fr.po @@ -1,7 +1,7 @@ # translation of postgres.po to fr_fr # french message translation file for postgres # -# $PostgreSQL: pgsql/src/backend/po/fr.po,v 1.28 2010/07/08 21:32:27 petere Exp $ +# src/backend/po/fr.po # # Use these quotes: « %s » # Guillaume Lelarge , 2003-2009. diff --git a/src/backend/port/Makefile b/src/backend/port/Makefile index ed02523f38..44e873bebd 100644 --- a/src/backend/port/Makefile +++ b/src/backend/port/Makefile @@ -13,7 +13,7 @@ # be converted to Method 2. # # IDENTIFICATION -# $PostgreSQL: pgsql/src/backend/port/Makefile,v 1.29 2010/09/11 15:48:04 heikki Exp $ +# src/backend/port/Makefile # #------------------------------------------------------------------------- diff --git a/src/backend/port/aix/mkldexport.sh b/src/backend/port/aix/mkldexport.sh index 01986a0c40..070423ba9b 100755 --- a/src/backend/port/aix/mkldexport.sh +++ b/src/backend/port/aix/mkldexport.sh @@ -3,7 +3,7 @@ # mkldexport # create an AIX exports file from an object file # -# $PostgreSQL: pgsql/src/backend/port/aix/mkldexport.sh,v 1.9 2006/03/11 04:38:31 momjian Exp $ +# src/backend/port/aix/mkldexport.sh # # Usage: # mkldexport objectfile [location] diff --git a/src/backend/port/darwin/Makefile b/src/backend/port/darwin/Makefile index f4580d628c..9d463ffb87 100644 --- a/src/backend/port/darwin/Makefile +++ b/src/backend/port/darwin/Makefile @@ -4,7 +4,7 @@ # Makefile for port/darwin # # IDENTIFICATION -# $PostgreSQL: pgsql/src/backend/port/darwin/Makefile,v 1.6 2008/02/19 15:29:58 petere Exp $ +# src/backend/port/darwin/Makefile # #------------------------------------------------------------------------- diff --git a/src/backend/port/darwin/README b/src/backend/port/darwin/README index a63f4b7ddb..c8be401beb 100644 --- a/src/backend/port/darwin/README +++ b/src/backend/port/darwin/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/backend/port/darwin/README,v 1.5 2008/03/21 13:23:28 momjian Exp $ +src/backend/port/darwin/README Darwin ====== diff --git a/src/backend/port/darwin/system.c b/src/backend/port/darwin/system.c index 9cdcbddae5..1385e43152 100644 --- a/src/backend/port/darwin/system.c +++ b/src/backend/port/darwin/system.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/src/backend/port/darwin/system.c,v 1.8 2009/06/11 14:49:00 momjian Exp $ + * src/backend/port/darwin/system.c * * only needed in OS X 10.1 and possibly early 10.2 releases */ #include diff --git a/src/backend/port/dynloader/aix.c b/src/backend/port/dynloader/aix.c index fcf4122d2a..bf6ec257e7 100644 --- a/src/backend/port/dynloader/aix.c +++ b/src/backend/port/dynloader/aix.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/src/backend/port/dynloader/aix.c,v 1.21 2009/04/21 21:15:50 tgl Exp $ + * src/backend/port/dynloader/aix.c * * Dummy file used for nothing at this point * diff --git a/src/backend/port/dynloader/aix.h b/src/backend/port/dynloader/aix.h index e2e59805e4..e7b18f0555 100644 --- a/src/backend/port/dynloader/aix.h +++ b/src/backend/port/dynloader/aix.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/port/dynloader/aix.h,v 1.15 2010/01/02 16:57:50 momjian Exp $ + * src/backend/port/dynloader/aix.h * *------------------------------------------------------------------------- */ diff --git a/src/backend/port/dynloader/bsdi.c b/src/backend/port/dynloader/bsdi.c index 930e68a002..978bfb44d9 100644 --- a/src/backend/port/dynloader/bsdi.c +++ b/src/backend/port/dynloader/bsdi.c @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/port/dynloader/bsdi.c,v 1.32 2010/01/02 16:57:50 momjian Exp $ + * src/backend/port/dynloader/bsdi.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/port/dynloader/bsdi.h b/src/backend/port/dynloader/bsdi.h index 8072898991..9f7827fbf5 100644 --- a/src/backend/port/dynloader/bsdi.h +++ b/src/backend/port/dynloader/bsdi.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/port/dynloader/bsdi.h,v 1.27 2010/01/02 16:57:50 momjian Exp $ + * src/backend/port/dynloader/bsdi.h * *------------------------------------------------------------------------- */ diff --git a/src/backend/port/dynloader/cygwin.c b/src/backend/port/dynloader/cygwin.c index ba014928b6..5c52bf6147 100644 --- a/src/backend/port/dynloader/cygwin.c +++ b/src/backend/port/dynloader/cygwin.c @@ -1,3 +1,3 @@ -/* $PostgreSQL: pgsql/src/backend/port/dynloader/cygwin.c,v 1.2 2006/03/11 04:38:31 momjian Exp $ */ +/* src/backend/port/dynloader/cygwin.c */ /* Dummy file used for nothing at this point; see cygwin.h */ diff --git a/src/backend/port/dynloader/cygwin.h b/src/backend/port/dynloader/cygwin.h index 955c9acf3e..111bf8269a 100644 --- a/src/backend/port/dynloader/cygwin.h +++ b/src/backend/port/dynloader/cygwin.h @@ -5,7 +5,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/port/dynloader/cygwin.h,v 1.10 2010/01/02 16:57:50 momjian Exp $ + * src/backend/port/dynloader/cygwin.h * *------------------------------------------------------------------------- */ diff --git a/src/backend/port/dynloader/darwin.c b/src/backend/port/dynloader/darwin.c index 4c24682e67..7373fe8033 100644 --- a/src/backend/port/dynloader/darwin.c +++ b/src/backend/port/dynloader/darwin.c @@ -4,7 +4,7 @@ * If dlopen() is available (Darwin 10.3 and later), we just use it. * Otherwise we emulate it with the older, now deprecated, NSLinkModule API. * - * $PostgreSQL: pgsql/src/backend/port/dynloader/darwin.c,v 1.13 2007/11/15 22:25:15 momjian Exp $ + * src/backend/port/dynloader/darwin.c */ #include "postgres.h" diff --git a/src/backend/port/dynloader/darwin.h b/src/backend/port/dynloader/darwin.h index c73548a794..44a3bd6b82 100644 --- a/src/backend/port/dynloader/darwin.h +++ b/src/backend/port/dynloader/darwin.h @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/backend/port/dynloader/darwin.h,v 1.5 2003/11/29 19:51:54 pgsql Exp $ */ +/* src/backend/port/dynloader/darwin.h */ #include "fmgr.h" diff --git a/src/backend/port/dynloader/dgux.c b/src/backend/port/dynloader/dgux.c index 34f6bc4805..34fbcaf228 100644 --- a/src/backend/port/dynloader/dgux.c +++ b/src/backend/port/dynloader/dgux.c @@ -2,5 +2,5 @@ * * see dgux.h * - * $PostgreSQL: pgsql/src/backend/port/dynloader/dgux.c,v 1.4 2003/11/29 22:39:52 pgsql Exp $ + * src/backend/port/dynloader/dgux.c */ diff --git a/src/backend/port/dynloader/dgux.h b/src/backend/port/dynloader/dgux.h index 1614086b34..7fc6c9ef3c 100644 --- a/src/backend/port/dynloader/dgux.h +++ b/src/backend/port/dynloader/dgux.h @@ -5,7 +5,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/port/dynloader/dgux.h,v 1.24 2010/01/02 16:57:50 momjian Exp $ + * src/backend/port/dynloader/dgux.h * *------------------------------------------------------------------------- */ diff --git a/src/backend/port/dynloader/freebsd.c b/src/backend/port/dynloader/freebsd.c index cb678cd696..cc79d321a5 100644 --- a/src/backend/port/dynloader/freebsd.c +++ b/src/backend/port/dynloader/freebsd.c @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/backend/port/dynloader/freebsd.c,v 1.30 2010/01/02 16:57:50 momjian Exp $ */ +/* src/backend/port/dynloader/freebsd.c */ /* * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group diff --git a/src/backend/port/dynloader/freebsd.h b/src/backend/port/dynloader/freebsd.h index cf1fbe43fe..67009c2467 100644 --- a/src/backend/port/dynloader/freebsd.h +++ b/src/backend/port/dynloader/freebsd.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/port/dynloader/freebsd.h,v 1.25 2010/01/02 16:57:50 momjian Exp $ + * src/backend/port/dynloader/freebsd.h * *------------------------------------------------------------------------- */ diff --git a/src/backend/port/dynloader/hpux.c b/src/backend/port/dynloader/hpux.c index 1ec30ea9c2..db66af243d 100644 --- a/src/backend/port/dynloader/hpux.c +++ b/src/backend/port/dynloader/hpux.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/port/dynloader/hpux.c,v 1.33 2010/01/02 16:57:50 momjian Exp $ + * src/backend/port/dynloader/hpux.c * * NOTES * all functions are defined here -- it's impossible to trace the diff --git a/src/backend/port/dynloader/hpux.h b/src/backend/port/dynloader/hpux.h index 2596019d25..141bde6a4e 100644 --- a/src/backend/port/dynloader/hpux.h +++ b/src/backend/port/dynloader/hpux.h @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/port/dynloader/hpux.h,v 1.16 2010/01/02 16:57:50 momjian Exp $ + * src/backend/port/dynloader/hpux.h * * NOTES * all functions are defined here -- it's impossible to trace the diff --git a/src/backend/port/dynloader/irix.c b/src/backend/port/dynloader/irix.c index ba71f8ebe5..df2843a950 100644 --- a/src/backend/port/dynloader/irix.c +++ b/src/backend/port/dynloader/irix.c @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/backend/port/dynloader/irix.c,v 1.2 2006/03/11 04:38:31 momjian Exp $ */ +/* src/backend/port/dynloader/irix.c */ /* Dummy file used for nothing at this point * diff --git a/src/backend/port/dynloader/irix.h b/src/backend/port/dynloader/irix.h index 07b31a49d0..d57d8dcc7a 100644 --- a/src/backend/port/dynloader/irix.h +++ b/src/backend/port/dynloader/irix.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/port/dynloader/irix.h,v 1.8 2010/01/02 16:57:50 momjian Exp $ + * src/backend/port/dynloader/irix.h * *------------------------------------------------------------------------- */ diff --git a/src/backend/port/dynloader/linux.c b/src/backend/port/dynloader/linux.c index 9a7401be0c..7b81345e51 100644 --- a/src/backend/port/dynloader/linux.c +++ b/src/backend/port/dynloader/linux.c @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/port/dynloader/linux.c,v 1.36 2010/01/02 16:57:50 momjian Exp $ + * src/backend/port/dynloader/linux.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/port/dynloader/linux.h b/src/backend/port/dynloader/linux.h index 2877d77503..2607696bac 100644 --- a/src/backend/port/dynloader/linux.h +++ b/src/backend/port/dynloader/linux.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/port/dynloader/linux.h,v 1.29 2010/01/02 16:57:50 momjian Exp $ + * src/backend/port/dynloader/linux.h * *------------------------------------------------------------------------- */ diff --git a/src/backend/port/dynloader/netbsd.c b/src/backend/port/dynloader/netbsd.c index b8dcfafec6..ef22681243 100644 --- a/src/backend/port/dynloader/netbsd.c +++ b/src/backend/port/dynloader/netbsd.c @@ -3,7 +3,7 @@ * Portions Copyright (c) 1990 The Regents of the University of California. * All rights reserved. * - * $PostgreSQL: pgsql/src/backend/port/dynloader/netbsd.c,v 1.26 2010/01/02 16:57:50 momjian Exp $ + * src/backend/port/dynloader/netbsd.c * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/src/backend/port/dynloader/netbsd.h b/src/backend/port/dynloader/netbsd.h index 746fb87a99..a06cecbaf7 100644 --- a/src/backend/port/dynloader/netbsd.h +++ b/src/backend/port/dynloader/netbsd.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/port/dynloader/netbsd.h,v 1.19 2010/01/02 16:57:50 momjian Exp $ + * src/backend/port/dynloader/netbsd.h * *------------------------------------------------------------------------- */ diff --git a/src/backend/port/dynloader/nextstep.c b/src/backend/port/dynloader/nextstep.c index 850b3a1166..432b148716 100644 --- a/src/backend/port/dynloader/nextstep.c +++ b/src/backend/port/dynloader/nextstep.c @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/backend/port/dynloader/nextstep.c,v 1.6 2006/03/11 04:38:31 momjian Exp $ */ +/* src/backend/port/dynloader/nextstep.c */ #include "postgres.h" diff --git a/src/backend/port/dynloader/nextstep.h b/src/backend/port/dynloader/nextstep.h index 287c42df6f..39057fd687 100644 --- a/src/backend/port/dynloader/nextstep.h +++ b/src/backend/port/dynloader/nextstep.h @@ -3,7 +3,7 @@ * port_protos.h * port-specific prototypes for NeXT * - * $PostgreSQL: pgsql/src/backend/port/dynloader/nextstep.h,v 1.9 2006/03/11 04:38:31 momjian Exp $ + * src/backend/port/dynloader/nextstep.h */ #ifndef PORT_PROTOS_H diff --git a/src/backend/port/dynloader/openbsd.c b/src/backend/port/dynloader/openbsd.c index f25239e740..1391c70d55 100644 --- a/src/backend/port/dynloader/openbsd.c +++ b/src/backend/port/dynloader/openbsd.c @@ -3,7 +3,7 @@ * Portions Copyright (c) 1990 The Regents of the University of California. * All rights reserved. * - * $PostgreSQL: pgsql/src/backend/port/dynloader/openbsd.c,v 1.24 2010/01/02 16:57:50 momjian Exp $ + * src/backend/port/dynloader/openbsd.c * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/src/backend/port/dynloader/openbsd.h b/src/backend/port/dynloader/openbsd.h index 71bd8535f3..372a3d1624 100644 --- a/src/backend/port/dynloader/openbsd.h +++ b/src/backend/port/dynloader/openbsd.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/port/dynloader/openbsd.h,v 1.20 2010/01/02 16:57:50 momjian Exp $ + * src/backend/port/dynloader/openbsd.h * *------------------------------------------------------------------------- */ diff --git a/src/backend/port/dynloader/osf.c b/src/backend/port/dynloader/osf.c index 1d3cd51eb3..aabf8054cd 100644 --- a/src/backend/port/dynloader/osf.c +++ b/src/backend/port/dynloader/osf.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/src/backend/port/dynloader/osf.c,v 1.3 2009/04/21 21:05:25 tgl Exp $ + * src/backend/port/dynloader/osf.c * * Dummy file used for nothing at this point * diff --git a/src/backend/port/dynloader/osf.h b/src/backend/port/dynloader/osf.h index 11e1b09a62..2a2dbbc38a 100644 --- a/src/backend/port/dynloader/osf.h +++ b/src/backend/port/dynloader/osf.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/port/dynloader/osf.h,v 1.18 2010/01/02 16:57:50 momjian Exp $ + * src/backend/port/dynloader/osf.h * *------------------------------------------------------------------------- */ diff --git a/src/backend/port/dynloader/sco.c b/src/backend/port/dynloader/sco.c index 0d108cbff5..1e24f494ac 100644 --- a/src/backend/port/dynloader/sco.c +++ b/src/backend/port/dynloader/sco.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/src/backend/port/dynloader/sco.c,v 1.3 2009/06/11 14:49:00 momjian Exp $ + * src/backend/port/dynloader/sco.c * * Dummy file used for nothing at this point * diff --git a/src/backend/port/dynloader/sco.h b/src/backend/port/dynloader/sco.h index 72e1567159..aa6be7ebf3 100644 --- a/src/backend/port/dynloader/sco.h +++ b/src/backend/port/dynloader/sco.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/port/dynloader/sco.h,v 1.22 2010/01/02 16:57:50 momjian Exp $ + * src/backend/port/dynloader/sco.h * *------------------------------------------------------------------------- */ diff --git a/src/backend/port/dynloader/solaris.c b/src/backend/port/dynloader/solaris.c index 9f5b5cfbde..19adcedc5e 100644 --- a/src/backend/port/dynloader/solaris.c +++ b/src/backend/port/dynloader/solaris.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/src/backend/port/dynloader/solaris.c,v 1.3 2009/06/11 14:49:00 momjian Exp $ + * src/backend/port/dynloader/solaris.c * * Dummy file used for nothing at this point * diff --git a/src/backend/port/dynloader/solaris.h b/src/backend/port/dynloader/solaris.h index de735811bc..3182f0807c 100644 --- a/src/backend/port/dynloader/solaris.h +++ b/src/backend/port/dynloader/solaris.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/port/dynloader/solaris.h,v 1.18 2010/01/02 16:57:50 momjian Exp $ + * src/backend/port/dynloader/solaris.h * *------------------------------------------------------------------------- */ diff --git a/src/backend/port/dynloader/sunos4.c b/src/backend/port/dynloader/sunos4.c index a354b0dad4..a43085df0a 100644 --- a/src/backend/port/dynloader/sunos4.c +++ b/src/backend/port/dynloader/sunos4.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/src/backend/port/dynloader/sunos4.c,v 1.3 2009/06/11 14:49:00 momjian Exp $ + * src/backend/port/dynloader/sunos4.c * * Dummy file used for nothing at this point * diff --git a/src/backend/port/dynloader/sunos4.h b/src/backend/port/dynloader/sunos4.h index 86ab337d6a..f4f1aff583 100644 --- a/src/backend/port/dynloader/sunos4.h +++ b/src/backend/port/dynloader/sunos4.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/port/dynloader/sunos4.h,v 1.23 2010/01/02 16:57:50 momjian Exp $ + * src/backend/port/dynloader/sunos4.h * *------------------------------------------------------------------------- */ diff --git a/src/backend/port/dynloader/svr4.c b/src/backend/port/dynloader/svr4.c index 290367060e..bd4d342b2f 100644 --- a/src/backend/port/dynloader/svr4.c +++ b/src/backend/port/dynloader/svr4.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/src/backend/port/dynloader/svr4.c,v 1.3 2009/06/11 14:49:00 momjian Exp $ + * src/backend/port/dynloader/svr4.c * * Dummy file used for nothing at this point * diff --git a/src/backend/port/dynloader/svr4.h b/src/backend/port/dynloader/svr4.h index 08c21dd8d2..617711cfad 100644 --- a/src/backend/port/dynloader/svr4.h +++ b/src/backend/port/dynloader/svr4.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/port/dynloader/svr4.h,v 1.22 2010/01/02 16:57:50 momjian Exp $ + * src/backend/port/dynloader/svr4.h * *------------------------------------------------------------------------- */ diff --git a/src/backend/port/dynloader/ultrix4.c b/src/backend/port/dynloader/ultrix4.c index 2e16ab8541..7992b6a514 100644 --- a/src/backend/port/dynloader/ultrix4.c +++ b/src/backend/port/dynloader/ultrix4.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/port/dynloader/ultrix4.c,v 1.28 2010/01/02 16:57:50 momjian Exp $ + * src/backend/port/dynloader/ultrix4.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/port/dynloader/ultrix4.h b/src/backend/port/dynloader/ultrix4.h index 8bb190aa84..159330adab 100644 --- a/src/backend/port/dynloader/ultrix4.h +++ b/src/backend/port/dynloader/ultrix4.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/port/dynloader/ultrix4.h,v 1.21 2010/01/02 16:57:50 momjian Exp $ + * src/backend/port/dynloader/ultrix4.h * *------------------------------------------------------------------------- */ diff --git a/src/backend/port/dynloader/univel.c b/src/backend/port/dynloader/univel.c index 95d40f015d..ffa7177d5e 100644 --- a/src/backend/port/dynloader/univel.c +++ b/src/backend/port/dynloader/univel.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/src/backend/port/dynloader/univel.c,v 1.5 2009/06/11 14:49:00 momjian Exp $ + * src/backend/port/dynloader/univel.c * * Dummy file used for nothing at this point * diff --git a/src/backend/port/dynloader/univel.h b/src/backend/port/dynloader/univel.h index 96fb8ba7e6..a072468d1c 100644 --- a/src/backend/port/dynloader/univel.h +++ b/src/backend/port/dynloader/univel.h @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/src/backend/port/dynloader/univel.h,v 1.25 2010/01/02 16:57:50 momjian Exp $ + * src/backend/port/dynloader/univel.h * *------------------------------------------------------------------------- * diff --git a/src/backend/port/dynloader/unixware.c b/src/backend/port/dynloader/unixware.c index 682340c694..afb36dfe99 100644 --- a/src/backend/port/dynloader/unixware.c +++ b/src/backend/port/dynloader/unixware.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/src/backend/port/dynloader/unixware.c,v 1.3 2009/06/11 14:49:00 momjian Exp $ + * src/backend/port/dynloader/unixware.c * * Dummy file used for nothing at this point * diff --git a/src/backend/port/dynloader/unixware.h b/src/backend/port/dynloader/unixware.h index 343c631528..b31e0dc8b0 100644 --- a/src/backend/port/dynloader/unixware.h +++ b/src/backend/port/dynloader/unixware.h @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/src/backend/port/dynloader/unixware.h,v 1.23 2010/01/02 16:57:50 momjian Exp $ + * src/backend/port/dynloader/unixware.h * *------------------------------------------------------------------------- * diff --git a/src/backend/port/dynloader/win32.c b/src/backend/port/dynloader/win32.c index 980b424b97..c59823e367 100644 --- a/src/backend/port/dynloader/win32.c +++ b/src/backend/port/dynloader/win32.c @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/backend/port/dynloader/win32.c,v 1.9 2006/12/04 22:23:40 momjian Exp $ */ +/* src/backend/port/dynloader/win32.c */ #include "postgres.h" diff --git a/src/backend/port/dynloader/win32.h b/src/backend/port/dynloader/win32.h index c6952dfda3..af6e979fb1 100644 --- a/src/backend/port/dynloader/win32.h +++ b/src/backend/port/dynloader/win32.h @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/src/backend/port/dynloader/win32.h,v 1.5 2009/06/11 14:49:00 momjian Exp $ + * src/backend/port/dynloader/win32.h */ #ifndef PORT_PROTOS_H #define PORT_PROTOS_H diff --git a/src/backend/port/ipc_test.c b/src/backend/port/ipc_test.c index 7e67187d16..a003dc9c20 100644 --- a/src/backend/port/ipc_test.c +++ b/src/backend/port/ipc_test.c @@ -21,7 +21,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/port/ipc_test.c,v 1.27 2010/01/02 16:57:50 momjian Exp $ + * src/backend/port/ipc_test.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/port/nextstep/Makefile b/src/backend/port/nextstep/Makefile index fc69c8a631..d6cda343e2 100644 --- a/src/backend/port/nextstep/Makefile +++ b/src/backend/port/nextstep/Makefile @@ -4,7 +4,7 @@ # Makefile for port/nextstep # # IDENTIFICATION -# $PostgreSQL: pgsql/src/backend/port/nextstep/Makefile,v 1.11 2008/02/19 15:29:58 petere Exp $ +# src/backend/port/nextstep/Makefile # #------------------------------------------------------------------------- diff --git a/src/backend/port/nextstep/port.c b/src/backend/port/nextstep/port.c index fd5461c321..f81a83a17a 100644 --- a/src/backend/port/nextstep/port.c +++ b/src/backend/port/nextstep/port.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/src/backend/port/nextstep/port.c,v 1.12 2009/06/11 14:49:00 momjian Exp $ + * src/backend/port/nextstep/port.c */ #include "postgres.h" diff --git a/src/backend/port/posix_sema.c b/src/backend/port/posix_sema.c index fedc79b7c1..aeba75816f 100644 --- a/src/backend/port/posix_sema.c +++ b/src/backend/port/posix_sema.c @@ -11,7 +11,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/port/posix_sema.c,v 1.23 2010/01/02 16:57:50 momjian Exp $ + * src/backend/port/posix_sema.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/port/sysv_sema.c b/src/backend/port/sysv_sema.c index 6ff3091dee..00d3de1bb0 100644 --- a/src/backend/port/sysv_sema.c +++ b/src/backend/port/sysv_sema.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/port/sysv_sema.c,v 1.26 2010/01/02 16:57:50 momjian Exp $ + * src/backend/port/sysv_sema.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/port/sysv_shmem.c b/src/backend/port/sysv_shmem.c index eec86325cc..d970eb2996 100644 --- a/src/backend/port/sysv_shmem.c +++ b/src/backend/port/sysv_shmem.c @@ -10,7 +10,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/port/sysv_shmem.c,v 1.58 2010/08/25 20:10:55 tgl Exp $ + * src/backend/port/sysv_shmem.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/port/tas/sunstudio_sparc.s b/src/backend/port/tas/sunstudio_sparc.s index 60e6e6d808..8c655875ec 100644 --- a/src/backend/port/tas/sunstudio_sparc.s +++ b/src/backend/port/tas/sunstudio_sparc.s @@ -7,7 +7,7 @@ ! Portions Copyright (c) 1994, Regents of the University of California ! ! IDENTIFICATION -! $PostgreSQL: pgsql/src/backend/port/tas/sunstudio_sparc.s,v 1.3 2010/01/02 16:57:50 momjian Exp $ +! src/backend/port/tas/sunstudio_sparc.s ! !------------------------------------------------------------------------- diff --git a/src/backend/port/tas/sunstudio_x86.s b/src/backend/port/tas/sunstudio_x86.s index f0ada2a580..ef2233bce1 100644 --- a/src/backend/port/tas/sunstudio_x86.s +++ b/src/backend/port/tas/sunstudio_x86.s @@ -7,7 +7,7 @@ / Portions Copyright (c) 1994, Regents of the University of California / / IDENTIFICATION -/ $PostgreSQL: pgsql/src/backend/port/tas/sunstudio_x86.s,v 1.3 2010/01/02 16:57:50 momjian Exp $ +/ src/backend/port/tas/sunstudio_x86.s / /------------------------------------------------------------------------- diff --git a/src/backend/port/unix_latch.c b/src/backend/port/unix_latch.c index d5d6143289..b8bab4ece8 100644 --- a/src/backend/port/unix_latch.c +++ b/src/backend/port/unix_latch.c @@ -77,7 +77,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/port/unix_latch.c,v 1.4 2010/09/15 10:06:21 heikki Exp $ + * src/backend/port/unix_latch.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/port/win32/Makefile b/src/backend/port/win32/Makefile index ddca8cfbeb..8bf9f74bc4 100644 --- a/src/backend/port/win32/Makefile +++ b/src/backend/port/win32/Makefile @@ -4,7 +4,7 @@ # Makefile for backend/port/win32 # # IDENTIFICATION -# $PostgreSQL: pgsql/src/backend/port/win32/Makefile,v 1.12 2008/02/19 15:29:58 petere Exp $ +# src/backend/port/win32/Makefile # #------------------------------------------------------------------------- diff --git a/src/backend/port/win32/mingwcompat.c b/src/backend/port/win32/mingwcompat.c index 4088b20492..7e7055f5c0 100644 --- a/src/backend/port/win32/mingwcompat.c +++ b/src/backend/port/win32/mingwcompat.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/port/win32/mingwcompat.c,v 1.11 2010/02/26 02:00:53 momjian Exp $ + * src/backend/port/win32/mingwcompat.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/port/win32/security.c b/src/backend/port/win32/security.c index 32e123f141..80bc08bbcd 100644 --- a/src/backend/port/win32/security.c +++ b/src/backend/port/win32/security.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/port/win32/security.c,v 1.15 2010/01/02 16:57:50 momjian Exp $ + * src/backend/port/win32/security.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/port/win32/signal.c b/src/backend/port/win32/signal.c index 35959ae015..da14f24a9b 100644 --- a/src/backend/port/win32/signal.c +++ b/src/backend/port/win32/signal.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/port/win32/signal.c,v 1.25 2010/02/26 02:00:53 momjian Exp $ + * src/backend/port/win32/signal.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/port/win32/socket.c b/src/backend/port/win32/socket.c index 6c7d327c6f..f7090b9210 100644 --- a/src/backend/port/win32/socket.c +++ b/src/backend/port/win32/socket.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/port/win32/socket.c,v 1.27 2010/07/06 19:18:57 momjian Exp $ + * src/backend/port/win32/socket.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/port/win32/timer.c b/src/backend/port/win32/timer.c index c2711fb092..94ce92e621 100644 --- a/src/backend/port/win32/timer.c +++ b/src/backend/port/win32/timer.c @@ -11,7 +11,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/port/win32/timer.c,v 1.19 2010/07/06 19:18:57 momjian Exp $ + * src/backend/port/win32/timer.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/port/win32_latch.c b/src/backend/port/win32_latch.c index a36d1b6ee5..c499d02920 100644 --- a/src/backend/port/win32_latch.c +++ b/src/backend/port/win32_latch.c @@ -12,7 +12,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/port/win32_latch.c,v 1.2 2010/09/15 10:06:21 heikki Exp $ + * src/backend/port/win32_latch.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/port/win32_sema.c b/src/backend/port/win32_sema.c index 8698940496..3d833ab155 100644 --- a/src/backend/port/win32_sema.c +++ b/src/backend/port/win32_sema.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/port/win32_sema.c,v 1.10 2010/01/02 16:57:50 momjian Exp $ + * src/backend/port/win32_sema.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/port/win32_shmem.c b/src/backend/port/win32_shmem.c index ffbc20736c..ff9baf9d38 100644 --- a/src/backend/port/win32_shmem.c +++ b/src/backend/port/win32_shmem.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/port/win32_shmem.c,v 1.16 2010/02/26 02:00:53 momjian Exp $ + * src/backend/port/win32_shmem.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/postmaster/Makefile b/src/backend/postmaster/Makefile index 008c6a4e9f..0767e97435 100644 --- a/src/backend/postmaster/Makefile +++ b/src/backend/postmaster/Makefile @@ -4,7 +4,7 @@ # Makefile for src/backend/postmaster # # IDENTIFICATION -# $PostgreSQL: pgsql/src/backend/postmaster/Makefile,v 1.24 2008/02/19 10:30:07 petere Exp $ +# src/backend/postmaster/Makefile # #------------------------------------------------------------------------- diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c index 78f0667271..e7176448a0 100644 --- a/src/backend/postmaster/autovacuum.c +++ b/src/backend/postmaster/autovacuum.c @@ -55,7 +55,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/postmaster/autovacuum.c,v 1.110 2010/04/28 16:54:15 tgl Exp $ + * src/backend/postmaster/autovacuum.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/postmaster/bgwriter.c b/src/backend/postmaster/bgwriter.c index 67f0d5c636..0690ab521e 100644 --- a/src/backend/postmaster/bgwriter.c +++ b/src/backend/postmaster/bgwriter.c @@ -38,7 +38,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/postmaster/bgwriter.c,v 1.69 2010/08/13 20:10:52 rhaas Exp $ + * src/backend/postmaster/bgwriter.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/postmaster/fork_process.c b/src/backend/postmaster/fork_process.c index 207ba8f0b2..5b8e5f6708 100644 --- a/src/backend/postmaster/fork_process.c +++ b/src/backend/postmaster/fork_process.c @@ -7,7 +7,7 @@ * Copyright (c) 1996-2010, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/postmaster/fork_process.c,v 1.12 2010/02/26 02:00:55 momjian Exp $ + * src/backend/postmaster/fork_process.c */ #include "postgres.h" #include "postmaster/fork_process.h" diff --git a/src/backend/postmaster/pgarch.c b/src/backend/postmaster/pgarch.c index bdbf04d5a2..a414f34221 100644 --- a/src/backend/postmaster/pgarch.c +++ b/src/backend/postmaster/pgarch.c @@ -19,7 +19,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/postmaster/pgarch.c,v 1.42 2010/05/11 16:42:28 tgl Exp $ + * src/backend/postmaster/pgarch.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/postmaster/pgstat.c b/src/backend/postmaster/pgstat.c index b1782da423..483d7afe34 100644 --- a/src/backend/postmaster/pgstat.c +++ b/src/backend/postmaster/pgstat.c @@ -13,7 +13,7 @@ * * Copyright (c) 2001-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/backend/postmaster/pgstat.c,v 1.206 2010/08/21 10:59:17 mha Exp $ + * src/backend/postmaster/pgstat.c * ---------- */ #include "postgres.h" diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index b0225a8c67..6c16752d96 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -37,7 +37,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.616 2010/09/16 20:37:13 mha Exp $ + * src/backend/postmaster/postmaster.c * * NOTES * diff --git a/src/backend/postmaster/syslogger.c b/src/backend/postmaster/syslogger.c index d801914a1c..00ab343d7d 100644 --- a/src/backend/postmaster/syslogger.c +++ b/src/backend/postmaster/syslogger.c @@ -18,7 +18,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/postmaster/syslogger.c,v 1.59 2010/07/16 22:25:50 tgl Exp $ + * src/backend/postmaster/syslogger.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/postmaster/walwriter.c b/src/backend/postmaster/walwriter.c index 194cf8cec3..260b053bb1 100644 --- a/src/backend/postmaster/walwriter.c +++ b/src/backend/postmaster/walwriter.c @@ -34,7 +34,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/postmaster/walwriter.c,v 1.10 2010/01/02 16:57:51 momjian Exp $ + * src/backend/postmaster/walwriter.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/regex/Makefile b/src/backend/regex/Makefile index 146a3d5b34..b4146449de 100644 --- a/src/backend/regex/Makefile +++ b/src/backend/regex/Makefile @@ -4,7 +4,7 @@ # Makefile for backend/regex # # IDENTIFICATION -# $PostgreSQL: pgsql/src/backend/regex/Makefile,v 1.22 2008/02/19 10:30:08 petere Exp $ +# src/backend/regex/Makefile # #------------------------------------------------------------------------- diff --git a/src/backend/regex/regc_color.c b/src/backend/regex/regc_color.c index e15fd4b788..2aeb861d97 100644 --- a/src/backend/regex/regc_color.c +++ b/src/backend/regex/regc_color.c @@ -28,7 +28,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $PostgreSQL: pgsql/src/backend/regex/regc_color.c,v 1.9 2008/02/14 17:33:37 tgl Exp $ + * src/backend/regex/regc_color.c * * * Note that there are some incestuous relationships between this code and diff --git a/src/backend/regex/regc_cvec.c b/src/backend/regex/regc_cvec.c index 25bfae3e32..fb6f06b524 100644 --- a/src/backend/regex/regc_cvec.c +++ b/src/backend/regex/regc_cvec.c @@ -28,7 +28,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $PostgreSQL: pgsql/src/backend/regex/regc_cvec.c,v 1.6 2008/02/14 17:33:37 tgl Exp $ + * src/backend/regex/regc_cvec.c * */ diff --git a/src/backend/regex/regc_lex.c b/src/backend/regex/regc_lex.c index 782c0085c2..da3ff0bf38 100644 --- a/src/backend/regex/regc_lex.c +++ b/src/backend/regex/regc_lex.c @@ -28,7 +28,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $PostgreSQL: pgsql/src/backend/regex/regc_lex.c,v 1.9 2009/06/11 14:49:01 momjian Exp $ + * src/backend/regex/regc_lex.c * */ diff --git a/src/backend/regex/regc_locale.c b/src/backend/regex/regc_locale.c index 8952c3cde0..4f89197364 100644 --- a/src/backend/regex/regc_locale.c +++ b/src/backend/regex/regc_locale.c @@ -47,7 +47,7 @@ * permission to use and distribute the software in accordance with the * terms specified in this license. * - * $PostgreSQL: pgsql/src/backend/regex/regc_locale.c,v 1.10 2009/12/01 21:00:24 tgl Exp $ + * src/backend/regex/regc_locale.c */ /* ASCII character-name table */ diff --git a/src/backend/regex/regc_nfa.c b/src/backend/regex/regc_nfa.c index ef56630173..66a361ee2f 100644 --- a/src/backend/regex/regc_nfa.c +++ b/src/backend/regex/regc_nfa.c @@ -28,7 +28,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $PostgreSQL: pgsql/src/backend/regex/regc_nfa.c,v 1.7 2009/06/11 14:49:01 momjian Exp $ + * src/backend/regex/regc_nfa.c * * * One or two things that technically ought to be in here diff --git a/src/backend/regex/regcomp.c b/src/backend/regex/regcomp.c index d15bea7150..a93e99011d 100644 --- a/src/backend/regex/regcomp.c +++ b/src/backend/regex/regcomp.c @@ -28,7 +28,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $PostgreSQL: pgsql/src/backend/regex/regcomp.c,v 1.49 2010/08/02 02:29:39 tgl Exp $ + * src/backend/regex/regcomp.c * */ diff --git a/src/backend/regex/rege_dfa.c b/src/backend/regex/rege_dfa.c index d35d855f32..e521261a57 100644 --- a/src/backend/regex/rege_dfa.c +++ b/src/backend/regex/rege_dfa.c @@ -28,7 +28,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $PostgreSQL: pgsql/src/backend/regex/rege_dfa.c,v 1.8 2007/10/06 16:05:54 tgl Exp $ + * src/backend/regex/rege_dfa.c * */ diff --git a/src/backend/regex/regerror.c b/src/backend/regex/regerror.c index dfcb462e01..21d2c60b62 100644 --- a/src/backend/regex/regerror.c +++ b/src/backend/regex/regerror.c @@ -27,7 +27,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $PostgreSQL: pgsql/src/backend/regex/regerror.c,v 1.28 2008/02/14 17:33:37 tgl Exp $ + * src/backend/regex/regerror.c * */ diff --git a/src/backend/regex/regexec.c b/src/backend/regex/regexec.c index 0e8b2fb283..5642bdfedf 100644 --- a/src/backend/regex/regexec.c +++ b/src/backend/regex/regexec.c @@ -27,7 +27,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $PostgreSQL: pgsql/src/backend/regex/regexec.c,v 1.29 2010/08/02 02:29:39 tgl Exp $ + * src/backend/regex/regexec.c * */ diff --git a/src/backend/regex/regfree.c b/src/backend/regex/regfree.c index 2b7a5431b1..b291749bd1 100644 --- a/src/backend/regex/regfree.c +++ b/src/backend/regex/regfree.c @@ -27,7 +27,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $PostgreSQL: pgsql/src/backend/regex/regfree.c,v 1.18 2003/11/29 19:51:55 pgsql Exp $ + * src/backend/regex/regfree.c * * * You might think that this could be incorporated into regcomp.c, and diff --git a/src/backend/replication/Makefile b/src/backend/replication/Makefile index 64a966b1cc..e9d9886113 100644 --- a/src/backend/replication/Makefile +++ b/src/backend/replication/Makefile @@ -4,7 +4,7 @@ # Makefile for src/backend/replication # # IDENTIFICATION -# $PostgreSQL: pgsql/src/backend/replication/Makefile,v 1.2 2010/01/20 09:16:24 heikki Exp $ +# src/backend/replication/Makefile # #------------------------------------------------------------------------- diff --git a/src/backend/replication/README b/src/backend/replication/README index 5819fd44de..9c2e0d8e97 100644 --- a/src/backend/replication/README +++ b/src/backend/replication/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/backend/replication/README,v 1.3 2010/03/24 06:25:39 heikki Exp $ +src/backend/replication/README Walreceiver - libpqwalreceiver API ---------------------------------- diff --git a/src/backend/replication/libpqwalreceiver/Makefile b/src/backend/replication/libpqwalreceiver/Makefile index 9ec58051d3..c310b3ba48 100644 --- a/src/backend/replication/libpqwalreceiver/Makefile +++ b/src/backend/replication/libpqwalreceiver/Makefile @@ -4,7 +4,7 @@ # Makefile for src/backend/replication/libpqwalreceiver # # IDENTIFICATION -# $PostgreSQL: pgsql/src/backend/replication/libpqwalreceiver/Makefile,v 1.2 2010/01/20 20:34:51 heikki Exp $ +# src/backend/replication/libpqwalreceiver/Makefile # #------------------------------------------------------------------------- diff --git a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c index e7581160cc..f66a6b46b9 100644 --- a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c +++ b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c,v 1.12 2010/07/06 19:18:57 momjian Exp $ + * src/backend/replication/libpqwalreceiver/libpqwalreceiver.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/replication/walreceiver.c b/src/backend/replication/walreceiver.c index ca5fddaee3..a49ff6c896 100644 --- a/src/backend/replication/walreceiver.c +++ b/src/backend/replication/walreceiver.c @@ -29,7 +29,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/replication/walreceiver.c,v 1.17 2010/09/15 10:35:05 heikki Exp $ + * src/backend/replication/walreceiver.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/replication/walreceiverfuncs.c b/src/backend/replication/walreceiverfuncs.c index 2ccaedb41c..1852fd3c92 100644 --- a/src/backend/replication/walreceiverfuncs.c +++ b/src/backend/replication/walreceiverfuncs.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/replication/walreceiverfuncs.c,v 1.7 2010/07/06 19:18:57 momjian Exp $ + * src/backend/replication/walreceiverfuncs.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/replication/walsender.c b/src/backend/replication/walsender.c index 9be53eec60..d2b9e5c5f9 100644 --- a/src/backend/replication/walsender.c +++ b/src/backend/replication/walsender.c @@ -28,7 +28,7 @@ * Portions Copyright (c) 2010-2010, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/replication/walsender.c,v 1.32 2010/09/15 06:51:19 heikki Exp $ + * src/backend/replication/walsender.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/rewrite/Makefile b/src/backend/rewrite/Makefile index c4c64cb0cc..9ff56c75ad 100644 --- a/src/backend/rewrite/Makefile +++ b/src/backend/rewrite/Makefile @@ -4,7 +4,7 @@ # Makefile for rewrite # # IDENTIFICATION -# $PostgreSQL: pgsql/src/backend/rewrite/Makefile,v 1.19 2009/01/27 12:40:15 petere Exp $ +# src/backend/rewrite/Makefile # #------------------------------------------------------------------------- diff --git a/src/backend/rewrite/rewriteDefine.c b/src/backend/rewrite/rewriteDefine.c index 8e32aed13e..029a2888a7 100644 --- a/src/backend/rewrite/rewriteDefine.c +++ b/src/backend/rewrite/rewriteDefine.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/rewrite/rewriteDefine.c,v 1.142 2010/07/28 05:22:24 sriggs Exp $ + * src/backend/rewrite/rewriteDefine.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/rewrite/rewriteHandler.c b/src/backend/rewrite/rewriteHandler.c index a8016f4adf..e917554f5c 100644 --- a/src/backend/rewrite/rewriteHandler.c +++ b/src/backend/rewrite/rewriteHandler.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/rewrite/rewriteHandler.c,v 1.194 2010/02/26 02:00:58 momjian Exp $ + * src/backend/rewrite/rewriteHandler.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/rewrite/rewriteManip.c b/src/backend/rewrite/rewriteManip.c index 724e94b913..5db2522aed 100644 --- a/src/backend/rewrite/rewriteManip.c +++ b/src/backend/rewrite/rewriteManip.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/rewrite/rewriteManip.c,v 1.127 2010/02/26 02:00:59 momjian Exp $ + * src/backend/rewrite/rewriteManip.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/rewrite/rewriteRemove.c b/src/backend/rewrite/rewriteRemove.c index 2bbfc1f2fa..ce3d53ebea 100644 --- a/src/backend/rewrite/rewriteRemove.c +++ b/src/backend/rewrite/rewriteRemove.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/rewrite/rewriteRemove.c,v 1.80 2010/02/14 18:42:15 rhaas Exp $ + * src/backend/rewrite/rewriteRemove.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/rewrite/rewriteSupport.c b/src/backend/rewrite/rewriteSupport.c index 0e39b06073..c6522c98f9 100644 --- a/src/backend/rewrite/rewriteSupport.c +++ b/src/backend/rewrite/rewriteSupport.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/rewrite/rewriteSupport.c,v 1.70 2010/08/05 15:25:35 rhaas Exp $ + * src/backend/rewrite/rewriteSupport.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/snowball/Makefile b/src/backend/snowball/Makefile index 698ef4f94f..054880866d 100644 --- a/src/backend/snowball/Makefile +++ b/src/backend/snowball/Makefile @@ -2,7 +2,7 @@ # # Makefile for src/backend/snowball # -# $PostgreSQL: pgsql/src/backend/snowball/Makefile,v 1.8 2009/08/28 20:26:19 petere Exp $ +# src/backend/snowball/Makefile # #------------------------------------------------------------------------- diff --git a/src/backend/snowball/README b/src/backend/snowball/README index bb78dde23f..d6fe143e99 100644 --- a/src/backend/snowball/README +++ b/src/backend/snowball/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/backend/snowball/README,v 1.3 2008/03/21 13:23:28 momjian Exp $ +src/backend/snowball/README Snowball-Based Stemming ======================= diff --git a/src/backend/snowball/dict_snowball.c b/src/backend/snowball/dict_snowball.c index 8da887bf16..bfd27b97c8 100644 --- a/src/backend/snowball/dict_snowball.c +++ b/src/backend/snowball/dict_snowball.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/snowball/dict_snowball.c,v 1.9 2010/01/02 16:57:51 momjian Exp $ + * src/backend/snowball/dict_snowball.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/snowball/snowball.sql.in b/src/backend/snowball/snowball.sql.in index 28383e5c67..2f68393ab5 100644 --- a/src/backend/snowball/snowball.sql.in +++ b/src/backend/snowball/snowball.sql.in @@ -1,4 +1,4 @@ --- $PostgreSQL: pgsql/src/backend/snowball/snowball.sql.in,v 1.7 2010/08/19 05:57:34 petere Exp $$ +-- src/backend/snowball/snowball.sql.in$ -- text search configuration for _LANGNAME_ language CREATE TEXT SEARCH DICTIONARY _DICTNAME_ diff --git a/src/backend/snowball/snowball_func.sql.in b/src/backend/snowball/snowball_func.sql.in index 8c09e20d48..e7d45109b4 100644 --- a/src/backend/snowball/snowball_func.sql.in +++ b/src/backend/snowball/snowball_func.sql.in @@ -1,4 +1,4 @@ --- $PostgreSQL: pgsql/src/backend/snowball/snowball_func.sql.in,v 1.3 2010/08/19 05:57:34 petere Exp $$ +-- src/backend/snowball/snowball_func.sql.in$ SET search_path = pg_catalog; diff --git a/src/backend/storage/Makefile b/src/backend/storage/Makefile index 6b7a37c535..bd2d272c6e 100644 --- a/src/backend/storage/Makefile +++ b/src/backend/storage/Makefile @@ -1,7 +1,7 @@ # # Makefile for the storage manager subsystem # -# $PostgreSQL: pgsql/src/backend/storage/Makefile,v 1.14 2008/02/19 10:30:08 petere Exp $ +# src/backend/storage/Makefile # subdir = src/backend/storage diff --git a/src/backend/storage/buffer/Makefile b/src/backend/storage/buffer/Makefile index 15c2828d9c..2c10fba9cd 100644 --- a/src/backend/storage/buffer/Makefile +++ b/src/backend/storage/buffer/Makefile @@ -4,7 +4,7 @@ # Makefile for storage/buffer # # IDENTIFICATION -# $PostgreSQL: pgsql/src/backend/storage/buffer/Makefile,v 1.19 2008/02/19 10:30:08 petere Exp $ +# src/backend/storage/buffer/Makefile # #------------------------------------------------------------------------- diff --git a/src/backend/storage/buffer/README b/src/backend/storage/buffer/README index a5470b3753..3b46094623 100644 --- a/src/backend/storage/buffer/README +++ b/src/backend/storage/buffer/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/backend/storage/buffer/README,v 1.17 2009/06/22 20:04:28 tgl Exp $ +src/backend/storage/buffer/README Notes About Shared Buffer Access Rules ====================================== diff --git a/src/backend/storage/buffer/buf_init.c b/src/backend/storage/buffer/buf_init.c index 6cf3958b3c..2da85db7c5 100644 --- a/src/backend/storage/buffer/buf_init.c +++ b/src/backend/storage/buffer/buf_init.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/buffer/buf_init.c,v 1.84 2010/01/02 16:57:51 momjian Exp $ + * src/backend/storage/buffer/buf_init.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/storage/buffer/buf_table.c b/src/backend/storage/buffer/buf_table.c index 44b2e599bc..dc30e47fb5 100644 --- a/src/backend/storage/buffer/buf_table.c +++ b/src/backend/storage/buffer/buf_table.c @@ -15,7 +15,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/buffer/buf_table.c,v 1.52 2010/04/28 16:54:15 tgl Exp $ + * src/backend/storage/buffer/buf_table.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index c48c33d10e..54c7109983 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/buffer/bufmgr.c,v 1.260 2010/08/20 01:07:50 rhaas Exp $ + * src/backend/storage/buffer/bufmgr.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/storage/buffer/freelist.c b/src/backend/storage/buffer/freelist.c index 11f5ded27e..995e745750 100644 --- a/src/backend/storage/buffer/freelist.c +++ b/src/backend/storage/buffer/freelist.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/buffer/freelist.c,v 1.68 2010/01/02 16:57:51 momjian Exp $ + * src/backend/storage/buffer/freelist.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/storage/buffer/localbuf.c b/src/backend/storage/buffer/localbuf.c index 6572917f83..46fddde187 100644 --- a/src/backend/storage/buffer/localbuf.c +++ b/src/backend/storage/buffer/localbuf.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/buffer/localbuf.c,v 1.91 2010/08/19 16:16:20 tgl Exp $ + * src/backend/storage/buffer/localbuf.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/storage/file/Makefile b/src/backend/storage/file/Makefile index 0944b7be48..3b93aa1b45 100644 --- a/src/backend/storage/file/Makefile +++ b/src/backend/storage/file/Makefile @@ -4,7 +4,7 @@ # Makefile for storage/file # # IDENTIFICATION -# $PostgreSQL: pgsql/src/backend/storage/file/Makefile,v 1.14 2010/07/02 17:03:30 rhaas Exp $ +# src/backend/storage/file/Makefile # #------------------------------------------------------------------------- diff --git a/src/backend/storage/file/buffile.c b/src/backend/storage/file/buffile.c index adb3285e79..59813b83d0 100644 --- a/src/backend/storage/file/buffile.c +++ b/src/backend/storage/file/buffile.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/file/buffile.c,v 1.36 2010/01/02 16:57:51 momjian Exp $ + * src/backend/storage/file/buffile.c * * NOTES: * diff --git a/src/backend/storage/file/copydir.c b/src/backend/storage/file/copydir.c index fe44180c93..a9715f3c7d 100644 --- a/src/backend/storage/file/copydir.c +++ b/src/backend/storage/file/copydir.c @@ -11,7 +11,7 @@ * as a service. * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/file/copydir.c,v 1.2 2010/07/06 19:18:57 momjian Exp $ + * src/backend/storage/file/copydir.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c index 18d6de1dec..27f0ef83c7 100644 --- a/src/backend/storage/file/fd.c +++ b/src/backend/storage/file/fd.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/file/fd.c,v 1.158 2010/08/13 20:10:52 rhaas Exp $ + * src/backend/storage/file/fd.c * * NOTES: * diff --git a/src/backend/storage/freespace/Makefile b/src/backend/storage/freespace/Makefile index bc9cae622c..fca1816990 100644 --- a/src/backend/storage/freespace/Makefile +++ b/src/backend/storage/freespace/Makefile @@ -4,7 +4,7 @@ # Makefile for storage/freespace # # IDENTIFICATION -# $PostgreSQL: pgsql/src/backend/storage/freespace/Makefile,v 1.5 2008/09/30 10:52:13 heikki Exp $ +# src/backend/storage/freespace/Makefile # #------------------------------------------------------------------------- diff --git a/src/backend/storage/freespace/README b/src/backend/storage/freespace/README index c2c5889834..b3b0e3a680 100644 --- a/src/backend/storage/freespace/README +++ b/src/backend/storage/freespace/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/backend/storage/freespace/README,v 1.2 2010/08/19 05:57:34 petere Exp $ +src/backend/storage/freespace/README Free Space Map -------------- diff --git a/src/backend/storage/freespace/freespace.c b/src/backend/storage/freespace/freespace.c index 3f6d7a3e18..cde9746f8c 100644 --- a/src/backend/storage/freespace/freespace.c +++ b/src/backend/storage/freespace/freespace.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/freespace/freespace.c,v 1.79 2010/08/19 02:58:37 rhaas Exp $ + * src/backend/storage/freespace/freespace.c * * * NOTES: diff --git a/src/backend/storage/freespace/fsmpage.c b/src/backend/storage/freespace/fsmpage.c index e6be975bd4..635cbcd28a 100644 --- a/src/backend/storage/freespace/fsmpage.c +++ b/src/backend/storage/freespace/fsmpage.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/freespace/fsmpage.c,v 1.6 2010/01/02 16:57:51 momjian Exp $ + * src/backend/storage/freespace/fsmpage.c * * NOTES: * diff --git a/src/backend/storage/freespace/indexfsm.c b/src/backend/storage/freespace/indexfsm.c index 888e52cd61..07771fe2f5 100644 --- a/src/backend/storage/freespace/indexfsm.c +++ b/src/backend/storage/freespace/indexfsm.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/freespace/indexfsm.c,v 1.6 2010/01/02 16:57:51 momjian Exp $ + * src/backend/storage/freespace/indexfsm.c * * * NOTES: diff --git a/src/backend/storage/ipc/Makefile b/src/backend/storage/ipc/Makefile index 1d897c5afb..743f30e1c7 100644 --- a/src/backend/storage/ipc/Makefile +++ b/src/backend/storage/ipc/Makefile @@ -1,7 +1,7 @@ # # Makefile for storage/ipc # -# $PostgreSQL: pgsql/src/backend/storage/ipc/Makefile,v 1.23 2009/12/19 01:32:35 sriggs Exp $ +# src/backend/storage/ipc/Makefile # subdir = src/backend/storage/ipc diff --git a/src/backend/storage/ipc/README b/src/backend/storage/ipc/README index fc33fb6070..a56729db1a 100644 --- a/src/backend/storage/ipc/README +++ b/src/backend/storage/ipc/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/backend/storage/ipc/README,v 1.5 2008/03/20 17:55:15 momjian Exp $ +src/backend/storage/ipc/README Cache Invalidation Synchronization Routines =========================================== diff --git a/src/backend/storage/ipc/ipc.c b/src/backend/storage/ipc/ipc.c index e28127b03f..9d15d11e63 100644 --- a/src/backend/storage/ipc/ipc.c +++ b/src/backend/storage/ipc/ipc.c @@ -13,7 +13,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/ipc/ipc.c,v 1.108 2010/07/06 19:18:57 momjian Exp $ + * src/backend/storage/ipc/ipc.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/storage/ipc/ipci.c b/src/backend/storage/ipc/ipci.c index 666c015ded..95beba8ab4 100644 --- a/src/backend/storage/ipc/ipci.c +++ b/src/backend/storage/ipc/ipci.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/ipc/ipci.c,v 1.106 2010/09/15 10:06:21 heikki Exp $ + * src/backend/storage/ipc/ipci.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/storage/ipc/pmsignal.c b/src/backend/storage/ipc/pmsignal.c index 083bf40b4d..53aa9aaf70 100644 --- a/src/backend/storage/ipc/pmsignal.c +++ b/src/backend/storage/ipc/pmsignal.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/ipc/pmsignal.c,v 1.31 2010/08/23 17:20:01 tgl Exp $ + * src/backend/storage/ipc/pmsignal.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/storage/ipc/procarray.c b/src/backend/storage/ipc/procarray.c index c80ac49bd5..6e7a6db291 100644 --- a/src/backend/storage/ipc/procarray.c +++ b/src/backend/storage/ipc/procarray.c @@ -37,7 +37,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/ipc/procarray.c,v 1.75 2010/08/30 17:30:44 tgl Exp $ + * src/backend/storage/ipc/procarray.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/storage/ipc/procsignal.c b/src/backend/storage/ipc/procsignal.c index 0b8842a466..7704b35161 100644 --- a/src/backend/storage/ipc/procsignal.c +++ b/src/backend/storage/ipc/procsignal.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/ipc/procsignal.c,v 1.8 2010/09/11 15:48:04 heikki Exp $ + * src/backend/storage/ipc/procsignal.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/storage/ipc/shmem.c b/src/backend/storage/ipc/shmem.c index 910af52737..2e69f1f60f 100644 --- a/src/backend/storage/ipc/shmem.c +++ b/src/backend/storage/ipc/shmem.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/ipc/shmem.c,v 1.105 2010/07/06 19:18:57 momjian Exp $ + * src/backend/storage/ipc/shmem.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/storage/ipc/shmqueue.c b/src/backend/storage/ipc/shmqueue.c index 13b8baddc1..58cd538bfd 100644 --- a/src/backend/storage/ipc/shmqueue.c +++ b/src/backend/storage/ipc/shmqueue.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/ipc/shmqueue.c,v 1.34 2010/01/02 16:57:51 momjian Exp $ + * src/backend/storage/ipc/shmqueue.c * * NOTES * diff --git a/src/backend/storage/ipc/sinval.c b/src/backend/storage/ipc/sinval.c index 79fe548007..6c33c932e3 100644 --- a/src/backend/storage/ipc/sinval.c +++ b/src/backend/storage/ipc/sinval.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/ipc/sinval.c,v 1.92 2010/01/02 16:57:51 momjian Exp $ + * src/backend/storage/ipc/sinval.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/storage/ipc/sinvaladt.c b/src/backend/storage/ipc/sinvaladt.c index 0667652ed7..7910346dd5 100644 --- a/src/backend/storage/ipc/sinvaladt.c +++ b/src/backend/storage/ipc/sinvaladt.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.82 2010/02/26 02:01:00 momjian Exp $ + * src/backend/storage/ipc/sinvaladt.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/storage/ipc/standby.c b/src/backend/storage/ipc/standby.c index 502e145cda..4d00fb651e 100644 --- a/src/backend/storage/ipc/standby.c +++ b/src/backend/storage/ipc/standby.c @@ -11,7 +11,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/ipc/standby.c,v 1.29 2010/08/19 22:55:01 tgl Exp $ + * src/backend/storage/ipc/standby.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/storage/large_object/Makefile b/src/backend/storage/large_object/Makefile index 45de988d5c..e1fd01c862 100644 --- a/src/backend/storage/large_object/Makefile +++ b/src/backend/storage/large_object/Makefile @@ -4,7 +4,7 @@ # Makefile for storage/large_object # # IDENTIFICATION -# $PostgreSQL: pgsql/src/backend/storage/large_object/Makefile,v 1.13 2008/02/19 10:30:08 petere Exp $ +# src/backend/storage/large_object/Makefile # #------------------------------------------------------------------------- diff --git a/src/backend/storage/large_object/inv_api.c b/src/backend/storage/large_object/inv_api.c index 36da56da74..e2faf95d93 100644 --- a/src/backend/storage/large_object/inv_api.c +++ b/src/backend/storage/large_object/inv_api.c @@ -24,7 +24,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/large_object/inv_api.c,v 1.141 2010/02/26 02:01:00 momjian Exp $ + * src/backend/storage/large_object/inv_api.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/storage/lmgr/Makefile b/src/backend/storage/lmgr/Makefile index d2e1a05792..b0bfe66fe6 100644 --- a/src/backend/storage/lmgr/Makefile +++ b/src/backend/storage/lmgr/Makefile @@ -4,7 +4,7 @@ # Makefile for storage/lmgr # # IDENTIFICATION -# $PostgreSQL: pgsql/src/backend/storage/lmgr/Makefile,v 1.23 2008/02/19 10:30:08 petere Exp $ +# src/backend/storage/lmgr/Makefile # #------------------------------------------------------------------------- diff --git a/src/backend/storage/lmgr/README b/src/backend/storage/lmgr/README index bfc6853941..0358594bad 100644 --- a/src/backend/storage/lmgr/README +++ b/src/backend/storage/lmgr/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/backend/storage/lmgr/README,v 1.25 2009/12/19 01:32:35 sriggs Exp $ +src/backend/storage/lmgr/README Locking Overview ================ diff --git a/src/backend/storage/lmgr/deadlock.c b/src/backend/storage/lmgr/deadlock.c index df1be6cff3..0ac4874188 100644 --- a/src/backend/storage/lmgr/deadlock.c +++ b/src/backend/storage/lmgr/deadlock.c @@ -12,7 +12,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/lmgr/deadlock.c,v 1.58 2010/01/02 16:57:52 momjian Exp $ + * src/backend/storage/lmgr/deadlock.c * * Interface: * diff --git a/src/backend/storage/lmgr/lmgr.c b/src/backend/storage/lmgr/lmgr.c index 39a0ea1deb..9f335ed486 100644 --- a/src/backend/storage/lmgr/lmgr.c +++ b/src/backend/storage/lmgr/lmgr.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/lmgr/lmgr.c,v 1.101 2010/08/16 02:02:28 rhaas Exp $ + * src/backend/storage/lmgr/lmgr.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c index b196174f6e..45cfbc0710 100644 --- a/src/backend/storage/lmgr/lock.c +++ b/src/backend/storage/lmgr/lock.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/lmgr/lock.c,v 1.197 2010/04/28 16:54:16 tgl Exp $ + * src/backend/storage/lmgr/lock.c * * NOTES * A lock table is a shared memory hash table. When diff --git a/src/backend/storage/lmgr/lwlock.c b/src/backend/storage/lmgr/lwlock.c index 7a6cab968b..32cb81998c 100644 --- a/src/backend/storage/lmgr/lwlock.c +++ b/src/backend/storage/lmgr/lwlock.c @@ -15,7 +15,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/lmgr/lwlock.c,v 1.56 2010/02/16 22:34:50 tgl Exp $ + * src/backend/storage/lmgr/lwlock.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index e90417a493..e4a7dd901e 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/lmgr/proc.c,v 1.222 2010/08/23 17:20:01 tgl Exp $ + * src/backend/storage/lmgr/proc.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/storage/lmgr/s_lock.c b/src/backend/storage/lmgr/s_lock.c index db9c47a4f6..3552b66fb0 100644 --- a/src/backend/storage/lmgr/s_lock.c +++ b/src/backend/storage/lmgr/s_lock.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/lmgr/s_lock.c,v 1.51 2010/01/02 16:57:52 momjian Exp $ + * src/backend/storage/lmgr/s_lock.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/storage/lmgr/spin.c b/src/backend/storage/lmgr/spin.c index c729bb7c91..ed851c9244 100644 --- a/src/backend/storage/lmgr/spin.c +++ b/src/backend/storage/lmgr/spin.c @@ -16,7 +16,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/lmgr/spin.c,v 1.25 2010/01/02 16:57:52 momjian Exp $ + * src/backend/storage/lmgr/spin.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/storage/page/Makefile b/src/backend/storage/page/Makefile index 8af2341312..a59a450643 100644 --- a/src/backend/storage/page/Makefile +++ b/src/backend/storage/page/Makefile @@ -4,7 +4,7 @@ # Makefile for storage/page # # IDENTIFICATION -# $PostgreSQL: pgsql/src/backend/storage/page/Makefile,v 1.13 2008/02/19 10:30:08 petere Exp $ +# src/backend/storage/page/Makefile # #------------------------------------------------------------------------- diff --git a/src/backend/storage/page/bufpage.c b/src/backend/storage/page/bufpage.c index 0c9a98b45b..de8bcd63bf 100644 --- a/src/backend/storage/page/bufpage.c +++ b/src/backend/storage/page/bufpage.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/page/bufpage.c,v 1.83 2010/01/02 16:57:52 momjian Exp $ + * src/backend/storage/page/bufpage.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/storage/page/itemptr.c b/src/backend/storage/page/itemptr.c index cfea350c06..6733868668 100644 --- a/src/backend/storage/page/itemptr.c +++ b/src/backend/storage/page/itemptr.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/page/itemptr.c,v 1.23 2010/01/02 16:57:52 momjian Exp $ + * src/backend/storage/page/itemptr.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/storage/smgr/Makefile b/src/backend/storage/smgr/Makefile index 9e9ec866c3..2b95cb0df1 100644 --- a/src/backend/storage/smgr/Makefile +++ b/src/backend/storage/smgr/Makefile @@ -4,7 +4,7 @@ # Makefile for storage/smgr # # IDENTIFICATION -# $PostgreSQL: pgsql/src/backend/storage/smgr/Makefile,v 1.17 2008/02/19 10:30:08 petere Exp $ +# src/backend/storage/smgr/Makefile # #------------------------------------------------------------------------- diff --git a/src/backend/storage/smgr/README b/src/backend/storage/smgr/README index cc798533f2..44e93022df 100644 --- a/src/backend/storage/smgr/README +++ b/src/backend/storage/smgr/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/backend/storage/smgr/README,v 1.6 2008/08/11 11:05:11 heikki Exp $ +src/backend/storage/smgr/README Storage Manager =============== diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c index f1ff2fe15e..1219fcffeb 100644 --- a/src/backend/storage/smgr/md.c +++ b/src/backend/storage/smgr/md.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/smgr/md.c,v 1.152 2010/08/13 20:10:52 rhaas Exp $ + * src/backend/storage/smgr/md.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/storage/smgr/smgr.c b/src/backend/storage/smgr/smgr.c index c1d1449222..343a7f308e 100644 --- a/src/backend/storage/smgr/smgr.c +++ b/src/backend/storage/smgr/smgr.c @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/smgr/smgr.c,v 1.122 2010/08/13 20:10:52 rhaas Exp $ + * src/backend/storage/smgr/smgr.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/storage/smgr/smgrtype.c b/src/backend/storage/smgr/smgrtype.c index c5ee3f6f91..7db5fa7815 100644 --- a/src/backend/storage/smgr/smgrtype.c +++ b/src/backend/storage/smgr/smgrtype.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/smgr/smgrtype.c,v 1.31 2010/01/02 16:57:52 momjian Exp $ + * src/backend/storage/smgr/smgrtype.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/tcop/Makefile b/src/backend/tcop/Makefile index 0b8f3a6e03..674302feb7 100644 --- a/src/backend/tcop/Makefile +++ b/src/backend/tcop/Makefile @@ -4,7 +4,7 @@ # Makefile for tcop # # IDENTIFICATION -# $PostgreSQL: pgsql/src/backend/tcop/Makefile,v 1.29 2008/02/19 10:30:08 petere Exp $ +# src/backend/tcop/Makefile # #------------------------------------------------------------------------- diff --git a/src/backend/tcop/dest.c b/src/backend/tcop/dest.c index 937e1cfed3..11bf0ab27c 100644 --- a/src/backend/tcop/dest.c +++ b/src/backend/tcop/dest.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/tcop/dest.c,v 1.78 2010/02/26 02:01:01 momjian Exp $ + * src/backend/tcop/dest.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/tcop/fastpath.c b/src/backend/tcop/fastpath.c index a5c5a30982..af58e4ea26 100644 --- a/src/backend/tcop/fastpath.c +++ b/src/backend/tcop/fastpath.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/tcop/fastpath.c,v 1.106 2010/09/03 01:26:52 tgl Exp $ + * src/backend/tcop/fastpath.c * * NOTES * This cruft is the server side of PQfn. diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index 5597ac35a2..cba90a9e72 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.597 2010/09/11 18:38:56 joe Exp $ + * src/backend/tcop/postgres.c * * NOTES * this is the "main" module of the postgres backend and diff --git a/src/backend/tcop/pquery.c b/src/backend/tcop/pquery.c index 7d583c4e5c..8eb02da4b6 100644 --- a/src/backend/tcop/pquery.c +++ b/src/backend/tcop/pquery.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/tcop/pquery.c,v 1.138 2010/09/11 18:38:56 joe Exp $ + * src/backend/tcop/pquery.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c index d37e9123d9..1865f843d2 100644 --- a/src/backend/tcop/utility.c +++ b/src/backend/tcop/utility.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/tcop/utility.c,v 1.337 2010/08/18 18:35:20 tgl Exp $ + * src/backend/tcop/utility.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/tsearch/Makefile b/src/backend/tsearch/Makefile index 21ae7d50a9..395c21eae1 100644 --- a/src/backend/tsearch/Makefile +++ b/src/backend/tsearch/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 2006-2010, PostgreSQL Global Development Group # -# $PostgreSQL: pgsql/src/backend/tsearch/Makefile,v 1.12 2010/01/02 16:57:53 momjian Exp $ +# src/backend/tsearch/Makefile # #------------------------------------------------------------------------- subdir = src/backend/tsearch diff --git a/src/backend/tsearch/dict.c b/src/backend/tsearch/dict.c index 79c544e25f..28f0ca73e5 100644 --- a/src/backend/tsearch/dict.c +++ b/src/backend/tsearch/dict.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/tsearch/dict.c,v 1.7 2010/01/02 16:57:53 momjian Exp $ + * src/backend/tsearch/dict.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/tsearch/dict_ispell.c b/src/backend/tsearch/dict_ispell.c index a93d96bf65..95bf8d4632 100644 --- a/src/backend/tsearch/dict_ispell.c +++ b/src/backend/tsearch/dict_ispell.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/tsearch/dict_ispell.c,v 1.9 2010/01/02 16:57:53 momjian Exp $ + * src/backend/tsearch/dict_ispell.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/tsearch/dict_simple.c b/src/backend/tsearch/dict_simple.c index e85fc53c5c..603c873d7f 100644 --- a/src/backend/tsearch/dict_simple.c +++ b/src/backend/tsearch/dict_simple.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/tsearch/dict_simple.c,v 1.9 2010/01/02 16:57:53 momjian Exp $ + * src/backend/tsearch/dict_simple.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/tsearch/dict_synonym.c b/src/backend/tsearch/dict_synonym.c index b85fe93bd8..947088556d 100644 --- a/src/backend/tsearch/dict_synonym.c +++ b/src/backend/tsearch/dict_synonym.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/tsearch/dict_synonym.c,v 1.13 2010/02/26 02:01:05 momjian Exp $ + * src/backend/tsearch/dict_synonym.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/tsearch/dict_thesaurus.c b/src/backend/tsearch/dict_thesaurus.c index 7d6868ebd5..24ec3a9247 100644 --- a/src/backend/tsearch/dict_thesaurus.c +++ b/src/backend/tsearch/dict_thesaurus.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/tsearch/dict_thesaurus.c,v 1.17 2010/08/05 15:25:35 rhaas Exp $ + * src/backend/tsearch/dict_thesaurus.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/tsearch/regis.c b/src/backend/tsearch/regis.c index 1159a7e20c..c3114e7bb7 100644 --- a/src/backend/tsearch/regis.c +++ b/src/backend/tsearch/regis.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/tsearch/regis.c,v 1.9 2010/01/02 16:57:53 momjian Exp $ + * src/backend/tsearch/regis.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/tsearch/spell.c b/src/backend/tsearch/spell.c index cbfd386074..4b54b158f3 100644 --- a/src/backend/tsearch/spell.c +++ b/src/backend/tsearch/spell.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/tsearch/spell.c,v 1.17 2010/01/02 16:57:53 momjian Exp $ + * src/backend/tsearch/spell.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/tsearch/to_tsany.c b/src/backend/tsearch/to_tsany.c index e26f73984c..f2f13dd8dc 100644 --- a/src/backend/tsearch/to_tsany.c +++ b/src/backend/tsearch/to_tsany.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/tsearch/to_tsany.c,v 1.15 2010/01/02 16:57:53 momjian Exp $ + * src/backend/tsearch/to_tsany.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/tsearch/ts_locale.c b/src/backend/tsearch/ts_locale.c index 05f3619395..a9ce462377 100644 --- a/src/backend/tsearch/ts_locale.c +++ b/src/backend/tsearch/ts_locale.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/tsearch/ts_locale.c,v 1.14 2010/01/02 16:57:53 momjian Exp $ + * src/backend/tsearch/ts_locale.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/tsearch/ts_parse.c b/src/backend/tsearch/ts_parse.c index 55d740a9f5..71772e7fe3 100644 --- a/src/backend/tsearch/ts_parse.c +++ b/src/backend/tsearch/ts_parse.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/tsearch/ts_parse.c,v 1.17 2010/02/26 02:01:05 momjian Exp $ + * src/backend/tsearch/ts_parse.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/tsearch/ts_selfuncs.c b/src/backend/tsearch/ts_selfuncs.c index 3948ef9367..8a70c2fd4a 100644 --- a/src/backend/tsearch/ts_selfuncs.c +++ b/src/backend/tsearch/ts_selfuncs.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/tsearch/ts_selfuncs.c,v 1.9 2010/08/01 21:31:08 tgl Exp $ + * src/backend/tsearch/ts_selfuncs.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/tsearch/ts_typanalyze.c b/src/backend/tsearch/ts_typanalyze.c index e9685082b9..a42d09b280 100644 --- a/src/backend/tsearch/ts_typanalyze.c +++ b/src/backend/tsearch/ts_typanalyze.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/tsearch/ts_typanalyze.c,v 1.10 2010/07/06 19:18:57 momjian Exp $ + * src/backend/tsearch/ts_typanalyze.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/tsearch/ts_utils.c b/src/backend/tsearch/ts_utils.c index 76628f9797..e45f4da64e 100644 --- a/src/backend/tsearch/ts_utils.c +++ b/src/backend/tsearch/ts_utils.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/tsearch/ts_utils.c,v 1.14 2010/01/02 16:57:53 momjian Exp $ + * src/backend/tsearch/ts_utils.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/tsearch/wparser.c b/src/backend/tsearch/wparser.c index 9741bb9371..ff007161fe 100644 --- a/src/backend/tsearch/wparser.c +++ b/src/backend/tsearch/wparser.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/tsearch/wparser.c,v 1.13 2010/08/05 15:25:35 rhaas Exp $ + * src/backend/tsearch/wparser.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/tsearch/wparser_def.c b/src/backend/tsearch/wparser_def.c index 279fb52741..ce0b7586c8 100644 --- a/src/backend/tsearch/wparser_def.c +++ b/src/backend/tsearch/wparser_def.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/tsearch/wparser_def.c,v 1.33 2010/08/19 05:57:34 petere Exp $ + * src/backend/tsearch/wparser_def.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/Gen_dummy_probes.sed b/src/backend/utils/Gen_dummy_probes.sed index ee9eadba08..16c8c8de4a 100644 --- a/src/backend/utils/Gen_dummy_probes.sed +++ b/src/backend/utils/Gen_dummy_probes.sed @@ -3,7 +3,7 @@ # # Copyright (c) 2008-2010, PostgreSQL Global Development Group # -# $PostgreSQL: pgsql/src/backend/utils/Gen_dummy_probes.sed,v 1.5 2010/01/02 16:57:53 momjian Exp $ +# src/backend/utils/Gen_dummy_probes.sed #------------------------------------------------------------------------- /^[ ]*probe /!d diff --git a/src/backend/utils/Gen_fmgrtab.pl b/src/backend/utils/Gen_fmgrtab.pl index 3c9c777362..57cc5f70ff 100644 --- a/src/backend/utils/Gen_fmgrtab.pl +++ b/src/backend/utils/Gen_fmgrtab.pl @@ -9,7 +9,7 @@ # # # IDENTIFICATION -# $PostgreSQL: pgsql/src/backend/utils/Gen_fmgrtab.pl,v 1.5 2010/01/05 20:23:32 tgl Exp $ +# src/backend/utils/Gen_fmgrtab.pl # #------------------------------------------------------------------------- diff --git a/src/backend/utils/Makefile b/src/backend/utils/Makefile index 8f71c78d43..0f171d0128 100644 --- a/src/backend/utils/Makefile +++ b/src/backend/utils/Makefile @@ -1,7 +1,7 @@ # # Makefile for utils # -# $PostgreSQL: pgsql/src/backend/utils/Makefile,v 1.29 2010/01/05 01:06:56 tgl Exp $ +# src/backend/utils/Makefile # subdir = src/backend/utils diff --git a/src/backend/utils/adt/Makefile b/src/backend/utils/adt/Makefile index 69dfbbba3b..be272b51d9 100644 --- a/src/backend/utils/adt/Makefile +++ b/src/backend/utils/adt/Makefile @@ -1,7 +1,7 @@ # # Makefile for utils/adt # -# $PostgreSQL: pgsql/src/backend/utils/adt/Makefile,v 1.71 2008/12/28 18:53:59 tgl Exp $ +# src/backend/utils/adt/Makefile # subdir = src/backend/utils/adt diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c index 41b410e2a6..943f914e2b 100644 --- a/src/backend/utils/adt/acl.c +++ b/src/backend/utils/adt/acl.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/acl.c,v 1.158 2010/08/05 14:45:04 rhaas Exp $ + * src/backend/utils/adt/acl.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/array_userfuncs.c b/src/backend/utils/adt/array_userfuncs.c index 0c916149ca..d7ec310f51 100644 --- a/src/backend/utils/adt/array_userfuncs.c +++ b/src/backend/utils/adt/array_userfuncs.c @@ -6,7 +6,7 @@ * Copyright (c) 2003-2010, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/array_userfuncs.c,v 1.36 2010/08/10 21:51:00 tgl Exp $ + * src/backend/utils/adt/array_userfuncs.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c index d8939f2c98..43a2a6b596 100644 --- a/src/backend/utils/adt/arrayfuncs.c +++ b/src/backend/utils/adt/arrayfuncs.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.166 2010/08/21 16:55:51 tgl Exp $ + * src/backend/utils/adt/arrayfuncs.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/arrayutils.c b/src/backend/utils/adt/arrayutils.c index 06e2a28689..f0f49d3530 100644 --- a/src/backend/utils/adt/arrayutils.c +++ b/src/backend/utils/adt/arrayutils.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/arrayutils.c,v 1.28 2010/01/02 16:57:53 momjian Exp $ + * src/backend/utils/adt/arrayutils.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/ascii.c b/src/backend/utils/adt/ascii.c index d7977c1ddc..f161171411 100644 --- a/src/backend/utils/adt/ascii.c +++ b/src/backend/utils/adt/ascii.c @@ -5,7 +5,7 @@ * Portions Copyright (c) 1999-2010, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/ascii.c,v 1.34 2010/01/02 16:57:53 momjian Exp $ + * src/backend/utils/adt/ascii.c * *----------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/bool.c b/src/backend/utils/adt/bool.c index 69321a5ba0..1513a42786 100644 --- a/src/backend/utils/adt/bool.c +++ b/src/backend/utils/adt/bool.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/bool.c,v 1.49 2010/01/02 16:57:53 momjian Exp $ + * src/backend/utils/adt/bool.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/cash.c b/src/backend/utils/adt/cash.c index c33c7cdaae..67f51280c3 100644 --- a/src/backend/utils/adt/cash.c +++ b/src/backend/utils/adt/cash.c @@ -13,7 +13,7 @@ * this version handles 64 bit numbers and so can hold values up to * $92,233,720,368,547,758.07. * - * $PostgreSQL: pgsql/src/backend/utils/adt/cash.c,v 1.83 2010/07/16 02:15:53 tgl Exp $ + * src/backend/utils/adt/cash.c */ #include "postgres.h" diff --git a/src/backend/utils/adt/char.c b/src/backend/utils/adt/char.c index 65369c4680..4680cff812 100644 --- a/src/backend/utils/adt/char.c +++ b/src/backend/utils/adt/char.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/char.c,v 1.50 2010/01/02 16:57:53 momjian Exp $ + * src/backend/utils/adt/char.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/date.c b/src/backend/utils/adt/date.c index b5dfe08c9b..014294f137 100644 --- a/src/backend/utils/adt/date.c +++ b/src/backend/utils/adt/date.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/date.c,v 1.152 2010/02/26 02:01:07 momjian Exp $ + * src/backend/utils/adt/date.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c index 713a87df3c..b75ca09c63 100644 --- a/src/backend/utils/adt/datetime.c +++ b/src/backend/utils/adt/datetime.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.213 2010/08/02 01:24:53 tgl Exp $ + * src/backend/utils/adt/datetime.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/datum.c b/src/backend/utils/adt/datum.c index 5087ca4cc6..580f9fb9d3 100644 --- a/src/backend/utils/adt/datum.c +++ b/src/backend/utils/adt/datum.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/datum.c,v 1.38 2010/01/02 16:57:53 momjian Exp $ + * src/backend/utils/adt/datum.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/dbsize.c b/src/backend/utils/adt/dbsize.c index 01a4a17915..f5250a263c 100644 --- a/src/backend/utils/adt/dbsize.c +++ b/src/backend/utils/adt/dbsize.c @@ -5,7 +5,7 @@ * Copyright (c) 2002-2010, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/dbsize.c,v 1.33 2010/08/13 20:10:52 rhaas Exp $ + * src/backend/utils/adt/dbsize.c * */ diff --git a/src/backend/utils/adt/domains.c b/src/backend/utils/adt/domains.c index 97b047686f..c0317e7371 100644 --- a/src/backend/utils/adt/domains.c +++ b/src/backend/utils/adt/domains.c @@ -25,7 +25,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/domains.c,v 1.11 2010/02/26 02:01:07 momjian Exp $ + * src/backend/utils/adt/domains.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/encode.c b/src/backend/utils/adt/encode.c index 153d5d81ec..549ea36fab 100644 --- a/src/backend/utils/adt/encode.c +++ b/src/backend/utils/adt/encode.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/encode.c,v 1.26 2010/01/02 16:57:53 momjian Exp $ + * src/backend/utils/adt/encode.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/enum.c b/src/backend/utils/adt/enum.c index 9000d1ca16..e5747a46bc 100644 --- a/src/backend/utils/adt/enum.c +++ b/src/backend/utils/adt/enum.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/enum.c,v 1.11 2010/02/26 02:01:08 momjian Exp $ + * src/backend/utils/adt/enum.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/float.c b/src/backend/utils/adt/float.c index f396b1d1cc..b2a5b6c3df 100644 --- a/src/backend/utils/adt/float.c +++ b/src/backend/utils/adt/float.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/float.c,v 1.166 2010/02/27 21:53:21 tgl Exp $ + * src/backend/utils/adt/float.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/format_type.c b/src/backend/utils/adt/format_type.c index 2de07693af..8fd551ef84 100644 --- a/src/backend/utils/adt/format_type.c +++ b/src/backend/utils/adt/format_type.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/format_type.c,v 1.54 2010/07/30 04:30:23 rhaas Exp $ + * src/backend/utils/adt/format_type.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/formatting.c b/src/backend/utils/adt/formatting.c index 08ddab214d..fc0bf439fa 100644 --- a/src/backend/utils/adt/formatting.c +++ b/src/backend/utils/adt/formatting.c @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- * formatting.c * - * $PostgreSQL: pgsql/src/backend/utils/adt/formatting.c,v 1.171 2010/07/06 19:18:58 momjian Exp $ + * src/backend/utils/adt/formatting.c * * * Portions Copyright (c) 1999-2010, PostgreSQL Global Development Group diff --git a/src/backend/utils/adt/genfile.c b/src/backend/utils/adt/genfile.c index 863727dc01..e8a36edcd4 100644 --- a/src/backend/utils/adt/genfile.c +++ b/src/backend/utils/adt/genfile.c @@ -9,7 +9,7 @@ * Author: Andreas Pflug * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/genfile.c,v 1.23 2010/01/05 01:29:36 itagaki Exp $ + * src/backend/utils/adt/genfile.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/geo_ops.c b/src/backend/utils/adt/geo_ops.c index 3eef2f47da..f3b6a389ff 100644 --- a/src/backend/utils/adt/geo_ops.c +++ b/src/backend/utils/adt/geo_ops.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/geo_ops.c,v 1.109 2010/08/03 21:21:03 tgl Exp $ + * src/backend/utils/adt/geo_ops.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/geo_selfuncs.c b/src/backend/utils/adt/geo_selfuncs.c index 18bca94903..d21ebff98c 100644 --- a/src/backend/utils/adt/geo_selfuncs.c +++ b/src/backend/utils/adt/geo_selfuncs.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/geo_selfuncs.c,v 1.33 2010/01/02 16:57:54 momjian Exp $ + * src/backend/utils/adt/geo_selfuncs.c * * XXX These are totally bogus. Perhaps someone will make them do * something reasonable, someday. diff --git a/src/backend/utils/adt/inet_net_ntop.c b/src/backend/utils/adt/inet_net_ntop.c index 95b9cc9a24..3d7fb65889 100644 --- a/src/backend/utils/adt/inet_net_ntop.c +++ b/src/backend/utils/adt/inet_net_ntop.c @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $PostgreSQL: pgsql/src/backend/utils/adt/inet_net_ntop.c,v 1.24 2006/07/14 16:59:19 tgl Exp $ + * src/backend/utils/adt/inet_net_ntop.c */ #if defined(LIBC_SCCS) && !defined(lint) diff --git a/src/backend/utils/adt/inet_net_pton.c b/src/backend/utils/adt/inet_net_pton.c index 1fe837f0c6..1d32d2f04f 100644 --- a/src/backend/utils/adt/inet_net_pton.c +++ b/src/backend/utils/adt/inet_net_pton.c @@ -14,7 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $PostgreSQL: pgsql/src/backend/utils/adt/inet_net_pton.c,v 1.23 2006/07/14 16:59:19 tgl Exp $ + * src/backend/utils/adt/inet_net_pton.c */ #if defined(LIBC_SCCS) && !defined(lint) diff --git a/src/backend/utils/adt/int.c b/src/backend/utils/adt/int.c index ab8476b68a..c4503332f6 100644 --- a/src/backend/utils/adt/int.c +++ b/src/backend/utils/adt/int.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/int.c,v 1.89 2010/02/26 02:01:08 momjian Exp $ + * src/backend/utils/adt/int.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/int8.c b/src/backend/utils/adt/int8.c index 78bd5fb2b8..894110d7a2 100644 --- a/src/backend/utils/adt/int8.c +++ b/src/backend/utils/adt/int8.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/int8.c,v 1.79 2010/02/26 02:01:08 momjian Exp $ + * src/backend/utils/adt/int8.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/like.c b/src/backend/utils/adt/like.c index d3fee69864..57687fb015 100644 --- a/src/backend/utils/adt/like.c +++ b/src/backend/utils/adt/like.c @@ -11,7 +11,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/like.c,v 1.75 2010/01/02 16:57:54 momjian Exp $ + * src/backend/utils/adt/like.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/like_match.c b/src/backend/utils/adt/like_match.c index 4f762b85c3..e464695ec7 100644 --- a/src/backend/utils/adt/like_match.c +++ b/src/backend/utils/adt/like_match.c @@ -19,7 +19,7 @@ * Copyright (c) 1996-2010, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/like_match.c,v 1.30 2010/07/06 19:18:58 momjian Exp $ + * src/backend/utils/adt/like_match.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/lockfuncs.c b/src/backend/utils/adt/lockfuncs.c index c72c4c1eeb..3eba7fb0cf 100644 --- a/src/backend/utils/adt/lockfuncs.c +++ b/src/backend/utils/adt/lockfuncs.c @@ -6,7 +6,7 @@ * Copyright (c) 2002-2010, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/lockfuncs.c,v 1.37 2010/01/02 16:57:54 momjian Exp $ + * src/backend/utils/adt/lockfuncs.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/mac.c b/src/backend/utils/adt/mac.c index aa13589b8a..333f4bca46 100644 --- a/src/backend/utils/adt/mac.c +++ b/src/backend/utils/adt/mac.c @@ -1,7 +1,7 @@ /* * PostgreSQL type definitions for MAC addresses. * - * $PostgreSQL: pgsql/src/backend/utils/adt/mac.c,v 1.38 2007/06/05 21:31:06 tgl Exp $ + * src/backend/utils/adt/mac.c */ #include "postgres.h" diff --git a/src/backend/utils/adt/misc.c b/src/backend/utils/adt/misc.c index 66c8598d17..fb968eafd1 100644 --- a/src/backend/utils/adt/misc.c +++ b/src/backend/utils/adt/misc.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/misc.c,v 1.75 2010/02/26 02:01:09 momjian Exp $ + * src/backend/utils/adt/misc.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/nabstime.c b/src/backend/utils/adt/nabstime.c index 30730f7b09..8870e89495 100644 --- a/src/backend/utils/adt/nabstime.c +++ b/src/backend/utils/adt/nabstime.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/nabstime.c,v 1.165 2010/08/03 16:31:02 tgl Exp $ + * src/backend/utils/adt/nabstime.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/name.c b/src/backend/utils/adt/name.c index 736e26ddb4..c48db15c29 100644 --- a/src/backend/utils/adt/name.c +++ b/src/backend/utils/adt/name.c @@ -14,7 +14,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/name.c,v 1.65 2010/01/02 16:57:54 momjian Exp $ + * src/backend/utils/adt/name.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/network.c b/src/backend/utils/adt/network.c index 0ea13fc47b..8cac11134c 100644 --- a/src/backend/utils/adt/network.c +++ b/src/backend/utils/adt/network.c @@ -1,7 +1,7 @@ /* * PostgreSQL type definitions for the INET and CIDR types. * - * $PostgreSQL: pgsql/src/backend/utils/adt/network.c,v 1.75 2009/10/08 04:46:21 heikki Exp $ + * src/backend/utils/adt/network.c * * Jon Postel RIP 16 Oct 1998 */ diff --git a/src/backend/utils/adt/numeric.c b/src/backend/utils/adt/numeric.c index 0b2a1b1673..9ae6492982 100644 --- a/src/backend/utils/adt/numeric.c +++ b/src/backend/utils/adt/numeric.c @@ -14,7 +14,7 @@ * Copyright (c) 1998-2010, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/numeric.c,v 1.126 2010/08/04 17:33:09 rhaas Exp $ + * src/backend/utils/adt/numeric.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/numutils.c b/src/backend/utils/adt/numutils.c index a1377d5f70..5f8083f0c5 100644 --- a/src/backend/utils/adt/numutils.c +++ b/src/backend/utils/adt/numutils.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/numutils.c,v 1.78 2010/01/02 16:57:54 momjian Exp $ + * src/backend/utils/adt/numutils.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/oid.c b/src/backend/utils/adt/oid.c index e237178122..09d0b32a34 100644 --- a/src/backend/utils/adt/oid.c +++ b/src/backend/utils/adt/oid.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/oid.c,v 1.78 2010/07/06 19:18:58 momjian Exp $ + * src/backend/utils/adt/oid.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/oracle_compat.c b/src/backend/utils/adt/oracle_compat.c index 4d1ad1bb37..90d2b8a824 100644 --- a/src/backend/utils/adt/oracle_compat.c +++ b/src/backend/utils/adt/oracle_compat.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/oracle_compat.c,v 1.85 2010/01/02 16:57:54 momjian Exp $ + * src/backend/utils/adt/oracle_compat.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/pg_locale.c b/src/backend/utils/adt/pg_locale.c index 2006d022fa..20214365ef 100644 --- a/src/backend/utils/adt/pg_locale.c +++ b/src/backend/utils/adt/pg_locale.c @@ -4,7 +4,7 @@ * * Portions Copyright (c) 2002-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/backend/utils/adt/pg_locale.c,v 1.57 2010/07/06 19:18:58 momjian Exp $ + * src/backend/utils/adt/pg_locale.c * *----------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/pg_lzcompress.c b/src/backend/utils/adt/pg_lzcompress.c index 6e12469ee9..8b1e636396 100644 --- a/src/backend/utils/adt/pg_lzcompress.c +++ b/src/backend/utils/adt/pg_lzcompress.c @@ -166,7 +166,7 @@ * * Copyright (c) 1999-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/backend/utils/adt/pg_lzcompress.c,v 1.35 2010/01/02 16:57:54 momjian Exp $ + * src/backend/utils/adt/pg_lzcompress.c * ---------- */ #include "postgres.h" diff --git a/src/backend/utils/adt/pgstatfuncs.c b/src/backend/utils/adt/pgstatfuncs.c index 9432fc86c6..6edb8bfd13 100644 --- a/src/backend/utils/adt/pgstatfuncs.c +++ b/src/backend/utils/adt/pgstatfuncs.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/pgstatfuncs.c,v 1.62 2010/08/21 10:59:17 mha Exp $ + * src/backend/utils/adt/pgstatfuncs.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/pseudotypes.c b/src/backend/utils/adt/pseudotypes.c index 8986e06904..dd12592473 100644 --- a/src/backend/utils/adt/pseudotypes.c +++ b/src/backend/utils/adt/pseudotypes.c @@ -16,7 +16,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/pseudotypes.c,v 1.24 2010/09/03 01:34:55 tgl Exp $ + * src/backend/utils/adt/pseudotypes.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/quote.c b/src/backend/utils/adt/quote.c index cdbab8dcbb..70e98cad84 100644 --- a/src/backend/utils/adt/quote.c +++ b/src/backend/utils/adt/quote.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/quote.c,v 1.28 2010/01/02 16:57:55 momjian Exp $ + * src/backend/utils/adt/quote.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/regexp.c b/src/backend/utils/adt/regexp.c index cbffcdb183..4e2a953cdc 100644 --- a/src/backend/utils/adt/regexp.c +++ b/src/backend/utils/adt/regexp.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/regexp.c,v 1.86 2010/01/02 20:59:16 tgl Exp $ + * src/backend/utils/adt/regexp.c * * Alistair Crooks added the code for the regex caching * agc - cached the regular expressions used - there's a good chance diff --git a/src/backend/utils/adt/regproc.c b/src/backend/utils/adt/regproc.c index 0594c3c869..ce3d39d9df 100644 --- a/src/backend/utils/adt/regproc.c +++ b/src/backend/utils/adt/regproc.c @@ -13,7 +13,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/regproc.c,v 1.114 2010/08/05 15:25:35 rhaas Exp $ + * src/backend/utils/adt/regproc.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/ri_triggers.c b/src/backend/utils/adt/ri_triggers.c index 60ae41dc0a..33a8935932 100644 --- a/src/backend/utils/adt/ri_triggers.c +++ b/src/backend/utils/adt/ri_triggers.c @@ -15,7 +15,7 @@ * * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/backend/utils/adt/ri_triggers.c,v 1.121 2010/09/11 18:38:56 joe Exp $ + * src/backend/utils/adt/ri_triggers.c * * ---------- */ diff --git a/src/backend/utils/adt/rowtypes.c b/src/backend/utils/adt/rowtypes.c index 50a5419128..429153a41b 100644 --- a/src/backend/utils/adt/rowtypes.c +++ b/src/backend/utils/adt/rowtypes.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/rowtypes.c,v 1.28 2010/02/26 02:01:09 momjian Exp $ + * src/backend/utils/adt/rowtypes.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c index df5b08480a..578b9ce2b7 100644 --- a/src/backend/utils/adt/ruleutils.c +++ b/src/backend/utils/adt/ruleutils.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/ruleutils.c,v 1.332 2010/08/14 14:20:35 tgl Exp $ + * src/backend/utils/adt/ruleutils.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c index 5925a91373..34369e5aae 100644 --- a/src/backend/utils/adt/selfuncs.c +++ b/src/backend/utils/adt/selfuncs.c @@ -15,7 +15,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/selfuncs.c,v 1.270 2010/02/26 02:01:10 momjian Exp $ + * src/backend/utils/adt/selfuncs.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/tid.c b/src/backend/utils/adt/tid.c index 8c18a26547..49c9b5339a 100644 --- a/src/backend/utils/adt/tid.c +++ b/src/backend/utils/adt/tid.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/tid.c,v 1.64 2010/01/02 16:57:55 momjian Exp $ + * src/backend/utils/adt/tid.c * * NOTES * input routine largely stolen from boxin(). diff --git a/src/backend/utils/adt/timestamp.c b/src/backend/utils/adt/timestamp.c index a0c5a6ab66..c6e1d13183 100644 --- a/src/backend/utils/adt/timestamp.c +++ b/src/backend/utils/adt/timestamp.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/timestamp.c,v 1.206 2010/02/26 02:01:10 momjian Exp $ + * src/backend/utils/adt/timestamp.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/trigfuncs.c b/src/backend/utils/adt/trigfuncs.c index d831b60178..ec0db88c6a 100644 --- a/src/backend/utils/adt/trigfuncs.c +++ b/src/backend/utils/adt/trigfuncs.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/utils/adt/trigfuncs.c,v 1.8 2010/01/02 16:57:55 momjian Exp $ + * src/backend/utils/adt/trigfuncs.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/tsginidx.c b/src/backend/utils/adt/tsginidx.c index 519858cb11..f5533928ef 100644 --- a/src/backend/utils/adt/tsginidx.c +++ b/src/backend/utils/adt/tsginidx.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/tsginidx.c,v 1.18 2010/01/02 16:57:55 momjian Exp $ + * src/backend/utils/adt/tsginidx.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/tsgistidx.c b/src/backend/utils/adt/tsgistidx.c index 0c19c55399..6270094c51 100644 --- a/src/backend/utils/adt/tsgistidx.c +++ b/src/backend/utils/adt/tsgistidx.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/tsgistidx.c,v 1.12 2010/01/02 16:57:55 momjian Exp $ + * src/backend/utils/adt/tsgistidx.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/tsquery.c b/src/backend/utils/adt/tsquery.c index c419e86ced..db9236a474 100644 --- a/src/backend/utils/adt/tsquery.c +++ b/src/backend/utils/adt/tsquery.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/tsquery.c,v 1.22 2010/01/02 16:57:55 momjian Exp $ + * src/backend/utils/adt/tsquery.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/tsquery_cleanup.c b/src/backend/utils/adt/tsquery_cleanup.c index 2ffa241cf8..c38471026b 100644 --- a/src/backend/utils/adt/tsquery_cleanup.c +++ b/src/backend/utils/adt/tsquery_cleanup.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/tsquery_cleanup.c,v 1.13 2010/01/02 16:57:55 momjian Exp $ + * src/backend/utils/adt/tsquery_cleanup.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/tsquery_gist.c b/src/backend/utils/adt/tsquery_gist.c index 1f9f41e855..849ba6d82e 100644 --- a/src/backend/utils/adt/tsquery_gist.c +++ b/src/backend/utils/adt/tsquery_gist.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/tsquery_gist.c,v 1.10 2010/01/02 16:57:55 momjian Exp $ + * src/backend/utils/adt/tsquery_gist.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/tsquery_op.c b/src/backend/utils/adt/tsquery_op.c index 03edc7b172..80c794da48 100644 --- a/src/backend/utils/adt/tsquery_op.c +++ b/src/backend/utils/adt/tsquery_op.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/tsquery_op.c,v 1.10 2010/08/03 01:50:26 tgl Exp $ + * src/backend/utils/adt/tsquery_op.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/tsquery_rewrite.c b/src/backend/utils/adt/tsquery_rewrite.c index adebf3632f..9a56732643 100644 --- a/src/backend/utils/adt/tsquery_rewrite.c +++ b/src/backend/utils/adt/tsquery_rewrite.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/tsquery_rewrite.c,v 1.17 2010/01/02 16:57:55 momjian Exp $ + * src/backend/utils/adt/tsquery_rewrite.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/tsquery_util.c b/src/backend/utils/adt/tsquery_util.c index 80e169e430..3aa19aa77d 100644 --- a/src/backend/utils/adt/tsquery_util.c +++ b/src/backend/utils/adt/tsquery_util.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/tsquery_util.c,v 1.15 2010/08/03 01:50:27 tgl Exp $ + * src/backend/utils/adt/tsquery_util.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/tsrank.c b/src/backend/utils/adt/tsrank.c index f57e06b9ca..d61bcdd426 100644 --- a/src/backend/utils/adt/tsrank.c +++ b/src/backend/utils/adt/tsrank.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/tsrank.c,v 1.17 2010/01/02 16:57:55 momjian Exp $ + * src/backend/utils/adt/tsrank.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/tsvector.c b/src/backend/utils/adt/tsvector.c index 15192a484b..4562aaf063 100644 --- a/src/backend/utils/adt/tsvector.c +++ b/src/backend/utils/adt/tsvector.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/tsvector.c,v 1.19 2010/01/02 16:57:55 momjian Exp $ + * src/backend/utils/adt/tsvector.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/tsvector_op.c b/src/backend/utils/adt/tsvector_op.c index 4f51cf1436..399fee85af 100644 --- a/src/backend/utils/adt/tsvector_op.c +++ b/src/backend/utils/adt/tsvector_op.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/tsvector_op.c,v 1.27 2010/08/05 15:25:35 rhaas Exp $ + * src/backend/utils/adt/tsvector_op.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/tsvector_parser.c b/src/backend/utils/adt/tsvector_parser.c index 223b1eadea..c2494c5894 100644 --- a/src/backend/utils/adt/tsvector_parser.c +++ b/src/backend/utils/adt/tsvector_parser.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/tsvector_parser.c,v 1.8 2010/01/02 16:57:55 momjian Exp $ + * src/backend/utils/adt/tsvector_parser.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/txid.c b/src/backend/utils/adt/txid.c index db7ecd14b2..c3d35c944c 100644 --- a/src/backend/utils/adt/txid.c +++ b/src/backend/utils/adt/txid.c @@ -14,7 +14,7 @@ * Author: Jan Wieck, Afilias USA INC. * 64-bit txids: Marko Kreen, Skype Technologies * - * $PostgreSQL: pgsql/src/backend/utils/adt/txid.c,v 1.13 2010/02/26 02:01:10 momjian Exp $ + * src/backend/utils/adt/txid.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/uuid.c b/src/backend/utils/adt/uuid.c index cf080862a3..4ff95ecc8e 100644 --- a/src/backend/utils/adt/uuid.c +++ b/src/backend/utils/adt/uuid.c @@ -6,7 +6,7 @@ * Copyright (c) 2007-2010, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/uuid.c,v 1.12 2010/01/02 16:57:55 momjian Exp $ + * src/backend/utils/adt/uuid.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/varbit.c b/src/backend/utils/adt/varbit.c index d0cd0eba90..73e2a05845 100644 --- a/src/backend/utils/adt/varbit.c +++ b/src/backend/utils/adt/varbit.c @@ -9,7 +9,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/varbit.c,v 1.65 2010/02/26 02:01:10 momjian Exp $ + * src/backend/utils/adt/varbit.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/varchar.c b/src/backend/utils/adt/varchar.c index dd3fdea7a4..34acfb3618 100644 --- a/src/backend/utils/adt/varchar.c +++ b/src/backend/utils/adt/varchar.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/varchar.c,v 1.133 2010/01/02 16:57:55 momjian Exp $ + * src/backend/utils/adt/varchar.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c index cf62dd1b57..363fd3ce49 100644 --- a/src/backend/utils/adt/varlena.c +++ b/src/backend/utils/adt/varlena.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/varlena.c,v 1.180 2010/08/24 06:30:43 itagaki Exp $ + * src/backend/utils/adt/varlena.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/version.c b/src/backend/utils/adt/version.c index 9329731221..27394199e9 100644 --- a/src/backend/utils/adt/version.c +++ b/src/backend/utils/adt/version.c @@ -7,7 +7,7 @@ * * IDENTIFICATION * - * $PostgreSQL: pgsql/src/backend/utils/adt/version.c,v 1.19 2010/01/02 16:57:55 momjian Exp $ + * src/backend/utils/adt/version.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/windowfuncs.c b/src/backend/utils/adt/windowfuncs.c index 089ae050cf..96fa82e3be 100644 --- a/src/backend/utils/adt/windowfuncs.c +++ b/src/backend/utils/adt/windowfuncs.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/windowfuncs.c,v 1.4 2010/01/02 16:57:55 momjian Exp $ + * src/backend/utils/adt/windowfuncs.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/xid.c b/src/backend/utils/adt/xid.c index fcde92cb8a..1231ecd33d 100644 --- a/src/backend/utils/adt/xid.c +++ b/src/backend/utils/adt/xid.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/xid.c,v 1.14 2010/01/02 16:57:55 momjian Exp $ + * src/backend/utils/adt/xid.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/adt/xml.c b/src/backend/utils/adt/xml.c index 756390530a..cf2033249b 100644 --- a/src/backend/utils/adt/xml.c +++ b/src/backend/utils/adt/xml.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/utils/adt/xml.c,v 1.101 2010/08/13 18:36:24 tgl Exp $ + * src/backend/utils/adt/xml.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/cache/Makefile b/src/backend/utils/cache/Makefile index d1caf8e4ae..a1a539383b 100644 --- a/src/backend/utils/cache/Makefile +++ b/src/backend/utils/cache/Makefile @@ -4,7 +4,7 @@ # Makefile for utils/cache # # IDENTIFICATION -# $PostgreSQL: pgsql/src/backend/utils/cache/Makefile,v 1.26 2010/02/07 20:48:10 tgl Exp $ +# src/backend/utils/cache/Makefile # #------------------------------------------------------------------------- diff --git a/src/backend/utils/cache/attoptcache.c b/src/backend/utils/cache/attoptcache.c index 335688606b..56c1a37055 100644 --- a/src/backend/utils/cache/attoptcache.c +++ b/src/backend/utils/cache/attoptcache.c @@ -10,7 +10,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/cache/attoptcache.c,v 1.3 2010/02/26 02:01:11 momjian Exp $ + * src/backend/utils/cache/attoptcache.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c index da89c8a7e4..c24e6b351d 100644 --- a/src/backend/utils/cache/catcache.c +++ b/src/backend/utils/cache/catcache.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/cache/catcache.c,v 1.153 2010/07/06 19:18:58 momjian Exp $ + * src/backend/utils/cache/catcache.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/cache/inval.c b/src/backend/utils/cache/inval.c index 1490483922..c9d68e71ac 100644 --- a/src/backend/utils/cache/inval.c +++ b/src/backend/utils/cache/inval.c @@ -80,7 +80,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/cache/inval.c,v 1.99 2010/08/13 20:10:52 rhaas Exp $ + * src/backend/utils/cache/inval.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/cache/lsyscache.c b/src/backend/utils/cache/lsyscache.c index 85093b3e4a..6fae618293 100644 --- a/src/backend/utils/cache/lsyscache.c +++ b/src/backend/utils/cache/lsyscache.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/cache/lsyscache.c,v 1.172 2010/08/05 14:45:05 rhaas Exp $ + * src/backend/utils/cache/lsyscache.c * * NOTES * Eventually, the index information should go through here, too. diff --git a/src/backend/utils/cache/plancache.c b/src/backend/utils/cache/plancache.c index 339c8c2c85..491d05ab77 100644 --- a/src/backend/utils/cache/plancache.c +++ b/src/backend/utils/cache/plancache.c @@ -35,7 +35,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/cache/plancache.c,v 1.36 2010/08/13 16:27:11 tgl Exp $ + * src/backend/utils/cache/plancache.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c index 8ad11417c4..2a44303630 100644 --- a/src/backend/utils/cache/relcache.c +++ b/src/backend/utils/cache/relcache.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/cache/relcache.c,v 1.313 2010/09/02 03:16:45 tgl Exp $ + * src/backend/utils/cache/relcache.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/cache/relmapper.c b/src/backend/utils/cache/relmapper.c index 0320da113b..6367c6bbac 100644 --- a/src/backend/utils/cache/relmapper.c +++ b/src/backend/utils/cache/relmapper.c @@ -33,7 +33,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/cache/relmapper.c,v 1.3 2010/02/26 02:01:12 momjian Exp $ + * src/backend/utils/cache/relmapper.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/cache/spccache.c b/src/backend/utils/cache/spccache.c index 3eaafe898c..a269351b25 100644 --- a/src/backend/utils/cache/spccache.c +++ b/src/backend/utils/cache/spccache.c @@ -12,7 +12,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/cache/spccache.c,v 1.6 2010/02/26 02:01:12 momjian Exp $ + * src/backend/utils/cache/spccache.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/cache/syscache.c b/src/backend/utils/cache/syscache.c index a887b92048..94bef7dd01 100644 --- a/src/backend/utils/cache/syscache.c +++ b/src/backend/utils/cache/syscache.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/cache/syscache.c,v 1.127 2010/08/06 03:46:23 rhaas Exp $ + * src/backend/utils/cache/syscache.c * * NOTES * These routines allow the parser/planner/executor to perform diff --git a/src/backend/utils/cache/ts_cache.c b/src/backend/utils/cache/ts_cache.c index a58d3bfce7..2956644554 100644 --- a/src/backend/utils/cache/ts_cache.c +++ b/src/backend/utils/cache/ts_cache.c @@ -20,7 +20,7 @@ * Copyright (c) 2006-2010, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/cache/ts_cache.c,v 1.13 2010/08/05 15:25:35 rhaas Exp $ + * src/backend/utils/cache/ts_cache.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/cache/typcache.c b/src/backend/utils/cache/typcache.c index 8d0d753a3e..2009614489 100644 --- a/src/backend/utils/cache/typcache.c +++ b/src/backend/utils/cache/typcache.c @@ -36,7 +36,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/cache/typcache.c,v 1.33 2010/09/02 03:16:46 tgl Exp $ + * src/backend/utils/cache/typcache.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/error/Makefile b/src/backend/utils/error/Makefile index b5435b578e..4c313b7f92 100644 --- a/src/backend/utils/error/Makefile +++ b/src/backend/utils/error/Makefile @@ -4,7 +4,7 @@ # Makefile for utils/error # # IDENTIFICATION -# $PostgreSQL: pgsql/src/backend/utils/error/Makefile,v 1.13 2008/02/19 10:30:08 petere Exp $ +# src/backend/utils/error/Makefile # #------------------------------------------------------------------------- diff --git a/src/backend/utils/error/assert.c b/src/backend/utils/error/assert.c index 454db55f7d..2222872da6 100644 --- a/src/backend/utils/error/assert.c +++ b/src/backend/utils/error/assert.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/error/assert.c,v 1.37 2010/01/02 16:57:56 momjian Exp $ + * src/backend/utils/error/assert.c * * NOTE * This should eventually work with elog() diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c index 181db7e451..e321b99249 100644 --- a/src/backend/utils/error/elog.c +++ b/src/backend/utils/error/elog.c @@ -42,7 +42,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.226 2010/08/19 22:55:01 tgl Exp $ + * src/backend/utils/error/elog.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/fmgr/Makefile b/src/backend/utils/fmgr/Makefile index ea98626a3e..094767a029 100644 --- a/src/backend/utils/fmgr/Makefile +++ b/src/backend/utils/fmgr/Makefile @@ -4,7 +4,7 @@ # Makefile for utils/fmgr # # IDENTIFICATION -# $PostgreSQL: pgsql/src/backend/utils/fmgr/Makefile,v 1.18 2008/02/19 10:30:08 petere Exp $ +# src/backend/utils/fmgr/Makefile # #------------------------------------------------------------------------- diff --git a/src/backend/utils/fmgr/README b/src/backend/utils/fmgr/README index c2624ee475..72695fe197 100644 --- a/src/backend/utils/fmgr/README +++ b/src/backend/utils/fmgr/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/backend/utils/fmgr/README,v 1.16 2008/10/31 19:37:56 tgl Exp $ +src/backend/utils/fmgr/README Function Manager ================ diff --git a/src/backend/utils/fmgr/dfmgr.c b/src/backend/utils/fmgr/dfmgr.c index c51d3d0222..566ac46bd7 100644 --- a/src/backend/utils/fmgr/dfmgr.c +++ b/src/backend/utils/fmgr/dfmgr.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.102 2010/02/26 02:01:13 momjian Exp $ + * src/backend/utils/fmgr/dfmgr.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/fmgr/fmgr.c b/src/backend/utils/fmgr/fmgr.c index 04f91f1cea..a4b7e4aa78 100644 --- a/src/backend/utils/fmgr/fmgr.c +++ b/src/backend/utils/fmgr/fmgr.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/fmgr/fmgr.c,v 1.131 2010/02/26 02:01:13 momjian Exp $ + * src/backend/utils/fmgr/fmgr.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/fmgr/funcapi.c b/src/backend/utils/fmgr/funcapi.c index d946aabbb5..53a884e8f1 100644 --- a/src/backend/utils/fmgr/funcapi.c +++ b/src/backend/utils/fmgr/funcapi.c @@ -7,7 +7,7 @@ * Copyright (c) 2002-2010, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/fmgr/funcapi.c,v 1.49 2010/02/26 02:01:13 momjian Exp $ + * src/backend/utils/fmgr/funcapi.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/hash/Makefile b/src/backend/utils/hash/Makefile index 3f6233912e..64eebd1d99 100644 --- a/src/backend/utils/hash/Makefile +++ b/src/backend/utils/hash/Makefile @@ -4,7 +4,7 @@ # Makefile for utils/hash # # IDENTIFICATION -# $PostgreSQL: pgsql/src/backend/utils/hash/Makefile,v 1.13 2008/02/19 10:30:08 petere Exp $ +# src/backend/utils/hash/Makefile # #------------------------------------------------------------------------- diff --git a/src/backend/utils/hash/dynahash.c b/src/backend/utils/hash/dynahash.c index 21f94f5473..b3cdbe82b9 100644 --- a/src/backend/utils/hash/dynahash.c +++ b/src/backend/utils/hash/dynahash.c @@ -26,7 +26,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/hash/dynahash.c,v 1.80 2010/01/02 16:57:56 momjian Exp $ + * src/backend/utils/hash/dynahash.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/hash/hashfn.c b/src/backend/utils/hash/hashfn.c index 027d0605a3..a9d8359c4e 100644 --- a/src/backend/utils/hash/hashfn.c +++ b/src/backend/utils/hash/hashfn.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/hash/hashfn.c,v 1.34 2010/01/02 16:57:56 momjian Exp $ + * src/backend/utils/hash/hashfn.c * * NOTES * It is expected that every bit of a hash function's 32-bit result is diff --git a/src/backend/utils/hash/pg_crc.c b/src/backend/utils/hash/pg_crc.c index 0777faab4e..5ac19ddc6f 100644 --- a/src/backend/utils/hash/pg_crc.c +++ b/src/backend/utils/hash/pg_crc.c @@ -19,7 +19,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/hash/pg_crc.c,v 1.24 2010/02/26 02:01:13 momjian Exp $ + * src/backend/utils/hash/pg_crc.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/init/Makefile b/src/backend/utils/init/Makefile index 24a9ae804f..a2928c7f35 100644 --- a/src/backend/utils/init/Makefile +++ b/src/backend/utils/init/Makefile @@ -4,7 +4,7 @@ # Makefile for utils/init # # IDENTIFICATION -# $PostgreSQL: pgsql/src/backend/utils/init/Makefile,v 1.23 2009/09/01 02:54:51 alvherre Exp $ +# src/backend/utils/init/Makefile # #------------------------------------------------------------------------- diff --git a/src/backend/utils/init/globals.c b/src/backend/utils/init/globals.c index a9d61f380a..9aa2c0a498 100644 --- a/src/backend/utils/init/globals.c +++ b/src/backend/utils/init/globals.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/init/globals.c,v 1.111 2010/01/02 16:57:56 momjian Exp $ + * src/backend/utils/init/globals.c * * NOTES * Globals used all over the place should be declared here and not diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c index 973f584067..14ed9147a1 100644 --- a/src/backend/utils/init/miscinit.c +++ b/src/backend/utils/init/miscinit.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/init/miscinit.c,v 1.185 2010/08/16 17:32:46 tgl Exp $ + * src/backend/utils/init/miscinit.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c index 0000d2e070..db06cda46e 100644 --- a/src/backend/utils/init/postinit.c +++ b/src/backend/utils/init/postinit.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/init/postinit.c,v 1.214 2010/09/13 09:00:30 heikki Exp $ + * src/backend/utils/init/postinit.c * * *------------------------------------------------------------------------- diff --git a/src/backend/utils/mb/Makefile b/src/backend/utils/mb/Makefile index 62aeff6feb..89bec21bd0 100644 --- a/src/backend/utils/mb/Makefile +++ b/src/backend/utils/mb/Makefile @@ -4,7 +4,7 @@ # Makefile for utils/mb # # IDENTIFICATION -# $PostgreSQL: pgsql/src/backend/utils/mb/Makefile,v 1.24 2008/02/19 10:30:09 petere Exp $ +# src/backend/utils/mb/Makefile # #------------------------------------------------------------------------- diff --git a/src/backend/utils/mb/README b/src/backend/utils/mb/README index ffb73efbe9..c9bc6e6f8d 100644 --- a/src/backend/utils/mb/README +++ b/src/backend/utils/mb/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/backend/utils/mb/README,v 1.8 2008/06/17 18:22:43 momjian Exp $ +src/backend/utils/mb/README Encodings ========= diff --git a/src/backend/utils/mb/Unicode/Makefile b/src/backend/utils/mb/Unicode/Makefile index d0f1aaacab..a6cbd72510 100644 --- a/src/backend/utils/mb/Unicode/Makefile +++ b/src/backend/utils/mb/Unicode/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 2001-2010, PostgreSQL Global Development Group # -# $PostgreSQL: pgsql/src/backend/utils/mb/Unicode/Makefile,v 1.17 2010/01/02 16:57:56 momjian Exp $ +# src/backend/utils/mb/Unicode/Makefile # #------------------------------------------------------------------------- diff --git a/src/backend/utils/mb/Unicode/UCS_to_BIG5.pl b/src/backend/utils/mb/Unicode/UCS_to_BIG5.pl index b9f3c49c71..7582767a79 100755 --- a/src/backend/utils/mb/Unicode/UCS_to_BIG5.pl +++ b/src/backend/utils/mb/Unicode/UCS_to_BIG5.pl @@ -2,7 +2,7 @@ # # Copyright (c) 2001-2010, PostgreSQL Global Development Group # -# $PostgreSQL: pgsql/src/backend/utils/mb/Unicode/UCS_to_BIG5.pl,v 1.11 2010/08/19 05:57:34 petere Exp $ +# src/backend/utils/mb/Unicode/UCS_to_BIG5.pl # # Generate UTF-8 <--> BIG5 conversion tables from # map files provided by Unicode organization. diff --git a/src/backend/utils/mb/Unicode/UCS_to_EUC_CN.pl b/src/backend/utils/mb/Unicode/UCS_to_EUC_CN.pl index 0058499a75..909c7d272e 100755 --- a/src/backend/utils/mb/Unicode/UCS_to_EUC_CN.pl +++ b/src/backend/utils/mb/Unicode/UCS_to_EUC_CN.pl @@ -2,7 +2,7 @@ # # Copyright (c) 2001-2010, PostgreSQL Global Development Group # -# $PostgreSQL: pgsql/src/backend/utils/mb/Unicode/UCS_to_EUC_CN.pl,v 1.12 2010/01/02 16:57:56 momjian Exp $ +# src/backend/utils/mb/Unicode/UCS_to_EUC_CN.pl # # Generate UTF-8 <--> EUC_CN code conversion tables from # map files provided by Unicode organization. diff --git a/src/backend/utils/mb/Unicode/UCS_to_EUC_JIS_2004.pl b/src/backend/utils/mb/Unicode/UCS_to_EUC_JIS_2004.pl index 1f35027ea6..4552e06628 100755 --- a/src/backend/utils/mb/Unicode/UCS_to_EUC_JIS_2004.pl +++ b/src/backend/utils/mb/Unicode/UCS_to_EUC_JIS_2004.pl @@ -2,7 +2,7 @@ # # Copyright (c) 2007-2010, PostgreSQL Global Development Group # -# $PostgreSQL: pgsql/src/backend/utils/mb/Unicode/UCS_to_EUC_JIS_2004.pl,v 1.4 2010/01/02 16:57:56 momjian Exp $ +# src/backend/utils/mb/Unicode/UCS_to_EUC_JIS_2004.pl # # Generate UTF-8 <--> EUC_JIS_2004 code conversion tables from # "euc-jis-2004-std.txt" (http://x0213.org) diff --git a/src/backend/utils/mb/Unicode/UCS_to_EUC_JP.pl b/src/backend/utils/mb/Unicode/UCS_to_EUC_JP.pl index 073b8655cc..daaaea0bd5 100755 --- a/src/backend/utils/mb/Unicode/UCS_to_EUC_JP.pl +++ b/src/backend/utils/mb/Unicode/UCS_to_EUC_JP.pl @@ -2,7 +2,7 @@ # # Copyright (c) 2001-2010, PostgreSQL Global Development Group # -# $PostgreSQL: pgsql/src/backend/utils/mb/Unicode/UCS_to_EUC_JP.pl,v 1.12 2010/01/02 16:57:56 momjian Exp $ +# src/backend/utils/mb/Unicode/UCS_to_EUC_JP.pl # # Generate UTF-8 <--> EUC_JP code conversion tables from # map files provided by Unicode organization. diff --git a/src/backend/utils/mb/Unicode/UCS_to_EUC_KR.pl b/src/backend/utils/mb/Unicode/UCS_to_EUC_KR.pl index 030bbe7d18..4e2296a838 100755 --- a/src/backend/utils/mb/Unicode/UCS_to_EUC_KR.pl +++ b/src/backend/utils/mb/Unicode/UCS_to_EUC_KR.pl @@ -2,7 +2,7 @@ # # Copyright (c) 2001-2010, PostgreSQL Global Development Group # -# $PostgreSQL: pgsql/src/backend/utils/mb/Unicode/UCS_to_EUC_KR.pl,v 1.13 2010/01/02 16:57:56 momjian Exp $ +# src/backend/utils/mb/Unicode/UCS_to_EUC_KR.pl # # Generate UTF-8 <--> EUC_KR code conversion tables from # map files provided by Unicode organization. diff --git a/src/backend/utils/mb/Unicode/UCS_to_EUC_TW.pl b/src/backend/utils/mb/Unicode/UCS_to_EUC_TW.pl index 1f07ea0488..9434298927 100755 --- a/src/backend/utils/mb/Unicode/UCS_to_EUC_TW.pl +++ b/src/backend/utils/mb/Unicode/UCS_to_EUC_TW.pl @@ -2,7 +2,7 @@ # # Copyright (c) 2001-2010, PostgreSQL Global Development Group # -# $PostgreSQL: pgsql/src/backend/utils/mb/Unicode/UCS_to_EUC_TW.pl,v 1.12 2010/01/02 16:57:56 momjian Exp $ +# src/backend/utils/mb/Unicode/UCS_to_EUC_TW.pl # # Generate UTF-8 <--> EUC_TW code conversion tables from # map files provided by Unicode organization. diff --git a/src/backend/utils/mb/Unicode/UCS_to_GB18030.pl b/src/backend/utils/mb/Unicode/UCS_to_GB18030.pl index 3de7b867f8..4475c13a01 100755 --- a/src/backend/utils/mb/Unicode/UCS_to_GB18030.pl +++ b/src/backend/utils/mb/Unicode/UCS_to_GB18030.pl @@ -2,7 +2,7 @@ # # Copyright (c) 2007-2010, PostgreSQL Global Development Group # -# $PostgreSQL: pgsql/src/backend/utils/mb/Unicode/UCS_to_GB18030.pl,v 1.7 2010/09/19 16:27:17 tgl Exp $ +# src/backend/utils/mb/Unicode/UCS_to_GB18030.pl # # Generate UTF-8 <--> GB18030 code conversion tables from # "ISO10646-GB18030.TXT" diff --git a/src/backend/utils/mb/Unicode/UCS_to_SHIFT_JIS_2004.pl b/src/backend/utils/mb/Unicode/UCS_to_SHIFT_JIS_2004.pl index 0a22455328..828f34ed5a 100755 --- a/src/backend/utils/mb/Unicode/UCS_to_SHIFT_JIS_2004.pl +++ b/src/backend/utils/mb/Unicode/UCS_to_SHIFT_JIS_2004.pl @@ -2,7 +2,7 @@ # # Copyright (c) 2007-2010, PostgreSQL Global Development Group # -# $PostgreSQL: pgsql/src/backend/utils/mb/Unicode/UCS_to_SHIFT_JIS_2004.pl,v 1.4 2010/01/02 16:57:56 momjian Exp $ +# src/backend/utils/mb/Unicode/UCS_to_SHIFT_JIS_2004.pl # # Generate UTF-8 <--> SHIFT_JIS_2004 code conversion tables from # "sjis-0213-2004-std.txt" (http://x0213.org) diff --git a/src/backend/utils/mb/Unicode/UCS_to_SJIS.pl b/src/backend/utils/mb/Unicode/UCS_to_SJIS.pl index 48643b2962..00517a03f9 100755 --- a/src/backend/utils/mb/Unicode/UCS_to_SJIS.pl +++ b/src/backend/utils/mb/Unicode/UCS_to_SJIS.pl @@ -2,7 +2,7 @@ # # Copyright (c) 2001-2010, PostgreSQL Global Development Group # -# $PostgreSQL: pgsql/src/backend/utils/mb/Unicode/UCS_to_SJIS.pl,v 1.13 2010/01/02 16:57:56 momjian Exp $ +# src/backend/utils/mb/Unicode/UCS_to_SJIS.pl # # Generate UTF-8 <--> SJIS code conversion tables from # map files provided by Unicode organization. diff --git a/src/backend/utils/mb/Unicode/UCS_to_most.pl b/src/backend/utils/mb/Unicode/UCS_to_most.pl index 06d94f2512..0232957788 100644 --- a/src/backend/utils/mb/Unicode/UCS_to_most.pl +++ b/src/backend/utils/mb/Unicode/UCS_to_most.pl @@ -2,7 +2,7 @@ # # Copyright (c) 2001-2010, PostgreSQL Global Development Group # -# $PostgreSQL: pgsql/src/backend/utils/mb/Unicode/UCS_to_most.pl,v 1.9 2010/01/02 16:57:56 momjian Exp $ +# src/backend/utils/mb/Unicode/UCS_to_most.pl # # Generate UTF-8 <--> character code conversion tables from # map files provided by Unicode organization. diff --git a/src/backend/utils/mb/Unicode/euc_cn_to_utf8.map b/src/backend/utils/mb/Unicode/euc_cn_to_utf8.map index 05df71a5cc..bd12ebe39b 100644 --- a/src/backend/utils/mb/Unicode/euc_cn_to_utf8.map +++ b/src/backend/utils/mb/Unicode/euc_cn_to_utf8.map @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/backend/utils/mb/Unicode/euc_cn_to_utf8.map,v 1.3 2006/03/11 04:38:31 momjian Exp $ */ +/* src/backend/utils/mb/Unicode/euc_cn_to_utf8.map */ static pg_local_to_utf LUmapEUC_CN[ 7445 ] = { {0xa1a1, 0xe38080}, diff --git a/src/backend/utils/mb/Unicode/euc_jp_to_utf8.map b/src/backend/utils/mb/Unicode/euc_jp_to_utf8.map index 73762eea1b..ae796c12c2 100644 --- a/src/backend/utils/mb/Unicode/euc_jp_to_utf8.map +++ b/src/backend/utils/mb/Unicode/euc_jp_to_utf8.map @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/backend/utils/mb/Unicode/euc_jp_to_utf8.map,v 1.5 2006/03/11 04:38:31 momjian Exp $ */ +/* src/backend/utils/mb/Unicode/euc_jp_to_utf8.map */ static pg_local_to_utf LUmapEUC_JP[] = { {0x8ea1, 0xefbda1}, diff --git a/src/backend/utils/mb/Unicode/euc_tw_to_utf8.map b/src/backend/utils/mb/Unicode/euc_tw_to_utf8.map index 4680581518..d3a303f64b 100644 --- a/src/backend/utils/mb/Unicode/euc_tw_to_utf8.map +++ b/src/backend/utils/mb/Unicode/euc_tw_to_utf8.map @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/backend/utils/mb/Unicode/euc_tw_to_utf8.map,v 1.3 2006/03/11 04:38:31 momjian Exp $ */ +/* src/backend/utils/mb/Unicode/euc_tw_to_utf8.map */ static pg_local_to_utf LUmapEUC_TW[ 23575 ] = { {0xa1a1, 0xe38080}, diff --git a/src/backend/utils/mb/Unicode/gb18030_to_utf8.map b/src/backend/utils/mb/Unicode/gb18030_to_utf8.map index 8b9dab0bd2..95669451d2 100644 --- a/src/backend/utils/mb/Unicode/gb18030_to_utf8.map +++ b/src/backend/utils/mb/Unicode/gb18030_to_utf8.map @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/backend/utils/mb/Unicode/gb18030_to_utf8.map,v 1.5 2006/03/11 04:38:31 momjian Exp $ */ +/* src/backend/utils/mb/Unicode/gb18030_to_utf8.map */ static pg_local_to_utf LUmapGB18030[ 63360 ] = { {0x8140, 0xe4b882}, diff --git a/src/backend/utils/mb/Unicode/gbk_to_utf8.map b/src/backend/utils/mb/Unicode/gbk_to_utf8.map index 0aece2cb6d..6804f5dc69 100644 --- a/src/backend/utils/mb/Unicode/gbk_to_utf8.map +++ b/src/backend/utils/mb/Unicode/gbk_to_utf8.map @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/backend/utils/mb/Unicode/gbk_to_utf8.map,v 1.2 2006/03/11 04:38:37 momjian Exp $ */ +/* src/backend/utils/mb/Unicode/gbk_to_utf8.map */ static pg_local_to_utf LUmapGBK[ 21792 ] = { {0x0080, 0xe282ac}, diff --git a/src/backend/utils/mb/Unicode/iso8859_10_to_utf8.map b/src/backend/utils/mb/Unicode/iso8859_10_to_utf8.map index 2dddf18732..607b8e9401 100644 --- a/src/backend/utils/mb/Unicode/iso8859_10_to_utf8.map +++ b/src/backend/utils/mb/Unicode/iso8859_10_to_utf8.map @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/backend/utils/mb/Unicode/iso8859_10_to_utf8.map,v 1.2 2006/03/11 04:38:37 momjian Exp $ */ +/* src/backend/utils/mb/Unicode/iso8859_10_to_utf8.map */ static pg_local_to_utf LUmapISO8859_10[ 128 ] = { {0x0080, 0xc280}, diff --git a/src/backend/utils/mb/Unicode/iso8859_13_to_utf8.map b/src/backend/utils/mb/Unicode/iso8859_13_to_utf8.map index cadc974eb4..d50ce084f0 100644 --- a/src/backend/utils/mb/Unicode/iso8859_13_to_utf8.map +++ b/src/backend/utils/mb/Unicode/iso8859_13_to_utf8.map @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/backend/utils/mb/Unicode/iso8859_13_to_utf8.map,v 1.2 2006/03/11 04:38:37 momjian Exp $ */ +/* src/backend/utils/mb/Unicode/iso8859_13_to_utf8.map */ static pg_local_to_utf LUmapISO8859_13[ 128 ] = { {0x0080, 0xc280}, diff --git a/src/backend/utils/mb/Unicode/iso8859_14_to_utf8.map b/src/backend/utils/mb/Unicode/iso8859_14_to_utf8.map index 5637c221f6..eaecef88e8 100644 --- a/src/backend/utils/mb/Unicode/iso8859_14_to_utf8.map +++ b/src/backend/utils/mb/Unicode/iso8859_14_to_utf8.map @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/backend/utils/mb/Unicode/iso8859_14_to_utf8.map,v 1.2 2006/03/11 04:38:37 momjian Exp $ */ +/* src/backend/utils/mb/Unicode/iso8859_14_to_utf8.map */ static pg_local_to_utf LUmapISO8859_14[ 128 ] = { {0x0080, 0xc280}, diff --git a/src/backend/utils/mb/Unicode/iso8859_15_to_utf8.map b/src/backend/utils/mb/Unicode/iso8859_15_to_utf8.map index a6acd5a0de..e11a6bd241 100644 --- a/src/backend/utils/mb/Unicode/iso8859_15_to_utf8.map +++ b/src/backend/utils/mb/Unicode/iso8859_15_to_utf8.map @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/backend/utils/mb/Unicode/iso8859_15_to_utf8.map,v 1.2 2006/03/11 04:38:37 momjian Exp $ */ +/* src/backend/utils/mb/Unicode/iso8859_15_to_utf8.map */ static pg_local_to_utf LUmapISO8859_15[ 128 ] = { {0x0080, 0xc280}, diff --git a/src/backend/utils/mb/Unicode/iso8859_16_to_utf8.map b/src/backend/utils/mb/Unicode/iso8859_16_to_utf8.map index a438aabf7f..77382cb7ed 100644 --- a/src/backend/utils/mb/Unicode/iso8859_16_to_utf8.map +++ b/src/backend/utils/mb/Unicode/iso8859_16_to_utf8.map @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/backend/utils/mb/Unicode/iso8859_16_to_utf8.map,v 1.2 2006/03/11 04:38:37 momjian Exp $ */ +/* src/backend/utils/mb/Unicode/iso8859_16_to_utf8.map */ static pg_local_to_utf LUmapISO8859_16[ 128 ] = { {0x0080, 0xc280}, diff --git a/src/backend/utils/mb/Unicode/iso8859_2_to_utf8.map b/src/backend/utils/mb/Unicode/iso8859_2_to_utf8.map index 9e0bb4b27d..5cc984470d 100644 --- a/src/backend/utils/mb/Unicode/iso8859_2_to_utf8.map +++ b/src/backend/utils/mb/Unicode/iso8859_2_to_utf8.map @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/backend/utils/mb/Unicode/iso8859_2_to_utf8.map,v 1.3 2006/03/11 04:38:37 momjian Exp $ */ +/* src/backend/utils/mb/Unicode/iso8859_2_to_utf8.map */ static pg_local_to_utf LUmapISO8859_2[ 128 ] = { {0x0080, 0xc280}, diff --git a/src/backend/utils/mb/Unicode/iso8859_3_to_utf8.map b/src/backend/utils/mb/Unicode/iso8859_3_to_utf8.map index 92bf410229..2a7e285597 100644 --- a/src/backend/utils/mb/Unicode/iso8859_3_to_utf8.map +++ b/src/backend/utils/mb/Unicode/iso8859_3_to_utf8.map @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/backend/utils/mb/Unicode/iso8859_3_to_utf8.map,v 1.3 2006/03/11 04:38:38 momjian Exp $ */ +/* src/backend/utils/mb/Unicode/iso8859_3_to_utf8.map */ static pg_local_to_utf LUmapISO8859_3[ 121 ] = { {0x0080, 0xc280}, diff --git a/src/backend/utils/mb/Unicode/iso8859_4_to_utf8.map b/src/backend/utils/mb/Unicode/iso8859_4_to_utf8.map index a45496557d..315f1d3be6 100644 --- a/src/backend/utils/mb/Unicode/iso8859_4_to_utf8.map +++ b/src/backend/utils/mb/Unicode/iso8859_4_to_utf8.map @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/backend/utils/mb/Unicode/iso8859_4_to_utf8.map,v 1.3 2006/03/11 04:38:38 momjian Exp $ */ +/* src/backend/utils/mb/Unicode/iso8859_4_to_utf8.map */ static pg_local_to_utf LUmapISO8859_4[ 128 ] = { {0x0080, 0xc280}, diff --git a/src/backend/utils/mb/Unicode/iso8859_5_to_utf8.map b/src/backend/utils/mb/Unicode/iso8859_5_to_utf8.map index ff6357e421..60838e1be7 100644 --- a/src/backend/utils/mb/Unicode/iso8859_5_to_utf8.map +++ b/src/backend/utils/mb/Unicode/iso8859_5_to_utf8.map @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/backend/utils/mb/Unicode/iso8859_5_to_utf8.map,v 1.3 2006/03/11 04:38:38 momjian Exp $ */ +/* src/backend/utils/mb/Unicode/iso8859_5_to_utf8.map */ static pg_local_to_utf LUmapISO8859_5[ 128 ] = { {0x0080, 0xc280}, diff --git a/src/backend/utils/mb/Unicode/iso8859_6_to_utf8.map b/src/backend/utils/mb/Unicode/iso8859_6_to_utf8.map index 9d44a4f871..f097a01bf5 100644 --- a/src/backend/utils/mb/Unicode/iso8859_6_to_utf8.map +++ b/src/backend/utils/mb/Unicode/iso8859_6_to_utf8.map @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/backend/utils/mb/Unicode/iso8859_6_to_utf8.map,v 1.2 2006/03/11 04:38:38 momjian Exp $ */ +/* src/backend/utils/mb/Unicode/iso8859_6_to_utf8.map */ static pg_local_to_utf LUmapISO8859_6[ 83 ] = { {0x0080, 0xc280}, diff --git a/src/backend/utils/mb/Unicode/iso8859_7_to_utf8.map b/src/backend/utils/mb/Unicode/iso8859_7_to_utf8.map index dd7afb97f1..8cc6826a79 100644 --- a/src/backend/utils/mb/Unicode/iso8859_7_to_utf8.map +++ b/src/backend/utils/mb/Unicode/iso8859_7_to_utf8.map @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/backend/utils/mb/Unicode/iso8859_7_to_utf8.map,v 1.3 2006/03/11 04:38:38 momjian Exp $ */ +/* src/backend/utils/mb/Unicode/iso8859_7_to_utf8.map */ static pg_local_to_utf LUmapISO8859_7[ 125 ] = { {0x0080, 0xc280}, diff --git a/src/backend/utils/mb/Unicode/iso8859_8_to_utf8.map b/src/backend/utils/mb/Unicode/iso8859_8_to_utf8.map index af9745f2da..22e0b4e266 100644 --- a/src/backend/utils/mb/Unicode/iso8859_8_to_utf8.map +++ b/src/backend/utils/mb/Unicode/iso8859_8_to_utf8.map @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/backend/utils/mb/Unicode/iso8859_8_to_utf8.map,v 1.2 2006/03/11 04:38:38 momjian Exp $ */ +/* src/backend/utils/mb/Unicode/iso8859_8_to_utf8.map */ static pg_local_to_utf LUmapISO8859_8[ 92 ] = { {0x0080, 0xc280}, diff --git a/src/backend/utils/mb/Unicode/iso8859_9_to_utf8.map b/src/backend/utils/mb/Unicode/iso8859_9_to_utf8.map index 28304cfcdb..268f0e4c93 100644 --- a/src/backend/utils/mb/Unicode/iso8859_9_to_utf8.map +++ b/src/backend/utils/mb/Unicode/iso8859_9_to_utf8.map @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/backend/utils/mb/Unicode/iso8859_9_to_utf8.map,v 1.2 2006/03/11 04:38:38 momjian Exp $ */ +/* src/backend/utils/mb/Unicode/iso8859_9_to_utf8.map */ static pg_local_to_utf LUmapISO8859_9[ 128 ] = { {0x0080, 0xc280}, diff --git a/src/backend/utils/mb/Unicode/koi8r_to_utf8.map b/src/backend/utils/mb/Unicode/koi8r_to_utf8.map index af442210e7..9364e5efe9 100644 --- a/src/backend/utils/mb/Unicode/koi8r_to_utf8.map +++ b/src/backend/utils/mb/Unicode/koi8r_to_utf8.map @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/backend/utils/mb/Unicode/koi8r_to_utf8.map,v 1.3 2006/03/11 04:38:38 momjian Exp $ */ +/* src/backend/utils/mb/Unicode/koi8r_to_utf8.map */ static pg_local_to_utf LUmapKOI8R[ 128 ] = { {0x0080, 0xe29480}, diff --git a/src/backend/utils/mb/Unicode/ucs2utf.pl b/src/backend/utils/mb/Unicode/ucs2utf.pl index 0eb1692047..6ca982f8cb 100644 --- a/src/backend/utils/mb/Unicode/ucs2utf.pl +++ b/src/backend/utils/mb/Unicode/ucs2utf.pl @@ -1,7 +1,7 @@ # # Copyright (c) 2001-2010, PostgreSQL Global Development Group # -# $PostgreSQL: pgsql/src/backend/utils/mb/Unicode/ucs2utf.pl,v 1.6 2010/01/02 16:57:56 momjian Exp $ +# src/backend/utils/mb/Unicode/ucs2utf.pl # convert UCS-4 to UTF-8 # sub ucs2utf { diff --git a/src/backend/utils/mb/conv.c b/src/backend/utils/mb/conv.c index 34226935f3..aabba52268 100644 --- a/src/backend/utils/mb/conv.c +++ b/src/backend/utils/mb/conv.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/mb/conv.c,v 1.68 2010/01/02 16:57:56 momjian Exp $ + * src/backend/utils/mb/conv.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/mb/conversion_procs/Makefile b/src/backend/utils/mb/conversion_procs/Makefile index ae973f3955..3cdc45708e 100644 --- a/src/backend/utils/mb/conversion_procs/Makefile +++ b/src/backend/utils/mb/conversion_procs/Makefile @@ -4,7 +4,7 @@ # Makefile for utils/mb/conversion_procs # # IDENTIFICATION -# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/Makefile,v 1.25 2010/08/19 05:57:34 petere Exp $ +# src/backend/utils/mb/conversion_procs/Makefile # #------------------------------------------------------------------------- diff --git a/src/backend/utils/mb/conversion_procs/ascii_and_mic/Makefile b/src/backend/utils/mb/conversion_procs/ascii_and_mic/Makefile index 1ce163e932..d71ca16c00 100644 --- a/src/backend/utils/mb/conversion_procs/ascii_and_mic/Makefile +++ b/src/backend/utils/mb/conversion_procs/ascii_and_mic/Makefile @@ -1,6 +1,6 @@ #------------------------------------------------------------------------- # -# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/ascii_and_mic/Makefile,v 1.5 2007/02/09 15:55:58 petere Exp $ +# src/backend/utils/mb/conversion_procs/ascii_and_mic/Makefile # #------------------------------------------------------------------------- subdir = src/backend/utils/mb/conversion_procs/ascii_and_mic diff --git a/src/backend/utils/mb/conversion_procs/ascii_and_mic/ascii_and_mic.c b/src/backend/utils/mb/conversion_procs/ascii_and_mic/ascii_and_mic.c index 0ef8968461..aaf2772a31 100644 --- a/src/backend/utils/mb/conversion_procs/ascii_and_mic/ascii_and_mic.c +++ b/src/backend/utils/mb/conversion_procs/ascii_and_mic/ascii_and_mic.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/ascii_and_mic/ascii_and_mic.c,v 1.17 2010/01/02 16:57:56 momjian Exp $ + * src/backend/utils/mb/conversion_procs/ascii_and_mic/ascii_and_mic.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/mb/conversion_procs/cyrillic_and_mic/Makefile b/src/backend/utils/mb/conversion_procs/cyrillic_and_mic/Makefile index dc270b4147..78c384a6b6 100644 --- a/src/backend/utils/mb/conversion_procs/cyrillic_and_mic/Makefile +++ b/src/backend/utils/mb/conversion_procs/cyrillic_and_mic/Makefile @@ -1,6 +1,6 @@ #------------------------------------------------------------------------- # -# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/cyrillic_and_mic/Makefile,v 1.4 2007/02/09 15:55:58 petere Exp $ +# src/backend/utils/mb/conversion_procs/cyrillic_and_mic/Makefile # #------------------------------------------------------------------------- subdir = src/backend/utils/mb/conversion_procs/cyrillic_and_mic diff --git a/src/backend/utils/mb/conversion_procs/cyrillic_and_mic/cyrillic_and_mic.c b/src/backend/utils/mb/conversion_procs/cyrillic_and_mic/cyrillic_and_mic.c index 3e70463d46..02453bb754 100644 --- a/src/backend/utils/mb/conversion_procs/cyrillic_and_mic/cyrillic_and_mic.c +++ b/src/backend/utils/mb/conversion_procs/cyrillic_and_mic/cyrillic_and_mic.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/cyrillic_and_mic/cyrillic_and_mic.c,v 1.22 2010/01/02 16:57:56 momjian Exp $ + * src/backend/utils/mb/conversion_procs/cyrillic_and_mic/cyrillic_and_mic.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/mb/conversion_procs/euc2004_sjis2004/Makefile b/src/backend/utils/mb/conversion_procs/euc2004_sjis2004/Makefile index e12c8dd905..199e65525a 100644 --- a/src/backend/utils/mb/conversion_procs/euc2004_sjis2004/Makefile +++ b/src/backend/utils/mb/conversion_procs/euc2004_sjis2004/Makefile @@ -1,6 +1,6 @@ #------------------------------------------------------------------------- # -# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/euc2004_sjis2004/Makefile,v 1.1 2009/11/04 23:47:04 tgl Exp $ +# src/backend/utils/mb/conversion_procs/euc2004_sjis2004/Makefile # #------------------------------------------------------------------------- subdir = src/backend/utils/mb/conversion_procs/euc2004_sjis2004 diff --git a/src/backend/utils/mb/conversion_procs/euc2004_sjis2004/euc2004_sjis2004.c b/src/backend/utils/mb/conversion_procs/euc2004_sjis2004/euc2004_sjis2004.c index 48e6b213cd..4009b2cba1 100644 --- a/src/backend/utils/mb/conversion_procs/euc2004_sjis2004/euc2004_sjis2004.c +++ b/src/backend/utils/mb/conversion_procs/euc2004_sjis2004/euc2004_sjis2004.c @@ -5,7 +5,7 @@ * Copyright (c) 2007-2010, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/euc2004_sjis2004/euc2004_sjis2004.c,v 1.2 2010/01/02 16:57:56 momjian Exp $ + * src/backend/utils/mb/conversion_procs/euc2004_sjis2004/euc2004_sjis2004.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/mb/conversion_procs/euc_cn_and_mic/Makefile b/src/backend/utils/mb/conversion_procs/euc_cn_and_mic/Makefile index 4bc4c55de4..a740656429 100644 --- a/src/backend/utils/mb/conversion_procs/euc_cn_and_mic/Makefile +++ b/src/backend/utils/mb/conversion_procs/euc_cn_and_mic/Makefile @@ -1,6 +1,6 @@ #------------------------------------------------------------------------- # -# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/euc_cn_and_mic/Makefile,v 1.4 2007/02/09 15:55:58 petere Exp $ +# src/backend/utils/mb/conversion_procs/euc_cn_and_mic/Makefile # #------------------------------------------------------------------------- subdir = src/backend/utils/mb/conversion_procs/euc_cn_and_mic diff --git a/src/backend/utils/mb/conversion_procs/euc_cn_and_mic/euc_cn_and_mic.c b/src/backend/utils/mb/conversion_procs/euc_cn_and_mic/euc_cn_and_mic.c index fddbb4365e..8cd69fba61 100644 --- a/src/backend/utils/mb/conversion_procs/euc_cn_and_mic/euc_cn_and_mic.c +++ b/src/backend/utils/mb/conversion_procs/euc_cn_and_mic/euc_cn_and_mic.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/euc_cn_and_mic/euc_cn_and_mic.c,v 1.20 2010/01/02 16:57:56 momjian Exp $ + * src/backend/utils/mb/conversion_procs/euc_cn_and_mic/euc_cn_and_mic.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/Makefile b/src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/Makefile index 54e5b18512..fa167e98af 100644 --- a/src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/Makefile +++ b/src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/Makefile @@ -1,6 +1,6 @@ #------------------------------------------------------------------------- # -# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/Makefile,v 1.4 2007/02/09 15:55:58 petere Exp $ +# src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/Makefile # #------------------------------------------------------------------------- subdir = src/backend/utils/mb/conversion_procs/euc_jp_and_sjis diff --git a/src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/euc_jp_and_sjis.c b/src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/euc_jp_and_sjis.c index 0f27a56edd..3585d281df 100644 --- a/src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/euc_jp_and_sjis.c +++ b/src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/euc_jp_and_sjis.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/euc_jp_and_sjis.c,v 1.23 2010/01/02 16:57:56 momjian Exp $ + * src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/euc_jp_and_sjis.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/mb/conversion_procs/euc_kr_and_mic/Makefile b/src/backend/utils/mb/conversion_procs/euc_kr_and_mic/Makefile index 37be61fa9a..5ce5548dc3 100644 --- a/src/backend/utils/mb/conversion_procs/euc_kr_and_mic/Makefile +++ b/src/backend/utils/mb/conversion_procs/euc_kr_and_mic/Makefile @@ -1,6 +1,6 @@ #------------------------------------------------------------------------- # -# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/euc_kr_and_mic/Makefile,v 1.4 2007/02/09 15:55:58 petere Exp $ +# src/backend/utils/mb/conversion_procs/euc_kr_and_mic/Makefile # #------------------------------------------------------------------------- subdir = src/backend/utils/mb/conversion_procs/euc_kr_and_mic diff --git a/src/backend/utils/mb/conversion_procs/euc_kr_and_mic/euc_kr_and_mic.c b/src/backend/utils/mb/conversion_procs/euc_kr_and_mic/euc_kr_and_mic.c index 016b6ce854..365dd96c7e 100644 --- a/src/backend/utils/mb/conversion_procs/euc_kr_and_mic/euc_kr_and_mic.c +++ b/src/backend/utils/mb/conversion_procs/euc_kr_and_mic/euc_kr_and_mic.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/euc_kr_and_mic/euc_kr_and_mic.c,v 1.20 2010/01/02 16:57:57 momjian Exp $ + * src/backend/utils/mb/conversion_procs/euc_kr_and_mic/euc_kr_and_mic.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/Makefile b/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/Makefile index 0efa61fdc2..7625435434 100644 --- a/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/Makefile +++ b/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/Makefile @@ -1,6 +1,6 @@ #------------------------------------------------------------------------- # -# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/Makefile,v 1.4 2007/02/09 15:55:58 petere Exp $ +# src/backend/utils/mb/conversion_procs/euc_tw_and_big5/Makefile # #------------------------------------------------------------------------- subdir = src/backend/utils/mb/conversion_procs/euc_tw_and_big5 diff --git a/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/big5.c b/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/big5.c index a167d4e4c8..ca96539055 100644 --- a/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/big5.c +++ b/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/big5.c @@ -7,7 +7,7 @@ * * 1999/1/15 Tatsuo Ishii * - * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/big5.c,v 1.7 2005/11/22 18:17:26 momjian Exp $ + * src/backend/utils/mb/conversion_procs/euc_tw_and_big5/big5.c */ /* can be used in either frontend or backend */ diff --git a/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/euc_tw_and_big5.c b/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/euc_tw_and_big5.c index f00ef35a2f..ac4894377b 100644 --- a/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/euc_tw_and_big5.c +++ b/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/euc_tw_and_big5.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/euc_tw_and_big5.c,v 1.22 2010/01/02 16:57:57 momjian Exp $ + * src/backend/utils/mb/conversion_procs/euc_tw_and_big5/euc_tw_and_big5.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/mb/conversion_procs/latin2_and_win1250/Makefile b/src/backend/utils/mb/conversion_procs/latin2_and_win1250/Makefile index c7c2b7c0e2..7587b66cad 100644 --- a/src/backend/utils/mb/conversion_procs/latin2_and_win1250/Makefile +++ b/src/backend/utils/mb/conversion_procs/latin2_and_win1250/Makefile @@ -1,6 +1,6 @@ #------------------------------------------------------------------------- # -# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/latin2_and_win1250/Makefile,v 1.4 2007/02/09 15:55:58 petere Exp $ +# src/backend/utils/mb/conversion_procs/latin2_and_win1250/Makefile # #------------------------------------------------------------------------- subdir = src/backend/utils/mb/conversion_procs/latin2_and_win1250 diff --git a/src/backend/utils/mb/conversion_procs/latin2_and_win1250/latin2_and_win1250.c b/src/backend/utils/mb/conversion_procs/latin2_and_win1250/latin2_and_win1250.c index 75c8d976a6..2daba2382c 100644 --- a/src/backend/utils/mb/conversion_procs/latin2_and_win1250/latin2_and_win1250.c +++ b/src/backend/utils/mb/conversion_procs/latin2_and_win1250/latin2_and_win1250.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/latin2_and_win1250/latin2_and_win1250.c,v 1.19 2010/01/02 16:57:57 momjian Exp $ + * src/backend/utils/mb/conversion_procs/latin2_and_win1250/latin2_and_win1250.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/mb/conversion_procs/latin_and_mic/Makefile b/src/backend/utils/mb/conversion_procs/latin_and_mic/Makefile index 99da5d7481..ec887406b9 100644 --- a/src/backend/utils/mb/conversion_procs/latin_and_mic/Makefile +++ b/src/backend/utils/mb/conversion_procs/latin_and_mic/Makefile @@ -1,6 +1,6 @@ #------------------------------------------------------------------------- # -# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/latin_and_mic/Makefile,v 1.4 2007/02/09 15:55:58 petere Exp $ +# src/backend/utils/mb/conversion_procs/latin_and_mic/Makefile # #------------------------------------------------------------------------- subdir = src/backend/utils/mb/conversion_procs/latin_and_mic diff --git a/src/backend/utils/mb/conversion_procs/latin_and_mic/latin_and_mic.c b/src/backend/utils/mb/conversion_procs/latin_and_mic/latin_and_mic.c index 8d686e3fd9..cbba781649 100644 --- a/src/backend/utils/mb/conversion_procs/latin_and_mic/latin_and_mic.c +++ b/src/backend/utils/mb/conversion_procs/latin_and_mic/latin_and_mic.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/latin_and_mic/latin_and_mic.c,v 1.18 2010/01/02 16:57:57 momjian Exp $ + * src/backend/utils/mb/conversion_procs/latin_and_mic/latin_and_mic.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_ascii/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_ascii/Makefile index a706b42661..a4b1b3ff5d 100644 --- a/src/backend/utils/mb/conversion_procs/utf8_and_ascii/Makefile +++ b/src/backend/utils/mb/conversion_procs/utf8_and_ascii/Makefile @@ -1,6 +1,6 @@ #------------------------------------------------------------------------- # -# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_ascii/Makefile,v 1.4 2007/02/09 15:55:58 petere Exp $ +# src/backend/utils/mb/conversion_procs/utf8_and_ascii/Makefile # #------------------------------------------------------------------------- subdir = src/backend/utils/mb/conversion_procs/utf8_and_ascii diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_ascii/utf8_and_ascii.c b/src/backend/utils/mb/conversion_procs/utf8_and_ascii/utf8_and_ascii.c index 6d9fb2a58c..8c6b9c8d2c 100644 --- a/src/backend/utils/mb/conversion_procs/utf8_and_ascii/utf8_and_ascii.c +++ b/src/backend/utils/mb/conversion_procs/utf8_and_ascii/utf8_and_ascii.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_ascii/utf8_and_ascii.c,v 1.19 2010/01/02 16:57:57 momjian Exp $ + * src/backend/utils/mb/conversion_procs/utf8_and_ascii/utf8_and_ascii.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_big5/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_big5/Makefile index 772ebe1977..df728369a7 100644 --- a/src/backend/utils/mb/conversion_procs/utf8_and_big5/Makefile +++ b/src/backend/utils/mb/conversion_procs/utf8_and_big5/Makefile @@ -1,6 +1,6 @@ #------------------------------------------------------------------------- # -# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_big5/Makefile,v 1.4 2007/02/09 15:55:58 petere Exp $ +# src/backend/utils/mb/conversion_procs/utf8_and_big5/Makefile # #------------------------------------------------------------------------- subdir = src/backend/utils/mb/conversion_procs/utf8_and_big5 diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_big5/utf8_and_big5.c b/src/backend/utils/mb/conversion_procs/utf8_and_big5/utf8_and_big5.c index e38f0f1720..6ecaed56a4 100644 --- a/src/backend/utils/mb/conversion_procs/utf8_and_big5/utf8_and_big5.c +++ b/src/backend/utils/mb/conversion_procs/utf8_and_big5/utf8_and_big5.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_big5/utf8_and_big5.c,v 1.21 2010/01/02 16:57:57 momjian Exp $ + * src/backend/utils/mb/conversion_procs/utf8_and_big5/utf8_and_big5.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/Makefile index 0ff9aaf8c9..410037c378 100644 --- a/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/Makefile +++ b/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/Makefile @@ -1,6 +1,6 @@ #------------------------------------------------------------------------- # -# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/Makefile,v 1.4 2007/02/09 15:55:58 petere Exp $ +# src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/Makefile # #------------------------------------------------------------------------- subdir = src/backend/utils/mb/conversion_procs/utf8_and_cyrillic diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/utf8_and_cyrillic.c b/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/utf8_and_cyrillic.c index a6da321d8e..c2e1f5284b 100644 --- a/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/utf8_and_cyrillic.c +++ b/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/utf8_and_cyrillic.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/utf8_and_cyrillic.c,v 1.25 2010/01/02 16:57:57 momjian Exp $ + * src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/utf8_and_cyrillic.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_euc2004/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_euc2004/Makefile index 7abd09424e..58c513a224 100644 --- a/src/backend/utils/mb/conversion_procs/utf8_and_euc2004/Makefile +++ b/src/backend/utils/mb/conversion_procs/utf8_and_euc2004/Makefile @@ -1,6 +1,6 @@ #------------------------------------------------------------------------- # -# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_euc2004/Makefile,v 1.1 2009/11/04 23:47:04 tgl Exp $ +# src/backend/utils/mb/conversion_procs/utf8_and_euc2004/Makefile # #------------------------------------------------------------------------- subdir = src/backend/utils/mb/conversion_procs/utf8_and_euc2004 diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_euc2004/utf8_and_euc2004.c b/src/backend/utils/mb/conversion_procs/utf8_and_euc2004/utf8_and_euc2004.c index 86d11f9e9d..98d0732ec7 100644 --- a/src/backend/utils/mb/conversion_procs/utf8_and_euc2004/utf8_and_euc2004.c +++ b/src/backend/utils/mb/conversion_procs/utf8_and_euc2004/utf8_and_euc2004.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_euc2004/utf8_and_euc2004.c,v 1.2 2010/01/02 16:57:57 momjian Exp $ + * src/backend/utils/mb/conversion_procs/utf8_and_euc2004/utf8_and_euc2004.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_euc_cn/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_euc_cn/Makefile index a14326e820..053162e245 100644 --- a/src/backend/utils/mb/conversion_procs/utf8_and_euc_cn/Makefile +++ b/src/backend/utils/mb/conversion_procs/utf8_and_euc_cn/Makefile @@ -1,6 +1,6 @@ #------------------------------------------------------------------------- # -# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_euc_cn/Makefile,v 1.4 2007/02/09 15:55:58 petere Exp $ +# src/backend/utils/mb/conversion_procs/utf8_and_euc_cn/Makefile # #------------------------------------------------------------------------- subdir = src/backend/utils/mb/conversion_procs/utf8_and_euc_cn diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_euc_cn/utf8_and_euc_cn.c b/src/backend/utils/mb/conversion_procs/utf8_and_euc_cn/utf8_and_euc_cn.c index 56229f63c2..cc23ada817 100644 --- a/src/backend/utils/mb/conversion_procs/utf8_and_euc_cn/utf8_and_euc_cn.c +++ b/src/backend/utils/mb/conversion_procs/utf8_and_euc_cn/utf8_and_euc_cn.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_euc_cn/utf8_and_euc_cn.c,v 1.22 2010/01/02 16:57:57 momjian Exp $ + * src/backend/utils/mb/conversion_procs/utf8_and_euc_cn/utf8_and_euc_cn.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_euc_jp/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_euc_jp/Makefile index 8933b8af15..6a7678d0ec 100644 --- a/src/backend/utils/mb/conversion_procs/utf8_and_euc_jp/Makefile +++ b/src/backend/utils/mb/conversion_procs/utf8_and_euc_jp/Makefile @@ -1,6 +1,6 @@ #------------------------------------------------------------------------- # -# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_euc_jp/Makefile,v 1.4 2007/02/09 15:55:59 petere Exp $ +# src/backend/utils/mb/conversion_procs/utf8_and_euc_jp/Makefile # #------------------------------------------------------------------------- subdir = src/backend/utils/mb/conversion_procs/utf8_and_euc_jp diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_euc_jp/utf8_and_euc_jp.c b/src/backend/utils/mb/conversion_procs/utf8_and_euc_jp/utf8_and_euc_jp.c index 3171c62e54..20d0858d3c 100644 --- a/src/backend/utils/mb/conversion_procs/utf8_and_euc_jp/utf8_and_euc_jp.c +++ b/src/backend/utils/mb/conversion_procs/utf8_and_euc_jp/utf8_and_euc_jp.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_euc_jp/utf8_and_euc_jp.c,v 1.22 2010/01/02 16:57:57 momjian Exp $ + * src/backend/utils/mb/conversion_procs/utf8_and_euc_jp/utf8_and_euc_jp.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_euc_kr/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_euc_kr/Makefile index 1ebebc701f..13935abaf7 100644 --- a/src/backend/utils/mb/conversion_procs/utf8_and_euc_kr/Makefile +++ b/src/backend/utils/mb/conversion_procs/utf8_and_euc_kr/Makefile @@ -1,6 +1,6 @@ #------------------------------------------------------------------------- # -# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_euc_kr/Makefile,v 1.4 2007/02/09 15:55:59 petere Exp $ +# src/backend/utils/mb/conversion_procs/utf8_and_euc_kr/Makefile # #------------------------------------------------------------------------- subdir = src/backend/utils/mb/conversion_procs/utf8_and_euc_kr diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_euc_kr/utf8_and_euc_kr.c b/src/backend/utils/mb/conversion_procs/utf8_and_euc_kr/utf8_and_euc_kr.c index 27b498b4b7..ac3324f21f 100644 --- a/src/backend/utils/mb/conversion_procs/utf8_and_euc_kr/utf8_and_euc_kr.c +++ b/src/backend/utils/mb/conversion_procs/utf8_and_euc_kr/utf8_and_euc_kr.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_euc_kr/utf8_and_euc_kr.c,v 1.22 2010/01/02 16:57:57 momjian Exp $ + * src/backend/utils/mb/conversion_procs/utf8_and_euc_kr/utf8_and_euc_kr.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_euc_tw/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_euc_tw/Makefile index d9bf16a24d..7b9b833dc6 100644 --- a/src/backend/utils/mb/conversion_procs/utf8_and_euc_tw/Makefile +++ b/src/backend/utils/mb/conversion_procs/utf8_and_euc_tw/Makefile @@ -1,6 +1,6 @@ #------------------------------------------------------------------------- # -# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_euc_tw/Makefile,v 1.4 2007/02/09 15:55:59 petere Exp $ +# src/backend/utils/mb/conversion_procs/utf8_and_euc_tw/Makefile # #------------------------------------------------------------------------- subdir = src/backend/utils/mb/conversion_procs/utf8_and_euc_tw diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_euc_tw/utf8_and_euc_tw.c b/src/backend/utils/mb/conversion_procs/utf8_and_euc_tw/utf8_and_euc_tw.c index 5277cdebab..ac1b7984f2 100644 --- a/src/backend/utils/mb/conversion_procs/utf8_and_euc_tw/utf8_and_euc_tw.c +++ b/src/backend/utils/mb/conversion_procs/utf8_and_euc_tw/utf8_and_euc_tw.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_euc_tw/utf8_and_euc_tw.c,v 1.22 2010/01/02 16:57:57 momjian Exp $ + * src/backend/utils/mb/conversion_procs/utf8_and_euc_tw/utf8_and_euc_tw.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_gb18030/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_gb18030/Makefile index 7fd1a32876..1fb3e5a67a 100644 --- a/src/backend/utils/mb/conversion_procs/utf8_and_gb18030/Makefile +++ b/src/backend/utils/mb/conversion_procs/utf8_and_gb18030/Makefile @@ -1,6 +1,6 @@ #------------------------------------------------------------------------- # -# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_gb18030/Makefile,v 1.4 2007/02/09 15:55:59 petere Exp $ +# src/backend/utils/mb/conversion_procs/utf8_and_gb18030/Makefile # #------------------------------------------------------------------------- subdir = src/backend/utils/mb/conversion_procs/utf8_and_gb18030 diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_gb18030/utf8_and_gb18030.c b/src/backend/utils/mb/conversion_procs/utf8_and_gb18030/utf8_and_gb18030.c index 2e9df021f9..693229f9f4 100644 --- a/src/backend/utils/mb/conversion_procs/utf8_and_gb18030/utf8_and_gb18030.c +++ b/src/backend/utils/mb/conversion_procs/utf8_and_gb18030/utf8_and_gb18030.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_gb18030/utf8_and_gb18030.c,v 1.23 2010/01/02 16:57:57 momjian Exp $ + * src/backend/utils/mb/conversion_procs/utf8_and_gb18030/utf8_and_gb18030.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_gbk/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_gbk/Makefile index 5338e7928e..240fe1458d 100644 --- a/src/backend/utils/mb/conversion_procs/utf8_and_gbk/Makefile +++ b/src/backend/utils/mb/conversion_procs/utf8_and_gbk/Makefile @@ -1,6 +1,6 @@ #------------------------------------------------------------------------- # -# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_gbk/Makefile,v 1.4 2007/02/09 15:55:59 petere Exp $ +# src/backend/utils/mb/conversion_procs/utf8_and_gbk/Makefile # #------------------------------------------------------------------------- subdir = src/backend/utils/mb/conversion_procs/utf8_and_gbk diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_gbk/utf8_and_gbk.c b/src/backend/utils/mb/conversion_procs/utf8_and_gbk/utf8_and_gbk.c index 3dd655531b..ce461bf06c 100644 --- a/src/backend/utils/mb/conversion_procs/utf8_and_gbk/utf8_and_gbk.c +++ b/src/backend/utils/mb/conversion_procs/utf8_and_gbk/utf8_and_gbk.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_gbk/utf8_and_gbk.c,v 1.20 2010/01/02 16:57:57 momjian Exp $ + * src/backend/utils/mb/conversion_procs/utf8_and_gbk/utf8_and_gbk.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/Makefile index bbdb83996f..c02323e8d8 100644 --- a/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/Makefile +++ b/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/Makefile @@ -1,6 +1,6 @@ #------------------------------------------------------------------------- # -# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/Makefile,v 1.4 2007/02/09 15:55:59 petere Exp $ +# src/backend/utils/mb/conversion_procs/utf8_and_iso8859/Makefile # #------------------------------------------------------------------------- subdir = src/backend/utils/mb/conversion_procs/utf8_and_iso8859 diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c b/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c index 8511bb6b6b..d9ed1e6b9b 100644 --- a/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c +++ b/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c,v 1.31 2010/01/02 16:57:57 momjian Exp $ + * src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_iso8859_1/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_iso8859_1/Makefile index 7db2f359d7..c2fac2eda8 100644 --- a/src/backend/utils/mb/conversion_procs/utf8_and_iso8859_1/Makefile +++ b/src/backend/utils/mb/conversion_procs/utf8_and_iso8859_1/Makefile @@ -1,6 +1,6 @@ #------------------------------------------------------------------------- # -# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_iso8859_1/Makefile,v 1.4 2007/02/09 15:55:59 petere Exp $ +# src/backend/utils/mb/conversion_procs/utf8_and_iso8859_1/Makefile # #------------------------------------------------------------------------- subdir = src/backend/utils/mb/conversion_procs/utf8_and_iso8859_1 diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_iso8859_1/utf8_and_iso8859_1.c b/src/backend/utils/mb/conversion_procs/utf8_and_iso8859_1/utf8_and_iso8859_1.c index ac2ba97bef..15e6bbf471 100644 --- a/src/backend/utils/mb/conversion_procs/utf8_and_iso8859_1/utf8_and_iso8859_1.c +++ b/src/backend/utils/mb/conversion_procs/utf8_and_iso8859_1/utf8_and_iso8859_1.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_iso8859_1/utf8_and_iso8859_1.c,v 1.23 2010/01/02 16:57:57 momjian Exp $ + * src/backend/utils/mb/conversion_procs/utf8_and_iso8859_1/utf8_and_iso8859_1.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_johab/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_johab/Makefile index b3e479774a..bdd39fb542 100644 --- a/src/backend/utils/mb/conversion_procs/utf8_and_johab/Makefile +++ b/src/backend/utils/mb/conversion_procs/utf8_and_johab/Makefile @@ -1,6 +1,6 @@ #------------------------------------------------------------------------- # -# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_johab/Makefile,v 1.4 2007/02/09 15:55:59 petere Exp $ +# src/backend/utils/mb/conversion_procs/utf8_and_johab/Makefile # #------------------------------------------------------------------------- subdir = src/backend/utils/mb/conversion_procs/utf8_and_johab diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_johab/utf8_and_johab.c b/src/backend/utils/mb/conversion_procs/utf8_and_johab/utf8_and_johab.c index dd9c224c3a..fdaae4b38f 100644 --- a/src/backend/utils/mb/conversion_procs/utf8_and_johab/utf8_and_johab.c +++ b/src/backend/utils/mb/conversion_procs/utf8_and_johab/utf8_and_johab.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_johab/utf8_and_johab.c,v 1.22 2010/01/02 16:57:57 momjian Exp $ + * src/backend/utils/mb/conversion_procs/utf8_and_johab/utf8_and_johab.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_sjis/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_sjis/Makefile index 2927989bd6..7f4dd0c67f 100644 --- a/src/backend/utils/mb/conversion_procs/utf8_and_sjis/Makefile +++ b/src/backend/utils/mb/conversion_procs/utf8_and_sjis/Makefile @@ -1,6 +1,6 @@ #------------------------------------------------------------------------- # -# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_sjis/Makefile,v 1.4 2007/02/09 15:55:59 petere Exp $ +# src/backend/utils/mb/conversion_procs/utf8_and_sjis/Makefile # #------------------------------------------------------------------------- subdir = src/backend/utils/mb/conversion_procs/utf8_and_sjis diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_sjis/utf8_and_sjis.c b/src/backend/utils/mb/conversion_procs/utf8_and_sjis/utf8_and_sjis.c index 5cb10a2211..91ef89fc3b 100644 --- a/src/backend/utils/mb/conversion_procs/utf8_and_sjis/utf8_and_sjis.c +++ b/src/backend/utils/mb/conversion_procs/utf8_and_sjis/utf8_and_sjis.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_sjis/utf8_and_sjis.c,v 1.20 2010/01/02 16:57:57 momjian Exp $ + * src/backend/utils/mb/conversion_procs/utf8_and_sjis/utf8_and_sjis.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_sjis2004/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_sjis2004/Makefile index ea471286f3..ed0bfde801 100644 --- a/src/backend/utils/mb/conversion_procs/utf8_and_sjis2004/Makefile +++ b/src/backend/utils/mb/conversion_procs/utf8_and_sjis2004/Makefile @@ -1,6 +1,6 @@ #------------------------------------------------------------------------- # -# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_sjis2004/Makefile,v 1.1 2009/11/04 23:47:04 tgl Exp $ +# src/backend/utils/mb/conversion_procs/utf8_and_sjis2004/Makefile # #------------------------------------------------------------------------- subdir = src/backend/utils/mb/conversion_procs/utf8_and_sjis2004 diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_sjis2004/utf8_and_sjis2004.c b/src/backend/utils/mb/conversion_procs/utf8_and_sjis2004/utf8_and_sjis2004.c index e6d1e996b6..3a3d86f6cc 100644 --- a/src/backend/utils/mb/conversion_procs/utf8_and_sjis2004/utf8_and_sjis2004.c +++ b/src/backend/utils/mb/conversion_procs/utf8_and_sjis2004/utf8_and_sjis2004.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_sjis2004/utf8_and_sjis2004.c,v 1.2 2010/01/02 16:57:57 momjian Exp $ + * src/backend/utils/mb/conversion_procs/utf8_and_sjis2004/utf8_and_sjis2004.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_uhc/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_uhc/Makefile index fb2ba930bf..5c09c7e6f6 100644 --- a/src/backend/utils/mb/conversion_procs/utf8_and_uhc/Makefile +++ b/src/backend/utils/mb/conversion_procs/utf8_and_uhc/Makefile @@ -1,6 +1,6 @@ #------------------------------------------------------------------------- # -# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_uhc/Makefile,v 1.4 2007/02/09 15:55:59 petere Exp $ +# src/backend/utils/mb/conversion_procs/utf8_and_uhc/Makefile # #------------------------------------------------------------------------- subdir = src/backend/utils/mb/conversion_procs/utf8_and_uhc diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_uhc/utf8_and_uhc.c b/src/backend/utils/mb/conversion_procs/utf8_and_uhc/utf8_and_uhc.c index ba986f9b97..a8babba323 100644 --- a/src/backend/utils/mb/conversion_procs/utf8_and_uhc/utf8_and_uhc.c +++ b/src/backend/utils/mb/conversion_procs/utf8_and_uhc/utf8_and_uhc.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_uhc/utf8_and_uhc.c,v 1.20 2010/01/02 16:57:57 momjian Exp $ + * src/backend/utils/mb/conversion_procs/utf8_and_uhc/utf8_and_uhc.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_win/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_win/Makefile index 8dd9805946..31c510bab7 100644 --- a/src/backend/utils/mb/conversion_procs/utf8_and_win/Makefile +++ b/src/backend/utils/mb/conversion_procs/utf8_and_win/Makefile @@ -1,6 +1,6 @@ #------------------------------------------------------------------------- # -# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_win/Makefile,v 1.2 2007/02/09 15:55:59 petere Exp $ +# src/backend/utils/mb/conversion_procs/utf8_and_win/Makefile # #------------------------------------------------------------------------- subdir = src/backend/utils/mb/conversion_procs/utf8_and_win diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c b/src/backend/utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c index 128020b7b3..338c855077 100644 --- a/src/backend/utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c +++ b/src/backend/utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c,v 1.15 2010/01/02 16:57:58 momjian Exp $ + * src/backend/utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/mb/encnames.c b/src/backend/utils/mb/encnames.c index 04df4cb5af..7a3715750b 100644 --- a/src/backend/utils/mb/encnames.c +++ b/src/backend/utils/mb/encnames.c @@ -2,7 +2,7 @@ * Encoding names and routines for work with it. All * in this file is shared bedween FE and BE. * - * $PostgreSQL: pgsql/src/backend/utils/mb/encnames.c,v 1.40 2009/10/17 00:24:51 mha Exp $ + * src/backend/utils/mb/encnames.c */ #ifdef FRONTEND #include "postgres_fe.h" diff --git a/src/backend/utils/mb/iso.c b/src/backend/utils/mb/iso.c index defb7ca404..d5dae56339 100644 --- a/src/backend/utils/mb/iso.c +++ b/src/backend/utils/mb/iso.c @@ -4,7 +4,7 @@ * * Tatsuo Ishii * - * $PostgreSQL: pgsql/src/backend/utils/mb/iso.c,v 1.4 2003/11/29 22:39:59 pgsql Exp $ + * src/backend/utils/mb/iso.c */ #include diff --git a/src/backend/utils/mb/mbutils.c b/src/backend/utils/mb/mbutils.c index ddaf881ce0..a9dc2dee45 100644 --- a/src/backend/utils/mb/mbutils.c +++ b/src/backend/utils/mb/mbutils.c @@ -4,7 +4,7 @@ * * Tatsuo Ishii * - * $PostgreSQL: pgsql/src/backend/utils/mb/mbutils.c,v 1.98 2010/07/07 15:13:21 tgl Exp $ + * src/backend/utils/mb/mbutils.c */ #include "postgres.h" diff --git a/src/backend/utils/mb/wchar.c b/src/backend/utils/mb/wchar.c index 32d298780b..5b0cf628fe 100644 --- a/src/backend/utils/mb/wchar.c +++ b/src/backend/utils/mb/wchar.c @@ -1,7 +1,7 @@ /* * conversion functions between pg_wchar and multibyte streams. * Tatsuo Ishii - * $PostgreSQL: pgsql/src/backend/utils/mb/wchar.c,v 1.75 2010/08/18 19:54:01 tgl Exp $ + * src/backend/utils/mb/wchar.c * */ /* can be used in either frontend or backend */ diff --git a/src/backend/utils/mb/win1251.c b/src/backend/utils/mb/win1251.c index 6792c98cb7..75129e6eff 100644 --- a/src/backend/utils/mb/win1251.c +++ b/src/backend/utils/mb/win1251.c @@ -4,7 +4,7 @@ * * Tatsuo Ishii * - * $PostgreSQL: pgsql/src/backend/utils/mb/win1251.c,v 1.2 2003/11/29 22:39:59 pgsql Exp $ + * src/backend/utils/mb/win1251.c */ #include diff --git a/src/backend/utils/mb/win866.c b/src/backend/utils/mb/win866.c index b525aab123..f98c376450 100644 --- a/src/backend/utils/mb/win866.c +++ b/src/backend/utils/mb/win866.c @@ -4,7 +4,7 @@ * * Tatsuo Ishii * - * $PostgreSQL: pgsql/src/backend/utils/mb/win866.c,v 1.1 2005/03/07 04:30:52 momjian Exp $ + * src/backend/utils/mb/win866.c */ #include diff --git a/src/backend/utils/mb/wstrcmp.c b/src/backend/utils/mb/wstrcmp.c index 22cd7e93c0..64a9cf848e 100644 --- a/src/backend/utils/mb/wstrcmp.c +++ b/src/backend/utils/mb/wstrcmp.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/src/backend/utils/mb/wstrcmp.c,v 1.10 2009/06/11 14:49:06 momjian Exp $ + * src/backend/utils/mb/wstrcmp.c * *- * Copyright (c) 1990, 1993 diff --git a/src/backend/utils/mb/wstrncmp.c b/src/backend/utils/mb/wstrncmp.c index 60400e903b..87c1f5afda 100644 --- a/src/backend/utils/mb/wstrncmp.c +++ b/src/backend/utils/mb/wstrncmp.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/src/backend/utils/mb/wstrncmp.c,v 1.10 2009/06/11 14:49:06 momjian Exp $ + * src/backend/utils/mb/wstrncmp.c * * * Copyright (c) 1989, 1993 diff --git a/src/backend/utils/misc/Makefile b/src/backend/utils/misc/Makefile index 596d02d61f..0ca57a1f21 100644 --- a/src/backend/utils/misc/Makefile +++ b/src/backend/utils/misc/Makefile @@ -4,7 +4,7 @@ # Makefile for utils/misc # # IDENTIFICATION -# $PostgreSQL: pgsql/src/backend/utils/misc/Makefile,v 1.30 2010/02/11 14:29:50 teodor Exp $ +# src/backend/utils/misc/Makefile # #------------------------------------------------------------------------- diff --git a/src/backend/utils/misc/README b/src/backend/utils/misc/README index e2ae67afd9..881862a30b 100644 --- a/src/backend/utils/misc/README +++ b/src/backend/utils/misc/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/backend/utils/misc/README,v 1.10 2008/03/20 17:55:15 momjian Exp $ +src/backend/utils/misc/README Guc Implementation Notes ======================== diff --git a/src/backend/utils/misc/guc-file.l b/src/backend/utils/misc/guc-file.l index 3d71a39357..b51fd1dd54 100644 --- a/src/backend/utils/misc/guc-file.l +++ b/src/backend/utils/misc/guc-file.l @@ -4,7 +4,7 @@ * * Copyright (c) 2000-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/backend/utils/misc/guc-file.l,v 1.64 2010/01/02 16:57:58 momjian Exp $ + * src/backend/utils/misc/guc-file.l */ %{ diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index 3be7874f08..d4ef6aed08 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -10,7 +10,7 @@ * Written by Peter Eisentraut . * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.568 2010/08/19 22:55:01 tgl Exp $ + * src/backend/utils/misc/guc.c * *-------------------------------------------------------------------- */ diff --git a/src/backend/utils/misc/help_config.c b/src/backend/utils/misc/help_config.c index faec97e863..f637ddb65e 100644 --- a/src/backend/utils/misc/help_config.c +++ b/src/backend/utils/misc/help_config.c @@ -10,7 +10,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/misc/help_config.c,v 1.24 2010/01/02 16:57:58 momjian Exp $ + * src/backend/utils/misc/help_config.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/misc/pg_rusage.c b/src/backend/utils/misc/pg_rusage.c index 20b17d28e8..c843c58a9c 100644 --- a/src/backend/utils/misc/pg_rusage.c +++ b/src/backend/utils/misc/pg_rusage.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/misc/pg_rusage.c,v 1.8 2010/01/02 16:57:58 momjian Exp $ + * src/backend/utils/misc/pg_rusage.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/misc/ps_status.c b/src/backend/utils/misc/ps_status.c index 903ca0825a..72c4dae7d6 100644 --- a/src/backend/utils/misc/ps_status.c +++ b/src/backend/utils/misc/ps_status.c @@ -5,7 +5,7 @@ * to contain some useful information. Mechanism differs wildly across * platforms. * - * $PostgreSQL: pgsql/src/backend/utils/misc/ps_status.c,v 1.43 2010/09/04 17:45:56 tgl Exp $ + * src/backend/utils/misc/ps_status.c * * Copyright (c) 2000-2010, PostgreSQL Global Development Group * various details abducted from various places diff --git a/src/backend/utils/misc/rbtree.c b/src/backend/utils/misc/rbtree.c index 7ce197dbf9..717142566a 100644 --- a/src/backend/utils/misc/rbtree.c +++ b/src/backend/utils/misc/rbtree.c @@ -20,7 +20,7 @@ * Copyright (c) 2009-2010, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/misc/rbtree.c,v 1.4 2010/08/01 02:12:42 tgl Exp $ + * src/backend/utils/misc/rbtree.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/misc/superuser.c b/src/backend/utils/misc/superuser.c index d270a09d66..417af1e8ed 100644 --- a/src/backend/utils/misc/superuser.c +++ b/src/backend/utils/misc/superuser.c @@ -14,7 +14,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/misc/superuser.c,v 1.41 2010/02/14 18:42:18 rhaas Exp $ + * src/backend/utils/misc/superuser.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/misc/tzparser.c b/src/backend/utils/misc/tzparser.c index a19cc0ee5c..c619dba2d0 100644 --- a/src/backend/utils/misc/tzparser.c +++ b/src/backend/utils/misc/tzparser.c @@ -13,7 +13,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/misc/tzparser.c,v 1.9 2010/01/02 16:57:58 momjian Exp $ + * src/backend/utils/misc/tzparser.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/mmgr/Makefile b/src/backend/utils/mmgr/Makefile index 890ab2de16..b2403e186f 100644 --- a/src/backend/utils/mmgr/Makefile +++ b/src/backend/utils/mmgr/Makefile @@ -4,7 +4,7 @@ # Makefile for utils/mmgr # # IDENTIFICATION -# $PostgreSQL: pgsql/src/backend/utils/mmgr/Makefile,v 1.13 2008/02/19 10:30:09 petere Exp $ +# src/backend/utils/mmgr/Makefile # #------------------------------------------------------------------------- diff --git a/src/backend/utils/mmgr/README b/src/backend/utils/mmgr/README index d306c62213..2e9a226114 100644 --- a/src/backend/utils/mmgr/README +++ b/src/backend/utils/mmgr/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/backend/utils/mmgr/README,v 1.15 2008/04/09 01:00:46 momjian Exp $ +src/backend/utils/mmgr/README Notes About Memory Allocation Redesign ====================================== diff --git a/src/backend/utils/mmgr/aset.c b/src/backend/utils/mmgr/aset.c index 197f1fcd14..3dd80b2e1f 100644 --- a/src/backend/utils/mmgr/aset.c +++ b/src/backend/utils/mmgr/aset.c @@ -11,7 +11,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/mmgr/aset.c,v 1.83 2010/02/26 02:01:14 momjian Exp $ + * src/backend/utils/mmgr/aset.c * * NOTE: * This is a new (Feb. 05, 1999) implementation of the allocation set diff --git a/src/backend/utils/mmgr/mcxt.c b/src/backend/utils/mmgr/mcxt.c index 6d31e4e075..880f738434 100644 --- a/src/backend/utils/mmgr/mcxt.c +++ b/src/backend/utils/mmgr/mcxt.c @@ -14,7 +14,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/mmgr/mcxt.c,v 1.69 2010/02/13 02:34:12 tgl Exp $ + * src/backend/utils/mmgr/mcxt.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/mmgr/portalmem.c b/src/backend/utils/mmgr/portalmem.c index 852edd3f36..61309b3daa 100644 --- a/src/backend/utils/mmgr/portalmem.c +++ b/src/backend/utils/mmgr/portalmem.c @@ -12,7 +12,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/mmgr/portalmem.c,v 1.121 2010/07/13 09:02:30 heikki Exp $ + * src/backend/utils/mmgr/portalmem.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/probes.d b/src/backend/utils/probes.d index 7ed8c4a27a..22855c2746 100644 --- a/src/backend/utils/probes.d +++ b/src/backend/utils/probes.d @@ -3,7 +3,7 @@ * * Copyright (c) 2006-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/backend/utils/probes.d,v 1.15 2010/08/14 02:22:10 rhaas Exp $ + * src/backend/utils/probes.d * ---------- */ diff --git a/src/backend/utils/resowner/Makefile b/src/backend/utils/resowner/Makefile index 0a4dac3730..512fca1046 100644 --- a/src/backend/utils/resowner/Makefile +++ b/src/backend/utils/resowner/Makefile @@ -4,7 +4,7 @@ # Makefile for utils/resowner # # IDENTIFICATION -# $PostgreSQL: pgsql/src/backend/utils/resowner/Makefile,v 1.3 2008/02/19 10:30:09 petere Exp $ +# src/backend/utils/resowner/Makefile # #------------------------------------------------------------------------- diff --git a/src/backend/utils/resowner/README b/src/backend/utils/resowner/README index f74f1f5077..e7b9ddfa59 100644 --- a/src/backend/utils/resowner/README +++ b/src/backend/utils/resowner/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/backend/utils/resowner/README,v 1.8 2008/11/25 20:28:29 alvherre Exp $ +src/backend/utils/resowner/README Notes About Resource Owners =========================== diff --git a/src/backend/utils/resowner/resowner.c b/src/backend/utils/resowner/resowner.c index 51f2002390..8468d2c3f1 100644 --- a/src/backend/utils/resowner/resowner.c +++ b/src/backend/utils/resowner/resowner.c @@ -14,7 +14,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/resowner/resowner.c,v 1.34 2010/01/02 16:57:58 momjian Exp $ + * src/backend/utils/resowner/resowner.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/sort/Makefile b/src/backend/utils/sort/Makefile index 460f3c1cda..9e20ecb326 100644 --- a/src/backend/utils/sort/Makefile +++ b/src/backend/utils/sort/Makefile @@ -4,7 +4,7 @@ # Makefile for utils/sort # # IDENTIFICATION -# $PostgreSQL: pgsql/src/backend/utils/sort/Makefile,v 1.15 2008/02/19 10:30:09 petere Exp $ +# src/backend/utils/sort/Makefile # #------------------------------------------------------------------------- diff --git a/src/backend/utils/sort/logtape.c b/src/backend/utils/sort/logtape.c index 9b28800482..c2d8557d67 100644 --- a/src/backend/utils/sort/logtape.c +++ b/src/backend/utils/sort/logtape.c @@ -70,7 +70,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/sort/logtape.c,v 1.28 2010/01/02 16:57:58 momjian Exp $ + * src/backend/utils/sort/logtape.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/sort/tuplesort.c b/src/backend/utils/sort/tuplesort.c index 11ce8edad5..cf0a583f5c 100644 --- a/src/backend/utils/sort/tuplesort.c +++ b/src/backend/utils/sort/tuplesort.c @@ -91,7 +91,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/sort/tuplesort.c,v 1.95 2010/02/26 02:01:15 momjian Exp $ + * src/backend/utils/sort/tuplesort.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/sort/tuplestore.c b/src/backend/utils/sort/tuplestore.c index b752d67771..9bbaba4377 100644 --- a/src/backend/utils/sort/tuplestore.c +++ b/src/backend/utils/sort/tuplestore.c @@ -47,7 +47,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/sort/tuplestore.c,v 1.51 2010/02/26 02:01:15 momjian Exp $ + * src/backend/utils/sort/tuplestore.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/time/Makefile b/src/backend/utils/time/Makefile index 774aa5ccfa..5a6e6fa4c8 100644 --- a/src/backend/utils/time/Makefile +++ b/src/backend/utils/time/Makefile @@ -4,7 +4,7 @@ # Makefile for utils/time # # IDENTIFICATION -# $PostgreSQL: pgsql/src/backend/utils/time/Makefile,v 1.15 2008/03/26 18:48:59 alvherre Exp $ +# src/backend/utils/time/Makefile # #------------------------------------------------------------------------- diff --git a/src/backend/utils/time/combocid.c b/src/backend/utils/time/combocid.c index 34288ee9df..6b0205c090 100644 --- a/src/backend/utils/time/combocid.c +++ b/src/backend/utils/time/combocid.c @@ -34,7 +34,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/time/combocid.c,v 1.7 2010/01/02 16:57:58 momjian Exp $ + * src/backend/utils/time/combocid.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/time/snapmgr.c b/src/backend/utils/time/snapmgr.c index f0fb919dc8..273d8bdd05 100644 --- a/src/backend/utils/time/snapmgr.c +++ b/src/backend/utils/time/snapmgr.c @@ -19,7 +19,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/time/snapmgr.c,v 1.16 2010/09/11 18:38:56 joe Exp $ + * src/backend/utils/time/snapmgr.c * *------------------------------------------------------------------------- */ diff --git a/src/backend/utils/time/tqual.c b/src/backend/utils/time/tqual.c index bc19df813f..719dc13964 100644 --- a/src/backend/utils/time/tqual.c +++ b/src/backend/utils/time/tqual.c @@ -50,7 +50,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/time/tqual.c,v 1.118 2010/02/26 02:01:15 momjian Exp $ + * src/backend/utils/time/tqual.c * *------------------------------------------------------------------------- */ diff --git a/src/bcc32.mak b/src/bcc32.mak index 35aba705e6..67f73a53b9 100644 --- a/src/bcc32.mak +++ b/src/bcc32.mak @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/src/bcc32.mak,v 1.5 2007/03/05 14:18:38 mha Exp $ +# src/bcc32.mak # Makefile for Borland C++ 5.5 (or compat) # Top-file makefile for building Win32 libpq with Borland C++. diff --git a/src/bin/Makefile b/src/bin/Makefile index db0594b8f6..63b32e4598 100644 --- a/src/bin/Makefile +++ b/src/bin/Makefile @@ -5,7 +5,7 @@ # Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group # Portions Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/bin/Makefile,v 1.56 2010/01/02 16:57:58 momjian Exp $ +# src/bin/Makefile # #------------------------------------------------------------------------- diff --git a/src/bin/initdb/Makefile b/src/bin/initdb/Makefile index 2ffcb54153..99c8b1bca4 100644 --- a/src/bin/initdb/Makefile +++ b/src/bin/initdb/Makefile @@ -5,7 +5,7 @@ # Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group # Portions Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/bin/initdb/Makefile,v 1.61 2010/07/05 18:54:37 tgl Exp $ +# src/bin/initdb/Makefile # #------------------------------------------------------------------------- diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c index 0aee70de1d..71c6324a3b 100644 --- a/src/bin/initdb/initdb.c +++ b/src/bin/initdb/initdb.c @@ -42,7 +42,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * Portions taken from FreeBSD. * - * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.186 2010/02/26 02:01:15 momjian Exp $ + * src/bin/initdb/initdb.c * *------------------------------------------------------------------------- */ diff --git a/src/bin/initdb/nls.mk b/src/bin/initdb/nls.mk index f9b2879e68..be60427311 100644 --- a/src/bin/initdb/nls.mk +++ b/src/bin/initdb/nls.mk @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/src/bin/initdb/nls.mk,v 1.23 2010/05/13 15:56:37 petere Exp $ +# src/bin/initdb/nls.mk CATALOG_NAME := initdb AVAIL_LANGUAGES := cs de es fr it ja pt_BR ru sv ta tr zh_CN GETTEXT_FILES := initdb.c ../../port/dirmod.c ../../port/exec.c diff --git a/src/bin/initdb/po/fr.po b/src/bin/initdb/po/fr.po index 1952eaf5dd..065dc16e6c 100644 --- a/src/bin/initdb/po/fr.po +++ b/src/bin/initdb/po/fr.po @@ -1,7 +1,7 @@ # translation of initdb.po to fr_fr # french message translation file for initdb # -# $PostgreSQL: pgsql/src/bin/initdb/po/fr.po,v 1.17 2009/12/19 20:23:25 petere Exp $ +# src/bin/initdb/po/fr.po # # Use these quotes: « %s » # diff --git a/src/bin/initdb/po/ru.po b/src/bin/initdb/po/ru.po index f34b8b79e8..e5d919230a 100644 --- a/src/bin/initdb/po/ru.po +++ b/src/bin/initdb/po/ru.po @@ -4,7 +4,7 @@ # Copyright (c) 2004 Serguei A. Mokhov, mokhov@cs.concordia.ca # Distributed under the same licensing terms as PostgreSQL itself. # -# $PostgreSQL: pgsql/src/bin/initdb/po/ru.po,v 1.16 2009/04/09 19:38:51 petere Exp $ +# src/bin/initdb/po/ru.po # # translation of subject-specific terminology, see: # ÐÅÒÅ×ÏÄ ÎÅËÏÔÏÒÙÈ ÓÐÅÃÉÆÉÞÎÙÈ ÔÅÒÍÉÎÏ×: diff --git a/src/bin/pg_config/Makefile b/src/bin/pg_config/Makefile index b9ca579046..732144dde6 100644 --- a/src/bin/pg_config/Makefile +++ b/src/bin/pg_config/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1998-2010, PostgreSQL Global Development Group # -# $PostgreSQL: pgsql/src/bin/pg_config/Makefile,v 1.25 2010/07/05 18:54:38 tgl Exp $ +# src/bin/pg_config/Makefile # #------------------------------------------------------------------------- diff --git a/src/bin/pg_config/nls.mk b/src/bin/pg_config/nls.mk index 0372494f44..e3e77f399d 100644 --- a/src/bin/pg_config/nls.mk +++ b/src/bin/pg_config/nls.mk @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/src/bin/pg_config/nls.mk,v 1.21 2010/05/13 15:56:37 petere Exp $ +# src/bin/pg_config/nls.mk CATALOG_NAME := pg_config AVAIL_LANGUAGES := de es fr it ja ko nb pt_BR ro ru sv ta tr zh_CN GETTEXT_FILES := pg_config.c ../../port/exec.c diff --git a/src/bin/pg_config/pg_config.c b/src/bin/pg_config/pg_config.c index e8ddbed027..2e87060f80 100644 --- a/src/bin/pg_config/pg_config.c +++ b/src/bin/pg_config/pg_config.c @@ -17,7 +17,7 @@ * * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/pg_config/pg_config.c,v 1.33 2010/07/05 18:54:38 tgl Exp $ + * src/bin/pg_config/pg_config.c * *------------------------------------------------------------------------- */ diff --git a/src/bin/pg_config/po/fr.po b/src/bin/pg_config/po/fr.po index 50316c68c2..8602b26333 100644 --- a/src/bin/pg_config/po/fr.po +++ b/src/bin/pg_config/po/fr.po @@ -1,7 +1,7 @@ # translation of pg_config.po to fr_fr # french message translation file for pg_config # -# $PostgreSQL: pgsql/src/bin/pg_config/po/fr.po,v 1.11 2009/05/14 21:41:51 alvherre Exp $ +# src/bin/pg_config/po/fr.po # # Use these quotes: « %s » # diff --git a/src/bin/pg_config/po/ru.po b/src/bin/pg_config/po/ru.po index d729669b7a..7a05e11401 100644 --- a/src/bin/pg_config/po/ru.po +++ b/src/bin/pg_config/po/ru.po @@ -4,7 +4,7 @@ # Copyright (c) 2004-2005 Serguei A. Mokhov, mokhov@cs.concordia.ca # Distributed under the same licensing terms as PostgreSQL itself. # -# $PostgreSQL: pgsql/src/bin/pg_config/po/ru.po,v 1.6 2009/04/09 19:38:51 petere Exp $ +# src/bin/pg_config/po/ru.po # # translation of subject-specific terminology, see: # ÐÅÒÅ×ÏÄ ÎÅËÏÔÏÒÙÈ ÓÐÅÃÉÆÉÞÎÙÈ ÔÅÒÍÉÎÏ×: diff --git a/src/bin/pg_controldata/Makefile b/src/bin/pg_controldata/Makefile index ab551fe691..bcdf741fdc 100644 --- a/src/bin/pg_controldata/Makefile +++ b/src/bin/pg_controldata/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1998-2010, PostgreSQL Global Development Group # -# $PostgreSQL: pgsql/src/bin/pg_controldata/Makefile,v 1.22 2010/07/05 18:54:38 tgl Exp $ +# src/bin/pg_controldata/Makefile # #------------------------------------------------------------------------- diff --git a/src/bin/pg_controldata/nls.mk b/src/bin/pg_controldata/nls.mk index 251e0801fd..84240fa184 100644 --- a/src/bin/pg_controldata/nls.mk +++ b/src/bin/pg_controldata/nls.mk @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/src/bin/pg_controldata/nls.mk,v 1.21 2010/05/13 15:56:37 petere Exp $ +# src/bin/pg_controldata/nls.mk CATALOG_NAME := pg_controldata AVAIL_LANGUAGES := de es fr it ja ko pt_BR sv ta tr zh_CN GETTEXT_FILES := pg_controldata.c diff --git a/src/bin/pg_controldata/pg_controldata.c b/src/bin/pg_controldata/pg_controldata.c index b62b59e0dc..2d52f784ae 100644 --- a/src/bin/pg_controldata/pg_controldata.c +++ b/src/bin/pg_controldata/pg_controldata.c @@ -6,7 +6,7 @@ * copyright (c) Oliver Elphick , 2001; * licence: BSD * - * $PostgreSQL: pgsql/src/bin/pg_controldata/pg_controldata.c,v 1.50 2010/06/03 03:20:00 rhaas Exp $ + * src/bin/pg_controldata/pg_controldata.c */ /* diff --git a/src/bin/pg_controldata/po/fr.po b/src/bin/pg_controldata/po/fr.po index 581b1660fd..cea6532b6d 100644 --- a/src/bin/pg_controldata/po/fr.po +++ b/src/bin/pg_controldata/po/fr.po @@ -1,7 +1,7 @@ # translation of pg_controldata.po to fr_fr # french message translation file for pg_controldata # -# $PostgreSQL: pgsql/src/bin/pg_controldata/po/fr.po,v 1.21 2010/07/08 21:32:27 petere Exp $ +# src/bin/pg_controldata/po/fr.po # # Use these quotes: « %s » # diff --git a/src/bin/pg_ctl/Makefile b/src/bin/pg_ctl/Makefile index 6bd63995e6..0d49509724 100644 --- a/src/bin/pg_ctl/Makefile +++ b/src/bin/pg_ctl/Makefile @@ -5,7 +5,7 @@ # Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group # Portions Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/bin/pg_ctl/Makefile,v 1.30 2010/07/05 18:54:38 tgl Exp $ +# src/bin/pg_ctl/Makefile # #------------------------------------------------------------------------- diff --git a/src/bin/pg_ctl/nls.mk b/src/bin/pg_ctl/nls.mk index 2f52d24a8f..338ed42037 100644 --- a/src/bin/pg_ctl/nls.mk +++ b/src/bin/pg_ctl/nls.mk @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/src/bin/pg_ctl/nls.mk,v 1.20 2010/05/13 15:56:37 petere Exp $ +# src/bin/pg_ctl/nls.mk CATALOG_NAME := pg_ctl AVAIL_LANGUAGES := de es fr it ja ko pt_BR ru sv ta tr zh_CN GETTEXT_FILES := pg_ctl.c ../../port/exec.c diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c index 166a114334..4af639bfee 100644 --- a/src/bin/pg_ctl/pg_ctl.c +++ b/src/bin/pg_ctl/pg_ctl.c @@ -4,7 +4,7 @@ * * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.123 2010/09/14 08:05:33 heikki Exp $ + * src/bin/pg_ctl/pg_ctl.c * *------------------------------------------------------------------------- */ diff --git a/src/bin/pg_ctl/po/fr.po b/src/bin/pg_ctl/po/fr.po index 5b171e8103..4dccf6e778 100644 --- a/src/bin/pg_ctl/po/fr.po +++ b/src/bin/pg_ctl/po/fr.po @@ -1,7 +1,7 @@ # translation of pg_ctl.po to fr_fr # french message translation file for pg_ctl # -# $PostgreSQL: pgsql/src/bin/pg_ctl/po/fr.po,v 1.15 2009/12/19 20:23:25 petere Exp $ +# src/bin/pg_ctl/po/fr.po # # Use these quotes: « %s » # diff --git a/src/bin/pg_ctl/po/ru.po b/src/bin/pg_ctl/po/ru.po index 99e3b73b0d..c1a2c88fb2 100644 --- a/src/bin/pg_ctl/po/ru.po +++ b/src/bin/pg_ctl/po/ru.po @@ -4,7 +4,7 @@ # Copyright (c) 2004-2005 Serguei A. Mokhov, mokhov@cs.concordia.ca # Distributed under the same licensing terms as PostgreSQL itself. # -# $PostgreSQL: pgsql/src/bin/pg_ctl/po/ru.po,v 1.11 2009/04/09 19:38:51 petere Exp $ +# src/bin/pg_ctl/po/ru.po # # translation of subject-specific terminology, see: # ÐÅÒÅ×ÏÄ ÎÅËÏÔÏÒÙÈ ÓÐÅÃÉÆÉÞÎÙÈ ÔÅÒÍÉÎÏ×: diff --git a/src/bin/pg_dump/Makefile b/src/bin/pg_dump/Makefile index 0a26c702b6..f4c716ee2f 100644 --- a/src/bin/pg_dump/Makefile +++ b/src/bin/pg_dump/Makefile @@ -5,7 +5,7 @@ # Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group # Portions Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/bin/pg_dump/Makefile,v 1.71 2010/07/05 18:54:38 tgl Exp $ +# src/bin/pg_dump/Makefile # #------------------------------------------------------------------------- diff --git a/src/bin/pg_dump/README b/src/bin/pg_dump/README index 1b65b45828..c0a84ff63a 100644 --- a/src/bin/pg_dump/README +++ b/src/bin/pg_dump/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/bin/pg_dump/README,v 1.7 2008/03/21 13:23:28 momjian Exp $ +src/bin/pg_dump/README Notes on pg_dump ================ diff --git a/src/bin/pg_dump/common.c b/src/bin/pg_dump/common.c index 714494ce62..e4a02014fd 100644 --- a/src/bin/pg_dump/common.c +++ b/src/bin/pg_dump/common.c @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/bin/pg_dump/common.c,v 1.109 2010/01/02 16:57:58 momjian Exp $ + * src/bin/pg_dump/common.c * *------------------------------------------------------------------------- */ diff --git a/src/bin/pg_dump/dumputils.c b/src/bin/pg_dump/dumputils.c index 176abb2f16..d53e908a44 100644 --- a/src/bin/pg_dump/dumputils.c +++ b/src/bin/pg_dump/dumputils.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/bin/pg_dump/dumputils.c,v 1.58 2010/08/03 19:24:04 tgl Exp $ + * src/bin/pg_dump/dumputils.c * *------------------------------------------------------------------------- */ diff --git a/src/bin/pg_dump/dumputils.h b/src/bin/pg_dump/dumputils.h index 63bd02c156..04f111bb38 100644 --- a/src/bin/pg_dump/dumputils.h +++ b/src/bin/pg_dump/dumputils.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/bin/pg_dump/dumputils.h,v 1.31 2010/08/03 19:24:04 tgl Exp $ + * src/bin/pg_dump/dumputils.h * *------------------------------------------------------------------------- */ diff --git a/src/bin/pg_dump/keywords.c b/src/bin/pg_dump/keywords.c index 9510464897..c798bb821b 100644 --- a/src/bin/pg_dump/keywords.c +++ b/src/bin/pg_dump/keywords.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/bin/pg_dump/keywords.c,v 1.5 2010/01/02 16:57:59 momjian Exp $ + * src/bin/pg_dump/keywords.c * *------------------------------------------------------------------------- */ diff --git a/src/bin/pg_dump/nls.mk b/src/bin/pg_dump/nls.mk index 067a90504a..62acd358eb 100644 --- a/src/bin/pg_dump/nls.mk +++ b/src/bin/pg_dump/nls.mk @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/src/bin/pg_dump/nls.mk,v 1.23 2010/05/13 15:56:38 petere Exp $ +# src/bin/pg_dump/nls.mk CATALOG_NAME := pg_dump AVAIL_LANGUAGES := de es fr it ja pt_BR sv tr zh_CN GETTEXT_FILES := pg_dump.c common.c pg_backup_archiver.c pg_backup_custom.c \ diff --git a/src/bin/pg_dump/pg_backup.h b/src/bin/pg_dump/pg_backup.h index 5a73779d21..6f0277ea57 100644 --- a/src/bin/pg_dump/pg_backup.h +++ b/src/bin/pg_dump/pg_backup.h @@ -15,7 +15,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup.h,v 1.53 2010/05/15 21:41:16 tgl Exp $ + * src/bin/pg_dump/pg_backup.h * *------------------------------------------------------------------------- */ diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c index 7e1374bf89..a73afec73a 100644 --- a/src/bin/pg_dump/pg_backup_archiver.c +++ b/src/bin/pg_dump/pg_backup_archiver.c @@ -15,7 +15,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.188 2010/08/21 13:59:44 tgl Exp $ + * src/bin/pg_dump/pg_backup_archiver.c * *------------------------------------------------------------------------- */ diff --git a/src/bin/pg_dump/pg_backup_archiver.h b/src/bin/pg_dump/pg_backup_archiver.h index 0a135ee126..ae0c6e0963 100644 --- a/src/bin/pg_dump/pg_backup_archiver.h +++ b/src/bin/pg_dump/pg_backup_archiver.h @@ -17,7 +17,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.h,v 1.85 2010/02/26 02:01:16 momjian Exp $ + * src/bin/pg_dump/pg_backup_archiver.h * *------------------------------------------------------------------------- */ diff --git a/src/bin/pg_dump/pg_backup_custom.c b/src/bin/pg_dump/pg_backup_custom.c index 8b7ceb64c7..2bc7e8f13c 100644 --- a/src/bin/pg_dump/pg_backup_custom.c +++ b/src/bin/pg_dump/pg_backup_custom.c @@ -19,7 +19,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_custom.c,v 1.47 2010/07/06 19:18:59 momjian Exp $ + * src/bin/pg_dump/pg_backup_custom.c * *------------------------------------------------------------------------- */ diff --git a/src/bin/pg_dump/pg_backup_db.c b/src/bin/pg_dump/pg_backup_db.c index 37d1b742e4..cc3882c46c 100644 --- a/src/bin/pg_dump/pg_backup_db.c +++ b/src/bin/pg_dump/pg_backup_db.c @@ -5,7 +5,7 @@ * Implements the basic DB functions used by the archiver. * * IDENTIFICATION - * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_db.c,v 1.90 2010/02/26 02:01:16 momjian Exp $ + * src/bin/pg_dump/pg_backup_db.c * *------------------------------------------------------------------------- */ diff --git a/src/bin/pg_dump/pg_backup_db.h b/src/bin/pg_dump/pg_backup_db.h index 8d09eebe89..93970b5a91 100644 --- a/src/bin/pg_dump/pg_backup_db.h +++ b/src/bin/pg_dump/pg_backup_db.h @@ -2,7 +2,7 @@ * Definitions for pg_backup_db.c * * IDENTIFICATION - * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_db.h,v 1.13 2006/07/18 17:42:01 momjian Exp $ + * src/bin/pg_dump/pg_backup_db.h */ #ifndef PG_BACKUP_DB_H diff --git a/src/bin/pg_dump/pg_backup_files.c b/src/bin/pg_dump/pg_backup_files.c index 2df535581b..abc93b1403 100644 --- a/src/bin/pg_dump/pg_backup_files.c +++ b/src/bin/pg_dump/pg_backup_files.c @@ -20,7 +20,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_files.c,v 1.36 2009/07/21 21:46:10 tgl Exp $ + * src/bin/pg_dump/pg_backup_files.c * *------------------------------------------------------------------------- */ diff --git a/src/bin/pg_dump/pg_backup_null.c b/src/bin/pg_dump/pg_backup_null.c index 35b9a18a4e..bf1e6e68bf 100644 --- a/src/bin/pg_dump/pg_backup_null.c +++ b/src/bin/pg_dump/pg_backup_null.c @@ -17,7 +17,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_null.c,v 1.24 2010/02/18 01:29:10 tgl Exp $ + * src/bin/pg_dump/pg_backup_null.c * *------------------------------------------------------------------------- */ diff --git a/src/bin/pg_dump/pg_backup_tar.c b/src/bin/pg_dump/pg_backup_tar.c index 2871fee15d..d7e4c463dd 100644 --- a/src/bin/pg_dump/pg_backup_tar.c +++ b/src/bin/pg_dump/pg_backup_tar.c @@ -16,7 +16,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_tar.c,v 1.69 2010/02/26 02:01:16 momjian Exp $ + * src/bin/pg_dump/pg_backup_tar.c * *------------------------------------------------------------------------- */ diff --git a/src/bin/pg_dump/pg_backup_tar.h b/src/bin/pg_dump/pg_backup_tar.h index 7c99871fbd..cb9be645af 100644 --- a/src/bin/pg_dump/pg_backup_tar.h +++ b/src/bin/pg_dump/pg_backup_tar.h @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_tar.h,v 1.5 2003/11/29 19:52:05 pgsql Exp $ + * src/bin/pg_dump/pg_backup_tar.h * * TAR Header * diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c index b137c38728..fdf48fe101 100644 --- a/src/bin/pg_dump/pg_dump.c +++ b/src/bin/pg_dump/pg_dump.c @@ -25,7 +25,7 @@ * http://archives.postgresql.org/pgsql-bugs/2010-02/msg00187.php * * IDENTIFICATION - * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.585 2010/08/13 14:38:03 tgl Exp $ + * src/bin/pg_dump/pg_dump.c * *------------------------------------------------------------------------- */ diff --git a/src/bin/pg_dump/pg_dump.h b/src/bin/pg_dump/pg_dump.h index c309f69f72..78855357c8 100644 --- a/src/bin/pg_dump/pg_dump.h +++ b/src/bin/pg_dump/pg_dump.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.h,v 1.164 2010/02/26 02:01:17 momjian Exp $ + * src/bin/pg_dump/pg_dump.h * *------------------------------------------------------------------------- */ diff --git a/src/bin/pg_dump/pg_dump_sort.c b/src/bin/pg_dump/pg_dump_sort.c index 0c1efcdeb3..a52d03c27a 100644 --- a/src/bin/pg_dump/pg_dump_sort.c +++ b/src/bin/pg_dump/pg_dump_sort.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump_sort.c,v 1.30 2010/02/26 02:01:17 momjian Exp $ + * src/bin/pg_dump/pg_dump_sort.c * *------------------------------------------------------------------------- */ diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c index 3c15fe68c9..9294e079e9 100644 --- a/src/bin/pg_dump/pg_dumpall.c +++ b/src/bin/pg_dump/pg_dumpall.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * - * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.138 2010/08/13 14:38:04 tgl Exp $ + * src/bin/pg_dump/pg_dumpall.c * *------------------------------------------------------------------------- */ diff --git a/src/bin/pg_dump/pg_restore.c b/src/bin/pg_dump/pg_restore.c index 67a24b6e62..b9f0e86bfc 100644 --- a/src/bin/pg_dump/pg_restore.c +++ b/src/bin/pg_dump/pg_restore.c @@ -34,7 +34,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/bin/pg_dump/pg_restore.c,v 1.103 2010/08/13 14:38:04 tgl Exp $ + * src/bin/pg_dump/pg_restore.c * *------------------------------------------------------------------------- */ diff --git a/src/bin/pg_dump/po/fr.po b/src/bin/pg_dump/po/fr.po index 4f7d25128d..78b8569710 100644 --- a/src/bin/pg_dump/po/fr.po +++ b/src/bin/pg_dump/po/fr.po @@ -1,7 +1,7 @@ # translation of pg_dump.po to fr_fr # french message translation file for pg_dump # -# $PostgreSQL: pgsql/src/bin/pg_dump/po/fr.po,v 1.23 2010/07/08 21:32:28 petere Exp $ +# src/bin/pg_dump/po/fr.po # # Use these quotes: « %s » # diff --git a/src/bin/pg_dump/po/zh_CN.po b/src/bin/pg_dump/po/zh_CN.po index 452aa23216..338a965fa5 100644 --- a/src/bin/pg_dump/po/zh_CN.po +++ b/src/bin/pg_dump/po/zh_CN.po @@ -1,6 +1,6 @@ # simplified Chinese translation file for pg_dump and friends # Weiping He , 2001. -# $PostgreSQL: pgsql/src/bin/pg_dump/po/zh_CN.po,v 1.10 2010/05/13 15:56:38 petere Exp $ +# src/bin/pg_dump/po/zh_CN.po # msgid "" msgstr "" diff --git a/src/bin/pg_resetxlog/Makefile b/src/bin/pg_resetxlog/Makefile index 868c62fb6f..67ba562949 100644 --- a/src/bin/pg_resetxlog/Makefile +++ b/src/bin/pg_resetxlog/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1998-2010, PostgreSQL Global Development Group # -# $PostgreSQL: pgsql/src/bin/pg_resetxlog/Makefile,v 1.24 2010/07/05 18:54:38 tgl Exp $ +# src/bin/pg_resetxlog/Makefile # #------------------------------------------------------------------------- diff --git a/src/bin/pg_resetxlog/nls.mk b/src/bin/pg_resetxlog/nls.mk index 4059cd3621..3a52c03caa 100644 --- a/src/bin/pg_resetxlog/nls.mk +++ b/src/bin/pg_resetxlog/nls.mk @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/src/bin/pg_resetxlog/nls.mk,v 1.22 2010/05/13 15:56:39 petere Exp $ +# src/bin/pg_resetxlog/nls.mk CATALOG_NAME := pg_resetxlog AVAIL_LANGUAGES := de es fr it ja ko pt_BR ro ru sv ta tr zh_CN GETTEXT_FILES := pg_resetxlog.c diff --git a/src/bin/pg_resetxlog/pg_resetxlog.c b/src/bin/pg_resetxlog/pg_resetxlog.c index 18286de57e..e813874305 100644 --- a/src/bin/pg_resetxlog/pg_resetxlog.c +++ b/src/bin/pg_resetxlog/pg_resetxlog.c @@ -23,7 +23,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/bin/pg_resetxlog/pg_resetxlog.c,v 1.80 2010/04/28 19:38:49 tgl Exp $ + * src/bin/pg_resetxlog/pg_resetxlog.c * *------------------------------------------------------------------------- */ diff --git a/src/bin/pg_resetxlog/po/fr.po b/src/bin/pg_resetxlog/po/fr.po index ac083bcbcf..5ab9050056 100644 --- a/src/bin/pg_resetxlog/po/fr.po +++ b/src/bin/pg_resetxlog/po/fr.po @@ -1,7 +1,7 @@ # translation of pg_resetxlog.po to fr_fr # french message translation file for pg_resetxlog # -# $PostgreSQL: pgsql/src/bin/pg_resetxlog/po/fr.po,v 1.15 2010/05/13 15:56:39 petere Exp $ +# src/bin/pg_resetxlog/po/fr.po # # Use these quotes: « %s » # diff --git a/src/bin/pg_resetxlog/po/ru.po b/src/bin/pg_resetxlog/po/ru.po index c17c5c2d07..084451df2f 100644 --- a/src/bin/pg_resetxlog/po/ru.po +++ b/src/bin/pg_resetxlog/po/ru.po @@ -4,7 +4,7 @@ # Copyright (c) 2002-2005 Serguei A. Mokhov, mokhov@cs.concordia.ca # Distributed under the same licensing terms as PostgreSQL itself. # -# $PostgreSQL: pgsql/src/bin/pg_resetxlog/po/ru.po,v 1.13 2009/04/09 19:38:52 petere Exp $ +# src/bin/pg_resetxlog/po/ru.po # # translation of subject-specific terminology, see: # ÐÅÒÅ×ÏÄ ÎÅËÏÔÏÒÙÈ ÓÐÅÃÉÆÉÞÎÙÈ ÔÅÒÍÉÎÏ×: diff --git a/src/bin/pgevent/README b/src/bin/pgevent/README index 2d0f85f777..3d0329ec33 100644 --- a/src/bin/pgevent/README +++ b/src/bin/pgevent/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/bin/pgevent/README,v 1.3 2008/03/21 13:23:28 momjian Exp $ +src/bin/pgevent/README pgevent ======= diff --git a/src/bin/pgevent/pgevent.c b/src/bin/pgevent/pgevent.c index d1852187a6..1fcde866d6 100644 --- a/src/bin/pgevent/pgevent.c +++ b/src/bin/pgevent/pgevent.c @@ -6,7 +6,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/bin/pgevent/pgevent.c,v 1.6 2009/06/11 14:49:07 momjian Exp $ + * src/bin/pgevent/pgevent.c * *------------------------------------------------------------------------- */ diff --git a/src/bin/pgevent/pgmsgevent.h b/src/bin/pgevent/pgmsgevent.h index e7290cad13..8083131e12 100644 --- a/src/bin/pgevent/pgmsgevent.h +++ b/src/bin/pgevent/pgmsgevent.h @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/bin/pgevent/pgmsgevent.h,v 1.4 2006/03/11 04:38:38 momjian Exp $ */ +/* src/bin/pgevent/pgmsgevent.h */ /* */ /* Values are 32 bit values layed out as follows: */ diff --git a/src/bin/psql/Makefile b/src/bin/psql/Makefile index 8227b43407..9e1c3cd6f7 100644 --- a/src/bin/psql/Makefile +++ b/src/bin/psql/Makefile @@ -5,7 +5,7 @@ # Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group # Portions Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/bin/psql/Makefile,v 1.70 2010/07/05 18:54:38 tgl Exp $ +# src/bin/psql/Makefile # #------------------------------------------------------------------------- diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c index 6ab65d8b5f..e6d703abe7 100644 --- a/src/bin/psql/command.c +++ b/src/bin/psql/command.c @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/psql/command.c,v 1.229 2010/08/25 00:53:37 tgl Exp $ + * src/bin/psql/command.c */ #include "postgres_fe.h" #include "command.h" diff --git a/src/bin/psql/command.h b/src/bin/psql/command.h index 616df1d5af..9f12d4ae87 100644 --- a/src/bin/psql/command.h +++ b/src/bin/psql/command.h @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/psql/command.h,v 1.34 2010/02/16 21:07:01 momjian Exp $ + * src/bin/psql/command.h */ #ifndef COMMAND_H #define COMMAND_H diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c index ed92937242..c2c572c42d 100644 --- a/src/bin/psql/common.c +++ b/src/bin/psql/common.c @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/psql/common.c,v 1.147 2010/07/28 04:39:14 petere Exp $ + * src/bin/psql/common.c */ #include "postgres_fe.h" #include "common.h" diff --git a/src/bin/psql/common.h b/src/bin/psql/common.h index 838a5526bd..5fa13b76a8 100644 --- a/src/bin/psql/common.h +++ b/src/bin/psql/common.h @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/psql/common.h,v 1.59 2010/01/02 16:57:59 momjian Exp $ + * src/bin/psql/common.h */ #ifndef COMMON_H #define COMMON_H diff --git a/src/bin/psql/copy.c b/src/bin/psql/copy.c index 9ac8505425..5c39d94dfb 100644 --- a/src/bin/psql/copy.c +++ b/src/bin/psql/copy.c @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/psql/copy.c,v 1.84 2010/01/02 16:57:59 momjian Exp $ + * src/bin/psql/copy.c */ #include "postgres_fe.h" #include "copy.h" diff --git a/src/bin/psql/copy.h b/src/bin/psql/copy.h index 048d29909c..7f1b565bfe 100644 --- a/src/bin/psql/copy.h +++ b/src/bin/psql/copy.h @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/psql/copy.h,v 1.23 2010/01/02 16:57:59 momjian Exp $ + * src/bin/psql/copy.h */ #ifndef COPY_H #define COPY_H diff --git a/src/bin/psql/create_help.pl b/src/bin/psql/create_help.pl index 3771072509..495100326d 100644 --- a/src/bin/psql/create_help.pl +++ b/src/bin/psql/create_help.pl @@ -5,7 +5,7 @@ # # Copyright (c) 2000-2010, PostgreSQL Global Development Group # -# $PostgreSQL: pgsql/src/bin/psql/create_help.pl,v 1.21 2010/01/02 16:57:59 momjian Exp $ +# src/bin/psql/create_help.pl ################################################################# # diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c index b4fa7df81d..83e9845103 100644 --- a/src/bin/psql/describe.c +++ b/src/bin/psql/describe.c @@ -8,7 +8,7 @@ * * Copyright (c) 2000-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.243 2010/08/01 01:08:29 rhaas Exp $ + * src/bin/psql/describe.c */ #include "postgres_fe.h" diff --git a/src/bin/psql/describe.h b/src/bin/psql/describe.h index 5f10451757..ddf4aac482 100644 --- a/src/bin/psql/describe.h +++ b/src/bin/psql/describe.h @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/psql/describe.h,v 1.43 2010/01/02 16:57:59 momjian Exp $ + * src/bin/psql/describe.h */ #ifndef DESCRIBE_H #define DESCRIBE_H diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c index b02f9db9b5..66f72e8389 100644 --- a/src/bin/psql/help.c +++ b/src/bin/psql/help.c @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/psql/help.c,v 1.163 2010/08/14 13:59:49 tgl Exp $ + * src/bin/psql/help.c */ #include "postgres_fe.h" diff --git a/src/bin/psql/help.h b/src/bin/psql/help.h index 882cc745df..0b7bf8f645 100644 --- a/src/bin/psql/help.h +++ b/src/bin/psql/help.h @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/psql/help.h,v 1.21 2010/01/02 16:57:59 momjian Exp $ + * src/bin/psql/help.h */ #ifndef HELP_H #define HELP_H diff --git a/src/bin/psql/input.c b/src/bin/psql/input.c index d28fe9c0ba..c95ee22d88 100644 --- a/src/bin/psql/input.c +++ b/src/bin/psql/input.c @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/psql/input.c,v 1.69 2010/02/26 02:01:18 momjian Exp $ + * src/bin/psql/input.c */ #include "postgres_fe.h" diff --git a/src/bin/psql/input.h b/src/bin/psql/input.h index 170590645b..1c52f8d27a 100644 --- a/src/bin/psql/input.h +++ b/src/bin/psql/input.h @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/psql/input.h,v 1.35 2010/02/26 02:01:19 momjian Exp $ + * src/bin/psql/input.h */ #ifndef INPUT_H #define INPUT_H diff --git a/src/bin/psql/large_obj.c b/src/bin/psql/large_obj.c index b915c9f9e5..ecc7b76b5c 100644 --- a/src/bin/psql/large_obj.c +++ b/src/bin/psql/large_obj.c @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/psql/large_obj.c,v 1.56 2010/02/26 02:01:19 momjian Exp $ + * src/bin/psql/large_obj.c */ #include "postgres_fe.h" #include "large_obj.h" diff --git a/src/bin/psql/large_obj.h b/src/bin/psql/large_obj.h index 3031c93b06..b7aa204ed8 100644 --- a/src/bin/psql/large_obj.h +++ b/src/bin/psql/large_obj.h @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/psql/large_obj.h,v 1.20 2010/01/02 16:57:59 momjian Exp $ + * src/bin/psql/large_obj.h */ #ifndef LARGE_OBJ_H #define LARGE_OBJ_H diff --git a/src/bin/psql/mainloop.c b/src/bin/psql/mainloop.c index 23904f3f45..b124ec5ea9 100644 --- a/src/bin/psql/mainloop.c +++ b/src/bin/psql/mainloop.c @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/psql/mainloop.c,v 1.99 2010/02/26 02:01:19 momjian Exp $ + * src/bin/psql/mainloop.c */ #include "postgres_fe.h" #include "mainloop.h" diff --git a/src/bin/psql/mainloop.h b/src/bin/psql/mainloop.h index 93c0945fa4..cbb931b0c9 100644 --- a/src/bin/psql/mainloop.h +++ b/src/bin/psql/mainloop.h @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/psql/mainloop.h,v 1.24 2010/01/02 16:57:59 momjian Exp $ + * src/bin/psql/mainloop.h */ #ifndef MAINLOOP_H #define MAINLOOP_H diff --git a/src/bin/psql/mbprint.c b/src/bin/psql/mbprint.c index 141f860041..6bca2f29bb 100644 --- a/src/bin/psql/mbprint.c +++ b/src/bin/psql/mbprint.c @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/psql/mbprint.c,v 1.40 2010/08/18 19:54:01 tgl Exp $ + * src/bin/psql/mbprint.c * * XXX this file does not really belong in psql/. Perhaps move to libpq? * It also seems that the mbvalidate function is redundant with existing diff --git a/src/bin/psql/mbprint.h b/src/bin/psql/mbprint.h index 4e9d933c94..f729ef045c 100644 --- a/src/bin/psql/mbprint.h +++ b/src/bin/psql/mbprint.h @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/bin/psql/mbprint.h,v 1.15 2009/11/25 20:26:31 tgl Exp $ */ +/* src/bin/psql/mbprint.h */ #ifndef MBPRINT_H #define MBPRINT_H diff --git a/src/bin/psql/nls.mk b/src/bin/psql/nls.mk index 16c8380535..30de2e085f 100644 --- a/src/bin/psql/nls.mk +++ b/src/bin/psql/nls.mk @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/src/bin/psql/nls.mk,v 1.24 2009/09/18 05:00:42 petere Exp $ +# src/bin/psql/nls.mk CATALOG_NAME := psql AVAIL_LANGUAGES := cs de es fr ja pt_BR sv tr GETTEXT_FILES := command.c common.c copy.c help.c input.c large_obj.c \ diff --git a/src/bin/psql/po/cs.po b/src/bin/psql/po/cs.po index 1a2ff0c651..2b647e5378 100644 --- a/src/bin/psql/po/cs.po +++ b/src/bin/psql/po/cs.po @@ -1,7 +1,7 @@ # translation of psql-cs.po to Czech # Czech message translation file for psql # -# $PostgreSQL: pgsql/src/bin/psql/po/cs.po,v 1.6 2009/06/10 23:42:43 petere Exp $ +# src/bin/psql/po/cs.po # Karel Žák, 2001-2003, 2004. # ZdenÄ›k Kotala, 2009. diff --git a/src/bin/psql/po/fr.po b/src/bin/psql/po/fr.po index d62c122d8f..56a365d94a 100644 --- a/src/bin/psql/po/fr.po +++ b/src/bin/psql/po/fr.po @@ -1,7 +1,7 @@ # translation of psql.po to fr_fr # french message translation file for psql # -# $PostgreSQL: pgsql/src/bin/psql/po/fr.po,v 1.30 2010/06/03 21:12:04 petere Exp $ +# src/bin/psql/po/fr.po # # Use these quotes: « %s » # Peter Eisentraut , 2001. diff --git a/src/bin/psql/print.c b/src/bin/psql/print.c index 9c38be1fd2..a5007da09e 100644 --- a/src/bin/psql/print.c +++ b/src/bin/psql/print.c @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/psql/print.c,v 1.128 2010/07/06 19:19:00 momjian Exp $ + * src/bin/psql/print.c */ #include "postgres_fe.h" diff --git a/src/bin/psql/print.h b/src/bin/psql/print.h index ceb3b28452..1f54075e0e 100644 --- a/src/bin/psql/print.h +++ b/src/bin/psql/print.h @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/psql/print.h,v 1.46 2010/07/06 19:19:00 momjian Exp $ + * src/bin/psql/print.h */ #ifndef PRINT_H #define PRINT_H diff --git a/src/bin/psql/prompt.c b/src/bin/psql/prompt.c index b08234b781..6f097652a9 100644 --- a/src/bin/psql/prompt.c +++ b/src/bin/psql/prompt.c @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/psql/prompt.c,v 1.54 2010/04/30 17:09:13 tgl Exp $ + * src/bin/psql/prompt.c */ #include "postgres_fe.h" diff --git a/src/bin/psql/prompt.h b/src/bin/psql/prompt.h index 3ed420a912..8eb58977d6 100644 --- a/src/bin/psql/prompt.h +++ b/src/bin/psql/prompt.h @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/psql/prompt.h,v 1.21 2010/01/02 16:57:59 momjian Exp $ + * src/bin/psql/prompt.h */ #ifndef PROMPT_H #define PROMPT_H diff --git a/src/bin/psql/psqlscan.h b/src/bin/psql/psqlscan.h index 6f9879363f..c644d286e5 100644 --- a/src/bin/psql/psqlscan.h +++ b/src/bin/psql/psqlscan.h @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/psql/psqlscan.h,v 1.11 2010/01/02 16:57:59 momjian Exp $ + * src/bin/psql/psqlscan.h */ #ifndef PSQLSCAN_H #define PSQLSCAN_H diff --git a/src/bin/psql/psqlscan.l b/src/bin/psql/psqlscan.l index 8c105c11ed..0651fe2651 100644 --- a/src/bin/psql/psqlscan.l +++ b/src/bin/psql/psqlscan.l @@ -33,7 +33,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/bin/psql/psqlscan.l,v 1.34 2010/05/30 18:10:41 tgl Exp $ + * src/bin/psql/psqlscan.l * *------------------------------------------------------------------------- */ diff --git a/src/bin/psql/settings.h b/src/bin/psql/settings.h index e05d59b4df..188e819de0 100644 --- a/src/bin/psql/settings.h +++ b/src/bin/psql/settings.h @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/psql/settings.h,v 1.36 2010/01/02 16:57:59 momjian Exp $ + * src/bin/psql/settings.h */ #ifndef SETTINGS_H #define SETTINGS_H diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c index 805909ea25..996910270d 100644 --- a/src/bin/psql/startup.c +++ b/src/bin/psql/startup.c @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/psql/startup.c,v 1.164 2010/03/07 17:02:34 mha Exp $ + * src/bin/psql/startup.c */ #include "postgres_fe.h" diff --git a/src/bin/psql/stringutils.c b/src/bin/psql/stringutils.c index 37ca1198f3..09ccbc336a 100644 --- a/src/bin/psql/stringutils.c +++ b/src/bin/psql/stringutils.c @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/psql/stringutils.c,v 1.49 2010/01/02 16:58:00 momjian Exp $ + * src/bin/psql/stringutils.c */ #include "postgres_fe.h" diff --git a/src/bin/psql/stringutils.h b/src/bin/psql/stringutils.h index a1f9c3e4dc..1519e6aede 100644 --- a/src/bin/psql/stringutils.h +++ b/src/bin/psql/stringutils.h @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/psql/stringutils.h,v 1.28 2010/01/02 16:58:00 momjian Exp $ + * src/bin/psql/stringutils.h */ #ifndef STRINGUTILS_H #define STRINGUTILS_H diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c index 0c2d5bc780..3efa97ad88 100644 --- a/src/bin/psql/tab-complete.c +++ b/src/bin/psql/tab-complete.c @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/psql/tab-complete.c,v 1.202 2010/08/14 13:59:49 tgl Exp $ + * src/bin/psql/tab-complete.c */ /*---------------------------------------------------------------------- diff --git a/src/bin/psql/tab-complete.h b/src/bin/psql/tab-complete.h index 049a1fbc37..682ab74f54 100644 --- a/src/bin/psql/tab-complete.h +++ b/src/bin/psql/tab-complete.h @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/psql/tab-complete.h,v 1.17 2010/01/02 16:58:00 momjian Exp $ + * src/bin/psql/tab-complete.h */ #ifndef TAB_COMPLETE_H #define TAB_COMPLETE_H diff --git a/src/bin/psql/variables.c b/src/bin/psql/variables.c index 7a479a5060..50b015759f 100644 --- a/src/bin/psql/variables.c +++ b/src/bin/psql/variables.c @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/psql/variables.c,v 1.31 2010/01/02 16:58:00 momjian Exp $ + * src/bin/psql/variables.c */ #include "postgres_fe.h" #include "common.h" diff --git a/src/bin/psql/variables.h b/src/bin/psql/variables.h index eb73ebdc06..4f01fe8129 100644 --- a/src/bin/psql/variables.h +++ b/src/bin/psql/variables.h @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/psql/variables.h,v 1.24 2010/01/02 16:58:00 momjian Exp $ + * src/bin/psql/variables.h */ #ifndef VARIABLES_H #define VARIABLES_H diff --git a/src/bin/scripts/Makefile b/src/bin/scripts/Makefile index cc40f0fde3..4248f3bedd 100644 --- a/src/bin/scripts/Makefile +++ b/src/bin/scripts/Makefile @@ -5,7 +5,7 @@ # Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group # Portions Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/bin/scripts/Makefile,v 1.46 2010/07/05 18:54:38 tgl Exp $ +# src/bin/scripts/Makefile # #------------------------------------------------------------------------- diff --git a/src/bin/scripts/clusterdb.c b/src/bin/scripts/clusterdb.c index c2b2020af7..d16262284e 100644 --- a/src/bin/scripts/clusterdb.c +++ b/src/bin/scripts/clusterdb.c @@ -4,7 +4,7 @@ * * Portions Copyright (c) 2002-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/scripts/clusterdb.c,v 1.26 2010/01/02 16:58:00 momjian Exp $ + * src/bin/scripts/clusterdb.c * *------------------------------------------------------------------------- */ diff --git a/src/bin/scripts/common.c b/src/bin/scripts/common.c index fc5a325dbd..5cc0e70a7f 100644 --- a/src/bin/scripts/common.c +++ b/src/bin/scripts/common.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/bin/scripts/common.c,v 1.40 2010/02/26 02:01:20 momjian Exp $ + * src/bin/scripts/common.c * *------------------------------------------------------------------------- */ diff --git a/src/bin/scripts/common.h b/src/bin/scripts/common.h index 2f6fcec71e..bcddf8008f 100644 --- a/src/bin/scripts/common.h +++ b/src/bin/scripts/common.h @@ -4,7 +4,7 @@ * * Copyright (c) 2003-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/scripts/common.h,v 1.24 2010/01/02 16:58:00 momjian Exp $ + * src/bin/scripts/common.h */ #ifndef COMMON_H #define COMMON_H diff --git a/src/bin/scripts/createdb.c b/src/bin/scripts/createdb.c index 37da4b97ef..937a573d77 100644 --- a/src/bin/scripts/createdb.c +++ b/src/bin/scripts/createdb.c @@ -5,7 +5,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/bin/scripts/createdb.c,v 1.35 2010/01/02 16:58:00 momjian Exp $ + * src/bin/scripts/createdb.c * *------------------------------------------------------------------------- */ diff --git a/src/bin/scripts/createlang.c b/src/bin/scripts/createlang.c index a36b39bdee..23ce45b310 100644 --- a/src/bin/scripts/createlang.c +++ b/src/bin/scripts/createlang.c @@ -5,7 +5,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/bin/scripts/createlang.c,v 1.35 2010/01/02 16:58:00 momjian Exp $ + * src/bin/scripts/createlang.c * *------------------------------------------------------------------------- */ diff --git a/src/bin/scripts/createuser.c b/src/bin/scripts/createuser.c index fee12b6d12..c2c7aeeabe 100644 --- a/src/bin/scripts/createuser.c +++ b/src/bin/scripts/createuser.c @@ -5,7 +5,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/bin/scripts/createuser.c,v 1.44 2010/01/02 16:58:00 momjian Exp $ + * src/bin/scripts/createuser.c * *------------------------------------------------------------------------- */ diff --git a/src/bin/scripts/dropdb.c b/src/bin/scripts/dropdb.c index 9e3b5c9bb9..f52ed7d94a 100644 --- a/src/bin/scripts/dropdb.c +++ b/src/bin/scripts/dropdb.c @@ -5,7 +5,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/bin/scripts/dropdb.c,v 1.28 2010/01/02 16:58:00 momjian Exp $ + * src/bin/scripts/dropdb.c * *------------------------------------------------------------------------- */ diff --git a/src/bin/scripts/droplang.c b/src/bin/scripts/droplang.c index b634506f0f..2ba0728b95 100644 --- a/src/bin/scripts/droplang.c +++ b/src/bin/scripts/droplang.c @@ -5,7 +5,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/bin/scripts/droplang.c,v 1.34 2010/02/26 02:01:20 momjian Exp $ + * src/bin/scripts/droplang.c * *------------------------------------------------------------------------- */ diff --git a/src/bin/scripts/dropuser.c b/src/bin/scripts/dropuser.c index 5aa950da7a..f2b7336c23 100644 --- a/src/bin/scripts/dropuser.c +++ b/src/bin/scripts/dropuser.c @@ -5,7 +5,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/bin/scripts/dropuser.c,v 1.29 2010/01/02 16:58:00 momjian Exp $ + * src/bin/scripts/dropuser.c * *------------------------------------------------------------------------- */ diff --git a/src/bin/scripts/nls.mk b/src/bin/scripts/nls.mk index 4e505b6c21..85022c43a1 100644 --- a/src/bin/scripts/nls.mk +++ b/src/bin/scripts/nls.mk @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/src/bin/scripts/nls.mk,v 1.25 2010/05/13 15:56:39 petere Exp $ +# src/bin/scripts/nls.mk CATALOG_NAME := pgscripts AVAIL_LANGUAGES := cs de es fr it ja ko pt_BR ro sv ta tr zh_CN GETTEXT_FILES := createdb.c createlang.c createuser.c \ diff --git a/src/bin/scripts/po/cs.po b/src/bin/scripts/po/cs.po index 0e0a617caf..6f465be0d3 100644 --- a/src/bin/scripts/po/cs.po +++ b/src/bin/scripts/po/cs.po @@ -1,7 +1,7 @@ # translation of pgscripts-cs.po to Czech # Czech translation of pg_scripts messages. # -# $PostgreSQL: pgsql/src/bin/scripts/po/cs.po,v 1.5 2009/06/26 19:33:51 petere Exp $ +# src/bin/scripts/po/cs.po # Karel Žák, 2001-2003, 2004. # ZdenÄ›k Kotala, 2009. # diff --git a/src/bin/scripts/po/fr.po b/src/bin/scripts/po/fr.po index 63d42c9536..3a55b3d45d 100644 --- a/src/bin/scripts/po/fr.po +++ b/src/bin/scripts/po/fr.po @@ -1,7 +1,7 @@ # translation of pgscripts.po to fr_fr # french message translation file for pgscripts # -# $PostgreSQL: pgsql/src/bin/scripts/po/fr.po,v 1.19 2010/05/13 15:56:40 petere Exp $ +# src/bin/scripts/po/fr.po # # Use these quotes: « %s » # diff --git a/src/bin/scripts/reindexdb.c b/src/bin/scripts/reindexdb.c index 9781b3eb08..6feb5d6852 100644 --- a/src/bin/scripts/reindexdb.c +++ b/src/bin/scripts/reindexdb.c @@ -4,7 +4,7 @@ * * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/bin/scripts/reindexdb.c,v 1.19 2010/01/02 16:58:00 momjian Exp $ + * src/bin/scripts/reindexdb.c * *------------------------------------------------------------------------- */ diff --git a/src/bin/scripts/vacuumdb.c b/src/bin/scripts/vacuumdb.c index 0bac34954d..f281dca096 100644 --- a/src/bin/scripts/vacuumdb.c +++ b/src/bin/scripts/vacuumdb.c @@ -5,7 +5,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/bin/scripts/vacuumdb.c,v 1.38 2010/06/11 23:58:24 tgl Exp $ + * src/bin/scripts/vacuumdb.c * *------------------------------------------------------------------------- */ diff --git a/src/include/Makefile b/src/include/Makefile index c89960c7d6..b6744f6b90 100644 --- a/src/include/Makefile +++ b/src/include/Makefile @@ -4,7 +4,7 @@ # # 'make install' installs whole contents of src/include. # -# $PostgreSQL: pgsql/src/include/Makefile,v 1.31 2010/01/15 09:19:05 heikki Exp $ +# src/include/Makefile # #------------------------------------------------------------------------- diff --git a/src/include/access/attnum.h b/src/include/access/attnum.h index dd0775966a..db2a8d305a 100644 --- a/src/include/access/attnum.h +++ b/src/include/access/attnum.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/attnum.h,v 1.27 2010/01/02 16:58:00 momjian Exp $ + * src/include/access/attnum.h * *------------------------------------------------------------------------- */ diff --git a/src/include/access/clog.h b/src/include/access/clog.h index a1f4c9dc6a..bef1c88143 100644 --- a/src/include/access/clog.h +++ b/src/include/access/clog.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/clog.h,v 1.25 2010/01/02 16:58:00 momjian Exp $ + * src/include/access/clog.h */ #ifndef CLOG_H #define CLOG_H diff --git a/src/include/access/genam.h b/src/include/access/genam.h index c2731ba651..48380ef32f 100644 --- a/src/include/access/genam.h +++ b/src/include/access/genam.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/genam.h,v 1.84 2010/02/26 02:01:20 momjian Exp $ + * src/include/access/genam.h * *------------------------------------------------------------------------- */ diff --git a/src/include/access/gin.h b/src/include/access/gin.h index 279ff13a01..c67d4182c4 100644 --- a/src/include/access/gin.h +++ b/src/include/access/gin.h @@ -4,7 +4,7 @@ * * Copyright (c) 2006-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/access/gin.h,v 1.41 2010/08/01 19:16:39 tgl Exp $ + * src/include/access/gin.h *-------------------------------------------------------------------------- */ #ifndef GIN_H diff --git a/src/include/access/gist.h b/src/include/access/gist.h index c3c5493f76..0d9449b991 100644 --- a/src/include/access/gist.h +++ b/src/include/access/gist.h @@ -9,7 +9,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/gist.h,v 1.63 2010/01/02 16:58:00 momjian Exp $ + * src/include/access/gist.h * *------------------------------------------------------------------------- */ diff --git a/src/include/access/gist_private.h b/src/include/access/gist_private.h index a85da662ce..34cc5d5a8b 100644 --- a/src/include/access/gist_private.h +++ b/src/include/access/gist_private.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/gist_private.h,v 1.38 2010/01/02 16:58:00 momjian Exp $ + * src/include/access/gist_private.h * *------------------------------------------------------------------------- */ diff --git a/src/include/access/gistscan.h b/src/include/access/gistscan.h index cad5fe55c7..cb0e23771c 100644 --- a/src/include/access/gistscan.h +++ b/src/include/access/gistscan.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/gistscan.h,v 1.35 2010/01/02 16:58:00 momjian Exp $ + * src/include/access/gistscan.h * *------------------------------------------------------------------------- */ diff --git a/src/include/access/hash.h b/src/include/access/hash.h index 39337194e2..d5899f4d57 100644 --- a/src/include/access/hash.h +++ b/src/include/access/hash.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/hash.h,v 1.96 2010/01/02 16:58:00 momjian Exp $ + * src/include/access/hash.h * * NOTES * modeled after Margo Seltzer's hash implementation for unix. diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h index 521f9588fe..45e100c39b 100644 --- a/src/include/access/heapam.h +++ b/src/include/access/heapam.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/heapam.h,v 1.149 2010/04/21 17:20:56 sriggs Exp $ + * src/include/access/heapam.h * *------------------------------------------------------------------------- */ diff --git a/src/include/access/hio.h b/src/include/access/hio.h index 2464d53225..ea97e10957 100644 --- a/src/include/access/hio.h +++ b/src/include/access/hio.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/hio.h,v 1.40 2010/01/02 16:58:00 momjian Exp $ + * src/include/access/hio.h * *------------------------------------------------------------------------- */ diff --git a/src/include/access/htup.h b/src/include/access/htup.h index 3be701bf6f..adf1321052 100644 --- a/src/include/access/htup.h +++ b/src/include/access/htup.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/htup.h,v 1.113 2010/02/26 02:01:21 momjian Exp $ + * src/include/access/htup.h * *------------------------------------------------------------------------- */ diff --git a/src/include/access/itup.h b/src/include/access/itup.h index c2d3eac995..da937fca09 100644 --- a/src/include/access/itup.h +++ b/src/include/access/itup.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/itup.h,v 1.55 2010/02/26 02:01:21 momjian Exp $ + * src/include/access/itup.h * *------------------------------------------------------------------------- */ diff --git a/src/include/access/multixact.h b/src/include/access/multixact.h index c9a3a3d52d..565848e5e5 100644 --- a/src/include/access/multixact.h +++ b/src/include/access/multixact.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/multixact.h,v 1.16 2010/01/02 16:58:00 momjian Exp $ + * src/include/access/multixact.h */ #ifndef MULTIXACT_H #define MULTIXACT_H diff --git a/src/include/access/nbtree.h b/src/include/access/nbtree.h index e3426f6ea2..3bbc4d1cda 100644 --- a/src/include/access/nbtree.h +++ b/src/include/access/nbtree.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/nbtree.h,v 1.135 2010/07/06 19:19:00 momjian Exp $ + * src/include/access/nbtree.h * *------------------------------------------------------------------------- */ diff --git a/src/include/access/printtup.h b/src/include/access/printtup.h index cfd8d2aef9..500268ed3b 100644 --- a/src/include/access/printtup.h +++ b/src/include/access/printtup.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/printtup.h,v 1.39 2010/01/02 16:58:00 momjian Exp $ + * src/include/access/printtup.h * *------------------------------------------------------------------------- */ diff --git a/src/include/access/reloptions.h b/src/include/access/reloptions.h index 2756eabff0..9bba58bc2f 100644 --- a/src/include/access/reloptions.h +++ b/src/include/access/reloptions.h @@ -12,7 +12,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/reloptions.h,v 1.19 2010/01/22 16:40:19 rhaas Exp $ + * src/include/access/reloptions.h * *------------------------------------------------------------------------- */ diff --git a/src/include/access/relscan.h b/src/include/access/relscan.h index e667755240..b4ec01ed12 100644 --- a/src/include/access/relscan.h +++ b/src/include/access/relscan.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/relscan.h,v 1.70 2010/02/26 02:01:21 momjian Exp $ + * src/include/access/relscan.h * *------------------------------------------------------------------------- */ diff --git a/src/include/access/rewriteheap.h b/src/include/access/rewriteheap.h index bc52b8f71d..b89dc66676 100644 --- a/src/include/access/rewriteheap.h +++ b/src/include/access/rewriteheap.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994-5, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/rewriteheap.h,v 1.7 2010/01/02 16:58:00 momjian Exp $ + * src/include/access/rewriteheap.h * *------------------------------------------------------------------------- */ diff --git a/src/include/access/rmgr.h b/src/include/access/rmgr.h index 72ee757f70..83abba359a 100644 --- a/src/include/access/rmgr.h +++ b/src/include/access/rmgr.h @@ -3,7 +3,7 @@ * * Resource managers definition * - * $PostgreSQL: pgsql/src/include/access/rmgr.h,v 1.21 2010/02/07 20:48:11 tgl Exp $ + * src/include/access/rmgr.h */ #ifndef RMGR_H #define RMGR_H diff --git a/src/include/access/sdir.h b/src/include/access/sdir.h index 35ba8add96..9aae49c6e3 100644 --- a/src/include/access/sdir.h +++ b/src/include/access/sdir.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/sdir.h,v 1.22 2010/01/02 16:58:00 momjian Exp $ + * src/include/access/sdir.h * *------------------------------------------------------------------------- */ diff --git a/src/include/access/skey.h b/src/include/access/skey.h index 8cf71377f2..fcf81ba6ab 100644 --- a/src/include/access/skey.h +++ b/src/include/access/skey.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/skey.h,v 1.40 2010/02/26 02:01:21 momjian Exp $ + * src/include/access/skey.h * *------------------------------------------------------------------------- */ diff --git a/src/include/access/slru.h b/src/include/access/slru.h index aff5578c8f..710cca70ac 100644 --- a/src/include/access/slru.h +++ b/src/include/access/slru.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/slru.h,v 1.27 2010/02/26 02:01:21 momjian Exp $ + * src/include/access/slru.h * *------------------------------------------------------------------------- */ diff --git a/src/include/access/subtrans.h b/src/include/access/subtrans.h index 73996b3b83..9ad51976b5 100644 --- a/src/include/access/subtrans.h +++ b/src/include/access/subtrans.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/subtrans.h,v 1.14 2010/01/02 16:58:00 momjian Exp $ + * src/include/access/subtrans.h */ #ifndef SUBTRANS_H #define SUBTRANS_H diff --git a/src/include/access/sysattr.h b/src/include/access/sysattr.h index 6047735c09..5f9264dd88 100644 --- a/src/include/access/sysattr.h +++ b/src/include/access/sysattr.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/sysattr.h,v 1.3 2010/01/02 16:58:00 momjian Exp $ + * src/include/access/sysattr.h * *------------------------------------------------------------------------- */ diff --git a/src/include/access/transam.h b/src/include/access/transam.h index 626e0bdd25..a7ae7528ec 100644 --- a/src/include/access/transam.h +++ b/src/include/access/transam.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/transam.h,v 1.72 2010/01/02 16:58:00 momjian Exp $ + * src/include/access/transam.h * *------------------------------------------------------------------------- */ diff --git a/src/include/access/tupconvert.h b/src/include/access/tupconvert.h index 3f3fc280e3..8b5ff2818c 100644 --- a/src/include/access/tupconvert.h +++ b/src/include/access/tupconvert.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/tupconvert.h,v 1.3 2010/02/26 02:01:21 momjian Exp $ + * src/include/access/tupconvert.h * *------------------------------------------------------------------------- */ diff --git a/src/include/access/tupdesc.h b/src/include/access/tupdesc.h index e38a6e768f..f9f2900919 100644 --- a/src/include/access/tupdesc.h +++ b/src/include/access/tupdesc.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/tupdesc.h,v 1.55 2010/01/02 16:58:00 momjian Exp $ + * src/include/access/tupdesc.h * *------------------------------------------------------------------------- */ diff --git a/src/include/access/tupmacs.h b/src/include/access/tupmacs.h index c7475331d6..4173b81000 100644 --- a/src/include/access/tupmacs.h +++ b/src/include/access/tupmacs.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/tupmacs.h,v 1.38 2010/01/02 16:58:00 momjian Exp $ + * src/include/access/tupmacs.h * *------------------------------------------------------------------------- */ diff --git a/src/include/access/tuptoaster.h b/src/include/access/tuptoaster.h index bb3be61365..ae50bdcae8 100644 --- a/src/include/access/tuptoaster.h +++ b/src/include/access/tuptoaster.h @@ -6,7 +6,7 @@ * * Copyright (c) 2000-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/access/tuptoaster.h,v 1.46 2010/02/26 02:01:21 momjian Exp $ + * src/include/access/tuptoaster.h * *------------------------------------------------------------------------- */ diff --git a/src/include/access/twophase.h b/src/include/access/twophase.h index ea3c9966c7..7f30d6ce18 100644 --- a/src/include/access/twophase.h +++ b/src/include/access/twophase.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/twophase.h,v 1.15 2010/04/13 14:17:46 heikki Exp $ + * src/include/access/twophase.h * *------------------------------------------------------------------------- */ diff --git a/src/include/access/twophase_rmgr.h b/src/include/access/twophase_rmgr.h index 1d4d1cb221..0dba7cfb15 100644 --- a/src/include/access/twophase_rmgr.h +++ b/src/include/access/twophase_rmgr.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/twophase_rmgr.h,v 1.12 2010/02/16 22:34:50 tgl Exp $ + * src/include/access/twophase_rmgr.h * *------------------------------------------------------------------------- */ diff --git a/src/include/access/valid.h b/src/include/access/valid.h index cdb70bba60..a679c6a60c 100644 --- a/src/include/access/valid.h +++ b/src/include/access/valid.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/valid.h,v 1.42 2010/01/02 16:58:00 momjian Exp $ + * src/include/access/valid.h * *------------------------------------------------------------------------- */ diff --git a/src/include/access/visibilitymap.h b/src/include/access/visibilitymap.h index 652e966e95..be22bb9f1b 100644 --- a/src/include/access/visibilitymap.h +++ b/src/include/access/visibilitymap.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 2007-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/visibilitymap.h,v 1.6 2010/01/02 16:58:00 momjian Exp $ + * src/include/access/visibilitymap.h * *------------------------------------------------------------------------- */ diff --git a/src/include/access/xact.h b/src/include/access/xact.h index aa670a22ac..ff391726b2 100644 --- a/src/include/access/xact.h +++ b/src/include/access/xact.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/xact.h,v 1.104 2010/09/11 18:38:58 joe Exp $ + * src/include/access/xact.h * *------------------------------------------------------------------------- */ diff --git a/src/include/access/xlog.h b/src/include/access/xlog.h index ea156d3834..fa7ae2ac12 100644 --- a/src/include/access/xlog.h +++ b/src/include/access/xlog.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/xlog.h,v 1.117 2010/09/15 10:35:05 heikki Exp $ + * src/include/access/xlog.h */ #ifndef XLOG_H #define XLOG_H diff --git a/src/include/access/xlog_internal.h b/src/include/access/xlog_internal.h index f026728dd1..370c989ac0 100644 --- a/src/include/access/xlog_internal.h +++ b/src/include/access/xlog_internal.h @@ -11,7 +11,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/xlog_internal.h,v 1.34 2010/08/13 20:10:53 rhaas Exp $ + * src/include/access/xlog_internal.h */ #ifndef XLOG_INTERNAL_H #define XLOG_INTERNAL_H diff --git a/src/include/access/xlogdefs.h b/src/include/access/xlogdefs.h index 0760b25930..18b214e992 100644 --- a/src/include/access/xlogdefs.h +++ b/src/include/access/xlogdefs.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/xlogdefs.h,v 1.26 2010/02/19 10:51:04 heikki Exp $ + * src/include/access/xlogdefs.h */ #ifndef XLOG_DEFS_H #define XLOG_DEFS_H diff --git a/src/include/access/xlogutils.h b/src/include/access/xlogutils.h index e6cdb2f7dc..cda5b8e162 100644 --- a/src/include/access/xlogutils.h +++ b/src/include/access/xlogutils.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/xlogutils.h,v 1.30 2010/01/02 16:58:01 momjian Exp $ + * src/include/access/xlogutils.h */ #ifndef XLOG_UTILS_H #define XLOG_UTILS_H diff --git a/src/include/bootstrap/bootstrap.h b/src/include/bootstrap/bootstrap.h index 5e989eff4e..90ab1ce6d8 100644 --- a/src/include/bootstrap/bootstrap.h +++ b/src/include/bootstrap/bootstrap.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/bootstrap/bootstrap.h,v 1.55 2010/01/15 09:19:06 heikki Exp $ + * src/include/bootstrap/bootstrap.h * *------------------------------------------------------------------------- */ diff --git a/src/include/c.h b/src/include/c.h index bec1a8cc85..0686ad3d07 100644 --- a/src/include/c.h +++ b/src/include/c.h @@ -12,7 +12,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/c.h,v 1.241 2010/05/27 07:59:48 itagaki Exp $ + * src/include/c.h * *------------------------------------------------------------------------- */ diff --git a/src/include/catalog/catalog.h b/src/include/catalog/catalog.h index 6ba729a251..97c808bc50 100644 --- a/src/include/catalog/catalog.h +++ b/src/include/catalog/catalog.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/catalog.h,v 1.50 2010/08/13 20:10:53 rhaas Exp $ + * src/include/catalog/catalog.h * *------------------------------------------------------------------------- */ diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h index fef5e686a0..f88730e2d2 100644 --- a/src/include/catalog/catversion.h +++ b/src/include/catalog/catversion.h @@ -37,7 +37,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.598 2010/09/03 01:34:55 tgl Exp $ + * src/include/catalog/catversion.h * *------------------------------------------------------------------------- */ diff --git a/src/include/catalog/dependency.h b/src/include/catalog/dependency.h index 93c2073d26..ccde371f6a 100644 --- a/src/include/catalog/dependency.h +++ b/src/include/catalog/dependency.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/dependency.h,v 1.46 2010/08/27 11:47:41 rhaas Exp $ + * src/include/catalog/dependency.h * *------------------------------------------------------------------------- */ diff --git a/src/include/catalog/duplicate_oids b/src/include/catalog/duplicate_oids index ded692ca8a..3f3d9f69a8 100755 --- a/src/include/catalog/duplicate_oids +++ b/src/include/catalog/duplicate_oids @@ -2,7 +2,7 @@ # # duplicate_oids # -# $PostgreSQL: pgsql/src/include/catalog/duplicate_oids,v 1.9 2009/09/26 22:42:01 tgl Exp $ +# src/include/catalog/duplicate_oids # # finds manually-assigned oids that are duplicated in the system tables. # diff --git a/src/include/catalog/genbki.h b/src/include/catalog/genbki.h index 9d92ca7b31..7cd57befa9 100644 --- a/src/include/catalog/genbki.h +++ b/src/include/catalog/genbki.h @@ -12,7 +12,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/genbki.h,v 1.7 2010/09/03 01:34:55 tgl Exp $ + * src/include/catalog/genbki.h * *------------------------------------------------------------------------- */ diff --git a/src/include/catalog/heap.h b/src/include/catalog/heap.h index 681239a5c9..7795bda323 100644 --- a/src/include/catalog/heap.h +++ b/src/include/catalog/heap.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/heap.h,v 1.99 2010/07/25 23:21:22 rhaas Exp $ + * src/include/catalog/heap.h * *------------------------------------------------------------------------- */ diff --git a/src/include/catalog/index.h b/src/include/catalog/index.h index 6b5f3c43c8..66a6002ab8 100644 --- a/src/include/catalog/index.h +++ b/src/include/catalog/index.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/index.h,v 1.83 2010/02/07 22:40:33 tgl Exp $ + * src/include/catalog/index.h * *------------------------------------------------------------------------- */ diff --git a/src/include/catalog/indexing.h b/src/include/catalog/indexing.h index 752a35ef0d..38c48b9563 100644 --- a/src/include/catalog/indexing.h +++ b/src/include/catalog/indexing.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/indexing.h,v 1.117 2010/02/26 02:01:21 momjian Exp $ + * src/include/catalog/indexing.h * *------------------------------------------------------------------------- */ diff --git a/src/include/catalog/namespace.h b/src/include/catalog/namespace.h index 4fb0556210..c6672e955e 100644 --- a/src/include/catalog/namespace.h +++ b/src/include/catalog/namespace.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/namespace.h,v 1.64 2010/08/05 15:25:36 rhaas Exp $ + * src/include/catalog/namespace.h * *------------------------------------------------------------------------- */ diff --git a/src/include/catalog/objectaddress.h b/src/include/catalog/objectaddress.h index 780d915dab..0ec24bdd30 100644 --- a/src/include/catalog/objectaddress.h +++ b/src/include/catalog/objectaddress.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/objectaddress.h,v 1.1 2010/08/27 11:47:41 rhaas Exp $ + * src/include/catalog/objectaddress.h * *------------------------------------------------------------------------- */ diff --git a/src/include/catalog/pg_aggregate.h b/src/include/catalog/pg_aggregate.h index 0fc28df804..5ac3492bc6 100644 --- a/src/include/catalog/pg_aggregate.h +++ b/src/include/catalog/pg_aggregate.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_aggregate.h,v 1.72 2010/08/05 18:21:17 tgl Exp $ + * src/include/catalog/pg_aggregate.h * * NOTES * the genbki.pl script reads this file and generates .bki diff --git a/src/include/catalog/pg_am.h b/src/include/catalog/pg_am.h index 0daa0b67af..c9b8e2d766 100644 --- a/src/include/catalog/pg_am.h +++ b/src/include/catalog/pg_am.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_am.h,v 1.65 2010/01/05 01:06:56 tgl Exp $ + * src/include/catalog/pg_am.h * * NOTES * the genbki.pl script reads this file and generates .bki diff --git a/src/include/catalog/pg_amop.h b/src/include/catalog/pg_amop.h index 1f0c1d81d6..d5cf859539 100644 --- a/src/include/catalog/pg_amop.h +++ b/src/include/catalog/pg_amop.h @@ -29,7 +29,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_amop.h,v 1.93 2010/01/14 16:31:09 teodor Exp $ + * src/include/catalog/pg_amop.h * * NOTES * the genbki.pl script reads this file and generates .bki diff --git a/src/include/catalog/pg_amproc.h b/src/include/catalog/pg_amproc.h index 0f0f6e1fe0..3b549178af 100644 --- a/src/include/catalog/pg_amproc.h +++ b/src/include/catalog/pg_amproc.h @@ -22,7 +22,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_amproc.h,v 1.78 2010/01/14 16:31:09 teodor Exp $ + * src/include/catalog/pg_amproc.h * * NOTES * the genbki.pl script reads this file and generates .bki diff --git a/src/include/catalog/pg_attrdef.h b/src/include/catalog/pg_attrdef.h index 1b3153a7e7..d55479b6bc 100644 --- a/src/include/catalog/pg_attrdef.h +++ b/src/include/catalog/pg_attrdef.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_attrdef.h,v 1.27 2010/09/03 01:34:55 tgl Exp $ + * src/include/catalog/pg_attrdef.h * * NOTES * the genbki.pl script reads this file and generates .bki diff --git a/src/include/catalog/pg_attribute.h b/src/include/catalog/pg_attribute.h index 5381975a51..2a1b593c34 100644 --- a/src/include/catalog/pg_attribute.h +++ b/src/include/catalog/pg_attribute.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_attribute.h,v 1.158 2010/01/22 16:40:19 rhaas Exp $ + * src/include/catalog/pg_attribute.h * * NOTES * the genbki.pl script reads this file and generates .bki diff --git a/src/include/catalog/pg_auth_members.h b/src/include/catalog/pg_auth_members.h index 0b4b446750..91e4dd1dc3 100644 --- a/src/include/catalog/pg_auth_members.h +++ b/src/include/catalog/pg_auth_members.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_auth_members.h,v 1.9 2010/04/20 23:48:47 tgl Exp $ + * src/include/catalog/pg_auth_members.h * * NOTES * the genbki.pl script reads this file and generates .bki diff --git a/src/include/catalog/pg_authid.h b/src/include/catalog/pg_authid.h index 9891e57d1e..aaba0febc0 100644 --- a/src/include/catalog/pg_authid.h +++ b/src/include/catalog/pg_authid.h @@ -10,7 +10,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_authid.h,v 1.13 2010/04/20 23:48:47 tgl Exp $ + * src/include/catalog/pg_authid.h * * NOTES * the genbki.pl script reads this file and generates .bki diff --git a/src/include/catalog/pg_cast.h b/src/include/catalog/pg_cast.h index db2333d4d9..7e33b94b8f 100644 --- a/src/include/catalog/pg_cast.h +++ b/src/include/catalog/pg_cast.h @@ -10,7 +10,7 @@ * * Copyright (c) 2002-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/catalog/pg_cast.h,v 1.46 2010/09/03 01:34:55 tgl Exp $ + * src/include/catalog/pg_cast.h * * NOTES * the genbki.pl script reads this file and generates .bki diff --git a/src/include/catalog/pg_class.h b/src/include/catalog/pg_class.h index 2296fa2708..f50cf9d55b 100644 --- a/src/include/catalog/pg_class.h +++ b/src/include/catalog/pg_class.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_class.h,v 1.122 2010/02/26 02:01:21 momjian Exp $ + * src/include/catalog/pg_class.h * * NOTES * the genbki.pl script reads this file and generates .bki diff --git a/src/include/catalog/pg_constraint.h b/src/include/catalog/pg_constraint.h index bbfd576733..49e7c31d86 100644 --- a/src/include/catalog/pg_constraint.h +++ b/src/include/catalog/pg_constraint.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_constraint.h,v 1.42 2010/09/03 01:34:55 tgl Exp $ + * src/include/catalog/pg_constraint.h * * NOTES * the genbki.pl script reads this file and generates .bki diff --git a/src/include/catalog/pg_control.h b/src/include/catalog/pg_control.h index b905cc6976..d386165933 100644 --- a/src/include/catalog/pg_control.h +++ b/src/include/catalog/pg_control.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_control.h,v 1.58 2010/08/12 23:24:54 rhaas Exp $ + * src/include/catalog/pg_control.h * *------------------------------------------------------------------------- */ diff --git a/src/include/catalog/pg_conversion.h b/src/include/catalog/pg_conversion.h index 5c894940d0..c3a3b3c830 100644 --- a/src/include/catalog/pg_conversion.h +++ b/src/include/catalog/pg_conversion.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_conversion.h,v 1.24 2010/01/05 01:06:56 tgl Exp $ + * src/include/catalog/pg_conversion.h * * NOTES * the genbki.pl script reads this file and generates .bki diff --git a/src/include/catalog/pg_conversion_fn.h b/src/include/catalog/pg_conversion_fn.h index 3086936496..01b9355510 100644 --- a/src/include/catalog/pg_conversion_fn.h +++ b/src/include/catalog/pg_conversion_fn.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_conversion_fn.h,v 1.6 2010/02/02 18:52:33 rhaas Exp $ + * src/include/catalog/pg_conversion_fn.h * *------------------------------------------------------------------------- */ diff --git a/src/include/catalog/pg_database.h b/src/include/catalog/pg_database.h index b9b45a4c5d..bfed2e2bdc 100644 --- a/src/include/catalog/pg_database.h +++ b/src/include/catalog/pg_database.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_database.h,v 1.53 2010/01/05 01:06:56 tgl Exp $ + * src/include/catalog/pg_database.h * * NOTES * the genbki.pl script reads this file and generates .bki diff --git a/src/include/catalog/pg_db_role_setting.h b/src/include/catalog/pg_db_role_setting.h index 11b0ed6791..64816b1b77 100644 --- a/src/include/catalog/pg_db_role_setting.h +++ b/src/include/catalog/pg_db_role_setting.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_db_role_setting.h,v 1.4 2010/02/26 02:01:21 momjian Exp $ + * src/include/catalog/pg_db_role_setting.h * * NOTES * the genbki.pl script reads this file and generates .bki diff --git a/src/include/catalog/pg_default_acl.h b/src/include/catalog/pg_default_acl.h index 8ea9ea48af..8f2d88ef3d 100644 --- a/src/include/catalog/pg_default_acl.h +++ b/src/include/catalog/pg_default_acl.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_default_acl.h,v 1.4 2010/02/26 02:01:21 momjian Exp $ + * src/include/catalog/pg_default_acl.h * * NOTES * the genbki.pl script reads this file and generates .bki diff --git a/src/include/catalog/pg_depend.h b/src/include/catalog/pg_depend.h index 0eec51b5ac..6d78250339 100644 --- a/src/include/catalog/pg_depend.h +++ b/src/include/catalog/pg_depend.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_depend.h,v 1.13 2010/01/05 01:06:56 tgl Exp $ + * src/include/catalog/pg_depend.h * * NOTES * the genbki.pl script reads this file and generates .bki diff --git a/src/include/catalog/pg_description.h b/src/include/catalog/pg_description.h index 9e792b375b..e75560e0ab 100644 --- a/src/include/catalog/pg_description.h +++ b/src/include/catalog/pg_description.h @@ -22,7 +22,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_description.h,v 1.30 2010/01/05 01:06:56 tgl Exp $ + * src/include/catalog/pg_description.h * * NOTES * the genbki.pl script reads this file and generates .bki diff --git a/src/include/catalog/pg_enum.h b/src/include/catalog/pg_enum.h index fc05b4004a..28da42bf54 100644 --- a/src/include/catalog/pg_enum.h +++ b/src/include/catalog/pg_enum.h @@ -7,7 +7,7 @@ * * Copyright (c) 2006-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/catalog/pg_enum.h,v 1.9 2010/02/26 02:01:21 momjian Exp $ + * src/include/catalog/pg_enum.h * * NOTES * the genbki.pl script reads this file and generates .bki diff --git a/src/include/catalog/pg_foreign_data_wrapper.h b/src/include/catalog/pg_foreign_data_wrapper.h index a3f3b060e4..6dd01e60f6 100644 --- a/src/include/catalog/pg_foreign_data_wrapper.h +++ b/src/include/catalog/pg_foreign_data_wrapper.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_foreign_data_wrapper.h,v 1.5 2010/01/05 01:06:56 tgl Exp $ + * src/include/catalog/pg_foreign_data_wrapper.h * * NOTES * the genbki.pl script reads this file and generates .bki diff --git a/src/include/catalog/pg_foreign_server.h b/src/include/catalog/pg_foreign_server.h index e344fb621c..bb1e0a2f81 100644 --- a/src/include/catalog/pg_foreign_server.h +++ b/src/include/catalog/pg_foreign_server.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_foreign_server.h,v 1.5 2010/01/05 01:06:56 tgl Exp $ + * src/include/catalog/pg_foreign_server.h * * NOTES * the genbki.pl script reads this file and generates .bki diff --git a/src/include/catalog/pg_index.h b/src/include/catalog/pg_index.h index c6a1a22c02..3811e73363 100644 --- a/src/include/catalog/pg_index.h +++ b/src/include/catalog/pg_index.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_index.h,v 1.51 2010/09/03 01:34:55 tgl Exp $ + * src/include/catalog/pg_index.h * * NOTES * the genbki.pl script reads this file and generates .bki diff --git a/src/include/catalog/pg_inherits.h b/src/include/catalog/pg_inherits.h index 4a7320746c..74acd0516c 100644 --- a/src/include/catalog/pg_inherits.h +++ b/src/include/catalog/pg_inherits.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_inherits.h,v 1.30 2010/01/05 01:06:56 tgl Exp $ + * src/include/catalog/pg_inherits.h * * NOTES * the genbki.pl script reads this file and generates .bki diff --git a/src/include/catalog/pg_inherits_fn.h b/src/include/catalog/pg_inherits_fn.h index e22c497af5..42c703ebe0 100644 --- a/src/include/catalog/pg_inherits_fn.h +++ b/src/include/catalog/pg_inherits_fn.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_inherits_fn.h,v 1.3 2010/02/01 19:28:56 rhaas Exp $ + * src/include/catalog/pg_inherits_fn.h * *------------------------------------------------------------------------- */ diff --git a/src/include/catalog/pg_language.h b/src/include/catalog/pg_language.h index 4d4a590bbf..f9d7bda3c9 100644 --- a/src/include/catalog/pg_language.h +++ b/src/include/catalog/pg_language.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_language.h,v 1.37 2010/01/05 01:06:56 tgl Exp $ + * src/include/catalog/pg_language.h * * NOTES * the genbki.pl script reads this file and generates .bki diff --git a/src/include/catalog/pg_largeobject.h b/src/include/catalog/pg_largeobject.h index 78b3119ee2..87a02035f0 100644 --- a/src/include/catalog/pg_largeobject.h +++ b/src/include/catalog/pg_largeobject.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_largeobject.h,v 1.28 2010/02/26 02:01:21 momjian Exp $ + * src/include/catalog/pg_largeobject.h * * NOTES * the genbki.pl script reads this file and generates .bki diff --git a/src/include/catalog/pg_largeobject_metadata.h b/src/include/catalog/pg_largeobject_metadata.h index f13ff77e2f..b3dc19c610 100755 --- a/src/include/catalog/pg_largeobject_metadata.h +++ b/src/include/catalog/pg_largeobject_metadata.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_largeobject_metadata.h,v 1.4 2010/02/26 02:01:21 momjian Exp $ + * src/include/catalog/pg_largeobject_metadata.h * * NOTES * the genbki.pl script reads this file and generates .bki diff --git a/src/include/catalog/pg_namespace.h b/src/include/catalog/pg_namespace.h index cc576a51d4..1d866d4dc6 100644 --- a/src/include/catalog/pg_namespace.h +++ b/src/include/catalog/pg_namespace.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_namespace.h,v 1.27 2010/01/05 01:06:56 tgl Exp $ + * src/include/catalog/pg_namespace.h * * NOTES * the genbki.pl script reads this file and generates .bki diff --git a/src/include/catalog/pg_opclass.h b/src/include/catalog/pg_opclass.h index 6281121365..2921f382dd 100644 --- a/src/include/catalog/pg_opclass.h +++ b/src/include/catalog/pg_opclass.h @@ -28,7 +28,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_opclass.h,v 1.88 2010/01/14 16:31:09 teodor Exp $ + * src/include/catalog/pg_opclass.h * * NOTES * the genbki.pl script reads this file and generates .bki diff --git a/src/include/catalog/pg_operator.h b/src/include/catalog/pg_operator.h index b6c4701c74..468d3295ff 100644 --- a/src/include/catalog/pg_operator.h +++ b/src/include/catalog/pg_operator.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_operator.h,v 1.171 2010/07/16 02:15:54 tgl Exp $ + * src/include/catalog/pg_operator.h * * NOTES * the genbki.pl script reads this file and generates .bki diff --git a/src/include/catalog/pg_opfamily.h b/src/include/catalog/pg_opfamily.h index 5db9cb6f68..82157cfe18 100644 --- a/src/include/catalog/pg_opfamily.h +++ b/src/include/catalog/pg_opfamily.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_opfamily.h,v 1.14 2010/01/14 16:31:09 teodor Exp $ + * src/include/catalog/pg_opfamily.h * * NOTES * the genbki.pl script reads this file and generates .bki diff --git a/src/include/catalog/pg_pltemplate.h b/src/include/catalog/pg_pltemplate.h index 4a85536841..6befcfad7f 100644 --- a/src/include/catalog/pg_pltemplate.h +++ b/src/include/catalog/pg_pltemplate.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_pltemplate.h,v 1.14 2010/06/29 00:18:11 petere Exp $ + * src/include/catalog/pg_pltemplate.h * * NOTES * the genbki.pl script reads this file and generates .bki diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h index 33f5c218e3..61c6b27d1d 100644 --- a/src/include/catalog/pg_proc.h +++ b/src/include/catalog/pg_proc.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_proc.h,v 1.582 2010/09/03 01:34:55 tgl Exp $ + * src/include/catalog/pg_proc.h * * NOTES * The script catalog/genbki.pl reads this file and generates .bki diff --git a/src/include/catalog/pg_proc_fn.h b/src/include/catalog/pg_proc_fn.h index 0cb82b0426..0843201355 100644 --- a/src/include/catalog/pg_proc_fn.h +++ b/src/include/catalog/pg_proc_fn.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_proc_fn.h,v 1.8 2010/01/02 16:58:02 momjian Exp $ + * src/include/catalog/pg_proc_fn.h * *------------------------------------------------------------------------- */ diff --git a/src/include/catalog/pg_rewrite.h b/src/include/catalog/pg_rewrite.h index acb3e83b05..028d6aa902 100644 --- a/src/include/catalog/pg_rewrite.h +++ b/src/include/catalog/pg_rewrite.h @@ -11,7 +11,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_rewrite.h,v 1.36 2010/09/03 01:34:55 tgl Exp $ + * src/include/catalog/pg_rewrite.h * * NOTES * the genbki.pl script reads this file and generates .bki diff --git a/src/include/catalog/pg_shdepend.h b/src/include/catalog/pg_shdepend.h index 081876f250..d44fc574a6 100644 --- a/src/include/catalog/pg_shdepend.h +++ b/src/include/catalog/pg_shdepend.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_shdepend.h,v 1.12 2010/01/05 01:06:57 tgl Exp $ + * src/include/catalog/pg_shdepend.h * * NOTES * the genbki.pl script reads this file and generates .bki diff --git a/src/include/catalog/pg_shdescription.h b/src/include/catalog/pg_shdescription.h index 2a63b64559..483aad280e 100644 --- a/src/include/catalog/pg_shdescription.h +++ b/src/include/catalog/pg_shdescription.h @@ -15,7 +15,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_shdescription.h,v 1.9 2010/01/05 01:06:57 tgl Exp $ + * src/include/catalog/pg_shdescription.h * * NOTES * the genbki.pl script reads this file and generates .bki diff --git a/src/include/catalog/pg_statistic.h b/src/include/catalog/pg_statistic.h index 797774339d..246a98d46e 100644 --- a/src/include/catalog/pg_statistic.h +++ b/src/include/catalog/pg_statistic.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_statistic.h,v 1.42 2010/01/05 01:06:57 tgl Exp $ + * src/include/catalog/pg_statistic.h * * NOTES * the genbki.pl script reads this file and generates .bki diff --git a/src/include/catalog/pg_tablespace.h b/src/include/catalog/pg_tablespace.h index 1c189f5651..e165dd0d73 100644 --- a/src/include/catalog/pg_tablespace.h +++ b/src/include/catalog/pg_tablespace.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_tablespace.h,v 1.15 2010/01/05 21:53:59 rhaas Exp $ + * src/include/catalog/pg_tablespace.h * * NOTES * the genbki.pl script reads this file and generates .bki diff --git a/src/include/catalog/pg_trigger.h b/src/include/catalog/pg_trigger.h index 9a548dca86..46285ac303 100644 --- a/src/include/catalog/pg_trigger.h +++ b/src/include/catalog/pg_trigger.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_trigger.h,v 1.40 2010/09/03 01:34:55 tgl Exp $ + * src/include/catalog/pg_trigger.h * * NOTES * the genbki.pl script reads this file and generates .bki diff --git a/src/include/catalog/pg_ts_config.h b/src/include/catalog/pg_ts_config.h index fd459d85e6..386402de97 100644 --- a/src/include/catalog/pg_ts_config.h +++ b/src/include/catalog/pg_ts_config.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_ts_config.h,v 1.7 2010/01/05 01:06:57 tgl Exp $ + * src/include/catalog/pg_ts_config.h * * NOTES * the genbki.pl script reads this file and generates .bki diff --git a/src/include/catalog/pg_ts_config_map.h b/src/include/catalog/pg_ts_config_map.h index 051936c555..eb370ef437 100644 --- a/src/include/catalog/pg_ts_config_map.h +++ b/src/include/catalog/pg_ts_config_map.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_ts_config_map.h,v 1.7 2010/01/05 01:06:57 tgl Exp $ + * src/include/catalog/pg_ts_config_map.h * * NOTES * the genbki.pl script reads this file and generates .bki diff --git a/src/include/catalog/pg_ts_dict.h b/src/include/catalog/pg_ts_dict.h index 24ba3d6f8b..1f03e87884 100644 --- a/src/include/catalog/pg_ts_dict.h +++ b/src/include/catalog/pg_ts_dict.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_ts_dict.h,v 1.7 2010/01/05 01:06:57 tgl Exp $ + * src/include/catalog/pg_ts_dict.h * * NOTES * the genbki.pl script reads this file and generates .bki diff --git a/src/include/catalog/pg_ts_parser.h b/src/include/catalog/pg_ts_parser.h index 12332eadcc..c70d6d5046 100644 --- a/src/include/catalog/pg_ts_parser.h +++ b/src/include/catalog/pg_ts_parser.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_ts_parser.h,v 1.7 2010/01/05 01:06:57 tgl Exp $ + * src/include/catalog/pg_ts_parser.h * * NOTES * the genbki.pl script reads this file and generates .bki diff --git a/src/include/catalog/pg_ts_template.h b/src/include/catalog/pg_ts_template.h index 4270513115..510eec4430 100644 --- a/src/include/catalog/pg_ts_template.h +++ b/src/include/catalog/pg_ts_template.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_ts_template.h,v 1.8 2010/01/05 01:06:57 tgl Exp $ + * src/include/catalog/pg_ts_template.h * * NOTES * the genbki.pl script reads this file and generates .bki diff --git a/src/include/catalog/pg_type.h b/src/include/catalog/pg_type.h index 5d997dc731..fc2c3066f0 100644 --- a/src/include/catalog/pg_type.h +++ b/src/include/catalog/pg_type.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_type.h,v 1.213 2010/09/03 01:34:55 tgl Exp $ + * src/include/catalog/pg_type.h * * NOTES * the genbki.pl script reads this file and generates .bki diff --git a/src/include/catalog/pg_type_fn.h b/src/include/catalog/pg_type_fn.h index baf30127ab..cc7235071e 100644 --- a/src/include/catalog/pg_type_fn.h +++ b/src/include/catalog/pg_type_fn.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_type_fn.h,v 1.6 2010/01/02 16:58:02 momjian Exp $ + * src/include/catalog/pg_type_fn.h * *------------------------------------------------------------------------- */ diff --git a/src/include/catalog/pg_user_mapping.h b/src/include/catalog/pg_user_mapping.h index fb1ceb8f30..394ee181d6 100644 --- a/src/include/catalog/pg_user_mapping.h +++ b/src/include/catalog/pg_user_mapping.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_user_mapping.h,v 1.5 2010/01/05 01:06:57 tgl Exp $ + * src/include/catalog/pg_user_mapping.h * * NOTES * the genbki.pl script reads this file and generates .bki diff --git a/src/include/catalog/storage.h b/src/include/catalog/storage.h index 8449a7775e..d7b8731838 100644 --- a/src/include/catalog/storage.h +++ b/src/include/catalog/storage.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/storage.h,v 1.6 2010/08/13 20:10:53 rhaas Exp $ + * src/include/catalog/storage.h * *------------------------------------------------------------------------- */ diff --git a/src/include/catalog/toasting.h b/src/include/catalog/toasting.h index 056fd19b41..560d837d74 100644 --- a/src/include/catalog/toasting.h +++ b/src/include/catalog/toasting.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/toasting.h,v 1.14 2010/04/20 23:48:47 tgl Exp $ + * src/include/catalog/toasting.h * *------------------------------------------------------------------------- */ diff --git a/src/include/catalog/unused_oids b/src/include/catalog/unused_oids index 371473926c..97769d33d0 100755 --- a/src/include/catalog/unused_oids +++ b/src/include/catalog/unused_oids @@ -2,7 +2,7 @@ # # unused_oids # -# $PostgreSQL: pgsql/src/include/catalog/unused_oids,v 1.9 2009/09/26 22:42:03 tgl Exp $ +# src/include/catalog/unused_oids # # finds blocks of manually-assignable oids that have not already been # claimed by post_hackers. primarily useful for finding available diff --git a/src/include/commands/alter.h b/src/include/commands/alter.h index 83e735ae3e..5cee895f6c 100644 --- a/src/include/commands/alter.h +++ b/src/include/commands/alter.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/commands/alter.h,v 1.12 2010/01/02 16:58:03 momjian Exp $ + * src/include/commands/alter.h * *------------------------------------------------------------------------- */ diff --git a/src/include/commands/async.h b/src/include/commands/async.h index a9e4d42853..58bb594254 100644 --- a/src/include/commands/async.h +++ b/src/include/commands/async.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/commands/async.h,v 1.40 2010/02/16 22:34:57 tgl Exp $ + * src/include/commands/async.h * *------------------------------------------------------------------------- */ diff --git a/src/include/commands/cluster.h b/src/include/commands/cluster.h index 74b951f118..29a55be7f3 100644 --- a/src/include/commands/cluster.h +++ b/src/include/commands/cluster.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994-5, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/commands/cluster.h,v 1.42 2010/07/29 11:06:34 sriggs Exp $ + * src/include/commands/cluster.h * *------------------------------------------------------------------------- */ diff --git a/src/include/commands/comment.h b/src/include/commands/comment.h index f0bd45f97b..bc16536805 100644 --- a/src/include/commands/comment.h +++ b/src/include/commands/comment.h @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/src/include/commands/comment.h,v 1.26 2010/01/02 16:58:03 momjian Exp $ + * src/include/commands/comment.h * *------------------------------------------------------------------------- * diff --git a/src/include/commands/conversioncmds.h b/src/include/commands/conversioncmds.h index a281bab191..049e8c49ac 100644 --- a/src/include/commands/conversioncmds.h +++ b/src/include/commands/conversioncmds.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/commands/conversioncmds.h,v 1.19 2010/01/02 16:58:03 momjian Exp $ + * src/include/commands/conversioncmds.h * *------------------------------------------------------------------------- */ diff --git a/src/include/commands/copy.h b/src/include/commands/copy.h index b143101e4f..6d409e8bac 100644 --- a/src/include/commands/copy.h +++ b/src/include/commands/copy.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/commands/copy.h,v 1.33 2010/01/02 16:58:03 momjian Exp $ + * src/include/commands/copy.h * *------------------------------------------------------------------------- */ diff --git a/src/include/commands/dbcommands.h b/src/include/commands/dbcommands.h index 7da6e14ada..3d767c8fd1 100644 --- a/src/include/commands/dbcommands.h +++ b/src/include/commands/dbcommands.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/commands/dbcommands.h,v 1.51 2010/08/05 14:45:07 rhaas Exp $ + * src/include/commands/dbcommands.h * *------------------------------------------------------------------------- */ diff --git a/src/include/commands/defrem.h b/src/include/commands/defrem.h index 9620941a41..1dc1a7d194 100644 --- a/src/include/commands/defrem.h +++ b/src/include/commands/defrem.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/commands/defrem.h,v 1.104 2010/08/05 15:25:36 rhaas Exp $ + * src/include/commands/defrem.h * *------------------------------------------------------------------------- */ diff --git a/src/include/commands/discard.h b/src/include/commands/discard.h index a6ce65a7e8..6e2e52f13f 100644 --- a/src/include/commands/discard.h +++ b/src/include/commands/discard.h @@ -6,7 +6,7 @@ * * Copyright (c) 1996-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/commands/discard.h,v 1.6 2010/01/02 16:58:03 momjian Exp $ + * src/include/commands/discard.h * *------------------------------------------------------------------------- */ diff --git a/src/include/commands/explain.h b/src/include/commands/explain.h index 52d39937d0..760ba2273c 100644 --- a/src/include/commands/explain.h +++ b/src/include/commands/explain.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994-5, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/commands/explain.h,v 1.47 2010/02/26 02:01:24 momjian Exp $ + * src/include/commands/explain.h * *------------------------------------------------------------------------- */ diff --git a/src/include/commands/lockcmds.h b/src/include/commands/lockcmds.h index d4fdc2815a..52de59a448 100644 --- a/src/include/commands/lockcmds.h +++ b/src/include/commands/lockcmds.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/commands/lockcmds.h,v 1.11 2010/01/02 16:58:03 momjian Exp $ + * src/include/commands/lockcmds.h * *------------------------------------------------------------------------- */ diff --git a/src/include/commands/portalcmds.h b/src/include/commands/portalcmds.h index d155165c27..f7d4335be4 100644 --- a/src/include/commands/portalcmds.h +++ b/src/include/commands/portalcmds.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/commands/portalcmds.h,v 1.28 2010/01/02 16:58:03 momjian Exp $ + * src/include/commands/portalcmds.h * *------------------------------------------------------------------------- */ diff --git a/src/include/commands/prepare.h b/src/include/commands/prepare.h index 2f8c69f0b6..68251cd638 100644 --- a/src/include/commands/prepare.h +++ b/src/include/commands/prepare.h @@ -6,7 +6,7 @@ * * Copyright (c) 2002-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/commands/prepare.h,v 1.32 2010/01/02 16:58:03 momjian Exp $ + * src/include/commands/prepare.h * *------------------------------------------------------------------------- */ diff --git a/src/include/commands/proclang.h b/src/include/commands/proclang.h index 8cc72494f8..aa1fb34d1a 100644 --- a/src/include/commands/proclang.h +++ b/src/include/commands/proclang.h @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/src/include/commands/proclang.h,v 1.16 2010/08/05 14:45:08 rhaas Exp $ + * src/include/commands/proclang.h * *------------------------------------------------------------------------- * diff --git a/src/include/commands/schemacmds.h b/src/include/commands/schemacmds.h index 62562fad15..760d147e60 100644 --- a/src/include/commands/schemacmds.h +++ b/src/include/commands/schemacmds.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/commands/schemacmds.h,v 1.21 2010/01/02 16:58:03 momjian Exp $ + * src/include/commands/schemacmds.h * *------------------------------------------------------------------------- */ diff --git a/src/include/commands/sequence.h b/src/include/commands/sequence.h index 680dea3b30..5f566f6b8d 100644 --- a/src/include/commands/sequence.h +++ b/src/include/commands/sequence.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/commands/sequence.h,v 1.44 2010/01/07 04:53:35 tgl Exp $ + * src/include/commands/sequence.h * *------------------------------------------------------------------------- */ diff --git a/src/include/commands/tablecmds.h b/src/include/commands/tablecmds.h index 9cebb60f51..aed3960e49 100644 --- a/src/include/commands/tablecmds.h +++ b/src/include/commands/tablecmds.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/commands/tablecmds.h,v 1.48 2010/08/18 18:35:21 tgl Exp $ + * src/include/commands/tablecmds.h * *------------------------------------------------------------------------- */ diff --git a/src/include/commands/tablespace.h b/src/include/commands/tablespace.h index 44eed246a1..327fbc6c4f 100644 --- a/src/include/commands/tablespace.h +++ b/src/include/commands/tablespace.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/commands/tablespace.h,v 1.24 2010/08/05 14:45:08 rhaas Exp $ + * src/include/commands/tablespace.h * *------------------------------------------------------------------------- */ diff --git a/src/include/commands/trigger.h b/src/include/commands/trigger.h index 16a1b85923..08bb22a368 100644 --- a/src/include/commands/trigger.h +++ b/src/include/commands/trigger.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/commands/trigger.h,v 1.81 2010/08/05 15:25:36 rhaas Exp $ + * src/include/commands/trigger.h * *------------------------------------------------------------------------- */ diff --git a/src/include/commands/typecmds.h b/src/include/commands/typecmds.h index 4dc2d4f26d..2bff7e1c2b 100644 --- a/src/include/commands/typecmds.h +++ b/src/include/commands/typecmds.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/commands/typecmds.h,v 1.27 2010/01/02 16:58:03 momjian Exp $ + * src/include/commands/typecmds.h * *------------------------------------------------------------------------- */ diff --git a/src/include/commands/user.h b/src/include/commands/user.h index ffef486b83..476654abf6 100644 --- a/src/include/commands/user.h +++ b/src/include/commands/user.h @@ -4,7 +4,7 @@ * Commands for manipulating roles (formerly called users). * * - * $PostgreSQL: pgsql/src/include/commands/user.h,v 1.31 2009/11/18 21:57:56 tgl Exp $ + * src/include/commands/user.h * *------------------------------------------------------------------------- */ diff --git a/src/include/commands/vacuum.h b/src/include/commands/vacuum.h index 7fcb402813..ed50a399ca 100644 --- a/src/include/commands/vacuum.h +++ b/src/include/commands/vacuum.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/commands/vacuum.h,v 1.90 2010/08/01 22:38:11 tgl Exp $ + * src/include/commands/vacuum.h * *------------------------------------------------------------------------- */ diff --git a/src/include/commands/variable.h b/src/include/commands/variable.h index 2bb3831f34..dbd1fa23f5 100644 --- a/src/include/commands/variable.h +++ b/src/include/commands/variable.h @@ -5,7 +5,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/commands/variable.h,v 1.34 2010/01/02 16:58:03 momjian Exp $ + * src/include/commands/variable.h */ #ifndef VARIABLE_H #define VARIABLE_H diff --git a/src/include/commands/view.h b/src/include/commands/view.h index d8eae6bc6d..cffd1a0e17 100644 --- a/src/include/commands/view.h +++ b/src/include/commands/view.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/commands/view.h,v 1.29 2010/01/02 16:58:03 momjian Exp $ + * src/include/commands/view.h * *------------------------------------------------------------------------- */ diff --git a/src/include/executor/execdebug.h b/src/include/executor/execdebug.h index 12d8af70ee..5f713a46e7 100644 --- a/src/include/executor/execdebug.h +++ b/src/include/executor/execdebug.h @@ -10,7 +10,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/execdebug.h,v 1.36 2010/01/02 16:58:03 momjian Exp $ + * src/include/executor/execdebug.h * *------------------------------------------------------------------------- */ diff --git a/src/include/executor/execdefs.h b/src/include/executor/execdefs.h index 5141bc2c7d..36417815ee 100644 --- a/src/include/executor/execdefs.h +++ b/src/include/executor/execdefs.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/execdefs.h,v 1.23 2010/01/02 16:58:03 momjian Exp $ + * src/include/executor/execdefs.h * *------------------------------------------------------------------------- */ diff --git a/src/include/executor/execdesc.h b/src/include/executor/execdesc.h index da63ce0066..4fb57d2148 100644 --- a/src/include/executor/execdesc.h +++ b/src/include/executor/execdesc.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/execdesc.h,v 1.42 2010/01/02 16:58:03 momjian Exp $ + * src/include/executor/execdesc.h * *------------------------------------------------------------------------- */ diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h index 4cfbf7ad4d..1dddb032b5 100644 --- a/src/include/executor/executor.h +++ b/src/include/executor/executor.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/executor.h,v 1.171 2010/07/22 00:47:59 rhaas Exp $ + * src/include/executor/executor.h * *------------------------------------------------------------------------- */ diff --git a/src/include/executor/functions.h b/src/include/executor/functions.h index 7d934328ff..e9ed96c5fb 100644 --- a/src/include/executor/functions.h +++ b/src/include/executor/functions.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/functions.h,v 1.35 2010/01/02 16:58:03 momjian Exp $ + * src/include/executor/functions.h * *------------------------------------------------------------------------- */ diff --git a/src/include/executor/hashjoin.h b/src/include/executor/hashjoin.h index 4ac6ae3ce8..cd08345d9a 100644 --- a/src/include/executor/hashjoin.h +++ b/src/include/executor/hashjoin.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/hashjoin.h,v 1.53 2010/02/01 15:43:36 rhaas Exp $ + * src/include/executor/hashjoin.h * *------------------------------------------------------------------------- */ diff --git a/src/include/executor/instrument.h b/src/include/executor/instrument.h index a1f680daed..0634308f7d 100644 --- a/src/include/executor/instrument.h +++ b/src/include/executor/instrument.h @@ -6,7 +6,7 @@ * * Copyright (c) 2001-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/executor/instrument.h,v 1.24 2010/02/26 02:01:24 momjian Exp $ + * src/include/executor/instrument.h * *------------------------------------------------------------------------- */ diff --git a/src/include/executor/nodeAgg.h b/src/include/executor/nodeAgg.h index 5e7ab5913b..e551fc82b5 100644 --- a/src/include/executor/nodeAgg.h +++ b/src/include/executor/nodeAgg.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/nodeAgg.h,v 1.33 2010/07/12 17:01:06 tgl Exp $ + * src/include/executor/nodeAgg.h * *------------------------------------------------------------------------- */ diff --git a/src/include/executor/nodeAppend.h b/src/include/executor/nodeAppend.h index 9e3f293785..b7848c8610 100644 --- a/src/include/executor/nodeAppend.h +++ b/src/include/executor/nodeAppend.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/nodeAppend.h,v 1.31 2010/07/12 17:01:06 tgl Exp $ + * src/include/executor/nodeAppend.h * *------------------------------------------------------------------------- */ diff --git a/src/include/executor/nodeBitmapAnd.h b/src/include/executor/nodeBitmapAnd.h index fa09a790fb..248c1cc001 100644 --- a/src/include/executor/nodeBitmapAnd.h +++ b/src/include/executor/nodeBitmapAnd.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/nodeBitmapAnd.h,v 1.9 2010/07/12 17:01:06 tgl Exp $ + * src/include/executor/nodeBitmapAnd.h * *------------------------------------------------------------------------- */ diff --git a/src/include/executor/nodeBitmapHeapscan.h b/src/include/executor/nodeBitmapHeapscan.h index 472181881f..11c306d05c 100644 --- a/src/include/executor/nodeBitmapHeapscan.h +++ b/src/include/executor/nodeBitmapHeapscan.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/nodeBitmapHeapscan.h,v 1.9 2010/07/12 17:01:06 tgl Exp $ + * src/include/executor/nodeBitmapHeapscan.h * *------------------------------------------------------------------------- */ diff --git a/src/include/executor/nodeBitmapIndexscan.h b/src/include/executor/nodeBitmapIndexscan.h index bb4b28cc1a..d87db32798 100644 --- a/src/include/executor/nodeBitmapIndexscan.h +++ b/src/include/executor/nodeBitmapIndexscan.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/nodeBitmapIndexscan.h,v 1.9 2010/07/12 17:01:06 tgl Exp $ + * src/include/executor/nodeBitmapIndexscan.h * *------------------------------------------------------------------------- */ diff --git a/src/include/executor/nodeBitmapOr.h b/src/include/executor/nodeBitmapOr.h index 8987c700c5..a62b41049d 100644 --- a/src/include/executor/nodeBitmapOr.h +++ b/src/include/executor/nodeBitmapOr.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/nodeBitmapOr.h,v 1.9 2010/07/12 17:01:06 tgl Exp $ + * src/include/executor/nodeBitmapOr.h * *------------------------------------------------------------------------- */ diff --git a/src/include/executor/nodeCtescan.h b/src/include/executor/nodeCtescan.h index 22e6dd2152..550ca722db 100644 --- a/src/include/executor/nodeCtescan.h +++ b/src/include/executor/nodeCtescan.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/nodeCtescan.h,v 1.5 2010/07/12 17:01:06 tgl Exp $ + * src/include/executor/nodeCtescan.h * *------------------------------------------------------------------------- */ diff --git a/src/include/executor/nodeFunctionscan.h b/src/include/executor/nodeFunctionscan.h index 1584783ed0..74224eab35 100644 --- a/src/include/executor/nodeFunctionscan.h +++ b/src/include/executor/nodeFunctionscan.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/nodeFunctionscan.h,v 1.16 2010/07/12 17:01:06 tgl Exp $ + * src/include/executor/nodeFunctionscan.h * *------------------------------------------------------------------------- */ diff --git a/src/include/executor/nodeGroup.h b/src/include/executor/nodeGroup.h index 8af917a83f..4ec94497ae 100644 --- a/src/include/executor/nodeGroup.h +++ b/src/include/executor/nodeGroup.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/nodeGroup.h,v 1.36 2010/07/12 17:01:06 tgl Exp $ + * src/include/executor/nodeGroup.h * *------------------------------------------------------------------------- */ diff --git a/src/include/executor/nodeHash.h b/src/include/executor/nodeHash.h index 53348c435f..444a0137a2 100644 --- a/src/include/executor/nodeHash.h +++ b/src/include/executor/nodeHash.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/nodeHash.h,v 1.50 2010/07/12 17:01:06 tgl Exp $ + * src/include/executor/nodeHash.h * *------------------------------------------------------------------------- */ diff --git a/src/include/executor/nodeHashjoin.h b/src/include/executor/nodeHashjoin.h index 0a68e65f51..6ce305788d 100644 --- a/src/include/executor/nodeHashjoin.h +++ b/src/include/executor/nodeHashjoin.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/nodeHashjoin.h,v 1.41 2010/07/12 17:01:06 tgl Exp $ + * src/include/executor/nodeHashjoin.h * *------------------------------------------------------------------------- */ diff --git a/src/include/executor/nodeIndexscan.h b/src/include/executor/nodeIndexscan.h index 2a740a4f3e..48d35e4a48 100644 --- a/src/include/executor/nodeIndexscan.h +++ b/src/include/executor/nodeIndexscan.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/nodeIndexscan.h,v 1.37 2010/07/12 17:01:06 tgl Exp $ + * src/include/executor/nodeIndexscan.h * *------------------------------------------------------------------------- */ diff --git a/src/include/executor/nodeLimit.h b/src/include/executor/nodeLimit.h index 1e57eca559..078e677b1e 100644 --- a/src/include/executor/nodeLimit.h +++ b/src/include/executor/nodeLimit.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/nodeLimit.h,v 1.19 2010/07/12 17:01:06 tgl Exp $ + * src/include/executor/nodeLimit.h * *------------------------------------------------------------------------- */ diff --git a/src/include/executor/nodeLockRows.h b/src/include/executor/nodeLockRows.h index b3bb3a277c..6f0d7b2de0 100644 --- a/src/include/executor/nodeLockRows.h +++ b/src/include/executor/nodeLockRows.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/nodeLockRows.h,v 1.3 2010/07/12 17:01:06 tgl Exp $ + * src/include/executor/nodeLockRows.h * *------------------------------------------------------------------------- */ diff --git a/src/include/executor/nodeMaterial.h b/src/include/executor/nodeMaterial.h index ff1087b0cc..251779ec23 100644 --- a/src/include/executor/nodeMaterial.h +++ b/src/include/executor/nodeMaterial.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/nodeMaterial.h,v 1.31 2010/07/12 17:01:06 tgl Exp $ + * src/include/executor/nodeMaterial.h * *------------------------------------------------------------------------- */ diff --git a/src/include/executor/nodeMergejoin.h b/src/include/executor/nodeMergejoin.h index 6a176d90f0..300d74f3d2 100644 --- a/src/include/executor/nodeMergejoin.h +++ b/src/include/executor/nodeMergejoin.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/nodeMergejoin.h,v 1.30 2010/07/12 17:01:06 tgl Exp $ + * src/include/executor/nodeMergejoin.h * *------------------------------------------------------------------------- */ diff --git a/src/include/executor/nodeModifyTable.h b/src/include/executor/nodeModifyTable.h index 373ae1c13f..a8a28a4fde 100644 --- a/src/include/executor/nodeModifyTable.h +++ b/src/include/executor/nodeModifyTable.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/nodeModifyTable.h,v 1.3 2010/07/12 17:01:06 tgl Exp $ + * src/include/executor/nodeModifyTable.h * *------------------------------------------------------------------------- */ diff --git a/src/include/executor/nodeNestloop.h b/src/include/executor/nodeNestloop.h index 01e22b6082..90a7389994 100644 --- a/src/include/executor/nodeNestloop.h +++ b/src/include/executor/nodeNestloop.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/nodeNestloop.h,v 1.31 2010/07/12 17:01:06 tgl Exp $ + * src/include/executor/nodeNestloop.h * *------------------------------------------------------------------------- */ diff --git a/src/include/executor/nodeRecursiveunion.h b/src/include/executor/nodeRecursiveunion.h index 87d9888f86..c0dd58483d 100644 --- a/src/include/executor/nodeRecursiveunion.h +++ b/src/include/executor/nodeRecursiveunion.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/nodeRecursiveunion.h,v 1.5 2010/07/12 17:01:06 tgl Exp $ + * src/include/executor/nodeRecursiveunion.h * *------------------------------------------------------------------------- */ diff --git a/src/include/executor/nodeResult.h b/src/include/executor/nodeResult.h index 4c6234d688..610e37c266 100644 --- a/src/include/executor/nodeResult.h +++ b/src/include/executor/nodeResult.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/nodeResult.h,v 1.29 2010/07/12 17:01:06 tgl Exp $ + * src/include/executor/nodeResult.h * *------------------------------------------------------------------------- */ diff --git a/src/include/executor/nodeSeqscan.h b/src/include/executor/nodeSeqscan.h index 334fd44920..03b0d7cb4f 100644 --- a/src/include/executor/nodeSeqscan.h +++ b/src/include/executor/nodeSeqscan.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/nodeSeqscan.h,v 1.30 2010/07/12 17:01:06 tgl Exp $ + * src/include/executor/nodeSeqscan.h * *------------------------------------------------------------------------- */ diff --git a/src/include/executor/nodeSetOp.h b/src/include/executor/nodeSetOp.h index cdb0579afd..ae87ac8518 100644 --- a/src/include/executor/nodeSetOp.h +++ b/src/include/executor/nodeSetOp.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/nodeSetOp.h,v 1.19 2010/07/12 17:01:06 tgl Exp $ + * src/include/executor/nodeSetOp.h * *------------------------------------------------------------------------- */ diff --git a/src/include/executor/nodeSort.h b/src/include/executor/nodeSort.h index ee63274af2..32622bbc96 100644 --- a/src/include/executor/nodeSort.h +++ b/src/include/executor/nodeSort.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/nodeSort.h,v 1.28 2010/07/12 17:01:06 tgl Exp $ + * src/include/executor/nodeSort.h * *------------------------------------------------------------------------- */ diff --git a/src/include/executor/nodeSubplan.h b/src/include/executor/nodeSubplan.h index f925d5e2a6..f7536ea433 100644 --- a/src/include/executor/nodeSubplan.h +++ b/src/include/executor/nodeSubplan.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/nodeSubplan.h,v 1.30 2010/01/02 16:58:03 momjian Exp $ + * src/include/executor/nodeSubplan.h * *------------------------------------------------------------------------- */ diff --git a/src/include/executor/nodeSubqueryscan.h b/src/include/executor/nodeSubqueryscan.h index 1139ce3f3e..e7f3e24fee 100644 --- a/src/include/executor/nodeSubqueryscan.h +++ b/src/include/executor/nodeSubqueryscan.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/nodeSubqueryscan.h,v 1.19 2010/07/12 17:01:06 tgl Exp $ + * src/include/executor/nodeSubqueryscan.h * *------------------------------------------------------------------------- */ diff --git a/src/include/executor/nodeTidscan.h b/src/include/executor/nodeTidscan.h index 45b9b814cb..adceadf86c 100644 --- a/src/include/executor/nodeTidscan.h +++ b/src/include/executor/nodeTidscan.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/nodeTidscan.h,v 1.23 2010/07/12 17:01:06 tgl Exp $ + * src/include/executor/nodeTidscan.h * *------------------------------------------------------------------------- */ diff --git a/src/include/executor/nodeUnique.h b/src/include/executor/nodeUnique.h index 1c57a23fb1..3ae950d901 100644 --- a/src/include/executor/nodeUnique.h +++ b/src/include/executor/nodeUnique.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/nodeUnique.h,v 1.28 2010/07/12 17:01:06 tgl Exp $ + * src/include/executor/nodeUnique.h * *------------------------------------------------------------------------- */ diff --git a/src/include/executor/nodeValuesscan.h b/src/include/executor/nodeValuesscan.h index 049d66923a..5cb7889286 100644 --- a/src/include/executor/nodeValuesscan.h +++ b/src/include/executor/nodeValuesscan.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/nodeValuesscan.h,v 1.8 2010/07/12 17:01:06 tgl Exp $ + * src/include/executor/nodeValuesscan.h * *------------------------------------------------------------------------- */ diff --git a/src/include/executor/nodeWindowAgg.h b/src/include/executor/nodeWindowAgg.h index 5e944e45a8..de8e35d2d5 100644 --- a/src/include/executor/nodeWindowAgg.h +++ b/src/include/executor/nodeWindowAgg.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/nodeWindowAgg.h,v 1.5 2010/07/12 17:01:06 tgl Exp $ + * src/include/executor/nodeWindowAgg.h * *------------------------------------------------------------------------- */ diff --git a/src/include/executor/nodeWorktablescan.h b/src/include/executor/nodeWorktablescan.h index 53e465ce33..2b163e7611 100644 --- a/src/include/executor/nodeWorktablescan.h +++ b/src/include/executor/nodeWorktablescan.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/nodeWorktablescan.h,v 1.5 2010/07/12 17:01:06 tgl Exp $ + * src/include/executor/nodeWorktablescan.h * *------------------------------------------------------------------------- */ diff --git a/src/include/executor/spi.h b/src/include/executor/spi.h index 5ee60c16b7..96e29b9994 100644 --- a/src/include/executor/spi.h +++ b/src/include/executor/spi.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/spi.h,v 1.75 2010/02/26 02:01:24 momjian Exp $ + * src/include/executor/spi.h * *------------------------------------------------------------------------- */ diff --git a/src/include/executor/spi_priv.h b/src/include/executor/spi_priv.h index dc854521df..f14a5e3bdc 100644 --- a/src/include/executor/spi_priv.h +++ b/src/include/executor/spi_priv.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/spi_priv.h,v 1.35 2010/02/26 02:01:24 momjian Exp $ + * src/include/executor/spi_priv.h * *------------------------------------------------------------------------- */ diff --git a/src/include/executor/tstoreReceiver.h b/src/include/executor/tstoreReceiver.h index 02ec1f103b..2760cc73d6 100644 --- a/src/include/executor/tstoreReceiver.h +++ b/src/include/executor/tstoreReceiver.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/tstoreReceiver.h,v 1.15 2010/01/02 16:58:03 momjian Exp $ + * src/include/executor/tstoreReceiver.h * *------------------------------------------------------------------------- */ diff --git a/src/include/executor/tuptable.h b/src/include/executor/tuptable.h index 850f6a211f..f72349bc20 100644 --- a/src/include/executor/tuptable.h +++ b/src/include/executor/tuptable.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/tuptable.h,v 1.44 2010/01/02 16:58:03 momjian Exp $ + * src/include/executor/tuptable.h * *------------------------------------------------------------------------- */ diff --git a/src/include/fmgr.h b/src/include/fmgr.h index e588bb15d2..ca5a5eacf7 100644 --- a/src/include/fmgr.h +++ b/src/include/fmgr.h @@ -11,7 +11,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/fmgr.h,v 1.66 2010/05/27 07:59:48 itagaki Exp $ + * src/include/fmgr.h * *------------------------------------------------------------------------- */ diff --git a/src/include/foreign/foreign.h b/src/include/foreign/foreign.h index 814e057464..2305929b35 100644 --- a/src/include/foreign/foreign.h +++ b/src/include/foreign/foreign.h @@ -6,7 +6,7 @@ * * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/foreign/foreign.h,v 1.6 2010/01/02 16:58:03 momjian Exp $ + * src/include/foreign/foreign.h * *------------------------------------------------------------------------- */ diff --git a/src/include/funcapi.h b/src/include/funcapi.h index 8190f8abc3..aac4fe3d00 100644 --- a/src/include/funcapi.h +++ b/src/include/funcapi.h @@ -9,7 +9,7 @@ * * Copyright (c) 2002-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/funcapi.h,v 1.32 2010/02/26 02:01:20 momjian Exp $ + * src/include/funcapi.h * *------------------------------------------------------------------------- */ diff --git a/src/include/getaddrinfo.h b/src/include/getaddrinfo.h index b7733d2e6a..249dfbed2c 100644 --- a/src/include/getaddrinfo.h +++ b/src/include/getaddrinfo.h @@ -15,7 +15,7 @@ * * Copyright (c) 2003-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/getaddrinfo.h,v 1.27 2010/01/02 16:58:00 momjian Exp $ + * src/include/getaddrinfo.h * *------------------------------------------------------------------------- */ diff --git a/src/include/getopt_long.h b/src/include/getopt_long.h index 5c3bdd332c..3b05fadb38 100644 --- a/src/include/getopt_long.h +++ b/src/include/getopt_long.h @@ -4,7 +4,7 @@ * * Portions Copyright (c) 2003-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/getopt_long.h,v 1.12 2010/01/02 16:58:00 momjian Exp $ + * src/include/getopt_long.h */ #ifndef GETOPT_LONG_H #define GETOPT_LONG_H diff --git a/src/include/lib/dllist.h b/src/include/lib/dllist.h index b862f06247..1e651ecedd 100644 --- a/src/include/lib/dllist.h +++ b/src/include/lib/dllist.h @@ -34,7 +34,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/lib/dllist.h,v 1.30 2010/01/02 16:58:03 momjian Exp $ + * src/include/lib/dllist.h * *------------------------------------------------------------------------- */ diff --git a/src/include/lib/stringinfo.h b/src/include/lib/stringinfo.h index 93ef90a53d..72f873ebd4 100644 --- a/src/include/lib/stringinfo.h +++ b/src/include/lib/stringinfo.h @@ -10,7 +10,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/lib/stringinfo.h,v 1.38 2010/01/02 16:58:03 momjian Exp $ + * src/include/lib/stringinfo.h * *------------------------------------------------------------------------- */ diff --git a/src/include/libpq/auth.h b/src/include/libpq/auth.h index d87d95a257..00d4af5dcd 100644 --- a/src/include/libpq/auth.h +++ b/src/include/libpq/auth.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/libpq/auth.h,v 1.37 2010/01/02 16:58:04 momjian Exp $ + * src/include/libpq/auth.h * *------------------------------------------------------------------------- */ diff --git a/src/include/libpq/be-fsstubs.h b/src/include/libpq/be-fsstubs.h index d3dde65896..6583f1c4df 100644 --- a/src/include/libpq/be-fsstubs.h +++ b/src/include/libpq/be-fsstubs.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/libpq/be-fsstubs.h,v 1.35 2010/02/26 02:01:24 momjian Exp $ + * src/include/libpq/be-fsstubs.h * *------------------------------------------------------------------------- */ diff --git a/src/include/libpq/crypt.h b/src/include/libpq/crypt.h index 704661b77d..7d88cccd89 100644 --- a/src/include/libpq/crypt.h +++ b/src/include/libpq/crypt.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/libpq/crypt.h,v 1.39 2010/01/02 16:58:04 momjian Exp $ + * src/include/libpq/crypt.h * *------------------------------------------------------------------------- */ diff --git a/src/include/libpq/hba.h b/src/include/libpq/hba.h index 5f1365e3ba..b8e8df08e0 100644 --- a/src/include/libpq/hba.h +++ b/src/include/libpq/hba.h @@ -4,7 +4,7 @@ * Interface to hba.c * * - * $PostgreSQL: pgsql/src/include/libpq/hba.h,v 1.62 2010/04/19 19:02:18 sriggs Exp $ + * src/include/libpq/hba.h * *------------------------------------------------------------------------- */ diff --git a/src/include/libpq/ip.h b/src/include/libpq/ip.h index b6ab7827ed..2bcdbbc8d4 100644 --- a/src/include/libpq/ip.h +++ b/src/include/libpq/ip.h @@ -8,7 +8,7 @@ * * Copyright (c) 2003-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/libpq/ip.h,v 1.24 2010/02/26 02:01:24 momjian Exp $ + * src/include/libpq/ip.h * *------------------------------------------------------------------------- */ diff --git a/src/include/libpq/libpq-be.h b/src/include/libpq/libpq-be.h index 6ee4714489..83628c13f9 100644 --- a/src/include/libpq/libpq-be.h +++ b/src/include/libpq/libpq-be.h @@ -11,7 +11,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/libpq/libpq-be.h,v 1.74 2010/01/15 09:19:08 heikki Exp $ + * src/include/libpq/libpq-be.h * *------------------------------------------------------------------------- */ diff --git a/src/include/libpq/libpq-fs.h b/src/include/libpq/libpq-fs.h index 3a19830706..93c111bb7a 100644 --- a/src/include/libpq/libpq-fs.h +++ b/src/include/libpq/libpq-fs.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/libpq/libpq-fs.h,v 1.25 2010/01/02 16:58:04 momjian Exp $ + * src/include/libpq/libpq-fs.h * *------------------------------------------------------------------------- */ diff --git a/src/include/libpq/libpq.h b/src/include/libpq/libpq.h index 978d9a9aca..21eb29da2f 100644 --- a/src/include/libpq/libpq.h +++ b/src/include/libpq/libpq.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/libpq/libpq.h,v 1.75 2010/02/26 02:01:24 momjian Exp $ + * src/include/libpq/libpq.h * *------------------------------------------------------------------------- */ diff --git a/src/include/libpq/md5.h b/src/include/libpq/md5.h index decc6ddf12..072ce33860 100644 --- a/src/include/libpq/md5.h +++ b/src/include/libpq/md5.h @@ -9,7 +9,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/libpq/md5.h,v 1.8 2010/01/27 12:12:00 mha Exp $ + * src/include/libpq/md5.h * *------------------------------------------------------------------------- */ diff --git a/src/include/libpq/pqcomm.h b/src/include/libpq/pqcomm.h index df81db1dfe..82d210bd01 100644 --- a/src/include/libpq/pqcomm.h +++ b/src/include/libpq/pqcomm.h @@ -9,7 +9,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/libpq/pqcomm.h,v 1.111 2010/01/02 16:58:04 momjian Exp $ + * src/include/libpq/pqcomm.h * *------------------------------------------------------------------------- */ diff --git a/src/include/libpq/pqformat.h b/src/include/libpq/pqformat.h index 84d3a402cb..d6c2e6b234 100644 --- a/src/include/libpq/pqformat.h +++ b/src/include/libpq/pqformat.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/libpq/pqformat.h,v 1.29 2010/01/02 16:58:04 momjian Exp $ + * src/include/libpq/pqformat.h * *------------------------------------------------------------------------- */ diff --git a/src/include/libpq/pqsignal.h b/src/include/libpq/pqsignal.h index f6b5d5fb04..6e98d5329d 100644 --- a/src/include/libpq/pqsignal.h +++ b/src/include/libpq/pqsignal.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/libpq/pqsignal.h,v 1.41 2010/02/26 02:01:24 momjian Exp $ + * src/include/libpq/pqsignal.h * * NOTES * This shouldn't be in libpq, but the monitor and some other diff --git a/src/include/mb/pg_wchar.h b/src/include/mb/pg_wchar.h index 33e0c5ae08..475cab0dc0 100644 --- a/src/include/mb/pg_wchar.h +++ b/src/include/mb/pg_wchar.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/mb/pg_wchar.h,v 1.95 2010/08/18 19:54:01 tgl Exp $ + * src/include/mb/pg_wchar.h * * NOTES * This is used both by the backend and by libpq, but should not be diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h index a65bcda504..032875e36c 100644 --- a/src/include/miscadmin.h +++ b/src/include/miscadmin.h @@ -13,7 +13,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/miscadmin.h,v 1.221 2010/06/17 17:44:40 tgl Exp $ + * src/include/miscadmin.h * * NOTES * some of the information in this file should be moved to other files. diff --git a/src/include/nodes/bitmapset.h b/src/include/nodes/bitmapset.h index 95e8be3fcf..e75aa03f64 100644 --- a/src/include/nodes/bitmapset.h +++ b/src/include/nodes/bitmapset.h @@ -13,7 +13,7 @@ * * Copyright (c) 2003-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/nodes/bitmapset.h,v 1.12 2010/01/02 16:58:04 momjian Exp $ + * src/include/nodes/bitmapset.h * *------------------------------------------------------------------------- */ diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h index 6876ca0b8d..8a1f2ee047 100644 --- a/src/include/nodes/execnodes.h +++ b/src/include/nodes/execnodes.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/nodes/execnodes.h,v 1.220 2010/07/28 04:50:50 tgl Exp $ + * src/include/nodes/execnodes.h * *------------------------------------------------------------------------- */ diff --git a/src/include/nodes/makefuncs.h b/src/include/nodes/makefuncs.h index bf28a30086..3f59e9d40e 100644 --- a/src/include/nodes/makefuncs.h +++ b/src/include/nodes/makefuncs.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/nodes/makefuncs.h,v 1.71 2010/08/27 20:30:08 petere Exp $ + * src/include/nodes/makefuncs.h * *------------------------------------------------------------------------- */ diff --git a/src/include/nodes/memnodes.h b/src/include/nodes/memnodes.h index 51b2f748fa..74eff467c4 100644 --- a/src/include/nodes/memnodes.h +++ b/src/include/nodes/memnodes.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/nodes/memnodes.h,v 1.37 2010/01/02 16:58:04 momjian Exp $ + * src/include/nodes/memnodes.h * *------------------------------------------------------------------------- */ diff --git a/src/include/nodes/nodeFuncs.h b/src/include/nodes/nodeFuncs.h index 889bfdead4..464dded60f 100644 --- a/src/include/nodes/nodeFuncs.h +++ b/src/include/nodes/nodeFuncs.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/nodes/nodeFuncs.h,v 1.32 2010/01/02 16:58:04 momjian Exp $ + * src/include/nodes/nodeFuncs.h * *------------------------------------------------------------------------- */ diff --git a/src/include/nodes/nodes.h b/src/include/nodes/nodes.h index 24ddb3f0d3..35def5eed0 100644 --- a/src/include/nodes/nodes.h +++ b/src/include/nodes/nodes.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/nodes/nodes.h,v 1.235 2010/07/12 17:01:06 tgl Exp $ + * src/include/nodes/nodes.h * *------------------------------------------------------------------------- */ diff --git a/src/include/nodes/params.h b/src/include/nodes/params.h index 1219fe49e9..9dd62617f5 100644 --- a/src/include/nodes/params.h +++ b/src/include/nodes/params.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/nodes/params.h,v 1.42 2010/02/26 02:01:25 momjian Exp $ + * src/include/nodes/params.h * *------------------------------------------------------------------------- */ diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h index 6d2128df11..b67ab68298 100644 --- a/src/include/nodes/parsenodes.h +++ b/src/include/nodes/parsenodes.h @@ -13,7 +13,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/nodes/parsenodes.h,v 1.435 2010/08/18 18:35:21 tgl Exp $ + * src/include/nodes/parsenodes.h * *------------------------------------------------------------------------- */ diff --git a/src/include/nodes/pg_list.h b/src/include/nodes/pg_list.h index fae567969a..4d6b440da3 100644 --- a/src/include/nodes/pg_list.h +++ b/src/include/nodes/pg_list.h @@ -30,7 +30,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/nodes/pg_list.h,v 1.63 2010/02/13 02:34:13 tgl Exp $ + * src/include/nodes/pg_list.h * *------------------------------------------------------------------------- */ diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h index 5ca1b0f8fb..f2f99f4a2b 100644 --- a/src/include/nodes/plannodes.h +++ b/src/include/nodes/plannodes.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/nodes/plannodes.h,v 1.118 2010/07/12 17:01:06 tgl Exp $ + * src/include/nodes/plannodes.h * *------------------------------------------------------------------------- */ diff --git a/src/include/nodes/primnodes.h b/src/include/nodes/primnodes.h index 484eb0d627..b17adf2aa3 100644 --- a/src/include/nodes/primnodes.h +++ b/src/include/nodes/primnodes.h @@ -10,7 +10,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/nodes/primnodes.h,v 1.157 2010/07/12 17:01:06 tgl Exp $ + * src/include/nodes/primnodes.h * *------------------------------------------------------------------------- */ diff --git a/src/include/nodes/print.h b/src/include/nodes/print.h index 095d8fa45e..628b9588de 100644 --- a/src/include/nodes/print.h +++ b/src/include/nodes/print.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/nodes/print.h,v 1.31 2010/01/02 16:58:06 momjian Exp $ + * src/include/nodes/print.h * *------------------------------------------------------------------------- */ diff --git a/src/include/nodes/readfuncs.h b/src/include/nodes/readfuncs.h index fb2b62ba74..c970ba0bf0 100644 --- a/src/include/nodes/readfuncs.h +++ b/src/include/nodes/readfuncs.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/nodes/readfuncs.h,v 1.26 2010/01/02 16:58:07 momjian Exp $ + * src/include/nodes/readfuncs.h * *------------------------------------------------------------------------- */ diff --git a/src/include/nodes/relation.h b/src/include/nodes/relation.h index 3374e5fae7..6e3af0eae2 100644 --- a/src/include/nodes/relation.h +++ b/src/include/nodes/relation.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/nodes/relation.h,v 1.188 2010/07/12 17:01:06 tgl Exp $ + * src/include/nodes/relation.h * *------------------------------------------------------------------------- */ diff --git a/src/include/nodes/tidbitmap.h b/src/include/nodes/tidbitmap.h index 7ff1cf973d..3710d4b62e 100644 --- a/src/include/nodes/tidbitmap.h +++ b/src/include/nodes/tidbitmap.h @@ -15,7 +15,7 @@ * * Copyright (c) 2003-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/nodes/tidbitmap.h,v 1.12 2010/01/02 16:58:07 momjian Exp $ + * src/include/nodes/tidbitmap.h * *------------------------------------------------------------------------- */ diff --git a/src/include/nodes/value.h b/src/include/nodes/value.h index 9eead4dde2..d6009aa79e 100644 --- a/src/include/nodes/value.h +++ b/src/include/nodes/value.h @@ -6,7 +6,7 @@ * * Copyright (c) 2003-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/nodes/value.h,v 1.9 2010/01/02 16:58:07 momjian Exp $ + * src/include/nodes/value.h * *------------------------------------------------------------------------- */ diff --git a/src/include/optimizer/clauses.h b/src/include/optimizer/clauses.h index 566300ab47..489414e063 100644 --- a/src/include/optimizer/clauses.h +++ b/src/include/optimizer/clauses.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/optimizer/clauses.h,v 1.101 2010/02/26 02:01:26 momjian Exp $ + * src/include/optimizer/clauses.h * *------------------------------------------------------------------------- */ diff --git a/src/include/optimizer/cost.h b/src/include/optimizer/cost.h index ce9f3f5095..63641b9cc8 100644 --- a/src/include/optimizer/cost.h +++ b/src/include/optimizer/cost.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/optimizer/cost.h,v 1.101 2010/04/19 00:55:26 rhaas Exp $ + * src/include/optimizer/cost.h * *------------------------------------------------------------------------- */ diff --git a/src/include/optimizer/geqo.h b/src/include/optimizer/geqo.h index 128818d5a6..e9069a2f08 100644 --- a/src/include/optimizer/geqo.h +++ b/src/include/optimizer/geqo.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/optimizer/geqo.h,v 1.47 2010/02/26 02:01:26 momjian Exp $ + * src/include/optimizer/geqo.h * *------------------------------------------------------------------------- */ diff --git a/src/include/optimizer/geqo_copy.h b/src/include/optimizer/geqo_copy.h index 8b3599180b..6f748a29e9 100644 --- a/src/include/optimizer/geqo_copy.h +++ b/src/include/optimizer/geqo_copy.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/optimizer/geqo_copy.h,v 1.23 2010/01/02 16:58:07 momjian Exp $ + * src/include/optimizer/geqo_copy.h * *------------------------------------------------------------------------- */ diff --git a/src/include/optimizer/geqo_gene.h b/src/include/optimizer/geqo_gene.h index 02c476418e..bbd8deeaee 100644 --- a/src/include/optimizer/geqo_gene.h +++ b/src/include/optimizer/geqo_gene.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/optimizer/geqo_gene.h,v 1.23 2010/01/02 16:58:07 momjian Exp $ + * src/include/optimizer/geqo_gene.h * *------------------------------------------------------------------------- */ diff --git a/src/include/optimizer/geqo_misc.h b/src/include/optimizer/geqo_misc.h index 38990a9447..74aaad440c 100644 --- a/src/include/optimizer/geqo_misc.h +++ b/src/include/optimizer/geqo_misc.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/optimizer/geqo_misc.h,v 1.34 2010/01/02 16:58:07 momjian Exp $ + * src/include/optimizer/geqo_misc.h * *------------------------------------------------------------------------- */ diff --git a/src/include/optimizer/geqo_mutation.h b/src/include/optimizer/geqo_mutation.h index 01eab44697..74a5b51db1 100644 --- a/src/include/optimizer/geqo_mutation.h +++ b/src/include/optimizer/geqo_mutation.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/optimizer/geqo_mutation.h,v 1.23 2010/01/02 16:58:07 momjian Exp $ + * src/include/optimizer/geqo_mutation.h * *------------------------------------------------------------------------- */ diff --git a/src/include/optimizer/geqo_pool.h b/src/include/optimizer/geqo_pool.h index 17a6f11e68..04d98994e6 100644 --- a/src/include/optimizer/geqo_pool.h +++ b/src/include/optimizer/geqo_pool.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/optimizer/geqo_pool.h,v 1.27 2010/01/02 16:58:07 momjian Exp $ + * src/include/optimizer/geqo_pool.h * *------------------------------------------------------------------------- */ diff --git a/src/include/optimizer/geqo_random.h b/src/include/optimizer/geqo_random.h index 5b8d50b421..cf3340403e 100644 --- a/src/include/optimizer/geqo_random.h +++ b/src/include/optimizer/geqo_random.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/optimizer/geqo_random.h,v 1.23 2010/01/02 16:58:07 momjian Exp $ + * src/include/optimizer/geqo_random.h * *------------------------------------------------------------------------- */ diff --git a/src/include/optimizer/geqo_recombination.h b/src/include/optimizer/geqo_recombination.h index 9b36db6902..61eb245a27 100644 --- a/src/include/optimizer/geqo_recombination.h +++ b/src/include/optimizer/geqo_recombination.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/optimizer/geqo_recombination.h,v 1.23 2010/02/26 02:01:26 momjian Exp $ + * src/include/optimizer/geqo_recombination.h * *------------------------------------------------------------------------- */ diff --git a/src/include/optimizer/geqo_selection.h b/src/include/optimizer/geqo_selection.h index 711107dfd1..6ac427b1c2 100644 --- a/src/include/optimizer/geqo_selection.h +++ b/src/include/optimizer/geqo_selection.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/optimizer/geqo_selection.h,v 1.24 2010/02/26 02:01:26 momjian Exp $ + * src/include/optimizer/geqo_selection.h * *------------------------------------------------------------------------- */ diff --git a/src/include/optimizer/joininfo.h b/src/include/optimizer/joininfo.h index 0c4c8e172a..fad6d93f01 100644 --- a/src/include/optimizer/joininfo.h +++ b/src/include/optimizer/joininfo.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/optimizer/joininfo.h,v 1.39 2010/09/14 23:15:29 tgl Exp $ + * src/include/optimizer/joininfo.h * *------------------------------------------------------------------------- */ diff --git a/src/include/optimizer/pathnode.h b/src/include/optimizer/pathnode.h index 9ff5d6328d..5e0ebe046b 100644 --- a/src/include/optimizer/pathnode.h +++ b/src/include/optimizer/pathnode.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/optimizer/pathnode.h,v 1.84 2010/03/28 22:59:33 tgl Exp $ + * src/include/optimizer/pathnode.h * *------------------------------------------------------------------------- */ diff --git a/src/include/optimizer/paths.h b/src/include/optimizer/paths.h index 53698bf361..5f628eeeb9 100644 --- a/src/include/optimizer/paths.h +++ b/src/include/optimizer/paths.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/optimizer/paths.h,v 1.110 2010/01/02 16:58:07 momjian Exp $ + * src/include/optimizer/paths.h * *------------------------------------------------------------------------- */ diff --git a/src/include/optimizer/placeholder.h b/src/include/optimizer/placeholder.h index e9dde9315e..3f921a983a 100644 --- a/src/include/optimizer/placeholder.h +++ b/src/include/optimizer/placeholder.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/optimizer/placeholder.h,v 1.5 2010/03/28 22:59:33 tgl Exp $ + * src/include/optimizer/placeholder.h * *------------------------------------------------------------------------- */ diff --git a/src/include/optimizer/plancat.h b/src/include/optimizer/plancat.h index df1813a08e..0b84295854 100644 --- a/src/include/optimizer/plancat.h +++ b/src/include/optimizer/plancat.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/optimizer/plancat.h,v 1.56 2010/01/02 16:58:07 momjian Exp $ + * src/include/optimizer/plancat.h * *------------------------------------------------------------------------- */ diff --git a/src/include/optimizer/planmain.h b/src/include/optimizer/planmain.h index 416cec0d4e..5bb0e094e5 100644 --- a/src/include/optimizer/planmain.h +++ b/src/include/optimizer/planmain.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/optimizer/planmain.h,v 1.127 2010/03/28 22:59:33 tgl Exp $ + * src/include/optimizer/planmain.h * *------------------------------------------------------------------------- */ diff --git a/src/include/optimizer/planner.h b/src/include/optimizer/planner.h index 349aa86cf2..8552d6eeb0 100644 --- a/src/include/optimizer/planner.h +++ b/src/include/optimizer/planner.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/optimizer/planner.h,v 1.48 2010/01/02 16:58:07 momjian Exp $ + * src/include/optimizer/planner.h * *------------------------------------------------------------------------- */ diff --git a/src/include/optimizer/predtest.h b/src/include/optimizer/predtest.h index 5127fc3e7f..c73b22b03a 100644 --- a/src/include/optimizer/predtest.h +++ b/src/include/optimizer/predtest.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/optimizer/predtest.h,v 1.8 2010/01/02 16:58:07 momjian Exp $ + * src/include/optimizer/predtest.h * *------------------------------------------------------------------------- */ diff --git a/src/include/optimizer/prep.h b/src/include/optimizer/prep.h index 806c8d07a5..372b79688f 100644 --- a/src/include/optimizer/prep.h +++ b/src/include/optimizer/prep.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/optimizer/prep.h,v 1.68 2010/01/02 16:58:07 momjian Exp $ + * src/include/optimizer/prep.h * *------------------------------------------------------------------------- */ diff --git a/src/include/optimizer/restrictinfo.h b/src/include/optimizer/restrictinfo.h index 7aabc06ac3..2e8cc24ed4 100644 --- a/src/include/optimizer/restrictinfo.h +++ b/src/include/optimizer/restrictinfo.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/optimizer/restrictinfo.h,v 1.46 2010/01/02 16:58:07 momjian Exp $ + * src/include/optimizer/restrictinfo.h * *------------------------------------------------------------------------- */ diff --git a/src/include/optimizer/subselect.h b/src/include/optimizer/subselect.h index abbbd58c24..1b7fbcd932 100644 --- a/src/include/optimizer/subselect.h +++ b/src/include/optimizer/subselect.h @@ -5,7 +5,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/optimizer/subselect.h,v 1.40 2010/07/12 17:01:06 tgl Exp $ + * src/include/optimizer/subselect.h * *------------------------------------------------------------------------- */ diff --git a/src/include/optimizer/tlist.h b/src/include/optimizer/tlist.h index 22223a1c1c..293471e291 100644 --- a/src/include/optimizer/tlist.h +++ b/src/include/optimizer/tlist.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/optimizer/tlist.h,v 1.55 2010/01/02 16:58:07 momjian Exp $ + * src/include/optimizer/tlist.h * *------------------------------------------------------------------------- */ diff --git a/src/include/optimizer/var.h b/src/include/optimizer/var.h index e9047eb599..8fd99779d1 100644 --- a/src/include/optimizer/var.h +++ b/src/include/optimizer/var.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/optimizer/var.h,v 1.42 2010/01/02 16:58:07 momjian Exp $ + * src/include/optimizer/var.h * *------------------------------------------------------------------------- */ diff --git a/src/include/parser/analyze.h b/src/include/parser/analyze.h index 86a0312237..2db37876c5 100644 --- a/src/include/parser/analyze.h +++ b/src/include/parser/analyze.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/parser/analyze.h,v 1.45 2010/02/26 02:01:26 momjian Exp $ + * src/include/parser/analyze.h * *------------------------------------------------------------------------- */ diff --git a/src/include/parser/gramparse.h b/src/include/parser/gramparse.h index 6ca0a4fbc6..e495aa360b 100644 --- a/src/include/parser/gramparse.h +++ b/src/include/parser/gramparse.h @@ -11,7 +11,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/parser/gramparse.h,v 1.52 2010/02/26 02:01:26 momjian Exp $ + * src/include/parser/gramparse.h * *------------------------------------------------------------------------- */ diff --git a/src/include/parser/keywords.h b/src/include/parser/keywords.h index a139027850..ad740de363 100644 --- a/src/include/parser/keywords.h +++ b/src/include/parser/keywords.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/parser/keywords.h,v 1.29 2010/02/26 02:01:26 momjian Exp $ + * src/include/parser/keywords.h * *------------------------------------------------------------------------- */ diff --git a/src/include/parser/kwlist.h b/src/include/parser/kwlist.h index 271c5ca7b6..5e3ccd5ee2 100644 --- a/src/include/parser/kwlist.h +++ b/src/include/parser/kwlist.h @@ -11,7 +11,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/include/parser/kwlist.h,v 1.13 2010/08/05 04:21:54 petere Exp $ + * src/include/parser/kwlist.h * *------------------------------------------------------------------------- */ diff --git a/src/include/parser/parse_agg.h b/src/include/parser/parse_agg.h index 5dc0da2f9b..cedd26187a 100644 --- a/src/include/parser/parse_agg.h +++ b/src/include/parser/parse_agg.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/parser/parse_agg.h,v 1.43 2010/03/17 16:52:38 tgl Exp $ + * src/include/parser/parse_agg.h * *------------------------------------------------------------------------- */ diff --git a/src/include/parser/parse_clause.h b/src/include/parser/parse_clause.h index c6af17b272..0e8a80e04c 100644 --- a/src/include/parser/parse_clause.h +++ b/src/include/parser/parse_clause.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/parser/parse_clause.h,v 1.58 2010/01/02 16:58:07 momjian Exp $ + * src/include/parser/parse_clause.h * *------------------------------------------------------------------------- */ diff --git a/src/include/parser/parse_coerce.h b/src/include/parser/parse_coerce.h index 7347e04b93..449d9d382c 100644 --- a/src/include/parser/parse_coerce.h +++ b/src/include/parser/parse_coerce.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/parser/parse_coerce.h,v 1.80 2010/01/02 16:58:07 momjian Exp $ + * src/include/parser/parse_coerce.h * *------------------------------------------------------------------------- */ diff --git a/src/include/parser/parse_cte.h b/src/include/parser/parse_cte.h index 07efce78dc..8998dfc6f1 100644 --- a/src/include/parser/parse_cte.h +++ b/src/include/parser/parse_cte.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/parser/parse_cte.h,v 1.5 2010/02/26 02:01:26 momjian Exp $ + * src/include/parser/parse_cte.h * *------------------------------------------------------------------------- */ diff --git a/src/include/parser/parse_expr.h b/src/include/parser/parse_expr.h index d442b7689e..654bf34ef1 100644 --- a/src/include/parser/parse_expr.h +++ b/src/include/parser/parse_expr.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/parser/parse_expr.h,v 1.41 2010/01/02 16:58:07 momjian Exp $ + * src/include/parser/parse_expr.h * *------------------------------------------------------------------------- */ diff --git a/src/include/parser/parse_func.h b/src/include/parser/parse_func.h index 50e69537a3..7f42a6741a 100644 --- a/src/include/parser/parse_func.h +++ b/src/include/parser/parse_func.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/parser/parse_func.h,v 1.70 2010/09/03 01:26:52 tgl Exp $ + * src/include/parser/parse_func.h * *------------------------------------------------------------------------- */ diff --git a/src/include/parser/parse_node.h b/src/include/parser/parse_node.h index f21628a9b3..ff8d11031d 100644 --- a/src/include/parser/parse_node.h +++ b/src/include/parser/parse_node.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/parser/parse_node.h,v 1.68 2010/02/26 02:01:26 momjian Exp $ + * src/include/parser/parse_node.h * *------------------------------------------------------------------------- */ diff --git a/src/include/parser/parse_oper.h b/src/include/parser/parse_oper.h index c62927c439..03bc9598f5 100644 --- a/src/include/parser/parse_oper.h +++ b/src/include/parser/parse_oper.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/parser/parse_oper.h,v 1.45 2010/01/02 16:58:07 momjian Exp $ + * src/include/parser/parse_oper.h * *------------------------------------------------------------------------- */ diff --git a/src/include/parser/parse_param.h b/src/include/parser/parse_param.h index d8244f4c03..1d2b46542a 100644 --- a/src/include/parser/parse_param.h +++ b/src/include/parser/parse_param.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/parser/parse_param.h,v 1.3 2010/02/26 02:01:27 momjian Exp $ + * src/include/parser/parse_param.h * *------------------------------------------------------------------------- */ diff --git a/src/include/parser/parse_relation.h b/src/include/parser/parse_relation.h index 1c0f209b3a..b3348d0ed9 100644 --- a/src/include/parser/parse_relation.h +++ b/src/include/parser/parse_relation.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/parser/parse_relation.h,v 1.68 2010/01/02 16:58:07 momjian Exp $ + * src/include/parser/parse_relation.h * *------------------------------------------------------------------------- */ diff --git a/src/include/parser/parse_target.h b/src/include/parser/parse_target.h index 30e18e8303..9b4df398ac 100644 --- a/src/include/parser/parse_target.h +++ b/src/include/parser/parse_target.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/parser/parse_target.h,v 1.46 2010/01/02 16:58:08 momjian Exp $ + * src/include/parser/parse_target.h * *------------------------------------------------------------------------- */ diff --git a/src/include/parser/parse_type.h b/src/include/parser/parse_type.h index 903df34b0f..525502afe9 100644 --- a/src/include/parser/parse_type.h +++ b/src/include/parser/parse_type.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/parser/parse_type.h,v 1.42 2010/01/02 16:58:08 momjian Exp $ + * src/include/parser/parse_type.h * *------------------------------------------------------------------------- */ diff --git a/src/include/parser/parse_utilcmd.h b/src/include/parser/parse_utilcmd.h index 25fc8ebd63..3eb3127b5f 100644 --- a/src/include/parser/parse_utilcmd.h +++ b/src/include/parser/parse_utilcmd.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/parser/parse_utilcmd.h,v 1.5 2010/01/02 16:58:08 momjian Exp $ + * src/include/parser/parse_utilcmd.h * *------------------------------------------------------------------------- */ diff --git a/src/include/parser/parser.h b/src/include/parser/parser.h index 3cc2a6f547..a2a0ffe898 100644 --- a/src/include/parser/parser.h +++ b/src/include/parser/parser.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/parser/parser.h,v 1.29 2010/01/02 16:58:08 momjian Exp $ + * src/include/parser/parser.h * *------------------------------------------------------------------------- */ diff --git a/src/include/parser/parsetree.h b/src/include/parser/parsetree.h index 771b0a55d2..102e6138f9 100644 --- a/src/include/parser/parsetree.h +++ b/src/include/parser/parsetree.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/parser/parsetree.h,v 1.39 2010/01/02 16:58:08 momjian Exp $ + * src/include/parser/parsetree.h * *------------------------------------------------------------------------- */ diff --git a/src/include/parser/scanner.h b/src/include/parser/scanner.h index b076b67f8e..cf024bb02e 100644 --- a/src/include/parser/scanner.h +++ b/src/include/parser/scanner.h @@ -11,7 +11,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/parser/scanner.h,v 1.3 2010/02/26 02:01:27 momjian Exp $ + * src/include/parser/scanner.h * *------------------------------------------------------------------------- */ diff --git a/src/include/parser/scansup.h b/src/include/parser/scansup.h index 6788a06c02..f33766d339 100644 --- a/src/include/parser/scansup.h +++ b/src/include/parser/scansup.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/parser/scansup.h,v 1.24 2010/01/02 16:58:08 momjian Exp $ + * src/include/parser/scansup.h * *------------------------------------------------------------------------- */ diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h index 94a46eb6b7..62d15cca36 100644 --- a/src/include/pg_config_manual.h +++ b/src/include/pg_config_manual.h @@ -6,7 +6,7 @@ * for developers. If you edit any of these, be sure to do a *full* * rebuild (and an initdb if noted). * - * $PostgreSQL: pgsql/src/include/pg_config_manual.h,v 1.40 2010/01/07 04:53:35 tgl Exp $ + * src/include/pg_config_manual.h *------------------------------------------------------------------------ */ diff --git a/src/include/pg_trace.h b/src/include/pg_trace.h index e454da9a78..e9ec940493 100644 --- a/src/include/pg_trace.h +++ b/src/include/pg_trace.h @@ -5,7 +5,7 @@ * * Copyright (c) 2006-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/pg_trace.h,v 1.6 2010/01/02 16:58:00 momjian Exp $ + * src/include/pg_trace.h * ---------- */ diff --git a/src/include/pgstat.h b/src/include/pgstat.h index 1bbe008c46..87541433c0 100644 --- a/src/include/pgstat.h +++ b/src/include/pgstat.h @@ -5,7 +5,7 @@ * * Copyright (c) 2001-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/pgstat.h,v 1.91 2010/08/21 10:59:17 mha Exp $ + * src/include/pgstat.h * ---------- */ #ifndef PGSTAT_H diff --git a/src/include/pgtime.h b/src/include/pgtime.h index 60f3773e12..013b88611d 100644 --- a/src/include/pgtime.h +++ b/src/include/pgtime.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/include/pgtime.h,v 1.20 2010/01/02 16:58:00 momjian Exp $ + * src/include/pgtime.h * *------------------------------------------------------------------------- */ diff --git a/src/include/port.h b/src/include/port.h index 584a89eb70..f4aa69c8f6 100644 --- a/src/include/port.h +++ b/src/include/port.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/port.h,v 1.134 2010/05/15 14:44:13 tgl Exp $ + * src/include/port.h * *------------------------------------------------------------------------- */ diff --git a/src/include/port/aix.h b/src/include/port/aix.h index 67f300a72d..dc4013e46e 100644 --- a/src/include/port/aix.h +++ b/src/include/port/aix.h @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/src/include/port/aix.h,v 1.13 2009/06/11 14:49:11 momjian Exp $ + * src/include/port/aix.h */ #define CLASS_CONFLICT #define DISABLE_XOPEN_NLS diff --git a/src/include/port/bsdi.h b/src/include/port/bsdi.h index 4c4a7af9ae..13249f545b 100644 --- a/src/include/port/bsdi.h +++ b/src/include/port/bsdi.h @@ -1,3 +1,3 @@ /* - * $PostgreSQL: pgsql/src/include/port/bsdi.h,v 1.15 2009/06/11 14:49:11 momjian Exp $ + * src/include/port/bsdi.h */ diff --git a/src/include/port/cygwin.h b/src/include/port/cygwin.h index f07c07eeff..69f15a8241 100644 --- a/src/include/port/cygwin.h +++ b/src/include/port/cygwin.h @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/include/port/cygwin.h,v 1.9 2010/05/28 16:34:15 itagaki Exp $ */ +/* src/include/port/cygwin.h */ #include diff --git a/src/include/port/darwin.h b/src/include/port/darwin.h index ff3e219323..29c4b91d8c 100644 --- a/src/include/port/darwin.h +++ b/src/include/port/darwin.h @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/include/port/darwin.h,v 1.11 2006/10/04 00:30:09 momjian Exp $ */ +/* src/include/port/darwin.h */ #define __darwin__ 1 diff --git a/src/include/port/dgux.h b/src/include/port/dgux.h index 43ccbbbe53..582be12612 100644 --- a/src/include/port/dgux.h +++ b/src/include/port/dgux.h @@ -1,3 +1,3 @@ -/* $PostgreSQL: pgsql/src/include/port/dgux.h,v 1.11 2007/04/06 05:36:51 tgl Exp $ */ +/* src/include/port/dgux.h */ /* nothing needed */ diff --git a/src/include/port/freebsd.h b/src/include/port/freebsd.h index a70df321cc..2e36d3da4f 100644 --- a/src/include/port/freebsd.h +++ b/src/include/port/freebsd.h @@ -1 +1 @@ -/* $PostgreSQL: pgsql/src/include/port/freebsd.h,v 1.16 2006/03/11 04:38:38 momjian Exp $ */ +/* src/include/port/freebsd.h */ diff --git a/src/include/port/hpux.h b/src/include/port/hpux.h index dc48e6dc14..4d1dcea70c 100644 --- a/src/include/port/hpux.h +++ b/src/include/port/hpux.h @@ -1,3 +1,3 @@ -/* $PostgreSQL: pgsql/src/include/port/hpux.h,v 1.24 2007/04/06 05:36:51 tgl Exp $ */ +/* src/include/port/hpux.h */ /* nothing needed */ diff --git a/src/include/port/irix.h b/src/include/port/irix.h index e3e279ad1c..bb05314a79 100644 --- a/src/include/port/irix.h +++ b/src/include/port/irix.h @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/include/port/irix.h,v 1.4 2006/10/05 01:40:45 tgl Exp $ */ +/* src/include/port/irix.h */ /* * IRIX 6.5.26f and 6.5.22f (at least) have a strtod() that accepts diff --git a/src/include/port/linux.h b/src/include/port/linux.h index 0f4432a4ef..b9498b239d 100644 --- a/src/include/port/linux.h +++ b/src/include/port/linux.h @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/include/port/linux.h,v 1.44 2007/11/15 21:14:44 momjian Exp $ */ +/* src/include/port/linux.h */ /* * As of July 2007, all known versions of the Linux kernel will sometimes diff --git a/src/include/port/netbsd.h b/src/include/port/netbsd.h index 9f1666b71a..590233fbdb 100644 --- a/src/include/port/netbsd.h +++ b/src/include/port/netbsd.h @@ -1 +1 @@ -/* $PostgreSQL: pgsql/src/include/port/netbsd.h,v 1.16 2006/10/04 00:30:10 momjian Exp $ */ +/* src/include/port/netbsd.h */ diff --git a/src/include/port/nextstep.h b/src/include/port/nextstep.h index 47a3c8856f..ff4ea40f4e 100644 --- a/src/include/port/nextstep.h +++ b/src/include/port/nextstep.h @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/include/port/nextstep.h,v 1.8 2006/03/11 04:38:38 momjian Exp $ */ +/* src/include/port/nextstep.h */ #include "libc.h" #include diff --git a/src/include/port/openbsd.h b/src/include/port/openbsd.h index 412f5615a6..395319bd77 100644 --- a/src/include/port/openbsd.h +++ b/src/include/port/openbsd.h @@ -1 +1 @@ -/* $PostgreSQL: pgsql/src/include/port/openbsd.h,v 1.14 2006/03/11 04:38:38 momjian Exp $ */ +/* src/include/port/openbsd.h */ diff --git a/src/include/port/osf.h b/src/include/port/osf.h index 4b45d1a8f6..d56b35b399 100644 --- a/src/include/port/osf.h +++ b/src/include/port/osf.h @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/include/port/osf.h,v 1.9 2006/03/11 04:38:38 momjian Exp $ */ +/* src/include/port/osf.h */ #define NOFIXADE #define DISABLE_XOPEN_NLS diff --git a/src/include/port/sco.h b/src/include/port/sco.h index 5de37178b8..30811450c9 100644 --- a/src/include/port/sco.h +++ b/src/include/port/sco.h @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/src/include/port/sco.h,v 1.19 2009/06/11 14:49:11 momjian Exp $ + * src/include/port/sco.h * * see src/backend/libpq/pqcomm.c */ #define SCO_ACCEPT_BUG diff --git a/src/include/port/solaris.h b/src/include/port/solaris.h index 6e7fe601a6..eeb1a320bd 100644 --- a/src/include/port/solaris.h +++ b/src/include/port/solaris.h @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/include/port/solaris.h,v 1.19 2010/02/02 19:09:37 mha Exp $ */ +/* src/include/port/solaris.h */ /* * Sort this out for all operating systems some time. The __xxx diff --git a/src/include/port/sunos4.h b/src/include/port/sunos4.h index 5241bc0a29..3e39e1efc9 100644 --- a/src/include/port/sunos4.h +++ b/src/include/port/sunos4.h @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/src/include/port/sunos4.h,v 1.12 2009/06/11 14:49:11 momjian Exp $ + * src/include/port/sunos4.h * * sprintf() returns char *, not int, on SunOS 4.1.x */ #define SPRINTF_CHAR diff --git a/src/include/port/svr4.h b/src/include/port/svr4.h index 6ba3d68708..57b270c856 100644 --- a/src/include/port/svr4.h +++ b/src/include/port/svr4.h @@ -1,3 +1,3 @@ -/* $PostgreSQL: pgsql/src/include/port/svr4.h,v 1.15 2010/09/19 16:17:45 tgl Exp $ */ +/* src/include/port/svr4.h */ /* nothing needed */ diff --git a/src/include/port/ultrix4.h b/src/include/port/ultrix4.h index 92a50909e6..279f990f7f 100644 --- a/src/include/port/ultrix4.h +++ b/src/include/port/ultrix4.h @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/src/include/port/ultrix4.h,v 1.13 2009/06/11 14:49:11 momjian Exp $ + * src/include/port/ultrix4.h */ #define NOFIXADE #define NEED_STRDUP diff --git a/src/include/port/univel.h b/src/include/port/univel.h index 74eafd978f..bb2409bd89 100644 --- a/src/include/port/univel.h +++ b/src/include/port/univel.h @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/src/include/port/univel.h,v 1.25 2009/06/11 14:49:12 momjian Exp $ + * src/include/port/univel.h * *************************************** * Define this if you are compiling with diff --git a/src/include/port/unixware.h b/src/include/port/unixware.h index a63169910b..e068820957 100644 --- a/src/include/port/unixware.h +++ b/src/include/port/unixware.h @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/src/include/port/unixware.h,v 1.19 2009/06/11 14:49:12 momjian Exp $ + * src/include/port/unixware.h * * see src/backend/libpq/pqcomm.c */ #define SCO_ACCEPT_BUG diff --git a/src/include/port/win32.h b/src/include/port/win32.h index da5d6614df..988c1c98ba 100644 --- a/src/include/port/win32.h +++ b/src/include/port/win32.h @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.96 2010/07/06 19:19:00 momjian Exp $ */ +/* src/include/port/win32.h */ #if defined(_MSC_VER) || defined(__BORLANDC__) #define WIN32_ONLY_COMPILER diff --git a/src/include/port/win32/arpa/inet.h b/src/include/port/win32/arpa/inet.h index b61c4ebffd..ad1803179c 100644 --- a/src/include/port/win32/arpa/inet.h +++ b/src/include/port/win32/arpa/inet.h @@ -1,3 +1,3 @@ -/* $PostgreSQL: pgsql/src/include/port/win32/arpa/inet.h,v 1.2 2006/03/11 04:38:39 momjian Exp $ */ +/* src/include/port/win32/arpa/inet.h */ #include diff --git a/src/include/port/win32/dlfcn.h b/src/include/port/win32/dlfcn.h index e508867a6f..b6e43c091d 100644 --- a/src/include/port/win32/dlfcn.h +++ b/src/include/port/win32/dlfcn.h @@ -1 +1 @@ -/* $PostgreSQL: pgsql/src/include/port/win32/dlfcn.h,v 1.4 2006/10/04 00:30:10 momjian Exp $ */ +/* src/include/port/win32/dlfcn.h */ diff --git a/src/include/port/win32/grp.h b/src/include/port/win32/grp.h index c9bc172547..8b4f21310e 100644 --- a/src/include/port/win32/grp.h +++ b/src/include/port/win32/grp.h @@ -1 +1 @@ -/* $PostgreSQL: pgsql/src/include/port/win32/grp.h,v 1.4 2006/10/04 00:30:10 momjian Exp $ */ +/* src/include/port/win32/grp.h */ diff --git a/src/include/port/win32/netdb.h b/src/include/port/win32/netdb.h index e88e30f8e6..ad0627e986 100644 --- a/src/include/port/win32/netdb.h +++ b/src/include/port/win32/netdb.h @@ -1 +1 @@ -/* $PostgreSQL: pgsql/src/include/port/win32/netdb.h,v 1.4 2006/10/04 00:30:10 momjian Exp $ */ +/* src/include/port/win32/netdb.h */ diff --git a/src/include/port/win32/netinet/in.h b/src/include/port/win32/netinet/in.h index 19a8a650e1..a4e22f89f4 100644 --- a/src/include/port/win32/netinet/in.h +++ b/src/include/port/win32/netinet/in.h @@ -1,3 +1,3 @@ -/* $PostgreSQL: pgsql/src/include/port/win32/netinet/in.h,v 1.3 2006/03/11 04:38:39 momjian Exp $ */ +/* src/include/port/win32/netinet/in.h */ #include diff --git a/src/include/port/win32/pwd.h b/src/include/port/win32/pwd.h index a386c459f0..b8c7178fc0 100644 --- a/src/include/port/win32/pwd.h +++ b/src/include/port/win32/pwd.h @@ -1,3 +1,3 @@ /* - * $PostgreSQL: pgsql/src/include/port/win32/pwd.h,v 1.4 2009/06/11 14:49:12 momjian Exp $ + * src/include/port/win32/pwd.h */ diff --git a/src/include/port/win32/sys/socket.h b/src/include/port/win32/sys/socket.h index 97a5041799..6947ec07d6 100644 --- a/src/include/port/win32/sys/socket.h +++ b/src/include/port/win32/sys/socket.h @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/src/include/port/win32/sys/socket.h,v 1.7 2006/10/04 00:30:10 momjian Exp $ + * src/include/port/win32/sys/socket.h */ #ifndef WIN32_SYS_SOCKET_H #define WIN32_SYS_SOCKET_H diff --git a/src/include/port/win32/sys/wait.h b/src/include/port/win32/sys/wait.h index d41a67aa10..eaeb5661c9 100644 --- a/src/include/port/win32/sys/wait.h +++ b/src/include/port/win32/sys/wait.h @@ -1,3 +1,3 @@ /* - * $PostgreSQL: pgsql/src/include/port/win32/sys/wait.h,v 1.4 2009/06/11 14:49:12 momjian Exp $ + * src/include/port/win32/sys/wait.h */ diff --git a/src/include/port/win32_msvc/dirent.h b/src/include/port/win32_msvc/dirent.h index 422691aca2..9fabdf332b 100644 --- a/src/include/port/win32_msvc/dirent.h +++ b/src/include/port/win32_msvc/dirent.h @@ -1,7 +1,7 @@ /* * Headers for port/dirent.c, win32 native implementation of dirent functions * - * $PostgreSQL: pgsql/src/include/port/win32_msvc/dirent.h,v 1.3 2006/10/04 00:30:10 momjian Exp $ + * src/include/port/win32_msvc/dirent.h */ #ifndef _WIN32VC_DIRENT_H diff --git a/src/include/port/win32_msvc/sys/file.h b/src/include/port/win32_msvc/sys/file.h index c9c080f958..76be3e7774 100644 --- a/src/include/port/win32_msvc/sys/file.h +++ b/src/include/port/win32_msvc/sys/file.h @@ -1 +1 @@ -/* $PostgreSQL: pgsql/src/include/port/win32_msvc/sys/file.h,v 1.3 2006/10/04 00:30:10 momjian Exp $ */ +/* src/include/port/win32_msvc/sys/file.h */ diff --git a/src/include/port/win32_msvc/sys/param.h b/src/include/port/win32_msvc/sys/param.h index a09b35a169..160df3b25e 100644 --- a/src/include/port/win32_msvc/sys/param.h +++ b/src/include/port/win32_msvc/sys/param.h @@ -1 +1 @@ -/* $PostgreSQL: pgsql/src/include/port/win32_msvc/sys/param.h,v 1.3 2006/10/04 00:30:10 momjian Exp $ */ +/* src/include/port/win32_msvc/sys/param.h */ diff --git a/src/include/port/win32_msvc/sys/time.h b/src/include/port/win32_msvc/sys/time.h index 6fc2ab7f53..9d943ecc6f 100644 --- a/src/include/port/win32_msvc/sys/time.h +++ b/src/include/port/win32_msvc/sys/time.h @@ -1 +1 @@ -/* $PostgreSQL: pgsql/src/include/port/win32_msvc/sys/time.h,v 1.3 2006/10/04 00:30:10 momjian Exp $ */ +/* src/include/port/win32_msvc/sys/time.h */ diff --git a/src/include/port/win32_msvc/unistd.h b/src/include/port/win32_msvc/unistd.h index f5290aeafa..b63f4770a1 100644 --- a/src/include/port/win32_msvc/unistd.h +++ b/src/include/port/win32_msvc/unistd.h @@ -1 +1 @@ -/* $PostgreSQL: pgsql/src/include/port/win32_msvc/unistd.h,v 1.3 2006/10/04 00:30:10 momjian Exp $ */ +/* src/include/port/win32_msvc/unistd.h */ diff --git a/src/include/port/win32_msvc/utime.h b/src/include/port/win32_msvc/utime.h index 006c6a8396..dd1b103eae 100644 --- a/src/include/port/win32_msvc/utime.h +++ b/src/include/port/win32_msvc/utime.h @@ -1 +1 @@ -/* $PostgreSQL: pgsql/src/include/port/win32_msvc/utime.h,v 1.3 2006/10/04 00:30:10 momjian Exp $ */ +/* src/include/port/win32_msvc/utime.h */ diff --git a/src/include/portability/instr_time.h b/src/include/portability/instr_time.h index 8515189bca..60359b6e1a 100644 --- a/src/include/portability/instr_time.h +++ b/src/include/portability/instr_time.h @@ -45,7 +45,7 @@ * * Copyright (c) 2001-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/portability/instr_time.h,v 1.6 2010/02/13 02:34:15 tgl Exp $ + * src/include/portability/instr_time.h * *------------------------------------------------------------------------- */ diff --git a/src/include/postgres.h b/src/include/postgres.h index 0e80fa05d7..b8b80379ee 100644 --- a/src/include/postgres.h +++ b/src/include/postgres.h @@ -10,7 +10,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1995, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/postgres.h,v 1.94 2010/01/02 16:58:00 momjian Exp $ + * src/include/postgres.h * *------------------------------------------------------------------------- */ diff --git a/src/include/postgres_ext.h b/src/include/postgres_ext.h index 51a18b7dcc..b6ebb7aac3 100644 --- a/src/include/postgres_ext.h +++ b/src/include/postgres_ext.h @@ -15,7 +15,7 @@ * use header files that are otherwise internal to Postgres to interface * with the backend. * - * $PostgreSQL: pgsql/src/include/postgres_ext.h,v 1.17 2007/02/06 09:16:08 petere Exp $ + * src/include/postgres_ext.h * *------------------------------------------------------------------------- */ diff --git a/src/include/postgres_fe.h b/src/include/postgres_fe.h index c4734b65d6..f5fc8c6842 100644 --- a/src/include/postgres_fe.h +++ b/src/include/postgres_fe.h @@ -11,7 +11,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1995, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/postgres_fe.h,v 1.16 2010/01/02 16:58:00 momjian Exp $ + * src/include/postgres_fe.h * *------------------------------------------------------------------------- */ diff --git a/src/include/postmaster/autovacuum.h b/src/include/postmaster/autovacuum.h index f67a275751..758eb01f23 100644 --- a/src/include/postmaster/autovacuum.h +++ b/src/include/postmaster/autovacuum.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/postmaster/autovacuum.h,v 1.18 2010/02/26 02:01:27 momjian Exp $ + * src/include/postmaster/autovacuum.h * *------------------------------------------------------------------------- */ diff --git a/src/include/postmaster/bgwriter.h b/src/include/postmaster/bgwriter.h index e4ec6ad5b0..e251da6b58 100644 --- a/src/include/postmaster/bgwriter.h +++ b/src/include/postmaster/bgwriter.h @@ -5,7 +5,7 @@ * * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/postmaster/bgwriter.h,v 1.16 2010/08/13 20:10:53 rhaas Exp $ + * src/include/postmaster/bgwriter.h * *------------------------------------------------------------------------- */ diff --git a/src/include/postmaster/fork_process.h b/src/include/postmaster/fork_process.h index 4989e1696e..8a3c5e18bb 100644 --- a/src/include/postmaster/fork_process.h +++ b/src/include/postmaster/fork_process.h @@ -5,7 +5,7 @@ * * Copyright (c) 1996-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/postmaster/fork_process.h,v 1.8 2010/01/02 16:58:08 momjian Exp $ + * src/include/postmaster/fork_process.h * *------------------------------------------------------------------------- */ diff --git a/src/include/postmaster/pgarch.h b/src/include/postmaster/pgarch.h index 7c00e2601e..f6b2da6e1c 100644 --- a/src/include/postmaster/pgarch.h +++ b/src/include/postmaster/pgarch.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/postmaster/pgarch.h,v 1.8 2010/01/02 16:58:08 momjian Exp $ + * src/include/postmaster/pgarch.h * *------------------------------------------------------------------------- */ diff --git a/src/include/postmaster/postmaster.h b/src/include/postmaster/postmaster.h index 7cdcc7998f..b77cd82d25 100644 --- a/src/include/postmaster/postmaster.h +++ b/src/include/postmaster/postmaster.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/postmaster/postmaster.h,v 1.23 2010/07/20 00:47:53 rhaas Exp $ + * src/include/postmaster/postmaster.h * *------------------------------------------------------------------------- */ diff --git a/src/include/postmaster/syslogger.h b/src/include/postmaster/syslogger.h index f15d88d0ca..502373ba53 100644 --- a/src/include/postmaster/syslogger.h +++ b/src/include/postmaster/syslogger.h @@ -5,7 +5,7 @@ * * Copyright (c) 2004-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/postmaster/syslogger.h,v 1.17 2010/07/16 22:25:51 tgl Exp $ + * src/include/postmaster/syslogger.h * *------------------------------------------------------------------------- */ diff --git a/src/include/postmaster/walwriter.h b/src/include/postmaster/walwriter.h index aa58a99a13..7678950bab 100644 --- a/src/include/postmaster/walwriter.h +++ b/src/include/postmaster/walwriter.h @@ -5,7 +5,7 @@ * * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/postmaster/walwriter.h,v 1.4 2010/01/02 16:58:08 momjian Exp $ + * src/include/postmaster/walwriter.h * *------------------------------------------------------------------------- */ diff --git a/src/include/regex/regcustom.h b/src/include/regex/regcustom.h index d1a07dd00e..04849f291f 100644 --- a/src/include/regex/regcustom.h +++ b/src/include/regex/regcustom.h @@ -25,7 +25,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $PostgreSQL: pgsql/src/include/regex/regcustom.h,v 1.8 2009/12/01 21:00:24 tgl Exp $ + * src/include/regex/regcustom.h */ /* headers if any */ diff --git a/src/include/regex/regerrs.h b/src/include/regex/regerrs.h index b8cc1f3da7..a761371e5d 100644 --- a/src/include/regex/regerrs.h +++ b/src/include/regex/regerrs.h @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/src/include/regex/regerrs.h,v 1.5 2008/01/03 20:47:55 tgl Exp $ + * src/include/regex/regerrs.h */ { diff --git a/src/include/regex/regex.h b/src/include/regex/regex.h index 15975bc478..cab439df78 100644 --- a/src/include/regex/regex.h +++ b/src/include/regex/regex.h @@ -29,7 +29,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $PostgreSQL: pgsql/src/include/regex/regex.h,v 1.32 2009/10/21 20:38:58 tgl Exp $ + * src/include/regex/regex.h */ /* diff --git a/src/include/regex/regguts.h b/src/include/regex/regguts.h index 52f2157535..0cced701db 100644 --- a/src/include/regex/regguts.h +++ b/src/include/regex/regguts.h @@ -27,7 +27,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $PostgreSQL: pgsql/src/include/regex/regguts.h,v 1.7 2008/02/14 17:33:37 tgl Exp $ + * src/include/regex/regguts.h */ diff --git a/src/include/replication/walprotocol.h b/src/include/replication/walprotocol.h index edba868193..5c2cc70635 100644 --- a/src/include/replication/walprotocol.h +++ b/src/include/replication/walprotocol.h @@ -5,7 +5,7 @@ * * Portions Copyright (c) 2010-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/replication/walprotocol.h,v 1.2 2010/07/06 19:19:00 momjian Exp $ + * src/include/replication/walprotocol.h * *------------------------------------------------------------------------- */ diff --git a/src/include/replication/walreceiver.h b/src/include/replication/walreceiver.h index ef033ceb2c..df7eadfa9c 100644 --- a/src/include/replication/walreceiver.h +++ b/src/include/replication/walreceiver.h @@ -5,7 +5,7 @@ * * Portions Copyright (c) 2010-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/replication/walreceiver.h,v 1.12 2010/09/13 10:14:25 heikki Exp $ + * src/include/replication/walreceiver.h * *------------------------------------------------------------------------- */ diff --git a/src/include/replication/walsender.h b/src/include/replication/walsender.h index 87e01207c1..6bc0864f95 100644 --- a/src/include/replication/walsender.h +++ b/src/include/replication/walsender.h @@ -5,7 +5,7 @@ * * Portions Copyright (c) 2010-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/replication/walsender.h,v 1.5 2010/09/11 15:48:04 heikki Exp $ + * src/include/replication/walsender.h * *------------------------------------------------------------------------- */ diff --git a/src/include/rewrite/prs2lock.h b/src/include/rewrite/prs2lock.h index d22e634e85..1c79765ca9 100644 --- a/src/include/rewrite/prs2lock.h +++ b/src/include/rewrite/prs2lock.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/rewrite/prs2lock.h,v 1.28 2010/01/02 16:58:08 momjian Exp $ + * src/include/rewrite/prs2lock.h * *------------------------------------------------------------------------- */ diff --git a/src/include/rewrite/rewriteDefine.h b/src/include/rewrite/rewriteDefine.h index 1c38c799cf..a739d81fa3 100644 --- a/src/include/rewrite/rewriteDefine.h +++ b/src/include/rewrite/rewriteDefine.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/rewrite/rewriteDefine.h,v 1.34 2010/01/02 16:58:08 momjian Exp $ + * src/include/rewrite/rewriteDefine.h * *------------------------------------------------------------------------- */ diff --git a/src/include/rewrite/rewriteHandler.h b/src/include/rewrite/rewriteHandler.h index be57268149..8be2ace292 100644 --- a/src/include/rewrite/rewriteHandler.h +++ b/src/include/rewrite/rewriteHandler.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/rewrite/rewriteHandler.h,v 1.33 2010/01/02 16:58:08 momjian Exp $ + * src/include/rewrite/rewriteHandler.h * *------------------------------------------------------------------------- */ diff --git a/src/include/rewrite/rewriteManip.h b/src/include/rewrite/rewriteManip.h index 0e48129d82..8daea6e0d6 100644 --- a/src/include/rewrite/rewriteManip.h +++ b/src/include/rewrite/rewriteManip.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/rewrite/rewriteManip.h,v 1.53 2010/02/26 02:01:27 momjian Exp $ + * src/include/rewrite/rewriteManip.h * *------------------------------------------------------------------------- */ diff --git a/src/include/rewrite/rewriteRemove.h b/src/include/rewrite/rewriteRemove.h index 8d4a299a20..f8c0c32edf 100644 --- a/src/include/rewrite/rewriteRemove.h +++ b/src/include/rewrite/rewriteRemove.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/rewrite/rewriteRemove.h,v 1.28 2010/01/02 16:58:08 momjian Exp $ + * src/include/rewrite/rewriteRemove.h * *------------------------------------------------------------------------- */ diff --git a/src/include/rewrite/rewriteSupport.h b/src/include/rewrite/rewriteSupport.h index 2212fd12b5..a483c6fcad 100644 --- a/src/include/rewrite/rewriteSupport.h +++ b/src/include/rewrite/rewriteSupport.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/rewrite/rewriteSupport.h,v 1.33 2010/08/05 15:25:36 rhaas Exp $ + * src/include/rewrite/rewriteSupport.h * *------------------------------------------------------------------------- */ diff --git a/src/include/rusagestub.h b/src/include/rusagestub.h index ac7442c0b7..dbfa494dd6 100644 --- a/src/include/rusagestub.h +++ b/src/include/rusagestub.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/rusagestub.h,v 1.21 2010/01/02 16:58:00 momjian Exp $ + * src/include/rusagestub.h * *------------------------------------------------------------------------- */ diff --git a/src/include/snowball/header.h b/src/include/snowball/header.h index 9bdcc7eaeb..f551beb5b9 100644 --- a/src/include/snowball/header.h +++ b/src/include/snowball/header.h @@ -15,7 +15,7 @@ * * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/snowball/header.h,v 1.5 2010/01/02 16:58:08 momjian Exp $ + * src/include/snowball/header.h * *------------------------------------------------------------------------- */ diff --git a/src/include/storage/backendid.h b/src/include/storage/backendid.h index b306717b66..df22264c3b 100644 --- a/src/include/storage/backendid.h +++ b/src/include/storage/backendid.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/backendid.h,v 1.24 2010/08/14 13:37:21 tgl Exp $ + * src/include/storage/backendid.h * *------------------------------------------------------------------------- */ diff --git a/src/include/storage/block.h b/src/include/storage/block.h index 15659a71e6..eb6124b3f4 100644 --- a/src/include/storage/block.h +++ b/src/include/storage/block.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/block.h,v 1.26 2010/01/02 16:58:08 momjian Exp $ + * src/include/storage/block.h * *------------------------------------------------------------------------- */ diff --git a/src/include/storage/buf.h b/src/include/storage/buf.h index 74b41fb2a5..191bb59257 100644 --- a/src/include/storage/buf.h +++ b/src/include/storage/buf.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/buf.h,v 1.25 2010/01/02 16:58:08 momjian Exp $ + * src/include/storage/buf.h * *------------------------------------------------------------------------- */ diff --git a/src/include/storage/buf_internals.h b/src/include/storage/buf_internals.h index efaca0145e..0c18fb52ee 100644 --- a/src/include/storage/buf_internals.h +++ b/src/include/storage/buf_internals.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/buf_internals.h,v 1.104 2010/01/02 16:58:08 momjian Exp $ + * src/include/storage/buf_internals.h * *------------------------------------------------------------------------- */ diff --git a/src/include/storage/buffile.h b/src/include/storage/buffile.h index 52dc15b7e4..5dd73f629d 100644 --- a/src/include/storage/buffile.h +++ b/src/include/storage/buffile.h @@ -18,7 +18,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/buffile.h,v 1.26 2010/01/02 16:58:08 momjian Exp $ + * src/include/storage/buffile.h * *------------------------------------------------------------------------- */ diff --git a/src/include/storage/bufmgr.h b/src/include/storage/bufmgr.h index 68416ee1b5..8c1552190c 100644 --- a/src/include/storage/bufmgr.h +++ b/src/include/storage/bufmgr.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/bufmgr.h,v 1.125 2010/08/13 20:10:53 rhaas Exp $ + * src/include/storage/bufmgr.h * *------------------------------------------------------------------------- */ diff --git a/src/include/storage/bufpage.h b/src/include/storage/bufpage.h index 892807480e..52fe043eec 100644 --- a/src/include/storage/bufpage.h +++ b/src/include/storage/bufpage.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/bufpage.h,v 1.87 2010/01/02 16:58:08 momjian Exp $ + * src/include/storage/bufpage.h * *------------------------------------------------------------------------- */ diff --git a/src/include/storage/fd.h b/src/include/storage/fd.h index 5798ee3856..dbbe97bdeb 100644 --- a/src/include/storage/fd.h +++ b/src/include/storage/fd.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/fd.h,v 1.68 2010/02/26 02:01:27 momjian Exp $ + * src/include/storage/fd.h * *------------------------------------------------------------------------- */ diff --git a/src/include/storage/freespace.h b/src/include/storage/freespace.h index 21e2defa8a..0a1aa742a6 100644 --- a/src/include/storage/freespace.h +++ b/src/include/storage/freespace.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/freespace.h,v 1.35 2010/01/02 16:58:08 momjian Exp $ + * src/include/storage/freespace.h * *------------------------------------------------------------------------- */ diff --git a/src/include/storage/fsm_internals.h b/src/include/storage/fsm_internals.h index b5dc68a1a0..8c53397bee 100644 --- a/src/include/storage/fsm_internals.h +++ b/src/include/storage/fsm_internals.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/fsm_internals.h,v 1.4 2010/01/02 16:58:08 momjian Exp $ + * src/include/storage/fsm_internals.h * *------------------------------------------------------------------------- */ diff --git a/src/include/storage/indexfsm.h b/src/include/storage/indexfsm.h index 46451c5802..e8558a7847 100644 --- a/src/include/storage/indexfsm.h +++ b/src/include/storage/indexfsm.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/indexfsm.h,v 1.6 2010/01/02 16:58:08 momjian Exp $ + * src/include/storage/indexfsm.h * *------------------------------------------------------------------------- */ diff --git a/src/include/storage/ipc.h b/src/include/storage/ipc.h index e3630553f2..61b1af758a 100644 --- a/src/include/storage/ipc.h +++ b/src/include/storage/ipc.h @@ -11,7 +11,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/ipc.h,v 1.81 2010/01/20 18:54:27 heikki Exp $ + * src/include/storage/ipc.h * *------------------------------------------------------------------------- */ diff --git a/src/include/storage/item.h b/src/include/storage/item.h index 0e15ddcfd6..c9e12ad471 100644 --- a/src/include/storage/item.h +++ b/src/include/storage/item.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/item.h,v 1.20 2010/01/02 16:58:08 momjian Exp $ + * src/include/storage/item.h * *------------------------------------------------------------------------- */ diff --git a/src/include/storage/itemid.h b/src/include/storage/itemid.h index b760e00802..c77b455d1a 100644 --- a/src/include/storage/itemid.h +++ b/src/include/storage/itemid.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/itemid.h,v 1.32 2010/01/02 16:58:08 momjian Exp $ + * src/include/storage/itemid.h * *------------------------------------------------------------------------- */ diff --git a/src/include/storage/itemptr.h b/src/include/storage/itemptr.h index 8c11df5c0d..cb53ae41d9 100644 --- a/src/include/storage/itemptr.h +++ b/src/include/storage/itemptr.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/itemptr.h,v 1.33 2010/01/02 16:58:08 momjian Exp $ + * src/include/storage/itemptr.h * *------------------------------------------------------------------------- */ diff --git a/src/include/storage/large_object.h b/src/include/storage/large_object.h index b8de372a15..c6c983ccf2 100644 --- a/src/include/storage/large_object.h +++ b/src/include/storage/large_object.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/large_object.h,v 1.42 2010/01/02 16:58:08 momjian Exp $ + * src/include/storage/large_object.h * *------------------------------------------------------------------------- */ diff --git a/src/include/storage/latch.h b/src/include/storage/latch.h index 0c0b01ca19..18946800d6 100644 --- a/src/include/storage/latch.h +++ b/src/include/storage/latch.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/latch.h,v 1.2 2010/09/15 10:06:21 heikki Exp $ + * src/include/storage/latch.h * *------------------------------------------------------------------------- */ diff --git a/src/include/storage/lmgr.h b/src/include/storage/lmgr.h index 64b19e334c..68ec7a36cb 100644 --- a/src/include/storage/lmgr.h +++ b/src/include/storage/lmgr.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/lmgr.h,v 1.66 2010/01/02 16:58:08 momjian Exp $ + * src/include/storage/lmgr.h * *------------------------------------------------------------------------- */ diff --git a/src/include/storage/lock.h b/src/include/storage/lock.h index 8d3a6012b8..d9301f0620 100644 --- a/src/include/storage/lock.h +++ b/src/include/storage/lock.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/lock.h,v 1.119 2010/02/26 02:01:27 momjian Exp $ + * src/include/storage/lock.h * *------------------------------------------------------------------------- */ diff --git a/src/include/storage/lwlock.h b/src/include/storage/lwlock.h index 0322007da9..548e7e08cf 100644 --- a/src/include/storage/lwlock.h +++ b/src/include/storage/lwlock.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/lwlock.h,v 1.46 2010/02/26 02:01:27 momjian Exp $ + * src/include/storage/lwlock.h * *------------------------------------------------------------------------- */ diff --git a/src/include/storage/off.h b/src/include/storage/off.h index cfa8eab566..d9b4cd7239 100644 --- a/src/include/storage/off.h +++ b/src/include/storage/off.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/off.h,v 1.24 2010/01/02 16:58:08 momjian Exp $ + * src/include/storage/off.h * *------------------------------------------------------------------------- */ diff --git a/src/include/storage/pg_sema.h b/src/include/storage/pg_sema.h index b8f77159f9..041eca25c2 100644 --- a/src/include/storage/pg_sema.h +++ b/src/include/storage/pg_sema.h @@ -13,7 +13,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/pg_sema.h,v 1.14 2010/01/02 16:58:08 momjian Exp $ + * src/include/storage/pg_sema.h * *------------------------------------------------------------------------- */ diff --git a/src/include/storage/pg_shmem.h b/src/include/storage/pg_shmem.h index f87a092fe4..711773584f 100644 --- a/src/include/storage/pg_shmem.h +++ b/src/include/storage/pg_shmem.h @@ -17,7 +17,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/pg_shmem.h,v 1.27 2010/01/02 16:58:08 momjian Exp $ + * src/include/storage/pg_shmem.h * *------------------------------------------------------------------------- */ diff --git a/src/include/storage/pmsignal.h b/src/include/storage/pmsignal.h index 0e4e1d1e1c..6ab94de5a9 100644 --- a/src/include/storage/pmsignal.h +++ b/src/include/storage/pmsignal.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/pmsignal.h,v 1.33 2010/08/23 17:20:01 tgl Exp $ + * src/include/storage/pmsignal.h * *------------------------------------------------------------------------- */ diff --git a/src/include/storage/pos.h b/src/include/storage/pos.h index 4fa0c25d72..2862fb6b39 100644 --- a/src/include/storage/pos.h +++ b/src/include/storage/pos.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/pos.h,v 1.24 2010/01/02 16:58:08 momjian Exp $ + * src/include/storage/pos.h * *------------------------------------------------------------------------- */ diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index f77c4d3fc2..b6a4b3e445 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/proc.h,v 1.123 2010/07/06 19:19:00 momjian Exp $ + * src/include/storage/proc.h * *------------------------------------------------------------------------- */ diff --git a/src/include/storage/procarray.h b/src/include/storage/procarray.h index a64101f85a..959033e6a0 100644 --- a/src/include/storage/procarray.h +++ b/src/include/storage/procarray.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/procarray.h,v 1.33 2010/07/06 19:19:00 momjian Exp $ + * src/include/storage/procarray.h * *------------------------------------------------------------------------- */ diff --git a/src/include/storage/procsignal.h b/src/include/storage/procsignal.h index aad98982d1..9d47180fa7 100644 --- a/src/include/storage/procsignal.h +++ b/src/include/storage/procsignal.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/procsignal.h,v 1.6 2010/02/26 02:01:28 momjian Exp $ + * src/include/storage/procsignal.h * *------------------------------------------------------------------------- */ diff --git a/src/include/storage/relfilenode.h b/src/include/storage/relfilenode.h index 9bf170b2c8..24a72e60ac 100644 --- a/src/include/storage/relfilenode.h +++ b/src/include/storage/relfilenode.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/relfilenode.h,v 1.26 2010/08/13 20:10:53 rhaas Exp $ + * src/include/storage/relfilenode.h * *------------------------------------------------------------------------- */ diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h index 4104cf6c4c..bf97ab3586 100644 --- a/src/include/storage/s_lock.h +++ b/src/include/storage/s_lock.h @@ -66,7 +66,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/s_lock.h,v 1.171 2010/01/05 11:06:28 mha Exp $ + * src/include/storage/s_lock.h * *------------------------------------------------------------------------- */ diff --git a/src/include/storage/shmem.h b/src/include/storage/shmem.h index 856fdde4dd..cad2f401ac 100644 --- a/src/include/storage/shmem.h +++ b/src/include/storage/shmem.h @@ -14,7 +14,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/shmem.h,v 1.57 2010/01/02 16:58:08 momjian Exp $ + * src/include/storage/shmem.h * *------------------------------------------------------------------------- */ diff --git a/src/include/storage/sinval.h b/src/include/storage/sinval.h index b35fe7f1fb..e50e89165e 100644 --- a/src/include/storage/sinval.h +++ b/src/include/storage/sinval.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/sinval.h,v 1.60 2010/08/13 20:10:53 rhaas Exp $ + * src/include/storage/sinval.h * *------------------------------------------------------------------------- */ diff --git a/src/include/storage/sinvaladt.h b/src/include/storage/sinvaladt.h index 2702a9c4c5..bfd5282bca 100644 --- a/src/include/storage/sinvaladt.h +++ b/src/include/storage/sinvaladt.h @@ -15,7 +15,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/sinvaladt.h,v 1.53 2010/01/02 16:58:08 momjian Exp $ + * src/include/storage/sinvaladt.h * *------------------------------------------------------------------------- */ diff --git a/src/include/storage/smgr.h b/src/include/storage/smgr.h index 55028556fa..1e6b63ff43 100644 --- a/src/include/storage/smgr.h +++ b/src/include/storage/smgr.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/smgr.h,v 1.72 2010/08/13 20:10:53 rhaas Exp $ + * src/include/storage/smgr.h * *------------------------------------------------------------------------- */ diff --git a/src/include/storage/spin.h b/src/include/storage/spin.h index 44e1fa8807..c8e04db67b 100644 --- a/src/include/storage/spin.h +++ b/src/include/storage/spin.h @@ -49,7 +49,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/spin.h,v 1.32 2010/01/02 16:58:08 momjian Exp $ + * src/include/storage/spin.h * *------------------------------------------------------------------------- */ diff --git a/src/include/storage/standby.h b/src/include/storage/standby.h index 0654c5bccc..553415c2d3 100644 --- a/src/include/storage/standby.h +++ b/src/include/storage/standby.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/standby.h,v 1.11 2010/07/03 20:43:58 tgl Exp $ + * src/include/storage/standby.h * *------------------------------------------------------------------------- */ diff --git a/src/include/tcop/dest.h b/src/include/tcop/dest.h index bdea38117c..29f1ccc77f 100644 --- a/src/include/tcop/dest.h +++ b/src/include/tcop/dest.h @@ -60,7 +60,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/tcop/dest.h,v 1.59 2010/01/02 16:58:08 momjian Exp $ + * src/include/tcop/dest.h * *------------------------------------------------------------------------- */ diff --git a/src/include/tcop/fastpath.h b/src/include/tcop/fastpath.h index e01a164c6a..844d16fb17 100644 --- a/src/include/tcop/fastpath.h +++ b/src/include/tcop/fastpath.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/tcop/fastpath.h,v 1.23 2010/01/02 16:58:09 momjian Exp $ + * src/include/tcop/fastpath.h * *------------------------------------------------------------------------- */ diff --git a/src/include/tcop/pquery.h b/src/include/tcop/pquery.h index 4928354189..e1945079f4 100644 --- a/src/include/tcop/pquery.h +++ b/src/include/tcop/pquery.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/tcop/pquery.h,v 1.46 2010/01/02 16:58:09 momjian Exp $ + * src/include/tcop/pquery.h * *------------------------------------------------------------------------- */ diff --git a/src/include/tcop/tcopdebug.h b/src/include/tcop/tcopdebug.h index ea56a10d23..b366bca447 100644 --- a/src/include/tcop/tcopdebug.h +++ b/src/include/tcop/tcopdebug.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/tcop/tcopdebug.h,v 1.19 2010/01/02 16:58:09 momjian Exp $ + * src/include/tcop/tcopdebug.h * *------------------------------------------------------------------------- */ diff --git a/src/include/tcop/tcopprot.h b/src/include/tcop/tcopprot.h index 216980ab9e..f4026ecab1 100644 --- a/src/include/tcop/tcopprot.h +++ b/src/include/tcop/tcopprot.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/tcop/tcopprot.h,v 1.104 2010/02/26 02:01:28 momjian Exp $ + * src/include/tcop/tcopprot.h * * OLD COMMENTS * This file was created so that other c files could get the two diff --git a/src/include/tcop/utility.h b/src/include/tcop/utility.h index 4970410b6d..fd61021468 100644 --- a/src/include/tcop/utility.h +++ b/src/include/tcop/utility.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/tcop/utility.h,v 1.40 2010/02/26 02:01:28 momjian Exp $ + * src/include/tcop/utility.h * *------------------------------------------------------------------------- */ diff --git a/src/include/tsearch/dicts/regis.h b/src/include/tsearch/dicts/regis.h index 5aefa2187a..8585311db7 100644 --- a/src/include/tsearch/dicts/regis.h +++ b/src/include/tsearch/dicts/regis.h @@ -6,7 +6,7 @@ * * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/tsearch/dicts/regis.h,v 1.7 2010/01/02 16:58:09 momjian Exp $ + * src/include/tsearch/dicts/regis.h * *------------------------------------------------------------------------- */ diff --git a/src/include/tsearch/dicts/spell.h b/src/include/tsearch/dicts/spell.h index 5480b208fb..c2751c1690 100644 --- a/src/include/tsearch/dicts/spell.h +++ b/src/include/tsearch/dicts/spell.h @@ -6,7 +6,7 @@ * * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/tsearch/dicts/spell.h,v 1.9 2010/04/02 15:21:20 mha Exp $ + * src/include/tsearch/dicts/spell.h * *------------------------------------------------------------------------- */ diff --git a/src/include/tsearch/ts_cache.h b/src/include/tsearch/ts_cache.h index 68246abda9..04592f477f 100644 --- a/src/include/tsearch/ts_cache.h +++ b/src/include/tsearch/ts_cache.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/tsearch/ts_cache.h,v 1.6 2010/01/02 16:58:09 momjian Exp $ + * src/include/tsearch/ts_cache.h * *------------------------------------------------------------------------- */ diff --git a/src/include/tsearch/ts_locale.h b/src/include/tsearch/ts_locale.h index f47f1c66c5..be717586d3 100644 --- a/src/include/tsearch/ts_locale.h +++ b/src/include/tsearch/ts_locale.h @@ -5,7 +5,7 @@ * * Copyright (c) 1998-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/tsearch/ts_locale.h,v 1.11 2010/01/02 16:58:09 momjian Exp $ + * src/include/tsearch/ts_locale.h * *------------------------------------------------------------------------- */ diff --git a/src/include/tsearch/ts_public.h b/src/include/tsearch/ts_public.h index 756f5e2561..b8f43fbf0c 100644 --- a/src/include/tsearch/ts_public.h +++ b/src/include/tsearch/ts_public.h @@ -6,7 +6,7 @@ * * Copyright (c) 1998-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/tsearch/ts_public.h,v 1.17 2010/01/02 16:58:09 momjian Exp $ + * src/include/tsearch/ts_public.h * *------------------------------------------------------------------------- */ diff --git a/src/include/tsearch/ts_type.h b/src/include/tsearch/ts_type.h index ca553df2de..114352c492 100644 --- a/src/include/tsearch/ts_type.h +++ b/src/include/tsearch/ts_type.h @@ -5,7 +5,7 @@ * * Copyright (c) 1998-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/tsearch/ts_type.h,v 1.17 2010/01/02 16:58:09 momjian Exp $ + * src/include/tsearch/ts_type.h * *------------------------------------------------------------------------- */ diff --git a/src/include/tsearch/ts_utils.h b/src/include/tsearch/ts_utils.h index 6e028bba5d..a41c2363b9 100644 --- a/src/include/tsearch/ts_utils.h +++ b/src/include/tsearch/ts_utils.h @@ -5,7 +5,7 @@ * * Copyright (c) 1998-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/tsearch/ts_utils.h,v 1.19 2010/01/02 16:58:09 momjian Exp $ + * src/include/tsearch/ts_utils.h * *------------------------------------------------------------------------- */ diff --git a/src/include/utils/acl.h b/src/include/utils/acl.h index 1fa0a3df67..430dc1f61e 100644 --- a/src/include/utils/acl.h +++ b/src/include/utils/acl.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/acl.h,v 1.114 2010/08/05 14:45:09 rhaas Exp $ + * src/include/utils/acl.h * * NOTES * An ACL array is simply an array of AclItems, representing the union diff --git a/src/include/utils/array.h b/src/include/utils/array.h index ca9f16c4d9..bce28bb26d 100644 --- a/src/include/utils/array.h +++ b/src/include/utils/array.h @@ -49,7 +49,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/array.h,v 1.78 2010/08/10 21:51:00 tgl Exp $ + * src/include/utils/array.h * *------------------------------------------------------------------------- */ diff --git a/src/include/utils/ascii.h b/src/include/utils/ascii.h index f8f502a442..3605d8464a 100644 --- a/src/include/utils/ascii.h +++ b/src/include/utils/ascii.h @@ -3,7 +3,7 @@ * * Portions Copyright (c) 1999-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/utils/ascii.h,v 1.18 2010/01/02 16:58:10 momjian Exp $ + * src/include/utils/ascii.h * *----------------------------------------------------------------------- */ diff --git a/src/include/utils/attoptcache.h b/src/include/utils/attoptcache.h index 017bcbd91e..8117bb1ffa 100644 --- a/src/include/utils/attoptcache.h +++ b/src/include/utils/attoptcache.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/attoptcache.h,v 1.1 2010/01/22 16:42:31 rhaas Exp $ + * src/include/utils/attoptcache.h * *------------------------------------------------------------------------- */ diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h index c7e50d2512..f4b2a962c8 100644 --- a/src/include/utils/builtins.h +++ b/src/include/utils/builtins.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/builtins.h,v 1.356 2010/09/03 01:34:55 tgl Exp $ + * src/include/utils/builtins.h * *------------------------------------------------------------------------- */ diff --git a/src/include/utils/bytea.h b/src/include/utils/bytea.h index e36292a7ba..09908a65ea 100644 --- a/src/include/utils/bytea.h +++ b/src/include/utils/bytea.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/bytea.h,v 1.3 2010/01/25 20:55:32 tgl Exp $ + * src/include/utils/bytea.h * *------------------------------------------------------------------------- */ diff --git a/src/include/utils/cash.h b/src/include/utils/cash.h index af4448c8ac..81b51ad68f 100644 --- a/src/include/utils/cash.h +++ b/src/include/utils/cash.h @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/src/include/utils/cash.h,v 1.28 2010/07/16 02:15:56 tgl Exp $ + * src/include/utils/cash.h * * * cash.h diff --git a/src/include/utils/catcache.h b/src/include/utils/catcache.h index eead399ad7..dba6922dc0 100644 --- a/src/include/utils/catcache.h +++ b/src/include/utils/catcache.h @@ -13,7 +13,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/catcache.h,v 1.73 2010/02/26 02:01:29 momjian Exp $ + * src/include/utils/catcache.h * *------------------------------------------------------------------------- */ diff --git a/src/include/utils/combocid.h b/src/include/utils/combocid.h index 0e441b94ed..8355f14eaf 100644 --- a/src/include/utils/combocid.h +++ b/src/include/utils/combocid.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/combocid.h,v 1.4 2010/01/02 16:58:10 momjian Exp $ + * src/include/utils/combocid.h * *------------------------------------------------------------------------- */ diff --git a/src/include/utils/date.h b/src/include/utils/date.h index 98570e663c..dfa591b452 100644 --- a/src/include/utils/date.h +++ b/src/include/utils/date.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/date.h,v 1.44 2010/01/02 16:58:10 momjian Exp $ + * src/include/utils/date.h * *------------------------------------------------------------------------- */ diff --git a/src/include/utils/datetime.h b/src/include/utils/datetime.h index c0129e3058..65b6b2efdb 100644 --- a/src/include/utils/datetime.h +++ b/src/include/utils/datetime.h @@ -9,7 +9,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/datetime.h,v 1.79 2010/02/26 02:01:29 momjian Exp $ + * src/include/utils/datetime.h * *------------------------------------------------------------------------- */ diff --git a/src/include/utils/datum.h b/src/include/utils/datum.h index b756699b81..a3d4c65d7c 100644 --- a/src/include/utils/datum.h +++ b/src/include/utils/datum.h @@ -11,7 +11,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/datum.h,v 1.26 2010/01/02 16:58:10 momjian Exp $ + * src/include/utils/datum.h * *------------------------------------------------------------------------- */ diff --git a/src/include/utils/dynahash.h b/src/include/utils/dynahash.h index 1b8f6028c8..a2bba143cb 100644 --- a/src/include/utils/dynahash.h +++ b/src/include/utils/dynahash.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/dynahash.h,v 1.21 2010/01/02 16:58:10 momjian Exp $ + * src/include/utils/dynahash.h * *------------------------------------------------------------------------- */ diff --git a/src/include/utils/dynamic_loader.h b/src/include/utils/dynamic_loader.h index 89f9ac9f06..3aa31387a3 100644 --- a/src/include/utils/dynamic_loader.h +++ b/src/include/utils/dynamic_loader.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/dynamic_loader.h,v 1.30 2010/01/02 16:58:10 momjian Exp $ + * src/include/utils/dynamic_loader.h * *------------------------------------------------------------------------- */ diff --git a/src/include/utils/elog.h b/src/include/utils/elog.h index c48ab35e4e..92641ba184 100644 --- a/src/include/utils/elog.h +++ b/src/include/utils/elog.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/elog.h,v 1.102 2010/01/02 16:58:10 momjian Exp $ + * src/include/utils/elog.h * *------------------------------------------------------------------------- */ diff --git a/src/include/utils/errcodes.h b/src/include/utils/errcodes.h index f7be2611f8..5cab47a092 100644 --- a/src/include/utils/errcodes.h +++ b/src/include/utils/errcodes.h @@ -11,7 +11,7 @@ * * Copyright (c) 2003-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/utils/errcodes.h,v 1.32 2010/03/13 14:55:57 momjian Exp $ + * src/include/utils/errcodes.h * *------------------------------------------------------------------------- */ diff --git a/src/include/utils/fmgrtab.h b/src/include/utils/fmgrtab.h index 5fda398a61..4cb3fcf4e4 100644 --- a/src/include/utils/fmgrtab.h +++ b/src/include/utils/fmgrtab.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/fmgrtab.h,v 1.30 2010/01/02 16:58:10 momjian Exp $ + * src/include/utils/fmgrtab.h * *------------------------------------------------------------------------- */ diff --git a/src/include/utils/formatting.h b/src/include/utils/formatting.h index 4ba22db1f7..fcc5062cee 100644 --- a/src/include/utils/formatting.h +++ b/src/include/utils/formatting.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- * formatting.h * - * $PostgreSQL: pgsql/src/include/utils/formatting.h,v 1.23 2010/08/19 05:57:34 petere Exp $ + * src/include/utils/formatting.h * * * Portions Copyright (c) 1999-2010, PostgreSQL Global Development Group diff --git a/src/include/utils/geo_decls.h b/src/include/utils/geo_decls.h index 904d9f7948..d84f369854 100644 --- a/src/include/utils/geo_decls.h +++ b/src/include/utils/geo_decls.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/geo_decls.h,v 1.58 2010/08/03 21:21:03 tgl Exp $ + * src/include/utils/geo_decls.h * * NOTE * These routines do *not* use the float types from adt/. diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h index 9eb37b8860..ae8f2678d3 100644 --- a/src/include/utils/guc.h +++ b/src/include/utils/guc.h @@ -7,7 +7,7 @@ * Copyright (c) 2000-2010, PostgreSQL Global Development Group * Written by Peter Eisentraut . * - * $PostgreSQL: pgsql/src/include/utils/guc.h,v 1.113 2010/03/25 14:44:34 alvherre Exp $ + * src/include/utils/guc.h *-------------------------------------------------------------------- */ #ifndef GUC_H diff --git a/src/include/utils/guc_tables.h b/src/include/utils/guc_tables.h index 01c6174f04..76dab79059 100644 --- a/src/include/utils/guc_tables.h +++ b/src/include/utils/guc_tables.h @@ -7,7 +7,7 @@ * * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/utils/guc_tables.h,v 1.50 2010/07/20 00:47:53 rhaas Exp $ + * src/include/utils/guc_tables.h * *------------------------------------------------------------------------- */ diff --git a/src/include/utils/help_config.h b/src/include/utils/help_config.h index e96e42100a..cb411cbcfd 100644 --- a/src/include/utils/help_config.h +++ b/src/include/utils/help_config.h @@ -5,7 +5,7 @@ * * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/utils/help_config.h,v 1.12 2010/01/02 16:58:10 momjian Exp $ + * src/include/utils/help_config.h * *------------------------------------------------------------------------- */ diff --git a/src/include/utils/hsearch.h b/src/include/utils/hsearch.h index 005a840244..b736278075 100644 --- a/src/include/utils/hsearch.h +++ b/src/include/utils/hsearch.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/hsearch.h,v 1.50 2010/01/02 16:58:10 momjian Exp $ + * src/include/utils/hsearch.h * *------------------------------------------------------------------------- */ diff --git a/src/include/utils/inet.h b/src/include/utils/inet.h index 948f0cde9d..3a522e6485 100644 --- a/src/include/utils/inet.h +++ b/src/include/utils/inet.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/inet.h,v 1.31 2010/01/02 16:58:10 momjian Exp $ + * src/include/utils/inet.h * *------------------------------------------------------------------------- */ diff --git a/src/include/utils/int8.h b/src/include/utils/int8.h index 8c74214607..219fcdb946 100644 --- a/src/include/utils/int8.h +++ b/src/include/utils/int8.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/int8.h,v 1.51 2010/01/02 16:58:10 momjian Exp $ + * src/include/utils/int8.h * * NOTES * These data types are supported on all 64-bit architectures, and may diff --git a/src/include/utils/inval.h b/src/include/utils/inval.h index 328f73c543..6bfea9d5e7 100644 --- a/src/include/utils/inval.h +++ b/src/include/utils/inval.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/inval.h,v 1.50 2010/08/13 20:10:54 rhaas Exp $ + * src/include/utils/inval.h * *------------------------------------------------------------------------- */ diff --git a/src/include/utils/logtape.h b/src/include/utils/logtape.h index af45e86c82..27db38d2df 100644 --- a/src/include/utils/logtape.h +++ b/src/include/utils/logtape.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/logtape.h,v 1.19 2010/01/02 16:58:10 momjian Exp $ + * src/include/utils/logtape.h * *------------------------------------------------------------------------- */ diff --git a/src/include/utils/lsyscache.h b/src/include/utils/lsyscache.h index ef78aa8b7f..136bf386ca 100644 --- a/src/include/utils/lsyscache.h +++ b/src/include/utils/lsyscache.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/lsyscache.h,v 1.134 2010/08/05 14:45:09 rhaas Exp $ + * src/include/utils/lsyscache.h * *------------------------------------------------------------------------- */ diff --git a/src/include/utils/memutils.h b/src/include/utils/memutils.h index 83027589e1..0914f77c4f 100644 --- a/src/include/utils/memutils.h +++ b/src/include/utils/memutils.h @@ -10,7 +10,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/memutils.h,v 1.66 2010/01/02 16:58:10 momjian Exp $ + * src/include/utils/memutils.h * *------------------------------------------------------------------------- */ diff --git a/src/include/utils/nabstime.h b/src/include/utils/nabstime.h index 2a1c48da9f..35ec2de644 100644 --- a/src/include/utils/nabstime.h +++ b/src/include/utils/nabstime.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/nabstime.h,v 1.53 2010/01/02 16:58:10 momjian Exp $ + * src/include/utils/nabstime.h * *------------------------------------------------------------------------- */ diff --git a/src/include/utils/numeric.h b/src/include/utils/numeric.h index aa661a6679..3801ef6215 100644 --- a/src/include/utils/numeric.h +++ b/src/include/utils/numeric.h @@ -7,7 +7,7 @@ * * Copyright (c) 1998-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/utils/numeric.h,v 1.31 2010/08/04 17:35:59 rhaas Exp $ + * src/include/utils/numeric.h * *------------------------------------------------------------------------- */ diff --git a/src/include/utils/palloc.h b/src/include/utils/palloc.h index 304a5a84a5..275deba638 100644 --- a/src/include/utils/palloc.h +++ b/src/include/utils/palloc.h @@ -21,7 +21,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/palloc.h,v 1.44 2010/02/13 20:46:52 tgl Exp $ + * src/include/utils/palloc.h * *------------------------------------------------------------------------- */ diff --git a/src/include/utils/pg_crc.h b/src/include/utils/pg_crc.h index 6bab70ff48..a6a1d81953 100644 --- a/src/include/utils/pg_crc.h +++ b/src/include/utils/pg_crc.h @@ -17,7 +17,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/pg_crc.h,v 1.24 2010/02/26 02:01:29 momjian Exp $ + * src/include/utils/pg_crc.h */ #ifndef PG_CRC_H #define PG_CRC_H diff --git a/src/include/utils/pg_locale.h b/src/include/utils/pg_locale.h index 09e69113c1..7a0115d141 100644 --- a/src/include/utils/pg_locale.h +++ b/src/include/utils/pg_locale.h @@ -2,7 +2,7 @@ * * PostgreSQL locale utilities * - * $PostgreSQL: pgsql/src/include/utils/pg_locale.h,v 1.28 2010/01/02 16:58:10 momjian Exp $ + * src/include/utils/pg_locale.h * * Copyright (c) 2002-2010, PostgreSQL Global Development Group * diff --git a/src/include/utils/pg_lzcompress.h b/src/include/utils/pg_lzcompress.h index e81ae0d5ca..4af24a32a4 100644 --- a/src/include/utils/pg_lzcompress.h +++ b/src/include/utils/pg_lzcompress.h @@ -3,7 +3,7 @@ * * Definitions for the builtin LZ compressor * - * $PostgreSQL: pgsql/src/include/utils/pg_lzcompress.h,v 1.17 2008/03/07 23:20:21 tgl Exp $ + * src/include/utils/pg_lzcompress.h * ---------- */ diff --git a/src/include/utils/pg_rusage.h b/src/include/utils/pg_rusage.h index 63956b0e77..3e13137c9a 100644 --- a/src/include/utils/pg_rusage.h +++ b/src/include/utils/pg_rusage.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/pg_rusage.h,v 1.7 2010/01/02 16:58:10 momjian Exp $ + * src/include/utils/pg_rusage.h * *------------------------------------------------------------------------- */ diff --git a/src/include/utils/plancache.h b/src/include/utils/plancache.h index c2123181d4..5381b70d0e 100644 --- a/src/include/utils/plancache.h +++ b/src/include/utils/plancache.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/plancache.h,v 1.18 2010/02/26 02:01:29 momjian Exp $ + * src/include/utils/plancache.h * *------------------------------------------------------------------------- */ diff --git a/src/include/utils/portal.h b/src/include/utils/portal.h index 30214e68f3..37dba762cc 100644 --- a/src/include/utils/portal.h +++ b/src/include/utils/portal.h @@ -39,7 +39,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/portal.h,v 1.83 2010/07/05 09:27:17 heikki Exp $ + * src/include/utils/portal.h * *------------------------------------------------------------------------- */ diff --git a/src/include/utils/ps_status.h b/src/include/utils/ps_status.h index ff2bd63166..3f503cc187 100644 --- a/src/include/utils/ps_status.h +++ b/src/include/utils/ps_status.h @@ -4,7 +4,7 @@ * * Declarations for backend/utils/misc/ps_status.c * - * $PostgreSQL: pgsql/src/include/utils/ps_status.h,v 1.27 2006/06/27 22:16:44 momjian Exp $ + * src/include/utils/ps_status.h * *------------------------------------------------------------------------- */ diff --git a/src/include/utils/rbtree.h b/src/include/utils/rbtree.h index c7111d6850..3c3e7a5333 100644 --- a/src/include/utils/rbtree.h +++ b/src/include/utils/rbtree.h @@ -6,7 +6,7 @@ * Copyright (c) 2009-2010, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/include/utils/rbtree.h,v 1.4 2010/08/01 02:12:42 tgl Exp $ + * src/include/utils/rbtree.h * *------------------------------------------------------------------------- */ diff --git a/src/include/utils/rel.h b/src/include/utils/rel.h index b615f81c65..17ad88820d 100644 --- a/src/include/utils/rel.h +++ b/src/include/utils/rel.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/rel.h,v 1.125 2010/08/13 20:10:54 rhaas Exp $ + * src/include/utils/rel.h * *------------------------------------------------------------------------- */ diff --git a/src/include/utils/relcache.h b/src/include/utils/relcache.h index 4db4ba5db2..10d82d4b41 100644 --- a/src/include/utils/relcache.h +++ b/src/include/utils/relcache.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/relcache.h,v 1.69 2010/02/26 02:01:29 momjian Exp $ + * src/include/utils/relcache.h * *------------------------------------------------------------------------- */ diff --git a/src/include/utils/relmapper.h b/src/include/utils/relmapper.h index af291f3fb4..15cd49ec9f 100644 --- a/src/include/utils/relmapper.h +++ b/src/include/utils/relmapper.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/relmapper.h,v 1.2 2010/02/26 02:01:29 momjian Exp $ + * src/include/utils/relmapper.h * *------------------------------------------------------------------------- */ diff --git a/src/include/utils/resowner.h b/src/include/utils/resowner.h index 4725b5385b..7ce1db5dd2 100644 --- a/src/include/utils/resowner.h +++ b/src/include/utils/resowner.h @@ -12,7 +12,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/resowner.h,v 1.19 2010/01/02 16:58:10 momjian Exp $ + * src/include/utils/resowner.h * *------------------------------------------------------------------------- */ diff --git a/src/include/utils/selfuncs.h b/src/include/utils/selfuncs.h index fc9e611da1..0c6e918af7 100644 --- a/src/include/utils/selfuncs.h +++ b/src/include/utils/selfuncs.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/selfuncs.h,v 1.50 2010/01/02 16:58:10 momjian Exp $ + * src/include/utils/selfuncs.h * *------------------------------------------------------------------------- */ diff --git a/src/include/utils/snapmgr.h b/src/include/utils/snapmgr.h index 8fa661d3a9..f03647befe 100644 --- a/src/include/utils/snapmgr.h +++ b/src/include/utils/snapmgr.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/snapmgr.h,v 1.8 2010/01/02 16:58:10 momjian Exp $ + * src/include/utils/snapmgr.h * *------------------------------------------------------------------------- */ diff --git a/src/include/utils/snapshot.h b/src/include/utils/snapshot.h index 6e1a4f6e5b..3d243258f9 100644 --- a/src/include/utils/snapshot.h +++ b/src/include/utils/snapshot.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/snapshot.h,v 1.7 2010/01/02 16:58:10 momjian Exp $ + * src/include/utils/snapshot.h * *------------------------------------------------------------------------- */ diff --git a/src/include/utils/spccache.h b/src/include/utils/spccache.h index 9b620efa2b..876b608433 100644 --- a/src/include/utils/spccache.h +++ b/src/include/utils/spccache.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/spccache.h,v 1.2 2010/02/26 02:01:29 momjian Exp $ + * src/include/utils/spccache.h * *------------------------------------------------------------------------- */ diff --git a/src/include/utils/syscache.h b/src/include/utils/syscache.h index 9faefbe8d7..30e0f8f3bd 100644 --- a/src/include/utils/syscache.h +++ b/src/include/utils/syscache.h @@ -9,7 +9,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/syscache.h,v 1.79 2010/02/14 18:42:18 rhaas Exp $ + * src/include/utils/syscache.h * *------------------------------------------------------------------------- */ diff --git a/src/include/utils/timestamp.h b/src/include/utils/timestamp.h index ee42eb498e..db7b729ad3 100644 --- a/src/include/utils/timestamp.h +++ b/src/include/utils/timestamp.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/timestamp.h,v 1.82 2010/01/02 16:58:10 momjian Exp $ + * src/include/utils/timestamp.h * *------------------------------------------------------------------------- */ diff --git a/src/include/utils/tqual.h b/src/include/utils/tqual.h index 24fc288748..df14f59e34 100644 --- a/src/include/utils/tqual.h +++ b/src/include/utils/tqual.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/tqual.h,v 1.75 2010/01/02 16:58:10 momjian Exp $ + * src/include/utils/tqual.h * *------------------------------------------------------------------------- */ diff --git a/src/include/utils/tuplesort.h b/src/include/utils/tuplesort.h index 08d9f384a9..d879ff081d 100644 --- a/src/include/utils/tuplesort.h +++ b/src/include/utils/tuplesort.h @@ -13,7 +13,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/tuplesort.h,v 1.36 2010/02/26 02:01:29 momjian Exp $ + * src/include/utils/tuplesort.h * *------------------------------------------------------------------------- */ diff --git a/src/include/utils/tuplestore.h b/src/include/utils/tuplestore.h index 9a4b28722f..aa81e25e3e 100644 --- a/src/include/utils/tuplestore.h +++ b/src/include/utils/tuplestore.h @@ -24,7 +24,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/tuplestore.h,v 1.31 2010/01/02 16:58:10 momjian Exp $ + * src/include/utils/tuplestore.h * *------------------------------------------------------------------------- */ diff --git a/src/include/utils/typcache.h b/src/include/utils/typcache.h index 05b7732454..4065e483e4 100644 --- a/src/include/utils/typcache.h +++ b/src/include/utils/typcache.h @@ -9,7 +9,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/typcache.h,v 1.19 2010/09/02 03:16:46 tgl Exp $ + * src/include/utils/typcache.h * *------------------------------------------------------------------------- */ diff --git a/src/include/utils/tzparser.h b/src/include/utils/tzparser.h index 8f28a00d3b..6c262039ac 100644 --- a/src/include/utils/tzparser.h +++ b/src/include/utils/tzparser.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/tzparser.h,v 1.6 2010/01/02 16:58:10 momjian Exp $ + * src/include/utils/tzparser.h * *------------------------------------------------------------------------- */ diff --git a/src/include/utils/uuid.h b/src/include/utils/uuid.h index 8b7735e2f8..5562018dc9 100644 --- a/src/include/utils/uuid.h +++ b/src/include/utils/uuid.h @@ -7,7 +7,7 @@ * * Copyright (c) 2007-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/utils/uuid.h,v 1.6 2010/01/02 16:58:10 momjian Exp $ + * src/include/utils/uuid.h * *------------------------------------------------------------------------- */ diff --git a/src/include/utils/varbit.h b/src/include/utils/varbit.h index 02ed5f795e..b6c6032907 100644 --- a/src/include/utils/varbit.h +++ b/src/include/utils/varbit.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/varbit.h,v 1.31 2010/01/25 20:55:32 tgl Exp $ + * src/include/utils/varbit.h * *------------------------------------------------------------------------- */ diff --git a/src/include/utils/xml.h b/src/include/utils/xml.h index 96029c2ebd..5b65ad392b 100644 --- a/src/include/utils/xml.h +++ b/src/include/utils/xml.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/xml.h,v 1.34 2010/08/13 18:36:26 tgl Exp $ + * src/include/utils/xml.h * *------------------------------------------------------------------------- */ diff --git a/src/include/windowapi.h b/src/include/windowapi.h index e245981a13..ddb2fa098c 100644 --- a/src/include/windowapi.h +++ b/src/include/windowapi.h @@ -21,7 +21,7 @@ * * Portions Copyright (c) 2000-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/windowapi.h,v 1.4 2010/01/02 16:58:00 momjian Exp $ + * src/include/windowapi.h * *------------------------------------------------------------------------- */ diff --git a/src/interfaces/Makefile b/src/interfaces/Makefile index 09ca0c2bb8..f208a28919 100644 --- a/src/interfaces/Makefile +++ b/src/interfaces/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/interfaces/Makefile,v 1.57 2009/08/07 20:50:22 petere Exp $ +# src/interfaces/Makefile # #------------------------------------------------------------------------- diff --git a/src/interfaces/ecpg/README.dynSQL b/src/interfaces/ecpg/README.dynSQL index d036da5c60..dcb263e9f6 100644 --- a/src/interfaces/ecpg/README.dynSQL +++ b/src/interfaces/ecpg/README.dynSQL @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/interfaces/ecpg/README.dynSQL,v 1.4 2010/08/19 05:57:34 petere Exp $ +src/interfaces/ecpg/README.dynSQL descriptor statements have the following shortcomings diff --git a/src/interfaces/ecpg/compatlib/Makefile b/src/interfaces/ecpg/compatlib/Makefile index 0034282e90..d211b7d20a 100644 --- a/src/interfaces/ecpg/compatlib/Makefile +++ b/src/interfaces/ecpg/compatlib/Makefile @@ -5,7 +5,7 @@ # Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group # Portions Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/interfaces/ecpg/compatlib/Makefile,v 1.47 2010/07/12 16:18:44 momjian Exp $ +# src/interfaces/ecpg/compatlib/Makefile # #------------------------------------------------------------------------- diff --git a/src/interfaces/ecpg/compatlib/exports.txt b/src/interfaces/ecpg/compatlib/exports.txt index 6810240838..e0cfd7a22d 100644 --- a/src/interfaces/ecpg/compatlib/exports.txt +++ b/src/interfaces/ecpg/compatlib/exports.txt @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/src/interfaces/ecpg/compatlib/exports.txt,v 1.6 2009/08/27 16:49:41 mha Exp $ +# src/interfaces/ecpg/compatlib/exports.txt # Functions to be exported by ecpg_compatlib DLL ECPG_informix_get_var 1 ECPG_informix_set_var 2 diff --git a/src/interfaces/ecpg/compatlib/informix.c b/src/interfaces/ecpg/compatlib/informix.c index 92e2a5269a..641f01adf5 100644 --- a/src/interfaces/ecpg/compatlib/informix.c +++ b/src/interfaces/ecpg/compatlib/informix.c @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/interfaces/ecpg/compatlib/informix.c,v 1.64 2010/02/26 02:01:29 momjian Exp $ */ +/* src/interfaces/ecpg/compatlib/informix.c */ #define POSTGRES_ECPG_INTERNAL #include "postgres_fe.h" diff --git a/src/interfaces/ecpg/ecpglib/Makefile b/src/interfaces/ecpg/ecpglib/Makefile index 2b6923d56a..7d134acd7f 100644 --- a/src/interfaces/ecpg/ecpglib/Makefile +++ b/src/interfaces/ecpg/ecpglib/Makefile @@ -5,7 +5,7 @@ # Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group # Portions Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.67 2010/07/12 16:18:44 momjian Exp $ +# src/interfaces/ecpg/ecpglib/Makefile # #------------------------------------------------------------------------- diff --git a/src/interfaces/ecpg/ecpglib/connect.c b/src/interfaces/ecpg/ecpglib/connect.c index c05dc9014e..56a732a498 100644 --- a/src/interfaces/ecpg/ecpglib/connect.c +++ b/src/interfaces/ecpg/ecpglib/connect.c @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/connect.c,v 1.56 2010/07/06 19:19:00 momjian Exp $ */ +/* src/interfaces/ecpg/ecpglib/connect.c */ #define POSTGRES_ECPG_INTERNAL #include "postgres_fe.h" diff --git a/src/interfaces/ecpg/ecpglib/data.c b/src/interfaces/ecpg/ecpglib/data.c index 79af7b1ebb..fc0455607b 100644 --- a/src/interfaces/ecpg/ecpglib/data.c +++ b/src/interfaces/ecpg/ecpglib/data.c @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/data.c,v 1.53 2010/05/25 17:28:20 meskes Exp $ */ +/* src/interfaces/ecpg/ecpglib/data.c */ #define POSTGRES_ECPG_INTERNAL #include "postgres_fe.h" diff --git a/src/interfaces/ecpg/ecpglib/descriptor.c b/src/interfaces/ecpg/ecpglib/descriptor.c index cebc8b67fa..c9d960a687 100644 --- a/src/interfaces/ecpg/ecpglib/descriptor.c +++ b/src/interfaces/ecpg/ecpglib/descriptor.c @@ -1,6 +1,6 @@ /* dynamic SQL support routines * - * $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/descriptor.c,v 1.38 2010/05/25 17:28:20 meskes Exp $ + * src/interfaces/ecpg/ecpglib/descriptor.c */ #define POSTGRES_ECPG_INTERNAL diff --git a/src/interfaces/ecpg/ecpglib/error.c b/src/interfaces/ecpg/ecpglib/error.c index a8f3b051ff..58024f47b0 100644 --- a/src/interfaces/ecpg/ecpglib/error.c +++ b/src/interfaces/ecpg/ecpglib/error.c @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/error.c,v 1.27 2010/07/06 19:19:00 momjian Exp $ */ +/* src/interfaces/ecpg/ecpglib/error.c */ #define POSTGRES_ECPG_INTERNAL #include "postgres_fe.h" diff --git a/src/interfaces/ecpg/ecpglib/execute.c b/src/interfaces/ecpg/ecpglib/execute.c index 72eed58746..817724abe6 100644 --- a/src/interfaces/ecpg/ecpglib/execute.c +++ b/src/interfaces/ecpg/ecpglib/execute.c @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/execute.c,v 1.98 2010/07/06 19:19:00 momjian Exp $ */ +/* src/interfaces/ecpg/ecpglib/execute.c */ /* * The aim is to get a simpler inteface to the database routines. diff --git a/src/interfaces/ecpg/ecpglib/exports.txt b/src/interfaces/ecpg/ecpglib/exports.txt index 5b4144a178..69e96179d5 100644 --- a/src/interfaces/ecpg/ecpglib/exports.txt +++ b/src/interfaces/ecpg/ecpglib/exports.txt @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/exports.txt,v 1.7 2010/01/26 09:07:31 meskes Exp $ +# src/interfaces/ecpg/ecpglib/exports.txt # Functions to be exported by ecpglib DLL ECPGallocate_desc 1 ECPGconnect 2 diff --git a/src/interfaces/ecpg/ecpglib/extern.h b/src/interfaces/ecpg/ecpglib/extern.h index 1e8f18f965..0193ad1418 100644 --- a/src/interfaces/ecpg/ecpglib/extern.h +++ b/src/interfaces/ecpg/ecpglib/extern.h @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/extern.h,v 1.41 2010/05/25 14:32:55 meskes Exp $ */ +/* src/interfaces/ecpg/ecpglib/extern.h */ #ifndef _ECPG_LIB_EXTERN_H #define _ECPG_LIB_EXTERN_H diff --git a/src/interfaces/ecpg/ecpglib/memory.c b/src/interfaces/ecpg/ecpglib/memory.c index 63b57177ec..94414b5e99 100644 --- a/src/interfaces/ecpg/ecpglib/memory.c +++ b/src/interfaces/ecpg/ecpglib/memory.c @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/memory.c,v 1.12 2007/11/15 21:14:45 momjian Exp $ */ +/* src/interfaces/ecpg/ecpglib/memory.c */ #define POSTGRES_ECPG_INTERNAL #include "postgres_fe.h" diff --git a/src/interfaces/ecpg/ecpglib/misc.c b/src/interfaces/ecpg/ecpglib/misc.c index 9a5dca763b..20725e44e5 100644 --- a/src/interfaces/ecpg/ecpglib/misc.c +++ b/src/interfaces/ecpg/ecpglib/misc.c @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/misc.c,v 1.59 2010/07/06 19:19:00 momjian Exp $ */ +/* src/interfaces/ecpg/ecpglib/misc.c */ #define POSTGRES_ECPG_INTERNAL #include "postgres_fe.h" diff --git a/src/interfaces/ecpg/ecpglib/nls.mk b/src/interfaces/ecpg/ecpglib/nls.mk index c2e0421532..e78b83dba6 100644 --- a/src/interfaces/ecpg/ecpglib/nls.mk +++ b/src/interfaces/ecpg/ecpglib/nls.mk @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/nls.mk,v 1.7 2010/05/13 15:56:40 petere Exp $ +# src/interfaces/ecpg/ecpglib/nls.mk CATALOG_NAME = ecpglib AVAIL_LANGUAGES = de es fr it ja pt_BR tr zh_CN GETTEXT_FILES = connect.c error.c execute.c misc.c diff --git a/src/interfaces/ecpg/ecpglib/pg_type.h b/src/interfaces/ecpg/ecpglib/pg_type.h index ac6fa4910a..edfd7e02f9 100644 --- a/src/interfaces/ecpg/ecpglib/pg_type.h +++ b/src/interfaces/ecpg/ecpglib/pg_type.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/pg_type.h,v 1.11 2010/01/05 01:06:57 tgl Exp $ + * src/interfaces/ecpg/ecpglib/pg_type.h * *------------------------------------------------------------------------- */ diff --git a/src/interfaces/ecpg/ecpglib/po/fr.po b/src/interfaces/ecpg/ecpglib/po/fr.po index 7bef8f84c4..6761e4f1ff 100644 --- a/src/interfaces/ecpg/ecpglib/po/fr.po +++ b/src/interfaces/ecpg/ecpglib/po/fr.po @@ -1,7 +1,7 @@ # translation of ecpglib.po to fr_fr # french message translation file for ecpglib # -# $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/po/fr.po,v 1.3 2010/05/13 15:56:40 petere Exp $ +# src/interfaces/ecpg/ecpglib/po/fr.po # # Use these quotes: « %s » # diff --git a/src/interfaces/ecpg/ecpglib/prepare.c b/src/interfaces/ecpg/ecpglib/prepare.c index 6aefbe4648..c2725a231a 100644 --- a/src/interfaces/ecpg/ecpglib/prepare.c +++ b/src/interfaces/ecpg/ecpglib/prepare.c @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/prepare.c,v 1.38 2010/03/21 11:33:44 meskes Exp $ */ +/* src/interfaces/ecpg/ecpglib/prepare.c */ #define POSTGRES_ECPG_INTERNAL #include "postgres_fe.h" diff --git a/src/interfaces/ecpg/ecpglib/typename.c b/src/interfaces/ecpg/ecpglib/typename.c index 02f432347a..d4bfd0d35d 100644 --- a/src/interfaces/ecpg/ecpglib/typename.c +++ b/src/interfaces/ecpg/ecpglib/typename.c @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/typename.c,v 1.19 2010/02/26 02:01:30 momjian Exp $ */ +/* src/interfaces/ecpg/ecpglib/typename.c */ #define POSTGRES_ECPG_INTERNAL #include "postgres_fe.h" diff --git a/src/interfaces/ecpg/include/datetime.h b/src/interfaces/ecpg/include/datetime.h index a2f1b0d11c..e7d6d2144a 100644 --- a/src/interfaces/ecpg/include/datetime.h +++ b/src/interfaces/ecpg/include/datetime.h @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/interfaces/ecpg/include/datetime.h,v 1.17 2009/06/11 14:49:13 momjian Exp $ */ +/* src/interfaces/ecpg/include/datetime.h */ #ifndef _ECPG_DATETIME_H #define _ECPG_DATETIME_H diff --git a/src/interfaces/ecpg/include/decimal.h b/src/interfaces/ecpg/include/decimal.h index 5b923a0084..7efed47693 100644 --- a/src/interfaces/ecpg/include/decimal.h +++ b/src/interfaces/ecpg/include/decimal.h @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/interfaces/ecpg/include/decimal.h,v 1.19 2009/06/11 14:49:13 momjian Exp $ */ +/* src/interfaces/ecpg/include/decimal.h */ #ifndef _ECPG_DECIMAL_H #define _ECPG_DECIMAL_H diff --git a/src/interfaces/ecpg/include/ecpg-pthread-win32.h b/src/interfaces/ecpg/include/ecpg-pthread-win32.h index dce8c38715..7e59357a38 100644 --- a/src/interfaces/ecpg/include/ecpg-pthread-win32.h +++ b/src/interfaces/ecpg/include/ecpg-pthread-win32.h @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/interfaces/ecpg/include/ecpg-pthread-win32.h,v 1.5 2007/11/15 21:14:45 momjian Exp $ */ +/* src/interfaces/ecpg/include/ecpg-pthread-win32.h */ /* * pthread mapping macros for win32 native thread implementation */ diff --git a/src/interfaces/ecpg/include/ecpg_informix.h b/src/interfaces/ecpg/include/ecpg_informix.h index 3be8ebba9c..3ffeb95b5a 100644 --- a/src/interfaces/ecpg/include/ecpg_informix.h +++ b/src/interfaces/ecpg/include/ecpg_informix.h @@ -1,6 +1,6 @@ /* * This file contains stuff needed to be as compatible to Informix as possible. - * $PostgreSQL: pgsql/src/interfaces/ecpg/include/ecpg_informix.h,v 1.24 2010/02/26 02:01:31 momjian Exp $ + * src/interfaces/ecpg/include/ecpg_informix.h */ #ifndef _ECPG_INFORMIX_H #define _ECPG_INFORMIX_H diff --git a/src/interfaces/ecpg/include/ecpgerrno.h b/src/interfaces/ecpg/include/ecpgerrno.h index 9b5adb9981..36b15b7a61 100644 --- a/src/interfaces/ecpg/include/ecpgerrno.h +++ b/src/interfaces/ecpg/include/ecpgerrno.h @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/interfaces/ecpg/include/ecpgerrno.h,v 1.27 2006/03/11 04:38:39 momjian Exp $ */ +/* src/interfaces/ecpg/include/ecpgerrno.h */ #ifndef _ECPG_ERRNO_H #define _ECPG_ERRNO_H diff --git a/src/interfaces/ecpg/include/ecpglib.h b/src/interfaces/ecpg/include/ecpglib.h index 2e1f1d6e24..21b64d5d38 100644 --- a/src/interfaces/ecpg/include/ecpglib.h +++ b/src/interfaces/ecpg/include/ecpglib.h @@ -1,7 +1,7 @@ /* * this is a small part of c.h since we don't want to leak all postgres * definitions into ecpg programs - * $PostgreSQL: pgsql/src/interfaces/ecpg/include/ecpglib.h,v 1.83 2010/02/26 02:01:31 momjian Exp $ + * src/interfaces/ecpg/include/ecpglib.h */ #ifndef _ECPGLIB_H diff --git a/src/interfaces/ecpg/include/ecpgtype.h b/src/interfaces/ecpg/include/ecpgtype.h index 12bfd135ba..7cc47e91e3 100644 --- a/src/interfaces/ecpg/include/ecpgtype.h +++ b/src/interfaces/ecpg/include/ecpgtype.h @@ -5,7 +5,7 @@ * All types that can be handled for host variable declarations has to * be handled eventually. * - * $PostgreSQL: pgsql/src/interfaces/ecpg/include/ecpgtype.h,v 1.40 2010/02/26 02:01:31 momjian Exp $ + * src/interfaces/ecpg/include/ecpgtype.h */ /* diff --git a/src/interfaces/ecpg/include/pgtypes_date.h b/src/interfaces/ecpg/include/pgtypes_date.h index 9cc4233ee0..7ab8046b7b 100644 --- a/src/interfaces/ecpg/include/pgtypes_date.h +++ b/src/interfaces/ecpg/include/pgtypes_date.h @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/interfaces/ecpg/include/pgtypes_date.h,v 1.11 2006/10/04 00:30:11 momjian Exp $ */ +/* src/interfaces/ecpg/include/pgtypes_date.h */ #ifndef PGTYPES_DATETIME #define PGTYPES_DATETIME diff --git a/src/interfaces/ecpg/include/pgtypes_error.h b/src/interfaces/ecpg/include/pgtypes_error.h index f82a59f22b..9fc22a26aa 100644 --- a/src/interfaces/ecpg/include/pgtypes_error.h +++ b/src/interfaces/ecpg/include/pgtypes_error.h @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/interfaces/ecpg/include/pgtypes_error.h,v 1.8 2006/08/15 06:40:19 meskes Exp $ */ +/* src/interfaces/ecpg/include/pgtypes_error.h */ #define PGTYPES_NUM_OVERFLOW 301 #define PGTYPES_NUM_BAD_NUMERIC 302 diff --git a/src/interfaces/ecpg/include/pgtypes_interval.h b/src/interfaces/ecpg/include/pgtypes_interval.h index 6f2225c03a..deac6a2e01 100644 --- a/src/interfaces/ecpg/include/pgtypes_interval.h +++ b/src/interfaces/ecpg/include/pgtypes_interval.h @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/interfaces/ecpg/include/pgtypes_interval.h,v 1.16 2010/02/26 02:01:31 momjian Exp $ */ +/* src/interfaces/ecpg/include/pgtypes_interval.h */ #ifndef PGTYPES_INTERVAL #define PGTYPES_INTERVAL diff --git a/src/interfaces/ecpg/include/pgtypes_timestamp.h b/src/interfaces/ecpg/include/pgtypes_timestamp.h index 3c20be99b0..07e95294b3 100644 --- a/src/interfaces/ecpg/include/pgtypes_timestamp.h +++ b/src/interfaces/ecpg/include/pgtypes_timestamp.h @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/interfaces/ecpg/include/pgtypes_timestamp.h,v 1.11 2006/08/23 12:01:52 meskes Exp $ */ +/* src/interfaces/ecpg/include/pgtypes_timestamp.h */ #ifndef PGTYPES_TIMESTAMP #define PGTYPES_TIMESTAMP diff --git a/src/interfaces/ecpg/include/sqlda-native.h b/src/interfaces/ecpg/include/sqlda-native.h index bd870764ea..acb314cd17 100644 --- a/src/interfaces/ecpg/include/sqlda-native.h +++ b/src/interfaces/ecpg/include/sqlda-native.h @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/src/interfaces/ecpg/include/sqlda-native.h,v 1.3 2010/02/26 02:01:31 momjian Exp $ + * src/interfaces/ecpg/include/sqlda-native.h */ #ifndef ECPG_SQLDA_NATIVE_H diff --git a/src/interfaces/ecpg/pgtypeslib/Makefile b/src/interfaces/ecpg/pgtypeslib/Makefile index 1c21c84194..2a5cb33f8e 100644 --- a/src/interfaces/ecpg/pgtypeslib/Makefile +++ b/src/interfaces/ecpg/pgtypeslib/Makefile @@ -5,7 +5,7 @@ # Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group # Portions Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/interfaces/ecpg/pgtypeslib/Makefile,v 1.47 2010/07/12 16:18:44 momjian Exp $ +# src/interfaces/ecpg/pgtypeslib/Makefile # #------------------------------------------------------------------------- diff --git a/src/interfaces/ecpg/pgtypeslib/common.c b/src/interfaces/ecpg/pgtypeslib/common.c index 4c810292ad..d800321a9d 100644 --- a/src/interfaces/ecpg/pgtypeslib/common.c +++ b/src/interfaces/ecpg/pgtypeslib/common.c @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/interfaces/ecpg/pgtypeslib/common.c,v 1.14 2006/07/30 16:28:58 meskes Exp $ */ +/* src/interfaces/ecpg/pgtypeslib/common.c */ #include "postgres_fe.h" diff --git a/src/interfaces/ecpg/pgtypeslib/datetime.c b/src/interfaces/ecpg/pgtypeslib/datetime.c index 08efe98446..41377a6861 100644 --- a/src/interfaces/ecpg/pgtypeslib/datetime.c +++ b/src/interfaces/ecpg/pgtypeslib/datetime.c @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/interfaces/ecpg/pgtypeslib/datetime.c,v 1.38 2009/06/11 14:49:13 momjian Exp $ */ +/* src/interfaces/ecpg/pgtypeslib/datetime.c */ #include "postgres_fe.h" diff --git a/src/interfaces/ecpg/pgtypeslib/dt.h b/src/interfaces/ecpg/pgtypeslib/dt.h index 764529d3a7..ca9f5effcc 100644 --- a/src/interfaces/ecpg/pgtypeslib/dt.h +++ b/src/interfaces/ecpg/pgtypeslib/dt.h @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/interfaces/ecpg/pgtypeslib/dt.h,v 1.44 2009/06/11 14:49:13 momjian Exp $ */ +/* src/interfaces/ecpg/pgtypeslib/dt.h */ #ifndef DT_H #define DT_H diff --git a/src/interfaces/ecpg/pgtypeslib/dt_common.c b/src/interfaces/ecpg/pgtypeslib/dt_common.c index dc430f7881..da3224aae3 100644 --- a/src/interfaces/ecpg/pgtypeslib/dt_common.c +++ b/src/interfaces/ecpg/pgtypeslib/dt_common.c @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/interfaces/ecpg/pgtypeslib/dt_common.c,v 1.54 2010/06/16 00:54:16 petere Exp $ */ +/* src/interfaces/ecpg/pgtypeslib/dt_common.c */ #include "postgres_fe.h" diff --git a/src/interfaces/ecpg/pgtypeslib/exports.txt b/src/interfaces/ecpg/pgtypeslib/exports.txt index ea7cf313fa..70ef01a8a7 100644 --- a/src/interfaces/ecpg/pgtypeslib/exports.txt +++ b/src/interfaces/ecpg/pgtypeslib/exports.txt @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/src/interfaces/ecpg/pgtypeslib/exports.txt,v 1.3 2007/10/04 17:49:31 meskes Exp $ +# src/interfaces/ecpg/pgtypeslib/exports.txt # Functions to be exported by pgtypeslib DLL PGTYPESdate_dayofweek 1 PGTYPESdate_defmt_asc 2 diff --git a/src/interfaces/ecpg/pgtypeslib/extern.h b/src/interfaces/ecpg/pgtypeslib/extern.h index 86f6768299..c7c64b1578 100644 --- a/src/interfaces/ecpg/pgtypeslib/extern.h +++ b/src/interfaces/ecpg/pgtypeslib/extern.h @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/interfaces/ecpg/pgtypeslib/extern.h,v 1.8 2006/03/11 04:38:39 momjian Exp $ */ +/* src/interfaces/ecpg/pgtypeslib/extern.h */ #ifndef __PGTYPES_COMMON_H__ #define __PGTYPES_COMMON_H__ diff --git a/src/interfaces/ecpg/pgtypeslib/interval.c b/src/interfaces/ecpg/pgtypeslib/interval.c index 47fb936a18..bcc10eeafd 100644 --- a/src/interfaces/ecpg/pgtypeslib/interval.c +++ b/src/interfaces/ecpg/pgtypeslib/interval.c @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/interfaces/ecpg/pgtypeslib/interval.c,v 1.43 2010/08/02 01:24:54 tgl Exp $ */ +/* src/interfaces/ecpg/pgtypeslib/interval.c */ #include "postgres_fe.h" #include diff --git a/src/interfaces/ecpg/pgtypeslib/numeric.c b/src/interfaces/ecpg/pgtypeslib/numeric.c index 001e6cc730..7257c81254 100644 --- a/src/interfaces/ecpg/pgtypeslib/numeric.c +++ b/src/interfaces/ecpg/pgtypeslib/numeric.c @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/interfaces/ecpg/pgtypeslib/numeric.c,v 1.36 2010/08/17 09:36:04 meskes Exp $ */ +/* src/interfaces/ecpg/pgtypeslib/numeric.c */ #include "postgres_fe.h" #include diff --git a/src/interfaces/ecpg/pgtypeslib/timestamp.c b/src/interfaces/ecpg/pgtypeslib/timestamp.c index 315c683455..f9222b3538 100644 --- a/src/interfaces/ecpg/pgtypeslib/timestamp.c +++ b/src/interfaces/ecpg/pgtypeslib/timestamp.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/src/interfaces/ecpg/pgtypeslib/timestamp.c,v 1.46 2009/09/03 09:59:20 meskes Exp $ + * src/interfaces/ecpg/pgtypeslib/timestamp.c */ #include "postgres_fe.h" diff --git a/src/interfaces/ecpg/preproc/Makefile b/src/interfaces/ecpg/preproc/Makefile index b19f632feb..8978eeb241 100644 --- a/src/interfaces/ecpg/preproc/Makefile +++ b/src/interfaces/ecpg/preproc/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1998-2010, PostgreSQL Global Development Group # -# $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/Makefile,v 1.151 2010/07/12 16:18:44 momjian Exp $ +# src/interfaces/ecpg/preproc/Makefile # #------------------------------------------------------------------------- diff --git a/src/interfaces/ecpg/preproc/c_keywords.c b/src/interfaces/ecpg/preproc/c_keywords.c index 7abd94f4ca..41d20d26d6 100644 --- a/src/interfaces/ecpg/preproc/c_keywords.c +++ b/src/interfaces/ecpg/preproc/c_keywords.c @@ -3,7 +3,7 @@ * c_keywords.c * lexical token lookup for reserved words in postgres embedded SQL * - * $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/c_keywords.c,v 1.25 2010/02/26 02:01:31 momjian Exp $ + * src/interfaces/ecpg/preproc/c_keywords.c * *------------------------------------------------------------------------- */ diff --git a/src/interfaces/ecpg/preproc/check_rules.pl b/src/interfaces/ecpg/preproc/check_rules.pl index a806cd2461..7dc6ca46fb 100755 --- a/src/interfaces/ecpg/preproc/check_rules.pl +++ b/src/interfaces/ecpg/preproc/check_rules.pl @@ -1,5 +1,5 @@ #!/usr/bin/perl -# $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/check_rules.pl,v 1.3 2010/08/19 05:57:34 petere Exp $ +# src/interfaces/ecpg/preproc/check_rules.pl # test parser generater for ecpg # call with backend parser as stdin # diff --git a/src/interfaces/ecpg/preproc/descriptor.c b/src/interfaces/ecpg/preproc/descriptor.c index f1ef742cce..7dd8a21304 100644 --- a/src/interfaces/ecpg/preproc/descriptor.c +++ b/src/interfaces/ecpg/preproc/descriptor.c @@ -1,7 +1,7 @@ /* * functions needed for descriptor handling * - * $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/descriptor.c,v 1.34 2010/04/01 10:30:53 meskes Exp $ + * src/interfaces/ecpg/preproc/descriptor.c * * since descriptor might be either a string constant or a string var * we need to check for a constant if we expect a constant diff --git a/src/interfaces/ecpg/preproc/ecpg.addons b/src/interfaces/ecpg/preproc/ecpg.addons index af708ab019..c39b13c6fb 100644 --- a/src/interfaces/ecpg/preproc/ecpg.addons +++ b/src/interfaces/ecpg/preproc/ecpg.addons @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.addons,v 1.20 2010/09/10 10:13:20 meskes Exp $ */ +/* src/interfaces/ecpg/preproc/ecpg.addons */ ECPG: stmtClosePortalStmt block { if (INFORMIX_MODE) diff --git a/src/interfaces/ecpg/preproc/ecpg.c b/src/interfaces/ecpg/preproc/ecpg.c index db52bf5c20..df1ddfd818 100644 --- a/src/interfaces/ecpg/preproc/ecpg.c +++ b/src/interfaces/ecpg/preproc/ecpg.c @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.c,v 1.116 2010/07/06 19:19:00 momjian Exp $ */ +/* src/interfaces/ecpg/preproc/ecpg.c */ /* Main for ecpg, the PostgreSQL embedded SQL precompiler. */ /* Copyright (c) 1996-2010, PostgreSQL Global Development Group */ diff --git a/src/interfaces/ecpg/preproc/ecpg.header b/src/interfaces/ecpg/preproc/ecpg.header index 3e8219efaf..54979e987c 100644 --- a/src/interfaces/ecpg/preproc/ecpg.header +++ b/src/interfaces/ecpg/preproc/ecpg.header @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.header,v 1.17 2010/09/10 10:13:20 meskes Exp $ */ +/* src/interfaces/ecpg/preproc/ecpg.header */ /* Copyright comment */ %{ diff --git a/src/interfaces/ecpg/preproc/ecpg.tokens b/src/interfaces/ecpg/preproc/ecpg.tokens index d754ff9add..c396b552f9 100644 --- a/src/interfaces/ecpg/preproc/ecpg.tokens +++ b/src/interfaces/ecpg/preproc/ecpg.tokens @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.tokens,v 1.3 2010/08/19 05:57:34 petere Exp $ */ +/* src/interfaces/ecpg/preproc/ecpg.tokens */ /* special embedded SQL tokens */ %token SQL_ALLOCATE SQL_AUTOCOMMIT SQL_BOOL SQL_BREAK diff --git a/src/interfaces/ecpg/preproc/ecpg.trailer b/src/interfaces/ecpg/preproc/ecpg.trailer index 2b99b4e4cf..2ef6c3618e 100644 --- a/src/interfaces/ecpg/preproc/ecpg.trailer +++ b/src/interfaces/ecpg/preproc/ecpg.trailer @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.trailer,v 1.27 2010/09/10 10:13:20 meskes Exp $ */ +/* src/interfaces/ecpg/preproc/ecpg.trailer */ statements: /*EMPTY*/ | statements statement diff --git a/src/interfaces/ecpg/preproc/ecpg.type b/src/interfaces/ecpg/preproc/ecpg.type index aa062c3dc6..831c4c3b20 100644 --- a/src/interfaces/ecpg/preproc/ecpg.type +++ b/src/interfaces/ecpg/preproc/ecpg.type @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.type,v 1.7 2010/08/19 05:57:34 petere Exp $ */ +/* src/interfaces/ecpg/preproc/ecpg.type */ %type ECPGAllocateDescr %type ECPGCKeywords %type ECPGColId diff --git a/src/interfaces/ecpg/preproc/ecpg_keywords.c b/src/interfaces/ecpg/preproc/ecpg_keywords.c index c475bf9671..8032c30c40 100644 --- a/src/interfaces/ecpg/preproc/ecpg_keywords.c +++ b/src/interfaces/ecpg/preproc/ecpg_keywords.c @@ -4,7 +4,7 @@ * lexical token lookup for reserved words in postgres embedded SQL * * IDENTIFICATION - * $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg_keywords.c,v 1.41 2009/07/14 20:24:10 tgl Exp $ + * src/interfaces/ecpg/preproc/ecpg_keywords.c * *------------------------------------------------------------------------- */ diff --git a/src/interfaces/ecpg/preproc/extern.h b/src/interfaces/ecpg/preproc/extern.h index 25972b0c85..202baacc3d 100644 --- a/src/interfaces/ecpg/preproc/extern.h +++ b/src/interfaces/ecpg/preproc/extern.h @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/extern.h,v 1.78 2010/01/26 09:07:31 meskes Exp $ */ +/* src/interfaces/ecpg/preproc/extern.h */ #ifndef _ECPG_PREPROC_EXTERN_H #define _ECPG_PREPROC_EXTERN_H diff --git a/src/interfaces/ecpg/preproc/keywords.c b/src/interfaces/ecpg/preproc/keywords.c index 82c0d69fe8..5c8a525def 100644 --- a/src/interfaces/ecpg/preproc/keywords.c +++ b/src/interfaces/ecpg/preproc/keywords.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.90 2010/01/02 16:58:11 momjian Exp $ + * src/interfaces/ecpg/preproc/keywords.c * *------------------------------------------------------------------------- */ diff --git a/src/interfaces/ecpg/preproc/nls.mk b/src/interfaces/ecpg/preproc/nls.mk index ade6ad4a0f..a461fbf7f9 100644 --- a/src/interfaces/ecpg/preproc/nls.mk +++ b/src/interfaces/ecpg/preproc/nls.mk @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/nls.mk,v 1.7 2010/09/19 16:17:45 tgl Exp $ +# src/interfaces/ecpg/preproc/nls.mk CATALOG_NAME = ecpg AVAIL_LANGUAGES = de es fr it ja pt_BR tr zh_CN GETTEXT_FILES = descriptor.c ecpg.c pgc.c preproc.c type.c variable.c diff --git a/src/interfaces/ecpg/preproc/output.c b/src/interfaces/ecpg/preproc/output.c index 94cefdb2d2..9958a0a5df 100644 --- a/src/interfaces/ecpg/preproc/output.c +++ b/src/interfaces/ecpg/preproc/output.c @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/output.c,v 1.26 2009/12/16 10:15:06 meskes Exp $ */ +/* src/interfaces/ecpg/preproc/output.c */ #include "postgres_fe.h" diff --git a/src/interfaces/ecpg/preproc/parse.pl b/src/interfaces/ecpg/preproc/parse.pl index 1b59ead8f4..f3c757e893 100644 --- a/src/interfaces/ecpg/preproc/parse.pl +++ b/src/interfaces/ecpg/preproc/parse.pl @@ -1,5 +1,5 @@ #!/usr/bin/perl -# $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/parse.pl,v 1.9 2010/06/04 10:09:58 meskes Exp $ +# src/interfaces/ecpg/preproc/parse.pl # parser generater for ecpg # call with backend parser as stdin # diff --git a/src/interfaces/ecpg/preproc/parser.c b/src/interfaces/ecpg/preproc/parser.c index b87149a8cc..e347977344 100644 --- a/src/interfaces/ecpg/preproc/parser.c +++ b/src/interfaces/ecpg/preproc/parser.c @@ -14,7 +14,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/parser.c,v 1.6 2010/01/02 16:58:11 momjian Exp $ + * src/interfaces/ecpg/preproc/parser.c * *------------------------------------------------------------------------- */ diff --git a/src/interfaces/ecpg/preproc/pgc.l b/src/interfaces/ecpg/preproc/pgc.l index e0f112d3c4..05febb556d 100644 --- a/src/interfaces/ecpg/preproc/pgc.l +++ b/src/interfaces/ecpg/preproc/pgc.l @@ -12,7 +12,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.174 2010/05/30 18:10:41 tgl Exp $ + * src/interfaces/ecpg/preproc/pgc.l * *------------------------------------------------------------------------- */ diff --git a/src/interfaces/ecpg/preproc/type.c b/src/interfaces/ecpg/preproc/type.c index eb7d4aeb9b..2f1298d553 100644 --- a/src/interfaces/ecpg/preproc/type.c +++ b/src/interfaces/ecpg/preproc/type.c @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/type.c,v 1.93 2010/07/06 19:19:00 momjian Exp $ */ +/* src/interfaces/ecpg/preproc/type.c */ #include "postgres_fe.h" diff --git a/src/interfaces/ecpg/preproc/type.h b/src/interfaces/ecpg/preproc/type.h index 2c873aaf39..68e0d1aa20 100644 --- a/src/interfaces/ecpg/preproc/type.h +++ b/src/interfaces/ecpg/preproc/type.h @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/type.h,v 1.56 2010/04/01 10:30:53 meskes Exp $ + * src/interfaces/ecpg/preproc/type.h */ #ifndef _ECPG_PREPROC_TYPE_H #define _ECPG_PREPROC_TYPE_H diff --git a/src/interfaces/ecpg/preproc/variable.c b/src/interfaces/ecpg/preproc/variable.c index dbde1141ab..4b991549a7 100644 --- a/src/interfaces/ecpg/preproc/variable.c +++ b/src/interfaces/ecpg/preproc/variable.c @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/variable.c,v 1.56 2010/04/01 10:30:53 meskes Exp $ */ +/* src/interfaces/ecpg/preproc/variable.c */ #include "postgres_fe.h" diff --git a/src/interfaces/ecpg/test/Makefile b/src/interfaces/ecpg/test/Makefile index 404b604a0f..e1ee40db65 100644 --- a/src/interfaces/ecpg/test/Makefile +++ b/src/interfaces/ecpg/test/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/src/interfaces/ecpg/test/Makefile,v 1.79 2010/07/05 18:54:38 tgl Exp $ +# src/interfaces/ecpg/test/Makefile subdir = src/interfaces/ecpg/test top_builddir = ../../../.. diff --git a/src/interfaces/ecpg/test/connect/README b/src/interfaces/ecpg/test/connect/README index b632788d30..3bbfbc5b87 100644 --- a/src/interfaces/ecpg/test/connect/README +++ b/src/interfaces/ecpg/test/connect/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/interfaces/ecpg/test/connect/README,v 1.2 2008/03/21 13:23:28 momjian Exp $ +src/interfaces/ecpg/test/connect/README Programs in this directory test all sorts of connections. diff --git a/src/interfaces/ecpg/test/pg_regress_ecpg.c b/src/interfaces/ecpg/test/pg_regress_ecpg.c index c2faafbb77..ba50808502 100644 --- a/src/interfaces/ecpg/test/pg_regress_ecpg.c +++ b/src/interfaces/ecpg/test/pg_regress_ecpg.c @@ -11,7 +11,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/interfaces/ecpg/test/pg_regress_ecpg.c,v 1.7 2010/01/02 16:58:11 momjian Exp $ + * src/interfaces/ecpg/test/pg_regress_ecpg.c * *------------------------------------------------------------------------- */ diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile index 4c9e0dbb46..b327ee5b0d 100644 --- a/src/interfaces/libpq/Makefile +++ b/src/interfaces/libpq/Makefile @@ -5,7 +5,7 @@ # Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group # Portions Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.178 2010/07/12 16:18:44 momjian Exp $ +# src/interfaces/libpq/Makefile # #------------------------------------------------------------------------- diff --git a/src/interfaces/libpq/README b/src/interfaces/libpq/README index 4bb2ed88de..0dcef75a83 100644 --- a/src/interfaces/libpq/README +++ b/src/interfaces/libpq/README @@ -1,3 +1,3 @@ -$PostgreSQL: pgsql/src/interfaces/libpq/README,v 1.2 2008/03/21 13:23:29 momjian Exp $ +src/interfaces/libpq/README This directory contains the C version of Libpq, the POSTGRES frontend library. diff --git a/src/interfaces/libpq/exports.txt b/src/interfaces/libpq/exports.txt index bdaa5857b7..ecbd54c881 100644 --- a/src/interfaces/libpq/exports.txt +++ b/src/interfaces/libpq/exports.txt @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/src/interfaces/libpq/exports.txt,v 1.25 2010/01/28 06:28:26 joe Exp $ +# src/interfaces/libpq/exports.txt # Functions to be exported by libpq DLLs PQconnectdb 1 PQsetdbLogin 2 diff --git a/src/interfaces/libpq/fe-auth.c b/src/interfaces/libpq/fe-auth.c index a46259eee2..f7ca0aa302 100644 --- a/src/interfaces/libpq/fe-auth.c +++ b/src/interfaces/libpq/fe-auth.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/interfaces/libpq/fe-auth.c,v 1.145 2010/07/14 17:09:45 tgl Exp $ + * src/interfaces/libpq/fe-auth.c * *------------------------------------------------------------------------- */ diff --git a/src/interfaces/libpq/fe-auth.h b/src/interfaces/libpq/fe-auth.h index ee88fb72c8..936e1880e2 100644 --- a/src/interfaces/libpq/fe-auth.h +++ b/src/interfaces/libpq/fe-auth.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/interfaces/libpq/fe-auth.h,v 1.31 2010/01/02 16:58:11 momjian Exp $ + * src/interfaces/libpq/fe-auth.h * *------------------------------------------------------------------------- */ diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c index 39dfc46d8b..8f318a1a8c 100644 --- a/src/interfaces/libpq/fe-connect.c +++ b/src/interfaces/libpq/fe-connect.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.403 2010/07/19 18:53:25 petere Exp $ + * src/interfaces/libpq/fe-connect.c * *------------------------------------------------------------------------- */ diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c index b20587f0e4..8f25f5eb27 100644 --- a/src/interfaces/libpq/fe-exec.c +++ b/src/interfaces/libpq/fe-exec.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/interfaces/libpq/fe-exec.c,v 1.211 2010/02/26 02:01:32 momjian Exp $ + * src/interfaces/libpq/fe-exec.c * *------------------------------------------------------------------------- */ diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c index a98bfec2bf..816f5990a8 100644 --- a/src/interfaces/libpq/fe-lobj.c +++ b/src/interfaces/libpq/fe-lobj.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/interfaces/libpq/fe-lobj.c,v 1.69 2010/01/02 16:58:12 momjian Exp $ + * src/interfaces/libpq/fe-lobj.c * *------------------------------------------------------------------------- */ diff --git a/src/interfaces/libpq/fe-misc.c b/src/interfaces/libpq/fe-misc.c index 0b189453dd..24ab7cf97a 100644 --- a/src/interfaces/libpq/fe-misc.c +++ b/src/interfaces/libpq/fe-misc.c @@ -23,7 +23,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/interfaces/libpq/fe-misc.c,v 1.144 2010/07/06 19:19:01 momjian Exp $ + * src/interfaces/libpq/fe-misc.c * *------------------------------------------------------------------------- */ diff --git a/src/interfaces/libpq/fe-print.c b/src/interfaces/libpq/fe-print.c index 31466b18b6..0bf788f8a1 100644 --- a/src/interfaces/libpq/fe-print.c +++ b/src/interfaces/libpq/fe-print.c @@ -10,7 +10,7 @@ * didn't really belong there. * * IDENTIFICATION - * $PostgreSQL: pgsql/src/interfaces/libpq/fe-print.c,v 1.78 2010/01/02 16:58:12 momjian Exp $ + * src/interfaces/libpq/fe-print.c * *------------------------------------------------------------------------- */ diff --git a/src/interfaces/libpq/fe-protocol2.c b/src/interfaces/libpq/fe-protocol2.c index 0b3bd3b9aa..31eff831ee 100644 --- a/src/interfaces/libpq/fe-protocol2.c +++ b/src/interfaces/libpq/fe-protocol2.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/interfaces/libpq/fe-protocol2.c,v 1.30 2010/01/02 16:58:12 momjian Exp $ + * src/interfaces/libpq/fe-protocol2.c * *------------------------------------------------------------------------- */ diff --git a/src/interfaces/libpq/fe-protocol3.c b/src/interfaces/libpq/fe-protocol3.c index 28318f0069..b8e4bee31b 100644 --- a/src/interfaces/libpq/fe-protocol3.c +++ b/src/interfaces/libpq/fe-protocol3.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/interfaces/libpq/fe-protocol3.c,v 1.43 2010/04/28 13:46:23 mha Exp $ + * src/interfaces/libpq/fe-protocol3.c * *------------------------------------------------------------------------- */ diff --git a/src/interfaces/libpq/fe-secure.c b/src/interfaces/libpq/fe-secure.c index 9aab6e13d2..1db020b3c3 100644 --- a/src/interfaces/libpq/fe-secure.c +++ b/src/interfaces/libpq/fe-secure.c @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/interfaces/libpq/fe-secure.c,v 1.136 2010/07/14 17:09:45 tgl Exp $ + * src/interfaces/libpq/fe-secure.c * * NOTES * diff --git a/src/interfaces/libpq/libpq-events.c b/src/interfaces/libpq/libpq-events.c index b467b09d80..8be46cb87b 100644 --- a/src/interfaces/libpq/libpq-events.c +++ b/src/interfaces/libpq/libpq-events.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/interfaces/libpq/libpq-events.c,v 1.6 2010/01/02 16:58:12 momjian Exp $ + * src/interfaces/libpq/libpq-events.c * *------------------------------------------------------------------------- */ diff --git a/src/interfaces/libpq/libpq-events.h b/src/interfaces/libpq/libpq-events.h index 8f5e091ef4..0f11f19c15 100644 --- a/src/interfaces/libpq/libpq-events.h +++ b/src/interfaces/libpq/libpq-events.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/interfaces/libpq/libpq-events.h,v 1.5 2010/01/02 16:58:12 momjian Exp $ + * src/interfaces/libpq/libpq-events.h * *------------------------------------------------------------------------- */ diff --git a/src/interfaces/libpq/libpq-fe.h b/src/interfaces/libpq/libpq-fe.h index f32b2d3d5b..659d82d74d 100644 --- a/src/interfaces/libpq/libpq-fe.h +++ b/src/interfaces/libpq/libpq-fe.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/interfaces/libpq/libpq-fe.h,v 1.152 2010/02/26 02:01:33 momjian Exp $ + * src/interfaces/libpq/libpq-fe.h * *------------------------------------------------------------------------- */ diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h index f64917995a..5dc7a122f3 100644 --- a/src/interfaces/libpq/libpq-int.h +++ b/src/interfaces/libpq/libpq-int.h @@ -12,7 +12,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/interfaces/libpq/libpq-int.h,v 1.154 2010/07/18 11:37:26 petere Exp $ + * src/interfaces/libpq/libpq-int.h * *------------------------------------------------------------------------- */ diff --git a/src/interfaces/libpq/nls.mk b/src/interfaces/libpq/nls.mk index 81ce2025f0..1b25e5f87c 100644 --- a/src/interfaces/libpq/nls.mk +++ b/src/interfaces/libpq/nls.mk @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/src/interfaces/libpq/nls.mk,v 1.25 2010/05/13 15:56:42 petere Exp $ +# src/interfaces/libpq/nls.mk CATALOG_NAME := libpq AVAIL_LANGUAGES := cs de es fr it ja ko pt_BR ru sv ta tr zh_CN GETTEXT_FILES := fe-auth.c fe-connect.c fe-exec.c fe-lobj.c fe-misc.c fe-protocol2.c fe-protocol3.c fe-secure.c diff --git a/src/interfaces/libpq/po/cs.po b/src/interfaces/libpq/po/cs.po index 0dfc4065ea..79f818af80 100644 --- a/src/interfaces/libpq/po/cs.po +++ b/src/interfaces/libpq/po/cs.po @@ -1,7 +1,7 @@ # translation of libpq-cs.po to Czech # Czech translation of libpq messages # -# $PostgreSQL: pgsql/src/interfaces/libpq/po/cs.po,v 1.7 2009/06/26 19:33:51 petere Exp $ +# src/interfaces/libpq/po/cs.po # Karel Žák, 2001-2003, 2004. # ZdenÄ›k Kotala, 2009. # diff --git a/src/interfaces/libpq/po/fr.po b/src/interfaces/libpq/po/fr.po index 0b7450964e..acca5f31c0 100644 --- a/src/interfaces/libpq/po/fr.po +++ b/src/interfaces/libpq/po/fr.po @@ -1,7 +1,7 @@ # translation of libpq.po to fr_fr # french message translation file for libpq # -# $PostgreSQL: pgsql/src/interfaces/libpq/po/fr.po,v 1.26 2010/07/08 21:32:28 petere Exp $ +# src/interfaces/libpq/po/fr.po # # Use these quotes: « %s » # diff --git a/src/interfaces/libpq/po/ru.po b/src/interfaces/libpq/po/ru.po index 8d1338cac4..3797034394 100644 --- a/src/interfaces/libpq/po/ru.po +++ b/src/interfaces/libpq/po/ru.po @@ -4,7 +4,7 @@ # Copyright (c) 2001-2004 Serguei A. Mokhov, mokhov@cs.concordia.ca # Distributed under the same licensing terms as PostgreSQL itself. # -# $PostgreSQL: pgsql/src/interfaces/libpq/po/ru.po,v 1.19 2007/10/27 00:13:43 petere Exp $ +# src/interfaces/libpq/po/ru.po # # ChangeLog: # - January, 2005: Corrections and improvements by Oleg Bartunov diff --git a/src/interfaces/libpq/po/zh_CN.po b/src/interfaces/libpq/po/zh_CN.po index e121cdc2d2..42a40610bb 100644 --- a/src/interfaces/libpq/po/zh_CN.po +++ b/src/interfaces/libpq/po/zh_CN.po @@ -1,7 +1,7 @@ # simplified Chinese translation file for libpq # Bao Wei , 2002 # -# $PostgreSQL: pgsql/src/interfaces/libpq/po/zh_CN.po,v 1.11 2010/05/13 15:56:42 petere Exp $ +# src/interfaces/libpq/po/zh_CN.po # msgid "" msgstr "" diff --git a/src/interfaces/libpq/pqexpbuffer.c b/src/interfaces/libpq/pqexpbuffer.c index cf1941eee7..fb296c31a6 100644 --- a/src/interfaces/libpq/pqexpbuffer.c +++ b/src/interfaces/libpq/pqexpbuffer.c @@ -17,7 +17,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/interfaces/libpq/pqexpbuffer.c,v 1.28 2010/01/02 16:58:12 momjian Exp $ + * src/interfaces/libpq/pqexpbuffer.c * *------------------------------------------------------------------------- */ diff --git a/src/interfaces/libpq/pqexpbuffer.h b/src/interfaces/libpq/pqexpbuffer.h index f71c8e2c26..f41a144310 100644 --- a/src/interfaces/libpq/pqexpbuffer.h +++ b/src/interfaces/libpq/pqexpbuffer.h @@ -18,7 +18,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/interfaces/libpq/pqexpbuffer.h,v 1.24 2010/01/02 16:58:12 momjian Exp $ + * src/interfaces/libpq/pqexpbuffer.h * *------------------------------------------------------------------------- */ diff --git a/src/interfaces/libpq/pqsignal.c b/src/interfaces/libpq/pqsignal.c index 2122fda6c7..0ff6090ef2 100644 --- a/src/interfaces/libpq/pqsignal.c +++ b/src/interfaces/libpq/pqsignal.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/interfaces/libpq/pqsignal.c,v 1.31 2010/08/13 20:04:33 tgl Exp $ + * src/interfaces/libpq/pqsignal.c * * NOTES * This shouldn't be in libpq, but the monitor and some other diff --git a/src/interfaces/libpq/pqsignal.h b/src/interfaces/libpq/pqsignal.h index 9d22854415..302182a954 100644 --- a/src/interfaces/libpq/pqsignal.h +++ b/src/interfaces/libpq/pqsignal.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/interfaces/libpq/pqsignal.h,v 1.26 2010/08/13 20:04:33 tgl Exp $ + * src/interfaces/libpq/pqsignal.h * * NOTES * This shouldn't be in libpq, but the monitor and some other diff --git a/src/interfaces/libpq/pthread-win32.c b/src/interfaces/libpq/pthread-win32.c index f5889a0707..709ddecd77 100644 --- a/src/interfaces/libpq/pthread-win32.c +++ b/src/interfaces/libpq/pthread-win32.c @@ -5,7 +5,7 @@ * * Copyright (c) 2004-2010, PostgreSQL Global Development Group * IDENTIFICATION -* $PostgreSQL: pgsql/src/interfaces/libpq/pthread-win32.c,v 1.20 2010/01/02 16:58:12 momjian Exp $ +* src/interfaces/libpq/pthread-win32.c * *------------------------------------------------------------------------- */ diff --git a/src/interfaces/libpq/win32.c b/src/interfaces/libpq/win32.c index 0eec7d62e2..151751ca75 100644 --- a/src/interfaces/libpq/win32.c +++ b/src/interfaces/libpq/win32.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/src/interfaces/libpq/win32.c,v 1.27 2010/01/02 16:58:12 momjian Exp $ + * src/interfaces/libpq/win32.c * * * FILE diff --git a/src/interfaces/libpq/win32.h b/src/interfaces/libpq/win32.h index b40909527b..b65da9ada1 100644 --- a/src/interfaces/libpq/win32.h +++ b/src/interfaces/libpq/win32.h @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/src/interfaces/libpq/win32.h,v 1.30 2009/06/11 14:49:14 momjian Exp $ + * src/interfaces/libpq/win32.h */ #ifndef __win32_h_included #define __win32_h_included diff --git a/src/makefiles/Makefile b/src/makefiles/Makefile index c39128898d..417c98b914 100644 --- a/src/makefiles/Makefile +++ b/src/makefiles/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/src/makefiles/Makefile,v 1.3 2009/08/26 22:24:43 petere Exp $ +# src/makefiles/Makefile subdir = src/makefiles top_builddir = ../.. diff --git a/src/makefiles/Makefile.cygwin b/src/makefiles/Makefile.cygwin index 1a5bdc85cd..052ce22ddb 100644 --- a/src/makefiles/Makefile.cygwin +++ b/src/makefiles/Makefile.cygwin @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/src/makefiles/Makefile.cygwin,v 1.15 2010/07/05 23:15:56 tgl Exp $ +# src/makefiles/Makefile.cygwin DLLTOOL= dlltool DLLWRAP= dllwrap ifdef PGXS diff --git a/src/makefiles/Makefile.solaris b/src/makefiles/Makefile.solaris index 7681441f80..e459de30cf 100644 --- a/src/makefiles/Makefile.solaris +++ b/src/makefiles/Makefile.solaris @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/src/makefiles/Makefile.solaris,v 1.15 2010/07/05 18:54:38 tgl Exp $ +# src/makefiles/Makefile.solaris AROPT = crs diff --git a/src/makefiles/Makefile.win32 b/src/makefiles/Makefile.win32 index e6466304d4..dbeff298d8 100644 --- a/src/makefiles/Makefile.win32 +++ b/src/makefiles/Makefile.win32 @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/src/makefiles/Makefile.win32,v 1.17 2010/07/05 23:15:56 tgl Exp $ +# src/makefiles/Makefile.win32 # Use replacement include files for those missing on Win32 override CPPFLAGS+="-I$(top_srcdir)/src/include/port/win32" diff --git a/src/makefiles/pgxs.mk b/src/makefiles/pgxs.mk index 7910c35bca..76a88913fa 100644 --- a/src/makefiles/pgxs.mk +++ b/src/makefiles/pgxs.mk @@ -1,6 +1,6 @@ # PGXS: PostgreSQL extensions makefile -# $PostgreSQL: pgsql/src/makefiles/pgxs.mk,v 1.22 2010/07/05 23:40:13 tgl Exp $ +# src/makefiles/pgxs.mk # This file contains generic rules to build many kinds of simple # extension modules. You only need to set a few variables and include diff --git a/src/nls-global.mk b/src/nls-global.mk index e7e375f0d0..9ba2cfd94e 100644 --- a/src/nls-global.mk +++ b/src/nls-global.mk @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/src/nls-global.mk,v 1.22 2010/05/13 14:35:28 petere Exp $ +# src/nls-global.mk # Common rules for Native Language Support (NLS) # diff --git a/src/pl/Makefile b/src/pl/Makefile index cfaeddea9f..c625c0de50 100644 --- a/src/pl/Makefile +++ b/src/pl/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/pl/Makefile,v 1.28 2009/08/07 20:50:22 petere Exp $ +# src/pl/Makefile # #------------------------------------------------------------------------- diff --git a/src/pl/plperl/GNUmakefile b/src/pl/plperl/GNUmakefile index 6bbd1bfb23..429da8a6ba 100644 --- a/src/pl/plperl/GNUmakefile +++ b/src/pl/plperl/GNUmakefile @@ -1,5 +1,5 @@ # Makefile for PL/Perl -# $PostgreSQL: pgsql/src/pl/plperl/GNUmakefile,v 1.44 2010/05/13 16:39:43 adunstan Exp $ +# src/pl/plperl/GNUmakefile subdir = src/pl/plperl top_builddir = ../../.. diff --git a/src/pl/plperl/README b/src/pl/plperl/README index d3ccd14240..3ed8653fde 100644 --- a/src/pl/plperl/README +++ b/src/pl/plperl/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/pl/plperl/README,v 1.4 2008/03/21 13:23:29 momjian Exp $ +src/pl/plperl/README PL/Perl allows you to write PostgreSQL functions and procedures in Perl. To include PL/Perl in the build use './configure --with-perl'. diff --git a/src/pl/plperl/SPI.xs b/src/pl/plperl/SPI.xs index 9cee19a7f7..bea690cf3e 100644 --- a/src/pl/plperl/SPI.xs +++ b/src/pl/plperl/SPI.xs @@ -3,7 +3,7 @@ * * SPI interface for plperl. * - * $PostgreSQL: pgsql/src/pl/plperl/SPI.xs,v 1.21 2010/01/20 01:08:21 adunstan Exp $ + * src/pl/plperl/SPI.xs * **********************************************************************/ diff --git a/src/pl/plperl/Util.xs b/src/pl/plperl/Util.xs index e77961698d..7d29ef6aef 100644 --- a/src/pl/plperl/Util.xs +++ b/src/pl/plperl/Util.xs @@ -1,7 +1,7 @@ /********************************************************************** * PostgreSQL::InServer::Util * - * $PostgreSQL: pgsql/src/pl/plperl/Util.xs,v 1.1 2010/01/20 01:08:21 adunstan Exp $ + * src/pl/plperl/Util.xs * * Defines plperl interfaces for general-purpose utilities. * This module is bootstrapped as soon as an interpreter is initialized. diff --git a/src/pl/plperl/nls.mk b/src/pl/plperl/nls.mk index d56a9d4fdf..66408de109 100644 --- a/src/pl/plperl/nls.mk +++ b/src/pl/plperl/nls.mk @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/src/pl/plperl/nls.mk,v 1.8 2009/10/20 18:23:26 petere Exp $ +# src/pl/plperl/nls.mk CATALOG_NAME := plperl AVAIL_LANGUAGES := de es fr it ja pt_BR tr GETTEXT_FILES := plperl.c SPI.c diff --git a/src/pl/plperl/plc_perlboot.pl b/src/pl/plperl/plc_perlboot.pl index bfe443adb8..ebf6b4b100 100644 --- a/src/pl/plperl/plc_perlboot.pl +++ b/src/pl/plperl/plc_perlboot.pl @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/src/pl/plperl/plc_perlboot.pl,v 1.8 2010/08/19 05:57:35 petere Exp $ +# src/pl/plperl/plc_perlboot.pl use 5.008001; use vars qw(%_SHARED); diff --git a/src/pl/plperl/plc_trusted.pl b/src/pl/plperl/plc_trusted.pl index b7ca1d6ae5..a681ae0874 100644 --- a/src/pl/plperl/plc_trusted.pl +++ b/src/pl/plperl/plc_trusted.pl @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/src/pl/plperl/plc_trusted.pl,v 1.2 2010/08/19 05:57:35 petere Exp $ +# src/pl/plperl/plc_trusted.pl package PostgreSQL::InServer::safe; diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c index ff46d2c285..cfad4878aa 100644 --- a/src/pl/plperl/plperl.c +++ b/src/pl/plperl/plperl.c @@ -1,7 +1,7 @@ /********************************************************************** * plperl.c - perl as a procedural language for PostgreSQL * - * $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.179 2010/07/06 19:19:01 momjian Exp $ + * src/pl/plperl/plperl.c * **********************************************************************/ diff --git a/src/pl/plperl/plperl.h b/src/pl/plperl/plperl.h index 6d58f117ca..6b5f75156e 100644 --- a/src/pl/plperl/plperl.h +++ b/src/pl/plperl/plperl.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1995, Regents of the University of California * - * $PostgreSQL: pgsql/src/pl/plperl/plperl.h,v 1.11 2010/01/20 01:08:21 adunstan Exp $ + * src/pl/plperl/plperl.h */ #ifndef PL_PERL_H diff --git a/src/pl/plperl/po/fr.po b/src/pl/plperl/po/fr.po index fb6d7f3809..349093d639 100644 --- a/src/pl/plperl/po/fr.po +++ b/src/pl/plperl/po/fr.po @@ -1,7 +1,7 @@ # translation of plperl.po to fr_fr # french message translation file for plperl # -# $PostgreSQL: pgsql/src/pl/plperl/po/fr.po,v 1.6 2010/07/08 21:32:28 petere Exp $ +# src/pl/plperl/po/fr.po # # Use these quotes: « %s » # Guillaume Lelarge , 2009. diff --git a/src/pl/plperl/text2macro.pl b/src/pl/plperl/text2macro.pl index 339eac6864..482ea0fd07 100644 --- a/src/pl/plperl/text2macro.pl +++ b/src/pl/plperl/text2macro.pl @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/src/pl/plperl/text2macro.pl,v 1.3 2010/08/19 05:57:35 petere Exp $ +# src/pl/plperl/text2macro.pl =head1 NAME diff --git a/src/pl/plpgsql/Makefile b/src/pl/plpgsql/Makefile index 0c5dd72f2d..7112e7e263 100644 --- a/src/pl/plpgsql/Makefile +++ b/src/pl/plpgsql/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/pl/plpgsql/Makefile,v 1.10 2009/08/07 20:50:22 petere Exp $ +# src/pl/plpgsql/Makefile # #------------------------------------------------------------------------- diff --git a/src/pl/plpgsql/src/Makefile b/src/pl/plpgsql/src/Makefile index c414ac7621..13d971f267 100644 --- a/src/pl/plpgsql/src/Makefile +++ b/src/pl/plpgsql/src/Makefile @@ -2,7 +2,7 @@ # # Makefile for the plpgsql shared object # -# $PostgreSQL: pgsql/src/pl/plpgsql/src/Makefile,v 1.35 2009/11/12 00:13:00 tgl Exp $ +# src/pl/plpgsql/src/Makefile # #------------------------------------------------------------------------- diff --git a/src/pl/plpgsql/src/gram.y b/src/pl/plpgsql/src/gram.y index 2abc4aa8a7..bd62942c27 100644 --- a/src/pl/plpgsql/src/gram.y +++ b/src/pl/plpgsql/src/gram.y @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.144 2010/08/19 18:57:57 tgl Exp $ + * src/pl/plpgsql/src/gram.y * *------------------------------------------------------------------------- */ diff --git a/src/pl/plpgsql/src/nls.mk b/src/pl/plpgsql/src/nls.mk index b9a3beab86..8643e981e6 100644 --- a/src/pl/plpgsql/src/nls.mk +++ b/src/pl/plpgsql/src/nls.mk @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/src/pl/plpgsql/src/nls.mk,v 1.12 2009/11/12 00:13:00 tgl Exp $ +# src/pl/plpgsql/src/nls.mk CATALOG_NAME := plpgsql AVAIL_LANGUAGES := de es fr it ja ro GETTEXT_FILES := pl_comp.c pl_exec.c pl_gram.c pl_funcs.c pl_handler.c pl_scanner.c diff --git a/src/pl/plpgsql/src/pl_comp.c b/src/pl/plpgsql/src/pl_comp.c index 25d2760cb7..e09b55b0b0 100644 --- a/src/pl/plpgsql/src/pl_comp.c +++ b/src/pl/plpgsql/src/pl_comp.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_comp.c,v 1.150 2010/02/26 02:01:34 momjian Exp $ + * src/pl/plpgsql/src/pl_comp.c * *------------------------------------------------------------------------- */ diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c index 2ae80a32f1..8b4855b50e 100644 --- a/src/pl/plpgsql/src/pl_exec.c +++ b/src/pl/plpgsql/src/pl_exec.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.266 2010/08/19 18:10:48 tgl Exp $ + * src/pl/plpgsql/src/pl_exec.c * *------------------------------------------------------------------------- */ diff --git a/src/pl/plpgsql/src/pl_funcs.c b/src/pl/plpgsql/src/pl_funcs.c index 155a123223..6153aa4ce2 100644 --- a/src/pl/plpgsql/src/pl_funcs.c +++ b/src/pl/plpgsql/src/pl_funcs.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_funcs.c,v 1.90 2010/02/26 02:01:35 momjian Exp $ + * src/pl/plpgsql/src/pl_funcs.c * *------------------------------------------------------------------------- */ diff --git a/src/pl/plpgsql/src/pl_handler.c b/src/pl/plpgsql/src/pl_handler.c index 12661d32cf..ee49d71d23 100644 --- a/src/pl/plpgsql/src/pl_handler.c +++ b/src/pl/plpgsql/src/pl_handler.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_handler.c,v 1.51 2010/02/26 02:01:35 momjian Exp $ + * src/pl/plpgsql/src/pl_handler.c * *------------------------------------------------------------------------- */ diff --git a/src/pl/plpgsql/src/pl_scanner.c b/src/pl/plpgsql/src/pl_scanner.c index 4443ee943a..aa7615beec 100644 --- a/src/pl/plpgsql/src/pl_scanner.c +++ b/src/pl/plpgsql/src/pl_scanner.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_scanner.c,v 1.6 2010/08/02 03:46:54 rhaas Exp $ + * src/pl/plpgsql/src/pl_scanner.c * *------------------------------------------------------------------------- */ diff --git a/src/pl/plpgsql/src/plerrcodes.h b/src/pl/plpgsql/src/plerrcodes.h index 99008be9bf..30465de1fb 100644 --- a/src/pl/plpgsql/src/plerrcodes.h +++ b/src/pl/plpgsql/src/plerrcodes.h @@ -9,7 +9,7 @@ * * Copyright (c) 2003-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/pl/plpgsql/src/plerrcodes.h,v 1.21 2010/03/13 14:55:57 momjian Exp $ + * src/pl/plpgsql/src/plerrcodes.h * *------------------------------------------------------------------------- */ diff --git a/src/pl/plpgsql/src/plpgsql.h b/src/pl/plpgsql/src/plpgsql.h index 488c85bd89..5b174c49b8 100644 --- a/src/pl/plpgsql/src/plpgsql.h +++ b/src/pl/plpgsql/src/plpgsql.h @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/pl/plpgsql/src/plpgsql.h,v 1.131 2010/08/09 02:25:05 tgl Exp $ + * src/pl/plpgsql/src/plpgsql.h * *------------------------------------------------------------------------- */ diff --git a/src/pl/plpgsql/src/po/fr.po b/src/pl/plpgsql/src/po/fr.po index 5f1e381725..0ae0619349 100644 --- a/src/pl/plpgsql/src/po/fr.po +++ b/src/pl/plpgsql/src/po/fr.po @@ -1,7 +1,7 @@ # translation of plpgsql.po to fr_fr # french message translation file for plpgsql # -# $PostgreSQL: pgsql/src/pl/plpgsql/src/po/fr.po,v 1.7 2010/07/08 21:32:28 petere Exp $ +# src/pl/plpgsql/src/po/fr.po # # Use these quotes: « %s » # Guillaume Lelarge , 2009. diff --git a/src/pl/plpython/Makefile b/src/pl/plpython/Makefile index 4b18076a0f..16d78ae0e2 100644 --- a/src/pl/plpython/Makefile +++ b/src/pl/plpython/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/src/pl/plpython/Makefile,v 1.36 2010/01/22 15:45:15 petere Exp $ +# src/pl/plpython/Makefile subdir = src/pl/plpython top_builddir = ../../.. diff --git a/src/pl/plpython/nls.mk b/src/pl/plpython/nls.mk index a6e9ad33ae..e2ce7e2768 100644 --- a/src/pl/plpython/nls.mk +++ b/src/pl/plpython/nls.mk @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/src/pl/plpython/nls.mk,v 1.7 2009/10/20 18:23:27 petere Exp $ +# src/pl/plpython/nls.mk CATALOG_NAME := plpython AVAIL_LANGUAGES := de es fr it ja pt_BR tr GETTEXT_FILES := plpython.c diff --git a/src/pl/plpython/plpython.c b/src/pl/plpython/plpython.c index 0c4d0928e2..6e35637daf 100644 --- a/src/pl/plpython/plpython.c +++ b/src/pl/plpython/plpython.c @@ -1,7 +1,7 @@ /********************************************************************** * plpython.c - python as a procedural language for PostgreSQL * - * $PostgreSQL: pgsql/src/pl/plpython/plpython.c,v 1.149 2010/08/25 19:37:56 petere Exp $ + * src/pl/plpython/plpython.c * ********************************************************************* */ diff --git a/src/pl/plpython/po/fr.po b/src/pl/plpython/po/fr.po index 8cec1e62cf..a6194fa256 100644 --- a/src/pl/plpython/po/fr.po +++ b/src/pl/plpython/po/fr.po @@ -1,7 +1,7 @@ # translation of plpython.po to fr_fr # french message translation file for plpython # -# $PostgreSQL: pgsql/src/pl/plpython/po/fr.po,v 1.3 2010/02/19 00:40:05 petere Exp $ +# src/pl/plpython/po/fr.po # # Use these quotes: « %s » # Guillaume Lelarge , 2009. diff --git a/src/pl/tcl/Makefile b/src/pl/tcl/Makefile index 1b71c7c231..24be38ff69 100644 --- a/src/pl/tcl/Makefile +++ b/src/pl/tcl/Makefile @@ -2,7 +2,7 @@ # # Makefile for the pltcl shared object # -# $PostgreSQL: pgsql/src/pl/tcl/Makefile,v 1.53 2008/10/02 08:11:11 petere Exp $ +# src/pl/tcl/Makefile # #------------------------------------------------------------------------- diff --git a/src/pl/tcl/modules/Makefile b/src/pl/tcl/modules/Makefile index d52bd3973c..8055c61460 100644 --- a/src/pl/tcl/modules/Makefile +++ b/src/pl/tcl/modules/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/src/pl/tcl/modules/Makefile,v 1.5 2009/08/26 22:24:43 petere Exp $ +# src/pl/tcl/modules/Makefile subdir = src/pl/tcl/modules top_builddir = ../../../.. diff --git a/src/pl/tcl/modules/README b/src/pl/tcl/modules/README index 4abc249655..342742c04b 100644 --- a/src/pl/tcl/modules/README +++ b/src/pl/tcl/modules/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/pl/tcl/modules/README,v 1.4 2010/08/19 05:57:35 petere Exp $ +src/pl/tcl/modules/README Regular Tcl scripts of any size (over 8K :-) can be loaded into the table pltcl_modules using the pltcl_loadmod script. The script diff --git a/src/pl/tcl/modules/pltcl_delmod.in b/src/pl/tcl/modules/pltcl_delmod.in index 4f0280f511..daa4fac460 100644 --- a/src/pl/tcl/modules/pltcl_delmod.in +++ b/src/pl/tcl/modules/pltcl_delmod.in @@ -1,5 +1,5 @@ #! /bin/sh -# $PostgreSQL: pgsql/src/pl/tcl/modules/pltcl_delmod.in,v 1.3 2006/03/11 04:38:40 momjian Exp $ +# src/pl/tcl/modules/pltcl_delmod.in # # Start tclsh \ exec @TCLSH@ "$0" "$@" diff --git a/src/pl/tcl/modules/pltcl_listmod.in b/src/pl/tcl/modules/pltcl_listmod.in index eb27a864e9..231cb3f316 100644 --- a/src/pl/tcl/modules/pltcl_listmod.in +++ b/src/pl/tcl/modules/pltcl_listmod.in @@ -1,5 +1,5 @@ #! /bin/sh -# $PostgreSQL: pgsql/src/pl/tcl/modules/pltcl_listmod.in,v 1.3 2006/03/11 04:38:40 momjian Exp $ +# src/pl/tcl/modules/pltcl_listmod.in # # Start tclsh \ exec @TCLSH@ "$0" "$@" diff --git a/src/pl/tcl/nls.mk b/src/pl/tcl/nls.mk index 81612371d7..816f113cef 100644 --- a/src/pl/tcl/nls.mk +++ b/src/pl/tcl/nls.mk @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/src/pl/tcl/nls.mk,v 1.7 2009/10/20 18:23:27 petere Exp $ +# src/pl/tcl/nls.mk CATALOG_NAME := pltcl AVAIL_LANGUAGES := de es fr it ja pt_BR tr GETTEXT_FILES := pltcl.c diff --git a/src/pl/tcl/pltcl.c b/src/pl/tcl/pltcl.c index 1d0d04d3d7..8c94c826c9 100644 --- a/src/pl/tcl/pltcl.c +++ b/src/pl/tcl/pltcl.c @@ -2,7 +2,7 @@ * pltcl.c - PostgreSQL support for Tcl as * procedural language (PL) * - * $PostgreSQL: pgsql/src/pl/tcl/pltcl.c,v 1.134 2010/07/06 19:19:01 momjian Exp $ + * src/pl/tcl/pltcl.c * **********************************************************************/ diff --git a/src/pl/tcl/po/fr.po b/src/pl/tcl/po/fr.po index 0a52a4701f..1a5d6f2bb4 100644 --- a/src/pl/tcl/po/fr.po +++ b/src/pl/tcl/po/fr.po @@ -1,7 +1,7 @@ # translation of pltcl.po to fr_fr # french message translation file for pltcl # -# $PostgreSQL: pgsql/src/pl/tcl/po/fr.po,v 1.1 2009/04/09 19:38:53 petere Exp $ +# src/pl/tcl/po/fr.po # # Use these quotes: « %s » # Guillaume Lelarge , 2009. diff --git a/src/port/Makefile b/src/port/Makefile index c9b153d7da..327ec7246c 100644 --- a/src/port/Makefile +++ b/src/port/Makefile @@ -19,7 +19,7 @@ # OBJS adds additional object files that are always compiled. # # IDENTIFICATION -# $PostgreSQL: pgsql/src/port/Makefile,v 1.39 2010/07/02 17:03:30 rhaas Exp $ +# src/port/Makefile # #------------------------------------------------------------------------- diff --git a/src/port/README b/src/port/README index 147e35faf6..58fb32d9f9 100644 --- a/src/port/README +++ b/src/port/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/port/README,v 1.5 2010/08/19 05:57:35 petere Exp $ +src/port/README libpgport ========= diff --git a/src/port/chklocale.c b/src/port/chklocale.c index d26b86518d..00f1ea817f 100644 --- a/src/port/chklocale.c +++ b/src/port/chklocale.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/port/chklocale.c,v 1.17 2010/05/06 02:12:38 itagaki Exp $ + * src/port/chklocale.c * *------------------------------------------------------------------------- */ diff --git a/src/port/crypt.c b/src/port/crypt.c index 85b98c5704..7f18e1d2a7 100644 --- a/src/port/crypt.c +++ b/src/port/crypt.c @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/port/crypt.c,v 1.17 2010/07/06 19:19:01 momjian Exp $ */ +/* src/port/crypt.c */ /* $NetBSD: crypt.c,v 1.18 2001/03/01 14:37:35 wiz Exp $ */ /* diff --git a/src/port/dirent.c b/src/port/dirent.c index 4034ef42f3..2efe855978 100644 --- a/src/port/dirent.c +++ b/src/port/dirent.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/port/dirent.c,v 1.7 2010/01/02 16:58:13 momjian Exp $ + * src/port/dirent.c * *------------------------------------------------------------------------- */ diff --git a/src/port/dirmod.c b/src/port/dirmod.c index d47c03e445..a8b8a904df 100644 --- a/src/port/dirmod.c +++ b/src/port/dirmod.c @@ -10,7 +10,7 @@ * Win32 (NT4 and newer). * * IDENTIFICATION - * $PostgreSQL: pgsql/src/port/dirmod.c,v 1.63 2010/07/06 19:19:01 momjian Exp $ + * src/port/dirmod.c * *------------------------------------------------------------------------- */ diff --git a/src/port/erand48.c b/src/port/erand48.c index ce623e2e96..64db7a5376 100644 --- a/src/port/erand48.c +++ b/src/port/erand48.c @@ -20,7 +20,7 @@ * to anyone/anything when using this software. * * IDENTIFICATION - * $PostgreSQL: pgsql/src/port/erand48.c,v 1.1 2009/07/16 17:43:52 tgl Exp $ + * src/port/erand48.c * *------------------------------------------------------------------------- */ diff --git a/src/port/exec.c b/src/port/exec.c index 68bce6f962..742318d057 100644 --- a/src/port/exec.c +++ b/src/port/exec.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/port/exec.c,v 1.68 2010/02/26 02:01:38 momjian Exp $ + * src/port/exec.c * *------------------------------------------------------------------------- */ diff --git a/src/port/fseeko.c b/src/port/fseeko.c index ab6067e5f0..782e1679b4 100644 --- a/src/port/fseeko.c +++ b/src/port/fseeko.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/port/fseeko.c,v 1.25 2010/05/15 10:14:20 momjian Exp $ + * src/port/fseeko.c * *------------------------------------------------------------------------- */ diff --git a/src/port/getaddrinfo.c b/src/port/getaddrinfo.c index 4133aed54d..f867744eee 100644 --- a/src/port/getaddrinfo.c +++ b/src/port/getaddrinfo.c @@ -16,7 +16,7 @@ * Copyright (c) 2003-2010, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/port/getaddrinfo.c,v 1.30 2010/01/02 16:58:13 momjian Exp $ + * src/port/getaddrinfo.c * *------------------------------------------------------------------------- */ diff --git a/src/port/gethostname.c b/src/port/gethostname.c index 5e94fa0d7e..4a6fdc6d92 100644 --- a/src/port/gethostname.c +++ b/src/port/gethostname.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/port/gethostname.c,v 1.12 2010/01/02 16:58:13 momjian Exp $ + * src/port/gethostname.c * *------------------------------------------------------------------------- */ diff --git a/src/port/getopt.c b/src/port/getopt.c index ed7f421a47..90c882c1fd 100644 --- a/src/port/getopt.c +++ b/src/port/getopt.c @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/port/getopt.c,v 1.14 2009/06/11 14:49:15 momjian Exp $ */ +/* src/port/getopt.c */ /* This is used by psql under Win32 */ diff --git a/src/port/getopt_long.c b/src/port/getopt_long.c index 9433b56827..418cce7c8b 100644 --- a/src/port/getopt_long.c +++ b/src/port/getopt_long.c @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $PostgreSQL: pgsql/src/port/getopt_long.c,v 1.8 2009/06/11 14:49:15 momjian Exp $ + * src/port/getopt_long.c */ #include "c.h" diff --git a/src/port/getrusage.c b/src/port/getrusage.c index 920e933273..e9747640f9 100644 --- a/src/port/getrusage.c +++ b/src/port/getrusage.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/port/getrusage.c,v 1.18 2010/01/02 16:58:13 momjian Exp $ + * src/port/getrusage.c * *------------------------------------------------------------------------- */ diff --git a/src/port/gettimeofday.c b/src/port/gettimeofday.c index 8387088461..75a91993b7 100644 --- a/src/port/gettimeofday.c +++ b/src/port/gettimeofday.c @@ -2,7 +2,7 @@ * gettimeofday.c * Win32 gettimeofday() replacement * - * $PostgreSQL: pgsql/src/port/gettimeofday.c,v 1.9 2006/03/04 04:44:07 momjian Exp $ + * src/port/gettimeofday.c * * Copyright (c) 2003 SRA, Inc. * Copyright (c) 2003 SKC, Inc. diff --git a/src/port/inet_aton.c b/src/port/inet_aton.c index 31e19ea78f..473f51f88d 100644 --- a/src/port/inet_aton.c +++ b/src/port/inet_aton.c @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/port/inet_aton.c,v 1.10 2007/03/26 21:44:11 momjian Exp $ +/* src/port/inet_aton.c * * This inet_aton() function was taken from the GNU C library and * incorporated into Postgres for those systems which do not have this diff --git a/src/port/isinf.c b/src/port/isinf.c index 32b6d66d31..dc5ebf9618 100644 --- a/src/port/isinf.c +++ b/src/port/isinf.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/port/isinf.c,v 1.14 2010/01/02 16:58:13 momjian Exp $ + * src/port/isinf.c * *------------------------------------------------------------------------- */ diff --git a/src/port/kill.c b/src/port/kill.c index c1a639330b..7e7f1b311c 100644 --- a/src/port/kill.c +++ b/src/port/kill.c @@ -9,7 +9,7 @@ * signals that the backend can recognize. * * IDENTIFICATION - * $PostgreSQL: pgsql/src/port/kill.c,v 1.14 2010/01/31 17:18:28 mha Exp $ + * src/port/kill.c * *------------------------------------------------------------------------- */ diff --git a/src/port/memcmp.c b/src/port/memcmp.c index 761d81c9c3..365e3e3e28 100644 --- a/src/port/memcmp.c +++ b/src/port/memcmp.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/port/memcmp.c,v 1.14 2010/01/02 16:58:13 momjian Exp $ + * src/port/memcmp.c * * This file was taken from NetBSD and is used by SunOS because memcmp * on that platform does not properly compare negative bytes. The diff --git a/src/port/noblock.c b/src/port/noblock.c index ace3bfdb91..8cd6a345a1 100644 --- a/src/port/noblock.c +++ b/src/port/noblock.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/port/noblock.c,v 1.15 2010/01/10 14:16:08 mha Exp $ + * src/port/noblock.c * *------------------------------------------------------------------------- */ diff --git a/src/port/open.c b/src/port/open.c index 51700cd2ef..9d66a38114 100644 --- a/src/port/open.c +++ b/src/port/open.c @@ -6,7 +6,7 @@ * * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/port/open.c,v 1.30 2010/01/02 16:58:13 momjian Exp $ + * src/port/open.c * *------------------------------------------------------------------------- */ diff --git a/src/port/path.c b/src/port/path.c index 305eff511e..003368f96c 100644 --- a/src/port/path.c +++ b/src/port/path.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/port/path.c,v 1.80 2010/01/02 16:58:13 momjian Exp $ + * src/port/path.c * *------------------------------------------------------------------------- */ diff --git a/src/port/pgsleep.c b/src/port/pgsleep.c index 884e257dd7..744334e6af 100644 --- a/src/port/pgsleep.c +++ b/src/port/pgsleep.c @@ -6,7 +6,7 @@ * * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/port/pgsleep.c,v 1.13 2010/01/02 16:58:13 momjian Exp $ + * src/port/pgsleep.c * *------------------------------------------------------------------------- */ diff --git a/src/port/pgstrcasecmp.c b/src/port/pgstrcasecmp.c index c5eba13e6c..f6359f25b3 100644 --- a/src/port/pgstrcasecmp.c +++ b/src/port/pgstrcasecmp.c @@ -16,7 +16,7 @@ * * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/port/pgstrcasecmp.c,v 1.12 2010/01/02 16:58:13 momjian Exp $ + * src/port/pgstrcasecmp.c * *------------------------------------------------------------------------- */ diff --git a/src/port/pipe.c b/src/port/pipe.c index 4d04ba9da4..a30edf613d 100644 --- a/src/port/pipe.c +++ b/src/port/pipe.c @@ -10,7 +10,7 @@ * must be replaced with recv/send. * * IDENTIFICATION - * $PostgreSQL: pgsql/src/port/pipe.c,v 1.17 2010/07/06 19:19:01 momjian Exp $ + * src/port/pipe.c * *------------------------------------------------------------------------- */ diff --git a/src/port/pthread-win32.h b/src/port/pthread-win32.h index 799637345d..97ccc17a12 100644 --- a/src/port/pthread-win32.h +++ b/src/port/pthread-win32.h @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/src/port/pthread-win32.h,v 1.6 2009/06/11 14:49:15 momjian Exp $ + * src/port/pthread-win32.h */ #ifndef __PTHREAD_H #define __PTHREAD_H diff --git a/src/port/qsort.c b/src/port/qsort.c index f7dae50c28..8e2c6d92c2 100644 --- a/src/port/qsort.c +++ b/src/port/qsort.c @@ -9,7 +9,7 @@ * * CAUTION: if you change this file, see also qsort_arg.c * - * $PostgreSQL: pgsql/src/port/qsort.c,v 1.13 2007/03/18 05:36:50 neilc Exp $ + * src/port/qsort.c */ /* $NetBSD: qsort.c,v 1.13 2003/08/07 16:43:42 agc Exp $ */ diff --git a/src/port/qsort_arg.c b/src/port/qsort_arg.c index cf08ddb682..28d1894992 100644 --- a/src/port/qsort_arg.c +++ b/src/port/qsort_arg.c @@ -9,7 +9,7 @@ * * CAUTION: if you change this file, see also qsort.c * - * $PostgreSQL: pgsql/src/port/qsort_arg.c,v 1.4 2007/03/18 05:36:50 neilc Exp $ + * src/port/qsort_arg.c */ /* $NetBSD: qsort.c,v 1.13 2003/08/07 16:43:42 agc Exp $ */ diff --git a/src/port/random.c b/src/port/random.c index 57c63fc54d..525b2bea41 100644 --- a/src/port/random.c +++ b/src/port/random.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/port/random.c,v 1.11 2010/01/02 16:58:13 momjian Exp $ + * src/port/random.c * *------------------------------------------------------------------------- */ diff --git a/src/port/rint.c b/src/port/rint.c index 0e32dd9272..9c4d775357 100644 --- a/src/port/rint.c +++ b/src/port/rint.c @@ -4,7 +4,7 @@ * rint() implementation * * IDENTIFICATION - * $PostgreSQL: pgsql/src/port/rint.c,v 1.4 2010/02/06 05:42:49 tgl Exp $ + * src/port/rint.c * *------------------------------------------------------------------------- */ diff --git a/src/port/snprintf.c b/src/port/snprintf.c index b111f9707d..88cb4d4c2b 100644 --- a/src/port/snprintf.c +++ b/src/port/snprintf.c @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $PostgreSQL: pgsql/src/port/snprintf.c,v 1.36 2010/07/06 19:19:01 momjian Exp $ + * src/port/snprintf.c */ #include "c.h" diff --git a/src/port/sprompt.c b/src/port/sprompt.c index 8441300871..856833b8bc 100644 --- a/src/port/sprompt.c +++ b/src/port/sprompt.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/port/sprompt.c,v 1.22 2010/01/02 16:58:13 momjian Exp $ + * src/port/sprompt.c * *------------------------------------------------------------------------- */ diff --git a/src/port/srandom.c b/src/port/srandom.c index f93c9e722b..94813dac94 100644 --- a/src/port/srandom.c +++ b/src/port/srandom.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/port/srandom.c,v 1.11 2010/01/02 16:58:13 momjian Exp $ + * src/port/srandom.c * *------------------------------------------------------------------------- */ diff --git a/src/port/strdup.c b/src/port/strdup.c index db0ef59baf..d86f052a54 100644 --- a/src/port/strdup.c +++ b/src/port/strdup.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/port/strdup.c,v 1.16 2010/01/02 16:58:13 momjian Exp $ + * src/port/strdup.c * *------------------------------------------------------------------------- */ diff --git a/src/port/strerror.c b/src/port/strerror.c index eebeb1b858..e92ebc9f55 100644 --- a/src/port/strerror.c +++ b/src/port/strerror.c @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/port/strerror.c,v 1.5 2005/07/28 04:03:14 tgl Exp $ */ +/* src/port/strerror.c */ /* * strerror - map error number to descriptive string diff --git a/src/port/strlcat.c b/src/port/strlcat.c index cab2e9adf7..33ee22520d 100644 --- a/src/port/strlcat.c +++ b/src/port/strlcat.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/src/port/strlcat.c,v 1.4 2009/06/11 14:49:15 momjian Exp $ + * src/port/strlcat.c * * $OpenBSD: strlcat.c,v 1.13 2005/08/08 08:05:37 espie Exp $ */ diff --git a/src/port/strlcpy.c b/src/port/strlcpy.c index 1f4e7dd7d6..8f751eb88b 100644 --- a/src/port/strlcpy.c +++ b/src/port/strlcpy.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/port/strlcpy.c,v 1.7 2010/01/02 16:58:13 momjian Exp $ + * src/port/strlcpy.c * * This file was taken from OpenBSD and is used on platforms that don't * provide strlcpy(). The OpenBSD copyright terms follow. diff --git a/src/port/strtol.c b/src/port/strtol.c index d02c99b460..8513858634 100644 --- a/src/port/strtol.c +++ b/src/port/strtol.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/src/port/strtol.c,v 1.18 2010/01/02 16:58:13 momjian Exp $ + * src/port/strtol.c * * * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group diff --git a/src/port/strtoul.c b/src/port/strtoul.c index 18f04ac179..c9ec156ad1 100644 --- a/src/port/strtoul.c +++ b/src/port/strtoul.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/src/port/strtoul.c,v 1.5 2009/06/11 14:49:15 momjian Exp $ + * src/port/strtoul.c * * * Copyright (c) 1990, 1993 diff --git a/src/port/thread.c b/src/port/thread.c index 3d4d248add..2d54d228ba 100644 --- a/src/port/thread.c +++ b/src/port/thread.c @@ -7,7 +7,7 @@ * * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/port/thread.c,v 1.42 2010/01/02 16:58:13 momjian Exp $ + * src/port/thread.c * *------------------------------------------------------------------------- */ diff --git a/src/port/unsetenv.c b/src/port/unsetenv.c index 2110123694..11100330ff 100644 --- a/src/port/unsetenv.c +++ b/src/port/unsetenv.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/port/unsetenv.c,v 1.12 2010/09/07 14:10:30 momjian Exp $ + * src/port/unsetenv.c * *------------------------------------------------------------------------- */ diff --git a/src/port/win32env.c b/src/port/win32env.c index 2ab5d79112..8e9b948c52 100644 --- a/src/port/win32env.c +++ b/src/port/win32env.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/port/win32env.c,v 1.8 2010/02/26 02:01:38 momjian Exp $ + * src/port/win32env.c * *------------------------------------------------------------------------- */ diff --git a/src/port/win32error.c b/src/port/win32error.c index f3e4f9227d..4ab3de3fa4 100644 --- a/src/port/win32error.c +++ b/src/port/win32error.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/port/win32error.c,v 1.7 2010/01/02 16:58:13 momjian Exp $ + * src/port/win32error.c * *------------------------------------------------------------------------- */ diff --git a/src/template/cygwin b/src/template/cygwin index b2fe3640c6..3948fab641 100644 --- a/src/template/cygwin +++ b/src/template/cygwin @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/src/template/cygwin,v 1.8 2010/07/05 18:54:38 tgl Exp $ +# src/template/cygwin SRCH_LIB="/usr/local/lib" diff --git a/src/template/darwin b/src/template/darwin index 7663a75101..542f706b0f 100644 --- a/src/template/darwin +++ b/src/template/darwin @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/src/template/darwin,v 1.12 2010/08/02 04:51:17 tgl Exp $ +# src/template/darwin # Select appropriate semaphore support. Darwin 6.0 (Mac OS X 10.2) and up # support System V semaphores; before that we have to use POSIX semaphores, diff --git a/src/template/dgux b/src/template/dgux index 2a85835b7d..94aee2a611 100644 --- a/src/template/dgux +++ b/src/template/dgux @@ -1 +1 @@ -# $PostgreSQL: pgsql/src/template/dgux,v 1.13 2010/08/19 05:57:35 petere Exp $ +# src/template/dgux diff --git a/src/template/freebsd b/src/template/freebsd index 72a1e0cd6e..1e04fece42 100644 --- a/src/template/freebsd +++ b/src/template/freebsd @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/src/template/freebsd,v 1.35 2006/03/11 04:38:41 momjian Exp $ +# src/template/freebsd case $host_cpu in alpha*) CFLAGS="-O";; # alpha has problems with -O2 diff --git a/src/template/hpux b/src/template/hpux index a0d0b59f1f..ce4d93ced7 100644 --- a/src/template/hpux +++ b/src/template/hpux @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/src/template/hpux,v 1.16 2006/12/12 19:43:19 petere Exp $ +# src/template/hpux CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED" diff --git a/src/template/linux b/src/template/linux index 19904bc22e..3eb5ad2428 100644 --- a/src/template/linux +++ b/src/template/linux @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/src/template/linux,v 1.31 2008/10/29 16:06:47 petere Exp $ +# src/template/linux # Force _GNU_SOURCE on; plperl is broken with Perl 5.8.0 otherwise CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" diff --git a/src/template/netbsd b/src/template/netbsd index c6ac2ba170..198697723d 100644 --- a/src/template/netbsd +++ b/src/template/netbsd @@ -1,2 +1,2 @@ -# $PostgreSQL: pgsql/src/template/netbsd,v 1.21 2010/08/19 05:57:35 petere Exp $ +# src/template/netbsd # tools/thread/thread_test must be run diff --git a/src/template/nextstep b/src/template/nextstep index 68b8ac58ab..381ada6fad 100644 --- a/src/template/nextstep +++ b/src/template/nextstep @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/src/template/nextstep,v 1.9 2006/03/11 04:38:41 momjian Exp $ +# src/template/nextstep AROPT=rc SHARED_LIB= diff --git a/src/template/osf b/src/template/osf index d558389e8d..4f10ad619a 100644 --- a/src/template/osf +++ b/src/template/osf @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/src/template/osf,v 1.20 2006/03/11 04:38:41 momjian Exp $ +# src/template/osf if test "$GCC" != yes ; then CC="$CC -std" diff --git a/src/test/Makefile b/src/test/Makefile index 702f5b4b36..e8cf7041b4 100644 --- a/src/test/Makefile +++ b/src/test/Makefile @@ -7,7 +7,7 @@ # # # IDENTIFICATION -# $PostgreSQL: pgsql/src/test/Makefile,v 1.4 2003/11/29 19:52:13 pgsql Exp $ +# src/test/Makefile # #------------------------------------------------------------------------- diff --git a/src/test/examples/testlibpq.c b/src/test/examples/testlibpq.c index eed7617835..4d9af82dd1 100644 --- a/src/test/examples/testlibpq.c +++ b/src/test/examples/testlibpq.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/src/test/examples/testlibpq.c,v 1.18 2009/06/11 14:49:15 momjian Exp $ + * src/test/examples/testlibpq.c * * * testlibpq.c diff --git a/src/test/examples/testlibpq2.c b/src/test/examples/testlibpq2.c index c5921a5645..f47c5e36bb 100644 --- a/src/test/examples/testlibpq2.c +++ b/src/test/examples/testlibpq2.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/src/test/examples/testlibpq2.c,v 1.17 2010/07/06 19:19:01 momjian Exp $ + * src/test/examples/testlibpq2.c * * * testlibpq2.c diff --git a/src/test/examples/testlibpq3.c b/src/test/examples/testlibpq3.c index ab035887f7..e11e0567ca 100644 --- a/src/test/examples/testlibpq3.c +++ b/src/test/examples/testlibpq3.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/src/test/examples/testlibpq3.c,v 1.17 2009/12/31 00:16:47 adunstan Exp $ + * src/test/examples/testlibpq3.c * * * testlibpq3.c diff --git a/src/test/examples/testlibpq4.c b/src/test/examples/testlibpq4.c index a2935e895f..dafc6aecb1 100644 --- a/src/test/examples/testlibpq4.c +++ b/src/test/examples/testlibpq4.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/src/test/examples/testlibpq4.c,v 1.14 2009/06/11 14:49:15 momjian Exp $ + * src/test/examples/testlibpq4.c * * * testlibpq4.c diff --git a/src/test/examples/testlo.c b/src/test/examples/testlo.c index fd2c28606b..205bed7612 100644 --- a/src/test/examples/testlo.c +++ b/src/test/examples/testlo.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/test/examples/testlo.c,v 1.32 2010/01/02 16:58:13 momjian Exp $ + * src/test/examples/testlo.c * *------------------------------------------------------------------------- */ diff --git a/src/test/locale/Makefile b/src/test/locale/Makefile index 295f049ce8..e4d38646e4 100644 --- a/src/test/locale/Makefile +++ b/src/test/locale/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/src/test/locale/Makefile,v 1.10 2008/03/18 16:24:50 petere Exp $ +# src/test/locale/Makefile subdir = src/test/locale top_builddir = ../../.. diff --git a/src/test/locale/README b/src/test/locale/README index f3eeba36fd..86246df95d 100644 --- a/src/test/locale/README +++ b/src/test/locale/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/test/locale/README,v 1.6 2008/03/21 13:23:29 momjian Exp $ +src/test/locale/README Locales ======= diff --git a/src/test/locale/de_DE.ISO8859-1/README b/src/test/locale/de_DE.ISO8859-1/README index 76d9fd16bc..c9e6ee8121 100644 --- a/src/test/locale/de_DE.ISO8859-1/README +++ b/src/test/locale/de_DE.ISO8859-1/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/test/locale/de_DE.ISO8859-1/README,v 1.2 2008/03/21 13:23:29 momjian Exp $ +src/test/locale/de_DE.ISO8859-1/README de_DE.ISO-8859-1 (German) locale test. Created by Armin Diehl diff --git a/src/test/locale/gr_GR.ISO8859-7/README b/src/test/locale/gr_GR.ISO8859-7/README index 04a5202254..a3dad44725 100644 --- a/src/test/locale/gr_GR.ISO8859-7/README +++ b/src/test/locale/gr_GR.ISO8859-7/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/test/locale/gr_GR.ISO8859-7/README,v 1.2 2008/03/21 13:23:29 momjian Exp $ +src/test/locale/gr_GR.ISO8859-7/README gr_GR.ISO8859-7 (Greek) locale test. Created by Angelos Karageorgiou diff --git a/src/test/locale/koi8-to-win1251/README b/src/test/locale/koi8-to-win1251/README index 35d64ab2c6..07378030ba 100644 --- a/src/test/locale/koi8-to-win1251/README +++ b/src/test/locale/koi8-to-win1251/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/test/locale/koi8-to-win1251/README,v 1.2 2008/03/21 13:23:29 momjian Exp $ +src/test/locale/koi8-to-win1251/README koi8-to-win1251 test. The database should be created in koi8 (createdb -E koi8), test uses koi8-to-win1251 converting feature. diff --git a/src/test/locale/test-ctype.c b/src/test/locale/test-ctype.c index 08b491e4e7..8839d2de50 100644 --- a/src/test/locale/test-ctype.c +++ b/src/test/locale/test-ctype.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/src/test/locale/test-ctype.c,v 1.6 2009/06/11 14:49:15 momjian Exp $ + * src/test/locale/test-ctype.c */ /* diff --git a/src/test/mb/README b/src/test/mb/README index e7bd757dbd..f3de449445 100644 --- a/src/test/mb/README +++ b/src/test/mb/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/test/mb/README,v 1.4 2009/05/06 16:15:21 tgl Exp $ +src/test/mb/README README for multibyte regression test 1998/7/22 diff --git a/src/test/mb/mbregress.sh b/src/test/mb/mbregress.sh index 7a6e1e281c..1ce45c7e1c 100644 --- a/src/test/mb/mbregress.sh +++ b/src/test/mb/mbregress.sh @@ -1,5 +1,5 @@ #! /bin/sh -# $PostgreSQL: pgsql/src/test/mb/mbregress.sh,v 1.11 2009/11/23 16:02:24 tgl Exp $ +# src/test/mb/mbregress.sh if echo '\c' | grep -s c >/dev/null 2>&1 then diff --git a/src/test/performance/sqls/inssimple b/src/test/performance/sqls/inssimple index 950206a4ae..17574ad484 100644 --- a/src/test/performance/sqls/inssimple +++ b/src/test/performance/sqls/inssimple @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/src/test/performance/sqls/inssimple,v 1.3 2010/08/19 05:57:35 petere Exp $ +# src/test/performance/sqls/inssimple # # Transactions are unsupported by MySQL - so for insertion of # 8192 rows, 1 INSERT per Xaction, we returned "Transactions unsupported" diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile index 5f8f04f19c..368347527c 100644 --- a/src/test/regress/GNUmakefile +++ b/src/test/regress/GNUmakefile @@ -6,7 +6,7 @@ # Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group # Portions Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/test/regress/GNUmakefile,v 1.83 2010/07/05 18:54:38 tgl Exp $ +# src/test/regress/GNUmakefile # #------------------------------------------------------------------------- diff --git a/src/test/regress/parallel_schedule b/src/test/regress/parallel_schedule index 554ef39e7d..a05bfeb034 100644 --- a/src/test/regress/parallel_schedule +++ b/src/test/regress/parallel_schedule @@ -1,5 +1,5 @@ # ---------- -# $PostgreSQL: pgsql/src/test/regress/parallel_schedule,v 1.62 2010/08/07 02:44:08 tgl Exp $ +# src/test/regress/parallel_schedule # # By convention, we put no more than twenty tests in any one parallel group; # this limits the number of connections needed to run the tests. diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c index 477732eee7..ab2f69ecf0 100644 --- a/src/test/regress/pg_regress.c +++ b/src/test/regress/pg_regress.c @@ -11,7 +11,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/test/regress/pg_regress.c,v 1.72 2010/06/12 17:21:29 momjian Exp $ + * src/test/regress/pg_regress.c * *------------------------------------------------------------------------- */ diff --git a/src/test/regress/pg_regress.h b/src/test/regress/pg_regress.h index 85deb5719a..3f46037c8c 100644 --- a/src/test/regress/pg_regress.h +++ b/src/test/regress/pg_regress.h @@ -4,7 +4,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/test/regress/pg_regress.h,v 1.6 2010/01/02 16:58:16 momjian Exp $ + * src/test/regress/pg_regress.h *------------------------------------------------------------------------- */ diff --git a/src/test/regress/pg_regress_main.c b/src/test/regress/pg_regress_main.c index fdcea4f5cd..c2114b9515 100644 --- a/src/test/regress/pg_regress_main.c +++ b/src/test/regress/pg_regress_main.c @@ -11,7 +11,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/test/regress/pg_regress_main.c,v 1.9 2010/01/02 16:58:16 momjian Exp $ + * src/test/regress/pg_regress_main.c * *------------------------------------------------------------------------- */ diff --git a/src/test/regress/regress.c b/src/test/regress/regress.c index ffbe4e37b8..8b0f9f14f3 100644 --- a/src/test/regress/regress.c +++ b/src/test/regress/regress.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/src/test/regress/regress.c,v 1.72 2009/01/07 13:44:37 tgl Exp $ + * src/test/regress/regress.c */ #include "postgres.h" diff --git a/src/test/regress/serial_schedule b/src/test/regress/serial_schedule index 1717fe4b5a..e2f8351ad7 100644 --- a/src/test/regress/serial_schedule +++ b/src/test/regress/serial_schedule @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/src/test/regress/serial_schedule,v 1.57 2010/08/07 02:44:08 tgl Exp $ +# src/test/regress/serial_schedule # This should probably be in an order similar to parallel_schedule. test: tablespace test: boolean diff --git a/src/test/regress/standby_schedule b/src/test/regress/standby_schedule index 7e239d4b28..3ddb961c88 100644 --- a/src/test/regress/standby_schedule +++ b/src/test/regress/standby_schedule @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/src/test/regress/standby_schedule,v 1.1 2009/12/19 01:32:45 sriggs Exp $ +# src/test/regress/standby_schedule # # Test schedule for Hot Standby # diff --git a/src/test/thread/Makefile b/src/test/thread/Makefile index b932d10a26..b90bbd477d 100644 --- a/src/test/thread/Makefile +++ b/src/test/thread/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 2003-2010, PostgreSQL Global Development Group # -# $PostgreSQL: pgsql/src/test/thread/Makefile,v 1.7 2010/07/05 18:54:38 tgl Exp $ +# src/test/thread/Makefile # #------------------------------------------------------------------------- diff --git a/src/test/thread/README b/src/test/thread/README index 67220b328b..509f3dc24e 100644 --- a/src/test/thread/README +++ b/src/test/thread/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/test/thread/README,v 1.4 2010/08/19 05:57:35 petere Exp $ +src/test/thread/README Threading ========= diff --git a/src/test/thread/thread_test.c b/src/test/thread/thread_test.c index 79a9c10cda..bff7d5a263 100644 --- a/src/test/thread/thread_test.c +++ b/src/test/thread/thread_test.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/test/thread/thread_test.c,v 1.8 2010/01/02 16:58:16 momjian Exp $ + * src/test/thread/thread_test.c * * This program tests to see if your standard libc functions use * pthread_setspecific()/pthread_getspecific() to be thread-safe. diff --git a/src/timezone/Makefile b/src/timezone/Makefile index ddf07ad3da..a20ddb043a 100644 --- a/src/timezone/Makefile +++ b/src/timezone/Makefile @@ -4,7 +4,7 @@ # Makefile for the timezone library # IDENTIFICATION -# $PostgreSQL: pgsql/src/timezone/Makefile,v 1.33 2010/07/05 18:54:38 tgl Exp $ +# src/timezone/Makefile # #------------------------------------------------------------------------- diff --git a/src/timezone/README b/src/timezone/README index 4372ce542b..4db3148e0c 100644 --- a/src/timezone/README +++ b/src/timezone/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/timezone/README,v 1.9 2010/04/15 11:00:45 mha Exp $ +src/timezone/README Timezone ======== diff --git a/src/timezone/ialloc.c b/src/timezone/ialloc.c index 11fb1e66da..05faafe262 100644 --- a/src/timezone/ialloc.c +++ b/src/timezone/ialloc.c @@ -3,7 +3,7 @@ * 2006-07-17 by Arthur David Olson. * * IDENTIFICATION - * $PostgreSQL: pgsql/src/timezone/ialloc.c,v 1.10 2008/02/16 21:16:04 tgl Exp $ + * src/timezone/ialloc.c */ #include "postgres_fe.h" diff --git a/src/timezone/localtime.c b/src/timezone/localtime.c index da1646c25d..782b99adfb 100644 --- a/src/timezone/localtime.c +++ b/src/timezone/localtime.c @@ -3,7 +3,7 @@ * 1996-06-05 by Arthur David Olson. * * IDENTIFICATION - * $PostgreSQL: pgsql/src/timezone/localtime.c,v 1.22 2010/03/11 18:43:24 tgl Exp $ + * src/timezone/localtime.c */ /* diff --git a/src/timezone/pgtz.c b/src/timezone/pgtz.c index b29a781cf8..62cac7544c 100644 --- a/src/timezone/pgtz.c +++ b/src/timezone/pgtz.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/timezone/pgtz.c,v 1.74 2010/07/06 19:19:01 momjian Exp $ + * src/timezone/pgtz.c * *------------------------------------------------------------------------- */ diff --git a/src/timezone/pgtz.h b/src/timezone/pgtz.h index 863231139e..78aa49db00 100644 --- a/src/timezone/pgtz.h +++ b/src/timezone/pgtz.h @@ -9,7 +9,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * * IDENTIFICATION - * $PostgreSQL: pgsql/src/timezone/pgtz.h,v 1.25 2010/01/02 16:58:16 momjian Exp $ + * src/timezone/pgtz.h * *------------------------------------------------------------------------- */ diff --git a/src/timezone/private.h b/src/timezone/private.h index 8d6a411a39..b1ac9edfcf 100644 --- a/src/timezone/private.h +++ b/src/timezone/private.h @@ -6,7 +6,7 @@ * 1996-06-05 by Arthur David Olson. * * IDENTIFICATION - * $PostgreSQL: pgsql/src/timezone/private.h,v 1.13 2009/06/11 14:49:15 momjian Exp $ + * src/timezone/private.h */ /* diff --git a/src/timezone/scheck.c b/src/timezone/scheck.c index acc4cb5bc8..67bf2bcd4f 100644 --- a/src/timezone/scheck.c +++ b/src/timezone/scheck.c @@ -3,7 +3,7 @@ * 2006-07-17 by Arthur David Olson. * * IDENTIFICATION - * $PostgreSQL: pgsql/src/timezone/scheck.c,v 1.9 2008/02/16 21:16:04 tgl Exp $ + * src/timezone/scheck.c */ #include "postgres_fe.h" diff --git a/src/timezone/strftime.c b/src/timezone/strftime.c index 4400af53d0..bdc8dd3240 100644 --- a/src/timezone/strftime.c +++ b/src/timezone/strftime.c @@ -15,7 +15,7 @@ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * * IDENTIFICATION - * $PostgreSQL: pgsql/src/timezone/strftime.c,v 1.15 2010/03/11 18:43:24 tgl Exp $ + * src/timezone/strftime.c */ #include "postgres.h" diff --git a/src/timezone/tzfile.h b/src/timezone/tzfile.h index 46e380b608..065db9032e 100644 --- a/src/timezone/tzfile.h +++ b/src/timezone/tzfile.h @@ -6,7 +6,7 @@ * 1996-06-05 by Arthur David Olson. * * IDENTIFICATION - * $PostgreSQL: pgsql/src/timezone/tzfile.h,v 1.8 2009/06/11 14:49:15 momjian Exp $ + * src/timezone/tzfile.h */ /* diff --git a/src/timezone/tznames/Africa.txt b/src/timezone/tznames/Africa.txt index b0360115ea..6b88f20fad 100644 --- a/src/timezone/tznames/Africa.txt +++ b/src/timezone/tznames/Africa.txt @@ -4,7 +4,7 @@ # a template for timezones you could need. See the `Date/Time Support' # appendix in the PostgreSQL documentation for more information. # -# $PostgreSQL: pgsql/src/timezone/tznames/Africa.txt,v 1.3 2009/09/06 15:25:23 tgl Exp $ +# src/timezone/tznames/Africa.txt # CAT 7200 # Central Africa Time diff --git a/src/timezone/tznames/America.txt b/src/timezone/tznames/America.txt index e929c09238..b6104b85f3 100644 --- a/src/timezone/tznames/America.txt +++ b/src/timezone/tznames/America.txt @@ -4,7 +4,7 @@ # a template for timezones you could need. See the `Date/Time Support' # appendix in the PostgreSQL documentation for more information. # -# $PostgreSQL: pgsql/src/timezone/tznames/America.txt,v 1.4 2008/03/02 00:10:22 tgl Exp $ +# src/timezone/tznames/America.txt # # Acre time is sometimes called Acre Standard Time (AST) which leads to a diff --git a/src/timezone/tznames/Antarctica.txt b/src/timezone/tznames/Antarctica.txt index 22b06f9098..e25b0ebf17 100644 --- a/src/timezone/tznames/Antarctica.txt +++ b/src/timezone/tznames/Antarctica.txt @@ -4,7 +4,7 @@ # a template for timezones you could need. See the `Date/Time Support' # appendix in the PostgreSQL documentation for more information. # -# $PostgreSQL: pgsql/src/timezone/tznames/Antarctica.txt,v 1.2 2006/07/25 13:49:21 tgl Exp $ +# src/timezone/tznames/Antarctica.txt # CLST -10800 D # Chile Summer Time diff --git a/src/timezone/tznames/Asia.txt b/src/timezone/tznames/Asia.txt index 1a6d9bd5d2..1c6f276d0f 100644 --- a/src/timezone/tznames/Asia.txt +++ b/src/timezone/tznames/Asia.txt @@ -4,7 +4,7 @@ # a template for timezones you could need. See the `Date/Time Support' # appendix in the PostgreSQL documentation for more information. # -# $PostgreSQL: pgsql/src/timezone/tznames/Asia.txt,v 1.5 2010/05/11 22:36:52 tgl Exp $ +# src/timezone/tznames/Asia.txt # # CONFLICT! ADT is not unique diff --git a/src/timezone/tznames/Atlantic.txt b/src/timezone/tznames/Atlantic.txt index a74c8e44de..b2085818bb 100644 --- a/src/timezone/tznames/Atlantic.txt +++ b/src/timezone/tznames/Atlantic.txt @@ -4,7 +4,7 @@ # a template for timezones you could need. See the `Date/Time Support' # appendix in the PostgreSQL documentation for more information. # -# $PostgreSQL: pgsql/src/timezone/tznames/Atlantic.txt,v 1.2 2006/07/25 13:49:21 tgl Exp $ +# src/timezone/tznames/Atlantic.txt # # CONFLICT! ADT is not unique diff --git a/src/timezone/tznames/Australia b/src/timezone/tznames/Australia index a55f5088b4..320e94dcbc 100644 --- a/src/timezone/tznames/Australia +++ b/src/timezone/tznames/Australia @@ -4,7 +4,7 @@ # timezone_abbreviations to 'Australia'. See the `Date/Time Support' # appendix in the PostgreSQL documentation for more information. # -# $PostgreSQL: pgsql/src/timezone/tznames/Australia,v 1.2 2006/07/25 13:49:21 tgl Exp $ +# src/timezone/tznames/Australia # include the default set diff --git a/src/timezone/tznames/Australia.txt b/src/timezone/tznames/Australia.txt index 2eb430992f..906c7fc43a 100644 --- a/src/timezone/tznames/Australia.txt +++ b/src/timezone/tznames/Australia.txt @@ -4,7 +4,7 @@ # a template for timezones you could need. See the `Date/Time Support' # appendix in the PostgreSQL documentation for more information. # -# $PostgreSQL: pgsql/src/timezone/tznames/Australia.txt,v 1.3 2009/09/06 15:25:23 tgl Exp $ +# src/timezone/tznames/Australia.txt # ACSST 37800 D # Central Australia (not in zic) diff --git a/src/timezone/tznames/Default b/src/timezone/tznames/Default index f34d7ec444..7a7a87e651 100644 --- a/src/timezone/tznames/Default +++ b/src/timezone/tznames/Default @@ -4,7 +4,7 @@ # timezone_abbreviations to 'Default'. See the `Date/Time Support' # appendix in the PostgreSQL documentation for more information. # -# $PostgreSQL: pgsql/src/timezone/tznames/Default,v 1.10 2010/08/26 19:58:36 tgl Exp $ +# src/timezone/tznames/Default #################### AFRICA #################### diff --git a/src/timezone/tznames/Etc.txt b/src/timezone/tznames/Etc.txt index 9d0481d49a..52bd834a4a 100644 --- a/src/timezone/tznames/Etc.txt +++ b/src/timezone/tznames/Etc.txt @@ -4,7 +4,7 @@ # a template for timezones you could need. See the `Date/Time Support' # appendix in the PostgreSQL documentation for more information. # -# $PostgreSQL: pgsql/src/timezone/tznames/Etc.txt,v 1.2 2006/07/25 13:49:21 tgl Exp $ +# src/timezone/tznames/Etc.txt # GMT 0 # Greenwich Mean Time diff --git a/src/timezone/tznames/Europe.txt b/src/timezone/tznames/Europe.txt index 98998508a0..88abeccaab 100644 --- a/src/timezone/tznames/Europe.txt +++ b/src/timezone/tznames/Europe.txt @@ -4,7 +4,7 @@ # a template for timezones you could need. See the `Date/Time Support' # appendix in the PostgreSQL documentation for more information. # -# $PostgreSQL: pgsql/src/timezone/tznames/Europe.txt,v 1.3 2009/09/06 15:25:23 tgl Exp $ +# src/timezone/tznames/Europe.txt # BST 3600 D # British Summer Time diff --git a/src/timezone/tznames/India b/src/timezone/tznames/India index 05b404dae8..85830e9f89 100644 --- a/src/timezone/tznames/India +++ b/src/timezone/tznames/India @@ -4,7 +4,7 @@ # timezone_abbreviations to 'India'. See the `Date/Time Support' # appendix in the PostgreSQL documentation for more information. # -# $PostgreSQL: pgsql/src/timezone/tznames/India,v 1.2 2006/07/25 13:49:21 tgl Exp $ +# src/timezone/tznames/India # include the default set diff --git a/src/timezone/tznames/Indian.txt b/src/timezone/tznames/Indian.txt index 342f897b45..c77c9919a1 100644 --- a/src/timezone/tznames/Indian.txt +++ b/src/timezone/tznames/Indian.txt @@ -4,7 +4,7 @@ # a template for timezones you could need. See the `Date/Time Support' # appendix in the PostgreSQL documentation for more information. # -# $PostgreSQL: pgsql/src/timezone/tznames/Indian.txt,v 1.3 2009/03/05 14:27:50 heikki Exp $ +# src/timezone/tznames/Indian.txt # CCT 23400 # Cocos Islands Time (Indian Ocean) diff --git a/src/timezone/tznames/Makefile b/src/timezone/tznames/Makefile index f52f1d8176..e80bf53964 100644 --- a/src/timezone/tznames/Makefile +++ b/src/timezone/tznames/Makefile @@ -4,7 +4,7 @@ # Makefile for the timezone names # IDENTIFICATION -# $PostgreSQL: pgsql/src/timezone/tznames/Makefile,v 1.3 2009/08/26 22:24:44 petere Exp $ +# src/timezone/tznames/Makefile # #------------------------------------------------------------------------- diff --git a/src/timezone/tznames/Pacific.txt b/src/timezone/tznames/Pacific.txt index d7b1ad8cc1..91b9a5c089 100644 --- a/src/timezone/tznames/Pacific.txt +++ b/src/timezone/tznames/Pacific.txt @@ -4,7 +4,7 @@ # a template for timezones you could need. See the `Date/Time Support' # appendix in the PostgreSQL documentation for more information. # -# $PostgreSQL: pgsql/src/timezone/tznames/Pacific.txt,v 1.3 2010/08/26 19:58:36 tgl Exp $ +# src/timezone/tznames/Pacific.txt # CHADT 49500 D # Chatham Daylight Time (New Zealand) diff --git a/src/timezone/tznames/README b/src/timezone/tznames/README index 88958c8cbf..6cb0ae88c9 100644 --- a/src/timezone/tznames/README +++ b/src/timezone/tznames/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/timezone/tznames/README,v 1.4 2009/09/06 15:25:23 tgl Exp $ +src/timezone/tznames/README tznames ======= diff --git a/src/timezone/zic.c b/src/timezone/zic.c index c401b00e65..00ca6faab4 100644 --- a/src/timezone/zic.c +++ b/src/timezone/zic.c @@ -3,7 +3,7 @@ * 2006-07-17 by Arthur David Olson. * * IDENTIFICATION - * $PostgreSQL: pgsql/src/timezone/zic.c,v 1.26 2010/03/13 00:40:43 momjian Exp $ + * src/timezone/zic.c */ #include "postgres_fe.h" diff --git a/src/tools/FAQ2txt b/src/tools/FAQ2txt index ed2946921e..ab61d4d5f8 100755 --- a/src/tools/FAQ2txt +++ b/src/tools/FAQ2txt @@ -1,6 +1,6 @@ #!/bin/sh -# $PostgreSQL: pgsql/src/tools/FAQ2txt,v 1.3 2008/04/22 10:30:32 momjian Exp $: +# src/tools/FAQ2txt: # Converts doc/src/FAQ/FAQ.html to text file doc/FAQ diff --git a/src/tools/add_cvs_markers b/src/tools/add_cvs_markers index a28d26b59f..ccb1757d18 100755 --- a/src/tools/add_cvs_markers +++ b/src/tools/add_cvs_markers @@ -1,6 +1,6 @@ #!/bin/sh -# $PostgreSQL: pgsql/src/tools/add_cvs_markers,v 1.3 2010/08/19 05:57:35 petere Exp $ +# src/tools/add_cvs_markers # Author: Andrew Dunstan diff --git a/src/tools/backend/README b/src/tools/backend/README index ecf2b64878..d779c0e11a 100644 --- a/src/tools/backend/README +++ b/src/tools/backend/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/tools/backend/README,v 1.3 2010/08/19 05:57:35 petere Exp $ +src/tools/backend/README Just point your browser at the index.html file, and click on the flowchart to see the description and source code. diff --git a/src/tools/backend/index.html b/src/tools/backend/index.html index 3086ef8a2c..19945f8661 100644 --- a/src/tools/backend/index.html +++ b/src/tools/backend/index.html @@ -1,4 +1,4 @@ - + diff --git a/src/tools/ccsym b/src/tools/ccsym index a90550abde..bf4a92fafb 100755 --- a/src/tools/ccsym +++ b/src/tools/ccsym @@ -1,6 +1,6 @@ #!/bin/sh -# $PostgreSQL: pgsql/src/tools/ccsym,v 1.7 2006/03/11 04:38:41 momjian Exp $ +# src/tools/ccsym trap "rm -f /tmp/$$.*" 0 1 2 3 15 cd /tmp diff --git a/src/tools/check_keywords.pl b/src/tools/check_keywords.pl index ccfae25d63..24d7bf6f20 100755 --- a/src/tools/check_keywords.pl +++ b/src/tools/check_keywords.pl @@ -5,7 +5,7 @@ use strict; # Check that the keyword lists in gram.y and kwlist.h are sane. Run from # the top directory, or pass a path to a top directory as argument. # -# $PostgreSQL: pgsql/src/tools/check_keywords.pl,v 1.2 2009/04/30 10:26:35 heikki Exp $ +# src/tools/check_keywords.pl my $path; diff --git a/src/tools/codelines b/src/tools/codelines index 6455e83e0a..9a8e11bf40 100755 --- a/src/tools/codelines +++ b/src/tools/codelines @@ -1,6 +1,6 @@ #!/bin/sh -# $PostgreSQL: pgsql/src/tools/codelines,v 1.3 2006/03/11 04:38:41 momjian Exp $ +# src/tools/codelines # This script is used to compute the total number of "C" lines in the release # This should be run from the top of the CVS tree after a 'make distclean' diff --git a/src/tools/copyright b/src/tools/copyright index 230ed827d5..b0d61e1974 100755 --- a/src/tools/copyright +++ b/src/tools/copyright @@ -1,6 +1,6 @@ #!/bin/sh -# $PostgreSQL: pgsql/src/tools/copyright,v 1.19 2010/08/19 05:57:35 petere Exp $ +# src/tools/copyright echo "Using current year: `date '+%Y'`" diff --git a/src/tools/entab/entab.c b/src/tools/entab/entab.c index 7a87e0d5ab..5345c657f5 100644 --- a/src/tools/entab/entab.c +++ b/src/tools/entab/entab.c @@ -2,7 +2,7 @@ ** entab.c - add tabs to a text file ** by Bruce Momjian (root@candle.pha.pa.us) ** -** $PostgreSQL: pgsql/src/tools/entab/entab.c,v 1.18 2007/02/08 11:10:27 petere Exp $ +** src/tools/entab/entab.c ** ** version 1.3 ** diff --git a/src/tools/entab/entab.man b/src/tools/entab/entab.man index a90ab4a2f7..1692ee631b 100644 --- a/src/tools/entab/entab.man +++ b/src/tools/entab/entab.man @@ -1,4 +1,4 @@ -.\" $PostgreSQL: pgsql/src/tools/entab/entab.man,v 1.2 2006/03/11 04:38:41 momjian Exp $ +.\" src/tools/entab/entab.man .TH ENTAB 1 local .SH NAME entab - tab processor diff --git a/src/tools/entab/halt.c b/src/tools/entab/halt.c index af55fa9c2d..dfc5936fad 100644 --- a/src/tools/entab/halt.c +++ b/src/tools/entab/halt.c @@ -2,7 +2,7 @@ ** ** halt.c ** -** $PostgreSQL: pgsql/src/tools/entab/halt.c,v 1.10 2006/07/11 21:21:59 alvherre Exp $ +** src/tools/entab/halt.c ** ** This is used to print out error messages and exit */ diff --git a/src/tools/find_badmacros b/src/tools/find_badmacros index 1195e63182..58f43086e9 100755 --- a/src/tools/find_badmacros +++ b/src/tools/find_badmacros @@ -3,7 +3,7 @@ # This script attempts to find bad ifdef's, i.e. ifdef's that use braces # but not the do { ... } while (0) syntax # -# $PostgreSQL: pgsql/src/tools/find_badmacros,v 1.3 2010/08/19 05:57:35 petere Exp $ +# src/tools/find_badmacros # # This is useful for running before pgindent diff --git a/src/tools/find_gt_lt b/src/tools/find_gt_lt index 72bcad47ea..460a992694 100755 --- a/src/tools/find_gt_lt +++ b/src/tools/find_gt_lt @@ -1,6 +1,6 @@ #!/bin/sh -# $PostgreSQL: pgsql/src/tools/find_gt_lt,v 1.3 2006/10/16 17:28:03 momjian Exp $ +# src/tools/find_gt_lt grep "$@" '[^]a-z0-9"/!-]>' *.sgml ref/*.sgml grep "$@" '<[^]a-z0-9"/!-]' *.sgml ref/*.sgml diff --git a/src/tools/find_static b/src/tools/find_static index c0c8dc4809..28762728af 100755 --- a/src/tools/find_static +++ b/src/tools/find_static @@ -1,6 +1,6 @@ #!/bin/sh -# $PostgreSQL: pgsql/src/tools/find_static,v 1.6 2010/08/19 05:57:35 petere Exp $ +# src/tools/find_static trap "rm -f /tmp/$$" 0 1 2 3 15 diff --git a/src/tools/find_typedef b/src/tools/find_typedef index 4e1ca88d96..838c29b881 100755 --- a/src/tools/find_typedef +++ b/src/tools/find_typedef @@ -1,6 +1,6 @@ #!/bin/sh -# $PostgreSQL: pgsql/src/tools/find_typedef,v 1.16 2009/06/12 03:09:07 momjian Exp $ +# src/tools/find_typedef # This script attempts to find all typedef's in the postgres binaries # by using 'nm' to report all typedef debugging symbols. diff --git a/src/tools/findoidjoins/Makefile b/src/tools/findoidjoins/Makefile index 5f7bd0c77f..db3c8f9a9d 100644 --- a/src/tools/findoidjoins/Makefile +++ b/src/tools/findoidjoins/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 2003-2010, PostgreSQL Global Development Group # -# $PostgreSQL: pgsql/src/tools/findoidjoins/Makefile,v 1.8 2010/07/05 18:54:38 tgl Exp $ +# src/tools/findoidjoins/Makefile # #------------------------------------------------------------------------- diff --git a/src/tools/findoidjoins/README b/src/tools/findoidjoins/README index c98569d13e..0685d6cf21 100644 --- a/src/tools/findoidjoins/README +++ b/src/tools/findoidjoins/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/tools/findoidjoins/README,v 1.7 2010/03/14 04:17:54 tgl Exp $ +src/tools/findoidjoins/README findoidjoins ============ diff --git a/src/tools/findoidjoins/findoidjoins.c b/src/tools/findoidjoins/findoidjoins.c index 5bedee0e44..dbaaf257f8 100644 --- a/src/tools/findoidjoins/findoidjoins.c +++ b/src/tools/findoidjoins/findoidjoins.c @@ -3,7 +3,7 @@ * * Copyright (c) 2002-2010, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/tools/findoidjoins/findoidjoins.c,v 1.8 2010/01/02 16:58:16 momjian Exp $ + * src/tools/findoidjoins/findoidjoins.c */ #include "postgres_fe.h" diff --git a/src/tools/findoidjoins/make_oidjoins_check b/src/tools/findoidjoins/make_oidjoins_check index 6321260a0f..59ac76aaba 100755 --- a/src/tools/findoidjoins/make_oidjoins_check +++ b/src/tools/findoidjoins/make_oidjoins_check @@ -1,6 +1,6 @@ #! /bin/sh -# $PostgreSQL: pgsql/src/tools/findoidjoins/make_oidjoins_check,v 1.3 2008/10/13 12:59:29 tgl Exp $ +# src/tools/findoidjoins/make_oidjoins_check # You first run findoidjoins on the template1 database, and send that # output into this script to generate a list of SQL statements. diff --git a/src/tools/fsync/Makefile b/src/tools/fsync/Makefile index 2ddbbe9f47..b0fd13b692 100644 --- a/src/tools/fsync/Makefile +++ b/src/tools/fsync/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 2003-2010, PostgreSQL Global Development Group # -# $PostgreSQL: pgsql/src/tools/fsync/Makefile,v 1.9 2010/07/05 18:54:38 tgl Exp $ +# src/tools/fsync/Makefile # #------------------------------------------------------------------------- diff --git a/src/tools/fsync/README b/src/tools/fsync/README index 0ab84b1ef0..6d9acd333f 100644 --- a/src/tools/fsync/README +++ b/src/tools/fsync/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/tools/fsync/README,v 1.5 2009/11/28 15:04:54 momjian Exp $ +src/tools/fsync/README fsync ===== diff --git a/src/tools/fsync/test_fsync.c b/src/tools/fsync/test_fsync.c index 41d0117e6e..3c9c6b60ce 100644 --- a/src/tools/fsync/test_fsync.c +++ b/src/tools/fsync/test_fsync.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/src/tools/fsync/test_fsync.c,v 1.31 2010/07/13 17:00:50 momjian Exp $ + * src/tools/fsync/test_fsync.c * * * test_fsync.c diff --git a/src/tools/ifaddrs/Makefile b/src/tools/ifaddrs/Makefile index 72a6aa7de8..db482abcad 100644 --- a/src/tools/ifaddrs/Makefile +++ b/src/tools/ifaddrs/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 2003-2010, PostgreSQL Global Development Group # -# $PostgreSQL: pgsql/src/tools/ifaddrs/Makefile,v 1.3 2010/07/05 18:54:38 tgl Exp $ +# src/tools/ifaddrs/Makefile # #------------------------------------------------------------------------- diff --git a/src/tools/ifaddrs/README b/src/tools/ifaddrs/README index 9b0bd58517..9f92803eb5 100644 --- a/src/tools/ifaddrs/README +++ b/src/tools/ifaddrs/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/tools/ifaddrs/README,v 1.1 2009/10/01 01:58:58 tgl Exp $ +src/tools/ifaddrs/README test_ifaddrs ============ diff --git a/src/tools/ifaddrs/test_ifaddrs.c b/src/tools/ifaddrs/test_ifaddrs.c index 9ba6f11809..48d184c84a 100644 --- a/src/tools/ifaddrs/test_ifaddrs.c +++ b/src/tools/ifaddrs/test_ifaddrs.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/src/tools/ifaddrs/test_ifaddrs.c,v 1.2 2010/02/26 02:01:40 momjian Exp $ + * src/tools/ifaddrs/test_ifaddrs.c * * * test_ifaddrs.c diff --git a/src/tools/make_ctags b/src/tools/make_ctags index 18d96db5b8..4fc01f543d 100755 --- a/src/tools/make_ctags +++ b/src/tools/make_ctags @@ -1,6 +1,6 @@ #!/bin/sh -# $PostgreSQL: pgsql/src/tools/make_ctags,v 1.12 2009/01/14 21:59:19 momjian Exp $ +# src/tools/make_ctags trap "rm -f /tmp/$$" 0 1 2 3 15 rm -f ./tags diff --git a/src/tools/make_diff/README b/src/tools/make_diff/README index 0dbab7dc74..bc5cea4ceb 100644 --- a/src/tools/make_diff/README +++ b/src/tools/make_diff/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/tools/make_diff/README,v 1.5 2010/08/19 05:57:36 petere Exp $ +src/tools/make_diff/README scripts ======= diff --git a/src/tools/make_diff/cporig b/src/tools/make_diff/cporig index a4f2f24d63..7b8f75feb4 100755 --- a/src/tools/make_diff/cporig +++ b/src/tools/make_diff/cporig @@ -1,6 +1,6 @@ #!/bin/sh -# $PostgreSQL: pgsql/src/tools/make_diff/cporig,v 1.2 2006/03/11 04:38:42 momjian Exp $ +# src/tools/make_diff/cporig for FILE do diff --git a/src/tools/make_diff/difforig b/src/tools/make_diff/difforig index a65d7b5dba..08119a42c3 100755 --- a/src/tools/make_diff/difforig +++ b/src/tools/make_diff/difforig @@ -1,6 +1,6 @@ #!/bin/sh -# $PostgreSQL: pgsql/src/tools/make_diff/difforig,v 1.2 2006/03/11 04:38:42 momjian Exp $ +# src/tools/make_diff/difforig if [ "$#" -eq 0 ] then APATH="." diff --git a/src/tools/make_diff/rmorig b/src/tools/make_diff/rmorig index 5d405d0504..9879b786f4 100755 --- a/src/tools/make_diff/rmorig +++ b/src/tools/make_diff/rmorig @@ -1,6 +1,6 @@ #!/bin/sh -# $PostgreSQL: pgsql/src/tools/make_diff/rmorig,v 1.2 2006/03/11 04:38:42 momjian Exp $ +# src/tools/make_diff/rmorig if [ "$#" -eq 0 ] then APATH="." diff --git a/src/tools/make_etags b/src/tools/make_etags index 6acb0df0de..3ce96bc3ca 100755 --- a/src/tools/make_etags +++ b/src/tools/make_etags @@ -1,6 +1,6 @@ #!/bin/sh -# $PostgreSQL: pgsql/src/tools/make_etags,v 1.6 2009/01/14 21:59:19 momjian Exp $ +# src/tools/make_etags rm -f ./TAGS diff --git a/src/tools/make_keywords b/src/tools/make_keywords index 4aba19eb02..abbbfe000f 100755 --- a/src/tools/make_keywords +++ b/src/tools/make_keywords @@ -1,6 +1,6 @@ #!/bin/sh -# $PostgreSQL: pgsql/src/tools/make_keywords,v 1.2 2006/03/11 04:38:41 momjian Exp $ +# src/tools/make_keywords cat < \n" diff --git a/src/tools/msvc/install.bat b/src/tools/msvc/install.bat index 043bc69158..8c5fb1dccb 100644 --- a/src/tools/msvc/install.bat +++ b/src/tools/msvc/install.bat @@ -1,5 +1,5 @@ @echo off -REM $PostgreSQL: pgsql/src/tools/msvc/install.bat,v 1.3 2007/12/19 12:29:36 mha Exp $ +REM src/tools/msvc/install.bat if NOT "%1"=="" GOTO RUN_INSTALL diff --git a/src/tools/msvc/install.pl b/src/tools/msvc/install.pl index 7e0c48e998..28563a930d 100755 --- a/src/tools/msvc/install.pl +++ b/src/tools/msvc/install.pl @@ -1,7 +1,7 @@ # # Script that provides 'make install' functionality for msvc builds # -# $PostgreSQL: pgsql/src/tools/msvc/install.pl,v 1.7 2007/03/17 14:01:01 mha Exp $ +# src/tools/msvc/install.pl # use strict; use warnings; diff --git a/src/tools/msvc/mkvcbuild.pl b/src/tools/msvc/mkvcbuild.pl index bdb1cc4d82..32861cbbd6 100644 --- a/src/tools/msvc/mkvcbuild.pl +++ b/src/tools/msvc/mkvcbuild.pl @@ -2,7 +2,7 @@ # Script that parses Unix style build environment and generates build files # for building with Visual Studio. # -# $PostgreSQL: pgsql/src/tools/msvc/mkvcbuild.pl,v 1.19 2010/01/05 13:31:58 mha Exp $ +# src/tools/msvc/mkvcbuild.pl # use strict; use warnings; diff --git a/src/tools/msvc/pgbison.bat b/src/tools/msvc/pgbison.bat index e22b853a01..9f30e72b7d 100755 --- a/src/tools/msvc/pgbison.bat +++ b/src/tools/msvc/pgbison.bat @@ -1,5 +1,5 @@ @echo off -REM $PostgreSQL: pgsql/src/tools/msvc/pgbison.bat,v 1.10 2008/08/30 02:32:24 tgl Exp $ +REM src/tools/msvc/pgbison.bat IF NOT EXIST src\tools\msvc\buildenv.pl goto nobuildenv perl -e "require 'src/tools/msvc/buildenv.pl'; while(($k,$v) = each %ENV) { print qq[\@SET $k=$v\n]; }" > bldenv.bat diff --git a/src/tools/msvc/pgflex.bat b/src/tools/msvc/pgflex.bat index 00c6757231..7038fc95e4 100755 --- a/src/tools/msvc/pgflex.bat +++ b/src/tools/msvc/pgflex.bat @@ -1,5 +1,5 @@ @echo off -REM $PostgreSQL: pgsql/src/tools/msvc/pgflex.bat,v 1.6 2009/11/12 00:13:00 tgl Exp $ +REM src/tools/msvc/pgflex.bat IF NOT EXIST src\tools\msvc\buildenv.pl goto nobuildenv perl -e "require 'src/tools/msvc/buildenv.pl'; while(($k,$v) = each %ENV) { print qq[\@SET $k=$v\n]; }" > bldenv.bat diff --git a/src/tools/msvc/vcregress.bat b/src/tools/msvc/vcregress.bat index 56b6510d3d..a981d3a6aa 100644 --- a/src/tools/msvc/vcregress.bat +++ b/src/tools/msvc/vcregress.bat @@ -1,5 +1,5 @@ @echo off -REM $PostgreSQL: pgsql/src/tools/msvc/vcregress.bat,v 1.15 2007/09/27 21:13:11 adunstan Exp $ +REM src/tools/msvc/vcregress.bat REM all the logic for this now belongs in vcregress.pl. This file really REM only exists so you don't have to type "perl vcregress.pl" REM Resist any temptation to add any logic here. diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl index b942bb1dad..956db5fc8f 100644 --- a/src/tools/msvc/vcregress.pl +++ b/src/tools/msvc/vcregress.pl @@ -1,6 +1,6 @@ # -*-perl-*- hey - emacs - this is a perl file -# $PostgreSQL: pgsql/src/tools/msvc/vcregress.pl,v 1.16 2010/08/19 05:57:36 petere Exp $ +# src/tools/msvc/vcregress.pl use strict; diff --git a/src/tools/pgcvslog b/src/tools/pgcvslog index f2d01c62bd..6607b9b2dd 100755 --- a/src/tools/pgcvslog +++ b/src/tools/pgcvslog @@ -1,6 +1,6 @@ #!/bin/sh -# $PostgreSQL: pgsql/src/tools/pgcvslog,v 1.40 2009/08/29 17:09:20 momjian Exp $ +# src/tools/pgcvslog # This utility is used to generate a compact list of changes # for each release, bjm 2000-02-22 diff --git a/src/tools/pginclude/README b/src/tools/pginclude/README index dbe0a6ab0c..8d4131aed1 100644 --- a/src/tools/pginclude/README +++ b/src/tools/pginclude/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/tools/pginclude/README,v 1.10 2008/03/21 13:23:29 momjian Exp $ +src/tools/pginclude/README pginclude ========= diff --git a/src/tools/pginclude/pgcheckdefines b/src/tools/pginclude/pgcheckdefines index 07ae7b5d67..2936caf2e0 100755 --- a/src/tools/pginclude/pgcheckdefines +++ b/src/tools/pginclude/pgcheckdefines @@ -17,7 +17,7 @@ # them. We try to process all .c files, even those not intended for the # current platform, so there will be some phony failures. # -# $PostgreSQL: pgsql/src/tools/pginclude/pgcheckdefines,v 1.1 2006/07/15 03:27:42 tgl Exp $ +# src/tools/pginclude/pgcheckdefines # use Cwd; diff --git a/src/tools/pginclude/pgcompinclude b/src/tools/pginclude/pgcompinclude index 5b9564d490..13f49f1637 100755 --- a/src/tools/pginclude/pgcompinclude +++ b/src/tools/pginclude/pgcompinclude @@ -1,7 +1,7 @@ : # report which #include files can not compile on their own # takes -v option to display compile failure message and line numbers -# $PostgreSQL: pgsql/src/tools/pginclude/pgcompinclude,v 1.8 2006/07/14 01:05:13 momjian Exp $ +# src/tools/pginclude/pgcompinclude trap "rm -f /tmp/$$.c /tmp/$$.o /tmp/$$ /tmp/$$a" 0 1 2 3 15 find . \( -name CVS -a -prune \) -o -name '*.h' -type f -print | while read FILE diff --git a/src/tools/pginclude/pgdefine b/src/tools/pginclude/pgdefine index 52a775e163..0284307381 100755 --- a/src/tools/pginclude/pgdefine +++ b/src/tools/pginclude/pgdefine @@ -1,7 +1,7 @@ : # create macro calls for all defines in the file -# $PostgreSQL: pgsql/src/tools/pginclude/pgdefine,v 1.4 2006/07/13 16:39:20 momjian Exp $ +# src/tools/pginclude/pgdefine trap "rm -f /tmp/$$" 0 1 2 3 15 for FILE diff --git a/src/tools/pginclude/pgfixinclude b/src/tools/pginclude/pgfixinclude index 3f081a4997..4b2d2bacee 100755 --- a/src/tools/pginclude/pgfixinclude +++ b/src/tools/pginclude/pgfixinclude @@ -1,6 +1,6 @@ : # change #include's to <> or "" -# $PostgreSQL: pgsql/src/tools/pginclude/pgfixinclude,v 1.6 2006/07/10 16:07:24 momjian Exp $ +# src/tools/pginclude/pgfixinclude trap "rm -f /tmp/$$.c /tmp/$$.o /tmp/$$ /tmp/$$a /tmp/$$b" 0 1 2 3 15 find . \( -name CVS -a -prune \) -o -type f -name '*.[chyls]' -print | diff --git a/src/tools/pginclude/pgrminclude b/src/tools/pginclude/pgrminclude index 7944c9d735..1e99b12b73 100755 --- a/src/tools/pginclude/pgrminclude +++ b/src/tools/pginclude/pgrminclude @@ -1,7 +1,7 @@ : # remove extra #include's -# $PostgreSQL: pgsql/src/tools/pginclude/pgrminclude,v 1.16 2006/07/14 01:05:14 momjian Exp $ +# src/tools/pginclude/pgrminclude trap "rm -f /tmp/$$.c /tmp/$$.o /tmp/$$ /tmp/$$a /tmp/$$b" 0 1 2 3 15 find . \( -name CVS -a -prune \) -o -type f -name '*.[ch]' -print | diff --git a/src/tools/pgindent/README b/src/tools/pgindent/README index 7b65abe52f..49e0893575 100644 --- a/src/tools/pgindent/README +++ b/src/tools/pgindent/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/tools/pgindent/README,v 1.43 2010/08/19 05:57:36 petere Exp $ +src/tools/pgindent/README pgindent ======== diff --git a/src/tools/pgindent/indent.bsd.patch b/src/tools/pgindent/indent.bsd.patch index 095b65123d..e10b9973f6 100644 --- a/src/tools/pgindent/indent.bsd.patch +++ b/src/tools/pgindent/indent.bsd.patch @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/tools/pgindent/indent.bsd.patch,v 1.8 2006/03/11 04:38:42 momjian Exp $ +src/tools/pgindent/indent.bsd.patch This patch contains several fixes to NetBSD's indent and should be applied before using pgindent. diff --git a/src/tools/pgindent/pgcppindent b/src/tools/pgindent/pgcppindent index e624efb0e4..59ddf4baca 100755 --- a/src/tools/pgindent/pgcppindent +++ b/src/tools/pgindent/pgcppindent @@ -1,6 +1,6 @@ #!/bin/sh -# $PostgreSQL: pgsql/src/tools/pgindent/pgcppindent,v 1.2 2006/03/11 04:38:42 momjian Exp $ +# src/tools/pgindent/pgcppindent trap "rm -f /tmp/$$ /tmp/$$a" 0 1 2 3 15 entab /dev/null diff --git a/src/tools/pgindent/pgindent b/src/tools/pgindent/pgindent index 67c9253c47..00267ec845 100755 --- a/src/tools/pgindent/pgindent +++ b/src/tools/pgindent/pgindent @@ -1,6 +1,6 @@ #!/bin/sh -# $PostgreSQL: pgsql/src/tools/pgindent/pgindent,v 1.102 2010/04/05 03:09:09 adunstan Exp $ +# src/tools/pgindent/pgindent # Known bugs: # diff --git a/src/tools/pgtest b/src/tools/pgtest index 9a50bea446..11223f31cc 100755 --- a/src/tools/pgtest +++ b/src/tools/pgtest @@ -1,6 +1,6 @@ #!/bin/sh -# $PostgreSQL: pgsql/src/tools/pgtest,v 1.6 2006/03/11 04:38:41 momjian Exp $ +# src/tools/pgtest # This runs a build/initdb/regression test suite # diff --git a/src/tools/version_stamp.pl b/src/tools/version_stamp.pl index 3f5d409aa3..f86e298c2d 100755 --- a/src/tools/version_stamp.pl +++ b/src/tools/version_stamp.pl @@ -5,7 +5,7 @@ # # Copyright (c) 2008-2010, PostgreSQL Global Development Group # -# $PostgreSQL: pgsql/src/tools/version_stamp.pl,v 1.7 2010/07/09 04:10:58 tgl Exp $ +# src/tools/version_stamp.pl ################################################################# # diff --git a/src/tools/win32tzlist.pl b/src/tools/win32tzlist.pl index 083cc08850..01e1c06397 100755 --- a/src/tools/win32tzlist.pl +++ b/src/tools/win32tzlist.pl @@ -4,7 +4,7 @@ # # Copyright (c) 2008-2010, PostgreSQL Global Development Group # -# $PostgreSQL: pgsql/src/tools/win32tzlist.pl,v 1.1 2010/04/15 11:00:45 mha Exp $ +# src/tools/win32tzlist.pl ################################################################# # diff --git a/src/tutorial/Makefile b/src/tutorial/Makefile index cbd721103c..b180da5103 100644 --- a/src/tutorial/Makefile +++ b/src/tutorial/Makefile @@ -9,7 +9,7 @@ # to build using the surrounding source tree. # # IDENTIFICATION -# $PostgreSQL: pgsql/src/tutorial/Makefile,v 1.21 2008/04/07 14:15:58 petere Exp $ +# src/tutorial/Makefile # #------------------------------------------------------------------------- diff --git a/src/tutorial/README b/src/tutorial/README index 9748203fc5..ce9d733c70 100644 --- a/src/tutorial/README +++ b/src/tutorial/README @@ -1,4 +1,4 @@ -$PostgreSQL: pgsql/src/tutorial/README,v 1.4 2008/03/21 13:23:29 momjian Exp $ +src/tutorial/README tutorial ======== diff --git a/src/tutorial/advanced.source b/src/tutorial/advanced.source index 49321c2012..2717d4c51a 100644 --- a/src/tutorial/advanced.source +++ b/src/tutorial/advanced.source @@ -6,7 +6,7 @@ -- -- Copyright (c) 1994, Regents of the University of California -- --- $PostgreSQL: pgsql/src/tutorial/advanced.source,v 1.6 2003/11/29 22:41:33 pgsql Exp $ +-- src/tutorial/advanced.source -- --------------------------------------------------------------------------- diff --git a/src/tutorial/basics.source b/src/tutorial/basics.source index ede3a99411..1092cdf971 100644 --- a/src/tutorial/basics.source +++ b/src/tutorial/basics.source @@ -4,7 +4,7 @@ -- Tutorial on the basics (table creation and data manipulation) -- -- --- $PostgreSQL: pgsql/src/tutorial/basics.source,v 1.6 2010/02/02 18:52:02 momjian Exp $ +-- src/tutorial/basics.source -- --------------------------------------------------------------------------- diff --git a/src/tutorial/complex.c b/src/tutorial/complex.c index bc37220fe3..edae0065c7 100644 --- a/src/tutorial/complex.c +++ b/src/tutorial/complex.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/src/tutorial/complex.c,v 1.15 2009/06/11 14:49:15 momjian Exp $ + * src/tutorial/complex.c * ****************************************************************************** This file contains routines that can be bound to a Postgres backend and diff --git a/src/tutorial/complex.source b/src/tutorial/complex.source index b124f89a78..30b1e82406 100644 --- a/src/tutorial/complex.source +++ b/src/tutorial/complex.source @@ -8,7 +8,7 @@ -- Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group -- Portions Copyright (c) 1994, Regents of the University of California -- --- $PostgreSQL: pgsql/src/tutorial/complex.source,v 1.24 2010/01/02 16:58:17 momjian Exp $ +-- src/tutorial/complex.source -- --------------------------------------------------------------------------- diff --git a/src/tutorial/funcs.c b/src/tutorial/funcs.c index f9f28a5c5e..e581275856 100644 --- a/src/tutorial/funcs.c +++ b/src/tutorial/funcs.c @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/tutorial/funcs.c,v 1.17 2007/02/27 23:48:10 tgl Exp $ */ +/* src/tutorial/funcs.c */ /****************************************************************************** These are user-defined functions that can be bound to a Postgres backend diff --git a/src/tutorial/funcs.source b/src/tutorial/funcs.source index 2874be4543..d4d61fa09c 100644 --- a/src/tutorial/funcs.source +++ b/src/tutorial/funcs.source @@ -6,7 +6,7 @@ -- -- Copyright (c) 1994-5, Regents of the University of California -- --- $PostgreSQL: pgsql/src/tutorial/funcs.source,v 1.10 2006/05/22 14:08:06 momjian Exp $ +-- src/tutorial/funcs.source -- --------------------------------------------------------------------------- diff --git a/src/tutorial/funcs_new.c b/src/tutorial/funcs_new.c index 9811f5421b..c8ef458226 100644 --- a/src/tutorial/funcs_new.c +++ b/src/tutorial/funcs_new.c @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/tutorial/funcs_new.c,v 1.13 2007/02/27 23:48:10 tgl Exp $ */ +/* src/tutorial/funcs_new.c */ /****************************************************************************** These are user-defined functions that can be bound to a Postgres backend diff --git a/src/tutorial/syscat.source b/src/tutorial/syscat.source index 2ab169e9ce..ad50d10fd4 100644 --- a/src/tutorial/syscat.source +++ b/src/tutorial/syscat.source @@ -7,7 +7,7 @@ -- Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group -- Portions Copyright (c) 1994, Regents of the University of California -- --- $PostgreSQL: pgsql/src/tutorial/syscat.source,v 1.22 2010/08/19 05:57:36 petere Exp $ +-- src/tutorial/syscat.source -- --------------------------------------------------------------------------- diff --git a/src/win32.mak b/src/win32.mak index 63f7e67631..05ed2db114 100644 --- a/src/win32.mak +++ b/src/win32.mak @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/src/win32.mak,v 1.16 2007/08/03 10:47:10 mha Exp $ +# src/win32.mak # Top-file makefile for building Win32 libpq with Visual C++ 7.1. # (see src/tools/msvc for tools to build with Visual C++ 2005 and newer) -- cgit v1.2.3 From cc2c8152e624e4985660e7042960bf300bb78a39 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Wed, 22 Sep 2010 17:21:53 -0400 Subject: Some more gitignore cleanups: cover contrib and PL regression test outputs. Also do some further work in the back branches, where quite a bit wasn't covered by Magnus' original back-patch. --- contrib/btree_gin/.gitignore | 2 ++ contrib/btree_gist/.gitignore | 2 ++ contrib/citext/.gitignore | 2 ++ contrib/cube/.gitignore | 2 ++ contrib/dblink/.gitignore | 2 ++ contrib/dict_int/.gitignore | 2 ++ contrib/dict_xsyn/.gitignore | 2 ++ contrib/earthdistance/.gitignore | 2 ++ contrib/hstore/.gitignore | 2 ++ contrib/intarray/.gitignore | 2 ++ contrib/ltree/.gitignore | 2 ++ contrib/pg_trgm/.gitignore | 2 ++ contrib/pgcrypto/.gitignore | 2 ++ contrib/seg/.gitignore | 2 ++ contrib/tablefunc/.gitignore | 2 ++ contrib/test_parser/.gitignore | 2 ++ contrib/tsearch2/.gitignore | 2 ++ contrib/unaccent/.gitignore | 2 ++ contrib/xml2/.gitignore | 2 ++ src/pl/plperl/.gitignore | 3 +++ src/pl/plpython/.gitignore | 2 ++ src/pl/tcl/.gitignore | 2 ++ src/pl/tcl/modules/.gitignore | 3 +++ 23 files changed, 48 insertions(+) create mode 100644 contrib/xml2/.gitignore create mode 100644 src/pl/plpython/.gitignore create mode 100644 src/pl/tcl/.gitignore create mode 100644 src/pl/tcl/modules/.gitignore (limited to 'contrib/xml2') diff --git a/contrib/btree_gin/.gitignore b/contrib/btree_gin/.gitignore index c3ce67c140..7cebcf00f8 100644 --- a/contrib/btree_gin/.gitignore +++ b/contrib/btree_gin/.gitignore @@ -1 +1,3 @@ /btree_gin.sql +# Generated subdirectories +/results/ diff --git a/contrib/btree_gist/.gitignore b/contrib/btree_gist/.gitignore index 95b6332299..46318eaa7b 100644 --- a/contrib/btree_gist/.gitignore +++ b/contrib/btree_gist/.gitignore @@ -1 +1,3 @@ /btree_gist.sql +# Generated subdirectories +/results/ diff --git a/contrib/citext/.gitignore b/contrib/citext/.gitignore index 3f449cfc46..e626817156 100644 --- a/contrib/citext/.gitignore +++ b/contrib/citext/.gitignore @@ -1 +1,3 @@ /citext.sql +# Generated subdirectories +/results/ diff --git a/contrib/cube/.gitignore b/contrib/cube/.gitignore index bb28b9327c..9f60da5078 100644 --- a/contrib/cube/.gitignore +++ b/contrib/cube/.gitignore @@ -1,3 +1,5 @@ /cubeparse.c /cubescan.c /cube.sql +# Generated subdirectories +/results/ diff --git a/contrib/dblink/.gitignore b/contrib/dblink/.gitignore index 985b73d394..fb7e8728bc 100644 --- a/contrib/dblink/.gitignore +++ b/contrib/dblink/.gitignore @@ -1 +1,3 @@ /dblink.sql +# Generated subdirectories +/results/ diff --git a/contrib/dict_int/.gitignore b/contrib/dict_int/.gitignore index 90a29e83fa..932dda6d84 100644 --- a/contrib/dict_int/.gitignore +++ b/contrib/dict_int/.gitignore @@ -1 +1,3 @@ /dict_int.sql +# Generated subdirectories +/results/ diff --git a/contrib/dict_xsyn/.gitignore b/contrib/dict_xsyn/.gitignore index 4f1dc1e8b3..0ebd61caaf 100644 --- a/contrib/dict_xsyn/.gitignore +++ b/contrib/dict_xsyn/.gitignore @@ -1 +1,3 @@ /dict_xsyn.sql +# Generated subdirectories +/results/ diff --git a/contrib/earthdistance/.gitignore b/contrib/earthdistance/.gitignore index 86caae7daa..366a0a399e 100644 --- a/contrib/earthdistance/.gitignore +++ b/contrib/earthdistance/.gitignore @@ -1 +1,3 @@ /earthdistance.sql +# Generated subdirectories +/results/ diff --git a/contrib/hstore/.gitignore b/contrib/hstore/.gitignore index 737d3655c6..d7af95330c 100644 --- a/contrib/hstore/.gitignore +++ b/contrib/hstore/.gitignore @@ -1 +1,3 @@ /hstore.sql +# Generated subdirectories +/results/ diff --git a/contrib/intarray/.gitignore b/contrib/intarray/.gitignore index e9985910a3..761a9b2607 100644 --- a/contrib/intarray/.gitignore +++ b/contrib/intarray/.gitignore @@ -1 +1,3 @@ /_int.sql +# Generated subdirectories +/results/ diff --git a/contrib/ltree/.gitignore b/contrib/ltree/.gitignore index 85d1e298b4..49883e82a3 100644 --- a/contrib/ltree/.gitignore +++ b/contrib/ltree/.gitignore @@ -1 +1,3 @@ /ltree.sql +# Generated subdirectories +/results/ diff --git a/contrib/pg_trgm/.gitignore b/contrib/pg_trgm/.gitignore index 3272f08f53..9cda826ca4 100644 --- a/contrib/pg_trgm/.gitignore +++ b/contrib/pg_trgm/.gitignore @@ -1 +1,3 @@ /pg_trgm.sql +# Generated subdirectories +/results/ diff --git a/contrib/pgcrypto/.gitignore b/contrib/pgcrypto/.gitignore index 3cdb7a6396..07b24d98f0 100644 --- a/contrib/pgcrypto/.gitignore +++ b/contrib/pgcrypto/.gitignore @@ -1 +1,3 @@ /pgcrypto.sql +# Generated subdirectories +/results/ diff --git a/contrib/seg/.gitignore b/contrib/seg/.gitignore index d2a71ec0dd..a8973ff696 100644 --- a/contrib/seg/.gitignore +++ b/contrib/seg/.gitignore @@ -1,3 +1,5 @@ /segparse.c /segscan.c /seg.sql +# Generated subdirectories +/results/ diff --git a/contrib/tablefunc/.gitignore b/contrib/tablefunc/.gitignore index 3477af4d4b..b28639637b 100644 --- a/contrib/tablefunc/.gitignore +++ b/contrib/tablefunc/.gitignore @@ -1 +1,3 @@ /tablefunc.sql +# Generated subdirectories +/results/ diff --git a/contrib/test_parser/.gitignore b/contrib/test_parser/.gitignore index 54cb045adb..c07f518855 100644 --- a/contrib/test_parser/.gitignore +++ b/contrib/test_parser/.gitignore @@ -1 +1,3 @@ /test_parser.sql +# Generated subdirectories +/results/ diff --git a/contrib/tsearch2/.gitignore b/contrib/tsearch2/.gitignore index b5da0e9f7d..1d34309d00 100644 --- a/contrib/tsearch2/.gitignore +++ b/contrib/tsearch2/.gitignore @@ -1 +1,3 @@ /tsearch2.sql +# Generated subdirectories +/results/ diff --git a/contrib/unaccent/.gitignore b/contrib/unaccent/.gitignore index 30a8749048..6d74a7617f 100644 --- a/contrib/unaccent/.gitignore +++ b/contrib/unaccent/.gitignore @@ -1 +1,3 @@ /unaccent.sql +# Generated subdirectories +/results/ diff --git a/contrib/xml2/.gitignore b/contrib/xml2/.gitignore new file mode 100644 index 0000000000..19b6c5ba42 --- /dev/null +++ b/contrib/xml2/.gitignore @@ -0,0 +1,2 @@ +# Generated subdirectories +/results/ diff --git a/src/pl/plperl/.gitignore b/src/pl/plperl/.gitignore index 4ee7d6095b..c04f42ba07 100644 --- a/src/pl/plperl/.gitignore +++ b/src/pl/plperl/.gitignore @@ -2,3 +2,6 @@ /Util.c /perlchunks.h /plperl_opmask.h + +# Generated subdirectories +/results/ diff --git a/src/pl/plpython/.gitignore b/src/pl/plpython/.gitignore new file mode 100644 index 0000000000..19b6c5ba42 --- /dev/null +++ b/src/pl/plpython/.gitignore @@ -0,0 +1,2 @@ +# Generated subdirectories +/results/ diff --git a/src/pl/tcl/.gitignore b/src/pl/tcl/.gitignore new file mode 100644 index 0000000000..19b6c5ba42 --- /dev/null +++ b/src/pl/tcl/.gitignore @@ -0,0 +1,2 @@ +# Generated subdirectories +/results/ diff --git a/src/pl/tcl/modules/.gitignore b/src/pl/tcl/modules/.gitignore new file mode 100644 index 0000000000..89581887c4 --- /dev/null +++ b/src/pl/tcl/modules/.gitignore @@ -0,0 +1,3 @@ +/pltcl_delmod +/pltcl_listmod +/pltcl_loadmod -- cgit v1.2.3 From 0a8ed2cdb4f7a34f65976a87a2b08a39df17939a Mon Sep 17 00:00:00 2001 From: Robert Haas Date: Thu, 23 Sep 2010 22:00:26 -0400 Subject: Add contrib/xml2/pgxml.sql to .gitignore Kevin Grittner --- contrib/xml2/.gitignore | 1 + 1 file changed, 1 insertion(+) (limited to 'contrib/xml2') diff --git a/contrib/xml2/.gitignore b/contrib/xml2/.gitignore index 19b6c5ba42..5ef9dbf4d4 100644 --- a/contrib/xml2/.gitignore +++ b/contrib/xml2/.gitignore @@ -1,2 +1,3 @@ +/pgxml.sql # Generated subdirectories /results/ -- cgit v1.2.3 From fc946c39aeacdff7df60c83fca6582985e8546c8 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Tue, 23 Nov 2010 22:27:50 +0200 Subject: Remove useless whitespace at end of lines --- README | 2 +- config/ac_func_accept_argtypes.m4 | 4 +- config/general.m4 | 2 +- configure.in | 28 +- contrib/README | 6 +- contrib/btree_gin/Makefile | 2 +- contrib/btree_gin/expected/cidr.out | 2 +- contrib/btree_gin/expected/date.out | 2 +- contrib/btree_gin/expected/inet.out | 2 +- contrib/btree_gin/expected/interval.out | 2 +- contrib/btree_gin/expected/macaddr.out | 2 +- contrib/btree_gin/expected/time.out | 2 +- contrib/btree_gin/expected/timestamp.out | 2 +- contrib/btree_gin/expected/timestamptz.out | 2 +- contrib/btree_gin/expected/timetz.out | 2 +- contrib/btree_gin/sql/cidr.sql | 2 +- contrib/btree_gin/sql/date.sql | 2 +- contrib/btree_gin/sql/inet.sql | 2 +- contrib/btree_gin/sql/interval.sql | 2 +- contrib/btree_gin/sql/macaddr.sql | 2 +- contrib/btree_gin/sql/time.sql | 2 +- contrib/btree_gin/sql/timestamp.sql | 2 +- contrib/btree_gin/sql/timestamptz.sql | 2 +- contrib/btree_gin/sql/timetz.sql | 2 +- contrib/btree_gist/btree_gist.sql.in | 84 +-- contrib/btree_gist/uninstall_btree_gist.sql | 18 +- contrib/citext/citext.sql.in | 2 +- contrib/citext/expected/citext.out | 4 +- contrib/citext/expected/citext_1.out | 4 +- contrib/citext/sql/citext.sql | 4 +- contrib/cube/CHANGES | 4 +- contrib/cube/cube.sql.in | 10 +- contrib/cube/cubeparse.y | 32 +- contrib/cube/cubescan.l | 6 +- contrib/cube/expected/cube.out | 12 +- contrib/cube/expected/cube_1.out | 12 +- contrib/cube/expected/cube_2.out | 12 +- contrib/cube/sql/cube.sql | 12 +- contrib/dblink/Makefile | 4 +- contrib/dblink/dblink.sql.in | 4 +- contrib/dblink/expected/dblink.out | 8 +- contrib/dblink/sql/dblink.sql | 8 +- contrib/earthdistance/earthdistance.sql.in | 4 +- contrib/fuzzystrmatch/fuzzystrmatch.sql.in | 4 +- contrib/hstore/expected/hstore.out | 2 +- contrib/hstore/sql/hstore.sql | 2 +- contrib/intarray/Makefile | 2 +- contrib/intarray/bench/bench.pl | 22 +- contrib/intarray/bench/create_test.pl | 4 +- contrib/isn/ISBN.h | 2 +- contrib/ltree/ltree.sql.in | 6 +- contrib/ltree/uninstall_ltree.sql | 2 +- contrib/pg_buffercache/Makefile | 6 +- contrib/pg_buffercache/pg_buffercache.sql.in | 4 +- contrib/pg_freespacemap/Makefile | 6 +- contrib/pg_trgm/pg_trgm.sql.in | 2 +- contrib/pg_trgm/uninstall_pg_trgm.sql | 2 +- contrib/pg_upgrade/IMPLEMENTATION | 2 +- contrib/pg_upgrade/TESTING | 10 +- contrib/pg_upgrade/relfilenode.c | 2 +- contrib/pgcrypto/expected/blowfish.out | 8 +- contrib/pgcrypto/expected/crypt-blowfish.out | 2 +- contrib/pgcrypto/expected/rijndael.out | 8 +- contrib/pgcrypto/rijndael.tbl | 2 +- contrib/pgcrypto/sql/blowfish.sql | 8 +- contrib/pgcrypto/sql/crypt-blowfish.sql | 2 +- contrib/pgcrypto/sql/rijndael.sql | 8 +- contrib/seg/expected/seg.out | 4 +- contrib/seg/expected/seg_1.out | 4 +- contrib/seg/seg.sql.in | 12 +- contrib/seg/segparse.y | 6 +- contrib/seg/segscan.l | 6 +- contrib/seg/sort-segments.pl | 2 +- contrib/seg/sql/seg.sql | 4 +- contrib/spi/autoinc.example | 10 +- contrib/spi/autoinc.sql.in | 4 +- contrib/spi/insert_username.example | 2 +- contrib/spi/insert_username.sql.in | 4 +- contrib/spi/moddatetime.example | 2 +- contrib/spi/refint.example | 10 +- contrib/spi/timetravel.example | 18 +- contrib/spi/timetravel.sql.in | 12 +- contrib/start-scripts/osx/PostgreSQL | 4 +- contrib/test_parser/expected/test_parser.out | 2 +- contrib/test_parser/sql/test_parser.sql | 2 +- contrib/tsearch2/expected/tsearch2.out | 8 +- contrib/tsearch2/expected/tsearch2_1.out | 8 +- contrib/tsearch2/sql/tsearch2.sql | 10 +- contrib/tsearch2/tsearch2.sql.in | 26 +- contrib/unaccent/Makefile | 2 +- contrib/xml2/expected/xml2.out | 2 +- contrib/xml2/expected/xml2_1.out | 2 +- contrib/xml2/sql/xml2.sql | 2 +- doc/bug.template | 2 +- doc/src/sgml/Makefile | 2 +- doc/src/sgml/auto-explain.sgml | 4 +- doc/src/sgml/biblio.sgml | 4 +- doc/src/sgml/charset.sgml | 2 +- doc/src/sgml/config.sgml | 76 +-- doc/src/sgml/contacts.sgml | 2 +- doc/src/sgml/contrib.sgml | 2 +- doc/src/sgml/datatype.sgml | 52 +- doc/src/sgml/datetime.sgml | 16 +- doc/src/sgml/dfunc.sgml | 6 +- doc/src/sgml/docguide.sgml | 28 +- doc/src/sgml/ecpg.sgml | 71 +- doc/src/sgml/extend.sgml | 14 +- doc/src/sgml/external-projects.sgml | 4 +- doc/src/sgml/filelist.sgml | 2 +- doc/src/sgml/func.sgml | 144 ++--- doc/src/sgml/history.sgml | 4 +- doc/src/sgml/info.sgml | 2 +- doc/src/sgml/install-windows.sgml | 14 +- doc/src/sgml/keywords.sgml | 2 +- doc/src/sgml/legal.sgml | 2 +- doc/src/sgml/libpq.sgml | 2 +- doc/src/sgml/lobj.sgml | 16 +- doc/src/sgml/mvcc.sgml | 8 +- doc/src/sgml/pgarchivecleanup.sgml | 2 +- doc/src/sgml/pgupgrade.sgml | 124 ++-- doc/src/sgml/plperl.sgml | 10 +- doc/src/sgml/pltcl.sgml | 4 +- doc/src/sgml/problems.sgml | 6 +- doc/src/sgml/ref/abort.sgml | 2 +- doc/src/sgml/ref/alter_aggregate.sgml | 8 +- doc/src/sgml/ref/alter_conversion.sgml | 8 +- doc/src/sgml/ref/alter_database.sgml | 8 +- doc/src/sgml/ref/alter_domain.sgml | 6 +- doc/src/sgml/ref/alter_function.sgml | 10 +- doc/src/sgml/ref/alter_group.sgml | 4 +- doc/src/sgml/ref/alter_index.sgml | 8 +- doc/src/sgml/ref/alter_language.sgml | 2 +- doc/src/sgml/ref/alter_large_object.sgml | 2 +- doc/src/sgml/ref/alter_opclass.sgml | 8 +- doc/src/sgml/ref/alter_operator.sgml | 10 +- doc/src/sgml/ref/alter_opfamily.sgml | 16 +- doc/src/sgml/ref/alter_schema.sgml | 2 +- doc/src/sgml/ref/alter_sequence.sgml | 2 +- doc/src/sgml/ref/alter_tablespace.sgml | 10 +- doc/src/sgml/ref/alter_tsconfig.sgml | 10 +- doc/src/sgml/ref/alter_tsdictionary.sgml | 14 +- doc/src/sgml/ref/alter_tsparser.sgml | 8 +- doc/src/sgml/ref/alter_tstemplate.sgml | 8 +- doc/src/sgml/ref/alter_user.sgml | 6 +- doc/src/sgml/ref/alter_view.sgml | 8 +- doc/src/sgml/ref/begin.sgml | 14 +- doc/src/sgml/ref/close.sgml | 6 +- doc/src/sgml/ref/clusterdb.sgml | 10 +- doc/src/sgml/ref/comment.sgml | 10 +- doc/src/sgml/ref/commit.sgml | 6 +- doc/src/sgml/ref/commit_prepared.sgml | 4 +- doc/src/sgml/ref/create_aggregate.sgml | 12 +- doc/src/sgml/ref/create_conversion.sgml | 4 +- doc/src/sgml/ref/create_function.sgml | 2 +- doc/src/sgml/ref/create_group.sgml | 12 +- doc/src/sgml/ref/create_opclass.sgml | 12 +- doc/src/sgml/ref/create_operator.sgml | 10 +- doc/src/sgml/ref/create_opfamily.sgml | 4 +- doc/src/sgml/ref/create_role.sgml | 14 +- doc/src/sgml/ref/create_sequence.sgml | 2 +- doc/src/sgml/ref/create_table_as.sgml | 4 +- doc/src/sgml/ref/create_tsconfig.sgml | 6 +- doc/src/sgml/ref/create_tsdictionary.sgml | 8 +- doc/src/sgml/ref/create_tsparser.sgml | 4 +- doc/src/sgml/ref/create_tstemplate.sgml | 4 +- doc/src/sgml/ref/create_user.sgml | 10 +- doc/src/sgml/ref/createdb.sgml | 10 +- doc/src/sgml/ref/createlang.sgml | 20 +- doc/src/sgml/ref/createuser.sgml | 14 +- doc/src/sgml/ref/drop_cast.sgml | 6 +- doc/src/sgml/ref/drop_conversion.sgml | 4 +- doc/src/sgml/ref/drop_database.sgml | 6 +- doc/src/sgml/ref/drop_domain.sgml | 6 +- doc/src/sgml/ref/drop_function.sgml | 6 +- doc/src/sgml/ref/drop_index.sgml | 2 +- doc/src/sgml/ref/drop_language.sgml | 8 +- doc/src/sgml/ref/drop_opclass.sgml | 10 +- doc/src/sgml/ref/drop_operator.sgml | 8 +- doc/src/sgml/ref/drop_opfamily.sgml | 6 +- doc/src/sgml/ref/drop_role.sgml | 6 +- doc/src/sgml/ref/drop_rule.sgml | 4 +- doc/src/sgml/ref/drop_schema.sgml | 12 +- doc/src/sgml/ref/drop_sequence.sgml | 12 +- doc/src/sgml/ref/drop_table.sgml | 14 +- doc/src/sgml/ref/drop_tablespace.sgml | 2 +- doc/src/sgml/ref/drop_trigger.sgml | 10 +- doc/src/sgml/ref/drop_tsconfig.sgml | 6 +- doc/src/sgml/ref/drop_tsdictionary.sgml | 6 +- doc/src/sgml/ref/drop_tsparser.sgml | 6 +- doc/src/sgml/ref/drop_tstemplate.sgml | 6 +- doc/src/sgml/ref/drop_type.sgml | 6 +- doc/src/sgml/ref/drop_view.sgml | 12 +- doc/src/sgml/ref/dropdb.sgml | 8 +- doc/src/sgml/ref/droplang.sgml | 20 +- doc/src/sgml/ref/dropuser.sgml | 12 +- doc/src/sgml/ref/ecpg-ref.sgml | 2 +- doc/src/sgml/ref/end.sgml | 6 +- doc/src/sgml/ref/fetch.sgml | 2 +- doc/src/sgml/ref/initdb.sgml | 10 +- doc/src/sgml/ref/lock.sgml | 8 +- doc/src/sgml/ref/move.sgml | 2 +- doc/src/sgml/ref/pg_config-ref.sgml | 2 +- doc/src/sgml/ref/pg_controldata.sgml | 4 +- doc/src/sgml/ref/pg_dumpall.sgml | 2 +- doc/src/sgml/ref/pg_resetxlog.sgml | 4 +- doc/src/sgml/ref/postgres-ref.sgml | 8 +- doc/src/sgml/ref/prepare.sgml | 2 +- doc/src/sgml/ref/reindexdb.sgml | 10 +- doc/src/sgml/ref/release_savepoint.sgml | 4 +- doc/src/sgml/ref/rollback_prepared.sgml | 4 +- doc/src/sgml/ref/savepoint.sgml | 6 +- doc/src/sgml/ref/security_label.sgml | 2 +- doc/src/sgml/ref/set.sgml | 4 +- doc/src/sgml/ref/values.sgml | 2 +- doc/src/sgml/regress.sgml | 28 +- doc/src/sgml/rowtypes.sgml | 4 +- doc/src/sgml/runtime.sgml | 16 +- doc/src/sgml/sql.sgml | 88 +-- doc/src/sgml/start.sgml | 2 +- doc/src/sgml/stylesheet.css | 2 +- doc/src/sgml/stylesheet.dsl | 32 +- doc/src/sgml/vacuumlo.sgml | 2 +- doc/src/sgml/wal.sgml | 2 +- doc/src/sgml/xindex.sgml | 8 +- doc/src/sgml/xoper.sgml | 2 +- doc/src/sgml/xtypes.sgml | 2 +- src/Makefile.global.in | 12 +- src/Makefile.shlib | 2 +- src/backend/Makefile | 4 +- src/backend/access/gin/README | 32 +- src/backend/access/gist/README | 52 +- src/backend/access/nbtree/README | 2 +- src/backend/access/transam/xlog.c | 2 +- src/backend/bootstrap/Makefile | 2 +- src/backend/catalog/information_schema.sql | 6 +- src/backend/catalog/objectaddress.c | 4 +- src/backend/catalog/system_views.sql | 354 +++++----- src/backend/commands/comment.c | 2 +- src/backend/commands/copy.c | 2 +- src/backend/commands/explain.c | 4 +- src/backend/commands/tablespace.c | 2 +- src/backend/libpq/README.SSL | 2 +- src/backend/nodes/README | 4 +- src/backend/optimizer/plan/README | 38 +- src/backend/parser/scan.l | 6 +- src/backend/port/Makefile | 6 +- src/backend/port/aix/mkldexport.sh | 4 +- src/backend/port/darwin/README | 2 +- src/backend/port/tas/sunstudio_sparc.s | 4 +- src/backend/snowball/Makefile | 2 +- src/backend/storage/buffer/README | 2 +- src/backend/storage/freespace/README | 2 +- src/backend/storage/ipc/README | 2 +- src/backend/storage/lmgr/Makefile | 2 +- src/backend/storage/lmgr/README | 4 +- src/backend/tsearch/wparser_def.c | 76 +-- src/backend/utils/Gen_fmgrtab.pl | 2 +- src/backend/utils/adt/numeric.c | 4 +- src/backend/utils/adt/varlena.c | 20 +- src/backend/utils/adt/xml.c | 6 +- src/backend/utils/mb/Unicode/UCS_to_EUC_CN.pl | 2 +- .../utils/mb/Unicode/UCS_to_EUC_JIS_2004.pl | 10 +- src/backend/utils/mb/Unicode/UCS_to_EUC_JP.pl | 2 +- src/backend/utils/mb/Unicode/UCS_to_EUC_KR.pl | 2 +- src/backend/utils/mb/Unicode/UCS_to_EUC_TW.pl | 2 +- .../utils/mb/Unicode/UCS_to_SHIFT_JIS_2004.pl | 8 +- src/backend/utils/mb/Unicode/UCS_to_SJIS.pl | 2 +- src/backend/utils/mb/Unicode/ucs2utf.pl | 4 +- src/backend/utils/misc/Makefile | 2 +- src/backend/utils/misc/check_guc | 22 +- src/backend/utils/misc/guc-file.l | 8 +- src/backend/utils/misc/postgresql.conf.sample | 12 +- src/backend/utils/mmgr/README | 2 +- src/bcc32.mak | 8 +- src/bin/pg_dump/README | 6 +- src/bin/pg_dump/pg_dump.c | 2 +- src/bin/psql/psqlscan.l | 6 +- src/include/catalog/objectaddress.h | 2 +- src/include/pg_config.h.win32 | 4 +- src/include/storage/s_lock.h | 2 +- src/interfaces/ecpg/README.dynSQL | 2 +- src/interfaces/ecpg/ecpglib/prepare.c | 2 +- src/interfaces/ecpg/preproc/Makefile | 2 +- src/interfaces/ecpg/preproc/check_rules.pl | 4 +- src/interfaces/ecpg/preproc/ecpg.addons | 4 +- src/interfaces/ecpg/preproc/ecpg.header | 2 +- src/interfaces/ecpg/preproc/ecpg.tokens | 4 +- src/interfaces/ecpg/preproc/ecpg.trailer | 14 +- src/interfaces/ecpg/preproc/ecpg.type | 2 +- src/interfaces/ecpg/preproc/parse.pl | 16 +- src/interfaces/ecpg/preproc/pgc.l | 44 +- src/interfaces/ecpg/test/Makefile.regress | 4 +- .../ecpg/test/compat_informix/describe.pgc | 2 +- src/interfaces/ecpg/test/compat_informix/sqlda.pgc | 2 +- .../ecpg/test/compat_informix/test_informix.pgc | 2 +- .../ecpg/test/compat_informix/test_informix2.pgc | 6 +- .../ecpg/test/expected/compat_informix-describe.c | 2 +- .../ecpg/test/expected/compat_informix-sqlda.c | 2 +- .../test/expected/compat_informix-test_informix.c | 2 +- .../test/expected/compat_informix-test_informix2.c | 4 +- .../ecpg/test/expected/pgtypeslib-dt_test.c | 12 +- .../ecpg/test/expected/preproc-array_of_struct.c | 2 +- src/interfaces/ecpg/test/expected/preproc-cursor.c | 2 +- src/interfaces/ecpg/test/expected/preproc-init.c | 4 +- .../ecpg/test/expected/preproc-outofscope.c | 2 +- .../ecpg/test/expected/preproc-variable.c | 2 +- .../ecpg/test/expected/preproc-whenever.c | 2 +- src/interfaces/ecpg/test/expected/sql-array.c | 4 +- src/interfaces/ecpg/test/expected/sql-code100.c | 10 +- src/interfaces/ecpg/test/expected/sql-describe.c | 2 +- src/interfaces/ecpg/test/expected/sql-dynalloc.c | 16 +- src/interfaces/ecpg/test/expected/sql-dynalloc2.c | 4 +- src/interfaces/ecpg/test/expected/sql-fetch.c | 2 +- src/interfaces/ecpg/test/expected/sql-sqlda.c | 2 +- src/interfaces/ecpg/test/pgtypeslib/dt_test.pgc | 12 +- .../ecpg/test/preproc/array_of_struct.pgc | 2 +- src/interfaces/ecpg/test/preproc/cursor.pgc | 2 +- src/interfaces/ecpg/test/preproc/init.pgc | 4 +- src/interfaces/ecpg/test/preproc/outofscope.pgc | 2 +- src/interfaces/ecpg/test/preproc/variable.pgc | 2 +- src/interfaces/ecpg/test/preproc/whenever.pgc | 2 +- src/interfaces/ecpg/test/sql/Makefile | 2 +- src/interfaces/ecpg/test/sql/array.pgc | 4 +- src/interfaces/ecpg/test/sql/code100.pgc | 12 +- src/interfaces/ecpg/test/sql/describe.pgc | 2 +- src/interfaces/ecpg/test/sql/dynalloc.pgc | 16 +- src/interfaces/ecpg/test/sql/dynalloc2.pgc | 4 +- src/interfaces/ecpg/test/sql/fetch.pgc | 2 +- src/interfaces/ecpg/test/sql/sqlda.pgc | 2 +- src/interfaces/libpq/bcc32.mak | 8 +- src/interfaces/libpq/pg_service.conf.sample | 4 +- src/interfaces/libpq/win32.mak | 10 +- src/makefiles/Makefile.darwin | 2 +- src/makefiles/Makefile.irix | 2 +- src/makefiles/pgxs.mk | 2 +- src/pl/plperl/GNUmakefile | 4 +- src/pl/plperl/SPI.xs | 18 +- src/pl/plperl/Util.xs | 4 +- src/pl/plperl/expected/plperl.out | 6 +- src/pl/plperl/expected/plperl_plperlu.out | 2 - src/pl/plperl/expected/plperl_trigger.out | 18 +- src/pl/plperl/plc_trusted.pl | 2 +- src/pl/plperl/plperl.c | 6 +- src/pl/plperl/sql/plperl.sql | 6 +- src/pl/plperl/sql/plperl_plperlu.sql | 4 +- src/pl/plperl/sql/plperl_trigger.sql | 20 +- src/pl/plperl/text2macro.pl | 2 +- src/pl/plpgsql/src/gram.y | 2 +- src/pl/plpython/expected/plpython_newline.out | 2 +- src/pl/plpython/expected/plpython_schema.out | 2 +- src/pl/plpython/expected/plpython_trigger.out | 2 +- src/pl/plpython/sql/plpython_newline.sql | 2 +- src/pl/plpython/sql/plpython_schema.sql | 2 +- src/pl/plpython/sql/plpython_trigger.sql | 2 +- src/pl/tcl/expected/pltcl_setup.out | 10 +- src/pl/tcl/sql/pltcl_setup.sql | 10 +- src/test/examples/Makefile | 2 +- src/test/locale/Makefile | 2 +- src/test/locale/README | 2 +- src/test/locale/de_DE.ISO8859-1/Makefile | 6 +- src/test/locale/gr_GR.ISO8859-7/Makefile | 6 +- src/test/locale/koi8-r/Makefile | 6 +- src/test/locale/koi8-to-win1251/Makefile | 6 +- src/test/mb/mbregress.sh | 2 +- src/test/performance/runtests.pl | 16 +- src/test/regress/GNUmakefile | 2 +- src/test/regress/expected/abstime.out | 6 +- src/test/regress/expected/aggregates.out | 4 +- src/test/regress/expected/alter_table.out | 14 +- src/test/regress/expected/arrays.out | 18 +- src/test/regress/expected/bit.out | 14 +- src/test/regress/expected/bitmapops.out | 2 +- src/test/regress/expected/boolean.out | 12 +- src/test/regress/expected/box.out | 46 +- src/test/regress/expected/char.out | 6 +- src/test/regress/expected/char_1.out | 6 +- src/test/regress/expected/char_2.out | 6 +- src/test/regress/expected/cluster.out | 2 +- src/test/regress/expected/copyselect.out | 2 +- src/test/regress/expected/create_aggregate.out | 4 +- src/test/regress/expected/create_index.out | 5 +- src/test/regress/expected/create_misc.out | 22 +- src/test/regress/expected/create_operator.out | 16 +- src/test/regress/expected/create_table.out | 16 +- src/test/regress/expected/create_type.out | 10 +- src/test/regress/expected/create_view.out | 12 +- src/test/regress/expected/drop_if_exists.out | 4 +- src/test/regress/expected/errors.out | 188 +++--- .../regress/expected/float4-exp-three-digits.out | 4 +- src/test/regress/expected/float4.out | 4 +- .../expected/float8-exp-three-digits-win32.out | 18 +- src/test/regress/expected/float8-small-is-zero.out | 18 +- .../regress/expected/float8-small-is-zero_1.out | 18 +- src/test/regress/expected/float8.out | 18 +- src/test/regress/expected/foreign_key.out | 20 +- src/test/regress/expected/hash_index.out | 16 +- src/test/regress/expected/inet.out | 2 +- src/test/regress/expected/inherit.out | 2 +- src/test/regress/expected/int2.out | 4 +- .../regress/expected/int8-exp-three-digits.out | 22 +- src/test/regress/expected/int8.out | 22 +- src/test/regress/expected/interval.out | 14 +- src/test/regress/expected/limit.out | 28 +- src/test/regress/expected/numeric.out | 14 +- src/test/regress/expected/oid.out | 2 +- src/test/regress/expected/oidjoins.out | 714 ++++++++++----------- src/test/regress/expected/plpgsql.out | 4 +- src/test/regress/expected/point.out | 16 +- src/test/regress/expected/polygon.out | 54 +- src/test/regress/expected/portals.out | 16 +- src/test/regress/expected/portals_p2.out | 26 +- src/test/regress/expected/rules.out | 20 +- src/test/regress/expected/select.out | 13 +- src/test/regress/expected/select_implicit.out | 20 +- src/test/regress/expected/select_implicit_1.out | 20 +- src/test/regress/expected/select_implicit_2.out | 20 +- src/test/regress/expected/sequence.out | 4 - src/test/regress/expected/sequence_1.out | 4 - src/test/regress/expected/subselect.out | 4 +- src/test/regress/expected/timestamp.out | 17 +- src/test/regress/expected/timestamptz.out | 29 +- src/test/regress/expected/tinterval.out | 4 +- src/test/regress/expected/transactions.out | 7 +- src/test/regress/expected/triggers.out | 82 ++- src/test/regress/expected/truncate.out | 4 +- src/test/regress/expected/tsdicts.out | 12 +- src/test/regress/expected/tsearch.out | 5 +- src/test/regress/expected/type_sanity.out | 2 +- src/test/regress/expected/varchar.out | 6 +- src/test/regress/expected/varchar_1.out | 6 +- src/test/regress/expected/varchar_2.out | 6 +- src/test/regress/expected/window.out | 14 +- src/test/regress/input/copy.source | 4 +- src/test/regress/input/create_function_2.source | 4 +- src/test/regress/input/misc.source | 14 +- src/test/regress/output/copy.source | 4 +- src/test/regress/output/create_function_2.source | 4 +- src/test/regress/output/misc.source | 14 +- src/test/regress/sql/abstime.sql | 6 +- src/test/regress/sql/aggregates.sql | 4 +- src/test/regress/sql/alter_table.sql | 14 +- src/test/regress/sql/arrays.sql | 18 +- src/test/regress/sql/bit.sql | 14 +- src/test/regress/sql/bitmapops.sql | 2 +- src/test/regress/sql/boolean.sql | 12 +- src/test/regress/sql/box.sql | 46 +- src/test/regress/sql/char.sql | 6 +- src/test/regress/sql/cluster.sql | 2 +- src/test/regress/sql/copyselect.sql | 2 +- src/test/regress/sql/create_aggregate.sql | 4 +- src/test/regress/sql/create_index.sql | 6 +- src/test/regress/sql/create_misc.sql | 22 +- src/test/regress/sql/create_operator.sql | 16 +- src/test/regress/sql/create_table.sql | 16 +- src/test/regress/sql/create_type.sql | 10 +- src/test/regress/sql/create_view.sql | 12 +- src/test/regress/sql/drop.sql | 12 +- src/test/regress/sql/drop_if_exists.sql | 4 +- src/test/regress/sql/errors.sql | 192 +++--- src/test/regress/sql/float4.sql | 4 +- src/test/regress/sql/float8.sql | 18 +- src/test/regress/sql/foreign_key.sql | 20 +- src/test/regress/sql/hash_index.sql | 16 +- src/test/regress/sql/hs_primary_extremes.sql | 16 +- src/test/regress/sql/inet.sql | 2 +- src/test/regress/sql/inherit.sql | 2 +- src/test/regress/sql/int2.sql | 4 +- src/test/regress/sql/int8.sql | 22 +- src/test/regress/sql/interval.sql | 14 +- src/test/regress/sql/limit.sql | 28 +- src/test/regress/sql/numeric.sql | 14 +- src/test/regress/sql/oid.sql | 2 +- src/test/regress/sql/oidjoins.sql | 714 ++++++++++----------- src/test/regress/sql/plpgsql.sql | 4 +- src/test/regress/sql/point.sql | 16 +- src/test/regress/sql/polygon.sql | 54 +- src/test/regress/sql/portals.sql | 16 +- src/test/regress/sql/portals_p2.sql | 26 +- src/test/regress/sql/rules.sql | 22 +- src/test/regress/sql/select.sql | 16 +- src/test/regress/sql/select_implicit.sql | 20 +- src/test/regress/sql/sequence.sql | 8 +- src/test/regress/sql/subselect.sql | 4 +- src/test/regress/sql/timestamp.sql | 18 +- src/test/regress/sql/timestamptz.sql | 34 +- src/test/regress/sql/tinterval.sql | 4 +- src/test/regress/sql/transactions.sql | 8 +- src/test/regress/sql/triggers.sql | 84 +-- src/test/regress/sql/truncate.sql | 4 +- src/test/regress/sql/tsdicts.sql | 12 +- src/test/regress/sql/tsearch.sql | 6 +- src/test/regress/sql/type_sanity.sql | 2 +- src/test/regress/sql/varchar.sql | 6 +- src/test/regress/sql/window.sql | 14 +- src/test/thread/README | 8 +- src/tools/RELEASE_CHANGES | 2 +- src/tools/backend/README | 2 +- src/tools/backend/backend_dirs.html | 2 +- src/tools/check_keywords.pl | 4 +- src/tools/editors/emacs.samples | 4 +- src/tools/entab/Makefile | 8 +- src/tools/entab/entab.man | 2 +- src/tools/find_static | 8 +- src/tools/find_typedef | 6 +- src/tools/make_diff/README | 4 +- src/tools/msvc/Mkvcbuild.pm | 4 +- src/tools/msvc/README | 8 +- src/tools/pginclude/pgrminclude | 6 +- src/tools/pgindent/README | 6 +- src/tools/pgindent/pgindent | 10 +- src/tools/pgtest | 10 +- src/tutorial/advanced.source | 2 +- src/tutorial/basics.source | 16 +- src/tutorial/complex.source | 12 +- src/tutorial/funcs.source | 14 +- src/tutorial/syscat.source | 24 +- src/win32.mak | 6 +- 517 files changed, 3463 insertions(+), 3508 deletions(-) (limited to 'contrib/xml2') diff --git a/README b/README index 0790fd21ab..49d55af5f6 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ PostgreSQL Database Management System ===================================== - + This directory contains the source code distribution of the PostgreSQL database management system. diff --git a/config/ac_func_accept_argtypes.m4 b/config/ac_func_accept_argtypes.m4 index 7a86ccaae5..7cb5cb3776 100644 --- a/config/ac_func_accept_argtypes.m4 +++ b/config/ac_func_accept_argtypes.m4 @@ -6,7 +6,7 @@ dnl @synopsis AC_FUNC_ACCEPT_ARGTYPES dnl dnl Checks the data types of the three arguments to accept(). Results are -dnl placed into the symbols ACCEPT_TYPE_RETURN and ACCEPT_TYPE_ARG[123], +dnl placed into the symbols ACCEPT_TYPE_RETURN and ACCEPT_TYPE_ARG[123], dnl consistent with the following example: dnl dnl #define ACCEPT_TYPE_RETURN int @@ -37,7 +37,7 @@ dnl # which is *not* 'socklen_t *'). If we detect that, then we assume # 'int' as the result, because that ought to work best. # -# On Win32, accept() returns 'unsigned int PASCAL' +# On Win32, accept() returns 'unsigned int PASCAL' AC_DEFUN([AC_FUNC_ACCEPT_ARGTYPES], [AC_MSG_CHECKING([types of arguments for accept()]) diff --git a/config/general.m4 b/config/general.m4 index eb83815931..95d65ceb09 100644 --- a/config/general.m4 +++ b/config/general.m4 @@ -90,7 +90,7 @@ dnl values. But we only want it to appear once in the help. We achieve dnl that by making the help string look the same, which is why we need to dnl save the default that was passed in previously. m4_define([_pgac_helpdefault], m4_ifdef([pgac_defined_$1_$2_bool], [m4_defn([pgac_defined_$1_$2_bool])], [$3]))dnl -PGAC_ARG([$1], [$2], [m4_if(_pgac_helpdefault, yes, -)], [$4], [$5], [$6], +PGAC_ARG([$1], [$2], [m4_if(_pgac_helpdefault, yes, -)], [$4], [$5], [$6], [AC_MSG_ERROR([no argument expected for --$1-$2 option])], [m4_case([$3], yes, [pgac_arg_to_variable([$1], [$2])=yes diff --git a/configure.in b/configure.in index 4bfa459903..3a0d43f808 100644 --- a/configure.in +++ b/configure.in @@ -230,7 +230,7 @@ AC_SUBST(enable_coverage) # PGAC_ARG_BOOL(enable, dtrace, no, [build with DTrace support], -[AC_DEFINE([ENABLE_DTRACE], 1, +[AC_DEFINE([ENABLE_DTRACE], 1, [Define to 1 to enable DTrace support. (--enable-dtrace)]) AC_CHECK_PROGS(DTRACE, dtrace) if test -z "$DTRACE"; then @@ -262,14 +262,14 @@ AC_DEFINE_UNQUOTED([BLCKSZ], ${BLCKSZ}, [ can set it bigger if you need bigger tuples (although TOAST should reduce the need to have large tuples, since fields can be spread across multiple tuples). - + BLCKSZ must be a power of 2. The maximum possible value of BLCKSZ is currently 2^15 (32768). This is determined by the 15-bit widths of the lp_off and lp_len fields in ItemIdData (see include/storage/itemid.h). - + Changing BLCKSZ requires an initdb. -]) +]) # # Relation segment size @@ -288,7 +288,7 @@ AC_DEFINE_UNQUOTED([RELSEG_SIZE], ${RELSEG_SIZE}, [ RELSEG_SIZE is the maximum number of blocks allowed in one disk file. Thus, the maximum size of a single file is RELSEG_SIZE * BLCKSZ; relations bigger than that are divided into multiple files. - + RELSEG_SIZE * BLCKSZ must be less than your OS' limit on file size. This is often 2 GB or 4GB in a 32-bit operating system, unless you have large file support enabled. By default, we make the limit 1 GB @@ -329,7 +329,7 @@ AC_DEFINE_UNQUOTED([XLOG_BLCKSZ], ${XLOG_BLCKSZ}, [ buffers, else direct I/O may fail. Changing XLOG_BLCKSZ requires an initdb. -]) +]) # # WAL segment size @@ -461,7 +461,7 @@ fi # enable profiling if --enable-profiling if test "$enable_profiling" = yes && test "$ac_cv_prog_cc_g" = yes; then if test "$GCC" = yes; then - AC_DEFINE([PROFILE_PID_DIR], 1, + AC_DEFINE([PROFILE_PID_DIR], 1, [Define to 1 to allow profiling output to be saved separately for each process.]) CFLAGS="$CFLAGS -pg $PLATFORM_PROFILE_FLAGS" else @@ -1141,7 +1141,7 @@ if test "$with_krb5" = yes; then AC_MSG_CHECKING(for krb5_free_unparsed_name) AC_TRY_LINK([#include ], [krb5_free_unparsed_name(NULL,NULL);], - [AC_DEFINE(HAVE_KRB5_FREE_UNPARSED_NAME, 1, [Define to 1 if you have krb5_free_unparsed_name]) + [AC_DEFINE(HAVE_KRB5_FREE_UNPARSED_NAME, 1, [Define to 1 if you have krb5_free_unparsed_name]) AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no)]) fi @@ -1156,8 +1156,8 @@ AC_SYS_LARGEFILE AC_CHECK_SIZEOF([off_t]) # If we don't have largefile support, can't handle segsize >= 2GB. -if test "$ac_cv_sizeof_off_t" -lt 8 -a "$segsize" != "1"; then - AC_MSG_ERROR([Large file support is not enabled. Segment size cannot be larger than 1GB.]) +if test "$ac_cv_sizeof_off_t" -lt 8 -a "$segsize" != "1"; then + AC_MSG_ERROR([Large file support is not enabled. Segment size cannot be larger than 1GB.]) fi @@ -1228,8 +1228,8 @@ if test "$PORTNAME" = "win32"; then # # To properly translate all NLS languages strings, we must support the # *printf() %$ format, which allows *printf() arguments to be selected - # by position in the translated string. - # + # by position in the translated string. + # # libintl versions < 0.13 use the native *printf() functions, and Win32 # *printf() doesn't understand %$, so we must use our /port versions, # which do understand %$. libintl versions >= 0.13 include their own @@ -1590,7 +1590,7 @@ AC_CHECK_SIZEOF([size_t]) AC_CHECK_SIZEOF([long]) # Decide whether float4 is passed by value: user-selectable, enabled by default -AC_MSG_CHECKING([whether to build with float4 passed by value]) +AC_MSG_CHECKING([whether to build with float4 passed by value]) PGAC_ARG_BOOL(enable, float4-byval, yes, [disable float4 passed by value], [AC_DEFINE([USE_FLOAT4_BYVAL], 1, [Define to 1 if you want float4 values to be passed by value. (--enable-float4-byval)]) @@ -1858,7 +1858,7 @@ AC_CONFIG_LINKS([ if test "$PORTNAME" = "win32"; then AC_CONFIG_COMMANDS([check_win32_symlinks],[ -# Links sometimes fail undetected on Mingw - +# Links sometimes fail undetected on Mingw - # so here we detect it and warn the user for FILE in $CONFIG_LINKS do diff --git a/contrib/README b/contrib/README index a04c04346e..6d29cfe2b3 100644 --- a/contrib/README +++ b/contrib/README @@ -90,13 +90,13 @@ isn - lo - Large Object maintenance - by Peter Mount + by Peter Mount ltree - Tree-like data structures by Teodor Sigaev and Oleg Bartunov -oid2name - +oid2name - Maps numeric files to table names by B Palmer @@ -161,7 +161,7 @@ sslinfo - Functions to get information about SSL certificates by Victor Wagner -start-scripts - +start-scripts - Scripts for starting the server at boot time on various platforms. tablefunc - diff --git a/contrib/btree_gin/Makefile b/contrib/btree_gin/Makefile index cba68af595..8bc53f72da 100644 --- a/contrib/btree_gin/Makefile +++ b/contrib/btree_gin/Makefile @@ -1,7 +1,7 @@ # contrib/btree_gin/Makefile MODULE_big = btree_gin -OBJS = btree_gin.o +OBJS = btree_gin.o DATA_built = btree_gin.sql DATA = uninstall_btree_gin.sql diff --git a/contrib/btree_gin/expected/cidr.out b/contrib/btree_gin/expected/cidr.out index 28ff9195b1..3d1198a4d7 100644 --- a/contrib/btree_gin/expected/cidr.out +++ b/contrib/btree_gin/expected/cidr.out @@ -2,7 +2,7 @@ set enable_seqscan=off; CREATE TABLE test_cidr ( i cidr ); -INSERT INTO test_cidr VALUES +INSERT INTO test_cidr VALUES ( '1.2.3.4' ), ( '1.2.4.4' ), ( '1.2.5.4' ), diff --git a/contrib/btree_gin/expected/date.out b/contrib/btree_gin/expected/date.out index 8da6ee4843..40dfa308cf 100644 --- a/contrib/btree_gin/expected/date.out +++ b/contrib/btree_gin/expected/date.out @@ -2,7 +2,7 @@ set enable_seqscan=off; CREATE TABLE test_date ( i date ); -INSERT INTO test_date VALUES +INSERT INTO test_date VALUES ( '2004-10-23' ), ( '2004-10-24' ), ( '2004-10-25' ), diff --git a/contrib/btree_gin/expected/inet.out b/contrib/btree_gin/expected/inet.out index bb2eaafc7f..aa6147fb7d 100644 --- a/contrib/btree_gin/expected/inet.out +++ b/contrib/btree_gin/expected/inet.out @@ -2,7 +2,7 @@ set enable_seqscan=off; CREATE TABLE test_inet ( i inet ); -INSERT INTO test_inet VALUES +INSERT INTO test_inet VALUES ( '1.2.3.4/16' ), ( '1.2.4.4/16' ), ( '1.2.5.4/16' ), diff --git a/contrib/btree_gin/expected/interval.out b/contrib/btree_gin/expected/interval.out index a3b99c1f28..1f6ef54070 100644 --- a/contrib/btree_gin/expected/interval.out +++ b/contrib/btree_gin/expected/interval.out @@ -2,7 +2,7 @@ set enable_seqscan=off; CREATE TABLE test_interval ( i interval ); -INSERT INTO test_interval VALUES +INSERT INTO test_interval VALUES ( '03:55:08' ), ( '04:55:08' ), ( '05:55:08' ), diff --git a/contrib/btree_gin/expected/macaddr.out b/contrib/btree_gin/expected/macaddr.out index d26d1f9ad3..ebceb01862 100644 --- a/contrib/btree_gin/expected/macaddr.out +++ b/contrib/btree_gin/expected/macaddr.out @@ -2,7 +2,7 @@ set enable_seqscan=off; CREATE TABLE test_macaddr ( i macaddr ); -INSERT INTO test_macaddr VALUES +INSERT INTO test_macaddr VALUES ( '22:00:5c:03:55:08' ), ( '22:00:5c:04:55:08' ), ( '22:00:5c:05:55:08' ), diff --git a/contrib/btree_gin/expected/time.out b/contrib/btree_gin/expected/time.out index bf65946835..be6b084038 100644 --- a/contrib/btree_gin/expected/time.out +++ b/contrib/btree_gin/expected/time.out @@ -2,7 +2,7 @@ set enable_seqscan=off; CREATE TABLE test_time ( i time ); -INSERT INTO test_time VALUES +INSERT INTO test_time VALUES ( '03:55:08' ), ( '04:55:08' ), ( '05:55:08' ), diff --git a/contrib/btree_gin/expected/timestamp.out b/contrib/btree_gin/expected/timestamp.out index 00b0b66106..a236cdc94a 100644 --- a/contrib/btree_gin/expected/timestamp.out +++ b/contrib/btree_gin/expected/timestamp.out @@ -2,7 +2,7 @@ set enable_seqscan=off; CREATE TABLE test_timestamp ( i timestamp ); -INSERT INTO test_timestamp VALUES +INSERT INTO test_timestamp VALUES ( '2004-10-26 03:55:08' ), ( '2004-10-26 04:55:08' ), ( '2004-10-26 05:55:08' ), diff --git a/contrib/btree_gin/expected/timestamptz.out b/contrib/btree_gin/expected/timestamptz.out index 8550d6b4d9..d53963d2a0 100644 --- a/contrib/btree_gin/expected/timestamptz.out +++ b/contrib/btree_gin/expected/timestamptz.out @@ -2,7 +2,7 @@ set enable_seqscan=off; CREATE TABLE test_timestamptz ( i timestamptz ); -INSERT INTO test_timestamptz VALUES +INSERT INTO test_timestamptz VALUES ( '2004-10-26 03:55:08' ), ( '2004-10-26 04:55:08' ), ( '2004-10-26 05:55:08' ), diff --git a/contrib/btree_gin/expected/timetz.out b/contrib/btree_gin/expected/timetz.out index 184bc310f6..45aee71371 100644 --- a/contrib/btree_gin/expected/timetz.out +++ b/contrib/btree_gin/expected/timetz.out @@ -2,7 +2,7 @@ set enable_seqscan=off; CREATE TABLE test_timetz ( i timetz ); -INSERT INTO test_timetz VALUES +INSERT INTO test_timetz VALUES ( '03:55:08 GMT+2' ), ( '04:55:08 GMT+2' ), ( '05:55:08 GMT+2' ), diff --git a/contrib/btree_gin/sql/cidr.sql b/contrib/btree_gin/sql/cidr.sql index a608a3ec78..4a76e5f10b 100644 --- a/contrib/btree_gin/sql/cidr.sql +++ b/contrib/btree_gin/sql/cidr.sql @@ -4,7 +4,7 @@ CREATE TABLE test_cidr ( i cidr ); -INSERT INTO test_cidr VALUES +INSERT INTO test_cidr VALUES ( '1.2.3.4' ), ( '1.2.4.4' ), ( '1.2.5.4' ), diff --git a/contrib/btree_gin/sql/date.sql b/contrib/btree_gin/sql/date.sql index c486f272a4..35086f6b81 100644 --- a/contrib/btree_gin/sql/date.sql +++ b/contrib/btree_gin/sql/date.sql @@ -4,7 +4,7 @@ CREATE TABLE test_date ( i date ); -INSERT INTO test_date VALUES +INSERT INTO test_date VALUES ( '2004-10-23' ), ( '2004-10-24' ), ( '2004-10-25' ), diff --git a/contrib/btree_gin/sql/inet.sql b/contrib/btree_gin/sql/inet.sql index fadc1c47ec..e5ec087856 100644 --- a/contrib/btree_gin/sql/inet.sql +++ b/contrib/btree_gin/sql/inet.sql @@ -4,7 +4,7 @@ CREATE TABLE test_inet ( i inet ); -INSERT INTO test_inet VALUES +INSERT INTO test_inet VALUES ( '1.2.3.4/16' ), ( '1.2.4.4/16' ), ( '1.2.5.4/16' ), diff --git a/contrib/btree_gin/sql/interval.sql b/contrib/btree_gin/sql/interval.sql index f245e4d4b3..e385158783 100644 --- a/contrib/btree_gin/sql/interval.sql +++ b/contrib/btree_gin/sql/interval.sql @@ -4,7 +4,7 @@ CREATE TABLE test_interval ( i interval ); -INSERT INTO test_interval VALUES +INSERT INTO test_interval VALUES ( '03:55:08' ), ( '04:55:08' ), ( '05:55:08' ), diff --git a/contrib/btree_gin/sql/macaddr.sql b/contrib/btree_gin/sql/macaddr.sql index e0402869a8..66566aa604 100644 --- a/contrib/btree_gin/sql/macaddr.sql +++ b/contrib/btree_gin/sql/macaddr.sql @@ -4,7 +4,7 @@ CREATE TABLE test_macaddr ( i macaddr ); -INSERT INTO test_macaddr VALUES +INSERT INTO test_macaddr VALUES ( '22:00:5c:03:55:08' ), ( '22:00:5c:04:55:08' ), ( '22:00:5c:05:55:08' ), diff --git a/contrib/btree_gin/sql/time.sql b/contrib/btree_gin/sql/time.sql index afb1e16ebf..62d709a846 100644 --- a/contrib/btree_gin/sql/time.sql +++ b/contrib/btree_gin/sql/time.sql @@ -4,7 +4,7 @@ CREATE TABLE test_time ( i time ); -INSERT INTO test_time VALUES +INSERT INTO test_time VALUES ( '03:55:08' ), ( '04:55:08' ), ( '05:55:08' ), diff --git a/contrib/btree_gin/sql/timestamp.sql b/contrib/btree_gin/sql/timestamp.sql index 6e00cd7e40..56727e81c4 100644 --- a/contrib/btree_gin/sql/timestamp.sql +++ b/contrib/btree_gin/sql/timestamp.sql @@ -4,7 +4,7 @@ CREATE TABLE test_timestamp ( i timestamp ); -INSERT INTO test_timestamp VALUES +INSERT INTO test_timestamp VALUES ( '2004-10-26 03:55:08' ), ( '2004-10-26 04:55:08' ), ( '2004-10-26 05:55:08' ), diff --git a/contrib/btree_gin/sql/timestamptz.sql b/contrib/btree_gin/sql/timestamptz.sql index 26c01ef804..e6cfdb1b07 100644 --- a/contrib/btree_gin/sql/timestamptz.sql +++ b/contrib/btree_gin/sql/timestamptz.sql @@ -4,7 +4,7 @@ CREATE TABLE test_timestamptz ( i timestamptz ); -INSERT INTO test_timestamptz VALUES +INSERT INTO test_timestamptz VALUES ( '2004-10-26 03:55:08' ), ( '2004-10-26 04:55:08' ), ( '2004-10-26 05:55:08' ), diff --git a/contrib/btree_gin/sql/timetz.sql b/contrib/btree_gin/sql/timetz.sql index a72b105fc1..ca947b753e 100644 --- a/contrib/btree_gin/sql/timetz.sql +++ b/contrib/btree_gin/sql/timetz.sql @@ -4,7 +4,7 @@ CREATE TABLE test_timetz ( i timetz ); -INSERT INTO test_timetz VALUES +INSERT INTO test_timetz VALUES ( '03:55:08 GMT+2' ), ( '04:55:08 GMT+2' ), ( '05:55:08 GMT+2' ), diff --git a/contrib/btree_gist/btree_gist.sql.in b/contrib/btree_gist/btree_gist.sql.in index 339087018a..01cd30f2de 100644 --- a/contrib/btree_gist/btree_gist.sql.in +++ b/contrib/btree_gist/btree_gist.sql.in @@ -136,7 +136,7 @@ LANGUAGE C IMMUTABLE STRICT; -- Create the operator class CREATE OPERATOR CLASS gist_oid_ops -DEFAULT FOR TYPE oid USING gist +DEFAULT FOR TYPE oid USING gist AS OPERATOR 1 < , OPERATOR 2 <= , @@ -194,7 +194,7 @@ LANGUAGE C IMMUTABLE STRICT; -- Create the operator class CREATE OPERATOR CLASS gist_int2_ops -DEFAULT FOR TYPE int2 USING gist +DEFAULT FOR TYPE int2 USING gist AS OPERATOR 1 < , OPERATOR 2 <= , @@ -251,7 +251,7 @@ LANGUAGE C IMMUTABLE STRICT; -- Create the operator class CREATE OPERATOR CLASS gist_int4_ops -DEFAULT FOR TYPE int4 USING gist +DEFAULT FOR TYPE int4 USING gist AS OPERATOR 1 < , OPERATOR 2 <= , @@ -308,7 +308,7 @@ LANGUAGE C IMMUTABLE STRICT; -- Create the operator class CREATE OPERATOR CLASS gist_int8_ops -DEFAULT FOR TYPE int8 USING gist +DEFAULT FOR TYPE int8 USING gist AS OPERATOR 1 < , OPERATOR 2 <= , @@ -366,7 +366,7 @@ LANGUAGE C IMMUTABLE STRICT; -- Create the operator class CREATE OPERATOR CLASS gist_float4_ops -DEFAULT FOR TYPE float4 USING gist +DEFAULT FOR TYPE float4 USING gist AS OPERATOR 1 < , OPERATOR 2 <= , @@ -426,7 +426,7 @@ LANGUAGE C IMMUTABLE STRICT; -- Create the operator class CREATE OPERATOR CLASS gist_float8_ops -DEFAULT FOR TYPE float8 USING gist +DEFAULT FOR TYPE float8 USING gist AS OPERATOR 1 < , OPERATOR 2 <= , @@ -448,7 +448,7 @@ AS -- -- -- timestamp ops --- +-- -- -- @@ -461,7 +461,7 @@ CREATE OR REPLACE FUNCTION gbt_tstz_consistent(internal,timestamptz,int2,oid,int RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; - + CREATE OR REPLACE FUNCTION gbt_ts_compress(internal) RETURNS internal AS 'MODULE_PATHNAME' @@ -476,12 +476,12 @@ CREATE OR REPLACE FUNCTION gbt_ts_penalty(internal,internal,internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; - + CREATE OR REPLACE FUNCTION gbt_ts_picksplit(internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; - + CREATE OR REPLACE FUNCTION gbt_ts_union(bytea, internal) RETURNS gbtreekey16 AS 'MODULE_PATHNAME' @@ -494,7 +494,7 @@ LANGUAGE C IMMUTABLE STRICT; -- Create the operator class CREATE OPERATOR CLASS gist_timestamp_ops -DEFAULT FOR TYPE timestamp USING gist +DEFAULT FOR TYPE timestamp USING gist AS OPERATOR 1 < , OPERATOR 2 <= , @@ -514,7 +514,7 @@ AS -- Create the operator class CREATE OPERATOR CLASS gist_timestamptz_ops -DEFAULT FOR TYPE timestamptz USING gist +DEFAULT FOR TYPE timestamptz USING gist AS OPERATOR 1 < , OPERATOR 2 <= , @@ -536,7 +536,7 @@ AS -- -- -- time ops --- +-- -- -- @@ -564,12 +564,12 @@ CREATE OR REPLACE FUNCTION gbt_time_penalty(internal,internal,internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; - + CREATE OR REPLACE FUNCTION gbt_time_picksplit(internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; - + CREATE OR REPLACE FUNCTION gbt_time_union(bytea, internal) RETURNS gbtreekey16 AS 'MODULE_PATHNAME' @@ -582,7 +582,7 @@ LANGUAGE C IMMUTABLE STRICT; -- Create the operator class CREATE OPERATOR CLASS gist_time_ops -DEFAULT FOR TYPE time USING gist +DEFAULT FOR TYPE time USING gist AS OPERATOR 1 < , OPERATOR 2 <= , @@ -600,7 +600,7 @@ AS STORAGE gbtreekey16; CREATE OPERATOR CLASS gist_timetz_ops -DEFAULT FOR TYPE timetz USING gist +DEFAULT FOR TYPE timetz USING gist AS OPERATOR 1 < , OPERATOR 2 <= , @@ -622,7 +622,7 @@ AS -- -- -- date ops --- +-- -- -- @@ -640,12 +640,12 @@ CREATE OR REPLACE FUNCTION gbt_date_penalty(internal,internal,internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; - + CREATE OR REPLACE FUNCTION gbt_date_picksplit(internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; - + CREATE OR REPLACE FUNCTION gbt_date_union(bytea, internal) RETURNS gbtreekey8 AS 'MODULE_PATHNAME' @@ -658,7 +658,7 @@ LANGUAGE C IMMUTABLE STRICT; -- Create the operator class CREATE OPERATOR CLASS gist_date_ops -DEFAULT FOR TYPE date USING gist +DEFAULT FOR TYPE date USING gist AS OPERATOR 1 < , OPERATOR 2 <= , @@ -680,7 +680,7 @@ AS -- -- -- interval ops --- +-- -- -- @@ -703,12 +703,12 @@ CREATE OR REPLACE FUNCTION gbt_intv_penalty(internal,internal,internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; - + CREATE OR REPLACE FUNCTION gbt_intv_picksplit(internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; - + CREATE OR REPLACE FUNCTION gbt_intv_union(bytea, internal) RETURNS gbtreekey32 AS 'MODULE_PATHNAME' @@ -721,7 +721,7 @@ LANGUAGE C IMMUTABLE STRICT; -- Create the operator class CREATE OPERATOR CLASS gist_interval_ops -DEFAULT FOR TYPE interval USING gist +DEFAULT FOR TYPE interval USING gist AS OPERATOR 1 < , OPERATOR 2 <= , @@ -778,7 +778,7 @@ LANGUAGE C IMMUTABLE STRICT; -- Create the operator class CREATE OPERATOR CLASS gist_cash_ops -DEFAULT FOR TYPE money USING gist +DEFAULT FOR TYPE money USING gist AS OPERATOR 1 < , OPERATOR 2 <= , @@ -835,7 +835,7 @@ LANGUAGE C IMMUTABLE STRICT; -- Create the operator class CREATE OPERATOR CLASS gist_macaddr_ops -DEFAULT FOR TYPE macaddr USING gist +DEFAULT FOR TYPE macaddr USING gist AS OPERATOR 1 < , OPERATOR 2 <= , @@ -904,7 +904,7 @@ LANGUAGE C IMMUTABLE STRICT; -- Create the operator class CREATE OPERATOR CLASS gist_text_ops -DEFAULT FOR TYPE text USING gist +DEFAULT FOR TYPE text USING gist AS OPERATOR 1 < , OPERATOR 2 <= , @@ -919,12 +919,12 @@ AS FUNCTION 5 gbt_text_penalty (internal, internal, internal), FUNCTION 6 gbt_text_picksplit (internal, internal), FUNCTION 7 gbt_text_same (internal, internal, internal), - STORAGE gbtreekey_var; + STORAGE gbtreekey_var; ---- Create the operator class CREATE OPERATOR CLASS gist_bpchar_ops -DEFAULT FOR TYPE bpchar USING gist +DEFAULT FOR TYPE bpchar USING gist AS OPERATOR 1 < , OPERATOR 2 <= , @@ -939,7 +939,7 @@ AS FUNCTION 5 gbt_text_penalty (internal, internal, internal), FUNCTION 6 gbt_text_picksplit (internal, internal), FUNCTION 7 gbt_text_same (internal, internal, internal), - STORAGE gbtreekey_var; + STORAGE gbtreekey_var; @@ -982,7 +982,7 @@ LANGUAGE C IMMUTABLE STRICT; -- Create the operator class CREATE OPERATOR CLASS gist_bytea_ops -DEFAULT FOR TYPE bytea USING gist +DEFAULT FOR TYPE bytea USING gist AS OPERATOR 1 < , OPERATOR 2 <= , @@ -997,7 +997,7 @@ AS FUNCTION 5 gbt_bytea_penalty (internal, internal, internal), FUNCTION 6 gbt_bytea_picksplit (internal, internal), FUNCTION 7 gbt_bytea_same (internal, internal, internal), - STORAGE gbtreekey_var; + STORAGE gbtreekey_var; -- @@ -1040,7 +1040,7 @@ LANGUAGE C IMMUTABLE STRICT; -- Create the operator class CREATE OPERATOR CLASS gist_numeric_ops -DEFAULT FOR TYPE numeric USING gist +DEFAULT FOR TYPE numeric USING gist AS OPERATOR 1 < , OPERATOR 2 <= , @@ -1055,7 +1055,7 @@ AS FUNCTION 5 gbt_numeric_penalty (internal, internal, internal), FUNCTION 6 gbt_numeric_picksplit (internal, internal), FUNCTION 7 gbt_numeric_same (internal, internal, internal), - STORAGE gbtreekey_var; + STORAGE gbtreekey_var; -- -- @@ -1096,7 +1096,7 @@ LANGUAGE C IMMUTABLE STRICT; -- Create the operator class CREATE OPERATOR CLASS gist_bit_ops -DEFAULT FOR TYPE bit USING gist +DEFAULT FOR TYPE bit USING gist AS OPERATOR 1 < , OPERATOR 2 <= , @@ -1111,12 +1111,12 @@ AS FUNCTION 5 gbt_bit_penalty (internal, internal, internal), FUNCTION 6 gbt_bit_picksplit (internal, internal), FUNCTION 7 gbt_bit_same (internal, internal, internal), - STORAGE gbtreekey_var; + STORAGE gbtreekey_var; -- Create the operator class CREATE OPERATOR CLASS gist_vbit_ops -DEFAULT FOR TYPE varbit USING gist +DEFAULT FOR TYPE varbit USING gist AS OPERATOR 1 < , OPERATOR 2 <= , @@ -1131,7 +1131,7 @@ AS FUNCTION 5 gbt_bit_penalty (internal, internal, internal), FUNCTION 6 gbt_bit_picksplit (internal, internal), FUNCTION 7 gbt_bit_same (internal, internal, internal), - STORAGE gbtreekey_var; + STORAGE gbtreekey_var; @@ -1175,7 +1175,7 @@ LANGUAGE C IMMUTABLE STRICT; -- Create the operator class CREATE OPERATOR CLASS gist_inet_ops -DEFAULT FOR TYPE inet USING gist +DEFAULT FOR TYPE inet USING gist AS OPERATOR 1 < , OPERATOR 2 <= , @@ -1194,14 +1194,14 @@ AS -- Create the operator class CREATE OPERATOR CLASS gist_cidr_ops -DEFAULT FOR TYPE cidr USING gist +DEFAULT FOR TYPE cidr USING gist AS OPERATOR 1 < (inet, inet) , OPERATOR 2 <= (inet, inet) , OPERATOR 3 = (inet, inet) , OPERATOR 4 >= (inet, inet) , OPERATOR 5 > (inet, inet) , - OPERATOR 6 <> (inet, inet) , + OPERATOR 6 <> (inet, inet) , FUNCTION 1 gbt_inet_consistent (internal, inet, int2, oid, internal), FUNCTION 2 gbt_inet_union (bytea, internal), FUNCTION 3 gbt_inet_compress (internal), diff --git a/contrib/btree_gist/uninstall_btree_gist.sql b/contrib/btree_gist/uninstall_btree_gist.sql index 4163730e85..30b9da4c73 100644 --- a/contrib/btree_gist/uninstall_btree_gist.sql +++ b/contrib/btree_gist/uninstall_btree_gist.sql @@ -116,9 +116,9 @@ DROP OPERATOR CLASS gist_interval_ops USING gist; DROP FUNCTION gbt_intv_same(internal, internal, internal); DROP FUNCTION gbt_intv_union(bytea, internal); - + DROP FUNCTION gbt_intv_picksplit(internal, internal); - + DROP FUNCTION gbt_intv_penalty(internal,internal,internal); DROP FUNCTION gbt_intv_decompress(internal); @@ -132,9 +132,9 @@ DROP OPERATOR CLASS gist_date_ops USING gist; DROP FUNCTION gbt_date_same(internal, internal, internal); DROP FUNCTION gbt_date_union(bytea, internal); - + DROP FUNCTION gbt_date_picksplit(internal, internal); - + DROP FUNCTION gbt_date_penalty(internal,internal,internal); DROP FUNCTION gbt_date_compress(internal); @@ -148,9 +148,9 @@ DROP OPERATOR CLASS gist_time_ops USING gist; DROP FUNCTION gbt_time_same(internal, internal, internal); DROP FUNCTION gbt_time_union(bytea, internal); - + DROP FUNCTION gbt_time_picksplit(internal, internal); - + DROP FUNCTION gbt_time_penalty(internal,internal,internal); DROP FUNCTION gbt_timetz_compress(internal); @@ -168,15 +168,15 @@ DROP OPERATOR CLASS gist_timestamp_ops USING gist; DROP FUNCTION gbt_ts_same(internal, internal, internal); DROP FUNCTION gbt_ts_union(bytea, internal); - + DROP FUNCTION gbt_ts_picksplit(internal, internal); - + DROP FUNCTION gbt_ts_penalty(internal,internal,internal); DROP FUNCTION gbt_tstz_compress(internal); DROP FUNCTION gbt_ts_compress(internal); - + DROP FUNCTION gbt_tstz_consistent(internal,timestamptz,int2,oid,internal); DROP FUNCTION gbt_ts_consistent(internal,timestamp,int2,oid,internal); diff --git a/contrib/citext/citext.sql.in b/contrib/citext/citext.sql.in index 0aef0ad947..1e75b55397 100644 --- a/contrib/citext/citext.sql.in +++ b/contrib/citext/citext.sql.in @@ -343,7 +343,7 @@ CREATE OPERATOR !~~* ( ); -- --- Matching citext to text. +-- Matching citext to text. -- CREATE OR REPLACE FUNCTION texticlike(citext, text) diff --git a/contrib/citext/expected/citext.out b/contrib/citext/expected/citext.out index 21e73be2d7..66ea5ee6ff 100644 --- a/contrib/citext/expected/citext.out +++ b/contrib/citext/expected/citext.out @@ -1046,7 +1046,7 @@ CREATE TABLE caster ( bpchar bpchar, char char, chr "char", - name name, + name name, bytea bytea, boolean boolean, float4 float4, @@ -1055,7 +1055,7 @@ CREATE TABLE caster ( int8 int8, int4 int4, int2 int2, - cidr cidr, + cidr cidr, inet inet, macaddr macaddr, money money, diff --git a/contrib/citext/expected/citext_1.out b/contrib/citext/expected/citext_1.out index 5fa537bc19..c5ca1f6c54 100644 --- a/contrib/citext/expected/citext_1.out +++ b/contrib/citext/expected/citext_1.out @@ -1046,7 +1046,7 @@ CREATE TABLE caster ( bpchar bpchar, char char, chr "char", - name name, + name name, bytea bytea, boolean boolean, float4 float4, @@ -1055,7 +1055,7 @@ CREATE TABLE caster ( int8 int8, int4 int4, int2 int2, - cidr cidr, + cidr cidr, inet inet, macaddr macaddr, money money, diff --git a/contrib/citext/sql/citext.sql b/contrib/citext/sql/citext.sql index 9014e5d931..2f9b46665c 100644 --- a/contrib/citext/sql/citext.sql +++ b/contrib/citext/sql/citext.sql @@ -302,7 +302,7 @@ CREATE TABLE caster ( bpchar bpchar, char char, chr "char", - name name, + name name, bytea bytea, boolean boolean, float4 float4, @@ -311,7 +311,7 @@ CREATE TABLE caster ( int8 int8, int4 int4, int2 int2, - cidr cidr, + cidr cidr, inet inet, macaddr macaddr, money money, diff --git a/contrib/cube/CHANGES b/contrib/cube/CHANGES index d3eca90f6d..7c5590c16f 100644 --- a/contrib/cube/CHANGES +++ b/contrib/cube/CHANGES @@ -6,10 +6,10 @@ Code Cleanup: Update the calling convention for all external facing functions. By external facing, I mean all functions that are directly referenced in cube.sql. Prior -to my update, all functions used the older V0 calling convention. They now +to my update, all functions used the older V0 calling convention. They now use V1. -New Functions: +New Functions: cube(float[]), which makes a zero volume cube from a float array diff --git a/contrib/cube/cube.sql.in b/contrib/cube/cube.sql.in index 3cd199530a..a7e6b1d2b9 100644 --- a/contrib/cube/cube.sql.in +++ b/contrib/cube/cube.sql.in @@ -4,7 +4,7 @@ SET search_path = public; -- Create the user-defined type for N-dimensional boxes --- +-- CREATE OR REPLACE FUNCTION cube_in(cstring) RETURNS cube @@ -268,12 +268,12 @@ AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; CREATE OR REPLACE FUNCTION g_cube_compress(internal) -RETURNS internal +RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; CREATE OR REPLACE FUNCTION g_cube_decompress(internal) -RETURNS internal +RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; @@ -288,12 +288,12 @@ AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; CREATE OR REPLACE FUNCTION g_cube_union(internal, internal) -RETURNS cube +RETURNS cube AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; CREATE OR REPLACE FUNCTION g_cube_same(cube, cube, internal) -RETURNS internal +RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; diff --git a/contrib/cube/cubeparse.y b/contrib/cube/cubeparse.y index d02941dd8c..9e7c87e903 100644 --- a/contrib/cube/cubeparse.y +++ b/contrib/cube/cubeparse.y @@ -51,7 +51,7 @@ box: O_BRACKET paren_list COMMA paren_list C_BRACKET { int dim; - + dim = delim_count($2, ',') + 1; if ( (delim_count($4, ',') + 1) != dim ) { ereport(ERROR, @@ -69,16 +69,16 @@ box: CUBE_MAX_DIM))); YYABORT; } - + *((void **)result) = write_box( dim, $2, $4 ); - + } | paren_list COMMA paren_list { int dim; dim = delim_count($1, ',') + 1; - + if ( (delim_count($3, ',') + 1) != dim ) { ereport(ERROR, (errcode(ERRCODE_SYNTAX_ERROR), @@ -95,7 +95,7 @@ box: CUBE_MAX_DIM))); YYABORT; } - + *((void **)result) = write_box( dim, $1, $3 ); } | @@ -146,7 +146,7 @@ list: $$ = palloc(scanbuflen + 1); strcpy($$, $1); } - | + | list COMMA CUBEFLOAT { $$ = $1; strcat($$, ","); @@ -169,31 +169,31 @@ delim_count(char *s, char delim) return (ndelim); } -static NDBOX * +static NDBOX * write_box(unsigned int dim, char *str1, char *str2) { NDBOX * bp; char * s; - int i; + int i; int size = offsetof(NDBOX, x[0]) + sizeof(double) * dim * 2; - + bp = palloc0(size); SET_VARSIZE(bp, size); bp->dim = dim; - + s = str1; bp->x[i=0] = strtod(s, NULL); while ((s = strchr(s, ',')) != NULL) { s++; i++; bp->x[i] = strtod(s, NULL); - } - + } + s = str2; bp->x[i=dim] = strtod(s, NULL); while ((s = strchr(s, ',')) != NULL) { s++; i++; bp->x[i] = strtod(s, NULL); - } + } return(bp); } @@ -206,13 +206,13 @@ write_point_as_box(char *str, int dim) int i, size; double x; char * s = str; - + size = offsetof(NDBOX, x[0]) + sizeof(double) * dim * 2; bp = palloc0(size); SET_VARSIZE(bp, size); bp->dim = dim; - + i = 0; x = strtod(s, NULL); bp->x[0] = x; @@ -222,7 +222,7 @@ write_point_as_box(char *str, int dim) x = strtod(s, NULL); bp->x[i] = x; bp->x[i+dim] = x; - } + } return(bp); } diff --git a/contrib/cube/cubescan.l b/contrib/cube/cubescan.l index b0e477bf1e..eb71b11adf 100644 --- a/contrib/cube/cubescan.l +++ b/contrib/cube/cubescan.l @@ -1,8 +1,8 @@ %{ -/* -** A scanner for EMP-style numeric ranges +/* + * A scanner for EMP-style numeric ranges * contrib/cube/cubescan.l -*/ + */ #include "postgres.h" diff --git a/contrib/cube/expected/cube.out b/contrib/cube/expected/cube.out index 101a63b723..ae7b5b22c2 100644 --- a/contrib/cube/expected/cube.out +++ b/contrib/cube/expected/cube.out @@ -473,13 +473,13 @@ SELECT cube('{0,1,2}'::float[]); (0, 1, 2) (1 row) -SELECT cube_subset(cube('(1,3,5),(6,7,8)'), ARRAY[3,2,1,1]); +SELECT cube_subset(cube('(1,3,5),(6,7,8)'), ARRAY[3,2,1,1]); cube_subset --------------------------- (5, 3, 1, 1),(8, 7, 6, 6) (1 row) -SELECT cube_subset(cube('(1,3,5),(6,7,8)'), ARRAY[4,0]); +SELECT cube_subset(cube('(1,3,5),(6,7,8)'), ARRAY[4,0]); ERROR: Index out of bounds -- -- Testing limit of CUBE_MAX_DIM dimensions check in cube_in. @@ -1107,11 +1107,11 @@ SELECT cube_enlarge('(2,-2),(-3,7)'::cube, -3, 2); (1 row) -- Load some example data and build the index --- +-- CREATE TABLE test_cube (c cube); \copy test_cube from 'data/test_cube.data' CREATE INDEX test_cube_ix ON test_cube USING gist (c); -SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)' ORDER BY c; +SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)' ORDER BY c; c -------------------------- (337, 455),(240, 359) @@ -1121,8 +1121,8 @@ SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)' ORDER BY c; (2424, 160),(2424, 81) (5 rows) --- Test sorting -SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)' GROUP BY c ORDER BY c; +-- Test sorting +SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)' GROUP BY c ORDER BY c; c -------------------------- (337, 455),(240, 359) diff --git a/contrib/cube/expected/cube_1.out b/contrib/cube/expected/cube_1.out index 55f6861daf..f27e832d63 100644 --- a/contrib/cube/expected/cube_1.out +++ b/contrib/cube/expected/cube_1.out @@ -473,13 +473,13 @@ SELECT cube('{0,1,2}'::float[]); (0, 1, 2) (1 row) -SELECT cube_subset(cube('(1,3,5),(6,7,8)'), ARRAY[3,2,1,1]); +SELECT cube_subset(cube('(1,3,5),(6,7,8)'), ARRAY[3,2,1,1]); cube_subset --------------------------- (5, 3, 1, 1),(8, 7, 6, 6) (1 row) -SELECT cube_subset(cube('(1,3,5),(6,7,8)'), ARRAY[4,0]); +SELECT cube_subset(cube('(1,3,5),(6,7,8)'), ARRAY[4,0]); ERROR: Index out of bounds -- -- Testing limit of CUBE_MAX_DIM dimensions check in cube_in. @@ -1107,11 +1107,11 @@ SELECT cube_enlarge('(2,-2),(-3,7)'::cube, -3, 2); (1 row) -- Load some example data and build the index --- +-- CREATE TABLE test_cube (c cube); \copy test_cube from 'data/test_cube.data' CREATE INDEX test_cube_ix ON test_cube USING gist (c); -SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)' ORDER BY c; +SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)' ORDER BY c; c -------------------------- (337, 455),(240, 359) @@ -1121,8 +1121,8 @@ SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)' ORDER BY c; (2424, 160),(2424, 81) (5 rows) --- Test sorting -SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)' GROUP BY c ORDER BY c; +-- Test sorting +SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)' GROUP BY c ORDER BY c; c -------------------------- (337, 455),(240, 359) diff --git a/contrib/cube/expected/cube_2.out b/contrib/cube/expected/cube_2.out index c449395818..f534ccf0b5 100644 --- a/contrib/cube/expected/cube_2.out +++ b/contrib/cube/expected/cube_2.out @@ -473,13 +473,13 @@ SELECT cube('{0,1,2}'::float[]); (0, 1, 2) (1 row) -SELECT cube_subset(cube('(1,3,5),(6,7,8)'), ARRAY[3,2,1,1]); +SELECT cube_subset(cube('(1,3,5),(6,7,8)'), ARRAY[3,2,1,1]); cube_subset --------------------------- (5, 3, 1, 1),(8, 7, 6, 6) (1 row) -SELECT cube_subset(cube('(1,3,5),(6,7,8)'), ARRAY[4,0]); +SELECT cube_subset(cube('(1,3,5),(6,7,8)'), ARRAY[4,0]); ERROR: Index out of bounds -- -- Testing limit of CUBE_MAX_DIM dimensions check in cube_in. @@ -1107,11 +1107,11 @@ SELECT cube_enlarge('(2,-2),(-3,7)'::cube, -3, 2); (1 row) -- Load some example data and build the index --- +-- CREATE TABLE test_cube (c cube); \copy test_cube from 'data/test_cube.data' CREATE INDEX test_cube_ix ON test_cube USING gist (c); -SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)' ORDER BY c; +SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)' ORDER BY c; c -------------------------- (337, 455),(240, 359) @@ -1121,8 +1121,8 @@ SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)' ORDER BY c; (2424, 160),(2424, 81) (5 rows) --- Test sorting -SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)' GROUP BY c ORDER BY c; +-- Test sorting +SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)' GROUP BY c ORDER BY c; c -------------------------- (337, 455),(240, 359) diff --git a/contrib/cube/sql/cube.sql b/contrib/cube/sql/cube.sql index 1931dfbc80..5c12183dfd 100644 --- a/contrib/cube/sql/cube.sql +++ b/contrib/cube/sql/cube.sql @@ -119,8 +119,8 @@ SELECT cube('{0,1,2}'::float[], '{3,4,5}'::float[]); SELECT cube('{0,1,2}'::float[], '{3}'::float[]); SELECT cube(NULL::float[], '{3}'::float[]); SELECT cube('{0,1,2}'::float[]); -SELECT cube_subset(cube('(1,3,5),(6,7,8)'), ARRAY[3,2,1,1]); -SELECT cube_subset(cube('(1,3,5),(6,7,8)'), ARRAY[4,0]); +SELECT cube_subset(cube('(1,3,5),(6,7,8)'), ARRAY[3,2,1,1]); +SELECT cube_subset(cube('(1,3,5),(6,7,8)'), ARRAY[4,0]); -- -- Testing limit of CUBE_MAX_DIM dimensions check in cube_in. @@ -275,13 +275,13 @@ SELECT cube_enlarge('(2,-2),(-3,7)'::cube, -1, 2); SELECT cube_enlarge('(2,-2),(-3,7)'::cube, -3, 2); -- Load some example data and build the index --- +-- CREATE TABLE test_cube (c cube); \copy test_cube from 'data/test_cube.data' CREATE INDEX test_cube_ix ON test_cube USING gist (c); -SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)' ORDER BY c; +SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)' ORDER BY c; --- Test sorting -SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)' GROUP BY c ORDER BY c; +-- Test sorting +SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)' GROUP BY c ORDER BY c; diff --git a/contrib/dblink/Makefile b/contrib/dblink/Makefile index cc59128cb2..fdfd03a4cf 100644 --- a/contrib/dblink/Makefile +++ b/contrib/dblink/Makefile @@ -6,8 +6,8 @@ OBJS = dblink.o SHLIB_LINK = $(libpq) SHLIB_PREREQS = submake-libpq -DATA_built = dblink.sql -DATA = uninstall_dblink.sql +DATA_built = dblink.sql +DATA = uninstall_dblink.sql REGRESS = dblink diff --git a/contrib/dblink/dblink.sql.in b/contrib/dblink/dblink.sql.in index acad2c94d0..3c9d66e7df 100644 --- a/contrib/dblink/dblink.sql.in +++ b/contrib/dblink/dblink.sql.in @@ -207,7 +207,7 @@ CREATE OR REPLACE FUNCTION dblink_get_notify( OUT notify_name TEXT, OUT be_pid INT4, OUT extra TEXT -) +) RETURNS setof record AS 'MODULE_PATHNAME', 'dblink_get_notify' LANGUAGE C STRICT; @@ -217,7 +217,7 @@ CREATE OR REPLACE FUNCTION dblink_get_notify( OUT notify_name TEXT, OUT be_pid INT4, OUT extra TEXT -) +) RETURNS setof record AS 'MODULE_PATHNAME', 'dblink_get_notify' LANGUAGE C STRICT; diff --git a/contrib/dblink/expected/dblink.out b/contrib/dblink/expected/dblink.out index c59a67c737..15848dd922 100644 --- a/contrib/dblink/expected/dblink.out +++ b/contrib/dblink/expected/dblink.out @@ -668,7 +668,7 @@ SELECT dblink_connect('dtest1', 'dbname=contrib_regression'); OK (1 row) -SELECT * from +SELECT * from dblink_send_query('dtest1', 'select * from foo where f1 < 3') as t1; t1 ---- @@ -681,7 +681,7 @@ SELECT dblink_connect('dtest2', 'dbname=contrib_regression'); OK (1 row) -SELECT * from +SELECT * from dblink_send_query('dtest2', 'select * from foo where f1 > 2 and f1 < 7') as t1; t1 ---- @@ -694,7 +694,7 @@ SELECT dblink_connect('dtest3', 'dbname=contrib_regression'); OK (1 row) -SELECT * from +SELECT * from dblink_send_query('dtest3', 'select * from foo where f1 > 6') as t1; t1 ---- @@ -768,7 +768,7 @@ SELECT dblink_connect('dtest1', 'dbname=contrib_regression'); OK (1 row) -SELECT * from +SELECT * from dblink_send_query('dtest1', 'select * from foo where f1 < 3') as t1; t1 ---- diff --git a/contrib/dblink/sql/dblink.sql b/contrib/dblink/sql/dblink.sql index a6d7811bfc..062bc9ee0e 100644 --- a/contrib/dblink/sql/dblink.sql +++ b/contrib/dblink/sql/dblink.sql @@ -327,15 +327,15 @@ SELECT dblink_disconnect('myconn'); -- test asynchronous queries SELECT dblink_connect('dtest1', 'dbname=contrib_regression'); -SELECT * from +SELECT * from dblink_send_query('dtest1', 'select * from foo where f1 < 3') as t1; SELECT dblink_connect('dtest2', 'dbname=contrib_regression'); -SELECT * from +SELECT * from dblink_send_query('dtest2', 'select * from foo where f1 > 2 and f1 < 7') as t1; SELECT dblink_connect('dtest3', 'dbname=contrib_regression'); -SELECT * from +SELECT * from dblink_send_query('dtest3', 'select * from foo where f1 > 6') as t1; CREATE TEMPORARY TABLE result AS @@ -364,7 +364,7 @@ SELECT dblink_disconnect('dtest3'); SELECT * from result; SELECT dblink_connect('dtest1', 'dbname=contrib_regression'); -SELECT * from +SELECT * from dblink_send_query('dtest1', 'select * from foo where f1 < 3') as t1; SELECT dblink_cancel_query('dtest1'); diff --git a/contrib/earthdistance/earthdistance.sql.in b/contrib/earthdistance/earthdistance.sql.in index a4799914bd..a4ce812584 100644 --- a/contrib/earthdistance/earthdistance.sql.in +++ b/contrib/earthdistance/earthdistance.sql.in @@ -35,7 +35,7 @@ CREATE DOMAIN earth AS cube CONSTRAINT on_surface check(abs(cube_distance(value, '(0)'::cube) / earth() - 1) < '10e-7'::float8); -CREATE OR REPLACE FUNCTION sec_to_gc(float8) +CREATE OR REPLACE FUNCTION sec_to_gc(float8) RETURNS float8 LANGUAGE SQL IMMUTABLE STRICT @@ -76,7 +76,7 @@ RETURNS cube LANGUAGE SQL IMMUTABLE STRICT AS 'SELECT cube_enlarge($1, gc_to_sec($2), 3)'; - + --------------- geo_distance CREATE OR REPLACE FUNCTION geo_distance (point, point) diff --git a/contrib/fuzzystrmatch/fuzzystrmatch.sql.in b/contrib/fuzzystrmatch/fuzzystrmatch.sql.in index 0e75491cbe..0f2ea85e48 100644 --- a/contrib/fuzzystrmatch/fuzzystrmatch.sql.in +++ b/contrib/fuzzystrmatch/fuzzystrmatch.sql.in @@ -35,10 +35,10 @@ CREATE OR REPLACE FUNCTION difference(text,text) RETURNS int AS 'MODULE_PATHNAME', 'difference' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION dmetaphone (text) RETURNS text +CREATE OR REPLACE FUNCTION dmetaphone (text) RETURNS text AS 'MODULE_PATHNAME', 'dmetaphone' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION dmetaphone_alt (text) RETURNS text +CREATE OR REPLACE FUNCTION dmetaphone_alt (text) RETURNS text AS 'MODULE_PATHNAME', 'dmetaphone_alt' LANGUAGE C IMMUTABLE STRICT; diff --git a/contrib/hstore/expected/hstore.out b/contrib/hstore/expected/hstore.out index 0ed109203c..19dd299af7 100644 --- a/contrib/hstore/expected/hstore.out +++ b/contrib/hstore/expected/hstore.out @@ -438,7 +438,7 @@ select hstore 'a=>NULL, b=>qq' ?& '{}'::text[]; f (1 row) --- delete +-- delete select delete('a=>1 , b=>2, c=>3'::hstore, 'a'); delete -------------------- diff --git a/contrib/hstore/sql/hstore.sql b/contrib/hstore/sql/hstore.sql index 76f742299e..58a7967526 100644 --- a/contrib/hstore/sql/hstore.sql +++ b/contrib/hstore/sql/hstore.sql @@ -97,7 +97,7 @@ select hstore 'a=>NULL, b=>qq' ?& ARRAY['c','a']; select hstore 'a=>NULL, b=>qq' ?& ARRAY['c','d']; select hstore 'a=>NULL, b=>qq' ?& '{}'::text[]; --- delete +-- delete select delete('a=>1 , b=>2, c=>3'::hstore, 'a'); select delete('a=>null , b=>2, c=>3'::hstore, 'a'); diff --git a/contrib/intarray/Makefile b/contrib/intarray/Makefile index 18340f9d71..a10d7c6b1f 100644 --- a/contrib/intarray/Makefile +++ b/contrib/intarray/Makefile @@ -1,7 +1,7 @@ # contrib/intarray/Makefile MODULE_big = _int -OBJS = _int_bool.o _int_gist.o _int_op.o _int_tool.o _intbig_gist.o _int_gin.o +OBJS = _int_bool.o _int_gist.o _int_op.o _int_tool.o _intbig_gist.o _int_gin.o DATA_built = _int.sql DATA = uninstall__int.sql REGRESS = _int diff --git a/contrib/intarray/bench/bench.pl b/contrib/intarray/bench/bench.pl index 1887211989..4e18624b9c 100755 --- a/contrib/intarray/bench/bench.pl +++ b/contrib/intarray/bench/bench.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/perl use strict; # make sure we are in a sane environment. @@ -14,16 +14,16 @@ if ( !( scalar %opt && defined $opt{s} ) ) { print <{mid}\t$_->{sections}\n"; } -} +} print sprintf("total: %.02f sec; number: %d; for one: %.03f sec; found %d docs\n", $elapsed, $b, $elapsed/$b, $count+1 ); $dbi -> disconnect; sub exec_sql { my ($dbi, $sql, @keys) = @_; my $sth=$dbi->prepare($sql) || die; - $sth->execute( @keys ) || die; - my $r; + $sth->execute( @keys ) || die; + my $r; my @row; while ( defined ( $r=$sth->fetchrow_hashref ) ) { push @row, $r; - } - $sth->finish; + } + $sth->finish; return @row; } diff --git a/contrib/intarray/bench/create_test.pl b/contrib/intarray/bench/create_test.pl index 3a5e96301b..67394f87b7 100755 --- a/contrib/intarray/bench/create_test.pl +++ b/contrib/intarray/bench/create_test.pl @@ -9,7 +9,7 @@ create table message ( sections int[] ); create table message_section_map ( - mid int not null, + mid int not null, sid int not null ); @@ -66,7 +66,7 @@ unlink 'message.tmp', 'message_section_map.tmp'; sub copytable { my $t = shift; - + print "COPY $t from stdin;\n"; open( FFF, "$t.tmp") || die; while() { print; } diff --git a/contrib/isn/ISBN.h b/contrib/isn/ISBN.h index 6e6d95b09f..c0301ced1e 100644 --- a/contrib/isn/ISBN.h +++ b/contrib/isn/ISBN.h @@ -32,7 +32,7 @@ * For ISBN with prefix 978 * Range Table as of 2010-Jul-29 */ - + /* where the digit set begins, and how many of them are in the table */ const unsigned ISBN_index[10][2] = { {0, 6}, diff --git a/contrib/ltree/ltree.sql.in b/contrib/ltree/ltree.sql.in index 4ea6277c57..1b985a7a99 100644 --- a/contrib/ltree/ltree.sql.in +++ b/contrib/ltree/ltree.sql.in @@ -482,18 +482,18 @@ CREATE OR REPLACE FUNCTION ltree_gist_in(cstring) RETURNS ltree_gist AS 'MODULE_PATHNAME' LANGUAGE C STRICT; - + CREATE OR REPLACE FUNCTION ltree_gist_out(ltree_gist) RETURNS cstring AS 'MODULE_PATHNAME' LANGUAGE C STRICT; - + CREATE TYPE ltree_gist ( internallength = -1, input = ltree_gist_in, output = ltree_gist_out, storage = plain -); +); CREATE OR REPLACE FUNCTION ltree_consistent(internal,internal,int2,oid,internal) diff --git a/contrib/ltree/uninstall_ltree.sql b/contrib/ltree/uninstall_ltree.sql index 07ce1189b5..2e10b10e97 100644 --- a/contrib/ltree/uninstall_ltree.sql +++ b/contrib/ltree/uninstall_ltree.sql @@ -110,7 +110,7 @@ DROP FUNCTION ltree_compress(internal); DROP FUNCTION ltree_consistent(internal,internal,int2,oid,internal); DROP TYPE ltree_gist CASCADE; - + DROP OPERATOR ^@ (ltxtquery, ltree); DROP OPERATOR ^@ (ltree, ltxtquery); diff --git a/contrib/pg_buffercache/Makefile b/contrib/pg_buffercache/Makefile index 6a47a2241e..ffcf0c3b92 100644 --- a/contrib/pg_buffercache/Makefile +++ b/contrib/pg_buffercache/Makefile @@ -1,10 +1,10 @@ # contrib/pg_buffercache/Makefile MODULE_big = pg_buffercache -OBJS = pg_buffercache_pages.o +OBJS = pg_buffercache_pages.o -DATA_built = pg_buffercache.sql -DATA = uninstall_pg_buffercache.sql +DATA_built = pg_buffercache.sql +DATA = uninstall_pg_buffercache.sql ifdef USE_PGXS PG_CONFIG = pg_config diff --git a/contrib/pg_buffercache/pg_buffercache.sql.in b/contrib/pg_buffercache/pg_buffercache.sql.in index b23e94ed12..88b5e643ac 100644 --- a/contrib/pg_buffercache/pg_buffercache.sql.in +++ b/contrib/pg_buffercache/pg_buffercache.sql.in @@ -12,9 +12,9 @@ LANGUAGE C; -- Create a view for convenient access. CREATE VIEW pg_buffercache AS SELECT P.* FROM pg_buffercache_pages() AS P - (bufferid integer, relfilenode oid, reltablespace oid, reldatabase oid, + (bufferid integer, relfilenode oid, reltablespace oid, reldatabase oid, relforknumber int2, relblocknumber int8, isdirty bool, usagecount int2); - + -- Don't want these to be available at public. REVOKE ALL ON FUNCTION pg_buffercache_pages() FROM PUBLIC; REVOKE ALL ON pg_buffercache FROM PUBLIC; diff --git a/contrib/pg_freespacemap/Makefile b/contrib/pg_freespacemap/Makefile index da335a86ca..65539d5d71 100644 --- a/contrib/pg_freespacemap/Makefile +++ b/contrib/pg_freespacemap/Makefile @@ -1,10 +1,10 @@ # contrib/pg_freespacemap/Makefile MODULE_big = pg_freespacemap -OBJS = pg_freespacemap.o +OBJS = pg_freespacemap.o -DATA_built = pg_freespacemap.sql -DATA = uninstall_pg_freespacemap.sql +DATA_built = pg_freespacemap.sql +DATA = uninstall_pg_freespacemap.sql ifdef USE_PGXS PG_CONFIG = pg_config diff --git a/contrib/pg_trgm/pg_trgm.sql.in b/contrib/pg_trgm/pg_trgm.sql.in index b1f094ab40..cce6cd9872 100644 --- a/contrib/pg_trgm/pg_trgm.sql.in +++ b/contrib/pg_trgm/pg_trgm.sql.in @@ -59,7 +59,7 @@ CREATE OR REPLACE FUNCTION gtrgm_consistent(internal,text,int,oid,internal) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; - + CREATE OR REPLACE FUNCTION gtrgm_compress(internal) RETURNS internal AS 'MODULE_PATHNAME' diff --git a/contrib/pg_trgm/uninstall_pg_trgm.sql b/contrib/pg_trgm/uninstall_pg_trgm.sql index 239cd85b5b..6706dd133e 100644 --- a/contrib/pg_trgm/uninstall_pg_trgm.sql +++ b/contrib/pg_trgm/uninstall_pg_trgm.sql @@ -16,7 +16,7 @@ DROP FUNCTION gtrgm_penalty(internal,internal,internal); DROP FUNCTION gtrgm_decompress(internal); DROP FUNCTION gtrgm_compress(internal); - + DROP FUNCTION gtrgm_consistent(internal,text,int,oid,internal); DROP TYPE gtrgm CASCADE; diff --git a/contrib/pg_upgrade/IMPLEMENTATION b/contrib/pg_upgrade/IMPLEMENTATION index bbd36ac9e9..a0cfcf15da 100644 --- a/contrib/pg_upgrade/IMPLEMENTATION +++ b/contrib/pg_upgrade/IMPLEMENTATION @@ -13,7 +13,7 @@ old data. If you have a lot of data, that can take a considerable amount of time. If you have too much data, you may have to buy more storage since you need enough room to hold the original data plus the exported data. pg_upgrade can reduce the amount of time and disk space required -for many upgrades. +for many upgrades. The URL http://momjian.us/main/writings/pgsql/pg_upgrade.pdf contains a presentation about pg_upgrade internals that mirrors the text diff --git a/contrib/pg_upgrade/TESTING b/contrib/pg_upgrade/TESTING index 88adfea276..85de8da7f7 100644 --- a/contrib/pg_upgrade/TESTING +++ b/contrib/pg_upgrade/TESTING @@ -35,10 +35,10 @@ Here are the steps needed to create a regression database dump file: b) For pre-9.0, remove 'regex_flavor' f) For pre-9.0, adjust extra_float_digits - Postgres 9.0 pg_dump uses extra_float_digits=-2 for pre-9.0 - databases, and extra_float_digits=-3 for >= 9.0 databases. - It is necessary to modify 9.0 pg_dump to always use -3, and - modify the pre-9.0 old server to accept extra_float_digits=-3. + Postgres 9.0 pg_dump uses extra_float_digits=-2 for pre-9.0 + databases, and extra_float_digits=-3 for >= 9.0 databases. + It is necessary to modify 9.0 pg_dump to always use -3, and + modify the pre-9.0 old server to accept extra_float_digits=-3. Once the dump is created, it can be repeatedly loaded into the old database, upgraded, and dumped out of the new database, and then @@ -52,7 +52,7 @@ steps: 3) Create the regression database in the old server. -4) Load the dump file created above into the regression database; +4) Load the dump file created above into the regression database; check for errors while loading. 5) Upgrade the old database to the new major version, as outlined in diff --git a/contrib/pg_upgrade/relfilenode.c b/contrib/pg_upgrade/relfilenode.c index 7b73b5e91f..4ded5d9d99 100644 --- a/contrib/pg_upgrade/relfilenode.c +++ b/contrib/pg_upgrade/relfilenode.c @@ -171,7 +171,7 @@ transfer_single_new_db(pageCnvCtx *pageConverter, namelist[fileno]->d_name); snprintf(new_file, sizeof(new_file), "%s/%u%s", maps[mapnum].new_dir, maps[mapnum].new_relfilenode, strchr(namelist[fileno]->d_name, '_')); - + unlink(new_file); transfer_relfile(pageConverter, old_file, new_file, maps[mapnum].old_nspname, maps[mapnum].old_relname, diff --git a/contrib/pgcrypto/expected/blowfish.out b/contrib/pgcrypto/expected/blowfish.out index 86c3244cec..72557ea161 100644 --- a/contrib/pgcrypto/expected/blowfish.out +++ b/contrib/pgcrypto/expected/blowfish.out @@ -108,7 +108,7 @@ decode('37363534333231204e6f77206973207468652074696d6520666f722000', 'hex'), 3ea6357a0ee7fad6d0c4b63464f2aafa40c2e91b4b7e1bba8114932fd92b5c8f111e7e50e7b2e541 (1 row) --- blowfish-448 +-- blowfish-448 SELECT encode(encrypt( decode('fedcba9876543210', 'hex'), decode('f0e1d2c3b4a5968778695a4b3c2d1e0f001122334455667704689104c2fd3b2f584023641aba61761f1f1f1f0e0e0e0effffffffffffffff', 'hex'), @@ -120,21 +120,21 @@ decode('f0e1d2c3b4a5968778695a4b3c2d1e0f001122334455667704689104c2fd3b2f58402364 -- result: c04504012e4e1f53 -- empty data -select encode( encrypt('', 'foo', 'bf'), 'hex'); +select encode(encrypt('', 'foo', 'bf'), 'hex'); encode ------------------ 1871949bb2311c8e (1 row) -- 10 bytes key -select encode( encrypt('foo', '0123456789', 'bf'), 'hex'); +select encode(encrypt('foo', '0123456789', 'bf'), 'hex'); encode ------------------ 42f58af3b2c03f46 (1 row) -- 22 bytes key -select encode( encrypt('foo', '0123456789012345678901', 'bf'), 'hex'); +select encode(encrypt('foo', '0123456789012345678901', 'bf'), 'hex'); encode ------------------ 86ab6f0bc72b5f22 diff --git a/contrib/pgcrypto/expected/crypt-blowfish.out b/contrib/pgcrypto/expected/crypt-blowfish.out index 8a8b007181..329d78f625 100644 --- a/contrib/pgcrypto/expected/crypt-blowfish.out +++ b/contrib/pgcrypto/expected/crypt-blowfish.out @@ -17,7 +17,7 @@ CREATE TABLE ctest (data text, res text, salt text); INSERT INTO ctest VALUES ('password', '', ''); UPDATE ctest SET salt = gen_salt('bf', 8); UPDATE ctest SET res = crypt(data, salt); -SELECT res = crypt(data, res) AS "worked" +SELECT res = crypt(data, res) AS "worked" FROM ctest; worked -------- diff --git a/contrib/pgcrypto/expected/rijndael.out b/contrib/pgcrypto/expected/rijndael.out index 106181ef22..14b2650c32 100644 --- a/contrib/pgcrypto/expected/rijndael.out +++ b/contrib/pgcrypto/expected/rijndael.out @@ -70,21 +70,21 @@ decode('000102030405060708090a0b0c0d0e0f101112131415161718191a1b', 'hex'), (1 row) -- empty data -select encode( encrypt('', 'foo', 'aes'), 'hex'); +select encode(encrypt('', 'foo', 'aes'), 'hex'); encode ---------------------------------- b48cc3338a2eb293b6007ef72c360d48 (1 row) -- 10 bytes key -select encode( encrypt('foo', '0123456789', 'aes'), 'hex'); +select encode(encrypt('foo', '0123456789', 'aes'), 'hex'); encode ---------------------------------- f397f03d2819b7172b68d0706fda4693 (1 row) -- 22 bytes key -select encode( encrypt('foo', '0123456789012345678901', 'aes'), 'hex'); +select encode(encrypt('foo', '0123456789012345678901', 'aes'), 'hex'); encode ---------------------------------- 5c9db77af02b4678117bcd8a71ae7f53 @@ -105,7 +105,7 @@ select encode(encrypt_iv('foo', '0123456', 'abcd', 'aes'), 'hex'); (1 row) select decrypt_iv(decode('2c24cb7da91d6d5699801268b0f5adad', 'hex'), - '0123456', 'abcd', 'aes'); + '0123456', 'abcd', 'aes'); decrypt_iv ------------ foo diff --git a/contrib/pgcrypto/rijndael.tbl b/contrib/pgcrypto/rijndael.tbl index 8ea62eae1b..c7610c0134 100644 --- a/contrib/pgcrypto/rijndael.tbl +++ b/contrib/pgcrypto/rijndael.tbl @@ -1133,6 +1133,6 @@ static const u4byte il_tab[4][256] = { }; static const u4byte rco_tab[10] = { - 0x00000001, 0x00000002, 0x00000004, 0x00000008, 0x00000010, + 0x00000001, 0x00000002, 0x00000004, 0x00000008, 0x00000010, 0x00000020, 0x00000040, 0x00000080, 0x0000001b, 0x00000036 }; diff --git a/contrib/pgcrypto/sql/blowfish.sql b/contrib/pgcrypto/sql/blowfish.sql index 951cbc0519..ba8df41c68 100644 --- a/contrib/pgcrypto/sql/blowfish.sql +++ b/contrib/pgcrypto/sql/blowfish.sql @@ -66,7 +66,7 @@ decode('6b77b4d63006dee605b156e27403979358deb9e7154616d959f1652bd5ff92cc', 'hex' decode('37363534333231204e6f77206973207468652074696d6520666f722000', 'hex'), 'bf-cbc'), 'hex'); --- blowfish-448 +-- blowfish-448 SELECT encode(encrypt( decode('fedcba9876543210', 'hex'), decode('f0e1d2c3b4a5968778695a4b3c2d1e0f001122334455667704689104c2fd3b2f584023641aba61761f1f1f1f0e0e0e0effffffffffffffff', 'hex'), @@ -74,11 +74,11 @@ decode('f0e1d2c3b4a5968778695a4b3c2d1e0f001122334455667704689104c2fd3b2f58402364 -- result: c04504012e4e1f53 -- empty data -select encode( encrypt('', 'foo', 'bf'), 'hex'); +select encode(encrypt('', 'foo', 'bf'), 'hex'); -- 10 bytes key -select encode( encrypt('foo', '0123456789', 'bf'), 'hex'); +select encode(encrypt('foo', '0123456789', 'bf'), 'hex'); -- 22 bytes key -select encode( encrypt('foo', '0123456789012345678901', 'bf'), 'hex'); +select encode(encrypt('foo', '0123456789012345678901', 'bf'), 'hex'); -- decrypt select decrypt(encrypt('foo', '0123456', 'bf'), '0123456', 'bf'); diff --git a/contrib/pgcrypto/sql/crypt-blowfish.sql b/contrib/pgcrypto/sql/crypt-blowfish.sql index b89dfd22b7..60c1140055 100644 --- a/contrib/pgcrypto/sql/crypt-blowfish.sql +++ b/contrib/pgcrypto/sql/crypt-blowfish.sql @@ -11,7 +11,7 @@ INSERT INTO ctest VALUES ('password', '', ''); UPDATE ctest SET salt = gen_salt('bf', 8); UPDATE ctest SET res = crypt(data, salt); -SELECT res = crypt(data, res) AS "worked" +SELECT res = crypt(data, res) AS "worked" FROM ctest; DROP TABLE ctest; diff --git a/contrib/pgcrypto/sql/rijndael.sql b/contrib/pgcrypto/sql/rijndael.sql index 41595074bc..bfbf95d39b 100644 --- a/contrib/pgcrypto/sql/rijndael.sql +++ b/contrib/pgcrypto/sql/rijndael.sql @@ -44,11 +44,11 @@ decode('000102030405060708090a0b0c0d0e0f101112131415161718191a1b', 'hex'), 'aes-cbc'), 'hex'); -- empty data -select encode( encrypt('', 'foo', 'aes'), 'hex'); +select encode(encrypt('', 'foo', 'aes'), 'hex'); -- 10 bytes key -select encode( encrypt('foo', '0123456789', 'aes'), 'hex'); +select encode(encrypt('foo', '0123456789', 'aes'), 'hex'); -- 22 bytes key -select encode( encrypt('foo', '0123456789012345678901', 'aes'), 'hex'); +select encode(encrypt('foo', '0123456789012345678901', 'aes'), 'hex'); -- decrypt select decrypt(encrypt('foo', '0123456', 'aes'), '0123456', 'aes'); @@ -56,7 +56,7 @@ select decrypt(encrypt('foo', '0123456', 'aes'), '0123456', 'aes'); -- iv select encode(encrypt_iv('foo', '0123456', 'abcd', 'aes'), 'hex'); select decrypt_iv(decode('2c24cb7da91d6d5699801268b0f5adad', 'hex'), - '0123456', 'abcd', 'aes'); + '0123456', 'abcd', 'aes'); -- long message select encode(encrypt('Lets try a longer message.', '0123456789', 'aes'), 'hex'); diff --git a/contrib/seg/expected/seg.out b/contrib/seg/expected/seg.out index bd099a222c..17c803e50e 100644 --- a/contrib/seg/expected/seg.out +++ b/contrib/seg/expected/seg.out @@ -924,7 +924,7 @@ SELECT '1'::seg <@ '-1 .. 1'::seg AS bool; (1 row) -- Load some example data and build the index --- +-- CREATE TABLE test_seg (s seg); \copy test_seg from 'data/test_seg.data' CREATE INDEX test_seg_ix ON test_seg USING gist (s); @@ -934,7 +934,7 @@ SELECT count(*) FROM test_seg WHERE s @> '11..11.3'; 143 (1 row) --- Test sorting +-- Test sorting SELECT * FROM test_seg WHERE s @> '11..11.3' GROUP BY s; s ----------------- diff --git a/contrib/seg/expected/seg_1.out b/contrib/seg/expected/seg_1.out index c92cd83510..a4cca8b391 100644 --- a/contrib/seg/expected/seg_1.out +++ b/contrib/seg/expected/seg_1.out @@ -924,7 +924,7 @@ SELECT '1'::seg <@ '-1 .. 1'::seg AS bool; (1 row) -- Load some example data and build the index --- +-- CREATE TABLE test_seg (s seg); \copy test_seg from 'data/test_seg.data' CREATE INDEX test_seg_ix ON test_seg USING gist (s); @@ -934,7 +934,7 @@ SELECT count(*) FROM test_seg WHERE s @> '11..11.3'; 143 (1 row) --- Test sorting +-- Test sorting SELECT * FROM test_seg WHERE s @> '11..11.3' GROUP BY s; s ----------------- diff --git a/contrib/seg/seg.sql.in b/contrib/seg/seg.sql.in index 2713c4a8dc..9bd747656c 100644 --- a/contrib/seg/seg.sql.in +++ b/contrib/seg/seg.sql.in @@ -4,7 +4,7 @@ SET search_path = public; -- Create the user-defined type for 1-D floating point intervals (seg) --- +-- CREATE OR REPLACE FUNCTION seg_in(cstring) RETURNS seg @@ -333,12 +333,12 @@ AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; CREATE OR REPLACE FUNCTION gseg_compress(internal) -RETURNS internal +RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; CREATE OR REPLACE FUNCTION gseg_decompress(internal) -RETURNS internal +RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; @@ -353,12 +353,12 @@ AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; CREATE OR REPLACE FUNCTION gseg_union(internal, internal) -RETURNS seg +RETURNS seg AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; CREATE OR REPLACE FUNCTION gseg_same(seg, seg, internal) -RETURNS internal +RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; @@ -375,7 +375,7 @@ CREATE OPERATOR CLASS seg_ops FUNCTION 1 seg_cmp(seg, seg); CREATE OPERATOR CLASS gist_seg_ops -DEFAULT FOR TYPE seg USING gist +DEFAULT FOR TYPE seg USING gist AS OPERATOR 1 << , OPERATOR 2 &< , diff --git a/contrib/seg/segparse.y b/contrib/seg/segparse.y index ca351c661b..1f5f0affe8 100644 --- a/contrib/seg/segparse.y +++ b/contrib/seg/segparse.y @@ -1,6 +1,6 @@ %{ #define YYPARSE_PARAM result /* need this to pass a pointer (void *) to yyparse */ - + #include "postgres.h" #include @@ -23,7 +23,7 @@ extern int seg_yylex(void); extern int significant_digits(char *str); /* defined in seg.c */ - + void seg_yyerror(const char *message); int seg_yyparse(void *result); @@ -126,7 +126,7 @@ boundary: $$.sigd = significant_digits($1); $$.val = val; } - | + | EXTENSION SEGFLOAT { /* temp variable avoids a gcc 3.3.x bug on Sparc64 */ float val = seg_atof($2); diff --git a/contrib/seg/segscan.l b/contrib/seg/segscan.l index 36da5fa395..c2b5ca8789 100644 --- a/contrib/seg/segscan.l +++ b/contrib/seg/segscan.l @@ -1,7 +1,7 @@ %{ -/* -** A scanner for EMP-style numeric ranges -*/ +/* + * A scanner for EMP-style numeric ranges + */ #include "postgres.h" diff --git a/contrib/seg/sort-segments.pl b/contrib/seg/sort-segments.pl index 1205d3b972..62cdfb1ffd 100755 --- a/contrib/seg/sort-segments.pl +++ b/contrib/seg/sort-segments.pl @@ -7,7 +7,7 @@ while (<>) { push @rows, $_; } -foreach ( sort { +foreach ( sort { @ar = split("\t", $a); $valA = pop @ar; $valA =~ s/[~<> ]+//g; diff --git a/contrib/seg/sql/seg.sql b/contrib/seg/sql/seg.sql index 61ad519613..b8a29d659a 100644 --- a/contrib/seg/sql/seg.sql +++ b/contrib/seg/sql/seg.sql @@ -213,7 +213,7 @@ SELECT '-1'::seg <@ '-1 .. 1'::seg AS bool; SELECT '1'::seg <@ '-1 .. 1'::seg AS bool; -- Load some example data and build the index --- +-- CREATE TABLE test_seg (s seg); \copy test_seg from 'data/test_seg.data' @@ -221,7 +221,7 @@ CREATE TABLE test_seg (s seg); CREATE INDEX test_seg_ix ON test_seg USING gist (s); SELECT count(*) FROM test_seg WHERE s @> '11..11.3'; --- Test sorting +-- Test sorting SELECT * FROM test_seg WHERE s @> '11..11.3' GROUP BY s; -- Test functions diff --git a/contrib/spi/autoinc.example b/contrib/spi/autoinc.example index a2f470dc2d..08880ce5fa 100644 --- a/contrib/spi/autoinc.example +++ b/contrib/spi/autoinc.example @@ -8,9 +8,9 @@ CREATE TABLE ids ( idesc text ); -CREATE TRIGGER ids_nextid +CREATE TRIGGER ids_nextid BEFORE INSERT OR UPDATE ON ids - FOR EACH ROW + FOR EACH ROW EXECUTE PROCEDURE autoinc (id, next_id); INSERT INTO ids VALUES (0, 'first (-2 ?)'); @@ -19,11 +19,11 @@ INSERT INTO ids(idesc) VALUES ('third (1 ?!)'); SELECT * FROM ids; -UPDATE ids SET id = null, idesc = 'first: -2 --> 2' +UPDATE ids SET id = null, idesc = 'first: -2 --> 2' WHERE idesc = 'first (-2 ?)'; -UPDATE ids SET id = 0, idesc = 'second: -1 --> 3' +UPDATE ids SET id = 0, idesc = 'second: -1 --> 3' WHERE id = -1; -UPDATE ids SET id = 4, idesc = 'third: 1 --> 4' +UPDATE ids SET id = 4, idesc = 'third: 1 --> 4' WHERE id = 1; SELECT * FROM ids; diff --git a/contrib/spi/autoinc.sql.in b/contrib/spi/autoinc.sql.in index d38c9df2d4..1fa322f9c7 100644 --- a/contrib/spi/autoinc.sql.in +++ b/contrib/spi/autoinc.sql.in @@ -3,7 +3,7 @@ -- Adjust this setting to control where the objects get created. SET search_path = public; -CREATE OR REPLACE FUNCTION autoinc() -RETURNS trigger +CREATE OR REPLACE FUNCTION autoinc() +RETURNS trigger AS 'MODULE_PATHNAME' LANGUAGE C; diff --git a/contrib/spi/insert_username.example b/contrib/spi/insert_username.example index a9d23fb2ad..2c1eeb0e0d 100644 --- a/contrib/spi/insert_username.example +++ b/contrib/spi/insert_username.example @@ -7,7 +7,7 @@ CREATE TABLE username_test ( CREATE TRIGGER insert_usernames BEFORE INSERT OR UPDATE ON username_test - FOR EACH ROW + FOR EACH ROW EXECUTE PROCEDURE insert_username (username); INSERT INTO username_test VALUES ('nothing'); diff --git a/contrib/spi/insert_username.sql.in b/contrib/spi/insert_username.sql.in index f06cc0cb5a..bdc2deb340 100644 --- a/contrib/spi/insert_username.sql.in +++ b/contrib/spi/insert_username.sql.in @@ -3,7 +3,7 @@ -- Adjust this setting to control where the objects get created. SET search_path = public; -CREATE OR REPLACE FUNCTION insert_username() -RETURNS trigger +CREATE OR REPLACE FUNCTION insert_username() +RETURNS trigger AS 'MODULE_PATHNAME' LANGUAGE C; diff --git a/contrib/spi/moddatetime.example b/contrib/spi/moddatetime.example index e4a713c12a..65af388214 100644 --- a/contrib/spi/moddatetime.example +++ b/contrib/spi/moddatetime.example @@ -8,7 +8,7 @@ CREATE TABLE mdt ( CREATE TRIGGER mdt_moddatetime BEFORE UPDATE ON mdt - FOR EACH ROW + FOR EACH ROW EXECUTE PROCEDURE moddatetime (moddate); INSERT INTO mdt VALUES (1, 'first'); diff --git a/contrib/spi/refint.example b/contrib/spi/refint.example index 1300e81654..d0ff744164 100644 --- a/contrib/spi/refint.example +++ b/contrib/spi/refint.example @@ -20,11 +20,11 @@ CREATE INDEX CI ON C (REFC); --Trigger for table A: CREATE TRIGGER AT BEFORE DELETE OR UPDATE ON A FOR EACH ROW -EXECUTE PROCEDURE +EXECUTE PROCEDURE check_foreign_key (2, 'cascade', 'ID', 'B', 'REFB', 'C', 'REFC'); /* 2 - means that check must be performed for foreign keys of 2 tables. -cascade - defines that corresponding keys must be deleted. +cascade - defines that corresponding keys must be deleted. ID - name of primary key column in triggered table (A). You may use as many columns as you need. B - name of (first) table with foreign keys. @@ -38,11 +38,11 @@ REFC - name of foreign key column in this table. --Trigger for table B: CREATE TRIGGER BT BEFORE INSERT OR UPDATE ON B FOR EACH ROW -EXECUTE PROCEDURE +EXECUTE PROCEDURE check_primary_key ('REFB', 'A', 'ID'); /* -REFB - name of foreign key column in triggered (B) table. You may use as +REFB - name of foreign key column in triggered (B) table. You may use as many columns as you need, but number of key columns in referenced table must be the same. A - referenced table name. @@ -52,7 +52,7 @@ ID - name of primary key column in referenced table. --Trigger for table C: CREATE TRIGGER CT BEFORE INSERT OR UPDATE ON C FOR EACH ROW -EXECUTE PROCEDURE +EXECUTE PROCEDURE check_primary_key ('REFC', 'A', 'ID'); -- Now try diff --git a/contrib/spi/timetravel.example b/contrib/spi/timetravel.example index 1769e48154..35a7f65408 100644 --- a/contrib/spi/timetravel.example +++ b/contrib/spi/timetravel.example @@ -1,8 +1,8 @@ drop table tttest; create table tttest ( - price_id int4, - price_val int4, + price_id int4, + price_val int4, price_on abstime, price_off abstime ); @@ -12,17 +12,17 @@ alter table tttest add column q1 text; alter table tttest add column q2 int; alter table tttest drop column q1; -create trigger timetravel +create trigger timetravel before insert or delete or update on tttest - for each row - execute procedure + for each row + execute procedure timetravel (price_on, price_off); insert into tttest values (1, 1, null, null); insert into tttest(price_id, price_val) values (2, 2); insert into tttest(price_id, price_val,price_off) values (3, 3, 'infinity'); -insert into tttest(price_id, price_val,price_off) values (4, 4, +insert into tttest(price_id, price_val,price_off) values (4, 4, abstime('now'::timestamp - '100 days'::interval)); insert into tttest(price_id, price_val,price_on) values (3, 3, 'infinity'); -- duplicate key @@ -62,7 +62,7 @@ select set_timetravel('tttest', 1); -- turn TT ON! select get_timetravel('tttest'); -- check status -- we want to correct some date -update tttest set price_on = 'Jan-01-1990 00:00:01' where price_id = 5 and +update tttest set price_on = 'Jan-01-1990 00:00:01' where price_id = 5 and price_off <> 'infinity'; -- but this doesn't work @@ -71,11 +71,11 @@ select set_timetravel('tttest', 0); -- turn TT OFF! select get_timetravel('tttest'); -- check status -update tttest set price_on = '01-Jan-1990 00:00:01' where price_id = 5 and +update tttest set price_on = '01-Jan-1990 00:00:01' where price_id = 5 and price_off <> 'infinity'; select * from tttest; -- isn't it what we need ? -- get price for price_id == 5 as it was '10-Jan-1990' -select * from tttest where price_id = 5 and +select * from tttest where price_id = 5 and price_on <= '10-Jan-1990' and price_off > '10-Jan-1990'; diff --git a/contrib/spi/timetravel.sql.in b/contrib/spi/timetravel.sql.in index 4c64f211d9..83dc958a88 100644 --- a/contrib/spi/timetravel.sql.in +++ b/contrib/spi/timetravel.sql.in @@ -3,17 +3,17 @@ -- Adjust this setting to control where the objects get created. SET search_path = public; -CREATE OR REPLACE FUNCTION timetravel() -RETURNS trigger +CREATE OR REPLACE FUNCTION timetravel() +RETURNS trigger AS 'MODULE_PATHNAME' LANGUAGE C; -CREATE OR REPLACE FUNCTION set_timetravel(name, int4) -RETURNS int4 +CREATE OR REPLACE FUNCTION set_timetravel(name, int4) +RETURNS int4 AS 'MODULE_PATHNAME' LANGUAGE C RETURNS NULL ON NULL INPUT; -CREATE OR REPLACE FUNCTION get_timetravel(name) -RETURNS int4 +CREATE OR REPLACE FUNCTION get_timetravel(name) +RETURNS int4 AS 'MODULE_PATHNAME' LANGUAGE C RETURNS NULL ON NULL INPUT; diff --git a/contrib/start-scripts/osx/PostgreSQL b/contrib/start-scripts/osx/PostgreSQL index 65150d0fd5..58e69bc784 100755 --- a/contrib/start-scripts/osx/PostgreSQL +++ b/contrib/start-scripts/osx/PostgreSQL @@ -30,9 +30,9 @@ # # Created by David Wheeler, 2002. -# modified by Ray Aspeitia 12-03-2003 : +# modified by Ray Aspeitia 12-03-2003 : # added log rotation script to db startup -# modified StartupParameters.plist "Provides" parameter to make it easier to +# modified StartupParameters.plist "Provides" parameter to make it easier to # start and stop with the SystemStarter utitlity # use the below command in order to correctly start/stop/restart PG with log rotation script: diff --git a/contrib/test_parser/expected/test_parser.out b/contrib/test_parser/expected/test_parser.out index 600086c4ae..3d0fd4210f 100644 --- a/contrib/test_parser/expected/test_parser.out +++ b/contrib/test_parser/expected/test_parser.out @@ -41,7 +41,7 @@ SELECT to_tsquery('testcfg', 'star'); 'star' (1 row) -SELECT ts_headline('testcfg','Supernovae stars are the brightest phenomena in galaxies', +SELECT ts_headline('testcfg','Supernovae stars are the brightest phenomena in galaxies', to_tsquery('testcfg', 'stars')); ts_headline ----------------------------------------------------------------- diff --git a/contrib/test_parser/sql/test_parser.sql b/contrib/test_parser/sql/test_parser.sql index f43d4c7e09..97c2cb5a5d 100644 --- a/contrib/test_parser/sql/test_parser.sql +++ b/contrib/test_parser/sql/test_parser.sql @@ -22,5 +22,5 @@ SELECT to_tsvector('testcfg','That''s my first own parser'); SELECT to_tsquery('testcfg', 'star'); -SELECT ts_headline('testcfg','Supernovae stars are the brightest phenomena in galaxies', +SELECT ts_headline('testcfg','Supernovae stars are the brightest phenomena in galaxies', to_tsquery('testcfg', 'stars')); diff --git a/contrib/tsearch2/expected/tsearch2.out b/contrib/tsearch2/expected/tsearch2.out index 8674337e52..18b591e0aa 100644 --- a/contrib/tsearch2/expected/tsearch2.out +++ b/contrib/tsearch2/expected/tsearch2.out @@ -815,13 +815,13 @@ SELECT length(to_tsvector('english', '345 qwe@efd.r '' http://www.com/ http://ae 53 (1 row) -select to_tsquery('english', 'qwe & sKies '); +select to_tsquery('english', 'qwe & sKies '); to_tsquery --------------- 'qwe' & 'sky' (1 row) -select to_tsquery('simple', 'qwe & sKies '); +select to_tsquery('simple', 'qwe & sKies '); to_tsquery ----------------- 'qwe' & 'skies' @@ -2337,7 +2337,6 @@ Upon a woman s face. E. J. Pratt (1882 1964) The granite features of this cliff (1 row) - select headline('Erosion It took the sea a thousand years, A thousand years to trace The granite features of this cliff @@ -2354,7 +2353,6 @@ Upon a woman s face. E. J. Pratt (1882 1964) The granite features of this cliff (1 row) - select headline('Erosion It took the sea a thousand years, A thousand years to trace The granite features of this cliff @@ -2382,7 +2380,7 @@ ff-bg document.write(15); -', +', to_tsquery('sea&foo'), 'HighlightAll=true'); headline ----------------------------------------------------------------------------- diff --git a/contrib/tsearch2/expected/tsearch2_1.out b/contrib/tsearch2/expected/tsearch2_1.out index a26c5162d1..f7cb0963b8 100644 --- a/contrib/tsearch2/expected/tsearch2_1.out +++ b/contrib/tsearch2/expected/tsearch2_1.out @@ -815,13 +815,13 @@ SELECT length(to_tsvector('english', '345 qwe@efd.r '' http://www.com/ http://ae 53 (1 row) -select to_tsquery('english', 'qwe & sKies '); +select to_tsquery('english', 'qwe & sKies '); to_tsquery --------------- 'qwe' & 'sky' (1 row) -select to_tsquery('simple', 'qwe & sKies '); +select to_tsquery('simple', 'qwe & sKies '); to_tsquery ----------------- 'qwe' & 'skies' @@ -2337,7 +2337,6 @@ Upon a woman s face. E. J. Pratt (1882 1964) The granite features of this cliff (1 row) - select headline('Erosion It took the sea a thousand years, A thousand years to trace The granite features of this cliff @@ -2354,7 +2353,6 @@ Upon a woman s face. E. J. Pratt (1882 1964) The granite features of this cliff (1 row) - select headline('Erosion It took the sea a thousand years, A thousand years to trace The granite features of this cliff @@ -2382,7 +2380,7 @@ ff-bg document.write(15); -', +', to_tsquery('sea&foo'), 'HighlightAll=true'); headline ----------------------------------------------------------------------------- diff --git a/contrib/tsearch2/sql/tsearch2.sql b/contrib/tsearch2/sql/tsearch2.sql index bbae7b45db..99d808a1b3 100644 --- a/contrib/tsearch2/sql/tsearch2.sql +++ b/contrib/tsearch2/sql/tsearch2.sql @@ -168,8 +168,8 @@ SELECT length(to_tsvector('english', '345 qwe@efd.r '' http://www.com/ http://ae wow < jqw <> qwerty')); -select to_tsquery('english', 'qwe & sKies '); -select to_tsquery('simple', 'qwe & sKies '); +select to_tsquery('english', 'qwe & sKies '); +select to_tsquery('simple', 'qwe & sKies '); select to_tsquery('english', '''the wether'':dc & '' sKies '':BC '); select to_tsquery('english', 'asd&(and|fghj)'); select to_tsquery('english', '(asd&and)|fghj'); @@ -288,7 +288,7 @@ An hour of storm to place The sculpture of these granite seams, Upon a woman s face. E. J. Pratt (1882 1964) ', to_tsquery('sea&thousand&years')); - + select headline('Erosion It took the sea a thousand years, A thousand years to trace The granite features of this cliff @@ -298,7 +298,7 @@ An hour of storm to place The sculpture of these granite seams, Upon a woman s face. E. J. Pratt (1882 1964) ', to_tsquery('granite&sea')); - + select headline('Erosion It took the sea a thousand years, A thousand years to trace The granite features of this cliff @@ -321,7 +321,7 @@ ff-bg document.write(15); -', +', to_tsquery('sea&foo'), 'HighlightAll=true'); --check debug select * from public.ts_debug('Tsearch module for PostgreSQL 7.3.3'); diff --git a/contrib/tsearch2/tsearch2.sql.in b/contrib/tsearch2/tsearch2.sql.in index 739d57eaa9..1df2908285 100644 --- a/contrib/tsearch2/tsearch2.sql.in +++ b/contrib/tsearch2/tsearch2.sql.in @@ -11,7 +11,7 @@ CREATE DOMAIN gtsvector AS pg_catalog.gtsvector; CREATE DOMAIN gtsq AS pg_catalog.text; --dict interface -CREATE FUNCTION lexize(oid, text) +CREATE FUNCTION lexize(oid, text) RETURNS _text as 'ts_lexize' LANGUAGE INTERNAL @@ -44,7 +44,7 @@ CREATE FUNCTION set_curdict(text) --built-in dictionaries CREATE FUNCTION dex_init(internal) RETURNS internal - as 'MODULE_PATHNAME', 'tsa_dex_init' + as 'MODULE_PATHNAME', 'tsa_dex_init' LANGUAGE C; CREATE FUNCTION dex_lexize(internal,internal,int4) @@ -66,7 +66,7 @@ CREATE FUNCTION snb_lexize(internal,internal,int4) CREATE FUNCTION snb_ru_init_koi8(internal) RETURNS internal - as 'MODULE_PATHNAME', 'tsa_snb_ru_init_koi8' + as 'MODULE_PATHNAME', 'tsa_snb_ru_init_koi8' LANGUAGE C; CREATE FUNCTION snb_ru_init_utf8(internal) @@ -81,7 +81,7 @@ CREATE FUNCTION snb_ru_init(internal) CREATE FUNCTION spell_init(internal) RETURNS internal - as 'MODULE_PATHNAME', 'tsa_spell_init' + as 'MODULE_PATHNAME', 'tsa_spell_init' LANGUAGE C; CREATE FUNCTION spell_lexize(internal,internal,int4) @@ -92,7 +92,7 @@ CREATE FUNCTION spell_lexize(internal,internal,int4) CREATE FUNCTION syn_init(internal) RETURNS internal - as 'MODULE_PATHNAME', 'tsa_syn_init' + as 'MODULE_PATHNAME', 'tsa_syn_init' LANGUAGE C; CREATE FUNCTION syn_lexize(internal,internal,int4) @@ -113,8 +113,8 @@ CREATE FUNCTION thesaurus_lexize(internal,internal,int4,internal) RETURNS NULL ON NULL INPUT; --sql-level interface -CREATE TYPE tokentype - as (tokid int4, alias text, descr text); +CREATE TYPE tokentype + as (tokid int4, alias text, descr text); CREATE FUNCTION token_type(int4) RETURNS setof tokentype @@ -149,7 +149,7 @@ CREATE FUNCTION set_curprs(text) LANGUAGE C RETURNS NULL ON NULL INPUT; -CREATE TYPE tokenout +CREATE TYPE tokenout as (tokid int4, token text); CREATE FUNCTION parse(oid,text) @@ -157,19 +157,19 @@ CREATE FUNCTION parse(oid,text) as 'ts_parse_byid' LANGUAGE INTERNAL RETURNS NULL ON NULL INPUT; - + CREATE FUNCTION parse(text,text) RETURNS setof tokenout as 'ts_parse_byname' LANGUAGE INTERNAL RETURNS NULL ON NULL INPUT; - + CREATE FUNCTION parse(text) RETURNS setof tokenout as 'MODULE_PATHNAME', 'tsa_parse_current' LANGUAGE C RETURNS NULL ON NULL INPUT; - + --default parser CREATE FUNCTION prsd_start(internal,int4) RETURNS internal @@ -399,7 +399,7 @@ AS STORAGE gtsvector; --stat info -CREATE TYPE statinfo +CREATE TYPE statinfo as (word text, ndoc int4, nentry int4); CREATE FUNCTION stat(text) @@ -560,7 +560,7 @@ AS CREATE OPERATOR CLASS tsvector_ops FOR TYPE tsvector USING btree AS OPERATOR 1 < , - OPERATOR 2 <= , + OPERATOR 2 <= , OPERATOR 3 = , OPERATOR 4 >= , OPERATOR 5 > , diff --git a/contrib/unaccent/Makefile b/contrib/unaccent/Makefile index 36415fef77..254155dcca 100644 --- a/contrib/unaccent/Makefile +++ b/contrib/unaccent/Makefile @@ -9,7 +9,7 @@ DATA_TSEARCH = unaccent.rules REGRESS = unaccent # Adjust REGRESS_OPTS because we need a UTF8 database -REGRESS_OPTS = --dbname=$(CONTRIB_TESTDB) --multibyte=UTF8 --no-locale +REGRESS_OPTS = --dbname=$(CONTRIB_TESTDB) --multibyte=UTF8 --no-locale ifdef USE_PGXS PG_CONFIG = pg_config diff --git a/contrib/xml2/expected/xml2.out b/contrib/xml2/expected/xml2.out index 53b8064cc3..8ce04d0b84 100644 --- a/contrib/xml2/expected/xml2.out +++ b/contrib/xml2/expected/xml2.out @@ -18,7 +18,7 @@ select query_to_xml('select 1 as x',true,false,''); (1 row) -select xslt_process( query_to_xml('select x from generate_series(1,5) as +select xslt_process( query_to_xml('select x from generate_series(1,5) as x',true,false,'')::text, $$ diff --git a/contrib/xml2/expected/xml2_1.out b/contrib/xml2/expected/xml2_1.out index b465ea27b6..d2d243ada7 100644 --- a/contrib/xml2/expected/xml2_1.out +++ b/contrib/xml2/expected/xml2_1.out @@ -18,7 +18,7 @@ select query_to_xml('select 1 as x',true,false,''); (1 row) -select xslt_process( query_to_xml('select x from generate_series(1,5) as +select xslt_process( query_to_xml('select x from generate_series(1,5) as x',true,false,'')::text, $$ diff --git a/contrib/xml2/sql/xml2.sql b/contrib/xml2/sql/xml2.sql index 202a72baed..5b3cc997f5 100644 --- a/contrib/xml2/sql/xml2.sql +++ b/contrib/xml2/sql/xml2.sql @@ -10,7 +10,7 @@ RESET client_min_messages; select query_to_xml('select 1 as x',true,false,''); -select xslt_process( query_to_xml('select x from generate_series(1,5) as +select xslt_process( query_to_xml('select x from generate_series(1,5) as x',true,false,'')::text, $$ diff --git a/doc/bug.template b/doc/bug.template index 7204935426..f1c5dc9d04 100644 --- a/doc/bug.template +++ b/doc/bug.template @@ -40,7 +40,7 @@ Please enter a FULL description of your problem: Please describe a way to repeat the problem. Please try to provide a -concise reproducible example, if at all possible: +concise reproducible example, if at all possible: ---------------------------------------------------------------------- diff --git a/doc/src/sgml/Makefile b/doc/src/sgml/Makefile index a7f0c8d634..a797499c79 100644 --- a/doc/src/sgml/Makefile +++ b/doc/src/sgml/Makefile @@ -64,7 +64,7 @@ CATALOG = -c $(DOCBOOKSTYLE)/catalog endif # Enable some extra warnings -# -wfully-tagged needed to throw a warning on missing tags +# -wfully-tagged needed to throw a warning on missing tags # for older tool chains, 2007-08-31 # Note: try "make SPFLAGS=-wxml" to catch a lot of other dubious constructs, # in particular < and & that haven't been made into entities. It's far too diff --git a/doc/src/sgml/auto-explain.sgml b/doc/src/sgml/auto-explain.sgml index 82b209f9c6..027138b92e 100644 --- a/doc/src/sgml/auto-explain.sgml +++ b/doc/src/sgml/auto-explain.sgml @@ -112,8 +112,8 @@ LOAD 'auto_explain'; auto_explain.log_buffers causes EXPLAIN - (ANALYZE, BUFFERS) output, rather than just EXPLAIN - output, to be printed when an execution plan is logged. This parameter is + (ANALYZE, BUFFERS) output, rather than just EXPLAIN + output, to be printed when an execution plan is logged. This parameter is off by default. Only superusers can change this setting. This parameter has no effect unless auto_explain.log_analyze parameter is set. diff --git a/doc/src/sgml/biblio.sgml b/doc/src/sgml/biblio.sgml index e02f443566..edc59bdbb6 100644 --- a/doc/src/sgml/biblio.sgml +++ b/doc/src/sgml/biblio.sgml @@ -257,7 +257,7 @@ ssimkovi@ag.or.at Proceedings and Articles This section is for articles and newsletters. - + Partial indexing in POSTGRES: research project Olson, 1993 @@ -328,7 +328,7 @@ ssimkovi@ag.or.at Generalized Partial Indexes <ulink url="http://citeseer.ist.psu.edu/seshadri95generalized.html">(cached version) -<!-- +<!-- Original URL: http://citeseer.ist.psu.edu/seshadri95generalized.html --> </ulink> diff --git a/doc/src/sgml/charset.sgml b/doc/src/sgml/charset.sgml index e94922124c..9e047e7dbd 100644 --- a/doc/src/sgml/charset.sgml +++ b/doc/src/sgml/charset.sgml @@ -71,7 +71,7 @@ initdb --locale=sv_SE locale then the specifications can take the form <replaceable>language_territory.codeset</>. For example, <literal>fr_BE.UTF-8</> represents the French language (fr) as - spoken in Belgium (BE), with a <acronym>UTF-8</> character set + spoken in Belgium (BE), with a <acronym>UTF-8</> character set encoding. </para> diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml index 898cdacbb1..96f1ef49b2 100644 --- a/doc/src/sgml/config.sgml +++ b/doc/src/sgml/config.sgml @@ -718,7 +718,7 @@ SET ENABLE_SEQSCAN TO OFF; <listitem> <para> Sets the location of the Kerberos server key file. See - <xref linkend="kerberos-auth"> or <xref linkend="gssapi-auth"> + <xref linkend="kerberos-auth"> or <xref linkend="gssapi-auth"> for details. This parameter can only be set in the <filename>postgresql.conf</> file or on the server command line. </para> @@ -748,7 +748,7 @@ SET ENABLE_SEQSCAN TO OFF; <para> Sets whether Kerberos and GSSAPI user names should be treated case-insensitively. - The default is <literal>off</> (case sensitive). This parameter can only be + The default is <literal>off</> (case sensitive). This parameter can only be set in the <filename>postgresql.conf</> file or on the server command line. </para> </listitem> @@ -1044,7 +1044,7 @@ SET ENABLE_SEQSCAN TO OFF; </para> </listitem> </varlistentry> - + <varlistentry id="guc-shared-preload-libraries" xreflabel="shared_preload_libraries"> <term><varname>shared_preload_libraries</varname> (<type>string</type>)</term> <indexterm> @@ -1076,7 +1076,7 @@ SET ENABLE_SEQSCAN TO OFF; when the library is first used. However, the time to start each new server process might increase slightly, even if that process never uses the library. So this parameter is recommended only for - libraries that will be used in most sessions. + libraries that will be used in most sessions. </para> <note> @@ -1084,7 +1084,7 @@ SET ENABLE_SEQSCAN TO OFF; On Windows hosts, preloading a library at server start will not reduce the time required to start each new server process; each server process will re-load all preload libraries. However, <varname>shared_preload_libraries - </varname> is still useful on Windows hosts because some shared libraries may + </varname> is still useful on Windows hosts because some shared libraries may need to perform certain operations that only take place at postmaster start (for example, a shared library may need to reserve lightweight locks or shared memory and you can't do that after the postmaster has started). @@ -1097,8 +1097,8 @@ SET ENABLE_SEQSCAN TO OFF; <para> Every PostgreSQL-supported library has a <quote>magic - block</> that is checked to guarantee compatibility. - For this reason, non-PostgreSQL libraries cannot be + block</> that is checked to guarantee compatibility. + For this reason, non-PostgreSQL libraries cannot be loaded in this way. </para> </listitem> @@ -1487,7 +1487,7 @@ SET ENABLE_SEQSCAN TO OFF; <para> <varname>fsync</varname> can only be set in the <filename>postgresql.conf</> file or on the server command line. - If you turn this parameter off, also consider turning off + If you turn this parameter off, also consider turning off <xref linkend="guc-full-page-writes">. </para> </listitem> @@ -1528,7 +1528,7 @@ SET ENABLE_SEQSCAN TO OFF; </para> </listitem> </varlistentry> - + <varlistentry id="guc-wal-sync-method" xreflabel="wal_sync_method"> <term><varname>wal_sync_method</varname> (<type>enum</type>)</term> <indexterm> @@ -1584,7 +1584,7 @@ SET ENABLE_SEQSCAN TO OFF; </para> </listitem> </varlistentry> - + <varlistentry id="guc-full-page-writes" xreflabel="full_page_writes"> <indexterm> <primary><varname>full_page_writes</> configuration parameter</primary> @@ -1848,7 +1848,7 @@ SET ENABLE_SEQSCAN TO OFF; </para> </listitem> </varlistentry> - + <varlistentry id="guc-archive-timeout" xreflabel="archive_timeout"> <term><varname>archive_timeout</varname> (<type>integer</type>)</term> <indexterm> @@ -2257,7 +2257,7 @@ SET ENABLE_SEQSCAN TO OFF; </para> </listitem> </varlistentry> - + </variablelist> </sect2> <sect2 id="runtime-config-query-constants"> @@ -2368,7 +2368,7 @@ SET ENABLE_SEQSCAN TO OFF; </para> </listitem> </varlistentry> - + <varlistentry id="guc-cpu-operator-cost" xreflabel="cpu_operator_cost"> <term><varname>cpu_operator_cost</varname> (<type>floating point</type>)</term> <indexterm> @@ -2382,7 +2382,7 @@ SET ENABLE_SEQSCAN TO OFF; </para> </listitem> </varlistentry> - + <varlistentry id="guc-effective-cache-size" xreflabel="effective_cache_size"> <term><varname>effective_cache_size</varname> (<type>integer</type>)</term> <indexterm> @@ -2745,10 +2745,10 @@ SELECT * FROM parent WHERE key = 2400; <productname>PostgreSQL</productname> supports several methods for logging server messages, including <systemitem>stderr</systemitem>, <systemitem>csvlog</systemitem> and - <systemitem>syslog</systemitem>. On Windows, + <systemitem>syslog</systemitem>. On Windows, <systemitem>eventlog</systemitem> is also supported. Set this parameter to a list of desired log destinations separated by - commas. The default is to log to <systemitem>stderr</systemitem> + commas. The default is to log to <systemitem>stderr</systemitem> only. This parameter can only be set in the <filename>postgresql.conf</> file or on the server command line. @@ -2759,7 +2759,7 @@ SELECT * FROM parent WHERE key = 2400; value</> (<acronym>CSV</>) format, which is convenient for loading logs into programs. See <xref linkend="runtime-config-logging-csvlog"> for details. - <varname>logging_collector</varname> must be enabled to generate + <varname>logging_collector</varname> must be enabled to generate CSV-format log output. </para> @@ -2822,7 +2822,7 @@ local0.* /var/log/postgresql </indexterm> <listitem> <para> - When <varname>logging_collector</> is enabled, + When <varname>logging_collector</> is enabled, this parameter determines the directory in which log files will be created. It can be specified as an absolute path, or relative to the cluster data directory. @@ -2861,7 +2861,7 @@ local0.* /var/log/postgresql </para> <para> If CSV-format output is enabled in <varname>log_destination</>, - <literal>.csv</> will be appended to the timestamped + <literal>.csv</> will be appended to the timestamped log file name to create the file name for CSV-format output. (If <varname>log_filename</> ends in <literal>.log</>, the suffix is replaced instead.) @@ -2966,18 +2966,18 @@ local0.* /var/log/postgresql </para> <para> Example: To keep 7 days of logs, one log file per day named - <literal>server_log.Mon</literal>, <literal>server_log.Tue</literal>, + <literal>server_log.Mon</literal>, <literal>server_log.Tue</literal>, etc, and automatically overwrite last week's log with this week's log, - set <varname>log_filename</varname> to <literal>server_log.%a</literal>, - <varname>log_truncate_on_rotation</varname> to <literal>on</literal>, and + set <varname>log_filename</varname> to <literal>server_log.%a</literal>, + <varname>log_truncate_on_rotation</varname> to <literal>on</literal>, and <varname>log_rotation_age</varname> to <literal>1440</literal>. </para> <para> - Example: To keep 24 hours of logs, one log file per hour, but - also rotate sooner if the log file size exceeds 1GB, set - <varname>log_filename</varname> to <literal>server_log.%H%M</literal>, - <varname>log_truncate_on_rotation</varname> to <literal>on</literal>, - <varname>log_rotation_age</varname> to <literal>60</literal>, and + Example: To keep 24 hours of logs, one log file per hour, but + also rotate sooner if the log file size exceeds 1GB, set + <varname>log_filename</varname> to <literal>server_log.%H%M</literal>, + <varname>log_truncate_on_rotation</varname> to <literal>on</literal>, + <varname>log_rotation_age</varname> to <literal>60</literal>, and <varname>log_rotation_size</varname> to <literal>1000000</literal>. Including <literal>%M</> in <varname>log_filename</varname> allows any size-driven rotations that might occur to select a file name @@ -3007,7 +3007,7 @@ local0.* /var/log/postgresql </para> </listitem> </varlistentry> - + <varlistentry id="guc-syslog-ident" xreflabel="syslog_ident"> <term><varname>syslog_ident</varname> (<type>string</type>)</term> <indexterm> @@ -3132,7 +3132,7 @@ local0.* /var/log/postgresql </para> </listitem> </varlistentry> - + <varlistentry id="guc-log-min-duration-statement" xreflabel="log_min_duration_statement"> <term><varname>log_min_duration_statement</varname> (<type>integer</type>)</term> <indexterm> @@ -3163,7 +3163,7 @@ local0.* /var/log/postgresql the text of statements that are logged because of <varname>log_statement</> will not be repeated in the duration log message. - If you are not using <application>syslog</>, it is recommended + If you are not using <application>syslog</>, it is recommended that you log the PID or session ID using <xref linkend="guc-log-line-prefix"> so that you can link the statement message to the later @@ -3365,8 +3365,8 @@ local0.* /var/log/postgresql <note> <para> - Some client programs, like <application>psql</>, attempt - to connect twice while determining if a password is required, so + Some client programs, like <application>psql</>, attempt + to connect twice while determining if a password is required, so duplicate <quote>connection received</> messages do not necessarily indicate a problem. </para> @@ -3462,7 +3462,7 @@ local0.* /var/log/postgresql </para> </listitem> </varlistentry> - + <varlistentry id="guc-log-line-prefix" xreflabel="log_line_prefix"> <term><varname>log_line_prefix</varname> (<type>string</type>)</term> <indexterm> @@ -3607,7 +3607,7 @@ FROM pg_stat_activity; <tip> <para> - <application>Syslog</> produces its own + <application>Syslog</> produces its own time stamp and process ID information, so you probably do not want to include those escapes if you are logging to <application>syslog</>. </para> @@ -3808,9 +3808,9 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv; <listitem> <para> - Set <varname>log_rotation_size</varname> to 0 to disable - size-based log rotation, as it makes the log file name difficult - to predict. + Set <varname>log_rotation_size</varname> to 0 to disable + size-based log rotation, as it makes the log file name difficult + to predict. </para> </listitem> @@ -5000,7 +5000,7 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir' <para> Every PostgreSQL-supported library has a <quote>magic - block</> that is checked to guarantee compatibility. + block</> that is checked to guarantee compatibility. For this reason, non-PostgreSQL libraries cannot be loaded in this way. </para> diff --git a/doc/src/sgml/contacts.sgml b/doc/src/sgml/contacts.sgml index 996c0771bb..a981625027 100644 --- a/doc/src/sgml/contacts.sgml +++ b/doc/src/sgml/contacts.sgml @@ -15,7 +15,7 @@ and the mailing lists themselves. <para> Refer to the introduction in this manual or to the -<productname>PostgreSQL</productname> +<productname>PostgreSQL</productname> <ulink url="http://www.postgresql.org">web page</ulink> for subscription information to the no-cost mailing lists. </para> diff --git a/doc/src/sgml/contrib.sgml b/doc/src/sgml/contrib.sgml index 9057996014..a7c2a1d43e 100644 --- a/doc/src/sgml/contrib.sgml +++ b/doc/src/sgml/contrib.sgml @@ -16,7 +16,7 @@ <para> When building from the source distribution, these modules are not built - automatically, unless you build the "world" target + automatically, unless you build the "world" target (see <xref linkend="build">). You can build and install all of them by running: <screen> diff --git a/doc/src/sgml/datatype.sgml b/doc/src/sgml/datatype.sgml index 02eaedf943..66aef15608 100644 --- a/doc/src/sgml/datatype.sgml +++ b/doc/src/sgml/datatype.sgml @@ -21,7 +21,7 @@ <para> <xref linkend="datatype-table"> shows all the built-in general-purpose data - types. Most of the alternative names listed in the + types. Most of the alternative names listed in the <quote>Aliases</quote> column are the names used internally by <productname>PostgreSQL</productname> for historical reasons. In addition, some internally used or deprecated types are available, @@ -555,7 +555,7 @@ NUMERIC <para> In addition to ordinary numeric values, the <type>numeric</type> - type allows the special value <literal>NaN</>, meaning + type allows the special value <literal>NaN</>, meaning <quote>not-a-number</quote>. Any operation on <literal>NaN</> yields another <literal>NaN</>. When writing this value as a constant in an SQL command, you must put quotes around it, @@ -703,9 +703,9 @@ NUMERIC <type>float(<replaceable>p</replaceable>)</type> for specifying inexact numeric types. Here, <replaceable>p</replaceable> specifies the minimum acceptable precision in <emphasis>binary</> digits. - <productname>PostgreSQL</productname> accepts + <productname>PostgreSQL</productname> accepts <type>float(1)</type> to <type>float(24)</type> as selecting the - <type>real</type> type, while + <type>real</type> type, while <type>float(25)</type> to <type>float(53)</type> select <type>double precision</type>. Values of <replaceable>p</replaceable> outside the allowed range draw an error. @@ -1628,7 +1628,7 @@ MINUTE TO SECOND <para> Date and time input is accepted in almost any reasonable format, including - ISO 8601, <acronym>SQL</acronym>-compatible, + ISO 8601, <acronym>SQL</acronym>-compatible, traditional <productname>POSTGRES</productname>, and others. For some formats, ordering of day, month, and year in date input is ambiguous and there is support for specifying the expected @@ -1645,12 +1645,12 @@ MINUTE TO SECOND See <xref linkend="datetime-appendix"> for the exact parsing rules of date/time input and for the recognized text fields including months, days of the week, and - time zones. + time zones. </para> <para> Remember that any date or time literal input needs to be enclosed - in single quotes, like text strings. Refer to + in single quotes, like text strings. Refer to <xref linkend="sql-syntax-constants-generic"> for more information. <acronym>SQL</acronym> requires the following syntax @@ -1672,7 +1672,7 @@ MINUTE TO SECOND <indexterm> <primary>date</primary> </indexterm> - + <para> <xref linkend="datatype-datetime-date-table"> shows some possible inputs for the <type>date</type> type. @@ -1787,7 +1787,7 @@ MINUTE TO SECOND <para> Valid input for these types consists of a time of day followed by an optional time zone. (See <xref - linkend="datatype-datetime-time-table"> + linkend="datatype-datetime-time-table"> and <xref linkend="datatype-timezone-table">.) If a time zone is specified in the input for <type>time without time zone</type>, it is silently ignored. You can also specify a date but it will @@ -1954,8 +1954,8 @@ January 8 04:05:06 1999 PST <para> The <acronym>SQL</acronym> standard differentiates - <type>timestamp without time zone</type> - and <type>timestamp with time zone</type> literals by the presence of a + <type>timestamp without time zone</type> + and <type>timestamp with time zone</type> literals by the presence of a <quote>+</quote> or <quote>-</quote> symbol and time zone offset after the time. Hence, according to the standard, @@ -2097,10 +2097,10 @@ January 8 04:05:06 1999 PST The following <acronym>SQL</acronym>-compatible functions can also be used to obtain the current time value for the corresponding data type: - <literal>CURRENT_DATE</literal>, <literal>CURRENT_TIME</literal>, - <literal>CURRENT_TIMESTAMP</literal>, <literal>LOCALTIME</literal>, - <literal>LOCALTIMESTAMP</literal>. The latter four accept an - optional subsecond precision specification. (See <xref + <literal>CURRENT_DATE</literal>, <literal>CURRENT_TIME</literal>, + <literal>CURRENT_TIMESTAMP</literal>, <literal>LOCALTIME</literal>, + <literal>LOCALTIMESTAMP</literal>. The latter four accept an + optional subsecond precision specification. (See <xref linkend="functions-datetime-current">.) Note that these are SQL functions and are <emphasis>not</> recognized in data input strings. </para> @@ -2255,10 +2255,10 @@ January 8 04:05:06 1999 PST <itemizedlist> <listitem> <para> - Although the <type>date</type> type + Although the <type>date</type> type cannot have an associated time zone, the <type>time</type> type can. - Time zones in the real world have little meaning unless + Time zones in the real world have little meaning unless associated with a date as well as a time, since the offset can vary through the year with daylight-saving time boundaries. @@ -2267,7 +2267,7 @@ January 8 04:05:06 1999 PST <listitem> <para> - The default time zone is specified as a constant numeric offset + The default time zone is specified as a constant numeric offset from <acronym>UTC</>. It is therefore impossible to adapt to daylight-saving time when doing date/time arithmetic across <acronym>DST</acronym> boundaries. @@ -2901,7 +2901,7 @@ SELECT * FROM person WHERE current_mood = 'happy'; order in which the values were listed when the type was created. All standard comparison operators and related aggregate functions are supported for enums. For example: - + <programlisting> INSERT INTO person VALUES ('Larry', 'sad'); INSERT INTO person VALUES ('Curly', 'ok'); @@ -2919,7 +2919,7 @@ SELECT * FROM person WHERE current_mood > 'sad' ORDER BY current_mood; Moe | happy (2 rows) -SELECT name +SELECT name FROM person WHERE current_mood = (SELECT MIN(current_mood) FROM person); name @@ -2972,7 +2972,7 @@ SELECT person.name, holidays.num_weeks FROM person, holidays <sect2> <title>Implementation Details - + An enum value occupies four bytes on disk. The length of an enum value's textual label is limited by the NAMEDATALEN @@ -3409,8 +3409,8 @@ SELECT person.name, holidays.num_weeks FROM person, holidays <type>cidr</> Type Input Examples - - + + cidr Input cidr Output abbrev(cidr) @@ -3772,7 +3772,7 @@ select 'The Fat Rats'::tsvector; for searching: -SELECT to_tsvector('english', 'The Fat Rats'); +SELECT to_tsvector('english', 'The Fat Rats'); to_tsvector ----------------- 'fat':2 'rat':3 @@ -3913,7 +3913,7 @@ a0ee-bc99-9c0b-4ef8-bb6d-6bb9-bd38-0a11 functions for UUIDs, but the core database does not include any function for generating UUIDs, because no single algorithm is well suited for every application. The contrib module - contrib/uuid-ossp provides functions that implement + contrib/uuid-ossp provides functions that implement several standard algorithms. Alternatively, UUIDs could be generated by client applications or other libraries invoked through a server-side function. @@ -3933,7 +3933,7 @@ a0ee-bc99-9c0b-4ef8-bb6d-6bb9-bd38-0a11 checks the input values for well-formedness, and there are support functions to perform type-safe operations on it; see . Use of this data type requires the - installation to have been built with configure + installation to have been built with configure --with-libxml. diff --git a/doc/src/sgml/datetime.sgml b/doc/src/sgml/datetime.sgml index fb75a1e8b0..0b55446245 100644 --- a/doc/src/sgml/datetime.sgml +++ b/doc/src/sgml/datetime.sgml @@ -75,7 +75,7 @@ If the token is a text string, match up with possible strings: - + @@ -83,7 +83,7 @@ abbreviation. - + If not found, do a similar binary-search table lookup to match @@ -101,7 +101,7 @@ - + When the token is a number or number field: @@ -111,7 +111,7 @@ If there are eight or six digits, - and if no other date fields have been previously read, then interpret + and if no other date fields have been previously read, then interpret as a concatenated date (e.g., 19990118 or 990118). The interpretation is YYYYMMDD or YYMMDD. @@ -124,7 +124,7 @@ and a year has already been read, then interpret as day of year. - + If four or six digits and a year has already been read, then @@ -465,7 +465,7 @@ about 1 day in 128 years. - + The accumulating calendar error prompted Pope Gregory XIII to reform the calendar in accordance with instructions from the Council of Trent. @@ -544,7 +544,7 @@ $ cal 9 1752 the beginnings of the Chinese calendar can be traced back to the 14th century BC. Legend has it that the Emperor Huangdi invented that calendar in 2637 BC. - + The People's Republic of China uses the Gregorian calendar for civil purposes. The Chinese calendar is used for determining festivals. @@ -552,7 +552,7 @@ $ cal 9 1752 The Julian Date is unrelated to the Julian - calendar. + calendar. The Julian Date system was invented by the French scholar Joseph Justus Scaliger (1540-1609) and probably takes its name from Scaliger's father, diff --git a/doc/src/sgml/dfunc.sgml b/doc/src/sgml/dfunc.sgml index 689b14ffa5..155207bd3e 100644 --- a/doc/src/sgml/dfunc.sgml +++ b/doc/src/sgml/dfunc.sgml @@ -160,7 +160,7 @@ cc -shared -o foo.so foo.o Here is an example. It assumes the developer tools are installed. -cc -c foo.c +cc -c foo.c cc -bundle -flat_namespace -undefined suppress -o foo.so foo.o @@ -226,7 +226,7 @@ gcc -G -o foo.so foo.o - Tru64 UNIX + Tru64 UNIX Tru64 UNIXshared library Digital UNIXTru64 UNIX @@ -272,7 +272,7 @@ gcc -shared -o foo.so foo.o - If this is too complicated for you, you should consider using + If this is too complicated for you, you should consider using GNU Libtool, which hides the platform differences behind a uniform interface. diff --git a/doc/src/sgml/docguide.sgml b/doc/src/sgml/docguide.sgml index 5da2d61b20..008ebcdcf6 100644 --- a/doc/src/sgml/docguide.sgml +++ b/doc/src/sgml/docguide.sgml @@ -240,7 +240,7 @@ It's possible that the ports do not update the main catalog file - in /usr/local/share/sgml/catalog.ports or order + in /usr/local/share/sgml/catalog.ports or order isn't proper . Be sure to have the following lines in beginning of file: CATALOG "openjade/catalog" @@ -613,7 +613,7 @@ gmake man - + To make a PDF: @@ -1059,7 +1059,7 @@ save_size.pdfjadetex = 15000 Norm Walsh offers a major mode - specifically for DocBook which also has font-lock and a number of features to + specifically for DocBook which also has font-lock and a number of features to reduce typing. @@ -1114,7 +1114,7 @@ save_size.pdfjadetex = 15000 - + Description @@ -1123,7 +1123,7 @@ save_size.pdfjadetex = 15000 - + Options @@ -1133,7 +1133,7 @@ save_size.pdfjadetex = 15000 - + Exit Status @@ -1144,7 +1144,7 @@ save_size.pdfjadetex = 15000 - + Usage @@ -1156,7 +1156,7 @@ save_size.pdfjadetex = 15000 - + Environment @@ -1167,7 +1167,7 @@ save_size.pdfjadetex = 15000 - + Files @@ -1178,7 +1178,7 @@ save_size.pdfjadetex = 15000 - + Diagnostics @@ -1191,7 +1191,7 @@ save_size.pdfjadetex = 15000 - + Notes @@ -1202,7 +1202,7 @@ save_size.pdfjadetex = 15000 - + Examples @@ -1211,7 +1211,7 @@ save_size.pdfjadetex = 15000 - + History @@ -1222,7 +1222,7 @@ save_size.pdfjadetex = 15000 - + See Also diff --git a/doc/src/sgml/ecpg.sgml b/doc/src/sgml/ecpg.sgml index 387f50d6d0..83f396ad21 100644 --- a/doc/src/sgml/ecpg.sgml +++ b/doc/src/sgml/ecpg.sgml @@ -110,7 +110,7 @@ EXEC SQL CONNECT TO target AS unix:postgresql://hostname:port/dbname?options - + an SQL string literal containing one of the above forms @@ -122,7 +122,7 @@ EXEC SQL CONNECT TO target AS a reference to a character variable containing one of the above forms (see examples) - + DEFAULT @@ -2743,7 +2743,6 @@ timestamp PGTYPEStimestamp_from_asc(char *str, char **endptr); The function returns the parsed timestamp on success. On error, PGTYPESInvalidTimestamp is returned and errno is set to PGTYPES_TS_BAD_TIMESTAMP. See for important notes on this value. - In general, the input string can contain any combination of an allowed @@ -2839,7 +2838,7 @@ int PGTYPEStimestamp_fmt_asc(timestamp *ts, char *output, int str_len, char *fmt You can use the following format specifiers for the format mask. The format specifiers are the same ones that are used in the strftime function in libc. Any - non-format specifier will be copied into the output buffer. + non-format specifier will be copied into the output buffer. @@ -2897,24 +2896,24 @@ int PGTYPEStimestamp_fmt_asc(timestamp *ts, char *output, int str_len, char *fmt %E* %O* - POSIX locale extensions. The sequences %Ec - %EC - %Ex - %EX - %Ey - %EY - %Od + %EC + %Ex + %EX + %Ey + %EY + %Od %Oe - %OH - %OI - %Om - %OM - %OS - %Ou - %OU - %OV - %Ow - %OW - %Oy + %OH + %OI + %Om + %OM + %OS + %Ou + %OU + %OV + %Ow + %OW + %Oy are supposed to provide alternative representations. @@ -5763,10 +5762,10 @@ ECPG = ecpg On Windows, if the ecpg libraries and an application are - compiled with different flags, this function call will crash the - application because the internal representation of the + compiled with different flags, this function call will crash the + application because the internal representation of the FILE pointers differ. Specifically, - multithreaded/single-threaded, release/debug, and static/dynamic + multithreaded/single-threaded, release/debug, and static/dynamic flags should be the same for the library and all applications using that library. @@ -5778,7 +5777,7 @@ ECPG = ecpg ECPGget_PGconn(const char *connection_name) returns the library database connection handle identified by the given name. If connection_name is set to NULL, the current - connection handle is returned. If no connection handle can be identified, the function returns + connection handle is returned. If no connection handle can be identified, the function returns NULL. The returned connection handle can be used to call any other functions from libpq, if necessary. @@ -5803,7 +5802,7 @@ ECPG = ecpg ECPGstatus(int lineno, const char* connection_name) returns true if you are connected to a database and false if not. - connection_name can be NULL + connection_name can be NULL if a single connection is being used. @@ -8064,7 +8063,7 @@ typedef struct sqlda_compat sqlda_t; Pointer to the field data. The pointer is of char * type, the data pointed by it is in a binary format. Example: -int intval; +int intval; switch (sqldata->sqlvar[i].sqltype) { @@ -8083,7 +8082,7 @@ switch (sqldata->sqlvar[i].sqltype) Pointer to the NULL indicator. If returned by DESCRIBE or FETCH then it's always a valid pointer. - If used as input for EXECUTE ... USING sqlda; then NULL-pointer value means + If used as input for EXECUTE ... USING sqlda; then NULL-pointer value means that the value for this field is non-NULL. Otherwise a valid pointer and sqlitype has to be properly set. Example: @@ -8117,7 +8116,7 @@ if (*(int2 *)sqldata->sqlvar[i].sqlind != 0) Type of the NULL indicator data. It's always SQLSMINT when returning data from the server. - When the SQLDA is used for a parametrized query, the data is treated + When the SQLDA is used for a parametrized query, the data is treated according to the set type. @@ -8143,13 +8142,13 @@ if (*(int2 *)sqldata->sqlvar[i].sqlind != 0) sqltypename - sqltypelen + sqltypelen sqlownerlen sqlsourcetype - sqlownername - sqlsourceid - sqlflags - sqlreserved + sqlownername + sqlsourceid + sqlflags + sqlreserved Unused. @@ -8469,7 +8468,7 @@ int dectoasc(decimal *np, char *cp, int len, int right) The function returns either -1 if the buffer cp was too small or ECPG_INFORMIX_OUT_OF_MEMORY if memory was - exhausted. + exhausted. @@ -9548,7 +9547,7 @@ risnull(CINTTYPE, (char *) &i); - + A pointer to the value or a pointer to the pointer. diff --git a/doc/src/sgml/extend.sgml b/doc/src/sgml/extend.sgml index 2e8f77cf4f..246451a42e 100644 --- a/doc/src/sgml/extend.sgml +++ b/doc/src/sgml/extend.sgml @@ -9,7 +9,7 @@ In the sections that follow, we will discuss how you - can extend the PostgreSQL + can extend the PostgreSQL SQL query language by adding: @@ -45,8 +45,8 @@ How Extensibility Works - PostgreSQL is extensible because its operation is - catalog-driven. If you are familiar with standard + PostgreSQL is extensible because its operation is + catalog-driven. If you are familiar with standard relational database systems, you know that they store information about databases, tables, columns, etc., in what are commonly known as system catalogs. (Some systems call @@ -54,14 +54,14 @@ user as tables like any other, but the DBMS stores its internal bookkeeping in them. One key difference between PostgreSQL and standard relational database systems is - that PostgreSQL stores much more information in its + that PostgreSQL stores much more information in its catalogs: not only information about tables and columns, but also information about data types, functions, access methods, and so on. These tables can be modified by - the user, and since PostgreSQL bases its operation + the user, and since PostgreSQL bases its operation on these tables, this means that PostgreSQL can be extended by users. By comparison, conventional - database systems can only be extended by changing hardcoded + database systems can only be extended by changing hardcoded procedures in the source code or by loading modules specially written by the DBMS vendor. @@ -209,7 +209,7 @@ parsed. Each position (either argument or return value) declared as anyelement is allowed to have any specific actual data type, but in any given call they must all be the - same actual type. Each + same actual type. Each position declared as anyarray can have any array data type, but similarly they must all be the same type. If there are positions declared anyarray and others declared diff --git a/doc/src/sgml/external-projects.sgml b/doc/src/sgml/external-projects.sgml index 8927ef344b..129b9814eb 100644 --- a/doc/src/sgml/external-projects.sgml +++ b/doc/src/sgml/external-projects.sgml @@ -218,7 +218,7 @@
- + Extensions @@ -247,7 +247,7 @@ There are several administration tools available for PostgreSQL. The most popular is - pgAdmin III, + pgAdmin III, and there are several commercially available ones as well. diff --git a/doc/src/sgml/filelist.sgml b/doc/src/sgml/filelist.sgml index 39cfcee961..4361991ea9 100644 --- a/doc/src/sgml/filelist.sgml +++ b/doc/src/sgml/filelist.sgml @@ -134,7 +134,7 @@ - + diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml index e4d00b2403..6992aaa281 100644 --- a/doc/src/sgml/func.sgml +++ b/doc/src/sgml/func.sgml @@ -30,7 +30,7 @@ is present in other SQL database management systems, and in many cases this functionality is compatible and consistent between the various implementations. This chapter is also - not exhaustive; additional functions appear in relevant sections of + not exhaustive; additional functions appear in relevant sections of the manual. @@ -416,7 +416,7 @@ IS NOT NULL, respectively, except that the input expression must be of Boolean type. - + - A relation scheme R is a + A relation scheme R is a finite set of attributes A1, A2, @@ -416,7 +416,7 @@ attributes are taken from. We often write a relation scheme as SELECT (σ): extracts tuples from a relation that - satisfy a given restriction. Let R be a + satisfy a given restriction. Let R be a table that contains an attribute A. σA=a(R) = {t ∈ R ∣ t(A) = a} @@ -447,7 +447,7 @@ attributes are taken from. We often write a relation scheme as S be a table with arity k2. R × S - is the set of all + is the set of all k1 + k2-tuples whose first k1 @@ -477,7 +477,7 @@ attributes are taken from. We often write a relation scheme as set of tuples that are in R and in S. - We again require that R and + We again require that R and S have the same arity. @@ -497,14 +497,14 @@ attributes are taken from. We often write a relation scheme as JOIN (∏): connects two tables by their common - attributes. Let R be a table with the - attributes A,B + attributes. Let R be a table with the + attributes A,B and C and let S be a table with the attributes C,D and E. There is one attribute common to both relations, - the attribute C. + the attribute C. @@ -45,7 +45,7 @@ ;; Don't append period if run-in title ends with any of these ;; characters. We had to add the colon here. This is fixed in ;; stylesheets version 1.71, so it can be removed sometime. -(define %content-title-end-punct% +(define %content-title-end-punct% '(#\. #\! #\? #\:)) ;; No automatic punctuation after honorific name parts @@ -114,7 +114,7 @@ (normalize "author") (normalize "authorgroup") (normalize "title") - (normalize "subtitle") + (normalize "subtitle") (normalize "volumenum") (normalize "edition") (normalize "othercredit") @@ -214,7 +214,7 @@ (empty-sosofo))) ;; Add character encoding and time of creation into HTML header -(define %html-header-tags% +(define %html-header-tags% (list (list "META" '("HTTP-EQUIV" "Content-Type") '("CONTENT" "text/html; charset=ISO-8859-1")) (list "META" '("NAME" "creation") (list "CONTENT" (time->string (time) #t))))) @@ -332,7 +332,7 @@ (make element gi: "A" attributes: (list (list "TITLE" (element-title-string nextsib)) - (list "HREF" + (list "HREF" (href-to nextsib))) (gentext-nav-next-sibling nextsib)))) @@ -346,7 +346,7 @@ (make element gi: "A" attributes: (list (list "TITLE" (element-title-string next)) - (list "HREF" + (list "HREF" (href-to next)) (list "ACCESSKEY" @@ -556,7 +556,7 @@ (my-simplelist-vert members)) ((equal? type (normalize "horiz")) (simplelist-table 'row cols members))))) - + (element member (let ((type (inherited-attribute-string (normalize "type")))) (cond @@ -585,7 +585,7 @@ (let ((table (ancestor-member nd ($table-element-list$)))) (if (node-list-empty? table) nd - table))) + table))) ;; (The function below overrides the one in print/dbindex.dsl.) @@ -652,7 +652,7 @@ (define (part-titlepage elements #!optional (side 'recto)) - (let ((nodelist (titlepage-nodelist + (let ((nodelist (titlepage-nodelist (if (equal? side 'recto) (reference-titlepage-recto-elements) (reference-titlepage-verso-elements)) @@ -670,7 +670,7 @@ page-number-restart?: (first-part?) input-whitespace-treatment: 'collapse use: default-text-style - + ;; This hack is required for the RTF backend. If an external-graphic ;; is the first thing on the page, RTF doesn't seem to do the right ;; thing (the graphic winds up on the baseline of the first line @@ -679,7 +679,7 @@ (make paragraph line-spacing: 1pt (literal "")) - + (let loop ((nl nodelist) (lastnode (empty-node-list))) (if (node-list-empty? nl) (empty-sosofo) @@ -717,7 +717,7 @@ (define (reference-titlepage elements #!optional (side 'recto)) - (let ((nodelist (titlepage-nodelist + (let ((nodelist (titlepage-nodelist (if (equal? side 'recto) (reference-titlepage-recto-elements) (reference-titlepage-verso-elements)) @@ -735,7 +735,7 @@ page-number-restart?: (first-reference?) input-whitespace-treatment: 'collapse use: default-text-style - + ;; This hack is required for the RTF backend. If an external-graphic ;; is the first thing on the page, RTF doesn't seem to do the right ;; thing (the graphic winds up on the baseline of the first line @@ -744,7 +744,7 @@ (make paragraph line-spacing: 1pt (literal "")) - + (let loop ((nl nodelist) (lastnode (empty-node-list))) (if (node-list-empty? nl) (empty-sosofo) @@ -812,13 +812,13 @@ Lynx, or similar). (literal "*") sosofo (literal "*"))) - + (define ($dquote-seq$ #!optional (sosofo (process-children))) (make sequence (literal (gentext-start-quote)) sosofo (literal (gentext-end-quote)))) - + (element (para command) ($dquote-seq$)) (element (para emphasis) ($asterix-seq$)) (element (para filename) ($dquote-seq$)) diff --git a/doc/src/sgml/vacuumlo.sgml b/doc/src/sgml/vacuumlo.sgml index 76e2282ad6..65f55f03c9 100644 --- a/doc/src/sgml/vacuumlo.sgml +++ b/doc/src/sgml/vacuumlo.sgml @@ -75,7 +75,7 @@ vacuumlo [options] database [database2 ... databaseN] Force vacuumlo to prompt for a - password before connecting to a database. + password before connecting to a database. diff --git a/doc/src/sgml/wal.sgml b/doc/src/sgml/wal.sgml index 2266d549ff..a2724fad6b 100644 --- a/doc/src/sgml/wal.sgml +++ b/doc/src/sgml/wal.sgml @@ -390,7 +390,7 @@ are points in the sequence of transactions at which it is guaranteed that the heap and index data files have been updated with all information written before the checkpoint. At checkpoint time, all dirty data pages are flushed to - disk and a special checkpoint record is written to the log file. + disk and a special checkpoint record is written to the log file. (The changes were previously flushed to the WAL files.) In the event of a crash, the crash recovery procedure looks at the latest checkpoint record to determine the point in the log (known as the redo diff --git a/doc/src/sgml/xindex.sgml b/doc/src/sgml/xindex.sgml index 8c829a9df7..8f9fd21f38 100644 --- a/doc/src/sgml/xindex.sgml +++ b/doc/src/sgml/xindex.sgml @@ -373,7 +373,7 @@ - consistent - determine whether key satisfies the + consistent - determine whether key satisfies the query qualifier 1 @@ -387,12 +387,12 @@ 3 - decompress - compute a decompressed representation of a + decompress - compute a decompressed representation of a compressed key 4 - penalty - compute penalty for inserting new key into subtree + penalty - compute penalty for inserting new key into subtree with given subtree's key 5 @@ -940,7 +940,7 @@ SELECT * FROM table WHERE integer_column < 4; can be satisfied exactly by a B-tree index on the integer column. But there are cases where an index is useful as an inexact guide to the matching rows. For example, if a GiST index stores only bounding boxes - for geometric objects, then it cannot exactly satisfy a WHERE + for geometric objects, then it cannot exactly satisfy a WHERE condition that tests overlap between nonrectangular objects such as polygons. Yet we could use the index to find objects whose bounding box overlaps the bounding box of the target object, and then do the diff --git a/doc/src/sgml/xoper.sgml b/doc/src/sgml/xoper.sgml index a2592c304d..ea64a152f7 100644 --- a/doc/src/sgml/xoper.sgml +++ b/doc/src/sgml/xoper.sgml @@ -52,7 +52,7 @@ CREATE OPERATOR + ( Now we could execute a query like this: - + SELECT (a + b) AS c FROM test_complex; diff --git a/doc/src/sgml/xtypes.sgml b/doc/src/sgml/xtypes.sgml index b020f28e87..972cc76bf9 100644 --- a/doc/src/sgml/xtypes.sgml +++ b/doc/src/sgml/xtypes.sgml @@ -207,7 +207,7 @@ CREATE FUNCTION complex_send(complex) Finally, we can provide the full definition of the data type: CREATE TYPE complex ( - internallength = 16, + internallength = 16, input = complex_in, output = complex_out, receive = complex_recv, diff --git a/src/Makefile.global.in b/src/Makefile.global.in index 85cf617786..7a61a5a1a1 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -258,7 +258,7 @@ RANLIB = @RANLIB@ WINDRES = @WINDRES@ X = @EXEEXT@ -# Perl +# Perl ifneq (@PERL@,) # quoted to protect pathname with spaces @@ -391,7 +391,7 @@ endif # This macro is for use by libraries linking to libpq. (Because libpgport # isn't created with the same link flags as libpq, it can't be used.) libpq = -L$(libpq_builddir) -lpq - + # If doing static linking, shared library dependency info isn't available, # so add in the libraries that libpq depends on. ifeq ($(enable_shared), no) @@ -400,9 +400,9 @@ libpq += $(filter -lintl -lssl -lcrypto -lkrb5 -lcrypt, $(LIBS)) \ endif # This macro is for use by client executables (not libraries) that use libpq. -# We force clients to pull symbols from the non-shared library libpgport -# rather than pulling some libpgport symbols from libpq just because -# libpq uses those functions too. This makes applications less +# We force clients to pull symbols from the non-shared library libpgport +# rather than pulling some libpgport symbols from libpq just because +# libpq uses those functions too. This makes applications less # dependent on changes in libpq's usage of pgport. To do this we link to # pgport before libpq. This does cause duplicate -lpgport's to appear # on client link lines. @@ -517,7 +517,7 @@ $(top_builddir)/src/include/pg_config.h: $(top_builddir)/src/include/stamp-h $(top_builddir)/src/include/stamp-h: $(top_srcdir)/src/include/pg_config.h.in $(top_builddir)/config.status cd $(top_builddir) && ./config.status src/include/pg_config.h -# Also remake ecpg_config.h from ecpg_config.h.in if the latter changed, same +# Also remake ecpg_config.h from ecpg_config.h.in if the latter changed, same # logic as above. $(top_builddir)/src/interfaces/ecpg/include/ecpg_config.h: $(top_builddir)/src/interfaces/ecpg/include/stamp-h diff --git a/src/Makefile.shlib b/src/Makefile.shlib index b6dea47f90..a5cf6c6c16 100644 --- a/src/Makefile.shlib +++ b/src/Makefile.shlib @@ -271,7 +271,7 @@ endif ifeq ($(PORTNAME), sunos4) LINK.shared = $(LD) -assert pure-text -Bdynamic endif - + ifeq ($(PORTNAME), osf) LINK.shared = $(LD) -shared -expect_unresolved '*' endif diff --git a/src/backend/Makefile b/src/backend/Makefile index 9a0f2e21e5..87b97c21d9 100644 --- a/src/backend/Makefile +++ b/src/backend/Makefile @@ -187,7 +187,7 @@ distprep: $(MAKE) -C parser gram.c gram.h scan.c $(MAKE) -C bootstrap bootparse.c bootscanner.c $(MAKE) -C catalog schemapg.h postgres.bki postgres.description postgres.shdescription - $(MAKE) -C utils fmgrtab.c fmgroids.h + $(MAKE) -C utils fmgrtab.c fmgroids.h $(MAKE) -C utils/misc guc-file.c @@ -305,7 +305,7 @@ maintainer-clean: distclean # # Support for code development. # -# Use target "quick" to build "postgres" when you know all the subsystems +# Use target "quick" to build "postgres" when you know all the subsystems # are up to date. It saves the time of doing all the submakes. .PHONY: quick quick: $(OBJS) diff --git a/src/backend/access/gin/README b/src/backend/access/gin/README index 69d5a31941..0f634f83d1 100644 --- a/src/backend/access/gin/README +++ b/src/backend/access/gin/README @@ -9,27 +9,27 @@ Gin stands for Generalized Inverted Index and should be considered as a genie, not a drink. Generalized means that the index does not know which operation it accelerates. -It instead works with custom strategies, defined for specific data types (read -"Index Method Strategies" in the PostgreSQL documentation). In that sense, Gin +It instead works with custom strategies, defined for specific data types (read +"Index Method Strategies" in the PostgreSQL documentation). In that sense, Gin is similar to GiST and differs from btree indices, which have predefined, comparison-based operations. -An inverted index is an index structure storing a set of (key, posting list) -pairs, where 'posting list' is a set of documents in which the key occurs. -(A text document would usually contain many keys.) The primary goal of +An inverted index is an index structure storing a set of (key, posting list) +pairs, where 'posting list' is a set of documents in which the key occurs. +(A text document would usually contain many keys.) The primary goal of Gin indices is support for highly scalable, full-text search in PostgreSQL. Gin consists of a B-tree index constructed over entries (ET, entries tree), where each entry is an element of the indexed value (element of array, lexeme -for tsvector) and where each tuple in a leaf page is either a pointer to a -B-tree over item pointers (PT, posting tree), or a list of item pointers +for tsvector) and where each tuple in a leaf page is either a pointer to a +B-tree over item pointers (PT, posting tree), or a list of item pointers (PL, posting list) if the tuple is small enough. Note: There is no delete operation for ET. The reason for this is that in our experience, the set of distinct words in a large corpus changes very rarely. This greatly simplifies the code and concurrency algorithms. -Gin comes with built-in support for one-dimensional arrays (eg. integer[], +Gin comes with built-in support for one-dimensional arrays (eg. integer[], text[]), but no support for NULL elements. The following operations are available: @@ -59,25 +59,25 @@ Gin Fuzzy Limit There are often situations when a full-text search returns a very large set of results. Since reading tuples from the disk and sorting them could take a -lot of time, this is unacceptable for production. (Note that the search +lot of time, this is unacceptable for production. (Note that the search itself is very fast.) -Such queries usually contain very frequent lexemes, so the results are not -very helpful. To facilitate execution of such queries Gin has a configurable -soft upper limit on the size of the returned set, determined by the -'gin_fuzzy_search_limit' GUC variable. This is set to 0 by default (no +Such queries usually contain very frequent lexemes, so the results are not +very helpful. To facilitate execution of such queries Gin has a configurable +soft upper limit on the size of the returned set, determined by the +'gin_fuzzy_search_limit' GUC variable. This is set to 0 by default (no limit). If a non-zero search limit is set, then the returned set is a subset of the whole result set, chosen at random. "Soft" means that the actual number of returned results could slightly differ -from the specified limit, depending on the query and the quality of the +from the specified limit, depending on the query and the quality of the system's random number generator. From experience, a value of 'gin_fuzzy_search_limit' in the thousands (eg. 5000-20000) works well. This means that 'gin_fuzzy_search_limit' will -have no effect for queries returning a result set with less tuples than this +have no effect for queries returning a result set with less tuples than this number. Limitations @@ -115,5 +115,5 @@ Distant future: Authors ------- -All work was done by Teodor Sigaev (teodor@sigaev.ru) and Oleg Bartunov +All work was done by Teodor Sigaev (teodor@sigaev.ru) and Oleg Bartunov (oleg@sai.msu.su). diff --git a/src/backend/access/gist/README b/src/backend/access/gist/README index b613a4831f..66d559d33b 100644 --- a/src/backend/access/gist/README +++ b/src/backend/access/gist/README @@ -24,21 +24,21 @@ The current implementation of GiST supports: * Concurrency * Recovery support via WAL logging -The support for concurrency implemented in PostgreSQL was developed based on -the paper "Access Methods for Next-Generation Database Systems" by +The support for concurrency implemented in PostgreSQL was developed based on +the paper "Access Methods for Next-Generation Database Systems" by Marcel Kornaker: http://www.sai.msu.su/~megera/postgres/gist/papers/concurrency/access-methods-for-next-generation.pdf.gz The original algorithms were modified in several ways: -* They should be adapted to PostgreSQL conventions. For example, the SEARCH - algorithm was considerably changed, because in PostgreSQL function search - should return one tuple (next), not all tuples at once. Also, it should +* They should be adapted to PostgreSQL conventions. For example, the SEARCH + algorithm was considerably changed, because in PostgreSQL function search + should return one tuple (next), not all tuples at once. Also, it should release page locks between calls. -* Since we added support for variable length keys, it's not possible to - guarantee enough free space for all keys on pages after splitting. User - defined function picksplit doesn't have information about size of tuples +* Since we added support for variable length keys, it's not possible to + guarantee enough free space for all keys on pages after splitting. User + defined function picksplit doesn't have information about size of tuples (each tuple may contain several keys as in multicolumn index while picksplit could work with only one key) and pages. * We modified original INSERT algorithm for performance reason. In particular, @@ -67,7 +67,7 @@ gettuple(search-pred) ptr = top of stack while(true) latch( ptr->page, S-mode ) - if ( ptr->page->lsn != ptr->lsn ) + if ( ptr->page->lsn != ptr->lsn ) ptr->lsn = ptr->page->lsn currentposition=0 if ( ptr->parentlsn < ptr->page->nsn ) @@ -88,7 +88,7 @@ gettuple(search-pred) else if ( ptr->page is leaf ) unlatch( ptr->page ) return tuple - else + else add to stack child page end currentposition++ @@ -99,20 +99,20 @@ gettuple(search-pred) Insert Algorithm ---------------- -INSERT guarantees that the GiST tree remains balanced. User defined key method -Penalty is used for choosing a subtree to insert; method PickSplit is used for -the node splitting algorithm; method Union is used for propagating changes +INSERT guarantees that the GiST tree remains balanced. User defined key method +Penalty is used for choosing a subtree to insert; method PickSplit is used for +the node splitting algorithm; method Union is used for propagating changes upward to maintain the tree properties. -NOTICE: We modified original INSERT algorithm for performance reason. In +NOTICE: We modified original INSERT algorithm for performance reason. In particularly, it is now a single-pass algorithm. -Function findLeaf is used to identify subtree for insertion. Page, in which -insertion is proceeded, is locked as well as its parent page. Functions -findParent and findPath are used to find parent pages, which could be changed -because of concurrent access. Function pageSplit is recurrent and could split -page by more than 2 pages, which could be necessary if keys have different -lengths or more than one key are inserted (in such situation, user defined +Function findLeaf is used to identify subtree for insertion. Page, in which +insertion is proceeded, is locked as well as its parent page. Functions +findParent and findPath are used to find parent pages, which could be changed +because of concurrent access. Function pageSplit is recurrent and could split +page by more than 2 pages, which could be necessary if keys have different +lengths or more than one key are inserted (in such situation, user defined function pickSplit cannot guarantee free space on page). findLeaf(new-key) @@ -143,7 +143,7 @@ findLeaf(new-key) end findPath( stack item ) - push stack, [root, 0, 0] // page, LSN, parent + push stack, [root, 0, 0] // page, LSN, parent while( stack ) ptr = top of stack latch( ptr->page, S-mode ) @@ -152,7 +152,7 @@ findPath( stack item ) end for( each tuple on page ) if ( tuple->pagepointer == item->page ) - return stack + return stack else add to stack at the end [tuple->pagepointer,0, ptr] end @@ -160,12 +160,12 @@ findPath( stack item ) unlatch( ptr->page ) pop stack end - + findParent( stack item ) parent = item->parent latch( parent->page, X-mode ) if ( parent->page->lsn != parent->lsn ) - while(true) + while(true) search parent tuple on parent->page, if found the return rightlink = parent->page->rightlink unlatch( parent->page ) @@ -214,7 +214,7 @@ placetopage(page, keysarray) keysarray = [ union(keysarray) ] end end - + insert(new-key) stack = findLeaf(new-key) keysarray = [new-key] @@ -236,4 +236,4 @@ insert(new-key) Authors: Teodor Sigaev - Oleg Bartunov + Oleg Bartunov diff --git a/src/backend/access/nbtree/README b/src/backend/access/nbtree/README index de0da704a3..561ffbb9d4 100644 --- a/src/backend/access/nbtree/README +++ b/src/backend/access/nbtree/README @@ -154,7 +154,7 @@ even pages that don't contain any deletable tuples. This guarantees that the btbulkdelete call cannot return while any indexscan is still holding a copy of a deleted index tuple. Note that this requirement does not say that btbulkdelete must visit the pages in any particular order. (See also -on-the-fly deletion, below.) +on-the-fly deletion, below.) There is no such interlocking for deletion of items in internal pages, since backends keep no lock nor pin on a page they have descended past. diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index 70f4cc5d2e..ede6ceb6af 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -5608,7 +5608,7 @@ GetLatestXTime(void) * Returns timestamp of latest processed commit/abort record. * * When the server has been started normally without recovery the function - * returns NULL. + * returns NULL. */ Datum pg_last_xact_replay_timestamp(PG_FUNCTION_ARGS) diff --git a/src/backend/bootstrap/Makefile b/src/backend/bootstrap/Makefile index 4d68649ccc..a77d864800 100644 --- a/src/backend/bootstrap/Makefile +++ b/src/backend/bootstrap/Makefile @@ -12,7 +12,7 @@ include $(top_builddir)/src/Makefile.global override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS) -OBJS= bootparse.o bootstrap.o +OBJS= bootparse.o bootstrap.o include $(top_srcdir)/src/backend/common.mk diff --git a/src/backend/catalog/information_schema.sql b/src/backend/catalog/information_schema.sql index def273d3c0..8d9790d196 100644 --- a/src/backend/catalog/information_schema.sql +++ b/src/backend/catalog/information_schema.sql @@ -1269,7 +1269,7 @@ GRANT SELECT ON role_routine_grants TO PUBLIC; -- not tracked by PostgreSQL -/* +/* * 5.47 * ROUTINE_SEQUENCE_USAGE view */ @@ -1385,7 +1385,7 @@ CREATE VIEW routines AS CAST(null AS sql_identifier) AS result_cast_scope_schema, CAST(null AS sql_identifier) AS result_cast_scope_name, CAST(null AS cardinal_number) AS result_cast_maximum_cardinality, - CAST(null AS sql_identifier) AS result_cast_dtd_identifier + CAST(null AS sql_identifier) AS result_cast_dtd_identifier FROM pg_namespace n, pg_proc p, pg_language l, pg_type t, pg_namespace nt @@ -2323,7 +2323,7 @@ CREATE VIEW element_types AS CAST(null AS cardinal_number) AS datetime_precision, CAST(null AS character_data) AS interval_type, CAST(null AS character_data) AS interval_precision, - + CAST(null AS character_data) AS domain_default, -- XXX maybe a bug in the standard CAST(current_database() AS sql_identifier) AS udt_catalog, diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index 5e23fea705..6a37e61dba 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -552,7 +552,7 @@ object_exists(ObjectAddress address) else { found = ((Form_pg_attribute) GETSTRUCT(atttup))->attisdropped; - ReleaseSysCache(atttup); + ReleaseSysCache(atttup); } return found; } @@ -654,5 +654,5 @@ object_exists(ObjectAddress address) found = HeapTupleIsValid(systable_getnext(sd)); systable_endscan(sd); heap_close(rel, AccessShareLock); - return found; + return found; } diff --git a/src/backend/catalog/system_views.sql b/src/backend/catalog/system_views.sql index 82788fa14a..346eaaf892 100644 --- a/src/backend/catalog/system_views.sql +++ b/src/backend/catalog/system_views.sql @@ -6,8 +6,8 @@ * src/backend/catalog/system_views.sql */ -CREATE VIEW pg_roles AS - SELECT +CREATE VIEW pg_roles AS + SELECT rolname, rolsuper, rolinherit, @@ -47,72 +47,72 @@ CREATE VIEW pg_group AS FROM pg_authid WHERE NOT rolcanlogin; -CREATE VIEW pg_user AS - SELECT - usename, - usesysid, - usecreatedb, - usesuper, - usecatupd, - '********'::text as passwd, - valuntil, - useconfig +CREATE VIEW pg_user AS + SELECT + usename, + usesysid, + usecreatedb, + usesuper, + usecatupd, + '********'::text as passwd, + valuntil, + useconfig FROM pg_shadow; -CREATE VIEW pg_rules AS - SELECT - N.nspname AS schemaname, - C.relname AS tablename, - R.rulename AS rulename, - pg_get_ruledef(R.oid) AS definition - FROM (pg_rewrite R JOIN pg_class C ON (C.oid = R.ev_class)) - LEFT JOIN pg_namespace N ON (N.oid = C.relnamespace) +CREATE VIEW pg_rules AS + SELECT + N.nspname AS schemaname, + C.relname AS tablename, + R.rulename AS rulename, + pg_get_ruledef(R.oid) AS definition + FROM (pg_rewrite R JOIN pg_class C ON (C.oid = R.ev_class)) + LEFT JOIN pg_namespace N ON (N.oid = C.relnamespace) WHERE R.rulename != '_RETURN'; -CREATE VIEW pg_views AS - SELECT - N.nspname AS schemaname, - C.relname AS viewname, - pg_get_userbyid(C.relowner) AS viewowner, - pg_get_viewdef(C.oid) AS definition - FROM pg_class C LEFT JOIN pg_namespace N ON (N.oid = C.relnamespace) +CREATE VIEW pg_views AS + SELECT + N.nspname AS schemaname, + C.relname AS viewname, + pg_get_userbyid(C.relowner) AS viewowner, + pg_get_viewdef(C.oid) AS definition + FROM pg_class C LEFT JOIN pg_namespace N ON (N.oid = C.relnamespace) WHERE C.relkind = 'v'; -CREATE VIEW pg_tables AS - SELECT - N.nspname AS schemaname, - C.relname AS tablename, - pg_get_userbyid(C.relowner) AS tableowner, +CREATE VIEW pg_tables AS + SELECT + N.nspname AS schemaname, + C.relname AS tablename, + pg_get_userbyid(C.relowner) AS tableowner, T.spcname AS tablespace, - C.relhasindex AS hasindexes, - C.relhasrules AS hasrules, - C.relhastriggers AS hastriggers - FROM pg_class C LEFT JOIN pg_namespace N ON (N.oid = C.relnamespace) + C.relhasindex AS hasindexes, + C.relhasrules AS hasrules, + C.relhastriggers AS hastriggers + FROM pg_class C LEFT JOIN pg_namespace N ON (N.oid = C.relnamespace) LEFT JOIN pg_tablespace T ON (T.oid = C.reltablespace) WHERE C.relkind = 'r'; -CREATE VIEW pg_indexes AS - SELECT - N.nspname AS schemaname, - C.relname AS tablename, - I.relname AS indexname, +CREATE VIEW pg_indexes AS + SELECT + N.nspname AS schemaname, + C.relname AS tablename, + I.relname AS indexname, T.spcname AS tablespace, - pg_get_indexdef(I.oid) AS indexdef - FROM pg_index X JOIN pg_class C ON (C.oid = X.indrelid) - JOIN pg_class I ON (I.oid = X.indexrelid) - LEFT JOIN pg_namespace N ON (N.oid = C.relnamespace) + pg_get_indexdef(I.oid) AS indexdef + FROM pg_index X JOIN pg_class C ON (C.oid = X.indrelid) + JOIN pg_class I ON (I.oid = X.indexrelid) + LEFT JOIN pg_namespace N ON (N.oid = C.relnamespace) LEFT JOIN pg_tablespace T ON (T.oid = I.reltablespace) WHERE C.relkind = 'r' AND I.relkind = 'i'; -CREATE VIEW pg_stats AS - SELECT - nspname AS schemaname, - relname AS tablename, - attname AS attname, - stainherit AS inherited, - stanullfrac AS null_frac, - stawidth AS avg_width, - stadistinct AS n_distinct, +CREATE VIEW pg_stats AS + SELECT + nspname AS schemaname, + relname AS tablename, + attname AS attname, + stainherit AS inherited, + stanullfrac AS null_frac, + stawidth AS avg_width, + stadistinct AS n_distinct, CASE WHEN stakind1 IN (1, 4) THEN stavalues1 WHEN stakind2 IN (1, 4) THEN stavalues2 @@ -137,14 +137,14 @@ CREATE VIEW pg_stats AS WHEN stakind3 = 3 THEN stanumbers3[1] WHEN stakind4 = 3 THEN stanumbers4[1] END AS correlation - FROM pg_statistic s JOIN pg_class c ON (c.oid = s.starelid) - JOIN pg_attribute a ON (c.oid = attrelid AND attnum = s.staattnum) - LEFT JOIN pg_namespace n ON (n.oid = c.relnamespace) + FROM pg_statistic s JOIN pg_class c ON (c.oid = s.starelid) + JOIN pg_attribute a ON (c.oid = attrelid AND attnum = s.staattnum) + LEFT JOIN pg_namespace n ON (n.oid = c.relnamespace) WHERE NOT attisdropped AND has_column_privilege(c.oid, a.attnum, 'select'); REVOKE ALL on pg_statistic FROM public; -CREATE VIEW pg_locks AS +CREATE VIEW pg_locks AS SELECT * FROM pg_lock_status() AS L; CREATE VIEW pg_cursors AS @@ -268,16 +268,16 @@ FROM WHERE l.objsubid = 0; -CREATE VIEW pg_settings AS - SELECT * FROM pg_show_all_settings() AS A; +CREATE VIEW pg_settings AS + SELECT * FROM pg_show_all_settings() AS A; -CREATE RULE pg_settings_u AS - ON UPDATE TO pg_settings - WHERE new.name = old.name DO +CREATE RULE pg_settings_u AS + ON UPDATE TO pg_settings + WHERE new.name = old.name DO SELECT set_config(old.name, new.setting, 'f'); -CREATE RULE pg_settings_n AS - ON UPDATE TO pg_settings +CREATE RULE pg_settings_n AS + ON UPDATE TO pg_settings DO INSTEAD NOTHING; GRANT SELECT, UPDATE ON pg_settings TO PUBLIC; @@ -290,21 +290,21 @@ CREATE VIEW pg_timezone_names AS -- Statistics views -CREATE VIEW pg_stat_all_tables AS - SELECT - C.oid AS relid, - N.nspname AS schemaname, - C.relname AS relname, - pg_stat_get_numscans(C.oid) AS seq_scan, - pg_stat_get_tuples_returned(C.oid) AS seq_tup_read, - sum(pg_stat_get_numscans(I.indexrelid))::bigint AS idx_scan, +CREATE VIEW pg_stat_all_tables AS + SELECT + C.oid AS relid, + N.nspname AS schemaname, + C.relname AS relname, + pg_stat_get_numscans(C.oid) AS seq_scan, + pg_stat_get_tuples_returned(C.oid) AS seq_tup_read, + sum(pg_stat_get_numscans(I.indexrelid))::bigint AS idx_scan, sum(pg_stat_get_tuples_fetched(I.indexrelid))::bigint + - pg_stat_get_tuples_fetched(C.oid) AS idx_tup_fetch, - pg_stat_get_tuples_inserted(C.oid) AS n_tup_ins, - pg_stat_get_tuples_updated(C.oid) AS n_tup_upd, + pg_stat_get_tuples_fetched(C.oid) AS idx_tup_fetch, + pg_stat_get_tuples_inserted(C.oid) AS n_tup_ins, + pg_stat_get_tuples_updated(C.oid) AS n_tup_upd, pg_stat_get_tuples_deleted(C.oid) AS n_tup_del, pg_stat_get_tuples_hot_updated(C.oid) AS n_tup_hot_upd, - pg_stat_get_live_tuples(C.oid) AS n_live_tup, + pg_stat_get_live_tuples(C.oid) AS n_live_tup, pg_stat_get_dead_tuples(C.oid) AS n_dead_tup, pg_stat_get_last_vacuum_time(C.oid) as last_vacuum, pg_stat_get_last_autovacuum_time(C.oid) as last_autovacuum, @@ -314,9 +314,9 @@ CREATE VIEW pg_stat_all_tables AS pg_stat_get_autovacuum_count(C.oid) AS autovacuum_count, pg_stat_get_analyze_count(C.oid) AS analyze_count, pg_stat_get_autoanalyze_count(C.oid) AS autoanalyze_count - FROM pg_class C LEFT JOIN - pg_index I ON C.oid = I.indrelid - LEFT JOIN pg_namespace N ON (N.oid = C.relnamespace) + FROM pg_class C LEFT JOIN + pg_index I ON C.oid = I.indrelid + LEFT JOIN pg_namespace N ON (N.oid = C.relnamespace) WHERE C.relkind IN ('r', 't') GROUP BY C.oid, N.nspname, C.relname; @@ -340,8 +340,8 @@ CREATE VIEW pg_stat_xact_all_tables AS WHERE C.relkind IN ('r', 't') GROUP BY C.oid, N.nspname, C.relname; -CREATE VIEW pg_stat_sys_tables AS - SELECT * FROM pg_stat_all_tables +CREATE VIEW pg_stat_sys_tables AS + SELECT * FROM pg_stat_all_tables WHERE schemaname IN ('pg_catalog', 'information_schema') OR schemaname ~ '^pg_toast'; @@ -350,8 +350,8 @@ CREATE VIEW pg_stat_xact_sys_tables AS WHERE schemaname IN ('pg_catalog', 'information_schema') OR schemaname ~ '^pg_toast'; -CREATE VIEW pg_stat_user_tables AS - SELECT * FROM pg_stat_all_tables +CREATE VIEW pg_stat_user_tables AS + SELECT * FROM pg_stat_all_tables WHERE schemaname NOT IN ('pg_catalog', 'information_schema') AND schemaname !~ '^pg_toast'; @@ -360,117 +360,117 @@ CREATE VIEW pg_stat_xact_user_tables AS WHERE schemaname NOT IN ('pg_catalog', 'information_schema') AND schemaname !~ '^pg_toast'; -CREATE VIEW pg_statio_all_tables AS - SELECT - C.oid AS relid, - N.nspname AS schemaname, - C.relname AS relname, - pg_stat_get_blocks_fetched(C.oid) - - pg_stat_get_blocks_hit(C.oid) AS heap_blks_read, - pg_stat_get_blocks_hit(C.oid) AS heap_blks_hit, - sum(pg_stat_get_blocks_fetched(I.indexrelid) - - pg_stat_get_blocks_hit(I.indexrelid))::bigint AS idx_blks_read, - sum(pg_stat_get_blocks_hit(I.indexrelid))::bigint AS idx_blks_hit, - pg_stat_get_blocks_fetched(T.oid) - - pg_stat_get_blocks_hit(T.oid) AS toast_blks_read, - pg_stat_get_blocks_hit(T.oid) AS toast_blks_hit, - pg_stat_get_blocks_fetched(X.oid) - - pg_stat_get_blocks_hit(X.oid) AS tidx_blks_read, - pg_stat_get_blocks_hit(X.oid) AS tidx_blks_hit - FROM pg_class C LEFT JOIN - pg_index I ON C.oid = I.indrelid LEFT JOIN - pg_class T ON C.reltoastrelid = T.oid LEFT JOIN - pg_class X ON T.reltoastidxid = X.oid - LEFT JOIN pg_namespace N ON (N.oid = C.relnamespace) +CREATE VIEW pg_statio_all_tables AS + SELECT + C.oid AS relid, + N.nspname AS schemaname, + C.relname AS relname, + pg_stat_get_blocks_fetched(C.oid) - + pg_stat_get_blocks_hit(C.oid) AS heap_blks_read, + pg_stat_get_blocks_hit(C.oid) AS heap_blks_hit, + sum(pg_stat_get_blocks_fetched(I.indexrelid) - + pg_stat_get_blocks_hit(I.indexrelid))::bigint AS idx_blks_read, + sum(pg_stat_get_blocks_hit(I.indexrelid))::bigint AS idx_blks_hit, + pg_stat_get_blocks_fetched(T.oid) - + pg_stat_get_blocks_hit(T.oid) AS toast_blks_read, + pg_stat_get_blocks_hit(T.oid) AS toast_blks_hit, + pg_stat_get_blocks_fetched(X.oid) - + pg_stat_get_blocks_hit(X.oid) AS tidx_blks_read, + pg_stat_get_blocks_hit(X.oid) AS tidx_blks_hit + FROM pg_class C LEFT JOIN + pg_index I ON C.oid = I.indrelid LEFT JOIN + pg_class T ON C.reltoastrelid = T.oid LEFT JOIN + pg_class X ON T.reltoastidxid = X.oid + LEFT JOIN pg_namespace N ON (N.oid = C.relnamespace) WHERE C.relkind IN ('r', 't') GROUP BY C.oid, N.nspname, C.relname, T.oid, X.oid; -CREATE VIEW pg_statio_sys_tables AS - SELECT * FROM pg_statio_all_tables +CREATE VIEW pg_statio_sys_tables AS + SELECT * FROM pg_statio_all_tables WHERE schemaname IN ('pg_catalog', 'information_schema') OR schemaname ~ '^pg_toast'; -CREATE VIEW pg_statio_user_tables AS - SELECT * FROM pg_statio_all_tables +CREATE VIEW pg_statio_user_tables AS + SELECT * FROM pg_statio_all_tables WHERE schemaname NOT IN ('pg_catalog', 'information_schema') AND schemaname !~ '^pg_toast'; -CREATE VIEW pg_stat_all_indexes AS - SELECT - C.oid AS relid, - I.oid AS indexrelid, - N.nspname AS schemaname, - C.relname AS relname, - I.relname AS indexrelname, - pg_stat_get_numscans(I.oid) AS idx_scan, - pg_stat_get_tuples_returned(I.oid) AS idx_tup_read, - pg_stat_get_tuples_fetched(I.oid) AS idx_tup_fetch - FROM pg_class C JOIN - pg_index X ON C.oid = X.indrelid JOIN - pg_class I ON I.oid = X.indexrelid - LEFT JOIN pg_namespace N ON (N.oid = C.relnamespace) +CREATE VIEW pg_stat_all_indexes AS + SELECT + C.oid AS relid, + I.oid AS indexrelid, + N.nspname AS schemaname, + C.relname AS relname, + I.relname AS indexrelname, + pg_stat_get_numscans(I.oid) AS idx_scan, + pg_stat_get_tuples_returned(I.oid) AS idx_tup_read, + pg_stat_get_tuples_fetched(I.oid) AS idx_tup_fetch + FROM pg_class C JOIN + pg_index X ON C.oid = X.indrelid JOIN + pg_class I ON I.oid = X.indexrelid + LEFT JOIN pg_namespace N ON (N.oid = C.relnamespace) WHERE C.relkind IN ('r', 't'); -CREATE VIEW pg_stat_sys_indexes AS - SELECT * FROM pg_stat_all_indexes +CREATE VIEW pg_stat_sys_indexes AS + SELECT * FROM pg_stat_all_indexes WHERE schemaname IN ('pg_catalog', 'information_schema') OR schemaname ~ '^pg_toast'; -CREATE VIEW pg_stat_user_indexes AS - SELECT * FROM pg_stat_all_indexes +CREATE VIEW pg_stat_user_indexes AS + SELECT * FROM pg_stat_all_indexes WHERE schemaname NOT IN ('pg_catalog', 'information_schema') AND schemaname !~ '^pg_toast'; -CREATE VIEW pg_statio_all_indexes AS - SELECT - C.oid AS relid, - I.oid AS indexrelid, - N.nspname AS schemaname, - C.relname AS relname, - I.relname AS indexrelname, - pg_stat_get_blocks_fetched(I.oid) - - pg_stat_get_blocks_hit(I.oid) AS idx_blks_read, - pg_stat_get_blocks_hit(I.oid) AS idx_blks_hit - FROM pg_class C JOIN - pg_index X ON C.oid = X.indrelid JOIN - pg_class I ON I.oid = X.indexrelid - LEFT JOIN pg_namespace N ON (N.oid = C.relnamespace) +CREATE VIEW pg_statio_all_indexes AS + SELECT + C.oid AS relid, + I.oid AS indexrelid, + N.nspname AS schemaname, + C.relname AS relname, + I.relname AS indexrelname, + pg_stat_get_blocks_fetched(I.oid) - + pg_stat_get_blocks_hit(I.oid) AS idx_blks_read, + pg_stat_get_blocks_hit(I.oid) AS idx_blks_hit + FROM pg_class C JOIN + pg_index X ON C.oid = X.indrelid JOIN + pg_class I ON I.oid = X.indexrelid + LEFT JOIN pg_namespace N ON (N.oid = C.relnamespace) WHERE C.relkind IN ('r', 't'); -CREATE VIEW pg_statio_sys_indexes AS - SELECT * FROM pg_statio_all_indexes +CREATE VIEW pg_statio_sys_indexes AS + SELECT * FROM pg_statio_all_indexes WHERE schemaname IN ('pg_catalog', 'information_schema') OR schemaname ~ '^pg_toast'; -CREATE VIEW pg_statio_user_indexes AS - SELECT * FROM pg_statio_all_indexes +CREATE VIEW pg_statio_user_indexes AS + SELECT * FROM pg_statio_all_indexes WHERE schemaname NOT IN ('pg_catalog', 'information_schema') AND schemaname !~ '^pg_toast'; -CREATE VIEW pg_statio_all_sequences AS - SELECT - C.oid AS relid, - N.nspname AS schemaname, - C.relname AS relname, - pg_stat_get_blocks_fetched(C.oid) - - pg_stat_get_blocks_hit(C.oid) AS blks_read, - pg_stat_get_blocks_hit(C.oid) AS blks_hit - FROM pg_class C - LEFT JOIN pg_namespace N ON (N.oid = C.relnamespace) +CREATE VIEW pg_statio_all_sequences AS + SELECT + C.oid AS relid, + N.nspname AS schemaname, + C.relname AS relname, + pg_stat_get_blocks_fetched(C.oid) - + pg_stat_get_blocks_hit(C.oid) AS blks_read, + pg_stat_get_blocks_hit(C.oid) AS blks_hit + FROM pg_class C + LEFT JOIN pg_namespace N ON (N.oid = C.relnamespace) WHERE C.relkind = 'S'; -CREATE VIEW pg_statio_sys_sequences AS - SELECT * FROM pg_statio_all_sequences +CREATE VIEW pg_statio_sys_sequences AS + SELECT * FROM pg_statio_all_sequences WHERE schemaname IN ('pg_catalog', 'information_schema') OR schemaname ~ '^pg_toast'; -CREATE VIEW pg_statio_user_sequences AS - SELECT * FROM pg_statio_all_sequences +CREATE VIEW pg_statio_user_sequences AS + SELECT * FROM pg_statio_all_sequences WHERE schemaname NOT IN ('pg_catalog', 'information_schema') AND schemaname !~ '^pg_toast'; -CREATE VIEW pg_stat_activity AS - SELECT +CREATE VIEW pg_stat_activity AS + SELECT S.datid AS datid, D.datname AS datname, S.procpid, @@ -485,18 +485,18 @@ CREATE VIEW pg_stat_activity AS S.waiting, S.current_query FROM pg_database D, pg_stat_get_activity(NULL) AS S, pg_authid U - WHERE S.datid = D.oid AND + WHERE S.datid = D.oid AND S.usesysid = U.oid; -CREATE VIEW pg_stat_database AS - SELECT - D.oid AS datid, - D.datname AS datname, - pg_stat_get_db_numbackends(D.oid) AS numbackends, - pg_stat_get_db_xact_commit(D.oid) AS xact_commit, - pg_stat_get_db_xact_rollback(D.oid) AS xact_rollback, - pg_stat_get_db_blocks_fetched(D.oid) - - pg_stat_get_db_blocks_hit(D.oid) AS blks_read, +CREATE VIEW pg_stat_database AS + SELECT + D.oid AS datid, + D.datname AS datname, + pg_stat_get_db_numbackends(D.oid) AS numbackends, + pg_stat_get_db_xact_commit(D.oid) AS xact_commit, + pg_stat_get_db_xact_rollback(D.oid) AS xact_rollback, + pg_stat_get_db_blocks_fetched(D.oid) - + pg_stat_get_db_blocks_hit(D.oid) AS blks_read, pg_stat_get_db_blocks_hit(D.oid) AS blks_hit, pg_stat_get_db_tuples_returned(D.oid) AS tup_returned, pg_stat_get_db_tuples_fetched(D.oid) AS tup_fetched, @@ -505,16 +505,16 @@ CREATE VIEW pg_stat_database AS pg_stat_get_db_tuples_deleted(D.oid) AS tup_deleted FROM pg_database D; -CREATE VIEW pg_stat_user_functions AS +CREATE VIEW pg_stat_user_functions AS SELECT - P.oid AS funcid, + P.oid AS funcid, N.nspname AS schemaname, P.proname AS funcname, pg_stat_get_function_calls(P.oid) AS calls, pg_stat_get_function_time(P.oid) / 1000 AS total_time, pg_stat_get_function_self_time(P.oid) / 1000 AS self_time FROM pg_proc P LEFT JOIN pg_namespace N ON (N.oid = P.pronamespace) - WHERE P.prolang != 12 -- fast check to eliminate built-in functions + WHERE P.prolang != 12 -- fast check to eliminate built-in functions AND pg_stat_get_function_calls(P.oid) IS NOT NULL; CREATE VIEW pg_stat_xact_user_functions AS @@ -580,7 +580,7 @@ CREATE FUNCTION ts_debug(IN config regconfig, IN document text, OUT lexemes text[]) RETURNS SETOF record AS $$ -SELECT +SELECT tt.alias AS alias, tt.description AS description, parse.token AS token, @@ -602,7 +602,7 @@ SELECT LIMIT 1 ) AS lexemes FROM pg_catalog.ts_parse( - (SELECT cfgparser FROM pg_catalog.pg_ts_config WHERE oid = $1 ), $2 + (SELECT cfgparser FROM pg_catalog.pg_ts_config WHERE oid = $1 ), $2 ) AS parse, pg_catalog.ts_token_type( (SELECT cfgparser FROM pg_catalog.pg_ts_config WHERE oid = $1 ) diff --git a/src/backend/commands/comment.c b/src/backend/commands/comment.c index 4ae161a625..b578818b4f 100644 --- a/src/backend/commands/comment.c +++ b/src/backend/commands/comment.c @@ -208,7 +208,7 @@ CommentObject(CommentStmt *stmt) * catalog. Comments on all other objects are recorded in pg_description. */ if (stmt->objtype == OBJECT_DATABASE || stmt->objtype == OBJECT_TABLESPACE - || stmt->objtype == OBJECT_ROLE) + || stmt->objtype == OBJECT_ROLE) CreateSharedComments(address.objectId, address.classId, stmt->comment); else CreateComments(address.objectId, address.classId, address.objectSubId, diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c index 98110dfd2a..3ffd10b143 100644 --- a/src/backend/commands/copy.c +++ b/src/backend/commands/copy.c @@ -2064,7 +2064,7 @@ CopyFrom(CopyState cstate) done = true; break; } - + if (fld_count == -1) { /* diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c index f494ec98e5..a5e44c046f 100644 --- a/src/backend/commands/explain.c +++ b/src/backend/commands/explain.c @@ -1191,7 +1191,7 @@ ExplainNode(PlanState *planstate, List *ancestors, { ExplainOpenGroup("Plans", "Plans", false, es); /* Pass current PlanState as head of ancestors list for children */ - ancestors = lcons(planstate, ancestors); + ancestors = lcons(planstate, ancestors); } /* initPlan-s */ @@ -1251,7 +1251,7 @@ ExplainNode(PlanState *planstate, List *ancestors, /* end of child plans */ if (haschildren) { - ancestors = list_delete_first(ancestors); + ancestors = list_delete_first(ancestors); ExplainCloseGroup("Plans", "Plans", false, es); } diff --git a/src/backend/commands/tablespace.c b/src/backend/commands/tablespace.c index 590eee5dec..305ac46b40 100644 --- a/src/backend/commands/tablespace.c +++ b/src/backend/commands/tablespace.c @@ -608,7 +608,7 @@ create_tablespace_directories(const char *location, const Oid tablespaceoid) errmsg("could not remove symbolic link \"%s\": %m", linkloc))); } - + /* * Create the symlink under PGDATA */ diff --git a/src/backend/libpq/README.SSL b/src/backend/libpq/README.SSL index d3b6e831ce..53dc9dd005 100644 --- a/src/backend/libpq/README.SSL +++ b/src/backend/libpq/README.SSL @@ -28,7 +28,7 @@ SSL | | Normal startup - + diff --git a/src/backend/nodes/README b/src/backend/nodes/README index f4034be276..95de7a1e2a 100644 --- a/src/backend/nodes/README +++ b/src/backend/nodes/README @@ -40,7 +40,7 @@ FILES IN src/include/nodes/ relation.h - planner internal nodes execnodes.h - executor nodes memnodes.h - memory nodes - pg_list.h - generic list + pg_list.h - generic list Steps to Add a Node @@ -69,7 +69,7 @@ Suppose you wanna define a node Foo: Historical Note --------------- -Prior to the current simple C structure definitions, the Node structures +Prior to the current simple C structure definitions, the Node structures used a pseudo-inheritance system which automatically generated creator and accessor functions. Since every node inherited from LispValue, the whole thing was a mess. Here's a little anecdote: diff --git a/src/backend/optimizer/plan/README b/src/backend/optimizer/plan/README index e52e3d34e7..013c0f9ea2 100644 --- a/src/backend/optimizer/plan/README +++ b/src/backend/optimizer/plan/README @@ -37,19 +37,19 @@ This is some implementation notes and opened issues... First, implementation uses new type of parameters - PARAM_EXEC - to deal with correlation Vars. When query_planner() is called, it first tries to -replace all upper queries Var referenced in current query with Param of -this type. Some global variables are used to keep mapping of Vars to -Params and Params to Vars. - -After this, all current query' SubLinks are processed: for each SubLink -found in query' qual union_planner() (old planner() function) will be -called to plan corresponding subselect (union_planner() calls -query_planner() for "simple" query and supports UNIONs). After subselect -are planned, optimizer knows about is this correlated, un-correlated or -_undirect_ correlated (references some grand-parent Vars but no parent -ones: uncorrelated from the parent' point of view) query. - -For uncorrelated and undirect correlated subqueries of EXPRession or +replace all upper queries Var referenced in current query with Param of +this type. Some global variables are used to keep mapping of Vars to +Params and Params to Vars. + +After this, all current query' SubLinks are processed: for each SubLink +found in query' qual union_planner() (old planner() function) will be +called to plan corresponding subselect (union_planner() calls +query_planner() for "simple" query and supports UNIONs). After subselect +are planned, optimizer knows about is this correlated, un-correlated or +_undirect_ correlated (references some grand-parent Vars but no parent +ones: uncorrelated from the parent' point of view) query. + +For uncorrelated and undirect correlated subqueries of EXPRession or EXISTS type SubLinks will be replaced with "normal" clauses from SubLink->Oper list (I changed this list to be list of EXPR nodes, not just Oper ones). Right sides of these nodes are replaced with @@ -81,7 +81,7 @@ plan->qual) - to initialize them and let them know about changed Params (from the list of their "interests"). After all SubLinks are processed, query_planner() calls qual' -canonificator and does "normal" work. By using Params optimizer +canonificator and does "normal" work. By using Params optimizer is mostly unchanged. Well, Executor. To get subplans re-evaluated without ExecutorStart() @@ -91,7 +91,7 @@ on each call) ExecReScan() now supports most of Plan types... Explanation of EXPLAIN. -vac=> explain select * from tmp where x >= (select max(x2) from test2 +vac=> explain select * from tmp where x >= (select max(x2) from test2 where y2 = y and exists (select * from tempx where tx = x)); NOTICE: QUERY PLAN: @@ -128,17 +128,17 @@ Opened issues. for each parent tuple - very slow... Results of some test. TMP is table with x,y (int4-s), x in 0-9, -y = 100 - x, 1000 tuples (10 duplicates of each tuple). TEST2 is table +y = 100 - x, 1000 tuples (10 duplicates of each tuple). TEST2 is table with x2, y2 (int4-s), x2 in 1-99, y2 = 100 -x2, 10000 tuples (100 dups). - Trying + Trying select * from tmp where x >= (select max(x2) from test2 where y2 = y); - + and begin; -select y as ty, max(x2) as mx into table tsub from test2, tmp +select y as ty, max(x2) as mx into table tsub from test2, tmp where y2 = y group by ty; vacuum tsub; select x, y from tmp, tsub where x >= mx and y = ty; diff --git a/src/backend/parser/scan.l b/src/backend/parser/scan.l index 09eac791c3..1fe2b9bcf3 100644 --- a/src/backend/parser/scan.l +++ b/src/backend/parser/scan.l @@ -247,8 +247,8 @@ xqinside [^']+ /* $foo$ style quotes ("dollar quoting") * The quoted string starts with $foo$ where "foo" is an optional string - * in the form of an identifier, except that it may not contain "$", - * and extends to the first occurrence of an identical string. + * in the form of an identifier, except that it may not contain "$", + * and extends to the first occurrence of an identical string. * There is *no* processing of the quoted text. * * {dolqfailed} is an error rule to avoid scanner backup when {dolqdelim} @@ -334,7 +334,7 @@ self [,()\[\].;\:\+\-\*\/\%\^\<\>\=] op_chars [\~\!\@\#\^\&\|\`\?\+\-\*\/\%\<\>\=] operator {op_chars}+ -/* we no longer allow unary minus in numbers. +/* we no longer allow unary minus in numbers. * instead we pass it separately to parser. there it gets * coerced via doNegate() -- Leon aug 20 1999 * diff --git a/src/backend/port/Makefile b/src/backend/port/Makefile index 44e873bebd..8ebb6d5703 100644 --- a/src/backend/port/Makefile +++ b/src/backend/port/Makefile @@ -4,13 +4,13 @@ # Makefile for the port-specific subsystem of the backend # # We have two different modes of operation: 1) put stuff specific to Port X -# in subdirectory X and have that subdirectory's make file make it all, and +# in subdirectory X and have that subdirectory's make file make it all, and # 2) use conditional statements in the present make file to include what's # necessary for a specific port in our own output. (1) came first, but (2) # is superior for many things, like when the same thing needs to be done for -# multiple ports and you don't want to duplicate files in multiple +# multiple ports and you don't want to duplicate files in multiple # subdirectories. Much of the stuff done via Method 1 today should probably -# be converted to Method 2. +# be converted to Method 2. # # IDENTIFICATION # src/backend/port/Makefile diff --git a/src/backend/port/aix/mkldexport.sh b/src/backend/port/aix/mkldexport.sh index 070423ba9b..adf3793e86 100755 --- a/src/backend/port/aix/mkldexport.sh +++ b/src/backend/port/aix/mkldexport.sh @@ -9,13 +9,13 @@ # mkldexport objectfile [location] # where # objectfile is the current location of the object file. -# location is the eventual (installed) location of the +# location is the eventual (installed) location of the # object file (if different from the current # working directory). # # [This file comes from the Postgres 4.2 distribution. - ay 7/95] # -# Header: /usr/local/devel/postgres/src/tools/mkldexport/RCS/mkldexport.sh,v 1.2 1994/03/13 04:59:12 aoki Exp +# Header: /usr/local/devel/postgres/src/tools/mkldexport/RCS/mkldexport.sh,v 1.2 1994/03/13 04:59:12 aoki Exp # # setting this to nm -B might be better diff --git a/src/backend/port/darwin/README b/src/backend/port/darwin/README index c8be401beb..2d9df79683 100644 --- a/src/backend/port/darwin/README +++ b/src/backend/port/darwin/README @@ -16,7 +16,7 @@ that a backend attempting to execute CREATE DATABASE core-dumps.) I would love to know why there is a discrepancy between the published source and the actual behavior --- tgl 7-Nov-2001. -Appropriate bug reports have been filed with Apple --- see +Appropriate bug reports have been filed with Apple --- see Radar Bug#s 2767956, 2683531, 2805147. One hopes we can retire this kluge in the not too distant future. diff --git a/src/backend/port/tas/sunstudio_sparc.s b/src/backend/port/tas/sunstudio_sparc.s index 8c655875ec..c8c20e747a 100644 --- a/src/backend/port/tas/sunstudio_sparc.s +++ b/src/backend/port/tas/sunstudio_sparc.s @@ -24,14 +24,14 @@ .global pg_atomic_cas pg_atomic_cas: - + ! "cas" only works on sparcv9 and sparcv8plus chips, and ! requies a compiler targeting these CPUs. It will fail ! on a compiler targeting sparcv8, and of course will not ! be understood by a sparcv8 CPU. gcc continues to use ! "ldstub" because it targets sparcv7. ! - ! There is actually a trick for embedding "cas" in a + ! There is actually a trick for embedding "cas" in a ! sparcv8-targeted compiler, but it can only be run ! on a sparcv8plus/v9 cpus: ! diff --git a/src/backend/snowball/Makefile b/src/backend/snowball/Makefile index 054880866d..c528be9d53 100644 --- a/src/backend/snowball/Makefile +++ b/src/backend/snowball/Makefile @@ -83,7 +83,7 @@ include $(top_srcdir)/src/Makefile.shlib $(SQLSCRIPT): Makefile snowball_func.sql.in snowball.sql.in ifeq ($(enable_shared), yes) echo '-- Language-specific snowball dictionaries' > $@ - cat $(srcdir)/snowball_func.sql.in >> $@ + cat $(srcdir)/snowball_func.sql.in >> $@ @set -e; \ set $(LANGUAGES) ; \ while [ "$$#" -gt 0 ] ; \ diff --git a/src/backend/storage/buffer/README b/src/backend/storage/buffer/README index 3b46094623..38e67c1c90 100644 --- a/src/backend/storage/buffer/README +++ b/src/backend/storage/buffer/README @@ -264,7 +264,7 @@ while scanning the buffers. (This is a very substantial improvement in the contention cost of the writer compared to PG 8.0.) During a checkpoint, the writer's strategy must be to write every dirty -buffer (pinned or not!). We may as well make it start this scan from +buffer (pinned or not!). We may as well make it start this scan from NextVictimBuffer, however, so that the first-to-be-written pages are the ones that backends might otherwise have to write for themselves soon. diff --git a/src/backend/storage/freespace/README b/src/backend/storage/freespace/README index b3b0e3a680..d591cbb585 100644 --- a/src/backend/storage/freespace/README +++ b/src/backend/storage/freespace/README @@ -84,7 +84,7 @@ backends are concurrently inserting into a relation, contention can be avoided by having them insert into different pages. But it is also desirable to fill up pages in sequential order, to get the benefit of OS prefetching and batched writes. The FSM is responsible for making that happen, and the next slot -pointer helps provide the desired behavior. +pointer helps provide the desired behavior. Higher-level structure ---------------------- diff --git a/src/backend/storage/ipc/README b/src/backend/storage/ipc/README index a56729db1a..913a4dab2b 100644 --- a/src/backend/storage/ipc/README +++ b/src/backend/storage/ipc/README @@ -7,7 +7,7 @@ Mon Jul 18 11:09:22 PDT 1988 W.KLAS The cache synchronization is done using a message queue. Every backend can register a message which then has to be read by -all backends. A message read by all backends is removed from the +all backends. A message read by all backends is removed from the queue automatically. If a message has been lost because the buffer was full, all backends that haven't read this message will be told that they have to reset their cache state. This is done diff --git a/src/backend/storage/lmgr/Makefile b/src/backend/storage/lmgr/Makefile index b0bfe66fe6..9aa9a5c086 100644 --- a/src/backend/storage/lmgr/Makefile +++ b/src/backend/storage/lmgr/Makefile @@ -27,5 +27,5 @@ s_lock_test: s_lock.c $(top_builddir)/src/port/libpgport.a check: s_lock_test ./s_lock_test -clean distclean maintainer-clean: +clean distclean maintainer-clean: rm -f s_lock_test diff --git a/src/backend/storage/lmgr/README b/src/backend/storage/lmgr/README index 0358594bad..87cae18cb6 100644 --- a/src/backend/storage/lmgr/README +++ b/src/backend/storage/lmgr/README @@ -31,7 +31,7 @@ arrival order. There is no timeout. * Regular locks (a/k/a heavyweight locks). The regular lock manager supports a variety of lock modes with table-driven semantics, and it has -full deadlock detection and automatic release at transaction end. +full deadlock detection and automatic release at transaction end. Regular locks should be used for all user-driven lock requests. Acquisition of either a spinlock or a lightweight lock causes query @@ -260,7 +260,7 @@ A key design consideration is that we want to make routine operations (lock grant and release) run quickly when there is no deadlock, and avoid the overhead of deadlock handling as much as possible. We do this using an "optimistic waiting" approach: if a process cannot acquire the -lock it wants immediately, it goes to sleep without any deadlock check. +lock it wants immediately, it goes to sleep without any deadlock check. But it also sets a delay timer, with a delay of DeadlockTimeout milliseconds (typically set to one second). If the delay expires before the process is granted the lock it wants, it runs the deadlock diff --git a/src/backend/tsearch/wparser_def.c b/src/backend/tsearch/wparser_def.c index ce0b7586c8..e10457797e 100644 --- a/src/backend/tsearch/wparser_def.c +++ b/src/backend/tsearch/wparser_def.c @@ -423,8 +423,8 @@ TParserCopyClose(TParser *prs) * Character-type support functions, equivalent to is* macros, but * working with any possible encodings and locales. Notes: * - with multibyte encoding and C-locale isw* function may fail - * or give wrong result. - * - multibyte encoding and C-locale often are used for + * or give wrong result. + * - multibyte encoding and C-locale often are used for * Asian languages. * - if locale is C the we use pgwstr instead of wstr */ @@ -761,8 +761,8 @@ p_isURLPath(TParser *prs) /* * returns true if current character has zero display length or * it's a special sign in several languages. Such characters - * aren't a word-breaker although they aren't an isalpha. - * In beginning of word they aren't a part of it. + * aren't a word-breaker although they aren't an isalpha. + * In beginning of word they aren't a part of it. */ static int p_isspecial(TParser *prs) @@ -2099,7 +2099,7 @@ hlCover(HeadlineParsedText *prs, TSQuery query, int *p, int *q) return false; } -static void +static void mark_fragment(HeadlineParsedText *prs, int highlight, int startpos, int endpos) { int i; @@ -2125,7 +2125,7 @@ mark_fragment(HeadlineParsedText *prs, int highlight, int startpos, int endpos) } } -typedef struct +typedef struct { int4 startpos; int4 endpos; @@ -2135,16 +2135,16 @@ typedef struct int2 excluded; } CoverPos; -static void +static void get_next_fragment(HeadlineParsedText *prs, int *startpos, int *endpos, int *curlen, int *poslen, int max_words) { int i; - /* Objective: Generate a fragment of words between startpos and endpos - * such that it has at most max_words and both ends has query words. - * If the startpos and endpos are the endpoints of the cover and the - * cover has fewer words than max_words, then this function should - * just return the cover + /* Objective: Generate a fragment of words between startpos and endpos + * such that it has at most max_words and both ends has query words. + * If the startpos and endpos are the endpoints of the cover and the + * cover has fewer words than max_words, then this function should + * just return the cover */ /* first move startpos to an item */ for(i = *startpos; i <= *endpos; i++) @@ -2156,14 +2156,14 @@ get_next_fragment(HeadlineParsedText *prs, int *startpos, int *endpos, /* cut endpos to have only max_words */ *curlen = 0; *poslen = 0; - for(i = *startpos; i <= *endpos && *curlen < max_words; i++) + for(i = *startpos; i <= *endpos && *curlen < max_words; i++) { if (!NONWORDTOKEN(prs->words[i].type)) *curlen += 1; if (prs->words[i].item && !prs->words[i].repeated) *poslen += 1; } - /* if the cover was cut then move back endpos to a query item */ + /* if the cover was cut then move back endpos to a query item */ if (*endpos > i) { *endpos = i; @@ -2174,31 +2174,31 @@ get_next_fragment(HeadlineParsedText *prs, int *startpos, int *endpos, break; if (!NONWORDTOKEN(prs->words[i].type)) *curlen -= 1; - } - } + } + } } static void mark_hl_fragments(HeadlineParsedText *prs, TSQuery query, int highlight, - int shortword, int min_words, + int shortword, int min_words, int max_words, int max_fragments) { int4 poslen, curlen, i, f, num_f = 0; int4 stretch, maxstretch, posmarker; - int4 startpos = 0, - endpos = 0, + int4 startpos = 0, + endpos = 0, p = 0, q = 0; - int4 numcovers = 0, + int4 numcovers = 0, maxcovers = 32; int4 minI, minwords, maxitems; CoverPos *covers; covers = palloc(maxcovers * sizeof(CoverPos)); - + /* get all covers */ while (hlCover(prs, query, &p, &q)) { @@ -2207,7 +2207,7 @@ mark_hl_fragments(HeadlineParsedText *prs, TSQuery query, int highlight, /* Break the cover into smaller fragments such that each fragment * has at most max_words. Also ensure that each end of the fragment - * is a query word. This will allow us to stretch the fragment in + * is a query word. This will allow us to stretch the fragment in * either direction */ @@ -2228,9 +2228,9 @@ mark_hl_fragments(HeadlineParsedText *prs, TSQuery query, int highlight, numcovers ++; startpos = endpos + 1; endpos = q; - } + } /* move p to generate the next cover */ - p++; + p++; } /* choose best covers */ @@ -2240,13 +2240,13 @@ mark_hl_fragments(HeadlineParsedText *prs, TSQuery query, int highlight, minwords = 0x7fffffff; minI = -1; /* Choose the cover that contains max items. - * In case of tie choose the one with smaller - * number of words. + * In case of tie choose the one with smaller + * number of words. */ for (i = 0; i < numcovers; i ++) { - if (!covers[i].in && !covers[i].excluded && - (maxitems < covers[i].poslen || (maxitems == covers[i].poslen + if (!covers[i].in && !covers[i].excluded && + (maxitems < covers[i].poslen || (maxitems == covers[i].poslen && minwords > covers[i].curlen))) { maxitems = covers[i].poslen; @@ -2263,15 +2263,15 @@ mark_hl_fragments(HeadlineParsedText *prs, TSQuery query, int highlight, endpos = covers[minI].endpos; curlen = covers[minI].curlen; /* stretch the cover if cover size is lower than max_words */ - if (curlen < max_words) + if (curlen < max_words) { /* divide the stretch on both sides of cover */ maxstretch = (max_words - curlen)/2; - /* first stretch the startpos - * stop stretching if - * 1. we hit the beginning of document - * 2. exceed maxstretch - * 3. we hit an already marked fragment + /* first stretch the startpos + * stop stretching if + * 1. we hit the beginning of document + * 2. exceed maxstretch + * 3. we hit an already marked fragment */ stretch = 0; posmarker = startpos; @@ -2297,7 +2297,7 @@ mark_hl_fragments(HeadlineParsedText *prs, TSQuery query, int highlight, { if (!NONWORDTOKEN(prs->words[i].type)) curlen ++; - posmarker = i; + posmarker = i; } /* cut back endpos till we find a non-short token */ for ( i = posmarker; i > endpos && (NOENDTOKEN(prs->words[i].type) || prs->words[i].len <= shortword); i--) @@ -2316,7 +2316,7 @@ mark_hl_fragments(HeadlineParsedText *prs, TSQuery query, int highlight, /* exclude overlapping covers */ for (i = 0; i < numcovers; i ++) { - if (i != minI && ( (covers[i].startpos >= covers[minI].startpos && covers[i].startpos <= covers[minI].endpos) || (covers[i].endpos >= covers[minI].startpos && covers[i].endpos <= covers[minI].endpos))) + if (i != minI && ( (covers[i].startpos >= covers[minI].startpos && covers[i].startpos <= covers[minI].endpos) || (covers[i].endpos >= covers[minI].startpos && covers[i].endpos <= covers[minI].endpos))) covers[i].excluded = 1; } } @@ -2340,7 +2340,7 @@ mark_hl_fragments(HeadlineParsedText *prs, TSQuery query, int highlight, } static void -mark_hl_words(HeadlineParsedText *prs, TSQuery query, int highlight, +mark_hl_words(HeadlineParsedText *prs, TSQuery query, int highlight, int shortword, int min_words, int max_words) { int p = 0, @@ -2552,7 +2552,7 @@ prsd_headline(PG_FUNCTION_ARGS) ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), errmsg("MaxFragments should be >= 0"))); - } + } if (max_fragments == 0) /* call the default headline generator */ diff --git a/src/backend/utils/Gen_fmgrtab.pl b/src/backend/utils/Gen_fmgrtab.pl index 57cc5f70ff..797324dcf3 100644 --- a/src/backend/utils/Gen_fmgrtab.pl +++ b/src/backend/utils/Gen_fmgrtab.pl @@ -93,7 +93,7 @@ my $tabfile = $output_path . 'fmgrtab.c'; open H, '>', $oidsfile . $tmpext or die "Could not open $oidsfile$tmpext: $!"; open T, '>', $tabfile . $tmpext or die "Could not open $tabfile$tmpext: $!"; -print H +print H qq|/*------------------------------------------------------------------------- * * fmgroids.h diff --git a/src/backend/utils/adt/numeric.c b/src/backend/utils/adt/numeric.c index 9ae6492982..5d29cf6533 100644 --- a/src/backend/utils/adt/numeric.c +++ b/src/backend/utils/adt/numeric.c @@ -102,7 +102,7 @@ typedef int16 NumericDigit; * remaining bits are never examined. Currently, we always initialize these * to zero, but it might be possible to use them for some other purpose in * the future. - * + * * In the NumericShort format, the remaining 14 bits of the header word * (n_short.n_header) are allocated as follows: 1 for sign (positive or * negative), 6 for dynamic scale, and 7 for weight. In practice, most @@ -3725,7 +3725,7 @@ make_result(NumericVar *var) len = NUMERIC_HDRSZ_SHORT + n * sizeof(NumericDigit); result = (Numeric) palloc(len); SET_VARSIZE(result, len); - result->choice.n_short.n_header = + result->choice.n_short.n_header = (sign == NUMERIC_NEG ? (NUMERIC_SHORT | NUMERIC_SHORT_SIGN_MASK) : NUMERIC_SHORT) | (var->dscale << NUMERIC_SHORT_DSCALE_SHIFT) diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c index 15b6d7c4fd..ee83e2f308 100644 --- a/src/backend/utils/adt/varlena.c +++ b/src/backend/utils/adt/varlena.c @@ -3054,7 +3054,7 @@ text_to_array_internal(PG_FUNCTION_ARGS) int start_posn; int end_posn; int chunk_len; - + text_position_setup(inputstring, fldsep, &state); /* @@ -3085,7 +3085,7 @@ text_to_array_internal(PG_FUNCTION_ARGS) PointerGetDatum(inputstring), is_null, 1)); } - + start_posn = 1; /* start_ptr points to the start_posn'th character of inputstring */ start_ptr = VARDATA_ANY(inputstring); @@ -3110,7 +3110,7 @@ text_to_array_internal(PG_FUNCTION_ARGS) /* must build a temp text datum to pass to accumArrayResult */ result_text = cstring_to_text_with_len(start_ptr, chunk_len); is_null = null_string ? text_isequal(result_text, null_string) : false; - + /* stash away this field */ astate = accumArrayResult(astate, PointerGetDatum(result_text), @@ -3133,19 +3133,19 @@ text_to_array_internal(PG_FUNCTION_ARGS) } else { - /* + /* * When fldsep is NULL, each character in the inputstring becomes an * element in the result array. The separator is effectively the space * between characters. */ inputstring_len = VARSIZE_ANY_EXHDR(inputstring); - + /* return empty array for empty input string */ if (inputstring_len < 1) PG_RETURN_ARRAYTYPE_P(construct_empty_array(TEXTOID)); - + start_ptr = VARDATA_ANY(inputstring); - + while (inputstring_len > 0) { int chunk_len = pg_mblen(start_ptr); @@ -3155,7 +3155,7 @@ text_to_array_internal(PG_FUNCTION_ARGS) /* must build a temp text datum to pass to accumArrayResult */ result_text = cstring_to_text_with_len(start_ptr, chunk_len); is_null = null_string ? text_isequal(result_text, null_string) : false; - + /* stash away this field */ astate = accumArrayResult(astate, PointerGetDatum(result_text), @@ -3205,7 +3205,7 @@ array_to_text_null(PG_FUNCTION_ARGS) /* returns NULL when first or second parameter is NULL */ if (PG_ARGISNULL(0) || PG_ARGISNULL(1)) PG_RETURN_NULL(); - + v = PG_GETARG_ARRAYTYPE_P(0); fldsep = text_to_cstring(PG_GETARG_TEXT_PP(1)); @@ -3332,7 +3332,7 @@ array_to_text_internal(FunctionCallInfo fcinfo, ArrayType *v, } } } - + result = cstring_to_text_with_len(buf.data, buf.len); pfree(buf.data); diff --git a/src/backend/utils/adt/xml.c b/src/backend/utils/adt/xml.c index 6e9c7fe2b0..726780bf37 100644 --- a/src/backend/utils/adt/xml.c +++ b/src/backend/utils/adt/xml.c @@ -3601,7 +3601,7 @@ xml_is_well_formed(PG_FUNCTION_ARGS) { #ifdef USE_LIBXML text *data = PG_GETARG_TEXT_P(0); - + PG_RETURN_BOOL(wellformed_xml(data, xmloption)); #else NO_XML_SUPPORT(); @@ -3614,7 +3614,7 @@ xml_is_well_formed_document(PG_FUNCTION_ARGS) { #ifdef USE_LIBXML text *data = PG_GETARG_TEXT_P(0); - + PG_RETURN_BOOL(wellformed_xml(data, XMLOPTION_DOCUMENT)); #else NO_XML_SUPPORT(); @@ -3627,7 +3627,7 @@ xml_is_well_formed_content(PG_FUNCTION_ARGS) { #ifdef USE_LIBXML text *data = PG_GETARG_TEXT_P(0); - + PG_RETURN_BOOL(wellformed_xml(data, XMLOPTION_CONTENT)); #else NO_XML_SUPPORT(); diff --git a/src/backend/utils/mb/Unicode/UCS_to_EUC_CN.pl b/src/backend/utils/mb/Unicode/UCS_to_EUC_CN.pl index 909c7d272e..f2bf957a2e 100755 --- a/src/backend/utils/mb/Unicode/UCS_to_EUC_CN.pl +++ b/src/backend/utils/mb/Unicode/UCS_to_EUC_CN.pl @@ -8,7 +8,7 @@ # map files provided by Unicode organization. # Unfortunately it is prohibited by the organization # to distribute the map files. So if you try to use this script, -# you have to obtain GB2312.TXT from +# you have to obtain GB2312.TXT from # the organization's ftp site. # # GB2312.TXT format: diff --git a/src/backend/utils/mb/Unicode/UCS_to_EUC_JIS_2004.pl b/src/backend/utils/mb/Unicode/UCS_to_EUC_JIS_2004.pl index 4552e06628..94e850cc7b 100755 --- a/src/backend/utils/mb/Unicode/UCS_to_EUC_JIS_2004.pl +++ b/src/backend/utils/mb/Unicode/UCS_to_EUC_JIS_2004.pl @@ -45,7 +45,7 @@ while($line = ){ } else { next; } - + $ucs = hex($u); $code = hex($c); $utf = &ucs2utf($ucs); @@ -73,7 +73,7 @@ for $index ( sort {$a <=> $b} keys( %array ) ){ if( $count == 0 ){ printf FILE " {0x%08x, 0x%06x} /* %s */\n", $index, $code, $comment{ $code }; } else { - printf FILE " {0x%08x, 0x%06x}, /* %s */\n", $index, $code, $comment{ $code }; + printf FILE " {0x%08x, 0x%06x}, /* %s */\n", $index, $code, $comment{ $code }; } } @@ -135,7 +135,7 @@ if ($TEST == 1) { ($code >= 0x8ea1 && $code <= 0x8efe) || ($code >= 0x8fa1a1 && $code <= 0x8ffefe) || ($code >= 0xa1a1 && $code <= 0x8fefe))) { - + $v1 = hex(substr($index, 0, 8)); $v2 = hex(substr($index, 8, 8)); @@ -192,7 +192,7 @@ while($line = ){ } else { next; } - + $ucs = hex($u); $code = hex($c); $utf = &ucs2utf($ucs); @@ -220,7 +220,7 @@ for $index ( sort {$a <=> $b} keys( %array ) ){ if( $count == 0 ){ printf FILE " {0x%06x, 0x%08x} /* %s */\n", $index, $code, $comment{ $code }; } else { - printf FILE " {0x%06x, 0x%08x}, /* %s */\n", $index, $code, $comment{ $code }; + printf FILE " {0x%06x, 0x%08x}, /* %s */\n", $index, $code, $comment{ $code }; } } diff --git a/src/backend/utils/mb/Unicode/UCS_to_EUC_JP.pl b/src/backend/utils/mb/Unicode/UCS_to_EUC_JP.pl index daaaea0bd5..2951fc2f1b 100755 --- a/src/backend/utils/mb/Unicode/UCS_to_EUC_JP.pl +++ b/src/backend/utils/mb/Unicode/UCS_to_EUC_JP.pl @@ -8,7 +8,7 @@ # map files provided by Unicode organization. # Unfortunately it is prohibited by the organization # to distribute the map files. So if you try to use this script, -# you have to obtain JIS0201.TXT, JIS0208.TXT, JIS0212.TXT from +# you have to obtain JIS0201.TXT, JIS0208.TXT, JIS0212.TXT from # the organization's ftp site. # # JIS0201.TXT format: diff --git a/src/backend/utils/mb/Unicode/UCS_to_EUC_KR.pl b/src/backend/utils/mb/Unicode/UCS_to_EUC_KR.pl index 4e2296a838..2d44837133 100755 --- a/src/backend/utils/mb/Unicode/UCS_to_EUC_KR.pl +++ b/src/backend/utils/mb/Unicode/UCS_to_EUC_KR.pl @@ -8,7 +8,7 @@ # map files provided by Unicode organization. # Unfortunately it is prohibited by the organization # to distribute the map files. So if you try to use this script, -# you have to obtain OLD5601.TXT from +# you have to obtain OLD5601.TXT from # the organization's ftp site. # # OLD5601.TXT format: diff --git a/src/backend/utils/mb/Unicode/UCS_to_EUC_TW.pl b/src/backend/utils/mb/Unicode/UCS_to_EUC_TW.pl index 9434298927..176f765a28 100755 --- a/src/backend/utils/mb/Unicode/UCS_to_EUC_TW.pl +++ b/src/backend/utils/mb/Unicode/UCS_to_EUC_TW.pl @@ -8,7 +8,7 @@ # map files provided by Unicode organization. # Unfortunately it is prohibited by the organization # to distribute the map files. So if you try to use this script, -# you have to obtain CNS11643.TXT from +# you have to obtain CNS11643.TXT from # the organization's ftp site. # # CNS11643.TXT format: diff --git a/src/backend/utils/mb/Unicode/UCS_to_SHIFT_JIS_2004.pl b/src/backend/utils/mb/Unicode/UCS_to_SHIFT_JIS_2004.pl index 828f34ed5a..5b7254feb0 100755 --- a/src/backend/utils/mb/Unicode/UCS_to_SHIFT_JIS_2004.pl +++ b/src/backend/utils/mb/Unicode/UCS_to_SHIFT_JIS_2004.pl @@ -43,7 +43,7 @@ while($line = ){ } else { next; } - + $ucs = hex($u); $code = hex($c); $utf = &ucs2utf($ucs); @@ -71,7 +71,7 @@ for $index ( sort {$a <=> $b} keys( %array ) ){ if( $count == 0 ){ printf FILE " {0x%08x, 0x%06x} /* %s */\n", $index, $code, $comment{ $code }; } else { - printf FILE " {0x%08x, 0x%06x}, /* %s */\n", $index, $code, $comment{ $code }; + printf FILE " {0x%08x, 0x%06x}, /* %s */\n", $index, $code, $comment{ $code }; } } @@ -132,7 +132,7 @@ while($line = ){ } else { next; } - + $ucs = hex($u); $code = hex($c); $utf = &ucs2utf($ucs); @@ -161,7 +161,7 @@ for $index ( sort {$a <=> $b} keys( %array ) ){ if( $count == 0 ){ printf FILE " {0x%04x, 0x%08x} /* %s */\n", $index, $code, $comment{ $code }; } else { - printf FILE " {0x%04x, 0x%08x}, /* %s */\n", $index, $code, $comment{ $code }; + printf FILE " {0x%04x, 0x%08x}, /* %s */\n", $index, $code, $comment{ $code }; } } diff --git a/src/backend/utils/mb/Unicode/UCS_to_SJIS.pl b/src/backend/utils/mb/Unicode/UCS_to_SJIS.pl index 00517a03f9..68037bd77a 100755 --- a/src/backend/utils/mb/Unicode/UCS_to_SJIS.pl +++ b/src/backend/utils/mb/Unicode/UCS_to_SJIS.pl @@ -8,7 +8,7 @@ # map files provided by Unicode organization. # Unfortunately it is prohibited by the organization # to distribute the map files. So if you try to use this script, -# you have to obtain SHIFTJIS.TXT from +# you have to obtain SHIFTJIS.TXT from # the organization's ftp site. # # SHIFTJIS.TXT format: diff --git a/src/backend/utils/mb/Unicode/ucs2utf.pl b/src/backend/utils/mb/Unicode/ucs2utf.pl index 6ca982f8cb..7e137f2e47 100644 --- a/src/backend/utils/mb/Unicode/ucs2utf.pl +++ b/src/backend/utils/mb/Unicode/ucs2utf.pl @@ -13,12 +13,12 @@ sub ucs2utf { } elsif ($ucs > 0x007f && $ucs <= 0x07ff) { $utf = (($ucs & 0x003f) | 0x80) | ((($ucs >> 6) | 0xc0) << 8); } elsif ($ucs > 0x07ff && $ucs <= 0xffff) { - $utf = ((($ucs >> 12) | 0xe0) << 16) | + $utf = ((($ucs >> 12) | 0xe0) << 16) | (((($ucs & 0x0fc0) >> 6) | 0x80) << 8) | (($ucs & 0x003f) | 0x80); } else { $utf = ((($ucs >> 18) | 0xf0) << 24) | - (((($ucs & 0x3ffff) >> 12) | 0x80) << 16) | + (((($ucs & 0x3ffff) >> 12) | 0x80) << 16) | (((($ucs & 0x0fc0) >> 6) | 0x80) << 8) | (($ucs & 0x003f) | 0x80); } diff --git a/src/backend/utils/misc/Makefile b/src/backend/utils/misc/Makefile index 0ca57a1f21..cd9ba5d1cc 100644 --- a/src/backend/utils/misc/Makefile +++ b/src/backend/utils/misc/Makefile @@ -37,5 +37,5 @@ endif # Note: guc-file.c is not deleted by 'make clean', # since we want to ship it in distribution tarballs. -clean: +clean: @rm -f lex.yy.c diff --git a/src/backend/utils/misc/check_guc b/src/backend/utils/misc/check_guc index 5152b4e929..293fb0363f 100755 --- a/src/backend/utils/misc/check_guc +++ b/src/backend/utils/misc/check_guc @@ -4,7 +4,7 @@ ## in postgresql.conf.sample: ## 1) the valid config settings may be preceded by a '#', but NOT '# ' ## (we use this to skip comments) -## 2) the valid config settings will be followed immediately by ' =' +## 2) the valid config settings will be followed immediately by ' =' ## (at least one space preceding the '=') ## in guc.c: ## 3) the options have PGC_ on the same line as the option @@ -14,7 +14,7 @@ ## 1) Don't know what to do with TRANSACTION ISOLATION LEVEL ## if an option is valid but shows up in only one file (guc.c but not -## postgresql.conf.sample), it should be listed here so that it +## postgresql.conf.sample), it should be listed here so that it ## can be ignored INTENTIONALLY_NOT_INCLUDED="autocommit debug_deadlocks \ is_superuser lc_collate lc_ctype lc_messages lc_monetary lc_numeric lc_time \ @@ -23,35 +23,35 @@ session_authorization trace_lock_oidmin trace_lock_table trace_locks trace_lwloc trace_notify trace_userlocks transaction_isolation transaction_read_only \ zero_damaged_pages" -### What options are listed in postgresql.conf.sample, but don't appear +### What options are listed in postgresql.conf.sample, but don't appear ### in guc.c? # grab everything that looks like a setting and convert it to lower case -SETTINGS=`grep ' =' postgresql.conf.sample | +SETTINGS=`grep ' =' postgresql.conf.sample | grep -v '^# ' | # strip comments -sed -e 's/^#//' | +sed -e 's/^#//' | awk '{print $1}'` SETTINGS=`echo "$SETTINGS" | tr 'A-Z' 'a-z'` -for i in $SETTINGS ; do +for i in $SETTINGS ; do hidden=0 ## it sure would be nice to replace this with an sql "not in" statement ## it doesn't seem to make sense to have things in .sample and not in guc.c # for hidethis in $INTENTIONALLY_NOT_INCLUDED ; do -# if [ "$hidethis" = "$i" ] ; then +# if [ "$hidethis" = "$i" ] ; then # hidden=1 # fi # done if [ "$hidden" -eq 0 ] ; then grep -i '"'$i'"' guc.c > /dev/null - if [ $? -ne 0 ] ; then - echo "$i seems to be missing from guc.c"; - fi; + if [ $? -ne 0 ] ; then + echo "$i seems to be missing from guc.c"; + fi; fi done -### What options are listed in guc.c, but don't appear +### What options are listed in guc.c, but don't appear ### in postgresql.conf.sample? # grab everything that looks like a setting and convert it to lower case diff --git a/src/backend/utils/misc/guc-file.l b/src/backend/utils/misc/guc-file.l index 3b827958f5..2986d2f25b 100644 --- a/src/backend/utils/misc/guc-file.l +++ b/src/backend/utils/misc/guc-file.l @@ -463,9 +463,9 @@ ParseConfigFile(const char *config_file, const char *calling_file, /* now we must have the option value */ if (token != GUC_ID && - token != GUC_STRING && - token != GUC_INTEGER && - token != GUC_REAL && + token != GUC_STRING && + token != GUC_INTEGER && + token != GUC_REAL && token != GUC_UNQUOTED_STRING) goto parse_error; if (token == GUC_STRING) /* strip quotes and escapes */ @@ -573,7 +573,7 @@ ParseConfigFile(const char *config_file, const char *calling_file, else ereport(elevel, (errcode(ERRCODE_SYNTAX_ERROR), - errmsg("syntax error in file \"%s\" line %u, near token \"%s\"", + errmsg("syntax error in file \"%s\" line %u, near token \"%s\"", config_file, ConfigFileLineno, yytext))); OK = false; diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample index d512172769..80ee04d30a 100644 --- a/src/backend/utils/misc/postgresql.conf.sample +++ b/src/backend/utils/misc/postgresql.conf.sample @@ -62,7 +62,7 @@ # (change requires restart) #port = 5432 # (change requires restart) #max_connections = 100 # (change requires restart) -# Note: Increasing max_connections costs ~400 bytes of shared memory per +# Note: Increasing max_connections costs ~400 bytes of shared memory per # connection slot, plus lock space (see max_locks_per_transaction). #superuser_reserved_connections = 3 # (change requires restart) #unix_socket_directory = '' # (change requires restart) @@ -154,7 +154,7 @@ # (change requires restart) #fsync = on # turns forced synchronization on or off #synchronous_commit = on # immediate fsync at commit -#wal_sync_method = fsync # the default is the first option +#wal_sync_method = fsync # the default is the first option # supported by the operating system: # open_datasync # fdatasync @@ -246,7 +246,7 @@ #constraint_exclusion = partition # on, off, or partition #cursor_tuple_fraction = 0.1 # range 0.0-1.0 #from_collapse_limit = 8 -#join_collapse_limit = 8 # 1 disables collapsing of explicit +#join_collapse_limit = 8 # 1 disables collapsing of explicit # JOIN clauses @@ -284,7 +284,7 @@ # in all cases. #log_rotation_age = 1d # Automatic rotation of logfiles will # happen after that time. 0 disables. -#log_rotation_size = 10MB # Automatic rotation of logfiles will +#log_rotation_size = 10MB # Automatic rotation of logfiles will # happen after that much log output. # 0 disables. @@ -412,7 +412,7 @@ # AUTOVACUUM PARAMETERS #------------------------------------------------------------------------------ -#autovacuum = on # Enable autovacuum subprocess? 'on' +#autovacuum = on # Enable autovacuum subprocess? 'on' # requires track_counts to also be on. #log_autovacuum_min_duration = -1 # -1 disables, 0 logs all actions and # their durations, > 0 logs only @@ -423,7 +423,7 @@ #autovacuum_naptime = 1min # time between autovacuum runs #autovacuum_vacuum_threshold = 50 # min number of row updates before # vacuum -#autovacuum_analyze_threshold = 50 # min number of row updates before +#autovacuum_analyze_threshold = 50 # min number of row updates before # analyze #autovacuum_vacuum_scale_factor = 0.2 # fraction of table size before vacuum #autovacuum_analyze_scale_factor = 0.1 # fraction of table size before analyze diff --git a/src/backend/utils/mmgr/README b/src/backend/utils/mmgr/README index 2e9a226114..d52e959784 100644 --- a/src/backend/utils/mmgr/README +++ b/src/backend/utils/mmgr/README @@ -377,7 +377,7 @@ constraining context-type designers very much.) Given this, the pfree routine will look something like - StandardChunkHeader * header = + StandardChunkHeader * header = (StandardChunkHeader *) ((char *) p - sizeof(StandardChunkHeader)); (*header->mycontext->methods->free_p) (p); diff --git a/src/bcc32.mak b/src/bcc32.mak index 67f73a53b9..83c26df167 100644 --- a/src/bcc32.mak +++ b/src/bcc32.mak @@ -19,17 +19,17 @@ !IF "$(OS)" == "Windows_NT" NULL= -!ELSE +!ELSE NULL=nul -!ENDIF +!ENDIF -ALL: +ALL: cd include if not exist pg_config.h copy pg_config.h.win32 pg_config.h if not exist pg_config_os.h copy port\win32.h pg_config_os.h cd .. cd interfaces\libpq - make -N -DCFG=$(CFG) /f bcc32.mak + make -N -DCFG=$(CFG) /f bcc32.mak cd ..\.. echo All Win32 parts have been built! diff --git a/src/bin/pg_dump/README b/src/bin/pg_dump/README index c0a84ff63a..5015b7cd45 100644 --- a/src/bin/pg_dump/README +++ b/src/bin/pg_dump/README @@ -19,7 +19,7 @@ or, to dump in TAR format pg_dump -Ft > To restore, try - + To list contents: pg_restore -l | less @@ -62,12 +62,12 @@ or, simply: TAR === -The TAR archive that pg_dump creates currently has a blank username & group for the files, +The TAR archive that pg_dump creates currently has a blank username & group for the files, but should be otherwise valid. It also includes a 'restore.sql' script which is there for the benefit of humans. The script is never used by pg_restore. Note: the TAR format archive can only be used as input into pg_restore if it is in TAR form. -(ie. you should not extract the files then expect pg_restore to work). +(ie. you should not extract the files then expect pg_restore to work). You can extract, edit, and tar the files again, and it should work, but the 'toc' file should go at the start, the data files be in the order they are used, and diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c index 55ea6841a4..3bca417cef 100644 --- a/src/bin/pg_dump/pg_dump.c +++ b/src/bin/pg_dump/pg_dump.c @@ -10498,7 +10498,7 @@ dumpACL(Archive *fout, CatalogId objCatId, DumpId objDumpId, } /* - * dumpSecLabel + * dumpSecLabel * * This routine is used to dump any security labels associated with the * object handed to this routine. The routine takes a constant character diff --git a/src/bin/psql/psqlscan.l b/src/bin/psql/psqlscan.l index 7942fe5c45..a1da032a6f 100644 --- a/src/bin/psql/psqlscan.l +++ b/src/bin/psql/psqlscan.l @@ -277,8 +277,8 @@ xqinside [^']+ /* $foo$ style quotes ("dollar quoting") * The quoted string starts with $foo$ where "foo" is an optional string - * in the form of an identifier, except that it may not contain "$", - * and extends to the first occurrence of an identical string. + * in the form of an identifier, except that it may not contain "$", + * and extends to the first occurrence of an identical string. * There is *no* processing of the quoted text. * * {dolqfailed} is an error rule to avoid scanner backup when {dolqdelim} @@ -364,7 +364,7 @@ self [,()\[\].;\:\+\-\*\/\%\^\<\>\=] op_chars [\~\!\@\#\^\&\|\`\?\+\-\*\/\%\<\>\=] operator {op_chars}+ -/* we no longer allow unary minus in numbers. +/* we no longer allow unary minus in numbers. * instead we pass it separately to parser. there it gets * coerced via doNegate() -- Leon aug 20 1999 * diff --git a/src/include/catalog/objectaddress.h b/src/include/catalog/objectaddress.h index 0ec24bdd30..1831fd01ee 100644 --- a/src/include/catalog/objectaddress.h +++ b/src/include/catalog/objectaddress.h @@ -10,7 +10,7 @@ * *------------------------------------------------------------------------- */ -#ifndef OBJECTADDRESS_H +#ifndef OBJECTADDRESS_H #define OBJECTADDRESS_H #include "nodes/parsenodes.h" diff --git a/src/include/pg_config.h.win32 b/src/include/pg_config.h.win32 index 6c342a24d0..2a383b619a 100644 --- a/src/include/pg_config.h.win32 +++ b/src/include/pg_config.h.win32 @@ -179,7 +179,7 @@ #define HAVE_INTTYPES_H 1 /* Define to 1 if you have the global variable 'int timezone'. */ -#define HAVE_INT_TIMEZONE +#define HAVE_INT_TIMEZONE /* Define to 1 if you have support for IPv6. */ #define HAVE_IPV6 1 @@ -249,7 +249,7 @@ /* Define to 1 if `long long int' works and is 64 bits. */ #if (_MSC_VER > 1200) -#define HAVE_LONG_LONG_INT_64 +#define HAVE_LONG_LONG_INT_64 #endif /* Define to 1 if you have the `memmove' function. */ diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h index bf97ab3586..d54a02c98f 100644 --- a/src/include/storage/s_lock.h +++ b/src/include/storage/s_lock.h @@ -856,7 +856,7 @@ spin_delay(void) #endif - + #endif /* !defined(HAS_TEST_AND_SET) */ diff --git a/src/interfaces/ecpg/README.dynSQL b/src/interfaces/ecpg/README.dynSQL index dcb263e9f6..e1d1507fd0 100644 --- a/src/interfaces/ecpg/README.dynSQL +++ b/src/interfaces/ecpg/README.dynSQL @@ -3,7 +3,7 @@ src/interfaces/ecpg/README.dynSQL descriptor statements have the following shortcomings - input descriptors (USING DESCRIPTOR ) are not supported - + Reason: to fully support dynamic SQL the frontend/backend communication should change to recognize input parameters. Since this is not likely to happen in the near future and you diff --git a/src/interfaces/ecpg/ecpglib/prepare.c b/src/interfaces/ecpg/ecpglib/prepare.c index 90288d343b..0296d925b9 100644 --- a/src/interfaces/ecpg/ecpglib/prepare.c +++ b/src/interfaces/ecpg/ecpglib/prepare.c @@ -164,7 +164,7 @@ ECPGprepare(int lineno, const char *connection_name, const bool questionmarks, c struct prepared_statement *this, *prev; - (void) questionmarks; /* quiet the compiler */ + (void) questionmarks; /* quiet the compiler */ con = ecpg_get_connection(connection_name); if (!ecpg_init(con, connection_name, lineno)) diff --git a/src/interfaces/ecpg/preproc/Makefile b/src/interfaces/ecpg/preproc/Makefile index e8a6916faa..4c8f8d699d 100644 --- a/src/interfaces/ecpg/preproc/Makefile +++ b/src/interfaces/ecpg/preproc/Makefile @@ -58,7 +58,7 @@ else endif preproc.y: ../../../backend/parser/gram.y parse.pl ecpg.addons ecpg.header ecpg.tokens ecpg.trailer ecpg.type - $(PERL) $(srcdir)/parse.pl $(srcdir) < $< > $@ + $(PERL) $(srcdir)/parse.pl $(srcdir) < $< > $@ $(PERL) $(srcdir)/check_rules.pl $(srcdir) $< ecpg_keywords.o c_keywords.o keywords.o preproc.o parser.o: preproc.h diff --git a/src/interfaces/ecpg/preproc/check_rules.pl b/src/interfaces/ecpg/preproc/check_rules.pl index 7dc6ca46fb..3a796493d5 100755 --- a/src/interfaces/ecpg/preproc/check_rules.pl +++ b/src/interfaces/ecpg/preproc/check_rules.pl @@ -102,7 +102,7 @@ while () { $block = $block . $arr[$fieldIndexer]; } } -} +} close GRAM; @@ -113,7 +113,7 @@ line: while () { @Fld = split(' ', $_, -1); if (!/^ECPG:/) { - next line; + next line; } if ($found{$Fld[2]} ne 'found') { diff --git a/src/interfaces/ecpg/preproc/ecpg.addons b/src/interfaces/ecpg/preproc/ecpg.addons index 3b74ba0a4e..3a8c2dca10 100644 --- a/src/interfaces/ecpg/preproc/ecpg.addons +++ b/src/interfaces/ecpg/preproc/ecpg.addons @@ -40,7 +40,7 @@ ECPG: stmtPrepareStmt block { if ($1.type == NULL || strlen($1.type) == 0) output_prepare_statement($1.name, $1.stmt); - else + else output_statement(cat_str(5, make_str("prepare"), $1.name, $1.type, make_str("as"), $1.stmt), 0, ECPGst_normal); } ECPG: stmtTransactionStmt block @@ -109,7 +109,7 @@ ECPG: stmtViewStmt rule if (!strcmp($1, "all")) fprintf(yyout, "{ ECPGdeallocate_all(__LINE__, %d, %s);", compat, con); - else if ($1[0] == ':') + else if ($1[0] == ':') fprintf(yyout, "{ ECPGdeallocate(__LINE__, %d, %s, %s);", compat, con, $1+1); else fprintf(yyout, "{ ECPGdeallocate(__LINE__, %d, %s, \"%s\");", compat, con, $1); diff --git a/src/interfaces/ecpg/preproc/ecpg.header b/src/interfaces/ecpg/preproc/ecpg.header index 54979e987c..3f6ffd9c7b 100644 --- a/src/interfaces/ecpg/preproc/ecpg.header +++ b/src/interfaces/ecpg/preproc/ecpg.header @@ -103,7 +103,7 @@ mmerror(int error_code, enum errortype type, const char *error, ...) fclose(yyin); if (yyout) fclose(yyout); - + if (strcmp(output_filename, "-") != 0 && unlink(output_filename) != 0) fprintf(stderr, _("could not remove output file \"%s\"\n"), output_filename); exit(error_code); diff --git a/src/interfaces/ecpg/preproc/ecpg.tokens b/src/interfaces/ecpg/preproc/ecpg.tokens index c396b552f9..b55138a316 100644 --- a/src/interfaces/ecpg/preproc/ecpg.tokens +++ b/src/interfaces/ecpg/preproc/ecpg.tokens @@ -3,7 +3,7 @@ /* special embedded SQL tokens */ %token SQL_ALLOCATE SQL_AUTOCOMMIT SQL_BOOL SQL_BREAK SQL_CALL SQL_CARDINALITY SQL_CONNECT - SQL_COUNT + SQL_COUNT SQL_DATETIME_INTERVAL_CODE SQL_DATETIME_INTERVAL_PRECISION SQL_DESCRIBE SQL_DESCRIPTOR SQL_DISCONNECT SQL_FOUND @@ -23,5 +23,5 @@ S_STATIC S_SUB S_VOLATILE S_TYPEDEF -%token CSTRING CVARIABLE CPP_LINE IP +%token CSTRING CVARIABLE CPP_LINE IP %token DOLCONST ECONST NCONST UCONST UIDENT diff --git a/src/interfaces/ecpg/preproc/ecpg.trailer b/src/interfaces/ecpg/preproc/ecpg.trailer index 2eaef25c53..e80fece810 100644 --- a/src/interfaces/ecpg/preproc/ecpg.trailer +++ b/src/interfaces/ecpg/preproc/ecpg.trailer @@ -70,7 +70,7 @@ connection_target: opt_database_name opt_server opt_port /* old style: dbname[@server][:port] */ if (strlen($2) > 0 && *($2) != '@') mmerror(PARSE_ERROR, ET_ERROR, "expected \"@\", found \"%s\"", $2); - + /* C strings need to be handled differently */ if ($1[0] == '\"') $$ = $1; @@ -241,7 +241,7 @@ opt_options: Op connect_options | /*EMPTY*/ { $$ = EMPTY; } ; -connect_options: ColId opt_opt_value +connect_options: ColId opt_opt_value { $$ = make2_str($1, $2); } | ColId opt_opt_value Op connect_options { @@ -347,7 +347,7 @@ ECPGCursorStmt: DECLARE cursor_name cursor_options CURSOR opt_hold FOR prepared ; ECPGExecuteImmediateStmt: EXECUTE IMMEDIATE execstring - { + { /* execute immediate means prepare the statement and * immediately execute it */ $$ = $3; @@ -631,7 +631,7 @@ var_type: simple_type $$.type_index = this->type->type_index; if (this->type->type_sizeof && strlen(this->type->type_sizeof) != 0) $$.type_sizeof = this->type->type_sizeof; - else + else $$.type_sizeof = cat_str(3, make_str("sizeof("), mm_strdup(this->name), make_str(")")); struct_member_list[struct_level] = ECPGstruct_member_dup(this->struct_member_list); @@ -862,7 +862,7 @@ variable: opt_pointer ECPGColLabel opt_array_bounds opt_bit_field opt_initialize type = ECPGmake_simple_type(actual_type[struct_level].type_enum, length, varchar_counter); else type = ECPGmake_array_type(ECPGmake_simple_type(actual_type[struct_level].type_enum, length, varchar_counter), dimension); - + if (strcmp(dimension, "0") == 0 || abs(atoi(dimension)) == 1) *dim = '\0'; else @@ -1037,7 +1037,7 @@ UsingValue: UsingConst } | civar { $$ = EMPTY; } | civarind { $$ = EMPTY; } - ; + ; UsingConst: Iconst { $$ = $1; } | '+' Iconst { $$ = cat_str(2, make_str("+"), $2); } @@ -1857,7 +1857,7 @@ execute_rest: /* EMPTY */ { $$ = EMPTY; } | ecpg_into ecpg_using { $$ = EMPTY; } | ecpg_using { $$ = EMPTY; } | ecpg_into { $$ = EMPTY; } - ; + ; ecpg_into: INTO into_list { $$ = EMPTY; } | into_descriptor { $$ = $1; } diff --git a/src/interfaces/ecpg/preproc/ecpg.type b/src/interfaces/ecpg/preproc/ecpg.type index 831c4c3b20..ac6aa000ac 100644 --- a/src/interfaces/ecpg/preproc/ecpg.type +++ b/src/interfaces/ecpg/preproc/ecpg.type @@ -113,7 +113,7 @@ %type variable %type variable_declarations %type variable_list -%type vt_declarations +%type vt_declarations %type Op %type IntConstVar diff --git a/src/interfaces/ecpg/preproc/parse.pl b/src/interfaces/ecpg/preproc/parse.pl index f3c757e893..b765a58305 100644 --- a/src/interfaces/ecpg/preproc/parse.pl +++ b/src/interfaces/ecpg/preproc/parse.pl @@ -93,7 +93,7 @@ line: while (<>) { chomp; # strip record separator @Fld = split(' ', $_, -1); - # Dump the action for a rule - + # Dump the action for a rule - # mode indicates if we are processing the 'stmt:' rule (mode==0 means normal, mode==1 means stmt:) # flds are the fields to use. These may start with a '$' - in which case they are the result of a previous non-terminal # if they dont start with a '$' then they are token name @@ -235,8 +235,8 @@ line: while (<>) { if ($replace_token{$arr[$fieldIndexer]}) { $arr[$fieldIndexer] = $replace_token{$arr[$fieldIndexer]}; } - - # Are we looking at a declaration of a non-terminal ? + + # Are we looking at a declaration of a non-terminal ? if (($arr[$fieldIndexer] =~ '[A-Za-z0-9]+:') || $arr[$fieldIndexer + 1] eq ':') { $non_term_id = $arr[$fieldIndexer]; $s = ':', $non_term_id =~ s/$s//g; @@ -253,7 +253,7 @@ line: while (<>) { $copymode = 'on'; } $line = $line . ' ' . $arr[$fieldIndexer]; - # Do we have the : attached already ? + # Do we have the : attached already ? # If yes, we'll have already printed the ':' if (!($arr[$fieldIndexer] =~ '[A-Za-z0-9]+:')) { # Consume the ':' which is next... @@ -261,7 +261,7 @@ line: while (<>) { $fieldIndexer++; } - # Special mode? + # Special mode? if ($non_term_id eq 'stmt') { $stmt_mode = 1; } @@ -380,7 +380,7 @@ sub dump { sub dump_fields { local($mode, *flds, $len, $ln) = @_; if ($mode == 0) { - #Normal + #Normal &add_to_buffer('rules', $ln); if ($feature_not_supported == 1) { # we found an unsupported feature, but we have to @@ -393,7 +393,7 @@ sub dump_fields { } if ($len == 0) { - # We have no fields ? + # We have no fields ? &add_to_buffer('rules', " \$\$=EMPTY; }"); } else { @@ -418,7 +418,7 @@ sub dump_fields { } } - # So - how many fields did we end up with ? + # So - how many fields did we end up with ? if ($cnt == 1) { # Straight assignement $str = " \$\$ = " . $flds_new{0} . ';'; diff --git a/src/interfaces/ecpg/preproc/pgc.l b/src/interfaces/ecpg/preproc/pgc.l index 05febb556d..b7e46866f7 100644 --- a/src/interfaces/ecpg/preproc/pgc.l +++ b/src/interfaces/ecpg/preproc/pgc.l @@ -58,8 +58,8 @@ static bool isinformixdefine(void); char *token_start; int state_before; -struct _yy_buffer -{ +struct _yy_buffer +{ YY_BUFFER_STATE buffer; long lineno; char *filename; @@ -71,7 +71,7 @@ static char *old; #define MAX_NESTED_IF 128 static short preproc_tos; static short ifcond; -static struct _if_value +static struct _if_value { short condition; short else_branch; @@ -87,7 +87,7 @@ static struct _if_value %option yylineno -%x C SQL incl def def_ident undef +%x C SQL incl def def_ident undef /* * OK, here is a short description of lex/flex rules behavior. @@ -518,7 +518,7 @@ cppline {space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})(.*\\{space})*. /* throw back all but the initial "$" */ yyless(1); /* and treat it as {other} */ - return yytext[0]; + return yytext[0]; } {dolqdelim} { token_start = yytext; @@ -737,7 +737,7 @@ cppline {space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})(.*\\{space})*. } {identifier} { const ScanKeyword *keyword; - + if (!isdefine()) { /* Is it an SQL/ECPG keyword? */ @@ -764,7 +764,7 @@ cppline {space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})(.*\\{space})*. } {other} { return yytext[0]; } {exec_sql} { BEGIN(SQL); return SQL_START; } -{informix_special} { +{informix_special} { /* are we simulating Informix? */ if (INFORMIX_MODE) { @@ -939,7 +939,7 @@ cppline {space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})(.*\\{space})*. yyterminate(); } {exec_sql}{include}{space}* { BEGIN(incl); } -{informix_special}{include}{space}* { +{informix_special}{include}{space}* { /* are we simulating Informix? */ if (INFORMIX_MODE) { @@ -952,7 +952,7 @@ cppline {space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})(.*\\{space})*. } } {exec_sql}{ifdef}{space}* { ifcond = TRUE; BEGIN(xcond); } -{informix_special}{ifdef}{space}* { +{informix_special}{ifdef}{space}* { /* are we simulating Informix? */ if (INFORMIX_MODE) { @@ -966,7 +966,7 @@ cppline {space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})(.*\\{space})*. } } {exec_sql}{ifndef}{space}* { ifcond = FALSE; BEGIN(xcond); } -{informix_special}{ifndef}{space}* { +{informix_special}{ifndef}{space}* { /* are we simulating Informix? */ if (INFORMIX_MODE) { @@ -990,7 +990,7 @@ cppline {space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})(.*\\{space})*. ifcond = TRUE; BEGIN(xcond); } -{informix_special}{elif}{space}* { +{informix_special}{elif}{space}* { /* are we simulating Informix? */ if (INFORMIX_MODE) { @@ -1089,7 +1089,7 @@ cppline {space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})(.*\\{space})*. {identifier}{space}*";" { if (preproc_tos >= MAX_NESTED_IF-1) mmerror(PARSE_ERROR, ET_FATAL, "too many nested EXEC SQL IFDEF conditions"); - else + else { struct _defines *defptr; unsigned int i; @@ -1132,7 +1132,7 @@ cppline {space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})(.*\\{space})*. {other}|\n { mmerror(PARSE_ERROR, ET_FATAL, "missing identifier in EXEC SQL DEFINE command"); yyterminate(); - } + } {space}*";" { struct _defines *ptr, *this; @@ -1170,7 +1170,7 @@ cppline {space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})(.*\\{space})*. <> { if (yy_buffer == NULL) { - if ( preproc_tos > 0 ) + if ( preproc_tos > 0 ) { preproc_tos = 0; mmerror(PARSE_ERROR, ET_FATAL, "missing \"EXEC SQL ENDIF;\""); @@ -1189,7 +1189,7 @@ cppline {space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})(.*\\{space})*. ptr->used = NULL; break; } - + if (yyin != NULL) fclose(yyin); @@ -1209,7 +1209,7 @@ cppline {space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})(.*\\{space})*. if (i != 0) output_line_number(); - + } } {other}|\n { mmerror(PARSE_ERROR, ET_FATAL, "internal error: unreachable state; please report this to "); } @@ -1244,7 +1244,7 @@ addlit(char *ytext, int yleng) /* enlarge buffer if needed */ if ((literallen+yleng) >= literalalloc) { - do + do literalalloc *= 2; while ((literallen+yleng) >= literalalloc); literalbuf = (char *) realloc(literalbuf, literalalloc); @@ -1290,7 +1290,7 @@ parse_include(void) /* * skip the ";" if there is one and trailing whitespace. Note that - * yytext contains at least one non-space character plus the ";" + * yytext contains at least one non-space character plus the ";" */ for (i = strlen(yytext)-2; i > 0 && ecpg_isspace(yytext[i]); @@ -1301,7 +1301,7 @@ parse_include(void) i--; yytext[i+1] = '\0'; - + yyin = NULL; /* If file name is enclosed in '"' remove these and look only in '.' */ @@ -1311,7 +1311,7 @@ parse_include(void) { yytext[i] = '\0'; memmove(yytext, yytext+1, strlen(yytext)); - + strncpy(inc_file, yytext, sizeof(inc_file)); yyin = fopen(inc_file, "r"); if (!yyin) @@ -1322,7 +1322,7 @@ parse_include(void) yyin = fopen(inc_file, "r"); } } - + } else { @@ -1331,7 +1331,7 @@ parse_include(void) yytext[i] = '\0'; memmove(yytext, yytext+1, strlen(yytext)); } - + for (ip = include_paths; yyin == NULL && ip != NULL; ip = ip->next) { if (strlen(ip->path) + strlen(yytext) + 3 > MAXPGPATH) diff --git a/src/interfaces/ecpg/test/Makefile.regress b/src/interfaces/ecpg/test/Makefile.regress index df792fd238..b2417081ee 100644 --- a/src/interfaces/ecpg/test/Makefile.regress +++ b/src/interfaces/ecpg/test/Makefile.regress @@ -1,6 +1,6 @@ override CPPFLAGS := -I../../include -I$(top_srcdir)/src/interfaces/ecpg/include \ - -I$(libpq_srcdir) $(CPPFLAGS) -override CFLAGS += $(PTHREAD_CFLAGS) + -I$(libpq_srcdir) $(CPPFLAGS) +override CFLAGS += $(PTHREAD_CFLAGS) override LDFLAGS := -L../../ecpglib -L../../pgtypeslib $(filter-out -l%, $(libpq)) $(LDFLAGS) override LIBS := -lecpg -lpgtypes $(filter -l%, $(libpq)) $(LIBS) $(PTHREAD_LIBS) diff --git a/src/interfaces/ecpg/test/compat_informix/describe.pgc b/src/interfaces/ecpg/test/compat_informix/describe.pgc index b0f9a3d8f2..1836ac3843 100644 --- a/src/interfaces/ecpg/test/compat_informix/describe.pgc +++ b/src/interfaces/ecpg/test/compat_informix/describe.pgc @@ -192,7 +192,7 @@ exec sql end declare section; strcpy(msg, "commit"); exec sql commit; - strcpy(msg, "disconnect"); + strcpy(msg, "disconnect"); exec sql disconnect; return (0); diff --git a/src/interfaces/ecpg/test/compat_informix/sqlda.pgc b/src/interfaces/ecpg/test/compat_informix/sqlda.pgc index 8490d06164..e1142d2b22 100644 --- a/src/interfaces/ecpg/test/compat_informix/sqlda.pgc +++ b/src/interfaces/ecpg/test/compat_informix/sqlda.pgc @@ -106,7 +106,7 @@ exec sql end declare section; while (1) { strcpy(msg, "fetch"); - exec sql fetch 1 from mycur1 into descriptor outp_sqlda; + exec sql fetch 1 from mycur1 into descriptor outp_sqlda; printf("FETCH RECORD %d\n", ++rec); dump_sqlda(outp_sqlda); diff --git a/src/interfaces/ecpg/test/compat_informix/test_informix.pgc b/src/interfaces/ecpg/test/compat_informix/test_informix.pgc index e1cfd25a3b..8b7692b0fd 100644 --- a/src/interfaces/ecpg/test/compat_informix/test_informix.pgc +++ b/src/interfaces/ecpg/test/compat_informix/test_informix.pgc @@ -11,7 +11,7 @@ static void dosqlprint(void) { int main(void) { - $int i = 14; + $int i = 14; $decimal j, m, n; $string c[10]; diff --git a/src/interfaces/ecpg/test/compat_informix/test_informix2.pgc b/src/interfaces/ecpg/test/compat_informix/test_informix2.pgc index 9b324e25e8..0e8f1f0f0b 100644 --- a/src/interfaces/ecpg/test/compat_informix/test_informix2.pgc +++ b/src/interfaces/ecpg/test/compat_informix/test_informix2.pgc @@ -67,8 +67,8 @@ int main(void) EXEC SQL create table history (customerid integer, timestamp timestamp without time zone, action_taken char(5), narrative varchar(100)); sql_check("main", "create", 0); - - EXEC SQL insert into history + + EXEC SQL insert into history (customerid, timestamp, action_taken, narrative) values(1, '2003-05-07 13:28:34 CEST', 'test', 'test'); sql_check("main", "insert", 0); @@ -96,7 +96,7 @@ int main(void) (customerid, timestamp, action_taken, narrative) values(:c, :e, 'test', 'test'); sql_check("main", "update", 0); - + EXEC SQL commit; EXEC SQL drop table history; diff --git a/src/interfaces/ecpg/test/expected/compat_informix-describe.c b/src/interfaces/ecpg/test/expected/compat_informix-describe.c index 6aa534f5d6..b4e1b47066 100644 --- a/src/interfaces/ecpg/test/expected/compat_informix-describe.c +++ b/src/interfaces/ecpg/test/expected/compat_informix-describe.c @@ -455,7 +455,7 @@ if (sqlca.sqlcode < 0) exit (1);} #line 193 "describe.pgc" - strcpy(msg, "disconnect"); + strcpy(msg, "disconnect"); { ECPGdisconnect(__LINE__, "CURRENT"); #line 196 "describe.pgc" diff --git a/src/interfaces/ecpg/test/expected/compat_informix-sqlda.c b/src/interfaces/ecpg/test/expected/compat_informix-sqlda.c index 647f677c14..a013be99aa 100644 --- a/src/interfaces/ecpg/test/expected/compat_informix-sqlda.c +++ b/src/interfaces/ecpg/test/expected/compat_informix-sqlda.c @@ -268,7 +268,7 @@ if (sqlca.sqlcode == ECPG_NOT_FOUND) break; if (sqlca.sqlcode < 0) exit (1);} #line 109 "sqlda.pgc" - + printf("FETCH RECORD %d\n", ++rec); dump_sqlda(outp_sqlda); diff --git a/src/interfaces/ecpg/test/expected/compat_informix-test_informix.c b/src/interfaces/ecpg/test/expected/compat_informix-test_informix.c index 4cc6e3d713..d357c77a43 100644 --- a/src/interfaces/ecpg/test/expected/compat_informix-test_informix.c +++ b/src/interfaces/ecpg/test/expected/compat_informix-test_informix.c @@ -36,7 +36,7 @@ int main(void) int i = 14 ; #line 14 "test_informix.pgc" - + #line 15 "test_informix.pgc" decimal j , m , n ; diff --git a/src/interfaces/ecpg/test/expected/compat_informix-test_informix2.c b/src/interfaces/ecpg/test/expected/compat_informix-test_informix2.c index 2f8ee74971..c1a4891191 100644 --- a/src/interfaces/ecpg/test/expected/compat_informix-test_informix2.c +++ b/src/interfaces/ecpg/test/expected/compat_informix-test_informix2.c @@ -193,7 +193,7 @@ if (sqlca.sqlcode < 0) sqlprint();} #line 68 "test_informix2.pgc" sql_check("main", "create", 0); - + { ECPGdo(__LINE__, 1, 1, NULL, 0, ECPGst_normal, "insert into history ( customerid , timestamp , action_taken , narrative ) values ( 1 , '2003-05-07 13:28:34 CEST' , 'test' , 'test' )", ECPGt_EOIT, ECPGt_EORT); #line 73 "test_informix2.pgc" @@ -244,7 +244,7 @@ if (sqlca.sqlcode < 0) sqlprint();} #line 97 "test_informix2.pgc" sql_check("main", "update", 0); - + { ECPGtrans(__LINE__, NULL, "commit"); #line 100 "test_informix2.pgc" diff --git a/src/interfaces/ecpg/test/expected/pgtypeslib-dt_test.c b/src/interfaces/ecpg/test/expected/pgtypeslib-dt_test.c index 58d11e8e7e..648b648e21 100644 --- a/src/interfaces/ecpg/test/expected/pgtypeslib-dt_test.c +++ b/src/interfaces/ecpg/test/expected/pgtypeslib-dt_test.c @@ -55,17 +55,17 @@ main(void) char *t1 = "2000-7-12 17:34:29"; int i; - ECPGdebug(1, stderr); - /* exec sql whenever sqlerror do sqlprint ( ) ; */ + ECPGdebug(1, stderr); + /* exec sql whenever sqlerror do sqlprint ( ) ; */ #line 27 "dt_test.pgc" - { ECPGconnect(__LINE__, 0, "regress1" , NULL, NULL , NULL, 0); + { ECPGconnect(__LINE__, 0, "regress1" , NULL, NULL , NULL, 0); #line 28 "dt_test.pgc" if (sqlca.sqlcode < 0) sqlprint ( );} #line 28 "dt_test.pgc" - { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create table date_test ( d date , ts timestamp )", ECPGt_EOIT, ECPGt_EORT); + { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create table date_test ( d date , ts timestamp )", ECPGt_EOIT, ECPGt_EORT); #line 29 "dt_test.pgc" if (sqlca.sqlcode < 0) sqlprint ( );} @@ -84,8 +84,8 @@ if (sqlca.sqlcode < 0) sqlprint ( );} #line 31 "dt_test.pgc" - date1 = PGTYPESdate_from_asc(d1, NULL); - ts1 = PGTYPEStimestamp_from_asc(t1, NULL); + date1 = PGTYPESdate_from_asc(d1, NULL); + ts1 = PGTYPEStimestamp_from_asc(t1, NULL); { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into date_test ( d , ts ) values ( $1 , $2 )", ECPGt_date,&(date1),(long)1,(long)1,sizeof(date), diff --git a/src/interfaces/ecpg/test/expected/preproc-array_of_struct.c b/src/interfaces/ecpg/test/expected/preproc-array_of_struct.c index 91c8ad55fe..c60bf51d93 100644 --- a/src/interfaces/ecpg/test/expected/preproc-array_of_struct.c +++ b/src/interfaces/ecpg/test/expected/preproc-array_of_struct.c @@ -120,7 +120,7 @@ int main() ECPGdebug(1, stderr); - + { ECPGconnect(__LINE__, 0, "regress1" , NULL, NULL , NULL, 0); #line 50 "array_of_struct.pgc" diff --git a/src/interfaces/ecpg/test/expected/preproc-cursor.c b/src/interfaces/ecpg/test/expected/preproc-cursor.c index e755c57461..794e7e2643 100644 --- a/src/interfaces/ecpg/test/expected/preproc-cursor.c +++ b/src/interfaces/ecpg/test/expected/preproc-cursor.c @@ -754,7 +754,7 @@ if (sqlca.sqlcode < 0) exit (1);} #line 239 "cursor.pgc" - strcpy(msg, "disconnect"); + strcpy(msg, "disconnect"); { ECPGdisconnect(__LINE__, "CURRENT"); #line 242 "cursor.pgc" diff --git a/src/interfaces/ecpg/test/expected/preproc-init.c b/src/interfaces/ecpg/test/expected/preproc-init.c index 1307915fad..49f2d5d57a 100644 --- a/src/interfaces/ecpg/test/expected/preproc-init.c +++ b/src/interfaces/ecpg/test/expected/preproc-init.c @@ -146,7 +146,7 @@ int main(void) - + /* = 1L */ #line 60 "init.pgc" @@ -250,7 +250,7 @@ if (sqlca.sqlcode < 0) fe ( ENUM0 );} /* exec sql whenever sqlerror do sqlnotice ( NULL , 0 ) ; */ #line 97 "init.pgc" - + { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select now ( )", ECPGt_EOIT, ECPGt_EORT); #line 98 "init.pgc" diff --git a/src/interfaces/ecpg/test/expected/preproc-outofscope.c b/src/interfaces/ecpg/test/expected/preproc-outofscope.c index ada4f89d6c..a30b7215ae 100644 --- a/src/interfaces/ecpg/test/expected/preproc-outofscope.c +++ b/src/interfaces/ecpg/test/expected/preproc-outofscope.c @@ -363,7 +363,7 @@ if (sqlca.sqlcode < 0) exit (1);} #line 118 "outofscope.pgc" - strcpy(msg, "disconnect"); + strcpy(msg, "disconnect"); { ECPGdisconnect(__LINE__, "CURRENT"); #line 121 "outofscope.pgc" diff --git a/src/interfaces/ecpg/test/expected/preproc-variable.c b/src/interfaces/ecpg/test/expected/preproc-variable.c index 9f8b36d8a7..ca3032faca 100644 --- a/src/interfaces/ecpg/test/expected/preproc-variable.c +++ b/src/interfaces/ecpg/test/expected/preproc-variable.c @@ -264,7 +264,7 @@ if (sqlca.sqlcode < 0) exit (1);} #line 95 "variable.pgc" - strcpy(msg, "disconnect"); + strcpy(msg, "disconnect"); { ECPGdisconnect(__LINE__, "CURRENT"); #line 98 "variable.pgc" diff --git a/src/interfaces/ecpg/test/expected/preproc-whenever.c b/src/interfaces/ecpg/test/expected/preproc-whenever.c index 1547a16e99..03f596a9c2 100644 --- a/src/interfaces/ecpg/test/expected/preproc-whenever.c +++ b/src/interfaces/ecpg/test/expected/preproc-whenever.c @@ -243,4 +243,4 @@ if (sqlca.sqlcode < 0) exit (1);} #line 65 "whenever.pgc" exit (0); -} +} diff --git a/src/interfaces/ecpg/test/expected/sql-array.c b/src/interfaces/ecpg/test/expected/sql-array.c index cdd2bea078..3c879561b3 100644 --- a/src/interfaces/ecpg/test/expected/sql-array.c +++ b/src/interfaces/ecpg/test/expected/sql-array.c @@ -148,7 +148,7 @@ if (sqlca.sqlcode < 0) sqlprint();} #line 29 "array.pgc" - { ECPGtrans(__LINE__, NULL, "begin work"); + { ECPGtrans(__LINE__, NULL, "begin work"); #line 31 "array.pgc" if (sqlca.sqlcode < 0) sqlprint();} @@ -205,7 +205,7 @@ if (sqlca.sqlcode < 0) sqlprint();} if (sqlca.sqlcode < 0) sqlprint();} #line 43 "array.pgc" - + { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select f , text from test where i = 1", ECPGt_EOIT, ECPGt_double,&(f),(long)1,(long)1,sizeof(double), diff --git a/src/interfaces/ecpg/test/expected/sql-code100.c b/src/interfaces/ecpg/test/expected/sql-code100.c index e250690e9c..051fc38622 100644 --- a/src/interfaces/ecpg/test/expected/sql-code100.c +++ b/src/interfaces/ecpg/test/expected/sql-code100.c @@ -104,7 +104,7 @@ int main() ECPGdebug(1,stderr); - + { ECPGconnect(__LINE__, 0, "regress1" , NULL, NULL , NULL, 0); } #line 15 "code100.pgc" @@ -118,7 +118,7 @@ int main() #line 22 "code100.pgc" if (sqlca.sqlcode) printf("%ld:%s\n",sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc); - + for (index=0;index<10;++index) { { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into test ( payload , index ) values ( 0 , $1 )", ECPGt_int,&(index),(long)1,(long)1,sizeof(int), @@ -131,12 +131,12 @@ int main() #line 31 "code100.pgc" if (sqlca.sqlcode) printf("%ld:%s\n",sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc); - + { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "update test set payload = payload + 1 where index = - 1", ECPGt_EOIT, ECPGt_EORT);} #line 35 "code100.pgc" if (sqlca.sqlcode!=100) printf("%ld:%s\n",sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc); - + { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "delete from test where index = - 1", ECPGt_EOIT, ECPGt_EORT);} #line 38 "code100.pgc" @@ -155,7 +155,7 @@ int main() #line 46 "code100.pgc" if (sqlca.sqlcode) printf("%ld:%s\n",sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc); - + { ECPGdisconnect(__LINE__, "CURRENT");} #line 49 "code100.pgc" diff --git a/src/interfaces/ecpg/test/expected/sql-describe.c b/src/interfaces/ecpg/test/expected/sql-describe.c index 7a5ab02deb..fd46a29245 100644 --- a/src/interfaces/ecpg/test/expected/sql-describe.c +++ b/src/interfaces/ecpg/test/expected/sql-describe.c @@ -453,7 +453,7 @@ if (sqlca.sqlcode < 0) exit (1);} #line 193 "describe.pgc" - strcpy(msg, "disconnect"); + strcpy(msg, "disconnect"); { ECPGdisconnect(__LINE__, "CURRENT"); #line 196 "describe.pgc" diff --git a/src/interfaces/ecpg/test/expected/sql-dynalloc.c b/src/interfaces/ecpg/test/expected/sql-dynalloc.c index 0232480333..ff04922fa7 100644 --- a/src/interfaces/ecpg/test/expected/sql-dynalloc.c +++ b/src/interfaces/ecpg/test/expected/sql-dynalloc.c @@ -296,28 +296,28 @@ if (sqlca.sqlcode < 0) sqlprint ( );} for (i=0;imember; int c=10>>2; - bool h=2||1; + bool h=2||1; long iay /* = 1L */ ; exec sql end declare section; @@ -94,7 +94,7 @@ int main(void) exec sql select now(); exec sql whenever sqlerror do fe(ENUM0); exec sql select now(); - exec sql whenever sqlerror do sqlnotice(NULL, NONO); + exec sql whenever sqlerror do sqlnotice(NULL, NONO); exec sql select now(); return 0; } diff --git a/src/interfaces/ecpg/test/preproc/outofscope.pgc b/src/interfaces/ecpg/test/preproc/outofscope.pgc index 12cd79ac77..25efe75cca 100644 --- a/src/interfaces/ecpg/test/preproc/outofscope.pgc +++ b/src/interfaces/ecpg/test/preproc/outofscope.pgc @@ -117,7 +117,7 @@ main (void) strcpy(msg, "commit"); exec sql commit; - strcpy(msg, "disconnect"); + strcpy(msg, "disconnect"); exec sql disconnect; return (0); diff --git a/src/interfaces/ecpg/test/preproc/variable.pgc b/src/interfaces/ecpg/test/preproc/variable.pgc index 71efa0ddaf..05420afdb2 100644 --- a/src/interfaces/ecpg/test/preproc/variable.pgc +++ b/src/interfaces/ecpg/test/preproc/variable.pgc @@ -94,7 +94,7 @@ exec sql end declare section; strcpy(msg, "commit"); exec sql commit; - strcpy(msg, "disconnect"); + strcpy(msg, "disconnect"); exec sql disconnect; return (0); diff --git a/src/interfaces/ecpg/test/preproc/whenever.pgc b/src/interfaces/ecpg/test/preproc/whenever.pgc index bba78ee023..9b3ae9e9ec 100644 --- a/src/interfaces/ecpg/test/preproc/whenever.pgc +++ b/src/interfaces/ecpg/test/preproc/whenever.pgc @@ -64,4 +64,4 @@ int main(void) exec sql select 1 into :i; exec sql rollback; exit (0); -} +} diff --git a/src/interfaces/ecpg/test/sql/Makefile b/src/interfaces/ecpg/test/sql/Makefile index 59e4dd6fc9..18c37b665e 100644 --- a/src/interfaces/ecpg/test/sql/Makefile +++ b/src/interfaces/ecpg/test/sql/Makefile @@ -22,7 +22,7 @@ TESTS = array array.c \ parser parser.c \ quote quote.c \ show show.c \ - insupd insupd.c + insupd insupd.c all: $(TESTS) diff --git a/src/interfaces/ecpg/test/sql/array.pgc b/src/interfaces/ecpg/test/sql/array.pgc index d74a1354e5..fbc6741665 100644 --- a/src/interfaces/ecpg/test/sql/array.pgc +++ b/src/interfaces/ecpg/test/sql/array.pgc @@ -28,7 +28,7 @@ EXEC SQL END DECLARE SECTION; EXEC SQL SET AUTOCOMMIT = ON; - EXEC SQL BEGIN WORK; + EXEC SQL BEGIN WORK; EXEC SQL CREATE TABLE test (f float, i int, a int[10], text char(10)); @@ -40,7 +40,7 @@ EXEC SQL END DECLARE SECTION; EXEC SQL COMMIT; - EXEC SQL BEGIN WORK; + EXEC SQL BEGIN WORK; EXEC SQL SELECT f,text INTO :f,:text diff --git a/src/interfaces/ecpg/test/sql/code100.pgc b/src/interfaces/ecpg/test/sql/code100.pgc index 2ae6d15ead..d9a5e52444 100644 --- a/src/interfaces/ecpg/test/sql/code100.pgc +++ b/src/interfaces/ecpg/test/sql/code100.pgc @@ -11,7 +11,7 @@ int main() ECPGdebug(1,stderr); - + exec sql connect to REGRESSDB1; if (sqlca.sqlcode) printf("%ld:%s\n",sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc); @@ -21,7 +21,7 @@ int main() if (sqlca.sqlcode) printf("%ld:%s\n",sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc); exec sql commit work; if (sqlca.sqlcode) printf("%ld:%s\n",sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc); - + for (index=0;index<10;++index) { exec sql insert into test (payload, index) @@ -30,11 +30,11 @@ int main() } exec sql commit work; if (sqlca.sqlcode) printf("%ld:%s\n",sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc); - + exec sql update test - set payload=payload+1 where index=-1; + set payload=payload+1 where index=-1; if (sqlca.sqlcode!=100) printf("%ld:%s\n",sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc); - + exec sql delete from test where index=-1; if (sqlca.sqlcode!=100) printf("%ld:%s\n",sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc); @@ -45,7 +45,7 @@ int main() if (sqlca.sqlcode) printf("%ld:%s\n",sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc); exec sql commit work; if (sqlca.sqlcode) printf("%ld:%s\n",sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc); - + exec sql disconnect; if (sqlca.sqlcode) printf("%ld:%s\n",sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc); return 0; diff --git a/src/interfaces/ecpg/test/sql/describe.pgc b/src/interfaces/ecpg/test/sql/describe.pgc index 80361cbe43..cd52c8220b 100644 --- a/src/interfaces/ecpg/test/sql/describe.pgc +++ b/src/interfaces/ecpg/test/sql/describe.pgc @@ -192,7 +192,7 @@ exec sql end declare section; strcpy(msg, "commit"); exec sql commit; - strcpy(msg, "disconnect"); + strcpy(msg, "disconnect"); exec sql disconnect; return (0); diff --git a/src/interfaces/ecpg/test/sql/dynalloc.pgc b/src/interfaces/ecpg/test/sql/dynalloc.pgc index 90da1c060a..8aa810f6c9 100644 --- a/src/interfaces/ecpg/test/sql/dynalloc.pgc +++ b/src/interfaces/ecpg/test/sql/dynalloc.pgc @@ -55,28 +55,28 @@ int main(void) for (i=0;i $@ all: all-lib diff --git a/src/pl/plperl/SPI.xs b/src/pl/plperl/SPI.xs index bea690cf3e..afcfe211c8 100644 --- a/src/pl/plperl/SPI.xs +++ b/src/pl/plperl/SPI.xs @@ -1,7 +1,7 @@ /********************************************************************** * PostgreSQL::InServer::SPI * - * SPI interface for plperl. + * SPI interface for plperl. * * src/pl/plperl/SPI.xs * @@ -94,10 +94,10 @@ spi_spi_prepare(query, ...) CODE: int i; SV** argv; - if (items < 1) + if (items < 1) Perl_croak(aTHX_ "Usage: spi_prepare(query, ...)"); argv = ( SV**) palloc(( items - 1) * sizeof(SV*)); - for ( i = 1; i < items; i++) + for ( i = 1; i < items; i++) argv[i - 1] = ST(i); RETVAL = plperl_spi_prepare(query, items - 1, argv); pfree( argv); @@ -113,17 +113,17 @@ spi_spi_exec_prepared(query, ...) HV *attr = NULL; int i, offset = 1, argc; SV ** argv; - if ( items < 1) - Perl_croak(aTHX_ "Usage: spi_exec_prepared(query, [\\%%attr,] " + if ( items < 1) + Perl_croak(aTHX_ "Usage: spi_exec_prepared(query, [\\%%attr,] " "[\\@bind_values])"); if ( items > 1 && SvROK( ST( 1)) && SvTYPE( SvRV( ST( 1))) == SVt_PVHV) - { + { attr = ( HV*) SvRV(ST(1)); offset++; } argc = items - offset; argv = ( SV**) palloc( argc * sizeof(SV*)); - for ( i = 0; offset < items; offset++, i++) + for ( i = 0; offset < items; offset++, i++) argv[i] = ST(offset); ret_hash = plperl_spi_exec_prepared(query, attr, argc, argv); RETVAL = newRV_noinc((SV*)ret_hash); @@ -137,11 +137,11 @@ spi_spi_query_prepared(query, ...) CODE: int i; SV ** argv; - if ( items < 1) + if ( items < 1) Perl_croak(aTHX_ "Usage: spi_query_prepared(query, " "[\\@bind_values])"); argv = ( SV**) palloc(( items - 1) * sizeof(SV*)); - for ( i = 1; i < items; i++) + for ( i = 1; i < items; i++) argv[i - 1] = ST(i); RETVAL = plperl_spi_query_prepared(query, items - 1, argv); pfree( argv); diff --git a/src/pl/plperl/Util.xs b/src/pl/plperl/Util.xs index 7d29ef6aef..6b96107444 100644 --- a/src/pl/plperl/Util.xs +++ b/src/pl/plperl/Util.xs @@ -134,11 +134,11 @@ SV * util_quote_nullable(sv) SV *sv CODE: - if (!sv || !SvOK(sv)) + if (!sv || !SvOK(sv)) { RETVAL = newSVstring_len("NULL", 4); } - else + else { text *arg = sv2text(sv); text *ret = DatumGetTextP(DirectFunctionCall1(quote_nullable, PointerGetDatum(arg))); diff --git a/src/pl/plperl/expected/plperl.out b/src/pl/plperl/expected/plperl.out index e3e9ec7b6f..d95f646e06 100644 --- a/src/pl/plperl/expected/plperl.out +++ b/src/pl/plperl/expected/plperl.out @@ -476,9 +476,9 @@ SELECT * FROM recurse(3); --- --- Test arrary return --- -CREATE OR REPLACE FUNCTION array_of_text() RETURNS TEXT[][] -LANGUAGE plperl as $$ - return [['a"b',undef,'c,d'],['e\\f',undef,'g']]; +CREATE OR REPLACE FUNCTION array_of_text() RETURNS TEXT[][] +LANGUAGE plperl as $$ + return [['a"b',undef,'c,d'],['e\\f',undef,'g']]; $$; SELECT array_of_text(); array_of_text diff --git a/src/pl/plperl/expected/plperl_plperlu.out b/src/pl/plperl/expected/plperl_plperlu.out index 479a902de4..2be955ff13 100644 --- a/src/pl/plperl/expected/plperl_plperlu.out +++ b/src/pl/plperl/expected/plperl_plperlu.out @@ -5,12 +5,10 @@ CREATE OR REPLACE FUNCTION bar() RETURNS integer AS $$ # alternative - causes server process to exit(255) spi_exec_query("invalid sql statement"); $$ language plperl; -- compile plperl code - CREATE OR REPLACE FUNCTION foo() RETURNS integer AS $$ spi_exec_query("SELECT * FROM bar()"); return 1; $$ LANGUAGE plperlu; -- compile plperlu code - SELECT * FROM bar(); -- throws exception normally (running plperl) ERROR: syntax error at or near "invalid" at line 4. CONTEXT: PL/Perl function "bar" diff --git a/src/pl/plperl/expected/plperl_trigger.out b/src/pl/plperl/expected/plperl_trigger.out index bb1aed3093..3e549f7eef 100644 --- a/src/pl/plperl/expected/plperl_trigger.out +++ b/src/pl/plperl/expected/plperl_trigger.out @@ -48,7 +48,7 @@ CREATE OR REPLACE FUNCTION trigger_data() RETURNS trigger LANGUAGE plperl AS $$ } return undef; # allow statement to proceed; $$; -CREATE TRIGGER show_trigger_data_trig +CREATE TRIGGER show_trigger_data_trig BEFORE INSERT OR UPDATE OR DELETE ON trigger_test FOR EACH ROW EXECUTE PROCEDURE trigger_data(23,'skidoo'); insert into trigger_test values(1,'insert'); @@ -122,7 +122,6 @@ NOTICE: $_TD->{table_schema} = 'public' CONTEXT: PL/Perl function "trigger_data" NOTICE: $_TD->{when} = 'BEFORE' CONTEXT: PL/Perl function "trigger_data" - DROP TRIGGER show_trigger_data_trig on trigger_test; insert into trigger_test values(1,'insert'); CREATE VIEW trigger_test_view AS SELECT * FROM trigger_test; @@ -202,20 +201,19 @@ NOTICE: $_TD->{when} = 'INSTEAD OF' CONTEXT: PL/Perl function "trigger_data" DROP VIEW trigger_test_view; delete from trigger_test; - DROP FUNCTION trigger_data(); CREATE OR REPLACE FUNCTION valid_id() RETURNS trigger AS $$ if (($_TD->{new}{i}>=100) || ($_TD->{new}{i}<=0)) { return "SKIP"; # Skip INSERT/UPDATE command - } - elsif ($_TD->{new}{v} ne "immortal") + } + elsif ($_TD->{new}{v} ne "immortal") { $_TD->{new}{v} .= "(modified by trigger)"; return "MODIFY"; # Modify tuple and proceed INSERT/UPDATE command - } - else + } + else { return; # Proceed INSERT/UPDATE command } @@ -251,9 +249,9 @@ CREATE OR REPLACE FUNCTION immortal() RETURNS trigger AS $$ if ($_TD->{old}{v} eq $_TD->{args}[0]) { return "SKIP"; # Skip DELETE command - } - else - { + } + else + { return; # Proceed DELETE command }; $$ LANGUAGE plperl; diff --git a/src/pl/plperl/plc_trusted.pl b/src/pl/plperl/plc_trusted.pl index a681ae0874..cd61882eb6 100644 --- a/src/pl/plperl/plc_trusted.pl +++ b/src/pl/plperl/plc_trusted.pl @@ -1,7 +1,7 @@ # src/pl/plperl/plc_trusted.pl package PostgreSQL::InServer::safe; - + # Load widely useful pragmas into plperl to make them available. # # SECURITY RISKS: diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c index 270e9f78e0..5595baaed5 100644 --- a/src/pl/plperl/plperl.c +++ b/src/pl/plperl/plperl.c @@ -1376,7 +1376,7 @@ plperl_validator(PG_FUNCTION_ARGS) &argtypes, &argnames, &argmodes); for (i = 0; i < numargs; i++) { - if (get_typtype(argtypes[i]) == TYPTYPE_PSEUDO && + if (get_typtype(argtypes[i]) == TYPTYPE_PSEUDO && argtypes[i] != RECORDOID) ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), @@ -2112,7 +2112,7 @@ compile_plperl_function(Oid fn_oid, bool is_trigger) typeStruct = (Form_pg_type) GETSTRUCT(typeTup); /* Disallow pseudotype argument */ - if (typeStruct->typtype == TYPTYPE_PSEUDO && + if (typeStruct->typtype == TYPTYPE_PSEUDO && procStruct->proargtypes.values[i] != RECORDOID) { free(prodesc->proname); @@ -2123,7 +2123,7 @@ compile_plperl_function(Oid fn_oid, bool is_trigger) format_type_be(procStruct->proargtypes.values[i])))); } - if (typeStruct->typtype == TYPTYPE_COMPOSITE || + if (typeStruct->typtype == TYPTYPE_COMPOSITE || procStruct->proargtypes.values[i] == RECORDOID) prodesc->arg_is_rowtype[i] = true; else diff --git a/src/pl/plperl/sql/plperl.sql b/src/pl/plperl/sql/plperl.sql index fcae9e093c..22ac0bb451 100644 --- a/src/pl/plperl/sql/plperl.sql +++ b/src/pl/plperl/sql/plperl.sql @@ -299,9 +299,9 @@ SELECT * FROM recurse(3); --- --- Test arrary return --- -CREATE OR REPLACE FUNCTION array_of_text() RETURNS TEXT[][] -LANGUAGE plperl as $$ - return [['a"b',undef,'c,d'],['e\\f',undef,'g']]; +CREATE OR REPLACE FUNCTION array_of_text() RETURNS TEXT[][] +LANGUAGE plperl as $$ + return [['a"b',undef,'c,d'],['e\\f',undef,'g']]; $$; SELECT array_of_text(); diff --git a/src/pl/plperl/sql/plperl_plperlu.sql b/src/pl/plperl/sql/plperl_plperlu.sql index 65281c2df9..bbd79b662e 100644 --- a/src/pl/plperl/sql/plperl_plperlu.sql +++ b/src/pl/plperl/sql/plperl_plperlu.sql @@ -7,12 +7,12 @@ CREATE OR REPLACE FUNCTION bar() RETURNS integer AS $$ # alternative - causes server process to exit(255) spi_exec_query("invalid sql statement"); $$ language plperl; -- compile plperl code - + CREATE OR REPLACE FUNCTION foo() RETURNS integer AS $$ spi_exec_query("SELECT * FROM bar()"); return 1; $$ LANGUAGE plperlu; -- compile plperlu code - + SELECT * FROM bar(); -- throws exception normally (running plperl) SELECT * FROM foo(); -- used to cause backend crash (after switching to plperlu) diff --git a/src/pl/plperl/sql/plperl_trigger.sql b/src/pl/plperl/sql/plperl_trigger.sql index c47ddad3ca..1583a42544 100644 --- a/src/pl/plperl/sql/plperl_trigger.sql +++ b/src/pl/plperl/sql/plperl_trigger.sql @@ -51,14 +51,14 @@ CREATE OR REPLACE FUNCTION trigger_data() RETURNS trigger LANGUAGE plperl AS $$ return undef; # allow statement to proceed; $$; -CREATE TRIGGER show_trigger_data_trig +CREATE TRIGGER show_trigger_data_trig BEFORE INSERT OR UPDATE OR DELETE ON trigger_test FOR EACH ROW EXECUTE PROCEDURE trigger_data(23,'skidoo'); insert into trigger_test values(1,'insert'); update trigger_test set v = 'update' where i = 1; delete from trigger_test; - + DROP TRIGGER show_trigger_data_trig on trigger_test; insert into trigger_test values(1,'insert'); @@ -74,7 +74,7 @@ delete from trigger_test_view; DROP VIEW trigger_test_view; delete from trigger_test; - + DROP FUNCTION trigger_data(); CREATE OR REPLACE FUNCTION valid_id() RETURNS trigger AS $$ @@ -82,13 +82,13 @@ CREATE OR REPLACE FUNCTION valid_id() RETURNS trigger AS $$ if (($_TD->{new}{i}>=100) || ($_TD->{new}{i}<=0)) { return "SKIP"; # Skip INSERT/UPDATE command - } - elsif ($_TD->{new}{v} ne "immortal") + } + elsif ($_TD->{new}{v} ne "immortal") { $_TD->{new}{v} .= "(modified by trigger)"; return "MODIFY"; # Modify tuple and proceed INSERT/UPDATE command - } - else + } + else { return; # Proceed INSERT/UPDATE command } @@ -116,9 +116,9 @@ CREATE OR REPLACE FUNCTION immortal() RETURNS trigger AS $$ if ($_TD->{old}{v} eq $_TD->{args}[0]) { return "SKIP"; # Skip DELETE command - } - else - { + } + else + { return; # Proceed DELETE command }; $$ LANGUAGE plperl; diff --git a/src/pl/plperl/text2macro.pl b/src/pl/plperl/text2macro.pl index 482ea0fd07..88241e2cb2 100644 --- a/src/pl/plperl/text2macro.pl +++ b/src/pl/plperl/text2macro.pl @@ -88,7 +88,7 @@ sub selftest { print $fh "int main() { puts(X); return 0; }\n"; close $fh; system("cat -n $tmp.c"); - + system("make $tmp") == 0 or die; open $fh, "./$tmp |" or die; my $result = <$fh>; diff --git a/src/pl/plpgsql/src/gram.y b/src/pl/plpgsql/src/gram.y index a28c6707e4..e4f485b553 100644 --- a/src/pl/plpgsql/src/gram.y +++ b/src/pl/plpgsql/src/gram.y @@ -1734,7 +1734,7 @@ stmt_open : K_OPEN cursor_variable if (endtoken == K_USING) { PLpgSQL_expr *expr; - + do { expr = read_sql_expression2(',', ';', diff --git a/src/pl/plpython/expected/plpython_newline.out b/src/pl/plpython/expected/plpython_newline.out index bf77285b98..27dc2f8ab0 100644 --- a/src/pl/plpython/expected/plpython_newline.out +++ b/src/pl/plpython/expected/plpython_newline.out @@ -1,6 +1,6 @@ -- -- Universal Newline Support --- +-- CREATE OR REPLACE FUNCTION newline_lf() RETURNS integer AS E'x = 100\ny = 23\nreturn x + y\n' LANGUAGE plpythonu; diff --git a/src/pl/plpython/expected/plpython_schema.out b/src/pl/plpython/expected/plpython_schema.out index e94e7bbcf8..3ec331c0f0 100644 --- a/src/pl/plpython/expected/plpython_schema.out +++ b/src/pl/plpython/expected/plpython_schema.out @@ -3,7 +3,7 @@ CREATE TABLE users ( lname text not null, username text, userid serial, - PRIMARY KEY(lname, fname) + PRIMARY KEY(lname, fname) ) ; NOTICE: CREATE TABLE will create implicit sequence "users_userid_seq" for serial column "users.userid" NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index "users_pkey" for table "users" diff --git a/src/pl/plpython/expected/plpython_trigger.out b/src/pl/plpython/expected/plpython_trigger.out index a78e96e4a1..e04da221f7 100644 --- a/src/pl/plpython/expected/plpython_trigger.out +++ b/src/pl/plpython/expected/plpython_trigger.out @@ -78,7 +78,7 @@ for key in skeys: val = TD[key] plpy.notice("TD[" + key + "] => " + str(val)) -return None +return None $$; CREATE TRIGGER show_trigger_data_trig_before diff --git a/src/pl/plpython/sql/plpython_newline.sql b/src/pl/plpython/sql/plpython_newline.sql index 6263fac141..f9cee9491b 100644 --- a/src/pl/plpython/sql/plpython_newline.sql +++ b/src/pl/plpython/sql/plpython_newline.sql @@ -1,6 +1,6 @@ -- -- Universal Newline Support --- +-- CREATE OR REPLACE FUNCTION newline_lf() RETURNS integer AS E'x = 100\ny = 23\nreturn x + y\n' diff --git a/src/pl/plpython/sql/plpython_schema.sql b/src/pl/plpython/sql/plpython_schema.sql index 669c4877f1..a5bdbda2a3 100644 --- a/src/pl/plpython/sql/plpython_schema.sql +++ b/src/pl/plpython/sql/plpython_schema.sql @@ -3,7 +3,7 @@ CREATE TABLE users ( lname text not null, username text, userid serial, - PRIMARY KEY(lname, fname) + PRIMARY KEY(lname, fname) ) ; CREATE INDEX users_username_idx ON users(username); diff --git a/src/pl/plpython/sql/plpython_trigger.sql b/src/pl/plpython/sql/plpython_trigger.sql index 7520c79db5..4994d8fe7b 100644 --- a/src/pl/plpython/sql/plpython_trigger.sql +++ b/src/pl/plpython/sql/plpython_trigger.sql @@ -78,7 +78,7 @@ for key in skeys: val = TD[key] plpy.notice("TD[" + key + "] => " + str(val)) -return None +return None $$; diff --git a/src/pl/tcl/expected/pltcl_setup.out b/src/pl/tcl/expected/pltcl_setup.out index f577e66277..a1385b2eee 100644 --- a/src/pl/tcl/expected/pltcl_setup.out +++ b/src/pl/tcl/expected/pltcl_setup.out @@ -40,7 +40,7 @@ create function check_pkey1_exists(int4, bpchar) returns bool as E' where key1 = \\$1 and key2 = \\$2" \\ {int4 bpchar}] } - + set n [spi_execp -count 1 $GD(plan) [list $1 $2]] if {$n > 0} { @@ -61,8 +61,8 @@ CREATE FUNCTION trigger_data() returns trigger language pltcl as $_$ set dnames [info locals {[a-zA-Z]*} ] foreach key [lsort $dnames] { - - if { [array exists $key] } { + + if { [array exists $key] } { set str "{" foreach akey [lsort [ array names $key ] ] { if {[string length $str] > 1} { set str "$str, " } @@ -80,10 +80,10 @@ CREATE FUNCTION trigger_data() returns trigger language pltcl as $_$ } - return OK + return OK $_$; -CREATE TRIGGER show_trigger_data_trig +CREATE TRIGGER show_trigger_data_trig BEFORE INSERT OR UPDATE OR DELETE ON trigger_test FOR EACH ROW EXECUTE PROCEDURE trigger_data(23,'skidoo'); CREATE TRIGGER show_trigger_data_view_trig diff --git a/src/pl/tcl/sql/pltcl_setup.sql b/src/pl/tcl/sql/pltcl_setup.sql index a9370d258d..2176d5c4f4 100644 --- a/src/pl/tcl/sql/pltcl_setup.sql +++ b/src/pl/tcl/sql/pltcl_setup.sql @@ -45,7 +45,7 @@ create function check_pkey1_exists(int4, bpchar) returns bool as E' where key1 = \\$1 and key2 = \\$2" \\ {int4 bpchar}] } - + set n [spi_execp -count 1 $GD(plan) [list $1 $2]] if {$n > 0} { @@ -71,8 +71,8 @@ CREATE FUNCTION trigger_data() returns trigger language pltcl as $_$ set dnames [info locals {[a-zA-Z]*} ] foreach key [lsort $dnames] { - - if { [array exists $key] } { + + if { [array exists $key] } { set str "{" foreach akey [lsort [ array names $key ] ] { if {[string length $str] > 1} { set str "$str, " } @@ -90,11 +90,11 @@ CREATE FUNCTION trigger_data() returns trigger language pltcl as $_$ } - return OK + return OK $_$; -CREATE TRIGGER show_trigger_data_trig +CREATE TRIGGER show_trigger_data_trig BEFORE INSERT OR UPDATE OR DELETE ON trigger_test FOR EACH ROW EXECUTE PROCEDURE trigger_data(23,'skidoo'); diff --git a/src/test/examples/Makefile b/src/test/examples/Makefile index b009416b8f..bbc6ee1d36 100644 --- a/src/test/examples/Makefile +++ b/src/test/examples/Makefile @@ -18,5 +18,5 @@ PROGS = testlibpq testlibpq2 testlibpq3 testlibpq4 testlo all: $(PROGS) -clean: +clean: rm -f $(PROGS) diff --git a/src/test/locale/Makefile b/src/test/locale/Makefile index e4d38646e4..c71dc2dbbf 100644 --- a/src/test/locale/Makefile +++ b/src/test/locale/Makefile @@ -10,7 +10,7 @@ DIRS = de_DE.ISO8859-1 gr_GR.ISO8859-7 koi8-r koi8-to-win1251 all: $(PROGS) -clean: +clean: rm -f $(PROGS) for d in $(DIRS); do \ $(MAKE) -C $$d clean || exit; \ diff --git a/src/test/locale/README b/src/test/locale/README index 86246df95d..980df8005b 100644 --- a/src/test/locale/README +++ b/src/test/locale/README @@ -24,5 +24,5 @@ a Makefile (and other files) similar to koi8-r/*. Actually, the simplest the files. Oleg. ----- +---- Oleg Broytmann http://members.xoom.com/phd2/ phd2@earthling.net diff --git a/src/test/locale/de_DE.ISO8859-1/Makefile b/src/test/locale/de_DE.ISO8859-1/Makefile index fd8301928e..28a72b7e52 100644 --- a/src/test/locale/de_DE.ISO8859-1/Makefile +++ b/src/test/locale/de_DE.ISO8859-1/Makefile @@ -1,7 +1,7 @@ -all: +all: -test: +test: ./runall -clean: +clean: rm -f *.out diff --git a/src/test/locale/gr_GR.ISO8859-7/Makefile b/src/test/locale/gr_GR.ISO8859-7/Makefile index fd8301928e..28a72b7e52 100644 --- a/src/test/locale/gr_GR.ISO8859-7/Makefile +++ b/src/test/locale/gr_GR.ISO8859-7/Makefile @@ -1,7 +1,7 @@ -all: +all: -test: +test: ./runall -clean: +clean: rm -f *.out diff --git a/src/test/locale/koi8-r/Makefile b/src/test/locale/koi8-r/Makefile index fd8301928e..28a72b7e52 100644 --- a/src/test/locale/koi8-r/Makefile +++ b/src/test/locale/koi8-r/Makefile @@ -1,7 +1,7 @@ -all: +all: -test: +test: ./runall -clean: +clean: rm -f *.out diff --git a/src/test/locale/koi8-to-win1251/Makefile b/src/test/locale/koi8-to-win1251/Makefile index fd8301928e..28a72b7e52 100644 --- a/src/test/locale/koi8-to-win1251/Makefile +++ b/src/test/locale/koi8-to-win1251/Makefile @@ -1,7 +1,7 @@ -all: +all: -test: +test: ./runall -clean: +clean: rm -f *.out diff --git a/src/test/mb/mbregress.sh b/src/test/mb/mbregress.sh index 1ce45c7e1c..20942e30c2 100644 --- a/src/test/mb/mbregress.sh +++ b/src/test/mb/mbregress.sh @@ -46,7 +46,7 @@ do else EXPECTED="expected/${i}.out" fi - + if [ `diff ${EXPECTED} results/${i}.out | wc -l` -ne 0 ] then ( diff -C3 ${EXPECTED} results/${i}.out; \ diff --git a/src/test/performance/runtests.pl b/src/test/performance/runtests.pl index f4bf2fc2ec..edf45ded2f 100755 --- a/src/test/performance/runtests.pl +++ b/src/test/performance/runtests.pl @@ -15,10 +15,10 @@ $DBNAME = 'perftest'; ); # Tests to run: test' script, test' description, ... -# Test' script is in form +# Test' script is in form # # script_name[.ntm][ T] -# +# # script_name is name of file in ./sqls # .ntm means that script will be used for some initialization # and should not be timed: runtests.pl opens /dev/null as STDERR @@ -26,11 +26,11 @@ $DBNAME = 'perftest'; # Script shouldn't notice either he is running for test or for # initialization purposes. # T means that all queries in this test (initialization ?) are to be -# executed in SINGLE transaction. In this case global variable $XACTBLOCK +# executed in SINGLE transaction. In this case global variable $XACTBLOCK # is not empty string. Otherwise, each query in test is to be executed -# in own transaction ($XACTBLOCK is empty string). In accordance with -# $XACTBLOCK, script is to do DBMS specific preparation before execution -# of queries. (Look at example in sqls/inssimple for MySQL - it gives +# in own transaction ($XACTBLOCK is empty string). In accordance with +# $XACTBLOCK, script is to do DBMS specific preparation before execution +# of queries. (Look at example in sqls/inssimple for MySQL - it gives # an idea of what can be done for features unsupported by an DBMS.) # @perftests = ( @@ -91,9 +91,9 @@ for ($i = 0; $i <= $#perftests; $i++) $runtest = $test; if ( $test =~ /\.ntm/ ) { - # + # # No timing for this queries - # + # close (STDERR); # close $TmpFile open (STDERR, ">/dev/null") or die; $runtest =~ s/\.ntm//; diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile index 0755304820..2869b4022c 100644 --- a/src/test/regress/GNUmakefile +++ b/src/test/regress/GNUmakefile @@ -162,7 +162,7 @@ runtest: installcheck runtest-parallel: installcheck-parallel bigtest: all tablespace-setup - $(pg_regress_call) --psqldir=$(PSQLDIR) --schedule=$(srcdir)/serial_schedule numeric_big + $(pg_regress_call) --psqldir=$(PSQLDIR) --schedule=$(srcdir)/serial_schedule numeric_big bigcheck: all tablespace-setup $(pg_regress_call) --temp-install=./tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) numeric_big diff --git a/src/test/regress/expected/abstime.out b/src/test/regress/expected/abstime.out index a04f091666..ed48f642ab 100644 --- a/src/test/regress/expected/abstime.out +++ b/src/test/regress/expected/abstime.out @@ -5,7 +5,7 @@ -- -- -- timezones may vary based not only on location but the operating --- system. the main correctness issue is that the OS may not get +-- system. the main correctness issue is that the OS may not get -- daylight savings time right for times prior to Unix epoch (jan 1 1970). -- CREATE TABLE ABSTIME_TBL (f1 abstime); @@ -26,7 +26,7 @@ INSERT INTO ABSTIME_TBL (f1) VALUES (abstime 'epoch'); INSERT INTO ABSTIME_TBL (f1) VALUES (abstime 'infinity'); INSERT INTO ABSTIME_TBL (f1) VALUES (abstime '-infinity'); INSERT INTO ABSTIME_TBL (f1) VALUES (abstime 'May 10, 1947 23:59:12'); --- what happens if we specify slightly misformatted abstime? +-- what happens if we specify slightly misformatted abstime? INSERT INTO ABSTIME_TBL (f1) VALUES ('Feb 35, 1946 10:00:00'); ERROR: date/time field value out of range: "Feb 35, 1946 10:00:00" LINE 1: INSERT INTO ABSTIME_TBL (f1) VALUES ('Feb 35, 1946 10:00:00'... @@ -36,7 +36,7 @@ INSERT INTO ABSTIME_TBL (f1) VALUES ('Feb 28, 1984 25:08:10'); ERROR: date/time field value out of range: "Feb 28, 1984 25:08:10" LINE 1: INSERT INTO ABSTIME_TBL (f1) VALUES ('Feb 28, 1984 25:08:10'... ^ --- badly formatted abstimes: these should result in invalid abstimes +-- badly formatted abstimes: these should result in invalid abstimes INSERT INTO ABSTIME_TBL (f1) VALUES ('bad date format'); ERROR: invalid input syntax for type abstime: "bad date format" LINE 1: INSERT INTO ABSTIME_TBL (f1) VALUES ('bad date format'); diff --git a/src/test/regress/expected/aggregates.out b/src/test/regress/expected/aggregates.out index ed3b0c4b75..82407bc9fd 100644 --- a/src/test/regress/expected/aggregates.out +++ b/src/test/regress/expected/aggregates.out @@ -317,7 +317,7 @@ CREATE TEMPORARY TABLE bitwise_test( y BIT(4) ); -- empty case -SELECT +SELECT BIT_AND(i2) AS "?", BIT_OR(i4) AS "?" FROM bitwise_test; @@ -386,7 +386,7 @@ SELECT t | t | t | t | t | t | t | t | t (1 row) -CREATE TEMPORARY TABLE bool_test( +CREATE TEMPORARY TABLE bool_test( b1 BOOL, b2 BOOL, b3 BOOL, diff --git a/src/test/regress/expected/alter_table.out b/src/test/regress/expected/alter_table.out index ab19a8e4fc..d6c5827c68 100644 --- a/src/test/regress/expected/alter_table.out +++ b/src/test/regress/expected/alter_table.out @@ -35,8 +35,8 @@ ALTER TABLE tmp ADD COLUMN y float4[]; ALTER TABLE tmp ADD COLUMN z int2[]; INSERT INTO tmp (a, b, c, d, e, f, g, h, i, j, k, l, m, n, p, q, r, s, t, u, v, w, x, y, z) - VALUES (4, 'name', 'text', 4.1, 4.1, 2, '(4.1,4.1,3.1,3.1)', - 'Mon May 1 00:30:30 1995', 'c', '{Mon May 1 00:30:30 1995, Monday Aug 24 14:43:07 1992, epoch}', + VALUES (4, 'name', 'text', 4.1, 4.1, 2, '(4.1,4.1,3.1,3.1)', + 'Mon May 1 00:30:30 1995', 'c', '{Mon May 1 00:30:30 1995, Monday Aug 24 14:43:07 1992, epoch}', 314159, '(1,1)', '512', '1 2 3 4 5 6 7 8', 'magnetic disk', '(1.1,1.1)', '(4.1,4.1,3.1,3.1)', '(0,2,4.1,4.1,3.1,3.1)', '(4.1,4.1,3.1,3.1)', '["epoch" "infinity"]', @@ -48,7 +48,7 @@ SELECT * FROM tmp; (1 row) DROP TABLE tmp; --- the wolf bug - schema mods caused inconsistent row descriptors +-- the wolf bug - schema mods caused inconsistent row descriptors CREATE TABLE tmp ( initial int4 ); @@ -80,8 +80,8 @@ ALTER TABLE tmp ADD COLUMN y float4[]; ALTER TABLE tmp ADD COLUMN z int2[]; INSERT INTO tmp (a, b, c, d, e, f, g, h, i, j, k, l, m, n, p, q, r, s, t, u, v, w, x, y, z) - VALUES (4, 'name', 'text', 4.1, 4.1, 2, '(4.1,4.1,3.1,3.1)', - 'Mon May 1 00:30:30 1995', 'c', '{Mon May 1 00:30:30 1995, Monday Aug 24 14:43:07 1992, epoch}', + VALUES (4, 'name', 'text', 4.1, 4.1, 2, '(4.1,4.1,3.1,3.1)', + 'Mon May 1 00:30:30 1995', 'c', '{Mon May 1 00:30:30 1995, Monday Aug 24 14:43:07 1992, epoch}', 314159, '(1,1)', '512', '1 2 3 4 5 6 7 8', 'magnetic disk', '(1.1,1.1)', '(4.1,4.1,3.1,3.1)', '(0,2,4.1,4.1,3.1,3.1)', '(4.1,4.1,3.1,3.1)', '["epoch" "infinity"]', @@ -137,7 +137,7 @@ ALTER TABLE tmp_view RENAME TO tmp_view_new; ANALYZE tenk1; set enable_seqscan to off; set enable_bitmapscan to off; --- 5 values, sorted +-- 5 values, sorted SELECT unique1 FROM tenk1 WHERE unique1 < 5; unique1 --------- @@ -1413,7 +1413,7 @@ select * from anothertab; (3 rows) alter table anothertab alter column atcol2 type text - using case when atcol2 is true then 'IT WAS TRUE' + using case when atcol2 is true then 'IT WAS TRUE' when atcol2 is false then 'IT WAS FALSE' else 'IT WAS NULL!' end; select * from anothertab; diff --git a/src/test/regress/expected/arrays.out b/src/test/regress/expected/arrays.out index eff5f88c24..4d86f454f9 100644 --- a/src/test/regress/expected/arrays.out +++ b/src/test/regress/expected/arrays.out @@ -5,7 +5,7 @@ CREATE TABLE arrtest ( a int2[], b int4[][][], c name[], - d text[][], + d text[][], e float8[], f char(5)[], g varchar(5)[] @@ -21,7 +21,7 @@ INSERT INTO arrtest (f) VALUES ('{"too long"}'); ERROR: value too long for type character(5) INSERT INTO arrtest (a, b[1:2][1:2], c, d, e, f, g) - VALUES ('{11,12,23}', '{{3,4},{4,5}}', '{"foobar"}', + VALUES ('{11,12,23}', '{{3,4},{4,5}}', '{"foobar"}', '{{"elt1", "elt2"}}', '{"3.4", "6.7"}', '{"abc","abcde"}', '{"abc","abcde"}'); INSERT INTO arrtest (a, b[1:2], c, d[1:2]) @@ -37,7 +37,7 @@ SELECT * FROM arrtest; SELECT arrtest.a[1], arrtest.b[1][1][1], arrtest.c[1], - arrtest.d[1][1], + arrtest.d[1][1], arrtest.e[0] FROM arrtest; a | b | c | d | e @@ -58,7 +58,7 @@ SELECT a[1], b[1][1][1], c[1], d[1][1], e[0] SELECT a[1:3], b[1:1][1:2][1:2], - c[1:2], + c[1:2], d[1:1][1:2] FROM arrtest; a | b | c | d @@ -86,10 +86,10 @@ SELECT array_dims(a) AS a,array_dims(b) AS b,array_dims(c) AS c | [1:2] | [1:2] (3 rows) --- returns nothing +-- returns nothing SELECT * FROM arrtest - WHERE a[1] < 5 and + WHERE a[1] < 5 and c = '{"foobar"}'::_name; a | b | c | d | e | f | g ---+---+---+---+---+---+--- @@ -115,7 +115,7 @@ SELECT a,b,c FROM arrtest; SELECT a[1:3], b[1:1][1:2][1:2], - c[1:2], + c[1:2], d[1:1][2:2] FROM arrtest; a | b | c | d @@ -940,11 +940,11 @@ select c2[2].f2 from comptable; drop type _comptype; drop table comptable; drop type comptype; -create or replace function unnest1(anyarray) +create or replace function unnest1(anyarray) returns setof anyelement as $$ select $1[s] from generate_subscripts($1,1) g(s); $$ language sql immutable; -create or replace function unnest2(anyarray) +create or replace function unnest2(anyarray) returns setof anyelement as $$ select $1[s1][s2] from generate_subscripts($1,1) g1(s1), generate_subscripts($1,2) g2(s2); diff --git a/src/test/regress/expected/bit.out b/src/test/regress/expected/bit.out index 40082ca14a..9c7d202149 100644 --- a/src/test/regress/expected/bit.out +++ b/src/test/regress/expected/bit.out @@ -14,7 +14,7 @@ INSERT INTO BIT_TABLE VALUES (B'101011111010'); -- too long ERROR: bit string length 12 does not match type bit(11) --INSERT INTO BIT_TABLE VALUES ('X554'); --INSERT INTO BIT_TABLE VALUES ('X555'); -SELECT * FROM BIT_TABLE; +SELECT * FROM BIT_TABLE; b ------------- 00000000000 @@ -31,7 +31,7 @@ INSERT INTO VARBIT_TABLE VALUES (B'101011111010'); -- too long ERROR: bit string too long for type bit varying(11) --INSERT INTO VARBIT_TABLE VALUES ('X554'); --INSERT INTO VARBIT_TABLE VALUES ('X555'); -SELECT * FROM VARBIT_TABLE; +SELECT * FROM VARBIT_TABLE; v ------------- @@ -42,7 +42,7 @@ SELECT * FROM VARBIT_TABLE; -- Concatenation SELECT v, b, (v || b) AS concat - FROM BIT_TABLE, VARBIT_TABLE + FROM BIT_TABLE, VARBIT_TABLE ORDER BY 3; v | b | concat -------------+-------------+------------------------ @@ -110,7 +110,7 @@ SELECT v, DROP TABLE varbit_table; CREATE TABLE varbit_table (a BIT VARYING(16), b BIT VARYING(16)); COPY varbit_table FROM stdin; -SELECT a, b, ~a AS "~ a", a & b AS "a & b", +SELECT a, b, ~a AS "~ a", a & b AS "a & b", a | b AS "a | b", a # b AS "a # b" FROM varbit_table; a | b | ~ a | a & b | a | b | a # b ------------------+------------------+------------------+------------------+------------------+------------------ @@ -162,7 +162,7 @@ DROP TABLE varbit_table; DROP TABLE bit_table; CREATE TABLE bit_table (a BIT(16), b BIT(16)); COPY bit_table FROM stdin; -SELECT a,b,~a AS "~ a",a & b AS "a & b", +SELECT a,b,~a AS "~ a",a & b AS "a & b", a|b AS "a | b", a # b AS "a # b" FROM bit_table; a | b | ~ a | a & b | a | b | a # b ------------------+------------------+------------------+------------------+------------------+------------------ @@ -455,7 +455,7 @@ INSERT INTO BIT_SHIFT_TABLE SELECT b>>4 FROM BIT_SHIFT_TABLE; INSERT INTO BIT_SHIFT_TABLE SELECT b>>8 FROM BIT_SHIFT_TABLE; SELECT POSITION(B'1101' IN b), POSITION(B'11011' IN b), - b + b FROM BIT_SHIFT_TABLE ; position | position | b ----------+----------+------------------ @@ -485,7 +485,7 @@ INSERT INTO VARBIT_SHIFT_TABLE SELECT CAST(v || B'0000' AS BIT VARYING(12)) >>4 INSERT INTO VARBIT_SHIFT_TABLE SELECT CAST(v || B'00000000' AS BIT VARYING(20)) >>8 FROM VARBIT_SHIFT_TABLE; SELECT POSITION(B'1101' IN v), POSITION(B'11011' IN v), - v + v FROM VARBIT_SHIFT_TABLE ; position | position | v ----------+----------+---------------------- diff --git a/src/test/regress/expected/bitmapops.out b/src/test/regress/expected/bitmapops.out index d88a76fe24..3570973e3c 100644 --- a/src/test/regress/expected/bitmapops.out +++ b/src/test/regress/expected/bitmapops.out @@ -9,7 +9,7 @@ -- That allows us to test all the different combinations of -- lossy and non-lossy pages with the minimum amount of data CREATE TABLE bmscantest (a int, b int, t text); -INSERT INTO bmscantest +INSERT INTO bmscantest SELECT (r%53), (r%59), 'foooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo' FROM generate_series(1,70000) r; CREATE INDEX i_bmtest_a ON bmscantest(a); diff --git a/src/test/regress/expected/boolean.out b/src/test/regress/expected/boolean.out index 28d7cf9526..e39f550332 100644 --- a/src/test/regress/expected/boolean.out +++ b/src/test/regress/expected/boolean.out @@ -225,7 +225,7 @@ CREATE TABLE BOOLTBL1 (f1 bool); INSERT INTO BOOLTBL1 (f1) VALUES (bool 't'); INSERT INTO BOOLTBL1 (f1) VALUES (bool 'True'); INSERT INTO BOOLTBL1 (f1) VALUES (bool 'true'); --- BOOLTBL1 should be full of true's at this point +-- BOOLTBL1 should be full of true's at this point SELECT '' AS t_3, BOOLTBL1.* FROM BOOLTBL1; t_3 | f1 -----+---- @@ -244,7 +244,7 @@ SELECT '' AS t_3, BOOLTBL1.* | t (3 rows) -SELECT '' AS t_3, BOOLTBL1.* +SELECT '' AS t_3, BOOLTBL1.* FROM BOOLTBL1 WHERE f1 <> bool 'false'; t_3 | f1 @@ -262,7 +262,7 @@ SELECT '' AS zero, BOOLTBL1.* (0 rows) INSERT INTO BOOLTBL1 (f1) VALUES (bool 'f'); -SELECT '' AS f_1, BOOLTBL1.* +SELECT '' AS f_1, BOOLTBL1.* FROM BOOLTBL1 WHERE f1 = bool 'false'; f_1 | f1 @@ -277,12 +277,12 @@ INSERT INTO BOOLTBL2 (f1) VALUES (bool 'False'); INSERT INTO BOOLTBL2 (f1) VALUES (bool 'FALSE'); -- This is now an invalid expression -- For pre-v6.3 this evaluated to false - thomas 1997-10-23 -INSERT INTO BOOLTBL2 (f1) - VALUES (bool 'XXX'); +INSERT INTO BOOLTBL2 (f1) + VALUES (bool 'XXX'); ERROR: invalid input syntax for type boolean: "XXX" LINE 2: VALUES (bool 'XXX'); ^ --- BOOLTBL2 should be full of false's at this point +-- BOOLTBL2 should be full of false's at this point SELECT '' AS f_4, BOOLTBL2.* FROM BOOLTBL2; f_4 | f1 -----+---- diff --git a/src/test/regress/expected/box.out b/src/test/regress/expected/box.out index 2a94e33465..fc3154014b 100644 --- a/src/test/regress/expected/box.out +++ b/src/test/regress/expected/box.out @@ -18,11 +18,11 @@ CREATE TABLE BOX_TBL (f1 box); INSERT INTO BOX_TBL (f1) VALUES ('(2.0,2.0,0.0,0.0)'); INSERT INTO BOX_TBL (f1) VALUES ('(1.0,1.0,3.0,3.0)'); --- degenerate cases where the box is a line or a point --- note that lines and points boxes all have zero area +-- degenerate cases where the box is a line or a point +-- note that lines and points boxes all have zero area INSERT INTO BOX_TBL (f1) VALUES ('(2.5, 2.5, 2.5,3.5)'); INSERT INTO BOX_TBL (f1) VALUES ('(3.0, 3.0,3.0,3.0)'); --- badly formatted box inputs +-- badly formatted box inputs INSERT INTO BOX_TBL (f1) VALUES ('(2.3, 4.5)'); ERROR: invalid input syntax for type box: "(2.3, 4.5)" LINE 1: INSERT INTO BOX_TBL (f1) VALUES ('(2.3, 4.5)'); @@ -50,9 +50,9 @@ SELECT '' AS four, b.*, area(b.f1) as barea | (3,3),(3,3) | 0 (4 rows) --- overlap +-- overlap SELECT '' AS three, b.f1 - FROM BOX_TBL b + FROM BOX_TBL b WHERE b.f1 && box '(2.5,2.5,1.0,1.0)'; three | f1 -------+--------------------- @@ -61,7 +61,7 @@ SELECT '' AS three, b.f1 | (2.5,3.5),(2.5,2.5) (3 rows) --- left-or-overlap (x only) +-- left-or-overlap (x only) SELECT '' AS two, b1.* FROM BOX_TBL b1 WHERE b1.f1 &< box '(2.0,2.0,2.5,2.5)'; @@ -71,7 +71,7 @@ SELECT '' AS two, b1.* | (2.5,3.5),(2.5,2.5) (2 rows) --- right-or-overlap (x only) +-- right-or-overlap (x only) SELECT '' AS two, b1.* FROM BOX_TBL b1 WHERE b1.f1 &> box '(2.0,2.0,2.5,2.5)'; @@ -81,7 +81,7 @@ SELECT '' AS two, b1.* | (3,3),(3,3) (2 rows) --- left of +-- left of SELECT '' AS two, b.f1 FROM BOX_TBL b WHERE b.f1 << box '(3.0,3.0,5.0,5.0)'; @@ -91,7 +91,7 @@ SELECT '' AS two, b.f1 | (2.5,3.5),(2.5,2.5) (2 rows) --- area <= +-- area <= SELECT '' AS four, b.f1 FROM BOX_TBL b WHERE b.f1 <= box '(3.0,3.0,5.0,5.0)'; @@ -103,7 +103,7 @@ SELECT '' AS four, b.f1 | (3,3),(3,3) (4 rows) --- area < +-- area < SELECT '' AS two, b.f1 FROM BOX_TBL b WHERE b.f1 < box '(3.0,3.0,5.0,5.0)'; @@ -113,7 +113,7 @@ SELECT '' AS two, b.f1 | (3,3),(3,3) (2 rows) --- area = +-- area = SELECT '' AS two, b.f1 FROM BOX_TBL b WHERE b.f1 = box '(3.0,3.0,5.0,5.0)'; @@ -123,19 +123,19 @@ SELECT '' AS two, b.f1 | (3,3),(1,1) (2 rows) --- area > +-- area > SELECT '' AS two, b.f1 - FROM BOX_TBL b -- zero area - WHERE b.f1 > box '(3.5,3.0,4.5,3.0)'; + FROM BOX_TBL b -- zero area + WHERE b.f1 > box '(3.5,3.0,4.5,3.0)'; two | f1 -----+------------- | (2,2),(0,0) | (3,3),(1,1) (2 rows) --- area >= +-- area >= SELECT '' AS four, b.f1 - FROM BOX_TBL b -- zero area + FROM BOX_TBL b -- zero area WHERE b.f1 >= box '(3.5,3.0,4.5,3.0)'; four | f1 ------+--------------------- @@ -145,7 +145,7 @@ SELECT '' AS four, b.f1 | (3,3),(3,3) (4 rows) --- right of +-- right of SELECT '' AS two, b.f1 FROM BOX_TBL b WHERE box '(3.0,3.0,5.0,5.0)' >> b.f1; @@ -155,7 +155,7 @@ SELECT '' AS two, b.f1 | (2.5,3.5),(2.5,2.5) (2 rows) --- contained in +-- contained in SELECT '' AS three, b.f1 FROM BOX_TBL b WHERE b.f1 <@ box '(0,0,3,3)'; @@ -166,7 +166,7 @@ SELECT '' AS three, b.f1 | (3,3),(3,3) (3 rows) --- contains +-- contains SELECT '' AS three, b.f1 FROM BOX_TBL b WHERE box '(0,0,3,3)' @> b.f1; @@ -177,7 +177,7 @@ SELECT '' AS three, b.f1 | (3,3),(3,3) (3 rows) --- box equality +-- box equality SELECT '' AS one, b.f1 FROM BOX_TBL b WHERE box '(1,1,3,3)' ~= b.f1; @@ -186,7 +186,7 @@ SELECT '' AS one, b.f1 | (3,3),(1,1) (1 row) --- center of box, left unary operator +-- center of box, left unary operator SELECT '' AS four, @@(b1.f1) AS p FROM BOX_TBL b1; four | p @@ -197,9 +197,9 @@ SELECT '' AS four, @@(b1.f1) AS p | (3,3) (4 rows) --- wholly-contained +-- wholly-contained SELECT '' AS one, b1.*, b2.* - FROM BOX_TBL b1, BOX_TBL b2 + FROM BOX_TBL b1, BOX_TBL b2 WHERE b1.f1 @> b2.f1 and not b1.f1 ~= b2.f1; one | f1 | f1 -----+-------------+------------- diff --git a/src/test/regress/expected/char.out b/src/test/regress/expected/char.out index a0ba3d4a8c..991c7717d4 100644 --- a/src/test/regress/expected/char.out +++ b/src/test/regress/expected/char.out @@ -15,13 +15,13 @@ SELECT char 'c' = char 'c' AS true; CREATE TABLE CHAR_TBL(f1 char); INSERT INTO CHAR_TBL (f1) VALUES ('a'); INSERT INTO CHAR_TBL (f1) VALUES ('A'); --- any of the following three input formats are acceptable +-- any of the following three input formats are acceptable INSERT INTO CHAR_TBL (f1) VALUES ('1'); INSERT INTO CHAR_TBL (f1) VALUES (2); INSERT INTO CHAR_TBL (f1) VALUES ('3'); --- zero-length char +-- zero-length char INSERT INTO CHAR_TBL (f1) VALUES (''); --- try char's of greater than 1 length +-- try char's of greater than 1 length INSERT INTO CHAR_TBL (f1) VALUES ('cd'); ERROR: value too long for type character(1) INSERT INTO CHAR_TBL (f1) VALUES ('c '); diff --git a/src/test/regress/expected/char_1.out b/src/test/regress/expected/char_1.out index 4cc081deae..8eff75afb5 100644 --- a/src/test/regress/expected/char_1.out +++ b/src/test/regress/expected/char_1.out @@ -15,13 +15,13 @@ SELECT char 'c' = char 'c' AS true; CREATE TABLE CHAR_TBL(f1 char); INSERT INTO CHAR_TBL (f1) VALUES ('a'); INSERT INTO CHAR_TBL (f1) VALUES ('A'); --- any of the following three input formats are acceptable +-- any of the following three input formats are acceptable INSERT INTO CHAR_TBL (f1) VALUES ('1'); INSERT INTO CHAR_TBL (f1) VALUES (2); INSERT INTO CHAR_TBL (f1) VALUES ('3'); --- zero-length char +-- zero-length char INSERT INTO CHAR_TBL (f1) VALUES (''); --- try char's of greater than 1 length +-- try char's of greater than 1 length INSERT INTO CHAR_TBL (f1) VALUES ('cd'); ERROR: value too long for type character(1) INSERT INTO CHAR_TBL (f1) VALUES ('c '); diff --git a/src/test/regress/expected/char_2.out b/src/test/regress/expected/char_2.out index 8fe6e07acc..f54736c3e1 100644 --- a/src/test/regress/expected/char_2.out +++ b/src/test/regress/expected/char_2.out @@ -15,13 +15,13 @@ SELECT char 'c' = char 'c' AS true; CREATE TABLE CHAR_TBL(f1 char); INSERT INTO CHAR_TBL (f1) VALUES ('a'); INSERT INTO CHAR_TBL (f1) VALUES ('A'); --- any of the following three input formats are acceptable +-- any of the following three input formats are acceptable INSERT INTO CHAR_TBL (f1) VALUES ('1'); INSERT INTO CHAR_TBL (f1) VALUES (2); INSERT INTO CHAR_TBL (f1) VALUES ('3'); --- zero-length char +-- zero-length char INSERT INTO CHAR_TBL (f1) VALUES (''); --- try char's of greater than 1 length +-- try char's of greater than 1 length INSERT INTO CHAR_TBL (f1) VALUES ('cd'); ERROR: value too long for type character(1) INSERT INTO CHAR_TBL (f1) VALUES ('c '); diff --git a/src/test/regress/expected/cluster.out b/src/test/regress/expected/cluster.out index 96bd8164fa..979057d26f 100644 --- a/src/test/regress/expected/cluster.out +++ b/src/test/regress/expected/cluster.out @@ -398,7 +398,7 @@ BEGIN; UPDATE clustertest SET key = 100 WHERE key = 10; -- Test update where the new row version is found first in the scan UPDATE clustertest SET key = 35 WHERE key = 40; --- Test longer update chain +-- Test longer update chain UPDATE clustertest SET key = 60 WHERE key = 50; UPDATE clustertest SET key = 70 WHERE key = 60; UPDATE clustertest SET key = 80 WHERE key = 70; diff --git a/src/test/regress/expected/copyselect.out b/src/test/regress/expected/copyselect.out index 8a42b0e3d8..cbc140c538 100644 --- a/src/test/regress/expected/copyselect.out +++ b/src/test/regress/expected/copyselect.out @@ -113,7 +113,7 @@ ERROR: cannot copy from view "v_test1" HINT: Try the COPY (SELECT ...) TO variant. \copy: ERROR: cannot copy from view "v_test1" HINT: Try the COPY (SELECT ...) TO variant. --- +-- -- Test \copy (select ...) -- \copy (select "id",'id','id""'||t,(id + 1)*id,t,"test1"."t" from test1 where id=3) to stdout diff --git a/src/test/regress/expected/create_aggregate.out b/src/test/regress/expected/create_aggregate.out index 448e319794..ad1459419f 100644 --- a/src/test/regress/expected/create_aggregate.out +++ b/src/test/regress/expected/create_aggregate.out @@ -3,7 +3,7 @@ -- -- all functions CREATEd CREATE AGGREGATE newavg ( - sfunc = int4_avg_accum, basetype = int4, stype = _int8, + sfunc = int4_avg_accum, basetype = int4, stype = _int8, finalfunc = int8_avg, initcond1 = '{0,0}' ); @@ -14,7 +14,7 @@ COMMENT ON AGGREGATE newavg (int4) IS 'an agg comment'; COMMENT ON AGGREGATE newavg (int4) IS NULL; -- without finalfunc; test obsolete spellings 'sfunc1' etc CREATE AGGREGATE newsum ( - sfunc1 = int4pl, basetype = int4, stype1 = int4, + sfunc1 = int4pl, basetype = int4, stype1 = int4, initcond1 = '0' ); -- zero-argument aggregate diff --git a/src/test/regress/expected/create_index.out b/src/test/regress/expected/create_index.out index 2275343704..27d5e848e5 100644 --- a/src/test/regress/expected/create_index.out +++ b/src/test/regress/expected/create_index.out @@ -54,8 +54,8 @@ CREATE INDEX gcircleind ON circle_tbl USING gist (f1); CREATE INDEX gpointind ON point_tbl USING gist (f1); CREATE TEMP TABLE gpolygon_tbl AS SELECT polygon(home_base) AS f1 FROM slow_emp4000; -INSERT INTO gpolygon_tbl VALUES ( '(1000,0,0,1000)' ); -INSERT INTO gpolygon_tbl VALUES ( '(0,1000,1000,1000)' ); +INSERT INTO gpolygon_tbl VALUES ( '(1000,0,0,1000)' ); +INSERT INTO gpolygon_tbl VALUES ( '(0,1000,1000,1000)' ); CREATE TEMP TABLE gcircle_tbl AS SELECT circle(home_base) AS f1 FROM slow_emp4000; CREATE INDEX ggpolygonind ON gpolygon_tbl USING gist (f1); @@ -1023,5 +1023,4 @@ SELECT count(*) FROM onek_with_null WHERE unique1 IS NULL AND unique2 IS NOT NUL RESET enable_seqscan; RESET enable_indexscan; RESET enable_bitmapscan; - DROP TABLE onek_with_null; diff --git a/src/test/regress/expected/create_misc.out b/src/test/regress/expected/create_misc.out index 775d1bd1a7..45125fedfd 100644 --- a/src/test/regress/expected/create_misc.out +++ b/src/test/regress/expected/create_misc.out @@ -28,13 +28,13 @@ SELECT * INTO TABLE ramp FROM road WHERE name ~ '.*Ramp'; -INSERT INTO ihighway - SELECT * - FROM road +INSERT INTO ihighway + SELECT * + FROM road WHERE name ~ 'I- .*'; -INSERT INTO shighway - SELECT * - FROM road +INSERT INTO shighway + SELECT * + FROM road WHERE name ~ 'State Hwy.*'; UPDATE shighway SET surface = 'asphalt'; @@ -99,14 +99,14 @@ INSERT INTO f_star (class, a, c, f) INSERT INTO f_star (class, a, e, f) VALUES ('f', 22, '-7'::int2, '(111,555),(222,666),(333,777),(444,888)'::polygon); INSERT INTO f_star (class, c, e, f) - VALUES ('f', 'hi keith'::name, '-8'::int2, + VALUES ('f', 'hi keith'::name, '-8'::int2, '(1111,3333),(2222,4444)'::polygon); INSERT INTO f_star (class, a, c) VALUES ('f', 24, 'hi marc'::name); INSERT INTO f_star (class, a, e) VALUES ('f', 25, '-9'::int2); INSERT INTO f_star (class, a, f) - VALUES ('f', 26, '(11111,33333),(22222,44444)'::polygon); + VALUES ('f', 26, '(11111,33333),(22222,44444)'::polygon); INSERT INTO f_star (class, c, e) VALUES ('f', 'hi allison'::name, '-10'::int2); INSERT INTO f_star (class, c, f) @@ -117,15 +117,15 @@ INSERT INTO f_star (class, e, f) INSERT INTO f_star (class, a) VALUES ('f', 27); INSERT INTO f_star (class, c) VALUES ('f', 'hi carl'::name); INSERT INTO f_star (class, e) VALUES ('f', '-12'::int2); -INSERT INTO f_star (class, f) +INSERT INTO f_star (class, f) VALUES ('f', '(11111111,33333333),(22222222,44444444)'::polygon); INSERT INTO f_star (class) VALUES ('f'); -- -- for internal portal (cursor) tests -- CREATE TABLE iportaltest ( - i int4, - d float4, + i int4, + d float4, p polygon ); INSERT INTO iportaltest (i, d, p) diff --git a/src/test/regress/expected/create_operator.out b/src/test/regress/expected/create_operator.out index df25f35ae7..8656864655 100644 --- a/src/test/regress/expected/create_operator.out +++ b/src/test/regress/expected/create_operator.out @@ -1,30 +1,30 @@ -- -- CREATE_OPERATOR -- -CREATE OPERATOR ## ( +CREATE OPERATOR ## ( leftarg = path, rightarg = path, procedure = path_inter, - commutator = ## + commutator = ## ); CREATE OPERATOR <% ( leftarg = point, rightarg = widget, procedure = pt_in_widget, commutator = >% , - negator = >=% + negator = >=% ); CREATE OPERATOR @#@ ( - rightarg = int8, -- left unary - procedure = numeric_fac + rightarg = int8, -- left unary + procedure = numeric_fac ); CREATE OPERATOR #@# ( leftarg = int8, -- right unary procedure = numeric_fac ); -CREATE OPERATOR #%# ( - leftarg = int8, -- right unary - procedure = numeric_fac +CREATE OPERATOR #%# ( + leftarg = int8, -- right unary + procedure = numeric_fac ); -- Test comments COMMENT ON OPERATOR ###### (int4, NONE) IS 'bad right unary'; diff --git a/src/test/regress/expected/create_table.out b/src/test/regress/expected/create_table.out index 6f65885c82..62010a1482 100644 --- a/src/test/regress/expected/create_table.out +++ b/src/test/regress/expected/create_table.out @@ -5,7 +5,7 @@ -- CLASS DEFINITIONS -- CREATE TABLE hobbies_r ( - name text, + name text, person text ); CREATE TABLE equipment_r ( @@ -123,7 +123,7 @@ CREATE TABLE real_city ( -- f inherits from e (three-level single inheritance) -- CREATE TABLE a_star ( - class char, + class char, a int4 ); CREATE TABLE b_star ( @@ -165,7 +165,7 @@ CREATE TABLE hash_f8_heap ( ); -- don't include the hash_ovfl_heap stuff in the distribution -- the data set is too large for what it's worth --- +-- -- CREATE TABLE hash_ovfl_heap ( -- x int4, -- y int4 @@ -183,7 +183,7 @@ CREATE TABLE bt_txt_heap ( random int4 ); CREATE TABLE bt_f8_heap ( - seqno float8, + seqno float8, random int4 ); CREATE TABLE array_op_test ( @@ -196,11 +196,11 @@ CREATE TABLE array_index_op_test ( i int4[], t text[] ); -CREATE TABLE IF NOT EXISTS test_tsvector( - t text, - a tsvector +CREATE TABLE IF NOT EXISTS test_tsvector( + t text, + a tsvector ); -CREATE TABLE IF NOT EXISTS test_tsvector( +CREATE TABLE IF NOT EXISTS test_tsvector( t text ); NOTICE: relation "test_tsvector" already exists, skipping diff --git a/src/test/regress/expected/create_type.out b/src/test/regress/expected/create_type.out index 9d3a82e153..6dfe916985 100644 --- a/src/test/regress/expected/create_type.out +++ b/src/test/regress/expected/create_type.out @@ -7,17 +7,17 @@ -- of the "old style" approach of making the functions first. -- CREATE TYPE widget ( - internallength = 24, + internallength = 24, input = widget_in, output = widget_out, typmod_in = numerictypmodin, typmod_out = numerictypmodout, alignment = double ); -CREATE TYPE city_budget ( - internallength = 16, - input = int44in, - output = int44out, +CREATE TYPE city_budget ( + internallength = 16, + input = int44in, + output = int44out, element = int4, category = 'x', -- just to verify the system will take it preferred = true -- ditto diff --git a/src/test/regress/expected/create_view.out b/src/test/regress/expected/create_view.out index 04383e43d2..f2c06854d0 100644 --- a/src/test/regress/expected/create_view.out +++ b/src/test/regress/expected/create_view.out @@ -4,11 +4,11 @@ -- (this also tests the query rewrite system) -- CREATE VIEW street AS - SELECT r.name, r.thepath, c.cname AS cname + SELECT r.name, r.thepath, c.cname AS cname FROM ONLY road r, real_city c WHERE c.outline ## r.thepath; CREATE VIEW iexit AS - SELECT ih.name, ih.thepath, + SELECT ih.name, ih.thepath, interpt_pp(ih.thepath, r.thepath) AS exit FROM ihighway ih, ramp r WHERE ih.thepath ## r.thepath; @@ -58,7 +58,7 @@ ERROR: cannot change name of view column "a" to "?column?" CREATE OR REPLACE VIEW viewtest AS SELECT a, b::numeric FROM viewtest_tbl; ERROR: cannot change data type of view column "b" from integer to numeric --- should work +-- should work CREATE OR REPLACE VIEW viewtest AS SELECT a, b, 0 AS c FROM viewtest_tbl; DROP VIEW viewtest; @@ -133,7 +133,7 @@ CREATE VIEW v9 AS SELECT seq1.is_called FROM seq1; CREATE VIEW v13_temp AS SELECT seq1_temp.is_called FROM seq1_temp; NOTICE: view "v13_temp" will be a temporary view SELECT relname FROM pg_class - WHERE relname LIKE 'v_' + WHERE relname LIKE 'v_' AND relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = 'temp_view_test') ORDER BY relname; relname @@ -150,7 +150,7 @@ SELECT relname FROM pg_class (9 rows) SELECT relname FROM pg_class - WHERE relname LIKE 'v%' + WHERE relname LIKE 'v%' AND relnamespace IN (SELECT oid FROM pg_namespace WHERE nspname LIKE 'pg_temp%') ORDER BY relname; relname @@ -199,7 +199,7 @@ SELECT relname FROM pg_class (4 rows) SELECT relname FROM pg_class - WHERE relname LIKE 'temporal%' + WHERE relname LIKE 'temporal%' AND relnamespace IN (SELECT oid FROM pg_namespace WHERE nspname LIKE 'pg_temp%') ORDER BY relname; relname diff --git a/src/test/regress/expected/drop_if_exists.out b/src/test/regress/expected/drop_if_exists.out index 092c90403a..2a23b4cfe6 100644 --- a/src/test/regress/expected/drop_if_exists.out +++ b/src/test/regress/expected/drop_if_exists.out @@ -1,6 +1,6 @@ --- +-- -- IF EXISTS tests --- +-- -- table (will be really dropped at the end) DROP TABLE test_exists; ERROR: table "test_exists" does not exist diff --git a/src/test/regress/expected/errors.out b/src/test/regress/expected/errors.out index 55822e0b9b..4a10c6ae8a 100644 --- a/src/test/regress/expected/errors.out +++ b/src/test/regress/expected/errors.out @@ -10,19 +10,17 @@ select 1; -- -- UNSUPPORTED STUFF - --- doesn't work +-- doesn't work -- notify pg_class -- -- -- SELECT - --- missing relation name +-- missing relation name select; ERROR: syntax error at or near ";" LINE 1: select; ^ --- no such relation +-- no such relation select * from nonesuch; ERROR: relation "nonesuch" does not exist LINE 1: select * from nonesuch; @@ -59,74 +57,70 @@ LINE 1: select distinct on (foobar) * from pg_database; ^ -- -- DELETE - --- missing relation name (this had better not wildcard!) +-- missing relation name (this had better not wildcard!) delete from; ERROR: syntax error at or near ";" LINE 1: delete from; ^ --- no such relation +-- no such relation delete from nonesuch; ERROR: relation "nonesuch" does not exist LINE 1: delete from nonesuch; ^ -- -- DROP - --- missing relation name (this had better not wildcard!) +-- missing relation name (this had better not wildcard!) drop table; ERROR: syntax error at or near ";" LINE 1: drop table; ^ --- no such relation +-- no such relation drop table nonesuch; ERROR: table "nonesuch" does not exist -- -- ALTER TABLE - --- relation renaming --- missing relation name +-- relation renaming +-- missing relation name alter table rename; ERROR: syntax error at or near ";" LINE 1: alter table rename; ^ --- no such relation +-- no such relation alter table nonesuch rename to newnonesuch; ERROR: relation "nonesuch" does not exist --- no such relation +-- no such relation alter table nonesuch rename to stud_emp; ERROR: relation "nonesuch" does not exist --- conflict +-- conflict alter table stud_emp rename to aggtest; ERROR: relation "aggtest" already exists --- self-conflict +-- self-conflict alter table stud_emp rename to stud_emp; ERROR: relation "stud_emp" already exists --- attribute renaming --- no such relation +-- attribute renaming +-- no such relation alter table nonesuchrel rename column nonesuchatt to newnonesuchatt; ERROR: relation "nonesuchrel" does not exist --- no such attribute +-- no such attribute alter table emp rename column nonesuchatt to newnonesuchatt; ERROR: column "nonesuchatt" does not exist --- conflict +-- conflict alter table emp rename column salary to manager; ERROR: column "manager" of relation "stud_emp" already exists --- conflict +-- conflict alter table emp rename column salary to oid; ERROR: column "oid" of relation "stud_emp" already exists -- -- TRANSACTION STUFF - --- not in a xact +-- not in a xact abort; NOTICE: there is no transaction in progress --- not in a xact +-- not in a xact end; WARNING: there is no transaction in progress -- -- CREATE AGGREGATE --- sfunc/finalfunc type disagreement +-- sfunc/finalfunc type disagreement create aggregate newavg2 (sfunc = int4pl, basetype = int4, stype = int4, @@ -140,24 +134,22 @@ create aggregate newcnt1 (sfunc = int4inc, ERROR: aggregate input type must be specified -- -- DROP INDEX - --- missing index name +-- missing index name drop index; ERROR: syntax error at or near ";" LINE 1: drop index; ^ --- bad index name +-- bad index name drop index 314159; ERROR: syntax error at or near "314159" LINE 1: drop index 314159; ^ --- no such index +-- no such index drop index nonesuch; ERROR: index "nonesuch" does not exist -- -- DROP AGGREGATE - --- missing aggregate name +-- missing aggregate name drop aggregate; ERROR: syntax error at or near ";" LINE 1: drop aggregate; @@ -167,7 +159,7 @@ drop aggregate newcnt1; ERROR: syntax error at or near ";" LINE 1: drop aggregate newcnt1; ^ --- bad aggregate name +-- bad aggregate name drop aggregate 314159 (int); ERROR: syntax error at or near "314159" LINE 1: drop aggregate 314159 (int); @@ -175,7 +167,7 @@ LINE 1: drop aggregate 314159 (int); -- bad aggregate type drop aggregate newcnt (nonesuch); ERROR: type "nonesuch" does not exist --- no such aggregate +-- no such aggregate drop aggregate nonesuch (int4); ERROR: aggregate nonesuch(integer) does not exist -- no such aggregate for type @@ -183,114 +175,110 @@ drop aggregate newcnt (float4); ERROR: aggregate newcnt(real) does not exist -- -- DROP FUNCTION - --- missing function name +-- missing function name drop function (); ERROR: syntax error at or near "(" LINE 1: drop function (); ^ --- bad function name +-- bad function name drop function 314159(); ERROR: syntax error at or near "314159" LINE 1: drop function 314159(); ^ --- no such function +-- no such function drop function nonesuch(); ERROR: function nonesuch() does not exist -- -- DROP TYPE - --- missing type name +-- missing type name drop type; ERROR: syntax error at or near ";" LINE 1: drop type; ^ --- bad type name +-- bad type name drop type 314159; ERROR: syntax error at or near "314159" LINE 1: drop type 314159; ^ --- no such type +-- no such type drop type nonesuch; ERROR: type "nonesuch" does not exist -- -- DROP OPERATOR - --- missing everything +-- missing everything drop operator; ERROR: syntax error at or near ";" LINE 1: drop operator; ^ --- bad operator name +-- bad operator name drop operator equals; ERROR: syntax error at or near ";" LINE 1: drop operator equals; ^ --- missing type list +-- missing type list drop operator ===; ERROR: syntax error at or near ";" LINE 1: drop operator ===; ^ --- missing parentheses +-- missing parentheses drop operator int4, int4; ERROR: syntax error at or near "," LINE 1: drop operator int4, int4; ^ --- missing operator name +-- missing operator name drop operator (int4, int4); ERROR: syntax error at or near "(" LINE 1: drop operator (int4, int4); ^ --- missing type list contents +-- missing type list contents drop operator === (); ERROR: syntax error at or near ")" LINE 1: drop operator === (); ^ --- no such operator +-- no such operator drop operator === (int4); ERROR: missing argument LINE 1: drop operator === (int4); ^ HINT: Use NONE to denote the missing argument of a unary operator. --- no such operator by that name +-- no such operator by that name drop operator === (int4, int4); ERROR: operator does not exist: integer === integer --- no such type1 +-- no such type1 drop operator = (nonesuch); ERROR: missing argument LINE 1: drop operator = (nonesuch); ^ HINT: Use NONE to denote the missing argument of a unary operator. --- no such type1 +-- no such type1 drop operator = ( , int4); ERROR: syntax error at or near "," LINE 1: drop operator = ( , int4); ^ --- no such type1 +-- no such type1 drop operator = (nonesuch, int4); ERROR: type "nonesuch" does not exist --- no such type2 +-- no such type2 drop operator = (int4, nonesuch); ERROR: type "nonesuch" does not exist --- no such type2 +-- no such type2 drop operator = (int4, ); ERROR: syntax error at or near ")" LINE 1: drop operator = (int4, ); ^ -- -- DROP RULE - --- missing rule name +-- missing rule name drop rule; ERROR: syntax error at or near ";" LINE 1: drop rule; ^ --- bad rule name +-- bad rule name drop rule 314159; ERROR: syntax error at or near "314159" LINE 1: drop rule 314159; ^ --- no such rule +-- no such rule drop rule nonesuch on noplace; ERROR: relation "noplace" does not exist -- these postquel variants are no longer supported @@ -360,7 +348,7 @@ VALUES(123); ERROR: syntax error at or near "123" LINE 1: INSERT INTO 123 ^ -INSERT INTO foo +INSERT INTO foo VALUES(123) 123 ; ERROR: syntax error at or near "123" @@ -375,11 +363,11 @@ ERROR: syntax error at or near "NUL" LINE 3: id3 INTEGER NOT NUL, ^ -- long line to be truncated on the left -CREATE TABLE foo(id INT4 UNIQUE NOT NULL, id2 TEXT NOT NULL PRIMARY KEY, id3 INTEGER NOT NUL, +CREATE TABLE foo(id INT4 UNIQUE NOT NULL, id2 TEXT NOT NULL PRIMARY KEY, id3 INTEGER NOT NUL, id4 INT4 UNIQUE NOT NULL, id5 TEXT UNIQUE NOT NULL); ERROR: syntax error at or near "NUL" -LINE 1: ...T NULL, id2 TEXT NOT NULL PRIMARY KEY, id3 INTEGER NOT NUL, - ^ +LINE 1: ...OT NULL, id2 TEXT NOT NULL PRIMARY KEY, id3 INTEGER NOT NUL, + ^ -- long line to be truncated on the right CREATE TABLE foo( id3 INTEGER NOT NUL, id4 INT4 UNIQUE NOT NULL, id5 TEXT UNIQUE NOT NULL, id INT4 UNIQUE NOT NULL, id2 TEXT NOT NULL PRIMARY KEY); @@ -394,24 +382,24 @@ LINE 1: ...L, id2 TEXT NOT NULL PRIMARY KEY, id3 INTEGER NOT NUL, id4 I... -- long line to be truncated on the left, many lines CREATE TEMPORARY -TABLE -foo(id INT4 UNIQUE NOT NULL, id2 TEXT NOT NULL PRIMARY KEY, id3 INTEGER NOT NUL, -id4 INT4 -UNIQUE -NOT -NULL, -id5 TEXT -UNIQUE -NOT +TABLE +foo(id INT4 UNIQUE NOT NULL, id2 TEXT NOT NULL PRIMARY KEY, id3 INTEGER NOT NUL, +id4 INT4 +UNIQUE +NOT +NULL, +id5 TEXT +UNIQUE +NOT NULL) ; ERROR: syntax error at or near "NUL" -LINE 4: ...T NULL, id2 TEXT NOT NULL PRIMARY KEY, id3 INTEGER NOT NUL, - ^ +LINE 4: ...OT NULL, id2 TEXT NOT NULL PRIMARY KEY, id3 INTEGER NOT NUL, + ^ -- long line to be truncated on the right, many lines -CREATE +CREATE TEMPORARY -TABLE +TABLE foo( id3 INTEGER NOT NUL, id4 INT4 UNIQUE NOT NULL, id5 TEXT UNIQUE NOT NULL, id INT4 UNIQUE NOT NULL, id2 TEXT NOT NULL PRIMARY KEY) ; @@ -419,40 +407,40 @@ ERROR: syntax error at or near "NUL" LINE 5: id3 INTEGER NOT NUL, id4 INT4 UNIQUE NOT NULL, id5 TEXT UNIQ... ^ -- long line to be truncated both ways, many lines -CREATE +CREATE TEMPORARY -TABLE +TABLE foo -(id -INT4 -UNIQUE NOT NULL, idx INT4 UNIQUE NOT NULL, idy INT4 UNIQUE NOT NULL, id2 TEXT NOT NULL PRIMARY KEY, id3 INTEGER NOT NUL, id4 INT4 UNIQUE NOT NULL, id5 TEXT UNIQUE NOT NULL, -idz INT4 UNIQUE NOT NULL, +(id +INT4 +UNIQUE NOT NULL, idx INT4 UNIQUE NOT NULL, idy INT4 UNIQUE NOT NULL, id2 TEXT NOT NULL PRIMARY KEY, id3 INTEGER NOT NUL, id4 INT4 UNIQUE NOT NULL, id5 TEXT UNIQUE NOT NULL, +idz INT4 UNIQUE NOT NULL, idv INT4 UNIQUE NOT NULL); ERROR: syntax error at or near "NUL" LINE 7: ...L, id2 TEXT NOT NULL PRIMARY KEY, id3 INTEGER NOT NUL, id4 I... ^ -- more than 10 lines... -CREATE +CREATE TEMPORARY -TABLE +TABLE foo -(id -INT4 -UNIQUE -NOT +(id +INT4 +UNIQUE +NOT NULL -, +, idm -INT4 -UNIQUE -NOT +INT4 +UNIQUE +NOT NULL, -idx INT4 UNIQUE NOT NULL, idy INT4 UNIQUE NOT NULL, id2 TEXT NOT NULL PRIMARY KEY, id3 INTEGER NOT NUL, id4 INT4 UNIQUE NOT NULL, id5 TEXT UNIQUE NOT NULL, -idz INT4 UNIQUE NOT NULL, -idv -INT4 -UNIQUE -NOT +idx INT4 UNIQUE NOT NULL, idy INT4 UNIQUE NOT NULL, id2 TEXT NOT NULL PRIMARY KEY, id3 INTEGER NOT NUL, id4 INT4 UNIQUE NOT NULL, id5 TEXT UNIQUE NOT NULL, +idz INT4 UNIQUE NOT NULL, +idv +INT4 +UNIQUE +NOT NULL); ERROR: syntax error at or near "NUL" LINE 16: ...L, id2 TEXT NOT NULL PRIMARY KEY, id3 INTEGER NOT NUL, id4 I... diff --git a/src/test/regress/expected/float4-exp-three-digits.out b/src/test/regress/expected/float4-exp-three-digits.out index ff680f4792..f17f95697a 100644 --- a/src/test/regress/expected/float4-exp-three-digits.out +++ b/src/test/regress/expected/float4-exp-three-digits.out @@ -7,7 +7,7 @@ INSERT INTO FLOAT4_TBL(f1) VALUES ('1004.30 '); INSERT INTO FLOAT4_TBL(f1) VALUES (' -34.84 '); INSERT INTO FLOAT4_TBL(f1) VALUES ('1.2345678901234e+20'); INSERT INTO FLOAT4_TBL(f1) VALUES ('1.2345678901234e-20'); --- test for over and under flow +-- test for over and under flow INSERT INTO FLOAT4_TBL(f1) VALUES ('10e70'); ERROR: value out of range: overflow LINE 1: INSERT INTO FLOAT4_TBL(f1) VALUES ('10e70'); @@ -233,7 +233,7 @@ SELECT '' AS five, * FROM FLOAT4_TBL; | 1.23457e-020 (5 rows) --- test the unary float4abs operator +-- test the unary float4abs operator SELECT '' AS five, f.f1, @f.f1 AS abs_f1 FROM FLOAT4_TBL f; five | f1 | abs_f1 ------+--------------+-------------- diff --git a/src/test/regress/expected/float4.out b/src/test/regress/expected/float4.out index dd8066a79c..fd46a4a1db 100644 --- a/src/test/regress/expected/float4.out +++ b/src/test/regress/expected/float4.out @@ -7,7 +7,7 @@ INSERT INTO FLOAT4_TBL(f1) VALUES ('1004.30 '); INSERT INTO FLOAT4_TBL(f1) VALUES (' -34.84 '); INSERT INTO FLOAT4_TBL(f1) VALUES ('1.2345678901234e+20'); INSERT INTO FLOAT4_TBL(f1) VALUES ('1.2345678901234e-20'); --- test for over and under flow +-- test for over and under flow INSERT INTO FLOAT4_TBL(f1) VALUES ('10e70'); ERROR: value out of range: overflow LINE 1: INSERT INTO FLOAT4_TBL(f1) VALUES ('10e70'); @@ -233,7 +233,7 @@ SELECT '' AS five, * FROM FLOAT4_TBL; | 1.23457e-20 (5 rows) --- test the unary float4abs operator +-- test the unary float4abs operator SELECT '' AS five, f.f1, @f.f1 AS abs_f1 FROM FLOAT4_TBL f; five | f1 | abs_f1 ------+-------------+------------- diff --git a/src/test/regress/expected/float8-exp-three-digits-win32.out b/src/test/regress/expected/float8-exp-three-digits-win32.out index a4b8b47bad..2dd648d6b9 100644 --- a/src/test/regress/expected/float8-exp-three-digits-win32.out +++ b/src/test/regress/expected/float8-exp-three-digits-win32.out @@ -184,7 +184,7 @@ SELECT '' AS four, f.* FROM FLOAT8_TBL f WHERE f.f1 <= '1004.3'; | 1.2345678901234e-200 (4 rows) -SELECT '' AS three, f.f1, f.f1 * '-10' AS x +SELECT '' AS three, f.f1, f.f1 * '-10' AS x FROM FLOAT8_TBL f WHERE f.f1 > '0.0'; three | f1 | x @@ -231,8 +231,8 @@ SELECT '' AS one, f.f1 ^ '2.0' AS square_f1 | 1008618.49 (1 row) --- absolute value -SELECT '' AS five, f.f1, @f.f1 AS abs_f1 +-- absolute value +SELECT '' AS five, f.f1, @f.f1 AS abs_f1 FROM FLOAT8_TBL f; five | f1 | abs_f1 ------+----------------------+---------------------- @@ -243,7 +243,7 @@ SELECT '' AS five, f.f1, @f.f1 AS abs_f1 | 1.2345678901234e-200 | 1.2345678901234e-200 (5 rows) --- truncate +-- truncate SELECT '' AS five, f.f1, trunc(f.f1) AS trunc_f1 FROM FLOAT8_TBL f; five | f1 | trunc_f1 @@ -255,7 +255,7 @@ SELECT '' AS five, f.f1, trunc(f.f1) AS trunc_f1 | 1.2345678901234e-200 | 0 (5 rows) --- round +-- round SELECT '' AS five, f.f1, round(f.f1) AS round_f1 FROM FLOAT8_TBL f; five | f1 | round_f1 @@ -310,7 +310,7 @@ select sign(f1) as sign_f1 from float8_tbl f; 1 (5 rows) --- square root +-- square root SELECT sqrt(float8 '64') AS eight; eight ------- @@ -340,7 +340,7 @@ SELECT power(float8 '144', float8 '0.5'); 12 (1 row) --- take exp of ln(f.f1) +-- take exp of ln(f.f1) SELECT '' AS three, f.f1, exp(ln(f.f1)) AS exp_ln_f1 FROM FLOAT8_TBL f WHERE f.f1 > '0.0'; @@ -351,7 +351,7 @@ SELECT '' AS three, f.f1, exp(ln(f.f1)) AS exp_ln_f1 | 1.2345678901234e-200 | 1.23456789012339e-200 (3 rows) --- cube root +-- cube root SELECT ||/ float8 '27' AS three; three ------- @@ -409,7 +409,7 @@ SELECT '' AS five, * FROM FLOAT8_TBL; | -1.2345678901234e-200 (5 rows) --- test for over- and underflow +-- test for over- and underflow INSERT INTO FLOAT8_TBL(f1) VALUES ('10e400'); ERROR: "10e400" is out of range for type double precision LINE 1: INSERT INTO FLOAT8_TBL(f1) VALUES ('10e400'); diff --git a/src/test/regress/expected/float8-small-is-zero.out b/src/test/regress/expected/float8-small-is-zero.out index 6bddbc9290..5da743374c 100644 --- a/src/test/regress/expected/float8-small-is-zero.out +++ b/src/test/regress/expected/float8-small-is-zero.out @@ -188,7 +188,7 @@ SELECT '' AS four, f.* FROM FLOAT8_TBL f WHERE f.f1 <= '1004.3'; | 1.2345678901234e-200 (4 rows) -SELECT '' AS three, f.f1, f.f1 * '-10' AS x +SELECT '' AS three, f.f1, f.f1 * '-10' AS x FROM FLOAT8_TBL f WHERE f.f1 > '0.0'; three | f1 | x @@ -235,8 +235,8 @@ SELECT '' AS one, f.f1 ^ '2.0' AS square_f1 | 1008618.49 (1 row) --- absolute value -SELECT '' AS five, f.f1, @f.f1 AS abs_f1 +-- absolute value +SELECT '' AS five, f.f1, @f.f1 AS abs_f1 FROM FLOAT8_TBL f; five | f1 | abs_f1 ------+----------------------+---------------------- @@ -247,7 +247,7 @@ SELECT '' AS five, f.f1, @f.f1 AS abs_f1 | 1.2345678901234e-200 | 1.2345678901234e-200 (5 rows) --- truncate +-- truncate SELECT '' AS five, f.f1, trunc(f.f1) AS trunc_f1 FROM FLOAT8_TBL f; five | f1 | trunc_f1 @@ -259,7 +259,7 @@ SELECT '' AS five, f.f1, trunc(f.f1) AS trunc_f1 | 1.2345678901234e-200 | 0 (5 rows) --- round +-- round SELECT '' AS five, f.f1, round(f.f1) AS round_f1 FROM FLOAT8_TBL f; five | f1 | round_f1 @@ -314,7 +314,7 @@ select sign(f1) as sign_f1 from float8_tbl f; 1 (5 rows) --- square root +-- square root SELECT sqrt(float8 '64') AS eight; eight ------- @@ -344,7 +344,7 @@ SELECT power(float8 '144', float8 '0.5'); 12 (1 row) --- take exp of ln(f.f1) +-- take exp of ln(f.f1) SELECT '' AS three, f.f1, exp(ln(f.f1)) AS exp_ln_f1 FROM FLOAT8_TBL f WHERE f.f1 > '0.0'; @@ -355,7 +355,7 @@ SELECT '' AS three, f.f1, exp(ln(f.f1)) AS exp_ln_f1 | 1.2345678901234e-200 | 1.23456789012339e-200 (3 rows) --- cube root +-- cube root SELECT ||/ float8 '27' AS three; three ------- @@ -413,7 +413,7 @@ SELECT '' AS five, * FROM FLOAT8_TBL; | -1.2345678901234e-200 (5 rows) --- test for over- and underflow +-- test for over- and underflow INSERT INTO FLOAT8_TBL(f1) VALUES ('10e400'); ERROR: "10e400" is out of range for type double precision LINE 1: INSERT INTO FLOAT8_TBL(f1) VALUES ('10e400'); diff --git a/src/test/regress/expected/float8-small-is-zero_1.out b/src/test/regress/expected/float8-small-is-zero_1.out index f48d280845..530842e102 100644 --- a/src/test/regress/expected/float8-small-is-zero_1.out +++ b/src/test/regress/expected/float8-small-is-zero_1.out @@ -188,7 +188,7 @@ SELECT '' AS four, f.* FROM FLOAT8_TBL f WHERE f.f1 <= '1004.3'; | 1.2345678901234e-200 (4 rows) -SELECT '' AS three, f.f1, f.f1 * '-10' AS x +SELECT '' AS three, f.f1, f.f1 * '-10' AS x FROM FLOAT8_TBL f WHERE f.f1 > '0.0'; three | f1 | x @@ -235,8 +235,8 @@ SELECT '' AS one, f.f1 ^ '2.0' AS square_f1 | 1008618.49 (1 row) --- absolute value -SELECT '' AS five, f.f1, @f.f1 AS abs_f1 +-- absolute value +SELECT '' AS five, f.f1, @f.f1 AS abs_f1 FROM FLOAT8_TBL f; five | f1 | abs_f1 ------+----------------------+---------------------- @@ -247,7 +247,7 @@ SELECT '' AS five, f.f1, @f.f1 AS abs_f1 | 1.2345678901234e-200 | 1.2345678901234e-200 (5 rows) --- truncate +-- truncate SELECT '' AS five, f.f1, trunc(f.f1) AS trunc_f1 FROM FLOAT8_TBL f; five | f1 | trunc_f1 @@ -259,7 +259,7 @@ SELECT '' AS five, f.f1, trunc(f.f1) AS trunc_f1 | 1.2345678901234e-200 | 0 (5 rows) --- round +-- round SELECT '' AS five, f.f1, round(f.f1) AS round_f1 FROM FLOAT8_TBL f; five | f1 | round_f1 @@ -314,7 +314,7 @@ select sign(f1) as sign_f1 from float8_tbl f; 1 (5 rows) --- square root +-- square root SELECT sqrt(float8 '64') AS eight; eight ------- @@ -344,7 +344,7 @@ SELECT power(float8 '144', float8 '0.5'); 12 (1 row) --- take exp of ln(f.f1) +-- take exp of ln(f.f1) SELECT '' AS three, f.f1, exp(ln(f.f1)) AS exp_ln_f1 FROM FLOAT8_TBL f WHERE f.f1 > '0.0'; @@ -355,7 +355,7 @@ SELECT '' AS three, f.f1, exp(ln(f.f1)) AS exp_ln_f1 | 1.2345678901234e-200 | 1.23456789012339e-200 (3 rows) --- cube root +-- cube root SELECT ||/ float8 '27' AS three; three ------- @@ -413,7 +413,7 @@ SELECT '' AS five, * FROM FLOAT8_TBL; | -1.2345678901234e-200 (5 rows) --- test for over- and underflow +-- test for over- and underflow INSERT INTO FLOAT8_TBL(f1) VALUES ('10e400'); ERROR: "10e400" is out of range for type double precision LINE 1: INSERT INTO FLOAT8_TBL(f1) VALUES ('10e400'); diff --git a/src/test/regress/expected/float8.out b/src/test/regress/expected/float8.out index d8350d100e..6221538af5 100644 --- a/src/test/regress/expected/float8.out +++ b/src/test/regress/expected/float8.out @@ -184,7 +184,7 @@ SELECT '' AS four, f.* FROM FLOAT8_TBL f WHERE f.f1 <= '1004.3'; | 1.2345678901234e-200 (4 rows) -SELECT '' AS three, f.f1, f.f1 * '-10' AS x +SELECT '' AS three, f.f1, f.f1 * '-10' AS x FROM FLOAT8_TBL f WHERE f.f1 > '0.0'; three | f1 | x @@ -231,8 +231,8 @@ SELECT '' AS one, f.f1 ^ '2.0' AS square_f1 | 1008618.49 (1 row) --- absolute value -SELECT '' AS five, f.f1, @f.f1 AS abs_f1 +-- absolute value +SELECT '' AS five, f.f1, @f.f1 AS abs_f1 FROM FLOAT8_TBL f; five | f1 | abs_f1 ------+----------------------+---------------------- @@ -243,7 +243,7 @@ SELECT '' AS five, f.f1, @f.f1 AS abs_f1 | 1.2345678901234e-200 | 1.2345678901234e-200 (5 rows) --- truncate +-- truncate SELECT '' AS five, f.f1, trunc(f.f1) AS trunc_f1 FROM FLOAT8_TBL f; five | f1 | trunc_f1 @@ -255,7 +255,7 @@ SELECT '' AS five, f.f1, trunc(f.f1) AS trunc_f1 | 1.2345678901234e-200 | 0 (5 rows) --- round +-- round SELECT '' AS five, f.f1, round(f.f1) AS round_f1 FROM FLOAT8_TBL f; five | f1 | round_f1 @@ -310,7 +310,7 @@ select sign(f1) as sign_f1 from float8_tbl f; 1 (5 rows) --- square root +-- square root SELECT sqrt(float8 '64') AS eight; eight ------- @@ -340,7 +340,7 @@ SELECT power(float8 '144', float8 '0.5'); 12 (1 row) --- take exp of ln(f.f1) +-- take exp of ln(f.f1) SELECT '' AS three, f.f1, exp(ln(f.f1)) AS exp_ln_f1 FROM FLOAT8_TBL f WHERE f.f1 > '0.0'; @@ -351,7 +351,7 @@ SELECT '' AS three, f.f1, exp(ln(f.f1)) AS exp_ln_f1 | 1.2345678901234e-200 | 1.23456789012339e-200 (3 rows) --- cube root +-- cube root SELECT ||/ float8 '27' AS three; three ------- @@ -409,7 +409,7 @@ SELECT '' AS five, * FROM FLOAT8_TBL; | -1.2345678901234e-200 (5 rows) --- test for over- and underflow +-- test for over- and underflow INSERT INTO FLOAT8_TBL(f1) VALUES ('10e400'); ERROR: "10e400" is out of range for type double precision LINE 1: INSERT INTO FLOAT8_TBL(f1) VALUES ('10e400'); diff --git a/src/test/regress/expected/foreign_key.out b/src/test/regress/expected/foreign_key.out index 0367f53233..87d573b6ab 100644 --- a/src/test/regress/expected/foreign_key.out +++ b/src/test/regress/expected/foreign_key.out @@ -62,7 +62,7 @@ DROP TABLE PKTABLE; -- CREATE TABLE PKTABLE ( ptest1 int, ptest2 int, ptest3 text, PRIMARY KEY(ptest1, ptest2) ); NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index "pktable_pkey" for table "pktable" -CREATE TABLE FKTABLE ( ftest1 int, ftest2 int, ftest3 int, CONSTRAINT constrname FOREIGN KEY(ftest1, ftest2) +CREATE TABLE FKTABLE ( ftest1 int, ftest2 int, ftest3 int, CONSTRAINT constrname FOREIGN KEY(ftest1, ftest2) REFERENCES PKTABLE MATCH FULL ON DELETE SET NULL ON UPDATE SET NULL); -- Test comments COMMENT ON CONSTRAINT constrname_wrong ON FKTABLE IS 'fk constraint comment'; @@ -175,7 +175,7 @@ DROP TABLE FKTABLE; -- CREATE TABLE PKTABLE ( ptest1 int, ptest2 int, ptest3 text, PRIMARY KEY(ptest1, ptest2) ); NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index "pktable_pkey" for table "pktable" -CREATE TABLE FKTABLE ( ftest1 int DEFAULT -1, ftest2 int DEFAULT -2, ftest3 int, CONSTRAINT constrname2 FOREIGN KEY(ftest1, ftest2) +CREATE TABLE FKTABLE ( ftest1 int DEFAULT -1, ftest2 int DEFAULT -2, ftest3 int, CONSTRAINT constrname2 FOREIGN KEY(ftest1, ftest2) REFERENCES PKTABLE MATCH FULL ON DELETE SET DEFAULT ON UPDATE SET DEFAULT); -- Insert a value in PKTABLE for default INSERT INTO PKTABLE VALUES (-1, -2, 'The Default!'); @@ -351,7 +351,7 @@ INSERT INTO PKTABLE VALUES (1, 3, 3, 'test2'); INSERT INTO PKTABLE VALUES (2, 3, 4, 'test3'); INSERT INTO PKTABLE VALUES (2, 4, 5, 'test4'); -- Insert Foreign Key values -INSERT INTO FKTABLE VALUES (1, 2, 3, 1); +INSERT INTO FKTABLE VALUES (1, 2, 3, 1); INSERT INTO FKTABLE VALUES (NULL, 2, 3, 2); INSERT INTO FKTABLE VALUES (2, NULL, 3, 3); INSERT INTO FKTABLE VALUES (NULL, 2, 7, 4); @@ -416,7 +416,7 @@ INSERT INTO PKTABLE VALUES (1, 3, 3, 'test2'); INSERT INTO PKTABLE VALUES (2, 3, 4, 'test3'); INSERT INTO PKTABLE VALUES (2, 4, 5, 'test4'); -- Insert Foreign Key values -INSERT INTO FKTABLE VALUES (1, 2, 3, 1); +INSERT INTO FKTABLE VALUES (1, 2, 3, 1); INSERT INTO FKTABLE VALUES (NULL, 2, 3, 2); INSERT INTO FKTABLE VALUES (2, NULL, 3, 3); INSERT INTO FKTABLE VALUES (NULL, 2, 7, 4); @@ -513,8 +513,8 @@ INSERT INTO PKTABLE VALUES (1, 3, 3, 'test2'); INSERT INTO PKTABLE VALUES (2, 3, 4, 'test3'); INSERT INTO PKTABLE VALUES (2, 4, 5, 'test4'); -- Insert Foreign Key values -INSERT INTO FKTABLE VALUES (1, 2, 3, 1); -INSERT INTO FKTABLE VALUES (2, 3, 4, 1); +INSERT INTO FKTABLE VALUES (1, 2, 3, 1); +INSERT INTO FKTABLE VALUES (2, 3, 4, 1); INSERT INTO FKTABLE VALUES (NULL, 2, 3, 2); INSERT INTO FKTABLE VALUES (2, NULL, 3, 3); INSERT INTO FKTABLE VALUES (NULL, 2, 7, 4); @@ -618,8 +618,8 @@ INSERT INTO PKTABLE VALUES (2, 3, 4, 'test3'); INSERT INTO PKTABLE VALUES (2, 4, 5, 'test4'); INSERT INTO PKTABLE VALUES (2, -1, 5, 'test5'); -- Insert Foreign Key values -INSERT INTO FKTABLE VALUES (1, 2, 3, 1); -INSERT INTO FKTABLE VALUES (2, 3, 4, 1); +INSERT INTO FKTABLE VALUES (1, 2, 3, 1); +INSERT INTO FKTABLE VALUES (2, 3, 4, 1); INSERT INTO FKTABLE VALUES (2, 4, 5, 1); INSERT INTO FKTABLE VALUES (NULL, 2, 3, 2); INSERT INTO FKTABLE VALUES (2, NULL, 3, 3); @@ -745,7 +745,7 @@ DROP TABLE PKTABLE; -- -- Tests for mismatched types -- --- Basic one column, two table setup +-- Basic one column, two table setup CREATE TABLE PKTABLE (ptest1 int PRIMARY KEY); NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index "pktable_pkey" for table "pktable" INSERT INTO PKTABLE VALUES(42); @@ -831,7 +831,7 @@ CREATE TABLE PKTABLE (ptest1 int, ptest2 inet, ptest3 int, ptest4 inet, PRIMARY ptest4) REFERENCES pktable(ptest1, ptest2)); NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index "pktable_pkey" for table "pktable" DROP TABLE PKTABLE; --- And this, +-- And this, CREATE TABLE PKTABLE (ptest1 int, ptest2 inet, ptest3 int, ptest4 inet, PRIMARY KEY(ptest1, ptest2), FOREIGN KEY(ptest3, ptest4) REFERENCES pktable); NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index "pktable_pkey" for table "pktable" diff --git a/src/test/regress/expected/hash_index.out b/src/test/regress/expected/hash_index.out index 432c932480..22835f8ea4 100644 --- a/src/test/regress/expected/hash_index.out +++ b/src/test/regress/expected/hash_index.out @@ -108,10 +108,10 @@ SELECT h.seqno AS i1492, h.random AS i1 1492 | 1 (1 row) -UPDATE hash_i4_heap - SET seqno = 20000 +UPDATE hash_i4_heap + SET seqno = 20000 WHERE hash_i4_heap.random = 1492795354; -SELECT h.seqno AS i20000 +SELECT h.seqno AS i20000 FROM hash_i4_heap h WHERE h.random = 1492795354; i20000 @@ -119,7 +119,7 @@ SELECT h.seqno AS i20000 20000 (1 row) -UPDATE hash_name_heap +UPDATE hash_name_heap SET random = '0123456789abcdef'::name WHERE hash_name_heap.seqno = 6543; SELECT h.seqno AS i6543, h.random AS c0_to_f @@ -134,7 +134,7 @@ UPDATE hash_name_heap SET seqno = 20000 WHERE hash_name_heap.random = '76652222'::name; -- --- this is the row we just replaced; index scan should return zero rows +-- this is the row we just replaced; index scan should return zero rows -- SELECT h.seqno AS emptyset FROM hash_name_heap h @@ -143,7 +143,7 @@ SELECT h.seqno AS emptyset ---------- (0 rows) -UPDATE hash_txt_heap +UPDATE hash_txt_heap SET random = '0123456789abcdefghijklmnop'::text WHERE hash_txt_heap.seqno = 4002; SELECT h.seqno AS i4002, h.random AS c0_to_p @@ -168,7 +168,7 @@ SELECT h.seqno AS t20000 UPDATE hash_f8_heap SET random = '-1234.1234'::float8 WHERE hash_f8_heap.seqno = 8906; -SELECT h.seqno AS i8096, h.random AS f1234_1234 +SELECT h.seqno AS i8096, h.random AS f1234_1234 FROM hash_f8_heap h WHERE h.random = '-1234.1234'::float8; i8096 | f1234_1234 @@ -176,7 +176,7 @@ SELECT h.seqno AS i8096, h.random AS f1234_1234 8906 | -1234.1234 (1 row) -UPDATE hash_f8_heap +UPDATE hash_f8_heap SET seqno = 20000 WHERE hash_f8_heap.random = '488912369'::float8; SELECT h.seqno AS f20000 diff --git a/src/test/regress/expected/inet.out b/src/test/regress/expected/inet.out index abb59d4acf..356a397822 100644 --- a/src/test/regress/expected/inet.out +++ b/src/test/regress/expected/inet.out @@ -177,7 +177,7 @@ SELECT '' AS six, c AS cidr, i AS inet FROM INET_TBL (2 rows) SELECT '' AS ten, i, c, - i < c AS lt, i <= c AS le, i = c AS eq, + i < c AS lt, i <= c AS le, i = c AS eq, i >= c AS ge, i > c AS gt, i <> c AS ne, i << c AS sb, i <<= c AS sbe, i >> c AS sup, i >>= c AS spe diff --git a/src/test/regress/expected/inherit.out b/src/test/regress/expected/inherit.out index 581cc7d0e7..d59ca449dc 100644 --- a/src/test/regress/expected/inherit.out +++ b/src/test/regress/expected/inherit.out @@ -592,7 +592,7 @@ CREATE TABLE inhx (xx text DEFAULT 'text'); * Test double inheritance * * Ensure that defaults are NOT included unless - * INCLUDING DEFAULTS is specified + * INCLUDING DEFAULTS is specified */ CREATE TABLE inhe (ee text, LIKE inhx) inherits (b); INSERT INTO inhe VALUES ('ee-col1', 'ee-col2', DEFAULT, 'ee-col4'); diff --git a/src/test/regress/expected/int2.out b/src/test/regress/expected/int2.out index 80e6ed9fd6..021d476822 100644 --- a/src/test/regress/expected/int2.out +++ b/src/test/regress/expected/int2.out @@ -141,14 +141,14 @@ SELECT '' AS three, i.* FROM INT2_TBL i WHERE i.f1 >= int4 '0'; | 32767 (3 rows) --- positive odds +-- positive odds SELECT '' AS one, i.* FROM INT2_TBL i WHERE (i.f1 % int2 '2') = int2 '1'; one | f1 -----+------- | 32767 (1 row) --- any evens +-- any evens SELECT '' AS three, i.* FROM INT2_TBL i WHERE (i.f1 % int4 '2') = int2 '0'; three | f1 -------+------- diff --git a/src/test/regress/expected/int8-exp-three-digits.out b/src/test/regress/expected/int8-exp-three-digits.out index 2108d08d87..b523bfcc01 100644 --- a/src/test/regress/expected/int8-exp-three-digits.out +++ b/src/test/regress/expected/int8-exp-three-digits.out @@ -456,7 +456,7 @@ SELECT max(q1), max(q2) FROM INT8_TBL; -- TO_CHAR() -- -SELECT '' AS to_char_1, to_char(q1, '9G999G999G999G999G999'), to_char(q2, '9,999,999,999,999,999') +SELECT '' AS to_char_1, to_char(q1, '9G999G999G999G999G999'), to_char(q2, '9,999,999,999,999,999') FROM INT8_TBL; to_char_1 | to_char | to_char -----------+------------------------+------------------------ @@ -467,8 +467,8 @@ SELECT '' AS to_char_1, to_char(q1, '9G999G999G999G999G999'), to_char(q2, '9,999 | 4,567,890,123,456,789 | -4,567,890,123,456,789 (5 rows) -SELECT '' AS to_char_2, to_char(q1, '9G999G999G999G999G999D999G999'), to_char(q2, '9,999,999,999,999,999.999,999') - FROM INT8_TBL; +SELECT '' AS to_char_2, to_char(q1, '9G999G999G999G999G999D999G999'), to_char(q2, '9,999,999,999,999,999.999,999') + FROM INT8_TBL; to_char_2 | to_char | to_char -----------+--------------------------------+-------------------------------- | 123.000,000 | 456.000,000 @@ -478,7 +478,7 @@ SELECT '' AS to_char_2, to_char(q1, '9G999G999G999G999G999D999G999'), to_char(q2 | 4,567,890,123,456,789.000,000 | -4,567,890,123,456,789.000,000 (5 rows) -SELECT '' AS to_char_3, to_char( (q1 * -1), '9999999999999999PR'), to_char( (q2 * -1), '9999999999999999.999PR') +SELECT '' AS to_char_3, to_char( (q1 * -1), '9999999999999999PR'), to_char( (q2 * -1), '9999999999999999.999PR') FROM INT8_TBL; to_char_3 | to_char | to_char -----------+--------------------+------------------------ @@ -489,7 +489,7 @@ SELECT '' AS to_char_3, to_char( (q1 * -1), '9999999999999999PR'), to_char( (q2 | <4567890123456789> | 4567890123456789.000 (5 rows) -SELECT '' AS to_char_4, to_char( (q1 * -1), '9999999999999999S'), to_char( (q2 * -1), 'S9999999999999999') +SELECT '' AS to_char_4, to_char( (q1 * -1), '9999999999999999S'), to_char( (q2 * -1), 'S9999999999999999') FROM INT8_TBL; to_char_4 | to_char | to_char -----------+-------------------+------------------- @@ -500,7 +500,7 @@ SELECT '' AS to_char_4, to_char( (q1 * -1), '9999999999999999S'), to_char( (q2 * | 4567890123456789- | +4567890123456789 (5 rows) -SELECT '' AS to_char_5, to_char(q2, 'MI9999999999999999') FROM INT8_TBL; +SELECT '' AS to_char_5, to_char(q2, 'MI9999999999999999') FROM INT8_TBL; to_char_5 | to_char -----------+------------------- | 456 @@ -530,7 +530,7 @@ SELECT '' AS to_char_7, to_char(q2, 'FM9999999999999999THPR') FROM INT8_TBL; | <4567890123456789> (5 rows) -SELECT '' AS to_char_8, to_char(q2, 'SG9999999999999999th') FROM INT8_TBL; +SELECT '' AS to_char_8, to_char(q2, 'SG9999999999999999th') FROM INT8_TBL; to_char_8 | to_char -----------+--------------------- | + 456th @@ -540,7 +540,7 @@ SELECT '' AS to_char_8, to_char(q2, 'SG9999999999999999th') FROM INT8_TBL; | -4567890123456789 (5 rows) -SELECT '' AS to_char_9, to_char(q2, '0999999999999999') FROM INT8_TBL; +SELECT '' AS to_char_9, to_char(q2, '0999999999999999') FROM INT8_TBL; to_char_9 | to_char -----------+------------------- | 0000000000000456 @@ -550,7 +550,7 @@ SELECT '' AS to_char_9, to_char(q2, '0999999999999999') FROM INT8_TBL; | -4567890123456789 (5 rows) -SELECT '' AS to_char_10, to_char(q2, 'S0999999999999999') FROM INT8_TBL; +SELECT '' AS to_char_10, to_char(q2, 'S0999999999999999') FROM INT8_TBL; to_char_10 | to_char ------------+------------------- | +0000000000000456 @@ -560,7 +560,7 @@ SELECT '' AS to_char_10, to_char(q2, 'S0999999999999999') FROM INT8_TBL; | -4567890123456789 (5 rows) -SELECT '' AS to_char_11, to_char(q2, 'FM0999999999999999') FROM INT8_TBL; +SELECT '' AS to_char_11, to_char(q2, 'FM0999999999999999') FROM INT8_TBL; to_char_11 | to_char ------------+------------------- | 0000000000000456 @@ -580,7 +580,7 @@ SELECT '' AS to_char_12, to_char(q2, 'FM9999999999999999.000') FROM INT8_TBL; | -4567890123456789.000 (5 rows) -SELECT '' AS to_char_13, to_char(q2, 'L9999999999999999.000') FROM INT8_TBL; +SELECT '' AS to_char_13, to_char(q2, 'L9999999999999999.000') FROM INT8_TBL; to_char_13 | to_char ------------+------------------------ | 456.000 diff --git a/src/test/regress/expected/int8.out b/src/test/regress/expected/int8.out index 9272dd645f..811d6a5520 100644 --- a/src/test/regress/expected/int8.out +++ b/src/test/regress/expected/int8.out @@ -456,7 +456,7 @@ SELECT max(q1), max(q2) FROM INT8_TBL; -- TO_CHAR() -- -SELECT '' AS to_char_1, to_char(q1, '9G999G999G999G999G999'), to_char(q2, '9,999,999,999,999,999') +SELECT '' AS to_char_1, to_char(q1, '9G999G999G999G999G999'), to_char(q2, '9,999,999,999,999,999') FROM INT8_TBL; to_char_1 | to_char | to_char -----------+------------------------+------------------------ @@ -467,8 +467,8 @@ SELECT '' AS to_char_1, to_char(q1, '9G999G999G999G999G999'), to_char(q2, '9,999 | 4,567,890,123,456,789 | -4,567,890,123,456,789 (5 rows) -SELECT '' AS to_char_2, to_char(q1, '9G999G999G999G999G999D999G999'), to_char(q2, '9,999,999,999,999,999.999,999') - FROM INT8_TBL; +SELECT '' AS to_char_2, to_char(q1, '9G999G999G999G999G999D999G999'), to_char(q2, '9,999,999,999,999,999.999,999') + FROM INT8_TBL; to_char_2 | to_char | to_char -----------+--------------------------------+-------------------------------- | 123.000,000 | 456.000,000 @@ -478,7 +478,7 @@ SELECT '' AS to_char_2, to_char(q1, '9G999G999G999G999G999D999G999'), to_char(q2 | 4,567,890,123,456,789.000,000 | -4,567,890,123,456,789.000,000 (5 rows) -SELECT '' AS to_char_3, to_char( (q1 * -1), '9999999999999999PR'), to_char( (q2 * -1), '9999999999999999.999PR') +SELECT '' AS to_char_3, to_char( (q1 * -1), '9999999999999999PR'), to_char( (q2 * -1), '9999999999999999.999PR') FROM INT8_TBL; to_char_3 | to_char | to_char -----------+--------------------+------------------------ @@ -489,7 +489,7 @@ SELECT '' AS to_char_3, to_char( (q1 * -1), '9999999999999999PR'), to_char( (q2 | <4567890123456789> | 4567890123456789.000 (5 rows) -SELECT '' AS to_char_4, to_char( (q1 * -1), '9999999999999999S'), to_char( (q2 * -1), 'S9999999999999999') +SELECT '' AS to_char_4, to_char( (q1 * -1), '9999999999999999S'), to_char( (q2 * -1), 'S9999999999999999') FROM INT8_TBL; to_char_4 | to_char | to_char -----------+-------------------+------------------- @@ -500,7 +500,7 @@ SELECT '' AS to_char_4, to_char( (q1 * -1), '9999999999999999S'), to_char( (q2 * | 4567890123456789- | +4567890123456789 (5 rows) -SELECT '' AS to_char_5, to_char(q2, 'MI9999999999999999') FROM INT8_TBL; +SELECT '' AS to_char_5, to_char(q2, 'MI9999999999999999') FROM INT8_TBL; to_char_5 | to_char -----------+------------------- | 456 @@ -530,7 +530,7 @@ SELECT '' AS to_char_7, to_char(q2, 'FM9999999999999999THPR') FROM INT8_TBL; | <4567890123456789> (5 rows) -SELECT '' AS to_char_8, to_char(q2, 'SG9999999999999999th') FROM INT8_TBL; +SELECT '' AS to_char_8, to_char(q2, 'SG9999999999999999th') FROM INT8_TBL; to_char_8 | to_char -----------+--------------------- | + 456th @@ -540,7 +540,7 @@ SELECT '' AS to_char_8, to_char(q2, 'SG9999999999999999th') FROM INT8_TBL; | -4567890123456789 (5 rows) -SELECT '' AS to_char_9, to_char(q2, '0999999999999999') FROM INT8_TBL; +SELECT '' AS to_char_9, to_char(q2, '0999999999999999') FROM INT8_TBL; to_char_9 | to_char -----------+------------------- | 0000000000000456 @@ -550,7 +550,7 @@ SELECT '' AS to_char_9, to_char(q2, '0999999999999999') FROM INT8_TBL; | -4567890123456789 (5 rows) -SELECT '' AS to_char_10, to_char(q2, 'S0999999999999999') FROM INT8_TBL; +SELECT '' AS to_char_10, to_char(q2, 'S0999999999999999') FROM INT8_TBL; to_char_10 | to_char ------------+------------------- | +0000000000000456 @@ -560,7 +560,7 @@ SELECT '' AS to_char_10, to_char(q2, 'S0999999999999999') FROM INT8_TBL; | -4567890123456789 (5 rows) -SELECT '' AS to_char_11, to_char(q2, 'FM0999999999999999') FROM INT8_TBL; +SELECT '' AS to_char_11, to_char(q2, 'FM0999999999999999') FROM INT8_TBL; to_char_11 | to_char ------------+------------------- | 0000000000000456 @@ -580,7 +580,7 @@ SELECT '' AS to_char_12, to_char(q2, 'FM9999999999999999.000') FROM INT8_TBL; | -4567890123456789.000 (5 rows) -SELECT '' AS to_char_13, to_char(q2, 'L9999999999999999.000') FROM INT8_TBL; +SELECT '' AS to_char_13, to_char(q2, 'L9999999999999999.000') FROM INT8_TBL; to_char_13 | to_char ------------+------------------------ | 456.000 diff --git a/src/test/regress/expected/interval.out b/src/test/regress/expected/interval.out index a6f50b4622..e7e2181333 100644 --- a/src/test/regress/expected/interval.out +++ b/src/test/regress/expected/interval.out @@ -128,7 +128,7 @@ SELECT '' AS one, * FROM INTERVAL_TBL | 34 years (1 row) -SELECT '' AS five, * FROM INTERVAL_TBL +SELECT '' AS five, * FROM INTERVAL_TBL WHERE INTERVAL_TBL.f1 >= interval '@ 1 month'; five | f1 ------+----------------- @@ -208,11 +208,11 @@ SELECT '' AS fortyfive, r1.*, r2.* (45 rows) -- Test multiplication and division with intervals. --- Floating point arithmetic rounding errors can lead to unexpected results, --- though the code attempts to do the right thing and round up to days and --- minutes to avoid results such as '3 days 24:00 hours' or '14:20:60'. --- Note that it is expected for some day components to be greater than 29 and --- some time components be greater than 23:59:59 due to how intervals are +-- Floating point arithmetic rounding errors can lead to unexpected results, +-- though the code attempts to do the right thing and round up to days and +-- minutes to avoid results such as '3 days 24:00 hours' or '14:20:60'. +-- Note that it is expected for some day components to be greater than 29 and +-- some time components be greater than 23:59:59 due to how intervals are -- stored internally. CREATE TABLE INTERVAL_MULDIV_TBL (span interval); COPY INTERVAL_MULDIV_TBL FROM STDIN; @@ -753,7 +753,7 @@ select interval '1 year 2 mons 3 days 04:05:06.699999'; @ 1 year 2 mons 3 days 4 hours 5 mins 6.699999 secs (1 row) -select interval '0:0:0.7', interval '@ 0.70 secs', interval '0.7 seconds'; +select interval '0:0:0.7', interval '@ 0.70 secs', interval '0.7 seconds'; interval | interval | interval ------------+------------+------------ @ 0.7 secs | @ 0.7 secs | @ 0.7 secs diff --git a/src/test/regress/expected/limit.out b/src/test/regress/expected/limit.out index c33ebe0396..0c06ecba14 100644 --- a/src/test/regress/expected/limit.out +++ b/src/test/regress/expected/limit.out @@ -2,8 +2,8 @@ -- LIMIT -- Check the LIMIT/OFFSET feature of SELECT -- -SELECT ''::text AS two, unique1, unique2, stringu1 - FROM onek WHERE unique1 > 50 +SELECT ''::text AS two, unique1, unique2, stringu1 + FROM onek WHERE unique1 > 50 ORDER BY unique1 LIMIT 2; two | unique1 | unique2 | stringu1 -----+---------+---------+---------- @@ -11,8 +11,8 @@ SELECT ''::text AS two, unique1, unique2, stringu1 | 52 | 985 | ACAAAA (2 rows) -SELECT ''::text AS five, unique1, unique2, stringu1 - FROM onek WHERE unique1 > 60 +SELECT ''::text AS five, unique1, unique2, stringu1 + FROM onek WHERE unique1 > 60 ORDER BY unique1 LIMIT 5; five | unique1 | unique2 | stringu1 ------+---------+---------+---------- @@ -23,7 +23,7 @@ SELECT ''::text AS five, unique1, unique2, stringu1 | 65 | 64 | NCAAAA (5 rows) -SELECT ''::text AS two, unique1, unique2, stringu1 +SELECT ''::text AS two, unique1, unique2, stringu1 FROM onek WHERE unique1 > 60 AND unique1 < 63 ORDER BY unique1 LIMIT 5; two | unique1 | unique2 | stringu1 @@ -32,8 +32,8 @@ SELECT ''::text AS two, unique1, unique2, stringu1 | 62 | 633 | KCAAAA (2 rows) -SELECT ''::text AS three, unique1, unique2, stringu1 - FROM onek WHERE unique1 > 100 +SELECT ''::text AS three, unique1, unique2, stringu1 + FROM onek WHERE unique1 > 100 ORDER BY unique1 LIMIT 3 OFFSET 20; three | unique1 | unique2 | stringu1 -------+---------+---------+---------- @@ -42,15 +42,15 @@ SELECT ''::text AS three, unique1, unique2, stringu1 | 123 | 777 | TEAAAA (3 rows) -SELECT ''::text AS zero, unique1, unique2, stringu1 - FROM onek WHERE unique1 < 50 +SELECT ''::text AS zero, unique1, unique2, stringu1 + FROM onek WHERE unique1 < 50 ORDER BY unique1 DESC LIMIT 8 OFFSET 99; zero | unique1 | unique2 | stringu1 ------+---------+---------+---------- (0 rows) -SELECT ''::text AS eleven, unique1, unique2, stringu1 - FROM onek WHERE unique1 < 50 +SELECT ''::text AS eleven, unique1, unique2, stringu1 + FROM onek WHERE unique1 < 50 ORDER BY unique1 DESC LIMIT 20 OFFSET 39; eleven | unique1 | unique2 | stringu1 --------+---------+---------+---------- @@ -67,7 +67,7 @@ SELECT ''::text AS eleven, unique1, unique2, stringu1 | 0 | 998 | AAAAAA (11 rows) -SELECT ''::text AS ten, unique1, unique2, stringu1 +SELECT ''::text AS ten, unique1, unique2, stringu1 FROM onek ORDER BY unique1 OFFSET 990; ten | unique1 | unique2 | stringu1 @@ -84,7 +84,7 @@ SELECT ''::text AS ten, unique1, unique2, stringu1 | 999 | 152 | LMAAAA (10 rows) -SELECT ''::text AS five, unique1, unique2, stringu1 +SELECT ''::text AS five, unique1, unique2, stringu1 FROM onek ORDER BY unique1 OFFSET 990 LIMIT 5; five | unique1 | unique2 | stringu1 @@ -96,7 +96,7 @@ SELECT ''::text AS five, unique1, unique2, stringu1 | 994 | 695 | GMAAAA (5 rows) -SELECT ''::text AS five, unique1, unique2, stringu1 +SELECT ''::text AS five, unique1, unique2, stringu1 FROM onek ORDER BY unique1 LIMIT 5 OFFSET 900; five | unique1 | unique2 | stringu1 diff --git a/src/test/regress/expected/numeric.out b/src/test/regress/expected/numeric.out index 857e1d8319..d9927b7915 100644 --- a/src/test/regress/expected/numeric.out +++ b/src/test/regress/expected/numeric.out @@ -805,7 +805,7 @@ SELECT width_bucket('Infinity'::float8, 1, 10, 10), DROP TABLE width_bucket_test; -- TO_CHAR() -- -SELECT '' AS to_char_1, to_char(val, '9G999G999G999G999G999') +SELECT '' AS to_char_1, to_char(val, '9G999G999G999G999G999') FROM num_data; to_char_1 | to_char -----------+------------------------ @@ -869,7 +869,7 @@ SELECT '' AS to_char_4, to_char(val, '9999999999999999.999999999999999S') | 24926804.045047420000000- (10 rows) -SELECT '' AS to_char_5, to_char(val, 'MI9999999999999999.999999999999999') FROM num_data; +SELECT '' AS to_char_5, to_char(val, 'MI9999999999999999.999999999999999') FROM num_data; to_char_5 | to_char -----------+----------------------------------- | .000000000000000 @@ -914,7 +914,7 @@ SELECT '' AS to_char_7, to_char(val, 'FM9999999999999999.999999999999999THPR') | <24926804.04504742> (10 rows) -SELECT '' AS to_char_8, to_char(val, 'SG9999999999999999.999999999999999th') FROM num_data; +SELECT '' AS to_char_8, to_char(val, 'SG9999999999999999.999999999999999th') FROM num_data; to_char_8 | to_char -----------+----------------------------------- | + .000000000000000 @@ -929,7 +929,7 @@ SELECT '' AS to_char_8, to_char(val, 'SG9999999999999999.999999999999999th') | - 24926804.045047420000000 (10 rows) -SELECT '' AS to_char_9, to_char(val, '0999999999999999.999999999999999') FROM num_data; +SELECT '' AS to_char_9, to_char(val, '0999999999999999.999999999999999') FROM num_data; to_char_9 | to_char -----------+----------------------------------- | 0000000000000000.000000000000000 @@ -944,7 +944,7 @@ SELECT '' AS to_char_9, to_char(val, '0999999999999999.999999999999999') | -0000000024926804.045047420000000 (10 rows) -SELECT '' AS to_char_10, to_char(val, 'S0999999999999999.999999999999999') FROM num_data; +SELECT '' AS to_char_10, to_char(val, 'S0999999999999999.999999999999999') FROM num_data; to_char_10 | to_char ------------+----------------------------------- | +0000000000000000.000000000000000 @@ -959,7 +959,7 @@ SELECT '' AS to_char_10, to_char(val, 'S0999999999999999.999999999999999') | -0000000024926804.045047420000000 (10 rows) -SELECT '' AS to_char_11, to_char(val, 'FM0999999999999999.999999999999999') FROM num_data; +SELECT '' AS to_char_11, to_char(val, 'FM0999999999999999.999999999999999') FROM num_data; to_char_11 | to_char ------------+----------------------------- | 0000000000000000. @@ -1034,7 +1034,7 @@ SELECT '' AS to_char_15, to_char(val, 'FM9999999990999999.099999999999999') FRO | -24926804.04504742 (10 rows) -SELECT '' AS to_char_16, to_char(val, 'L9999999999999999.099999999999999') FROM num_data; +SELECT '' AS to_char_16, to_char(val, 'L9999999999999999.099999999999999') FROM num_data; to_char_16 | to_char ------------+------------------------------------ | .000000000000000 diff --git a/src/test/regress/expected/oid.out b/src/test/regress/expected/oid.out index 008b5a246b..1eab9cc935 100644 --- a/src/test/regress/expected/oid.out +++ b/src/test/regress/expected/oid.out @@ -11,7 +11,7 @@ INSERT INTO OID_TBL(f1) VALUES ('5 '); INSERT INTO OID_TBL(f1) VALUES (' 10 '); -- leading/trailing hard tab is also allowed INSERT INTO OID_TBL(f1) VALUES (' 15 '); --- bad inputs +-- bad inputs INSERT INTO OID_TBL(f1) VALUES (''); ERROR: invalid input syntax for type oid: "" LINE 1: INSERT INTO OID_TBL(f1) VALUES (''); diff --git a/src/test/regress/expected/oidjoins.out b/src/test/regress/expected/oidjoins.out index af1a801bc6..9fa0f845cf 100644 --- a/src/test/regress/expected/oidjoins.out +++ b/src/test/regress/expected/oidjoins.out @@ -1,953 +1,953 @@ -- -- This is created by pgsql/src/tools/findoidjoins/make_oidjoins_check -- -SELECT ctid, aggfnoid -FROM pg_catalog.pg_aggregate fk -WHERE aggfnoid != 0 AND +SELECT ctid, aggfnoid +FROM pg_catalog.pg_aggregate fk +WHERE aggfnoid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.aggfnoid); ctid | aggfnoid ------+---------- (0 rows) -SELECT ctid, aggtransfn -FROM pg_catalog.pg_aggregate fk -WHERE aggtransfn != 0 AND +SELECT ctid, aggtransfn +FROM pg_catalog.pg_aggregate fk +WHERE aggtransfn != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.aggtransfn); ctid | aggtransfn ------+------------ (0 rows) -SELECT ctid, aggfinalfn -FROM pg_catalog.pg_aggregate fk -WHERE aggfinalfn != 0 AND +SELECT ctid, aggfinalfn +FROM pg_catalog.pg_aggregate fk +WHERE aggfinalfn != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.aggfinalfn); ctid | aggfinalfn ------+------------ (0 rows) -SELECT ctid, aggsortop -FROM pg_catalog.pg_aggregate fk -WHERE aggsortop != 0 AND +SELECT ctid, aggsortop +FROM pg_catalog.pg_aggregate fk +WHERE aggsortop != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_operator pk WHERE pk.oid = fk.aggsortop); ctid | aggsortop ------+----------- (0 rows) -SELECT ctid, aggtranstype -FROM pg_catalog.pg_aggregate fk -WHERE aggtranstype != 0 AND +SELECT ctid, aggtranstype +FROM pg_catalog.pg_aggregate fk +WHERE aggtranstype != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.aggtranstype); ctid | aggtranstype ------+-------------- (0 rows) -SELECT ctid, amkeytype -FROM pg_catalog.pg_am fk -WHERE amkeytype != 0 AND +SELECT ctid, amkeytype +FROM pg_catalog.pg_am fk +WHERE amkeytype != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.amkeytype); ctid | amkeytype ------+----------- (0 rows) -SELECT ctid, aminsert -FROM pg_catalog.pg_am fk -WHERE aminsert != 0 AND +SELECT ctid, aminsert +FROM pg_catalog.pg_am fk +WHERE aminsert != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.aminsert); ctid | aminsert ------+---------- (0 rows) -SELECT ctid, ambeginscan -FROM pg_catalog.pg_am fk -WHERE ambeginscan != 0 AND +SELECT ctid, ambeginscan +FROM pg_catalog.pg_am fk +WHERE ambeginscan != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.ambeginscan); ctid | ambeginscan ------+------------- (0 rows) -SELECT ctid, amgettuple -FROM pg_catalog.pg_am fk -WHERE amgettuple != 0 AND +SELECT ctid, amgettuple +FROM pg_catalog.pg_am fk +WHERE amgettuple != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.amgettuple); ctid | amgettuple ------+------------ (0 rows) -SELECT ctid, amgetbitmap -FROM pg_catalog.pg_am fk -WHERE amgetbitmap != 0 AND +SELECT ctid, amgetbitmap +FROM pg_catalog.pg_am fk +WHERE amgetbitmap != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.amgetbitmap); ctid | amgetbitmap ------+------------- (0 rows) -SELECT ctid, amrescan -FROM pg_catalog.pg_am fk -WHERE amrescan != 0 AND +SELECT ctid, amrescan +FROM pg_catalog.pg_am fk +WHERE amrescan != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.amrescan); ctid | amrescan ------+---------- (0 rows) -SELECT ctid, amendscan -FROM pg_catalog.pg_am fk -WHERE amendscan != 0 AND +SELECT ctid, amendscan +FROM pg_catalog.pg_am fk +WHERE amendscan != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.amendscan); ctid | amendscan ------+----------- (0 rows) -SELECT ctid, ammarkpos -FROM pg_catalog.pg_am fk -WHERE ammarkpos != 0 AND +SELECT ctid, ammarkpos +FROM pg_catalog.pg_am fk +WHERE ammarkpos != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.ammarkpos); ctid | ammarkpos ------+----------- (0 rows) -SELECT ctid, amrestrpos -FROM pg_catalog.pg_am fk -WHERE amrestrpos != 0 AND +SELECT ctid, amrestrpos +FROM pg_catalog.pg_am fk +WHERE amrestrpos != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.amrestrpos); ctid | amrestrpos ------+------------ (0 rows) -SELECT ctid, ambuild -FROM pg_catalog.pg_am fk -WHERE ambuild != 0 AND +SELECT ctid, ambuild +FROM pg_catalog.pg_am fk +WHERE ambuild != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.ambuild); ctid | ambuild ------+--------- (0 rows) -SELECT ctid, ambulkdelete -FROM pg_catalog.pg_am fk -WHERE ambulkdelete != 0 AND +SELECT ctid, ambulkdelete +FROM pg_catalog.pg_am fk +WHERE ambulkdelete != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.ambulkdelete); ctid | ambulkdelete ------+-------------- (0 rows) -SELECT ctid, amvacuumcleanup -FROM pg_catalog.pg_am fk -WHERE amvacuumcleanup != 0 AND +SELECT ctid, amvacuumcleanup +FROM pg_catalog.pg_am fk +WHERE amvacuumcleanup != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.amvacuumcleanup); ctid | amvacuumcleanup ------+----------------- (0 rows) -SELECT ctid, amcostestimate -FROM pg_catalog.pg_am fk -WHERE amcostestimate != 0 AND +SELECT ctid, amcostestimate +FROM pg_catalog.pg_am fk +WHERE amcostestimate != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.amcostestimate); ctid | amcostestimate ------+---------------- (0 rows) -SELECT ctid, amoptions -FROM pg_catalog.pg_am fk -WHERE amoptions != 0 AND +SELECT ctid, amoptions +FROM pg_catalog.pg_am fk +WHERE amoptions != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.amoptions); ctid | amoptions ------+----------- (0 rows) -SELECT ctid, amopfamily -FROM pg_catalog.pg_amop fk -WHERE amopfamily != 0 AND +SELECT ctid, amopfamily +FROM pg_catalog.pg_amop fk +WHERE amopfamily != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_opfamily pk WHERE pk.oid = fk.amopfamily); ctid | amopfamily ------+------------ (0 rows) -SELECT ctid, amoplefttype -FROM pg_catalog.pg_amop fk -WHERE amoplefttype != 0 AND +SELECT ctid, amoplefttype +FROM pg_catalog.pg_amop fk +WHERE amoplefttype != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.amoplefttype); ctid | amoplefttype ------+-------------- (0 rows) -SELECT ctid, amoprighttype -FROM pg_catalog.pg_amop fk -WHERE amoprighttype != 0 AND +SELECT ctid, amoprighttype +FROM pg_catalog.pg_amop fk +WHERE amoprighttype != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.amoprighttype); ctid | amoprighttype ------+--------------- (0 rows) -SELECT ctid, amopopr -FROM pg_catalog.pg_amop fk -WHERE amopopr != 0 AND +SELECT ctid, amopopr +FROM pg_catalog.pg_amop fk +WHERE amopopr != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_operator pk WHERE pk.oid = fk.amopopr); ctid | amopopr ------+--------- (0 rows) -SELECT ctid, amopmethod -FROM pg_catalog.pg_amop fk -WHERE amopmethod != 0 AND +SELECT ctid, amopmethod +FROM pg_catalog.pg_amop fk +WHERE amopmethod != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_am pk WHERE pk.oid = fk.amopmethod); ctid | amopmethod ------+------------ (0 rows) -SELECT ctid, amprocfamily -FROM pg_catalog.pg_amproc fk -WHERE amprocfamily != 0 AND +SELECT ctid, amprocfamily +FROM pg_catalog.pg_amproc fk +WHERE amprocfamily != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_opfamily pk WHERE pk.oid = fk.amprocfamily); ctid | amprocfamily ------+-------------- (0 rows) -SELECT ctid, amproclefttype -FROM pg_catalog.pg_amproc fk -WHERE amproclefttype != 0 AND +SELECT ctid, amproclefttype +FROM pg_catalog.pg_amproc fk +WHERE amproclefttype != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.amproclefttype); ctid | amproclefttype ------+---------------- (0 rows) -SELECT ctid, amprocrighttype -FROM pg_catalog.pg_amproc fk -WHERE amprocrighttype != 0 AND +SELECT ctid, amprocrighttype +FROM pg_catalog.pg_amproc fk +WHERE amprocrighttype != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.amprocrighttype); ctid | amprocrighttype ------+----------------- (0 rows) -SELECT ctid, amproc -FROM pg_catalog.pg_amproc fk -WHERE amproc != 0 AND +SELECT ctid, amproc +FROM pg_catalog.pg_amproc fk +WHERE amproc != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.amproc); ctid | amproc ------+-------- (0 rows) -SELECT ctid, attrelid -FROM pg_catalog.pg_attribute fk -WHERE attrelid != 0 AND +SELECT ctid, attrelid +FROM pg_catalog.pg_attribute fk +WHERE attrelid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.attrelid); ctid | attrelid ------+---------- (0 rows) -SELECT ctid, atttypid -FROM pg_catalog.pg_attribute fk -WHERE atttypid != 0 AND +SELECT ctid, atttypid +FROM pg_catalog.pg_attribute fk +WHERE atttypid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.atttypid); ctid | atttypid ------+---------- (0 rows) -SELECT ctid, castsource -FROM pg_catalog.pg_cast fk -WHERE castsource != 0 AND +SELECT ctid, castsource +FROM pg_catalog.pg_cast fk +WHERE castsource != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.castsource); ctid | castsource ------+------------ (0 rows) -SELECT ctid, casttarget -FROM pg_catalog.pg_cast fk -WHERE casttarget != 0 AND +SELECT ctid, casttarget +FROM pg_catalog.pg_cast fk +WHERE casttarget != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.casttarget); ctid | casttarget ------+------------ (0 rows) -SELECT ctid, castfunc -FROM pg_catalog.pg_cast fk -WHERE castfunc != 0 AND +SELECT ctid, castfunc +FROM pg_catalog.pg_cast fk +WHERE castfunc != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.castfunc); ctid | castfunc ------+---------- (0 rows) -SELECT ctid, relnamespace -FROM pg_catalog.pg_class fk -WHERE relnamespace != 0 AND +SELECT ctid, relnamespace +FROM pg_catalog.pg_class fk +WHERE relnamespace != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_namespace pk WHERE pk.oid = fk.relnamespace); ctid | relnamespace ------+-------------- (0 rows) -SELECT ctid, reltype -FROM pg_catalog.pg_class fk -WHERE reltype != 0 AND +SELECT ctid, reltype +FROM pg_catalog.pg_class fk +WHERE reltype != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.reltype); ctid | reltype ------+--------- (0 rows) -SELECT ctid, relowner -FROM pg_catalog.pg_class fk -WHERE relowner != 0 AND +SELECT ctid, relowner +FROM pg_catalog.pg_class fk +WHERE relowner != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.relowner); ctid | relowner ------+---------- (0 rows) -SELECT ctid, relam -FROM pg_catalog.pg_class fk -WHERE relam != 0 AND +SELECT ctid, relam +FROM pg_catalog.pg_class fk +WHERE relam != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_am pk WHERE pk.oid = fk.relam); ctid | relam ------+------- (0 rows) -SELECT ctid, reltablespace -FROM pg_catalog.pg_class fk -WHERE reltablespace != 0 AND +SELECT ctid, reltablespace +FROM pg_catalog.pg_class fk +WHERE reltablespace != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_tablespace pk WHERE pk.oid = fk.reltablespace); ctid | reltablespace ------+--------------- (0 rows) -SELECT ctid, reltoastrelid -FROM pg_catalog.pg_class fk -WHERE reltoastrelid != 0 AND +SELECT ctid, reltoastrelid +FROM pg_catalog.pg_class fk +WHERE reltoastrelid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.reltoastrelid); ctid | reltoastrelid ------+--------------- (0 rows) -SELECT ctid, reltoastidxid -FROM pg_catalog.pg_class fk -WHERE reltoastidxid != 0 AND +SELECT ctid, reltoastidxid +FROM pg_catalog.pg_class fk +WHERE reltoastidxid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.reltoastidxid); ctid | reltoastidxid ------+--------------- (0 rows) -SELECT ctid, connamespace -FROM pg_catalog.pg_constraint fk -WHERE connamespace != 0 AND +SELECT ctid, connamespace +FROM pg_catalog.pg_constraint fk +WHERE connamespace != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_namespace pk WHERE pk.oid = fk.connamespace); ctid | connamespace ------+-------------- (0 rows) -SELECT ctid, contypid -FROM pg_catalog.pg_constraint fk -WHERE contypid != 0 AND +SELECT ctid, contypid +FROM pg_catalog.pg_constraint fk +WHERE contypid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.contypid); ctid | contypid ------+---------- (0 rows) -SELECT ctid, connamespace -FROM pg_catalog.pg_conversion fk -WHERE connamespace != 0 AND +SELECT ctid, connamespace +FROM pg_catalog.pg_conversion fk +WHERE connamespace != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_namespace pk WHERE pk.oid = fk.connamespace); ctid | connamespace ------+-------------- (0 rows) -SELECT ctid, conowner -FROM pg_catalog.pg_conversion fk -WHERE conowner != 0 AND +SELECT ctid, conowner +FROM pg_catalog.pg_conversion fk +WHERE conowner != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.conowner); ctid | conowner ------+---------- (0 rows) -SELECT ctid, conproc -FROM pg_catalog.pg_conversion fk -WHERE conproc != 0 AND +SELECT ctid, conproc +FROM pg_catalog.pg_conversion fk +WHERE conproc != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.conproc); ctid | conproc ------+--------- (0 rows) -SELECT ctid, datdba -FROM pg_catalog.pg_database fk -WHERE datdba != 0 AND +SELECT ctid, datdba +FROM pg_catalog.pg_database fk +WHERE datdba != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.datdba); ctid | datdba ------+-------- (0 rows) -SELECT ctid, dattablespace -FROM pg_catalog.pg_database fk -WHERE dattablespace != 0 AND +SELECT ctid, dattablespace +FROM pg_catalog.pg_database fk +WHERE dattablespace != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_tablespace pk WHERE pk.oid = fk.dattablespace); ctid | dattablespace ------+--------------- (0 rows) -SELECT ctid, setdatabase -FROM pg_catalog.pg_db_role_setting fk -WHERE setdatabase != 0 AND +SELECT ctid, setdatabase +FROM pg_catalog.pg_db_role_setting fk +WHERE setdatabase != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_database pk WHERE pk.oid = fk.setdatabase); ctid | setdatabase ------+------------- (0 rows) -SELECT ctid, classid -FROM pg_catalog.pg_depend fk -WHERE classid != 0 AND +SELECT ctid, classid +FROM pg_catalog.pg_depend fk +WHERE classid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.classid); ctid | classid ------+--------- (0 rows) -SELECT ctid, refclassid -FROM pg_catalog.pg_depend fk -WHERE refclassid != 0 AND +SELECT ctid, refclassid +FROM pg_catalog.pg_depend fk +WHERE refclassid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.refclassid); ctid | refclassid ------+------------ (0 rows) -SELECT ctid, classoid -FROM pg_catalog.pg_description fk -WHERE classoid != 0 AND +SELECT ctid, classoid +FROM pg_catalog.pg_description fk +WHERE classoid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.classoid); ctid | classoid ------+---------- (0 rows) -SELECT ctid, indexrelid -FROM pg_catalog.pg_index fk -WHERE indexrelid != 0 AND +SELECT ctid, indexrelid +FROM pg_catalog.pg_index fk +WHERE indexrelid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.indexrelid); ctid | indexrelid ------+------------ (0 rows) -SELECT ctid, indrelid -FROM pg_catalog.pg_index fk -WHERE indrelid != 0 AND +SELECT ctid, indrelid +FROM pg_catalog.pg_index fk +WHERE indrelid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.indrelid); ctid | indrelid ------+---------- (0 rows) -SELECT ctid, lanowner -FROM pg_catalog.pg_language fk -WHERE lanowner != 0 AND +SELECT ctid, lanowner +FROM pg_catalog.pg_language fk +WHERE lanowner != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.lanowner); ctid | lanowner ------+---------- (0 rows) -SELECT ctid, lanplcallfoid -FROM pg_catalog.pg_language fk -WHERE lanplcallfoid != 0 AND +SELECT ctid, lanplcallfoid +FROM pg_catalog.pg_language fk +WHERE lanplcallfoid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.lanplcallfoid); ctid | lanplcallfoid ------+--------------- (0 rows) -SELECT ctid, laninline -FROM pg_catalog.pg_language fk -WHERE laninline != 0 AND +SELECT ctid, laninline +FROM pg_catalog.pg_language fk +WHERE laninline != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.laninline); ctid | laninline ------+----------- (0 rows) -SELECT ctid, lanvalidator -FROM pg_catalog.pg_language fk -WHERE lanvalidator != 0 AND +SELECT ctid, lanvalidator +FROM pg_catalog.pg_language fk +WHERE lanvalidator != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.lanvalidator); ctid | lanvalidator ------+-------------- (0 rows) -SELECT ctid, nspowner -FROM pg_catalog.pg_namespace fk -WHERE nspowner != 0 AND +SELECT ctid, nspowner +FROM pg_catalog.pg_namespace fk +WHERE nspowner != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.nspowner); ctid | nspowner ------+---------- (0 rows) -SELECT ctid, opcmethod -FROM pg_catalog.pg_opclass fk -WHERE opcmethod != 0 AND +SELECT ctid, opcmethod +FROM pg_catalog.pg_opclass fk +WHERE opcmethod != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_am pk WHERE pk.oid = fk.opcmethod); ctid | opcmethod ------+----------- (0 rows) -SELECT ctid, opcnamespace -FROM pg_catalog.pg_opclass fk -WHERE opcnamespace != 0 AND +SELECT ctid, opcnamespace +FROM pg_catalog.pg_opclass fk +WHERE opcnamespace != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_namespace pk WHERE pk.oid = fk.opcnamespace); ctid | opcnamespace ------+-------------- (0 rows) -SELECT ctid, opcowner -FROM pg_catalog.pg_opclass fk -WHERE opcowner != 0 AND +SELECT ctid, opcowner +FROM pg_catalog.pg_opclass fk +WHERE opcowner != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.opcowner); ctid | opcowner ------+---------- (0 rows) -SELECT ctid, opcfamily -FROM pg_catalog.pg_opclass fk -WHERE opcfamily != 0 AND +SELECT ctid, opcfamily +FROM pg_catalog.pg_opclass fk +WHERE opcfamily != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_opfamily pk WHERE pk.oid = fk.opcfamily); ctid | opcfamily ------+----------- (0 rows) -SELECT ctid, opcintype -FROM pg_catalog.pg_opclass fk -WHERE opcintype != 0 AND +SELECT ctid, opcintype +FROM pg_catalog.pg_opclass fk +WHERE opcintype != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.opcintype); ctid | opcintype ------+----------- (0 rows) -SELECT ctid, opckeytype -FROM pg_catalog.pg_opclass fk -WHERE opckeytype != 0 AND +SELECT ctid, opckeytype +FROM pg_catalog.pg_opclass fk +WHERE opckeytype != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.opckeytype); ctid | opckeytype ------+------------ (0 rows) -SELECT ctid, oprnamespace -FROM pg_catalog.pg_operator fk -WHERE oprnamespace != 0 AND +SELECT ctid, oprnamespace +FROM pg_catalog.pg_operator fk +WHERE oprnamespace != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_namespace pk WHERE pk.oid = fk.oprnamespace); ctid | oprnamespace ------+-------------- (0 rows) -SELECT ctid, oprowner -FROM pg_catalog.pg_operator fk -WHERE oprowner != 0 AND +SELECT ctid, oprowner +FROM pg_catalog.pg_operator fk +WHERE oprowner != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.oprowner); ctid | oprowner ------+---------- (0 rows) -SELECT ctid, oprleft -FROM pg_catalog.pg_operator fk -WHERE oprleft != 0 AND +SELECT ctid, oprleft +FROM pg_catalog.pg_operator fk +WHERE oprleft != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.oprleft); ctid | oprleft ------+--------- (0 rows) -SELECT ctid, oprright -FROM pg_catalog.pg_operator fk -WHERE oprright != 0 AND +SELECT ctid, oprright +FROM pg_catalog.pg_operator fk +WHERE oprright != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.oprright); ctid | oprright ------+---------- (0 rows) -SELECT ctid, oprresult -FROM pg_catalog.pg_operator fk -WHERE oprresult != 0 AND +SELECT ctid, oprresult +FROM pg_catalog.pg_operator fk +WHERE oprresult != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.oprresult); ctid | oprresult ------+----------- (0 rows) -SELECT ctid, oprcom -FROM pg_catalog.pg_operator fk -WHERE oprcom != 0 AND +SELECT ctid, oprcom +FROM pg_catalog.pg_operator fk +WHERE oprcom != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_operator pk WHERE pk.oid = fk.oprcom); ctid | oprcom ------+-------- (0 rows) -SELECT ctid, oprnegate -FROM pg_catalog.pg_operator fk -WHERE oprnegate != 0 AND +SELECT ctid, oprnegate +FROM pg_catalog.pg_operator fk +WHERE oprnegate != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_operator pk WHERE pk.oid = fk.oprnegate); ctid | oprnegate ------+----------- (0 rows) -SELECT ctid, oprcode -FROM pg_catalog.pg_operator fk -WHERE oprcode != 0 AND +SELECT ctid, oprcode +FROM pg_catalog.pg_operator fk +WHERE oprcode != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.oprcode); ctid | oprcode ------+--------- (0 rows) -SELECT ctid, oprrest -FROM pg_catalog.pg_operator fk -WHERE oprrest != 0 AND +SELECT ctid, oprrest +FROM pg_catalog.pg_operator fk +WHERE oprrest != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.oprrest); ctid | oprrest ------+--------- (0 rows) -SELECT ctid, oprjoin -FROM pg_catalog.pg_operator fk -WHERE oprjoin != 0 AND +SELECT ctid, oprjoin +FROM pg_catalog.pg_operator fk +WHERE oprjoin != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.oprjoin); ctid | oprjoin ------+--------- (0 rows) -SELECT ctid, opfmethod -FROM pg_catalog.pg_opfamily fk -WHERE opfmethod != 0 AND +SELECT ctid, opfmethod +FROM pg_catalog.pg_opfamily fk +WHERE opfmethod != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_am pk WHERE pk.oid = fk.opfmethod); ctid | opfmethod ------+----------- (0 rows) -SELECT ctid, opfnamespace -FROM pg_catalog.pg_opfamily fk -WHERE opfnamespace != 0 AND +SELECT ctid, opfnamespace +FROM pg_catalog.pg_opfamily fk +WHERE opfnamespace != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_namespace pk WHERE pk.oid = fk.opfnamespace); ctid | opfnamespace ------+-------------- (0 rows) -SELECT ctid, opfowner -FROM pg_catalog.pg_opfamily fk -WHERE opfowner != 0 AND +SELECT ctid, opfowner +FROM pg_catalog.pg_opfamily fk +WHERE opfowner != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.opfowner); ctid | opfowner ------+---------- (0 rows) -SELECT ctid, pronamespace -FROM pg_catalog.pg_proc fk -WHERE pronamespace != 0 AND +SELECT ctid, pronamespace +FROM pg_catalog.pg_proc fk +WHERE pronamespace != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_namespace pk WHERE pk.oid = fk.pronamespace); ctid | pronamespace ------+-------------- (0 rows) -SELECT ctid, proowner -FROM pg_catalog.pg_proc fk -WHERE proowner != 0 AND +SELECT ctid, proowner +FROM pg_catalog.pg_proc fk +WHERE proowner != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.proowner); ctid | proowner ------+---------- (0 rows) -SELECT ctid, prolang -FROM pg_catalog.pg_proc fk -WHERE prolang != 0 AND +SELECT ctid, prolang +FROM pg_catalog.pg_proc fk +WHERE prolang != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_language pk WHERE pk.oid = fk.prolang); ctid | prolang ------+--------- (0 rows) -SELECT ctid, prorettype -FROM pg_catalog.pg_proc fk -WHERE prorettype != 0 AND +SELECT ctid, prorettype +FROM pg_catalog.pg_proc fk +WHERE prorettype != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.prorettype); ctid | prorettype ------+------------ (0 rows) -SELECT ctid, ev_class -FROM pg_catalog.pg_rewrite fk -WHERE ev_class != 0 AND +SELECT ctid, ev_class +FROM pg_catalog.pg_rewrite fk +WHERE ev_class != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.ev_class); ctid | ev_class ------+---------- (0 rows) -SELECT ctid, refclassid -FROM pg_catalog.pg_shdepend fk -WHERE refclassid != 0 AND +SELECT ctid, refclassid +FROM pg_catalog.pg_shdepend fk +WHERE refclassid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.refclassid); ctid | refclassid ------+------------ (0 rows) -SELECT ctid, classoid -FROM pg_catalog.pg_shdescription fk -WHERE classoid != 0 AND +SELECT ctid, classoid +FROM pg_catalog.pg_shdescription fk +WHERE classoid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.classoid); ctid | classoid ------+---------- (0 rows) -SELECT ctid, starelid -FROM pg_catalog.pg_statistic fk -WHERE starelid != 0 AND +SELECT ctid, starelid +FROM pg_catalog.pg_statistic fk +WHERE starelid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.starelid); ctid | starelid ------+---------- (0 rows) -SELECT ctid, staop1 -FROM pg_catalog.pg_statistic fk -WHERE staop1 != 0 AND +SELECT ctid, staop1 +FROM pg_catalog.pg_statistic fk +WHERE staop1 != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_operator pk WHERE pk.oid = fk.staop1); ctid | staop1 ------+-------- (0 rows) -SELECT ctid, staop2 -FROM pg_catalog.pg_statistic fk -WHERE staop2 != 0 AND +SELECT ctid, staop2 +FROM pg_catalog.pg_statistic fk +WHERE staop2 != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_operator pk WHERE pk.oid = fk.staop2); ctid | staop2 ------+-------- (0 rows) -SELECT ctid, staop3 -FROM pg_catalog.pg_statistic fk -WHERE staop3 != 0 AND +SELECT ctid, staop3 +FROM pg_catalog.pg_statistic fk +WHERE staop3 != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_operator pk WHERE pk.oid = fk.staop3); ctid | staop3 ------+-------- (0 rows) -SELECT ctid, spcowner -FROM pg_catalog.pg_tablespace fk -WHERE spcowner != 0 AND +SELECT ctid, spcowner +FROM pg_catalog.pg_tablespace fk +WHERE spcowner != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.spcowner); ctid | spcowner ------+---------- (0 rows) -SELECT ctid, cfgnamespace -FROM pg_catalog.pg_ts_config fk -WHERE cfgnamespace != 0 AND +SELECT ctid, cfgnamespace +FROM pg_catalog.pg_ts_config fk +WHERE cfgnamespace != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_namespace pk WHERE pk.oid = fk.cfgnamespace); ctid | cfgnamespace ------+-------------- (0 rows) -SELECT ctid, cfgowner -FROM pg_catalog.pg_ts_config fk -WHERE cfgowner != 0 AND +SELECT ctid, cfgowner +FROM pg_catalog.pg_ts_config fk +WHERE cfgowner != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.cfgowner); ctid | cfgowner ------+---------- (0 rows) -SELECT ctid, cfgparser -FROM pg_catalog.pg_ts_config fk -WHERE cfgparser != 0 AND +SELECT ctid, cfgparser +FROM pg_catalog.pg_ts_config fk +WHERE cfgparser != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_ts_parser pk WHERE pk.oid = fk.cfgparser); ctid | cfgparser ------+----------- (0 rows) -SELECT ctid, mapcfg -FROM pg_catalog.pg_ts_config_map fk -WHERE mapcfg != 0 AND +SELECT ctid, mapcfg +FROM pg_catalog.pg_ts_config_map fk +WHERE mapcfg != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_ts_config pk WHERE pk.oid = fk.mapcfg); ctid | mapcfg ------+-------- (0 rows) -SELECT ctid, mapdict -FROM pg_catalog.pg_ts_config_map fk -WHERE mapdict != 0 AND +SELECT ctid, mapdict +FROM pg_catalog.pg_ts_config_map fk +WHERE mapdict != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_ts_dict pk WHERE pk.oid = fk.mapdict); ctid | mapdict ------+--------- (0 rows) -SELECT ctid, dictnamespace -FROM pg_catalog.pg_ts_dict fk -WHERE dictnamespace != 0 AND +SELECT ctid, dictnamespace +FROM pg_catalog.pg_ts_dict fk +WHERE dictnamespace != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_namespace pk WHERE pk.oid = fk.dictnamespace); ctid | dictnamespace ------+--------------- (0 rows) -SELECT ctid, dictowner -FROM pg_catalog.pg_ts_dict fk -WHERE dictowner != 0 AND +SELECT ctid, dictowner +FROM pg_catalog.pg_ts_dict fk +WHERE dictowner != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.dictowner); ctid | dictowner ------+----------- (0 rows) -SELECT ctid, dicttemplate -FROM pg_catalog.pg_ts_dict fk -WHERE dicttemplate != 0 AND +SELECT ctid, dicttemplate +FROM pg_catalog.pg_ts_dict fk +WHERE dicttemplate != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_ts_template pk WHERE pk.oid = fk.dicttemplate); ctid | dicttemplate ------+-------------- (0 rows) -SELECT ctid, prsnamespace -FROM pg_catalog.pg_ts_parser fk -WHERE prsnamespace != 0 AND +SELECT ctid, prsnamespace +FROM pg_catalog.pg_ts_parser fk +WHERE prsnamespace != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_namespace pk WHERE pk.oid = fk.prsnamespace); ctid | prsnamespace ------+-------------- (0 rows) -SELECT ctid, prsstart -FROM pg_catalog.pg_ts_parser fk -WHERE prsstart != 0 AND +SELECT ctid, prsstart +FROM pg_catalog.pg_ts_parser fk +WHERE prsstart != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.prsstart); ctid | prsstart ------+---------- (0 rows) -SELECT ctid, prstoken -FROM pg_catalog.pg_ts_parser fk -WHERE prstoken != 0 AND +SELECT ctid, prstoken +FROM pg_catalog.pg_ts_parser fk +WHERE prstoken != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.prstoken); ctid | prstoken ------+---------- (0 rows) -SELECT ctid, prsend -FROM pg_catalog.pg_ts_parser fk -WHERE prsend != 0 AND +SELECT ctid, prsend +FROM pg_catalog.pg_ts_parser fk +WHERE prsend != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.prsend); ctid | prsend ------+-------- (0 rows) -SELECT ctid, prsheadline -FROM pg_catalog.pg_ts_parser fk -WHERE prsheadline != 0 AND +SELECT ctid, prsheadline +FROM pg_catalog.pg_ts_parser fk +WHERE prsheadline != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.prsheadline); ctid | prsheadline ------+------------- (0 rows) -SELECT ctid, prslextype -FROM pg_catalog.pg_ts_parser fk -WHERE prslextype != 0 AND +SELECT ctid, prslextype +FROM pg_catalog.pg_ts_parser fk +WHERE prslextype != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.prslextype); ctid | prslextype ------+------------ (0 rows) -SELECT ctid, tmplnamespace -FROM pg_catalog.pg_ts_template fk -WHERE tmplnamespace != 0 AND +SELECT ctid, tmplnamespace +FROM pg_catalog.pg_ts_template fk +WHERE tmplnamespace != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_namespace pk WHERE pk.oid = fk.tmplnamespace); ctid | tmplnamespace ------+--------------- (0 rows) -SELECT ctid, tmplinit -FROM pg_catalog.pg_ts_template fk -WHERE tmplinit != 0 AND +SELECT ctid, tmplinit +FROM pg_catalog.pg_ts_template fk +WHERE tmplinit != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.tmplinit); ctid | tmplinit ------+---------- (0 rows) -SELECT ctid, tmpllexize -FROM pg_catalog.pg_ts_template fk -WHERE tmpllexize != 0 AND +SELECT ctid, tmpllexize +FROM pg_catalog.pg_ts_template fk +WHERE tmpllexize != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.tmpllexize); ctid | tmpllexize ------+------------ (0 rows) -SELECT ctid, typnamespace -FROM pg_catalog.pg_type fk -WHERE typnamespace != 0 AND +SELECT ctid, typnamespace +FROM pg_catalog.pg_type fk +WHERE typnamespace != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_namespace pk WHERE pk.oid = fk.typnamespace); ctid | typnamespace ------+-------------- (0 rows) -SELECT ctid, typowner -FROM pg_catalog.pg_type fk -WHERE typowner != 0 AND +SELECT ctid, typowner +FROM pg_catalog.pg_type fk +WHERE typowner != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.typowner); ctid | typowner ------+---------- (0 rows) -SELECT ctid, typrelid -FROM pg_catalog.pg_type fk -WHERE typrelid != 0 AND +SELECT ctid, typrelid +FROM pg_catalog.pg_type fk +WHERE typrelid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.typrelid); ctid | typrelid ------+---------- (0 rows) -SELECT ctid, typelem -FROM pg_catalog.pg_type fk -WHERE typelem != 0 AND +SELECT ctid, typelem +FROM pg_catalog.pg_type fk +WHERE typelem != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.typelem); ctid | typelem ------+--------- (0 rows) -SELECT ctid, typarray -FROM pg_catalog.pg_type fk -WHERE typarray != 0 AND +SELECT ctid, typarray +FROM pg_catalog.pg_type fk +WHERE typarray != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.typarray); ctid | typarray ------+---------- (0 rows) -SELECT ctid, typinput -FROM pg_catalog.pg_type fk -WHERE typinput != 0 AND +SELECT ctid, typinput +FROM pg_catalog.pg_type fk +WHERE typinput != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.typinput); ctid | typinput ------+---------- (0 rows) -SELECT ctid, typoutput -FROM pg_catalog.pg_type fk -WHERE typoutput != 0 AND +SELECT ctid, typoutput +FROM pg_catalog.pg_type fk +WHERE typoutput != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.typoutput); ctid | typoutput ------+----------- (0 rows) -SELECT ctid, typreceive -FROM pg_catalog.pg_type fk -WHERE typreceive != 0 AND +SELECT ctid, typreceive +FROM pg_catalog.pg_type fk +WHERE typreceive != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.typreceive); ctid | typreceive ------+------------ (0 rows) -SELECT ctid, typsend -FROM pg_catalog.pg_type fk -WHERE typsend != 0 AND +SELECT ctid, typsend +FROM pg_catalog.pg_type fk +WHERE typsend != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.typsend); ctid | typsend ------+--------- (0 rows) -SELECT ctid, typmodin -FROM pg_catalog.pg_type fk -WHERE typmodin != 0 AND +SELECT ctid, typmodin +FROM pg_catalog.pg_type fk +WHERE typmodin != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.typmodin); ctid | typmodin ------+---------- (0 rows) -SELECT ctid, typmodout -FROM pg_catalog.pg_type fk -WHERE typmodout != 0 AND +SELECT ctid, typmodout +FROM pg_catalog.pg_type fk +WHERE typmodout != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.typmodout); ctid | typmodout ------+----------- (0 rows) -SELECT ctid, typanalyze -FROM pg_catalog.pg_type fk -WHERE typanalyze != 0 AND +SELECT ctid, typanalyze +FROM pg_catalog.pg_type fk +WHERE typanalyze != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.typanalyze); ctid | typanalyze ------+------------ (0 rows) -SELECT ctid, typbasetype -FROM pg_catalog.pg_type fk -WHERE typbasetype != 0 AND +SELECT ctid, typbasetype +FROM pg_catalog.pg_type fk +WHERE typbasetype != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.typbasetype); ctid | typbasetype ------+------------- diff --git a/src/test/regress/expected/plpgsql.out b/src/test/regress/expected/plpgsql.out index a02da98011..22ccce212c 100644 --- a/src/test/regress/expected/plpgsql.out +++ b/src/test/regress/expected/plpgsql.out @@ -3220,7 +3220,7 @@ NOTICE: 6 drop function exc_using(int, text); create or replace function exc_using(int) returns void as $$ -declare +declare c refcursor; i int; begin @@ -3231,7 +3231,7 @@ begin raise notice '%', i; end loop; close c; - return; + return; end; $$ language plpgsql; select exc_using(5); diff --git a/src/test/regress/expected/point.out b/src/test/regress/expected/point.out index 278837d091..7929229b16 100644 --- a/src/test/regress/expected/point.out +++ b/src/test/regress/expected/point.out @@ -7,7 +7,7 @@ INSERT INTO POINT_TBL(f1) VALUES ('(-10.0,0.0)'); INSERT INTO POINT_TBL(f1) VALUES ('(-3.0,4.0)'); INSERT INTO POINT_TBL(f1) VALUES ('(5.1, 34.5)'); INSERT INTO POINT_TBL(f1) VALUES ('(-5.0,-12.0)'); --- bad format points +-- bad format points INSERT INTO POINT_TBL(f1) VALUES ('asdfasdf'); ERROR: invalid input syntax for type point: "asdfasdf" LINE 1: INSERT INTO POINT_TBL(f1) VALUES ('asdfasdf'); @@ -32,7 +32,7 @@ SELECT '' AS six, * FROM POINT_TBL; | (10,10) (6 rows) --- left of +-- left of SELECT '' AS three, p.* FROM POINT_TBL p WHERE p.f1 << '(0.0, 0.0)'; three | f1 -------+---------- @@ -41,7 +41,7 @@ SELECT '' AS three, p.* FROM POINT_TBL p WHERE p.f1 << '(0.0, 0.0)'; | (-5,-12) (3 rows) --- right of +-- right of SELECT '' AS three, p.* FROM POINT_TBL p WHERE '(0.0,0.0)' >> p.f1; three | f1 -------+---------- @@ -50,28 +50,28 @@ SELECT '' AS three, p.* FROM POINT_TBL p WHERE '(0.0,0.0)' >> p.f1; | (-5,-12) (3 rows) --- above +-- above SELECT '' AS one, p.* FROM POINT_TBL p WHERE '(0.0,0.0)' >^ p.f1; one | f1 -----+---------- | (-5,-12) (1 row) --- below +-- below SELECT '' AS one, p.* FROM POINT_TBL p WHERE p.f1 <^ '(0.0, 0.0)'; one | f1 -----+---------- | (-5,-12) (1 row) --- equal +-- equal SELECT '' AS one, p.* FROM POINT_TBL p WHERE p.f1 ~= '(5.1, 34.5)'; one | f1 -----+------------ | (5.1,34.5) (1 row) --- point in box +-- point in box SELECT '' AS three, p.* FROM POINT_TBL p WHERE p.f1 <@ box '(0,0,100,100)'; three | f1 @@ -235,7 +235,7 @@ SELECT '' AS fifteen, p1.f1 AS point1, p2.f1 AS point2, (p1.f1 <-> p2.f1) AS dis -- put distance result into output to allow sorting with GEQ optimizer - tgl 97/05/10 SELECT '' AS three, p1.f1 AS point1, p2.f1 AS point2, (p1.f1 <-> p2.f1) AS distance - FROM POINT_TBL p1, POINT_TBL p2 + FROM POINT_TBL p1, POINT_TBL p2 WHERE (p1.f1 <-> p2.f1) > 3 and p1.f1 << p2.f1 and p1.f1 >^ p2.f1 ORDER BY distance; three | point1 | point2 | distance diff --git a/src/test/regress/expected/polygon.out b/src/test/regress/expected/polygon.out index 7e0ae24266..b252902720 100644 --- a/src/test/regress/expected/polygon.out +++ b/src/test/regress/expected/polygon.out @@ -16,10 +16,10 @@ CREATE TABLE POLYGON_TBL(f1 polygon); INSERT INTO POLYGON_TBL(f1) VALUES ('(2.0,0.0),(2.0,4.0),(0.0,0.0)'); INSERT INTO POLYGON_TBL(f1) VALUES ('(3.0,1.0),(3.0,3.0),(1.0,0.0)'); --- degenerate polygons +-- degenerate polygons INSERT INTO POLYGON_TBL(f1) VALUES ('(0.0,0.0)'); INSERT INTO POLYGON_TBL(f1) VALUES ('(0.0,1.0),(0.0,1.0)'); --- bad polygon input strings +-- bad polygon input strings INSERT INTO POLYGON_TBL(f1) VALUES ('0.0'); ERROR: invalid input syntax for type polygon: "0.0" LINE 1: INSERT INTO POLYGON_TBL(f1) VALUES ('0.0'); @@ -49,7 +49,7 @@ SELECT '' AS four, * FROM POLYGON_TBL; | ((0,1),(0,1)) (4 rows) --- overlap +-- overlap SELECT '' AS three, p.* FROM POLYGON_TBL p WHERE p.f1 && '(3.0,1.0),(3.0,3.0),(1.0,0.0)'; @@ -59,8 +59,8 @@ SELECT '' AS three, p.* | ((3,1),(3,3),(1,0)) (2 rows) --- left overlap -SELECT '' AS four, p.* +-- left overlap +SELECT '' AS four, p.* FROM POLYGON_TBL p WHERE p.f1 &< '(3.0,1.0),(3.0,3.0),(1.0,0.0)'; four | f1 @@ -71,8 +71,8 @@ SELECT '' AS four, p.* | ((0,1),(0,1)) (4 rows) --- right overlap -SELECT '' AS two, p.* +-- right overlap +SELECT '' AS two, p.* FROM POLYGON_TBL p WHERE p.f1 &> '(3.0,1.0),(3.0,3.0),(1.0,0.0)'; two | f1 @@ -80,7 +80,7 @@ SELECT '' AS two, p.* | ((3,1),(3,3),(1,0)) (1 row) --- left of +-- left of SELECT '' AS one, p.* FROM POLYGON_TBL p WHERE p.f1 << '(3.0,1.0),(3.0,3.0),(1.0,0.0)'; @@ -90,7 +90,7 @@ SELECT '' AS one, p.* | ((0,1),(0,1)) (2 rows) --- right of +-- right of SELECT '' AS zero, p.* FROM POLYGON_TBL p WHERE p.f1 >> '(3.0,1.0),(3.0,3.0),(1.0,0.0)'; @@ -98,8 +98,8 @@ SELECT '' AS zero, p.* ------+---- (0 rows) --- contained -SELECT '' AS one, p.* +-- contained +SELECT '' AS one, p.* FROM POLYGON_TBL p WHERE p.f1 <@ polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)'; one | f1 @@ -107,7 +107,7 @@ SELECT '' AS one, p.* | ((3,1),(3,3),(1,0)) (1 row) --- same +-- same SELECT '' AS one, p.* FROM POLYGON_TBL p WHERE p.f1 ~= polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)'; @@ -116,7 +116,7 @@ SELECT '' AS one, p.* | ((3,1),(3,3),(1,0)) (1 row) --- contains +-- contains SELECT '' AS one, p.* FROM POLYGON_TBL p WHERE p.f1 @> polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)'; @@ -138,42 +138,42 @@ SELECT '' AS one, p.* -- -- 0 1 2 3 4 -- --- left of +-- left of SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' << polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)' AS false; false ------- f (1 row) --- left overlap +-- left overlap SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' << polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)' AS true; true ------ f (1 row) --- right overlap +-- right overlap SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' &> polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)' AS false; false ------- f (1 row) --- right of +-- right of SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' >> polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)' AS false; false ------- f (1 row) --- contained in +-- contained in SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' <@ polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)' AS false; false ------- f (1 row) --- contains +-- contains SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' @> polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)' AS false; false ------- @@ -182,7 +182,7 @@ SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' @> polygon '(3.0,1.0),(3.0,3.0),( -- +------------------------+ -- | *---* 1 --- | + | | +-- | + | | -- | 2 *---* -- +------------------------+ -- 3 @@ -195,10 +195,10 @@ SELECT '((0,4),(6,4),(1,2),(6,0),(0,0))'::polygon @> '((2,1),(2,3),(3,3),(3,1))' (1 row) -- +-----------+ --- | *---* / --- | | |/ --- | | + --- | | |\ +-- | *---* / +-- | | |/ +-- | | + +-- | | |\ -- | *---* \ -- +-----------+ SELECT '((0,4),(6,4),(3,2),(6,0),(0,0))'::polygon @> '((2,1),(2,3),(3,3),(3,1))'::polygon AS "true"; @@ -233,14 +233,14 @@ SELECT '((0,0),(0,3),(3,3),(3,0))'::polygon @> '((2,1),(2,2),(3,2),(3,1))'::poly t (1 row) --- same +-- same SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' ~= polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)' AS false; false ------- f (1 row) --- overlap +-- overlap SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' && polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)' AS true; true ------ @@ -249,7 +249,7 @@ SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' && polygon '(3.0,1.0),(3.0,3.0),( -- +--------------------+ -- | *---* 1 --- | + | | +-- | + | | -- | 2 *---* -- +--------------------+ -- 3 diff --git a/src/test/regress/expected/portals.out b/src/test/regress/expected/portals.out index be7348d6b2..01152a939d 100644 --- a/src/test/regress/expected/portals.out +++ b/src/test/regress/expected/portals.out @@ -1244,16 +1244,16 @@ ERROR: WHERE CURRENT OF on a view is not implemented ROLLBACK; -- Make sure snapshot management works okay, per bug report in -- 235395b90909301035v7228ce63q392931f15aa74b31@mail.gmail.com -BEGIN; -SET TRANSACTION ISOLATION LEVEL SERIALIZABLE; -CREATE TABLE cursor (a int); -INSERT INTO cursor VALUES (1); -DECLARE c1 NO SCROLL CURSOR FOR SELECT * FROM cursor FOR UPDATE; -UPDATE cursor SET a = 2; -FETCH ALL FROM c1; +BEGIN; +SET TRANSACTION ISOLATION LEVEL SERIALIZABLE; +CREATE TABLE cursor (a int); +INSERT INTO cursor VALUES (1); +DECLARE c1 NO SCROLL CURSOR FOR SELECT * FROM cursor FOR UPDATE; +UPDATE cursor SET a = 2; +FETCH ALL FROM c1; a --- (0 rows) -COMMIT; +COMMIT; DROP TABLE cursor; diff --git a/src/test/regress/expected/portals_p2.out b/src/test/regress/expected/portals_p2.out index 7a9cf69674..1e2365a2a6 100644 --- a/src/test/regress/expected/portals_p2.out +++ b/src/test/regress/expected/portals_p2.out @@ -2,31 +2,31 @@ -- PORTALS_P2 -- BEGIN; -DECLARE foo13 CURSOR FOR +DECLARE foo13 CURSOR FOR SELECT * FROM onek WHERE unique1 = 50; -DECLARE foo14 CURSOR FOR +DECLARE foo14 CURSOR FOR SELECT * FROM onek WHERE unique1 = 51; -DECLARE foo15 CURSOR FOR +DECLARE foo15 CURSOR FOR SELECT * FROM onek WHERE unique1 = 52; -DECLARE foo16 CURSOR FOR +DECLARE foo16 CURSOR FOR SELECT * FROM onek WHERE unique1 = 53; -DECLARE foo17 CURSOR FOR +DECLARE foo17 CURSOR FOR SELECT * FROM onek WHERE unique1 = 54; -DECLARE foo18 CURSOR FOR +DECLARE foo18 CURSOR FOR SELECT * FROM onek WHERE unique1 = 55; -DECLARE foo19 CURSOR FOR +DECLARE foo19 CURSOR FOR SELECT * FROM onek WHERE unique1 = 56; -DECLARE foo20 CURSOR FOR +DECLARE foo20 CURSOR FOR SELECT * FROM onek WHERE unique1 = 57; -DECLARE foo21 CURSOR FOR +DECLARE foo21 CURSOR FOR SELECT * FROM onek WHERE unique1 = 58; -DECLARE foo22 CURSOR FOR +DECLARE foo22 CURSOR FOR SELECT * FROM onek WHERE unique1 = 59; -DECLARE foo23 CURSOR FOR +DECLARE foo23 CURSOR FOR SELECT * FROM onek WHERE unique1 = 60; -DECLARE foo24 CURSOR FOR +DECLARE foo24 CURSOR FOR SELECT * FROM onek2 WHERE unique1 = 50; -DECLARE foo25 CURSOR FOR +DECLARE foo25 CURSOR FOR SELECT * FROM onek2 WHERE unique1 = 60; FETCH all in foo13; unique1 | unique2 | two | four | ten | twenty | hundred | thousand | twothousand | fivethous | tenthous | odd | even | stringu1 | stringu2 | string4 diff --git a/src/test/regress/expected/rules.out b/src/test/regress/expected/rules.out index be65be91dd..5673f72173 100644 --- a/src/test/regress/expected/rules.out +++ b/src/test/regress/expected/rules.out @@ -35,9 +35,9 @@ create table rtest_interface (sysname text, ifname text); create table rtest_person (pname text, pdesc text); create table rtest_admin (pname text, sysname text); create rule rtest_sys_upd as on update to rtest_system do also ( - update rtest_interface set sysname = new.sysname + update rtest_interface set sysname = new.sysname where sysname = old.sysname; - update rtest_admin set sysname = new.sysname + update rtest_admin set sysname = new.sysname where sysname = old.sysname ); create rule rtest_sys_del as on delete to rtest_system do also ( @@ -65,7 +65,7 @@ create rule rtest_emp_del as on delete to rtest_emp do 'fired', '0.00', old.salary); -- -- Tables and rules for the multiple cascaded qualified instead --- rule test +-- rule test -- create table rtest_t4 (a int4, b text); create table rtest_t5 (a int4, b text); @@ -753,7 +753,7 @@ create table rtest_view1 (a int4, b text, v bool); create table rtest_view2 (a int4); create table rtest_view3 (a int4, b text); create table rtest_view4 (a int4, b text, c int4); -create view rtest_vview1 as select a, b from rtest_view1 X +create view rtest_vview1 as select a, b from rtest_view1 X where 0 < (select count(*) from rtest_view2 Y where Y.a = X.a); create view rtest_vview2 as select a, b from rtest_view1 where v; create view rtest_vview3 as select a, b from rtest_vview2 X @@ -896,7 +896,7 @@ create table rtest_unitfact ( unit char(4), factor float ); -create view rtest_vcomp as +create view rtest_vcomp as select X.part, (X.size * Y.factor) as size_in_cm from rtest_comp X, rtest_unitfact Y where X.unit = Y.unit; @@ -1227,7 +1227,7 @@ create rule rrule as on update to vview do instead ( insert into cchild (pid, descrip) - select old.pid, new.descrip where old.descrip isnull; + select old.pid, new.descrip where old.descrip isnull; update cchild set descrip = new.descrip where cchild.pid = old.pid; ); select * from vview; @@ -1336,7 +1336,7 @@ SELECT viewname, definition FROM pg_views WHERE schemaname <> 'information_schem toyemp | SELECT emp.name, emp.age, emp.location, (12 * emp.salary) AS annualsal FROM emp; (56 rows) -SELECT tablename, rulename, definition FROM pg_rules +SELECT tablename, rulename, definition FROM pg_rules ORDER BY tablename, rulename; tablename | rulename | definition ---------------+-----------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -1394,14 +1394,12 @@ SELECT * FROM ruletest_tbl2; create table rule_and_refint_t1 ( id1a integer, id1b integer, - primary key (id1a, id1b) ); NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index "rule_and_refint_t1_pkey" for table "rule_and_refint_t1" create table rule_and_refint_t2 ( id2a integer, id2c integer, - primary key (id2a, id2c) ); NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index "rule_and_refint_t2_pkey" for table "rule_and_refint_t2" @@ -1517,11 +1515,11 @@ create temp table t1 (a integer primary key); NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index "t1_pkey" for table "t1" create temp table t1_1 (check (a >= 0 and a < 10)) inherits (t1); create temp table t1_2 (check (a >= 10 and a < 20)) inherits (t1); -create rule t1_ins_1 as on insert to t1 +create rule t1_ins_1 as on insert to t1 where new.a >= 0 and new.a < 10 do instead insert into t1_1 values (new.a); -create rule t1_ins_2 as on insert to t1 +create rule t1_ins_2 as on insert to t1 where new.a >= 10 and new.a < 20 do instead insert into t1_2 values (new.a); diff --git a/src/test/regress/expected/select.out b/src/test/regress/expected/select.out index 449341739c..c376523bbe 100644 --- a/src/test/regress/expected/select.out +++ b/src/test/regress/expected/select.out @@ -25,7 +25,7 @@ SELECT * FROM onek -- awk '{if($1<20){print $1,$14;}else{next;}}' onek.data | sort +0nr -1 -- SELECT onek.unique1, onek.stringu1 FROM onek - WHERE onek.unique1 < 20 + WHERE onek.unique1 < 20 ORDER BY unique1 using >; unique1 | stringu1 ---------+---------- @@ -55,7 +55,7 @@ SELECT onek.unique1, onek.stringu1 FROM onek -- awk '{if($1>980){print $1,$14;}else{next;}}' onek.data | sort +1d -2 -- SELECT onek.unique1, onek.stringu1 FROM onek - WHERE onek.unique1 > 980 + WHERE onek.unique1 > 980 ORDER BY stringu1 using <; unique1 | stringu1 ---------+---------- @@ -80,13 +80,12 @@ SELECT onek.unique1, onek.stringu1 FROM onek 987 | ZLAAAA (19 rows) - -- -- awk '{if($1>980){print $1,$16;}else{next;}}' onek.data | -- sort +1d -2 +0nr -1 -- SELECT onek.unique1, onek.string4 FROM onek - WHERE onek.unique1 > 980 + WHERE onek.unique1 > 980 ORDER BY string4 using <, unique1 using >; unique1 | string4 ---------+--------- @@ -111,7 +110,6 @@ SELECT onek.unique1, onek.string4 FROM onek 984 | VVVVxx (19 rows) - -- -- awk '{if($1>980){print $1,$16;}else{next;}}' onek.data | -- sort +1dr -2 +0n -1 @@ -142,7 +140,6 @@ SELECT onek.unique1, onek.string4 FROM onek 999 | AAAAxx (19 rows) - -- -- awk '{if($1<20){print $1,$16;}else{next;}}' onek.data | -- sort +0nr -1 +1d -2 @@ -179,7 +176,7 @@ SELECT onek.unique1, onek.string4 FROM onek -- sort +0n -1 +1dr -2 -- SELECT onek.unique1, onek.string4 FROM onek - WHERE onek.unique1 < 20 + WHERE onek.unique1 < 20 ORDER BY unique1 using <, string4 using >; unique1 | string4 ---------+--------- @@ -238,7 +235,7 @@ SELECT onek2.* FROM onek2 WHERE onek2.unique1 < 10; -- awk '{if($1<20){print $1,$14;}else{next;}}' onek.data | sort +0nr -1 -- SELECT onek2.unique1, onek2.stringu1 FROM onek2 - WHERE onek2.unique1 < 20 + WHERE onek2.unique1 < 20 ORDER BY unique1 using >; unique1 | stringu1 ---------+---------- diff --git a/src/test/regress/expected/select_implicit.out b/src/test/regress/expected/select_implicit.out index 14fcd1c2b5..61b485fdaa 100644 --- a/src/test/regress/expected/select_implicit.out +++ b/src/test/regress/expected/select_implicit.out @@ -121,7 +121,7 @@ LINE 1: SELECT c, count(*) FROM test_missing_target GROUP BY 3; ^ -- group w/o existing GROUP BY and ORDER BY target under ambiguous condition -- failure expected -SELECT count(*) FROM test_missing_target x, test_missing_target y +SELECT count(*) FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY b ORDER BY b; ERROR: column reference "b" is ambiguous @@ -177,7 +177,7 @@ SELECT a/2, a/2 FROM test_missing_target (5 rows) -- group w/ existing GROUP BY target under ambiguous condition -SELECT x.b, count(*) FROM test_missing_target x, test_missing_target y +SELECT x.b, count(*) FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY x.b ORDER BY x.b; b | count @@ -189,7 +189,7 @@ SELECT x.b, count(*) FROM test_missing_target x, test_missing_target y (4 rows) -- group w/o existing GROUP BY target under ambiguous condition -SELECT count(*) FROM test_missing_target x, test_missing_target y +SELECT count(*) FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY x.b ORDER BY x.b; count @@ -202,8 +202,8 @@ SELECT count(*) FROM test_missing_target x, test_missing_target y -- group w/o existing GROUP BY target under ambiguous condition -- into a table -SELECT count(*) INTO TABLE test_missing_target2 -FROM test_missing_target x, test_missing_target y +SELECT count(*) INTO TABLE test_missing_target2 +FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY x.b ORDER BY x.b; SELECT * FROM test_missing_target2; @@ -291,14 +291,14 @@ SELECT count(b) FROM test_missing_target -- group w/o existing GROUP BY and ORDER BY target under ambiguous condition -- failure expected -SELECT count(x.a) FROM test_missing_target x, test_missing_target y +SELECT count(x.a) FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY b/2 ORDER BY b/2; ERROR: column reference "b" is ambiguous LINE 3: GROUP BY b/2 ORDER BY b/2; ^ -- group w/ existing GROUP BY target under ambiguous condition -SELECT x.b/2, count(x.b) FROM test_missing_target x, test_missing_target y +SELECT x.b/2, count(x.b) FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY x.b/2 ORDER BY x.b/2; ?column? | count @@ -310,7 +310,7 @@ SELECT x.b/2, count(x.b) FROM test_missing_target x, test_missing_target y -- group w/o existing GROUP BY target under ambiguous condition -- failure expected due to ambiguous b in count(b) -SELECT count(b) FROM test_missing_target x, test_missing_target y +SELECT count(b) FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY x.b/2; ERROR: column reference "b" is ambiguous @@ -318,8 +318,8 @@ LINE 1: SELECT count(b) FROM test_missing_target x, test_missing_tar... ^ -- group w/o existing GROUP BY target under ambiguous condition -- into a table -SELECT count(x.b) INTO TABLE test_missing_target3 -FROM test_missing_target x, test_missing_target y +SELECT count(x.b) INTO TABLE test_missing_target3 +FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY x.b/2 ORDER BY x.b/2; SELECT * FROM test_missing_target3; diff --git a/src/test/regress/expected/select_implicit_1.out b/src/test/regress/expected/select_implicit_1.out index aee2da72b1..f277375ebf 100644 --- a/src/test/regress/expected/select_implicit_1.out +++ b/src/test/regress/expected/select_implicit_1.out @@ -121,7 +121,7 @@ LINE 1: SELECT c, count(*) FROM test_missing_target GROUP BY 3; ^ -- group w/o existing GROUP BY and ORDER BY target under ambiguous condition -- failure expected -SELECT count(*) FROM test_missing_target x, test_missing_target y +SELECT count(*) FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY b ORDER BY b; ERROR: column reference "b" is ambiguous @@ -177,7 +177,7 @@ SELECT a/2, a/2 FROM test_missing_target (5 rows) -- group w/ existing GROUP BY target under ambiguous condition -SELECT x.b, count(*) FROM test_missing_target x, test_missing_target y +SELECT x.b, count(*) FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY x.b ORDER BY x.b; b | count @@ -189,7 +189,7 @@ SELECT x.b, count(*) FROM test_missing_target x, test_missing_target y (4 rows) -- group w/o existing GROUP BY target under ambiguous condition -SELECT count(*) FROM test_missing_target x, test_missing_target y +SELECT count(*) FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY x.b ORDER BY x.b; count @@ -202,8 +202,8 @@ SELECT count(*) FROM test_missing_target x, test_missing_target y -- group w/o existing GROUP BY target under ambiguous condition -- into a table -SELECT count(*) INTO TABLE test_missing_target2 -FROM test_missing_target x, test_missing_target y +SELECT count(*) INTO TABLE test_missing_target2 +FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY x.b ORDER BY x.b; SELECT * FROM test_missing_target2; @@ -291,14 +291,14 @@ SELECT count(b) FROM test_missing_target -- group w/o existing GROUP BY and ORDER BY target under ambiguous condition -- failure expected -SELECT count(x.a) FROM test_missing_target x, test_missing_target y +SELECT count(x.a) FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY b/2 ORDER BY b/2; ERROR: column reference "b" is ambiguous LINE 3: GROUP BY b/2 ORDER BY b/2; ^ -- group w/ existing GROUP BY target under ambiguous condition -SELECT x.b/2, count(x.b) FROM test_missing_target x, test_missing_target y +SELECT x.b/2, count(x.b) FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY x.b/2 ORDER BY x.b/2; ?column? | count @@ -310,7 +310,7 @@ SELECT x.b/2, count(x.b) FROM test_missing_target x, test_missing_target y -- group w/o existing GROUP BY target under ambiguous condition -- failure expected due to ambiguous b in count(b) -SELECT count(b) FROM test_missing_target x, test_missing_target y +SELECT count(b) FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY x.b/2; ERROR: column reference "b" is ambiguous @@ -318,8 +318,8 @@ LINE 1: SELECT count(b) FROM test_missing_target x, test_missing_tar... ^ -- group w/o existing GROUP BY target under ambiguous condition -- into a table -SELECT count(x.b) INTO TABLE test_missing_target3 -FROM test_missing_target x, test_missing_target y +SELECT count(x.b) INTO TABLE test_missing_target3 +FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY x.b/2 ORDER BY x.b/2; SELECT * FROM test_missing_target3; diff --git a/src/test/regress/expected/select_implicit_2.out b/src/test/regress/expected/select_implicit_2.out index 250f0fedb0..91c3a24f92 100644 --- a/src/test/regress/expected/select_implicit_2.out +++ b/src/test/regress/expected/select_implicit_2.out @@ -121,7 +121,7 @@ LINE 1: SELECT c, count(*) FROM test_missing_target GROUP BY 3; ^ -- group w/o existing GROUP BY and ORDER BY target under ambiguous condition -- failure expected -SELECT count(*) FROM test_missing_target x, test_missing_target y +SELECT count(*) FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY b ORDER BY b; ERROR: column reference "b" is ambiguous @@ -177,7 +177,7 @@ SELECT a/2, a/2 FROM test_missing_target (5 rows) -- group w/ existing GROUP BY target under ambiguous condition -SELECT x.b, count(*) FROM test_missing_target x, test_missing_target y +SELECT x.b, count(*) FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY x.b ORDER BY x.b; b | count @@ -189,7 +189,7 @@ SELECT x.b, count(*) FROM test_missing_target x, test_missing_target y (4 rows) -- group w/o existing GROUP BY target under ambiguous condition -SELECT count(*) FROM test_missing_target x, test_missing_target y +SELECT count(*) FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY x.b ORDER BY x.b; count @@ -202,8 +202,8 @@ SELECT count(*) FROM test_missing_target x, test_missing_target y -- group w/o existing GROUP BY target under ambiguous condition -- into a table -SELECT count(*) INTO TABLE test_missing_target2 -FROM test_missing_target x, test_missing_target y +SELECT count(*) INTO TABLE test_missing_target2 +FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY x.b ORDER BY x.b; SELECT * FROM test_missing_target2; @@ -291,14 +291,14 @@ SELECT count(b) FROM test_missing_target -- group w/o existing GROUP BY and ORDER BY target under ambiguous condition -- failure expected -SELECT count(x.a) FROM test_missing_target x, test_missing_target y +SELECT count(x.a) FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY b/2 ORDER BY b/2; ERROR: column reference "b" is ambiguous LINE 3: GROUP BY b/2 ORDER BY b/2; ^ -- group w/ existing GROUP BY target under ambiguous condition -SELECT x.b/2, count(x.b) FROM test_missing_target x, test_missing_target y +SELECT x.b/2, count(x.b) FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY x.b/2 ORDER BY x.b/2; ?column? | count @@ -310,7 +310,7 @@ SELECT x.b/2, count(x.b) FROM test_missing_target x, test_missing_target y -- group w/o existing GROUP BY target under ambiguous condition -- failure expected due to ambiguous b in count(b) -SELECT count(b) FROM test_missing_target x, test_missing_target y +SELECT count(b) FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY x.b/2; ERROR: column reference "b" is ambiguous @@ -318,8 +318,8 @@ LINE 1: SELECT count(b) FROM test_missing_target x, test_missing_tar... ^ -- group w/o existing GROUP BY target under ambiguous condition -- into a table -SELECT count(x.b) INTO TABLE test_missing_target3 -FROM test_missing_target x, test_missing_target y +SELECT count(x.b) INTO TABLE test_missing_target3 +FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY x.b/2 ORDER BY x.b/2; SELECT * FROM test_missing_target3; diff --git a/src/test/regress/expected/sequence.out b/src/test/regress/expected/sequence.out index 823039ae95..19f8f1308d 100644 --- a/src/test/regress/expected/sequence.out +++ b/src/test/regress/expected/sequence.out @@ -1,16 +1,13 @@ --- --- test creation of SERIAL column --- - CREATE TABLE serialTest (f1 text, f2 serial); NOTICE: CREATE TABLE will create implicit sequence "serialtest_f2_seq" for serial column "serialtest.f2" - INSERT INTO serialTest VALUES ('foo'); INSERT INTO serialTest VALUES ('bar'); INSERT INTO serialTest VALUES ('force', 100); INSERT INTO serialTest VALUES ('wrong', NULL); ERROR: null value in column "f2" violates not-null constraint - SELECT * FROM serialTest; f1 | f2 -------+----- @@ -21,7 +18,6 @@ SELECT * FROM serialTest; -- basic sequence operations using both text and oid references CREATE SEQUENCE sequence_test; - SELECT nextval('sequence_test'::text); nextval --------- diff --git a/src/test/regress/expected/sequence_1.out b/src/test/regress/expected/sequence_1.out index a97f499e75..ae928e9071 100644 --- a/src/test/regress/expected/sequence_1.out +++ b/src/test/regress/expected/sequence_1.out @@ -1,16 +1,13 @@ --- --- test creation of SERIAL column --- - CREATE TABLE serialTest (f1 text, f2 serial); NOTICE: CREATE TABLE will create implicit sequence "serialtest_f2_seq" for serial column "serialtest.f2" - INSERT INTO serialTest VALUES ('foo'); INSERT INTO serialTest VALUES ('bar'); INSERT INTO serialTest VALUES ('force', 100); INSERT INTO serialTest VALUES ('wrong', NULL); ERROR: null value in column "f2" violates not-null constraint - SELECT * FROM serialTest; f1 | f2 -------+----- @@ -21,7 +18,6 @@ SELECT * FROM serialTest; -- basic sequence operations using both text and oid references CREATE SEQUENCE sequence_test; - SELECT nextval('sequence_test'::text); nextval --------- diff --git a/src/test/regress/expected/subselect.out b/src/test/regress/expected/subselect.out index 7f8c05bc80..2440dcd822 100644 --- a/src/test/regress/expected/subselect.out +++ b/src/test/regress/expected/subselect.out @@ -297,7 +297,7 @@ SELECT *, ELSE 'Approved' END) ELSE 'PO' - END) + END) END) AS "Status", (CASE WHEN ord.ordercancelled @@ -312,7 +312,7 @@ END) AS "Status", ELSE 'Approved' END) ELSE 'PO' - END) + END) END) AS "Status_OK" FROM orderstest ord; SELECT * FROM orders_view; diff --git a/src/test/regress/expected/timestamp.out b/src/test/regress/expected/timestamp.out index 6def970d80..ab8faab52e 100644 --- a/src/test/regress/expected/timestamp.out +++ b/src/test/regress/expected/timestamp.out @@ -180,7 +180,7 @@ INSERT INTO TIMESTAMP_TBL VALUES ('Feb 16 17:32:01 5097 BC'); ERROR: timestamp out of range: "Feb 16 17:32:01 5097 BC" LINE 1: INSERT INTO TIMESTAMP_TBL VALUES ('Feb 16 17:32:01 5097 BC')... ^ -SELECT '' AS "64", d1 FROM TIMESTAMP_TBL; +SELECT '' AS "64", d1 FROM TIMESTAMP_TBL; 64 | d1 ----+----------------------------- | -infinity @@ -804,7 +804,7 @@ SELECT '' AS "54", d1 as "timestamp", (55 rows) -- TO_CHAR() -SELECT '' AS to_char_1, to_char(d1, 'DAY Day day DY Dy dy MONTH Month month RM MON Mon mon') +SELECT '' AS to_char_1, to_char(d1, 'DAY Day day DY Dy dy MONTH Month month RM MON Mon mon') FROM TIMESTAMP_TBL; to_char_1 | to_char -----------+------------------------------------------------------------------------------------------ @@ -1017,7 +1017,7 @@ SELECT '' AS to_char_3, to_char(d1, 'Y,YYY YYYY YYY YY Y CC Q MM WW DDD DD D J') | 2,001 2001 001 01 1 21 1 01 01 001 01 2 2451911 (65 rows) -SELECT '' AS to_char_4, to_char(d1, 'FMY,YYY FMYYYY FMYYY FMYY FMY FMCC FMQ FMMM FMWW FMDDD FMDD FMD FMJ') +SELECT '' AS to_char_4, to_char(d1, 'FMY,YYY FMYYYY FMYYY FMYY FMY FMCC FMQ FMMM FMWW FMDDD FMDD FMD FMJ') FROM TIMESTAMP_TBL; to_char_4 | to_char -----------+------------------------------------------------- @@ -1088,7 +1088,7 @@ SELECT '' AS to_char_4, to_char(d1, 'FMY,YYY FMYYYY FMYYY FMYY FMY FMCC FMQ FMMM | 2,001 2001 1 1 1 21 1 1 1 1 1 2 2451911 (65 rows) -SELECT '' AS to_char_5, to_char(d1, 'HH HH12 HH24 MI SS SSSS') +SELECT '' AS to_char_5, to_char(d1, 'HH HH12 HH24 MI SS SSSS') FROM TIMESTAMP_TBL; to_char_5 | to_char -----------+---------------------- @@ -1159,7 +1159,7 @@ SELECT '' AS to_char_5, to_char(d1, 'HH HH12 HH24 MI SS SSSS') | 05 05 17 32 01 63121 (65 rows) -SELECT '' AS to_char_6, to_char(d1, E'"HH:MI:SS is" HH:MI:SS "\\"text between quote marks\\""') +SELECT '' AS to_char_6, to_char(d1, E'"HH:MI:SS is" HH:MI:SS "\\"text between quote marks\\""') FROM TIMESTAMP_TBL; to_char_6 | to_char -----------+------------------------------------------------- @@ -1301,7 +1301,7 @@ SELECT '' AS to_char_7, to_char(d1, 'HH24--text--MI--text--SS') | 17--text--32--text--01 (65 rows) -SELECT '' AS to_char_8, to_char(d1, 'YYYYTH YYYYth Jth') +SELECT '' AS to_char_8, to_char(d1, 'YYYYTH YYYYth Jth') FROM TIMESTAMP_TBL; to_char_8 | to_char -----------+------------------------- @@ -1372,9 +1372,8 @@ SELECT '' AS to_char_8, to_char(d1, 'YYYYTH YYYYth Jth') | 2001ST 2001st 2451911th (65 rows) - -SELECT '' AS to_char_9, to_char(d1, 'YYYY A.D. YYYY a.d. YYYY bc HH:MI:SS P.M. HH:MI:SS p.m. HH:MI:SS pm') - FROM TIMESTAMP_TBL; +SELECT '' AS to_char_9, to_char(d1, 'YYYY A.D. YYYY a.d. YYYY bc HH:MI:SS P.M. HH:MI:SS p.m. HH:MI:SS pm') + FROM TIMESTAMP_TBL; to_char_9 | to_char -----------+--------------------------------------------------------------------- | diff --git a/src/test/regress/expected/timestamptz.out b/src/test/regress/expected/timestamptz.out index 47e3394792..9a4ce3e336 100644 --- a/src/test/regress/expected/timestamptz.out +++ b/src/test/regress/expected/timestamptz.out @@ -251,7 +251,7 @@ SELECT 'Wed Jul 11 10:51:14 PST+03:00 2001'::timestamptz; Wed Jul 11 06:51:14 2001 PDT (1 row) -SELECT '' AS "64", d1 FROM TIMESTAMPTZ_TBL; +SELECT '' AS "64", d1 FROM TIMESTAMPTZ_TBL; 64 | d1 ----+--------------------------------- | -infinity @@ -883,7 +883,7 @@ SELECT '' AS "54", d1 as timestamptz, (56 rows) -- TO_CHAR() -SELECT '' AS to_char_1, to_char(d1, 'DAY Day day DY Dy dy MONTH Month month RM MON Mon mon') +SELECT '' AS to_char_1, to_char(d1, 'DAY Day day DY Dy dy MONTH Month month RM MON Mon mon') FROM TIMESTAMPTZ_TBL; to_char_1 | to_char -----------+------------------------------------------------------------------------------------------ @@ -955,9 +955,8 @@ SELECT '' AS to_char_1, to_char(d1, 'DAY Day day DY Dy dy MONTH Month month RM M | MONDAY Monday monday MON Mon mon JANUARY January january I JAN Jan jan (66 rows) - SELECT '' AS to_char_2, to_char(d1, 'FMDAY FMDay FMday FMMONTH FMMonth FMmonth FMRM') - FROM TIMESTAMPTZ_TBL; + FROM TIMESTAMPTZ_TBL; to_char_2 | to_char -----------+-------------------------------------------------------------- | @@ -1100,9 +1099,8 @@ SELECT '' AS to_char_3, to_char(d1, 'Y,YYY YYYY YYY YY Y CC Q MM WW DDD DD D J') | 2,001 2001 001 01 1 21 1 01 01 001 01 2 2451911 (66 rows) - -SELECT '' AS to_char_4, to_char(d1, 'FMY,YYY FMYYYY FMYYY FMYY FMY FMCC FMQ FMMM FMWW FMDDD FMDD FMD FMJ') - FROM TIMESTAMPTZ_TBL; +SELECT '' AS to_char_4, to_char(d1, 'FMY,YYY FMYYYY FMYYY FMYY FMY FMCC FMQ FMMM FMWW FMDDD FMDD FMD FMJ') + FROM TIMESTAMPTZ_TBL; to_char_4 | to_char -----------+------------------------------------------------- | @@ -1173,8 +1171,7 @@ SELECT '' AS to_char_4, to_char(d1, 'FMY,YYY FMYYYY FMYYY FMYY FMY FMCC FMQ FMMM | 2,001 2001 1 1 1 21 1 1 1 1 1 2 2451911 (66 rows) - -SELECT '' AS to_char_5, to_char(d1, 'HH HH12 HH24 MI SS SSSS') +SELECT '' AS to_char_5, to_char(d1, 'HH HH12 HH24 MI SS SSSS') FROM TIMESTAMPTZ_TBL; to_char_5 | to_char -----------+---------------------- @@ -1246,8 +1243,8 @@ SELECT '' AS to_char_5, to_char(d1, 'HH HH12 HH24 MI SS SSSS') | 05 05 17 32 01 63121 (66 rows) -SELECT '' AS to_char_6, to_char(d1, E'"HH:MI:SS is" HH:MI:SS "\\"text between quote marks\\""') - FROM TIMESTAMPTZ_TBL; +SELECT '' AS to_char_6, to_char(d1, E'"HH:MI:SS is" HH:MI:SS "\\"text between quote marks\\""') + FROM TIMESTAMPTZ_TBL; to_char_6 | to_char -----------+------------------------------------------------- | @@ -1318,9 +1315,8 @@ SELECT '' AS to_char_6, to_char(d1, E'"HH:MI:SS is" HH:MI:SS "\\"text between qu | HH:MI:SS is 05:32:01 "text between quote marks" (66 rows) - SELECT '' AS to_char_7, to_char(d1, 'HH24--text--MI--text--SS') - FROM TIMESTAMPTZ_TBL; + FROM TIMESTAMPTZ_TBL; to_char_7 | to_char -----------+------------------------ | @@ -1391,7 +1387,7 @@ SELECT '' AS to_char_7, to_char(d1, 'HH24--text--MI--text--SS') | 17--text--32--text--01 (66 rows) -SELECT '' AS to_char_8, to_char(d1, 'YYYYTH YYYYth Jth') +SELECT '' AS to_char_8, to_char(d1, 'YYYYTH YYYYth Jth') FROM TIMESTAMPTZ_TBL; to_char_8 | to_char -----------+------------------------- @@ -1463,9 +1459,8 @@ SELECT '' AS to_char_8, to_char(d1, 'YYYYTH YYYYth Jth') | 2001ST 2001st 2451911th (66 rows) - -SELECT '' AS to_char_9, to_char(d1, 'YYYY A.D. YYYY a.d. YYYY bc HH:MI:SS P.M. HH:MI:SS p.m. HH:MI:SS pm') - FROM TIMESTAMPTZ_TBL; +SELECT '' AS to_char_9, to_char(d1, 'YYYY A.D. YYYY a.d. YYYY bc HH:MI:SS P.M. HH:MI:SS p.m. HH:MI:SS pm') + FROM TIMESTAMPTZ_TBL; to_char_9 | to_char -----------+--------------------------------------------------------------------- | diff --git a/src/test/regress/expected/tinterval.out b/src/test/regress/expected/tinterval.out index 89e850cf61..a0189729fc 100644 --- a/src/test/regress/expected/tinterval.out +++ b/src/test/regress/expected/tinterval.out @@ -14,7 +14,7 @@ INSERT INTO TINTERVAL_TBL (f1) VALUES ('["epoch" "Mon May 1 00:30:30 1995"]'); INSERT INTO TINTERVAL_TBL (f1) VALUES ('["Feb 15 1990 12:15:03" "2001-09-23 11:12:13"]'); --- badly formatted tintervals +-- badly formatted tintervals INSERT INTO TINTERVAL_TBL (f1) VALUES ('["bad time specifications" ""]'); ERROR: invalid input syntax for type abstime: "bad time specifications" @@ -146,7 +146,7 @@ SELECT '' AS fourteen, t1.f1 AS interval1, t2.f1 AS interval2 -- contains SELECT '' AS five, t1.f1 FROM TINTERVAL_TBL t1 - WHERE not t1.f1 << + WHERE not t1.f1 << tinterval '["Aug 15 14:23:19 1980" "Sep 16 14:23:19 1990"]' ORDER BY t1.f1; five | f1 diff --git a/src/test/regress/expected/transactions.out b/src/test/regress/expected/transactions.out index c4f8965fd1..84d14537f1 100644 --- a/src/test/regress/expected/transactions.out +++ b/src/test/regress/expected/transactions.out @@ -2,7 +2,7 @@ -- TRANSACTIONS -- BEGIN; -SELECT * +SELECT * INTO TABLE xacttest FROM aggtest; INSERT INTO xacttest (a, b) VALUES (777, 777.777); @@ -24,13 +24,13 @@ SELECT * FROM aggtest; (0 rows) ABORT; --- should not exist +-- should not exist SELECT oid FROM pg_class WHERE relname = 'disappear'; oid ----- (0 rows) --- should have members again +-- should have members again SELECT * FROM aggtest; a | b -----+--------- @@ -179,7 +179,6 @@ BEGIN; ROLLBACK; COMMIT; -- should not be in a transaction block WARNING: there is no transaction in progress - SELECT * FROM savepoints; a --- diff --git a/src/test/regress/expected/triggers.out b/src/test/regress/expected/triggers.out index 1b9cdd4375..c9e8c1a141 100644 --- a/src/test/regress/expected/triggers.out +++ b/src/test/regress/expected/triggers.out @@ -19,23 +19,23 @@ create unique index pkeys_i on pkeys (pkey1, pkey2); -- (fkey1, fkey2) --> pkeys (pkey1, pkey2) -- (fkey3) --> fkeys2 (pkey23) -- -create trigger check_fkeys_pkey_exist - before insert or update on fkeys - for each row - execute procedure +create trigger check_fkeys_pkey_exist + before insert or update on fkeys + for each row + execute procedure check_primary_key ('fkey1', 'fkey2', 'pkeys', 'pkey1', 'pkey2'); -create trigger check_fkeys_pkey2_exist - before insert or update on fkeys - for each row +create trigger check_fkeys_pkey2_exist + before insert or update on fkeys + for each row execute procedure check_primary_key ('fkey3', 'fkeys2', 'pkey23'); -- -- For fkeys2: -- (fkey21, fkey22) --> pkeys (pkey1, pkey2) -- -create trigger check_fkeys2_pkey_exist - before insert or update on fkeys2 - for each row - execute procedure +create trigger check_fkeys2_pkey_exist + before insert or update on fkeys2 + for each row + execute procedure check_primary_key ('fkey21', 'fkey22', 'pkeys', 'pkey1', 'pkey2'); -- Test comments COMMENT ON TRIGGER check_fkeys2_pkey_bad ON fkeys2 IS 'wrong'; @@ -48,19 +48,19 @@ COMMENT ON TRIGGER check_fkeys2_pkey_exist ON fkeys2 IS NULL; -- fkeys (fkey1, fkey2) and fkeys2 (fkey21, fkey22) -- create trigger check_pkeys_fkey_cascade - before delete or update on pkeys - for each row - execute procedure - check_foreign_key (2, 'cascade', 'pkey1', 'pkey2', + before delete or update on pkeys + for each row + execute procedure + check_foreign_key (2, 'cascade', 'pkey1', 'pkey2', 'fkeys', 'fkey1', 'fkey2', 'fkeys2', 'fkey21', 'fkey22'); -- -- For fkeys2: -- ON DELETE/UPDATE (pkey23) RESTRICT: -- fkeys (fkey3) -- -create trigger check_fkeys2_fkey_restrict +create trigger check_fkeys2_fkey_restrict before delete or update on fkeys2 - for each row + for each row execute procedure check_foreign_key (1, 'restrict', 'pkey23', 'fkeys', 'fkey3'); insert into fkeys2 values (10, '1', 1); insert into fkeys2 values (30, '3', 2); @@ -106,49 +106,49 @@ DROP TABLE fkeys2; -- -- Jan -- -- create table dup17 (x int4); --- --- create trigger dup17_before +-- +-- create trigger dup17_before -- before insert on dup17 --- for each row --- execute procedure +-- for each row +-- execute procedure -- funny_dup17 () -- ; --- +-- -- insert into dup17 values (17); -- select count(*) from dup17; -- insert into dup17 values (17); -- select count(*) from dup17; --- +-- -- drop trigger dup17_before on dup17; --- +-- -- create trigger dup17_after -- after insert on dup17 --- for each row --- execute procedure +-- for each row +-- execute procedure -- funny_dup17 () -- ; -- insert into dup17 values (13); -- select count(*) from dup17 where x = 13; -- insert into dup17 values (13); -- select count(*) from dup17 where x = 13; --- +-- -- DROP TABLE dup17; create sequence ttdummy_seq increment 10 start 0 minvalue 0; create table tttest ( - price_id int4, - price_val int4, + price_id int4, + price_val int4, price_on int4, price_off int4 default 999999 ); -create trigger ttdummy +create trigger ttdummy before delete or update on tttest - for each row - execute procedure + for each row + execute procedure ttdummy (price_on, price_off); -create trigger ttserial +create trigger ttserial before insert or update on tttest - for each row - execute procedure + for each row + execute procedure autoinc (price_on, ttdummy_seq); insert into tttest values (1, 1, null); insert into tttest values (2, 2, null); @@ -567,7 +567,7 @@ CREATE TABLE trigger_test ( i int, v varchar ); -CREATE OR REPLACE FUNCTION trigger_data() RETURNS trigger +CREATE OR REPLACE FUNCTION trigger_data() RETURNS trigger LANGUAGE plpgsql AS $$ declare @@ -580,7 +580,7 @@ begin relid := TG_relid::regclass; -- plpgsql can't discover its trigger data in a hash like perl and python - -- can, or by a sort of reflection like tcl can, + -- can, or by a sort of reflection like tcl can, -- so we have to hard code the names. raise NOTICE 'TG_NAME: %', TG_name; raise NOTICE 'TG_WHEN: %', TG_when; @@ -618,7 +618,7 @@ begin end; $$; -CREATE TRIGGER show_trigger_data_trig +CREATE TRIGGER show_trigger_data_trig BEFORE INSERT OR UPDATE OR DELETE ON trigger_test FOR EACH ROW EXECUTE PROCEDURE trigger_data(23,'skidoo'); insert into trigger_test values(1,'insert'); @@ -658,9 +658,7 @@ NOTICE: TG_TABLE_SCHEMA: public NOTICE: TG_NARGS: 2 NOTICE: TG_ARGV: [23, skidoo] NOTICE: OLD: (1,update) - DROP TRIGGER show_trigger_data_trig on trigger_test; - DROP FUNCTION trigger_data(); DROP TABLE trigger_test; -- @@ -755,10 +753,10 @@ CREATE TABLE min_updates_test_oids ( f3 int) WITH OIDS; INSERT INTO min_updates_test VALUES ('a',1,2),('b','2',null); INSERT INTO min_updates_test_oids VALUES ('a',1,2),('b','2',null); -CREATE TRIGGER z_min_update +CREATE TRIGGER z_min_update BEFORE UPDATE ON min_updates_test FOR EACH ROW EXECUTE PROCEDURE suppress_redundant_updates_trigger(); -CREATE TRIGGER z_min_update +CREATE TRIGGER z_min_update BEFORE UPDATE ON min_updates_test_oids FOR EACH ROW EXECUTE PROCEDURE suppress_redundant_updates_trigger(); \set QUIET false diff --git a/src/test/regress/expected/truncate.out b/src/test/regress/expected/truncate.out index 6e190fd5f6..1817bac8e3 100644 --- a/src/test/regress/expected/truncate.out +++ b/src/test/regress/expected/truncate.out @@ -302,7 +302,7 @@ $$ LANGUAGE plpgsql; INSERT INTO trunc_trigger_test VALUES(1, 'foo', 'bar'), (2, 'baz', 'quux'); CREATE TRIGGER t BEFORE TRUNCATE ON trunc_trigger_test -FOR EACH STATEMENT +FOR EACH STATEMENT EXECUTE PROCEDURE trunctrigger('before trigger truncate'); SELECT count(*) as "Row count in test table" FROM trunc_trigger_test; Row count in test table @@ -334,7 +334,7 @@ truncate trunc_trigger_log; INSERT INTO trunc_trigger_test VALUES(1, 'foo', 'bar'), (2, 'baz', 'quux'); CREATE TRIGGER tt AFTER TRUNCATE ON trunc_trigger_test -FOR EACH STATEMENT +FOR EACH STATEMENT EXECUTE PROCEDURE trunctrigger('after trigger truncate'); SELECT count(*) as "Row count in test table" FROM trunc_trigger_test; Row count in test table diff --git a/src/test/regress/expected/tsdicts.out b/src/test/regress/expected/tsdicts.out index aba67fcab7..9df1434a14 100644 --- a/src/test/regress/expected/tsdicts.out +++ b/src/test/regress/expected/tsdicts.out @@ -193,7 +193,7 @@ SELECT ts_lexize('hunspell', 'footballyklubber'); -- Synonim dictionary CREATE TEXT SEARCH DICTIONARY synonym ( - Template=synonym, + Template=synonym, Synonyms=synonym_sample ); SELECT ts_lexize('synonym', 'PoStGrEs'); @@ -219,7 +219,7 @@ SELECT ts_lexize('synonym', 'indices'); -- cannot pass more than one word to thesaurus. CREATE TEXT SEARCH DICTIONARY thesaurus ( Template=thesaurus, - DictFile=thesaurus_sample, + DictFile=thesaurus_sample, Dictionary=english_stem ); SELECT ts_lexize('thesaurus', 'one'); @@ -281,8 +281,8 @@ SELECT to_tsquery('hunspell_tst', 'footballyklubber:b & rebookings:A & sky'); CREATE TEXT SEARCH CONFIGURATION synonym_tst ( COPY=english ); -ALTER TEXT SEARCH CONFIGURATION synonym_tst ALTER MAPPING FOR - asciiword, hword_asciipart, asciihword +ALTER TEXT SEARCH CONFIGURATION synonym_tst ALTER MAPPING FOR + asciiword, hword_asciipart, asciihword WITH synonym, english_stem; SELECT to_tsvector('synonym_tst', 'Postgresql is often called as postgres or pgsql and pronounced as postgre'); to_tsvector @@ -313,8 +313,8 @@ SELECT to_tsquery('synonym_tst', 'Index & indices'); CREATE TEXT SEARCH CONFIGURATION thesaurus_tst ( COPY=synonym_tst ); -ALTER TEXT SEARCH CONFIGURATION thesaurus_tst ALTER MAPPING FOR - asciiword, hword_asciipart, asciihword +ALTER TEXT SEARCH CONFIGURATION thesaurus_tst ALTER MAPPING FOR + asciiword, hword_asciipart, asciihword WITH synonym, thesaurus, english_stem; SELECT to_tsvector('thesaurus_tst', 'one postgres one two one two three one'); to_tsvector diff --git a/src/test/regress/expected/tsearch.out b/src/test/regress/expected/tsearch.out index 86ea5efc7b..e1d7646c0d 100644 --- a/src/test/regress/expected/tsearch.out +++ b/src/test/regress/expected/tsearch.out @@ -46,7 +46,7 @@ WHERE mapcfg = 0 OR mapdict = 0; -- Look for pg_ts_config_map entries that aren't one of parser's token types SELECT * FROM ( SELECT oid AS cfgid, (ts_token_type(cfgparser)).tokid AS tokid - FROM pg_ts_config ) AS tt + FROM pg_ts_config ) AS tt RIGHT JOIN pg_ts_config_map AS m ON (tt.cfgid=m.mapcfg AND tt.tokid=m.maptokentype) WHERE @@ -188,7 +188,6 @@ SELECT count(*) FROM test_tsvector WHERE a @@ 'w:*|q:*'; 494 (1 row) - RESET enable_seqscan; INSERT INTO test_tsvector VALUES ('???', 'DFG:1A,2B,6C,10 FGH'); SELECT * FROM ts_stat('SELECT a FROM test_tsvector') ORDER BY ndoc DESC, nentry DESC, word LIMIT 10; @@ -672,7 +671,7 @@ to_tsquery('english', 'sea&foo'), 'HighlightAll=true'); (1 row) ---Check if headline fragments work +--Check if headline fragments work SELECT ts_headline('english', ' Day after day, day after day, We stuck, nor breath nor motion, diff --git a/src/test/regress/expected/type_sanity.out b/src/test/regress/expected/type_sanity.out index b7433653d1..556672d408 100644 --- a/src/test/regress/expected/type_sanity.out +++ b/src/test/regress/expected/type_sanity.out @@ -72,7 +72,7 @@ WHERE p1.typtype in ('b','e') AND p1.typname NOT LIKE E'\\_%' AND NOT EXISTS (3 rows) -- Make sure typarray points to a varlena array type of our own base -SELECT p1.oid, p1.typname as basetype, p2.typname as arraytype, +SELECT p1.oid, p1.typname as basetype, p2.typname as arraytype, p2.typelem, p2.typlen FROM pg_type p1 LEFT JOIN pg_type p2 ON (p1.typarray = p2.oid) WHERE p1.typarray <> 0 AND diff --git a/src/test/regress/expected/varchar.out b/src/test/regress/expected/varchar.out index 48a77f5e13..e1120234ac 100644 --- a/src/test/regress/expected/varchar.out +++ b/src/test/regress/expected/varchar.out @@ -4,13 +4,13 @@ CREATE TABLE VARCHAR_TBL(f1 varchar(1)); INSERT INTO VARCHAR_TBL (f1) VALUES ('a'); INSERT INTO VARCHAR_TBL (f1) VALUES ('A'); --- any of the following three input formats are acceptable +-- any of the following three input formats are acceptable INSERT INTO VARCHAR_TBL (f1) VALUES ('1'); INSERT INTO VARCHAR_TBL (f1) VALUES (2); INSERT INTO VARCHAR_TBL (f1) VALUES ('3'); --- zero-length char +-- zero-length char INSERT INTO VARCHAR_TBL (f1) VALUES (''); --- try varchar's of greater than 1 length +-- try varchar's of greater than 1 length INSERT INTO VARCHAR_TBL (f1) VALUES ('cd'); ERROR: value too long for type character varying(1) INSERT INTO VARCHAR_TBL (f1) VALUES ('c '); diff --git a/src/test/regress/expected/varchar_1.out b/src/test/regress/expected/varchar_1.out index d726e4cc43..35f6180d48 100644 --- a/src/test/regress/expected/varchar_1.out +++ b/src/test/regress/expected/varchar_1.out @@ -4,13 +4,13 @@ CREATE TABLE VARCHAR_TBL(f1 varchar(1)); INSERT INTO VARCHAR_TBL (f1) VALUES ('a'); INSERT INTO VARCHAR_TBL (f1) VALUES ('A'); --- any of the following three input formats are acceptable +-- any of the following three input formats are acceptable INSERT INTO VARCHAR_TBL (f1) VALUES ('1'); INSERT INTO VARCHAR_TBL (f1) VALUES (2); INSERT INTO VARCHAR_TBL (f1) VALUES ('3'); --- zero-length char +-- zero-length char INSERT INTO VARCHAR_TBL (f1) VALUES (''); --- try varchar's of greater than 1 length +-- try varchar's of greater than 1 length INSERT INTO VARCHAR_TBL (f1) VALUES ('cd'); ERROR: value too long for type character varying(1) INSERT INTO VARCHAR_TBL (f1) VALUES ('c '); diff --git a/src/test/regress/expected/varchar_2.out b/src/test/regress/expected/varchar_2.out index 79c4782462..49add1f621 100644 --- a/src/test/regress/expected/varchar_2.out +++ b/src/test/regress/expected/varchar_2.out @@ -4,13 +4,13 @@ CREATE TABLE VARCHAR_TBL(f1 varchar(1)); INSERT INTO VARCHAR_TBL (f1) VALUES ('a'); INSERT INTO VARCHAR_TBL (f1) VALUES ('A'); --- any of the following three input formats are acceptable +-- any of the following three input formats are acceptable INSERT INTO VARCHAR_TBL (f1) VALUES ('1'); INSERT INTO VARCHAR_TBL (f1) VALUES (2); INSERT INTO VARCHAR_TBL (f1) VALUES ('3'); --- zero-length char +-- zero-length char INSERT INTO VARCHAR_TBL (f1) VALUES (''); --- try varchar's of greater than 1 length +-- try varchar's of greater than 1 length INSERT INTO VARCHAR_TBL (f1) VALUES ('cd'); ERROR: value too long for type character varying(1) INSERT INTO VARCHAR_TBL (f1) VALUES ('c '); diff --git a/src/test/regress/expected/window.out b/src/test/regress/expected/window.out index 0481cc6dd8..aa0a0c2067 100644 --- a/src/test/regress/expected/window.out +++ b/src/test/regress/expected/window.out @@ -361,7 +361,7 @@ SELECT first_value(ten) OVER (PARTITION BY four ORDER BY ten), ten, four FROM te (10 rows) -- last_value returns the last row of the frame, which is CURRENT ROW in ORDER BY window. -SELECT last_value(four) OVER (ORDER BY ten), ten, four FROM tenk1 WHERE unique2 < 10; +SELECT last_value(four) OVER (ORDER BY ten), ten, four FROM tenk1 WHERE unique2 < 10; last_value | ten | four ------------+-----+------ 0 | 0 | 0 @@ -409,7 +409,7 @@ SELECT nth_value(ten, four + 1) OVER (PARTITION BY four), ten, four | 3 | 3 (10 rows) -SELECT ten, two, sum(hundred) AS gsum, sum(sum(hundred)) OVER (PARTITION BY two ORDER BY ten) AS wsum +SELECT ten, two, sum(hundred) AS gsum, sum(sum(hundred)) OVER (PARTITION BY two ORDER BY ten) AS wsum FROM tenk1 GROUP BY ten, two; ten | two | gsum | wsum -----+-----+-------+-------- @@ -436,8 +436,8 @@ SELECT count(*) OVER (PARTITION BY four), four FROM (SELECT * FROM tenk1 WHERE t 2 | 3 (6 rows) -SELECT (count(*) OVER (PARTITION BY four ORDER BY ten) + - sum(hundred) OVER (PARTITION BY four ORDER BY ten))::varchar AS cntsum +SELECT (count(*) OVER (PARTITION BY four ORDER BY ten) + + sum(hundred) OVER (PARTITION BY four ORDER BY ten))::varchar AS cntsum FROM tenk1 WHERE unique2 < 10; cntsum -------- @@ -455,8 +455,8 @@ SELECT (count(*) OVER (PARTITION BY four ORDER BY ten) + -- opexpr with different windows evaluation. SELECT * FROM( - SELECT count(*) OVER (PARTITION BY four ORDER BY ten) + - sum(hundred) OVER (PARTITION BY two ORDER BY ten) AS total, + SELECT count(*) OVER (PARTITION BY four ORDER BY ten) + + sum(hundred) OVER (PARTITION BY two ORDER BY ten) AS total, count(*) OVER (PARTITION BY four ORDER BY ten) AS fourcount, sum(hundred) OVER (PARTITION BY two ORDER BY ten) AS twosum FROM tenk1 @@ -481,7 +481,7 @@ SELECT avg(four) OVER (PARTITION BY four ORDER BY thousand / 100) FROM tenk1 WHE 3.0000000000000000 (10 rows) -SELECT ten, two, sum(hundred) AS gsum, sum(sum(hundred)) OVER win AS wsum +SELECT ten, two, sum(hundred) AS gsum, sum(sum(hundred)) OVER win AS wsum FROM tenk1 GROUP BY ten, two WINDOW win AS (PARTITION BY two ORDER BY ten); ten | two | gsum | wsum -----+-----+-------+-------- diff --git a/src/test/regress/input/copy.source b/src/test/regress/input/copy.source index 2d34c72b6c..ab3f5083e8 100644 --- a/src/test/regress/input/copy.source +++ b/src/test/regress/input/copy.source @@ -95,8 +95,8 @@ select * from copytest except select * from copytest2; -- test header line feature create temp table copytest3 ( - c1 int, - "col with , comma" text, + c1 int, + "col with , comma" text, "col with "" quote" int); copy copytest3 from stdin csv header; diff --git a/src/test/regress/input/create_function_2.source b/src/test/regress/input/create_function_2.source index 459ca3c0a3..6aed5f008b 100644 --- a/src/test/regress/input/create_function_2.source +++ b/src/test/regress/input/create_function_2.source @@ -2,7 +2,7 @@ -- CREATE_FUNCTION_2 -- CREATE FUNCTION hobbies(person) - RETURNS setof hobbies_r + RETURNS setof hobbies_r AS 'select * from hobbies_r where person = $1.name' LANGUAGE SQL; @@ -27,7 +27,7 @@ CREATE FUNCTION equipment(hobbies_r) CREATE FUNCTION user_relns() RETURNS setof name - AS 'select relname + AS 'select relname from pg_class c, pg_namespace n where relnamespace = n.oid and (nspname !~ ''pg_.*'' and nspname <> ''information_schema'') and diff --git a/src/test/regress/input/misc.source b/src/test/regress/input/misc.source index fa58b54564..0930a6a4bb 100644 --- a/src/test/regress/input/misc.source +++ b/src/test/regress/input/misc.source @@ -17,16 +17,16 @@ UPDATE onek -- UPDATE onek2 -- SET unique1 = onek2.unique1 + 1; ---UPDATE onek2 +--UPDATE onek2 -- SET unique1 = onek2.unique1 - 1; -- -- BTREE shutting out non-functional updates -- --- the following two tests seem to take a long time on some +-- the following two tests seem to take a long time on some -- systems. This non-func update stuff needs to be examined -- more closely. - jolly (2/22/96) --- +-- UPDATE tmp SET stringu1 = reverse_name(onek.stringu1) FROM onek @@ -87,12 +87,12 @@ SELECT * FROM stud_emp; -- SELECT * FROM a_star*; -SELECT * +SELECT * FROM b_star* x WHERE x.b = text 'bumble' or x.a < 3; -SELECT class, a - FROM c_star* x +SELECT class, a + FROM c_star* x WHERE x.c ~ text 'hi'; SELECT class, b, c @@ -137,7 +137,7 @@ SELECT class, foo ALTER TABLE a_star RENAME COLUMN foo TO aa; -SELECT * +SELECT * from a_star* WHERE aa < 1000; diff --git a/src/test/regress/output/copy.source b/src/test/regress/output/copy.source index 5a88d6ef20..febca712bb 100644 --- a/src/test/regress/output/copy.source +++ b/src/test/regress/output/copy.source @@ -63,8 +63,8 @@ select * from copytest except select * from copytest2; -- test header line feature create temp table copytest3 ( - c1 int, - "col with , comma" text, + c1 int, + "col with , comma" text, "col with "" quote" int); copy copytest3 from stdin csv header; copy copytest3 to stdout csv header; diff --git a/src/test/regress/output/create_function_2.source b/src/test/regress/output/create_function_2.source index 0feb975355..94ab7eba56 100644 --- a/src/test/regress/output/create_function_2.source +++ b/src/test/regress/output/create_function_2.source @@ -2,7 +2,7 @@ -- CREATE_FUNCTION_2 -- CREATE FUNCTION hobbies(person) - RETURNS setof hobbies_r + RETURNS setof hobbies_r AS 'select * from hobbies_r where person = $1.name' LANGUAGE SQL; CREATE FUNCTION hobby_construct(text, text) @@ -21,7 +21,7 @@ CREATE FUNCTION equipment(hobbies_r) LANGUAGE SQL; CREATE FUNCTION user_relns() RETURNS setof name - AS 'select relname + AS 'select relname from pg_class c, pg_namespace n where relnamespace = n.oid and (nspname !~ ''pg_.*'' and nspname <> ''information_schema'') and diff --git a/src/test/regress/output/misc.source b/src/test/regress/output/misc.source index 0effa4b853..c225d0f37f 100644 --- a/src/test/regress/output/misc.source +++ b/src/test/regress/output/misc.source @@ -13,15 +13,15 @@ UPDATE onek -- -- UPDATE onek2 -- SET unique1 = onek2.unique1 + 1; ---UPDATE onek2 +--UPDATE onek2 -- SET unique1 = onek2.unique1 - 1; -- -- BTREE shutting out non-functional updates -- --- the following two tests seem to take a long time on some +-- the following two tests seem to take a long time on some -- systems. This non-func update stuff needs to be examined -- more closely. - jolly (2/22/96) --- +-- UPDATE tmp SET stringu1 = reverse_name(onek.stringu1) FROM onek @@ -136,7 +136,7 @@ SELECT * FROM a_star*; f | (50 rows) -SELECT * +SELECT * FROM b_star* x WHERE x.b = text 'bumble' or x.a < 3; class | a | b @@ -144,8 +144,8 @@ SELECT * b | | bumble (1 row) -SELECT class, a - FROM c_star* x +SELECT class, a + FROM c_star* x WHERE x.c ~ text 'hi'; class | a -------+---- @@ -309,7 +309,7 @@ SELECT class, foo (25 rows) ALTER TABLE a_star RENAME COLUMN foo TO aa; -SELECT * +SELECT * from a_star* WHERE aa < 1000; class | aa diff --git a/src/test/regress/sql/abstime.sql b/src/test/regress/sql/abstime.sql index cbaeb62957..4ab821b1b8 100644 --- a/src/test/regress/sql/abstime.sql +++ b/src/test/regress/sql/abstime.sql @@ -6,7 +6,7 @@ -- -- timezones may vary based not only on location but the operating --- system. the main correctness issue is that the OS may not get +-- system. the main correctness issue is that the OS may not get -- daylight savings time right for times prior to Unix epoch (jan 1 1970). -- @@ -27,11 +27,11 @@ INSERT INTO ABSTIME_TBL (f1) VALUES (abstime 'infinity'); INSERT INTO ABSTIME_TBL (f1) VALUES (abstime '-infinity'); INSERT INTO ABSTIME_TBL (f1) VALUES (abstime 'May 10, 1947 23:59:12'); --- what happens if we specify slightly misformatted abstime? +-- what happens if we specify slightly misformatted abstime? INSERT INTO ABSTIME_TBL (f1) VALUES ('Feb 35, 1946 10:00:00'); INSERT INTO ABSTIME_TBL (f1) VALUES ('Feb 28, 1984 25:08:10'); --- badly formatted abstimes: these should result in invalid abstimes +-- badly formatted abstimes: these should result in invalid abstimes INSERT INTO ABSTIME_TBL (f1) VALUES ('bad date format'); INSERT INTO ABSTIME_TBL (f1) VALUES ('Jun 10, 1843'); diff --git a/src/test/regress/sql/aggregates.sql b/src/test/regress/sql/aggregates.sql index 3825d7b302..232649937a 100644 --- a/src/test/regress/sql/aggregates.sql +++ b/src/test/regress/sql/aggregates.sql @@ -99,7 +99,7 @@ CREATE TEMPORARY TABLE bitwise_test( ); -- empty case -SELECT +SELECT BIT_AND(i2) AS "?", BIT_OR(i4) AS "?" FROM bitwise_test; @@ -159,7 +159,7 @@ SELECT boolor_statefunc(FALSE, TRUE) AS "t", NOT boolor_statefunc(FALSE, FALSE) AS "t"; -CREATE TEMPORARY TABLE bool_test( +CREATE TEMPORARY TABLE bool_test( b1 BOOL, b2 BOOL, b3 BOOL, diff --git a/src/test/regress/sql/alter_table.sql b/src/test/regress/sql/alter_table.sql index 3e1646a96d..c6015cbb40 100644 --- a/src/test/regress/sql/alter_table.sql +++ b/src/test/regress/sql/alter_table.sql @@ -62,8 +62,8 @@ ALTER TABLE tmp ADD COLUMN z int2[]; INSERT INTO tmp (a, b, c, d, e, f, g, h, i, j, k, l, m, n, p, q, r, s, t, u, v, w, x, y, z) - VALUES (4, 'name', 'text', 4.1, 4.1, 2, '(4.1,4.1,3.1,3.1)', - 'Mon May 1 00:30:30 1995', 'c', '{Mon May 1 00:30:30 1995, Monday Aug 24 14:43:07 1992, epoch}', + VALUES (4, 'name', 'text', 4.1, 4.1, 2, '(4.1,4.1,3.1,3.1)', + 'Mon May 1 00:30:30 1995', 'c', '{Mon May 1 00:30:30 1995, Monday Aug 24 14:43:07 1992, epoch}', 314159, '(1,1)', '512', '1 2 3 4 5 6 7 8', 'magnetic disk', '(1.1,1.1)', '(4.1,4.1,3.1,3.1)', '(0,2,4.1,4.1,3.1,3.1)', '(4.1,4.1,3.1,3.1)', '["epoch" "infinity"]', @@ -73,7 +73,7 @@ SELECT * FROM tmp; DROP TABLE tmp; --- the wolf bug - schema mods caused inconsistent row descriptors +-- the wolf bug - schema mods caused inconsistent row descriptors CREATE TABLE tmp ( initial int4 ); @@ -131,8 +131,8 @@ ALTER TABLE tmp ADD COLUMN z int2[]; INSERT INTO tmp (a, b, c, d, e, f, g, h, i, j, k, l, m, n, p, q, r, s, t, u, v, w, x, y, z) - VALUES (4, 'name', 'text', 4.1, 4.1, 2, '(4.1,4.1,3.1,3.1)', - 'Mon May 1 00:30:30 1995', 'c', '{Mon May 1 00:30:30 1995, Monday Aug 24 14:43:07 1992, epoch}', + VALUES (4, 'name', 'text', 4.1, 4.1, 2, '(4.1,4.1,3.1,3.1)', + 'Mon May 1 00:30:30 1995', 'c', '{Mon May 1 00:30:30 1995, Monday Aug 24 14:43:07 1992, epoch}', 314159, '(1,1)', '512', '1 2 3 4 5 6 7 8', 'magnetic disk', '(1.1,1.1)', '(4.1,4.1,3.1,3.1)', '(0,2,4.1,4.1,3.1,3.1)', '(4.1,4.1,3.1,3.1)', '["epoch" "infinity"]', @@ -176,7 +176,7 @@ ALTER TABLE tmp_view RENAME TO tmp_view_new; ANALYZE tenk1; set enable_seqscan to off; set enable_bitmapscan to off; --- 5 values, sorted +-- 5 values, sorted SELECT unique1 FROM tenk1 WHERE unique1 < 5; reset enable_seqscan; reset enable_bitmapscan; @@ -1053,7 +1053,7 @@ insert into anothertab (atcol1, atcol2) values (default, null); select * from anothertab; alter table anothertab alter column atcol2 type text - using case when atcol2 is true then 'IT WAS TRUE' + using case when atcol2 is true then 'IT WAS TRUE' when atcol2 is false then 'IT WAS FALSE' else 'IT WAS NULL!' end; diff --git a/src/test/regress/sql/arrays.sql b/src/test/regress/sql/arrays.sql index a75b8c4d2d..b0c096d9e5 100644 --- a/src/test/regress/sql/arrays.sql +++ b/src/test/regress/sql/arrays.sql @@ -6,7 +6,7 @@ CREATE TABLE arrtest ( a int2[], b int4[][][], c name[], - d text[][], + d text[][], e float8[], f char(5)[], g varchar(5)[] @@ -27,7 +27,7 @@ INSERT INTO arrtest (f) VALUES ('{"too long"}'); INSERT INTO arrtest (a, b[1:2][1:2], c, d, e, f, g) - VALUES ('{11,12,23}', '{{3,4},{4,5}}', '{"foobar"}', + VALUES ('{11,12,23}', '{{3,4},{4,5}}', '{"foobar"}', '{{"elt1", "elt2"}}', '{"3.4", "6.7"}', '{"abc","abcde"}', '{"abc","abcde"}'); @@ -40,7 +40,7 @@ SELECT * FROM arrtest; SELECT arrtest.a[1], arrtest.b[1][1][1], arrtest.c[1], - arrtest.d[1][1], + arrtest.d[1][1], arrtest.e[0] FROM arrtest; @@ -49,7 +49,7 @@ SELECT a[1], b[1][1][1], c[1], d[1][1], e[0] SELECT a[1:3], b[1:1][1:2][1:2], - c[1:2], + c[1:2], d[1:1][1:2] FROM arrtest; @@ -59,10 +59,10 @@ SELECT array_ndims(a) AS a,array_ndims(b) AS b,array_ndims(c) AS c SELECT array_dims(a) AS a,array_dims(b) AS b,array_dims(c) AS c FROM arrtest; --- returns nothing +-- returns nothing SELECT * FROM arrtest - WHERE a[1] < 5 and + WHERE a[1] < 5 and c = '{"foobar"}'::_name; UPDATE arrtest @@ -82,7 +82,7 @@ SELECT a,b,c FROM arrtest; SELECT a[1:3], b[1:1][1:2][1:2], - c[1:2], + c[1:2], d[1:1][2:2] FROM arrtest; @@ -346,12 +346,12 @@ drop type _comptype; drop table comptable; drop type comptype; -create or replace function unnest1(anyarray) +create or replace function unnest1(anyarray) returns setof anyelement as $$ select $1[s] from generate_subscripts($1,1) g(s); $$ language sql immutable; -create or replace function unnest2(anyarray) +create or replace function unnest2(anyarray) returns setof anyelement as $$ select $1[s1][s2] from generate_subscripts($1,1) g1(s1), generate_subscripts($1,2) g2(s2); diff --git a/src/test/regress/sql/bit.sql b/src/test/regress/sql/bit.sql index 73ddd379c0..419d47c8b7 100644 --- a/src/test/regress/sql/bit.sql +++ b/src/test/regress/sql/bit.sql @@ -16,7 +16,7 @@ INSERT INTO BIT_TABLE VALUES (B'101011111010'); -- too long --INSERT INTO BIT_TABLE VALUES ('X554'); --INSERT INTO BIT_TABLE VALUES ('X555'); -SELECT * FROM BIT_TABLE; +SELECT * FROM BIT_TABLE; CREATE TABLE VARBIT_TABLE(v BIT VARYING(11)); @@ -27,12 +27,12 @@ INSERT INTO VARBIT_TABLE VALUES (B'01010101010'); INSERT INTO VARBIT_TABLE VALUES (B'101011111010'); -- too long --INSERT INTO VARBIT_TABLE VALUES ('X554'); --INSERT INTO VARBIT_TABLE VALUES ('X555'); -SELECT * FROM VARBIT_TABLE; +SELECT * FROM VARBIT_TABLE; -- Concatenation SELECT v, b, (v || b) AS concat - FROM BIT_TABLE, VARBIT_TABLE + FROM BIT_TABLE, VARBIT_TABLE ORDER BY 3; -- Length @@ -69,7 +69,7 @@ XFA50 X05AF X1234 XFFF5 \. -SELECT a, b, ~a AS "~ a", a & b AS "a & b", +SELECT a, b, ~a AS "~ a", a & b AS "a & b", a | b AS "a | b", a # b AS "a # b" FROM varbit_table; SELECT a,b,a=b AS "a>=b",a>b AS "a>b",a<>b AS "a<>b" FROM varbit_table; @@ -93,7 +93,7 @@ XFA50 X05AF X1234 XFFF5 \. -SELECT a,b,~a AS "~ a",a & b AS "a & b", +SELECT a,b,~a AS "~ a",a & b AS "a & b", a|b AS "a | b", a # b AS "a # b" FROM bit_table; SELECT a,b,a=b AS "a>=b",a>b AS "a>b",a<>b AS "a<>b" FROM bit_table; @@ -166,7 +166,7 @@ INSERT INTO BIT_SHIFT_TABLE SELECT b>>4 FROM BIT_SHIFT_TABLE; INSERT INTO BIT_SHIFT_TABLE SELECT b>>8 FROM BIT_SHIFT_TABLE; SELECT POSITION(B'1101' IN b), POSITION(B'11011' IN b), - b + b FROM BIT_SHIFT_TABLE ; @@ -178,7 +178,7 @@ INSERT INTO VARBIT_SHIFT_TABLE SELECT CAST(v || B'0000' AS BIT VARYING(12)) >>4 INSERT INTO VARBIT_SHIFT_TABLE SELECT CAST(v || B'00000000' AS BIT VARYING(20)) >>8 FROM VARBIT_SHIFT_TABLE; SELECT POSITION(B'1101' IN v), POSITION(B'11011' IN v), - v + v FROM VARBIT_SHIFT_TABLE ; diff --git a/src/test/regress/sql/bitmapops.sql b/src/test/regress/sql/bitmapops.sql index 0b5477e8e1..498f4721b5 100644 --- a/src/test/regress/sql/bitmapops.sql +++ b/src/test/regress/sql/bitmapops.sql @@ -14,7 +14,7 @@ CREATE TABLE bmscantest (a int, b int, t text); -INSERT INTO bmscantest +INSERT INTO bmscantest SELECT (r%53), (r%59), 'foooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo' FROM generate_series(1,70000) r; diff --git a/src/test/regress/sql/boolean.sql b/src/test/regress/sql/boolean.sql index a605302e12..d92a41ffe1 100644 --- a/src/test/regress/sql/boolean.sql +++ b/src/test/regress/sql/boolean.sql @@ -100,7 +100,7 @@ INSERT INTO BOOLTBL1 (f1) VALUES (bool 'True'); INSERT INTO BOOLTBL1 (f1) VALUES (bool 'true'); --- BOOLTBL1 should be full of true's at this point +-- BOOLTBL1 should be full of true's at this point SELECT '' AS t_3, BOOLTBL1.* FROM BOOLTBL1; @@ -109,7 +109,7 @@ SELECT '' AS t_3, BOOLTBL1.* WHERE f1 = bool 'true'; -SELECT '' AS t_3, BOOLTBL1.* +SELECT '' AS t_3, BOOLTBL1.* FROM BOOLTBL1 WHERE f1 <> bool 'false'; @@ -119,7 +119,7 @@ SELECT '' AS zero, BOOLTBL1.* INSERT INTO BOOLTBL1 (f1) VALUES (bool 'f'); -SELECT '' AS f_1, BOOLTBL1.* +SELECT '' AS f_1, BOOLTBL1.* FROM BOOLTBL1 WHERE f1 = bool 'false'; @@ -136,10 +136,10 @@ INSERT INTO BOOLTBL2 (f1) VALUES (bool 'FALSE'); -- This is now an invalid expression -- For pre-v6.3 this evaluated to false - thomas 1997-10-23 -INSERT INTO BOOLTBL2 (f1) - VALUES (bool 'XXX'); +INSERT INTO BOOLTBL2 (f1) + VALUES (bool 'XXX'); --- BOOLTBL2 should be full of false's at this point +-- BOOLTBL2 should be full of false's at this point SELECT '' AS f_4, BOOLTBL2.* FROM BOOLTBL2; diff --git a/src/test/regress/sql/box.sql b/src/test/regress/sql/box.sql index f1ff8158b0..234c2f28a3 100644 --- a/src/test/regress/sql/box.sql +++ b/src/test/regress/sql/box.sql @@ -25,13 +25,13 @@ INSERT INTO BOX_TBL (f1) VALUES ('(2.0,2.0,0.0,0.0)'); INSERT INTO BOX_TBL (f1) VALUES ('(1.0,1.0,3.0,3.0)'); --- degenerate cases where the box is a line or a point --- note that lines and points boxes all have zero area +-- degenerate cases where the box is a line or a point +-- note that lines and points boxes all have zero area INSERT INTO BOX_TBL (f1) VALUES ('(2.5, 2.5, 2.5,3.5)'); INSERT INTO BOX_TBL (f1) VALUES ('(3.0, 3.0,3.0,3.0)'); --- badly formatted box inputs +-- badly formatted box inputs INSERT INTO BOX_TBL (f1) VALUES ('(2.3, 4.5)'); INSERT INTO BOX_TBL (f1) VALUES ('asdfasdf(ad'); @@ -42,78 +42,78 @@ SELECT '' AS four, * FROM BOX_TBL; SELECT '' AS four, b.*, area(b.f1) as barea FROM BOX_TBL b; --- overlap +-- overlap SELECT '' AS three, b.f1 - FROM BOX_TBL b + FROM BOX_TBL b WHERE b.f1 && box '(2.5,2.5,1.0,1.0)'; --- left-or-overlap (x only) +-- left-or-overlap (x only) SELECT '' AS two, b1.* FROM BOX_TBL b1 WHERE b1.f1 &< box '(2.0,2.0,2.5,2.5)'; --- right-or-overlap (x only) +-- right-or-overlap (x only) SELECT '' AS two, b1.* FROM BOX_TBL b1 WHERE b1.f1 &> box '(2.0,2.0,2.5,2.5)'; --- left of +-- left of SELECT '' AS two, b.f1 FROM BOX_TBL b WHERE b.f1 << box '(3.0,3.0,5.0,5.0)'; --- area <= +-- area <= SELECT '' AS four, b.f1 FROM BOX_TBL b WHERE b.f1 <= box '(3.0,3.0,5.0,5.0)'; --- area < +-- area < SELECT '' AS two, b.f1 FROM BOX_TBL b WHERE b.f1 < box '(3.0,3.0,5.0,5.0)'; --- area = +-- area = SELECT '' AS two, b.f1 FROM BOX_TBL b WHERE b.f1 = box '(3.0,3.0,5.0,5.0)'; --- area > +-- area > SELECT '' AS two, b.f1 - FROM BOX_TBL b -- zero area - WHERE b.f1 > box '(3.5,3.0,4.5,3.0)'; + FROM BOX_TBL b -- zero area + WHERE b.f1 > box '(3.5,3.0,4.5,3.0)'; --- area >= +-- area >= SELECT '' AS four, b.f1 - FROM BOX_TBL b -- zero area + FROM BOX_TBL b -- zero area WHERE b.f1 >= box '(3.5,3.0,4.5,3.0)'; --- right of +-- right of SELECT '' AS two, b.f1 FROM BOX_TBL b WHERE box '(3.0,3.0,5.0,5.0)' >> b.f1; --- contained in +-- contained in SELECT '' AS three, b.f1 FROM BOX_TBL b WHERE b.f1 <@ box '(0,0,3,3)'; --- contains +-- contains SELECT '' AS three, b.f1 FROM BOX_TBL b WHERE box '(0,0,3,3)' @> b.f1; --- box equality +-- box equality SELECT '' AS one, b.f1 FROM BOX_TBL b WHERE box '(1,1,3,3)' ~= b.f1; --- center of box, left unary operator +-- center of box, left unary operator SELECT '' AS four, @@(b1.f1) AS p FROM BOX_TBL b1; --- wholly-contained +-- wholly-contained SELECT '' AS one, b1.*, b2.* - FROM BOX_TBL b1, BOX_TBL b2 + FROM BOX_TBL b1, BOX_TBL b2 WHERE b1.f1 @> b2.f1 and not b1.f1 ~= b2.f1; SELECT '' AS four, height(f1), width(f1) FROM BOX_TBL; diff --git a/src/test/regress/sql/char.sql b/src/test/regress/sql/char.sql index fcaef7e086..235ec62823 100644 --- a/src/test/regress/sql/char.sql +++ b/src/test/regress/sql/char.sql @@ -17,17 +17,17 @@ INSERT INTO CHAR_TBL (f1) VALUES ('a'); INSERT INTO CHAR_TBL (f1) VALUES ('A'); --- any of the following three input formats are acceptable +-- any of the following three input formats are acceptable INSERT INTO CHAR_TBL (f1) VALUES ('1'); INSERT INTO CHAR_TBL (f1) VALUES (2); INSERT INTO CHAR_TBL (f1) VALUES ('3'); --- zero-length char +-- zero-length char INSERT INTO CHAR_TBL (f1) VALUES (''); --- try char's of greater than 1 length +-- try char's of greater than 1 length INSERT INTO CHAR_TBL (f1) VALUES ('cd'); INSERT INTO CHAR_TBL (f1) VALUES ('c '); diff --git a/src/test/regress/sql/cluster.sql b/src/test/regress/sql/cluster.sql index 3dea2e4b29..8d536c8c36 100644 --- a/src/test/regress/sql/cluster.sql +++ b/src/test/regress/sql/cluster.sql @@ -174,7 +174,7 @@ UPDATE clustertest SET key = 100 WHERE key = 10; -- Test update where the new row version is found first in the scan UPDATE clustertest SET key = 35 WHERE key = 40; --- Test longer update chain +-- Test longer update chain UPDATE clustertest SET key = 60 WHERE key = 50; UPDATE clustertest SET key = 70 WHERE key = 60; UPDATE clustertest SET key = 80 WHERE key = 70; diff --git a/src/test/regress/sql/copyselect.sql b/src/test/regress/sql/copyselect.sql index beca507ae7..621d49444d 100644 --- a/src/test/regress/sql/copyselect.sql +++ b/src/test/regress/sql/copyselect.sql @@ -70,7 +70,7 @@ copy (select t from test1 where id = 1) to stdout csv header force quote t; -- This should fail -- \copy v_test1 to stdout --- +-- -- Test \copy (select ...) -- \copy (select "id",'id','id""'||t,(id + 1)*id,t,"test1"."t" from test1 where id=3) to stdout diff --git a/src/test/regress/sql/create_aggregate.sql b/src/test/regress/sql/create_aggregate.sql index 6174248252..84f9a4f1e0 100644 --- a/src/test/regress/sql/create_aggregate.sql +++ b/src/test/regress/sql/create_aggregate.sql @@ -4,7 +4,7 @@ -- all functions CREATEd CREATE AGGREGATE newavg ( - sfunc = int4_avg_accum, basetype = int4, stype = _int8, + sfunc = int4_avg_accum, basetype = int4, stype = _int8, finalfunc = int8_avg, initcond1 = '{0,0}' ); @@ -16,7 +16,7 @@ COMMENT ON AGGREGATE newavg (int4) IS NULL; -- without finalfunc; test obsolete spellings 'sfunc1' etc CREATE AGGREGATE newsum ( - sfunc1 = int4pl, basetype = int4, stype1 = int4, + sfunc1 = int4pl, basetype = int4, stype1 = int4, initcond1 = '0' ); diff --git a/src/test/regress/sql/create_index.sql b/src/test/regress/sql/create_index.sql index a4261c0f5e..abf222de8e 100644 --- a/src/test/regress/sql/create_index.sql +++ b/src/test/regress/sql/create_index.sql @@ -80,8 +80,8 @@ CREATE INDEX gpointind ON point_tbl USING gist (f1); CREATE TEMP TABLE gpolygon_tbl AS SELECT polygon(home_base) AS f1 FROM slow_emp4000; -INSERT INTO gpolygon_tbl VALUES ( '(1000,0,0,1000)' ); -INSERT INTO gpolygon_tbl VALUES ( '(0,1000,1000,1000)' ); +INSERT INTO gpolygon_tbl VALUES ( '(1000,0,0,1000)' ); +INSERT INTO gpolygon_tbl VALUES ( '(0,1000,1000,1000)' ); CREATE TEMP TABLE gcircle_tbl AS SELECT circle(home_base) AS f1 FROM slow_emp4000; @@ -424,5 +424,5 @@ SELECT count(*) FROM onek_with_null WHERE unique1 IS NULL AND unique2 IS NOT NUL RESET enable_seqscan; RESET enable_indexscan; RESET enable_bitmapscan; - + DROP TABLE onek_with_null; diff --git a/src/test/regress/sql/create_misc.sql b/src/test/regress/sql/create_misc.sql index 40c9b417d9..705a7e55b1 100644 --- a/src/test/regress/sql/create_misc.sql +++ b/src/test/regress/sql/create_misc.sql @@ -42,14 +42,14 @@ SELECT * FROM road WHERE name ~ '.*Ramp'; -INSERT INTO ihighway - SELECT * - FROM road +INSERT INTO ihighway + SELECT * + FROM road WHERE name ~ 'I- .*'; -INSERT INTO shighway - SELECT * - FROM road +INSERT INTO shighway + SELECT * + FROM road WHERE name ~ 'State Hwy.*'; UPDATE shighway @@ -154,7 +154,7 @@ INSERT INTO f_star (class, a, e, f) VALUES ('f', 22, '-7'::int2, '(111,555),(222,666),(333,777),(444,888)'::polygon); INSERT INTO f_star (class, c, e, f) - VALUES ('f', 'hi keith'::name, '-8'::int2, + VALUES ('f', 'hi keith'::name, '-8'::int2, '(1111,3333),(2222,4444)'::polygon); INSERT INTO f_star (class, a, c) @@ -164,7 +164,7 @@ INSERT INTO f_star (class, a, e) VALUES ('f', 25, '-9'::int2); INSERT INTO f_star (class, a, f) - VALUES ('f', 26, '(11111,33333),(22222,44444)'::polygon); + VALUES ('f', 26, '(11111,33333),(22222,44444)'::polygon); INSERT INTO f_star (class, c, e) VALUES ('f', 'hi allison'::name, '-10'::int2); @@ -182,7 +182,7 @@ INSERT INTO f_star (class, c) VALUES ('f', 'hi carl'::name); INSERT INTO f_star (class, e) VALUES ('f', '-12'::int2); -INSERT INTO f_star (class, f) +INSERT INTO f_star (class, f) VALUES ('f', '(11111111,33333333),(22222222,44444444)'::polygon); INSERT INTO f_star (class) VALUES ('f'); @@ -192,8 +192,8 @@ INSERT INTO f_star (class) VALUES ('f'); -- for internal portal (cursor) tests -- CREATE TABLE iportaltest ( - i int4, - d float4, + i int4, + d float4, p polygon ); diff --git a/src/test/regress/sql/create_operator.sql b/src/test/regress/sql/create_operator.sql index 5ce8128a24..dcad804eec 100644 --- a/src/test/regress/sql/create_operator.sql +++ b/src/test/regress/sql/create_operator.sql @@ -2,11 +2,11 @@ -- CREATE_OPERATOR -- -CREATE OPERATOR ## ( +CREATE OPERATOR ## ( leftarg = path, rightarg = path, procedure = path_inter, - commutator = ## + commutator = ## ); CREATE OPERATOR <% ( @@ -14,12 +14,12 @@ CREATE OPERATOR <% ( rightarg = widget, procedure = pt_in_widget, commutator = >% , - negator = >=% + negator = >=% ); CREATE OPERATOR @#@ ( - rightarg = int8, -- left unary - procedure = numeric_fac + rightarg = int8, -- left unary + procedure = numeric_fac ); CREATE OPERATOR #@# ( @@ -27,9 +27,9 @@ CREATE OPERATOR #@# ( procedure = numeric_fac ); -CREATE OPERATOR #%# ( - leftarg = int8, -- right unary - procedure = numeric_fac +CREATE OPERATOR #%# ( + leftarg = int8, -- right unary + procedure = numeric_fac ); -- Test comments diff --git a/src/test/regress/sql/create_table.sql b/src/test/regress/sql/create_table.sql index f491e8c142..e622b1f0f5 100644 --- a/src/test/regress/sql/create_table.sql +++ b/src/test/regress/sql/create_table.sql @@ -6,7 +6,7 @@ -- CLASS DEFINITIONS -- CREATE TABLE hobbies_r ( - name text, + name text, person text ); @@ -143,7 +143,7 @@ CREATE TABLE real_city ( -- f inherits from e (three-level single inheritance) -- CREATE TABLE a_star ( - class char, + class char, a int4 ); @@ -194,7 +194,7 @@ CREATE TABLE hash_f8_heap ( -- don't include the hash_ovfl_heap stuff in the distribution -- the data set is too large for what it's worth --- +-- -- CREATE TABLE hash_ovfl_heap ( -- x int4, -- y int4 @@ -216,7 +216,7 @@ CREATE TABLE bt_txt_heap ( ); CREATE TABLE bt_f8_heap ( - seqno float8, + seqno float8, random int4 ); @@ -232,11 +232,11 @@ CREATE TABLE array_index_op_test ( t text[] ); -CREATE TABLE IF NOT EXISTS test_tsvector( - t text, - a tsvector +CREATE TABLE IF NOT EXISTS test_tsvector( + t text, + a tsvector ); -CREATE TABLE IF NOT EXISTS test_tsvector( +CREATE TABLE IF NOT EXISTS test_tsvector( t text ); diff --git a/src/test/regress/sql/create_type.sql b/src/test/regress/sql/create_type.sql index c667313c71..a4906b64e1 100644 --- a/src/test/regress/sql/create_type.sql +++ b/src/test/regress/sql/create_type.sql @@ -8,7 +8,7 @@ -- of the "old style" approach of making the functions first. -- CREATE TYPE widget ( - internallength = 24, + internallength = 24, input = widget_in, output = widget_out, typmod_in = numerictypmodin, @@ -16,10 +16,10 @@ CREATE TYPE widget ( alignment = double ); -CREATE TYPE city_budget ( - internallength = 16, - input = int44in, - output = int44out, +CREATE TYPE city_budget ( + internallength = 16, + input = int44in, + output = int44out, element = int4, category = 'x', -- just to verify the system will take it preferred = true -- ditto diff --git a/src/test/regress/sql/create_view.sql b/src/test/regress/sql/create_view.sql index f8942c93f5..86cfc5162c 100644 --- a/src/test/regress/sql/create_view.sql +++ b/src/test/regress/sql/create_view.sql @@ -5,12 +5,12 @@ -- CREATE VIEW street AS - SELECT r.name, r.thepath, c.cname AS cname + SELECT r.name, r.thepath, c.cname AS cname FROM ONLY road r, real_city c WHERE c.outline ## r.thepath; CREATE VIEW iexit AS - SELECT ih.name, ih.thepath, + SELECT ih.name, ih.thepath, interpt_pp(ih.thepath, r.thepath) AS exit FROM ihighway ih, ramp r WHERE ih.thepath ## r.thepath; @@ -61,7 +61,7 @@ CREATE OR REPLACE VIEW viewtest AS CREATE OR REPLACE VIEW viewtest AS SELECT a, b::numeric FROM viewtest_tbl; --- should work +-- should work CREATE OR REPLACE VIEW viewtest AS SELECT a, b, 0 AS c FROM viewtest_tbl; @@ -135,11 +135,11 @@ CREATE VIEW v9 AS SELECT seq1.is_called FROM seq1; CREATE VIEW v13_temp AS SELECT seq1_temp.is_called FROM seq1_temp; SELECT relname FROM pg_class - WHERE relname LIKE 'v_' + WHERE relname LIKE 'v_' AND relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = 'temp_view_test') ORDER BY relname; SELECT relname FROM pg_class - WHERE relname LIKE 'v%' + WHERE relname LIKE 'v%' AND relnamespace IN (SELECT oid FROM pg_namespace WHERE nspname LIKE 'pg_temp%') ORDER BY relname; @@ -164,7 +164,7 @@ SELECT relname FROM pg_class AND relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = 'testviewschm2') ORDER BY relname; SELECT relname FROM pg_class - WHERE relname LIKE 'temporal%' + WHERE relname LIKE 'temporal%' AND relnamespace IN (SELECT oid FROM pg_namespace WHERE nspname LIKE 'pg_temp%') ORDER BY relname; diff --git a/src/test/regress/sql/drop.sql b/src/test/regress/sql/drop.sql index 5df1b6adce..da9297d8b6 100644 --- a/src/test/regress/sql/drop.sql +++ b/src/test/regress/sql/drop.sql @@ -5,7 +5,7 @@ -- -- this will fail if the user is not the postgres superuser. -- if it does, don't worry about it (you can turn usersuper --- back on as "postgres"). too many people don't follow +-- back on as "postgres"). too many people don't follow -- directions and run this as "postgres", though... -- UPDATE pg_user @@ -47,14 +47,14 @@ DROP OPERATOR ## (path, path); DROP OPERATOR <% (point, widget); --- left unary +-- left unary DROP OPERATOR @#@ (none, int4); --- right unary -DROP OPERATOR #@# (int4, none); +-- right unary +DROP OPERATOR #@# (int4, none); --- right unary -DROP OPERATOR #%# (int4, none); +-- right unary +DROP OPERATOR #%# (int4, none); -- diff --git a/src/test/regress/sql/drop_if_exists.sql b/src/test/regress/sql/drop_if_exists.sql index 62b3f579a5..3d7e46cf2e 100644 --- a/src/test/regress/sql/drop_if_exists.sql +++ b/src/test/regress/sql/drop_if_exists.sql @@ -1,6 +1,6 @@ --- +-- -- IF EXISTS tests --- +-- -- table (will be really dropped at the end) diff --git a/src/test/regress/sql/errors.sql b/src/test/regress/sql/errors.sql index cf63474160..2ee707c5c7 100644 --- a/src/test/regress/sql/errors.sql +++ b/src/test/regress/sql/errors.sql @@ -8,18 +8,18 @@ select 1; -- -- UNSUPPORTED STUFF - --- doesn't work + +-- doesn't work -- notify pg_class -- -- -- SELECT - --- missing relation name + +-- missing relation name select; --- no such relation +-- no such relation select * from nonesuch; -- missing target list @@ -43,74 +43,74 @@ select distinct on (foobar) * from pg_database; -- -- DELETE - --- missing relation name (this had better not wildcard!) + +-- missing relation name (this had better not wildcard!) delete from; --- no such relation +-- no such relation delete from nonesuch; -- -- DROP - --- missing relation name (this had better not wildcard!) + +-- missing relation name (this had better not wildcard!) drop table; --- no such relation +-- no such relation drop table nonesuch; -- -- ALTER TABLE - --- relation renaming --- missing relation name +-- relation renaming + +-- missing relation name alter table rename; --- no such relation +-- no such relation alter table nonesuch rename to newnonesuch; --- no such relation +-- no such relation alter table nonesuch rename to stud_emp; --- conflict +-- conflict alter table stud_emp rename to aggtest; --- self-conflict +-- self-conflict alter table stud_emp rename to stud_emp; --- attribute renaming +-- attribute renaming --- no such relation +-- no such relation alter table nonesuchrel rename column nonesuchatt to newnonesuchatt; --- no such attribute +-- no such attribute alter table emp rename column nonesuchatt to newnonesuchatt; --- conflict +-- conflict alter table emp rename column salary to manager; --- conflict +-- conflict alter table emp rename column salary to oid; -- -- TRANSACTION STUFF - --- not in a xact + +-- not in a xact abort; --- not in a xact +-- not in a xact end; -- -- CREATE AGGREGATE --- sfunc/finalfunc type disagreement +-- sfunc/finalfunc type disagreement create aggregate newavg2 (sfunc = int4pl, basetype = int4, stype = int4, @@ -125,33 +125,33 @@ create aggregate newcnt1 (sfunc = int4inc, -- -- DROP INDEX - --- missing index name + +-- missing index name drop index; --- bad index name +-- bad index name drop index 314159; --- no such index +-- no such index drop index nonesuch; -- -- DROP AGGREGATE - --- missing aggregate name + +-- missing aggregate name drop aggregate; -- missing aggregate type drop aggregate newcnt1; --- bad aggregate name +-- bad aggregate name drop aggregate 314159 (int); -- bad aggregate type drop aggregate newcnt (nonesuch); --- no such aggregate +-- no such aggregate drop aggregate nonesuch (int4); -- no such aggregate for type @@ -160,83 +160,83 @@ drop aggregate newcnt (float4); -- -- DROP FUNCTION - --- missing function name + +-- missing function name drop function (); --- bad function name +-- bad function name drop function 314159(); --- no such function +-- no such function drop function nonesuch(); -- -- DROP TYPE - --- missing type name + +-- missing type name drop type; --- bad type name +-- bad type name drop type 314159; --- no such type +-- no such type drop type nonesuch; -- -- DROP OPERATOR - --- missing everything + +-- missing everything drop operator; --- bad operator name +-- bad operator name drop operator equals; --- missing type list +-- missing type list drop operator ===; --- missing parentheses +-- missing parentheses drop operator int4, int4; --- missing operator name +-- missing operator name drop operator (int4, int4); --- missing type list contents +-- missing type list contents drop operator === (); --- no such operator +-- no such operator drop operator === (int4); --- no such operator by that name +-- no such operator by that name drop operator === (int4, int4); --- no such type1 +-- no such type1 drop operator = (nonesuch); --- no such type1 +-- no such type1 drop operator = ( , int4); --- no such type1 +-- no such type1 drop operator = (nonesuch, int4); --- no such type2 +-- no such type2 drop operator = (int4, nonesuch); --- no such type2 +-- no such type2 drop operator = (int4, ); -- -- DROP RULE - --- missing rule name + +-- missing rule name drop rule; --- bad rule name +-- bad rule name drop rule 314159; --- no such rule +-- no such rule drop rule nonesuch on noplace; -- these postquel variants are no longer supported @@ -289,7 +289,7 @@ INSERT INTO foo VALUES(123) foo; INSERT INTO 123 VALUES(123); -INSERT INTO foo +INSERT INTO foo VALUES(123) 123 ; @@ -300,7 +300,7 @@ CREATE TABLE foo id4 INT4 UNIQUE NOT NULL, id5 TEXT UNIQUE NOT NULL); -- long line to be truncated on the left -CREATE TABLE foo(id INT4 UNIQUE NOT NULL, id2 TEXT NOT NULL PRIMARY KEY, id3 INTEGER NOT NUL, +CREATE TABLE foo(id INT4 UNIQUE NOT NULL, id2 TEXT NOT NULL PRIMARY KEY, id3 INTEGER NOT NUL, id4 INT4 UNIQUE NOT NULL, id5 TEXT UNIQUE NOT NULL); -- long line to be truncated on the right @@ -313,59 +313,59 @@ CREATE TABLE foo(id INT4 UNIQUE NOT NULL, id2 TEXT NOT NULL PRIMARY KEY, id3 INT -- long line to be truncated on the left, many lines CREATE TEMPORARY -TABLE -foo(id INT4 UNIQUE NOT NULL, id2 TEXT NOT NULL PRIMARY KEY, id3 INTEGER NOT NUL, -id4 INT4 -UNIQUE -NOT -NULL, -id5 TEXT -UNIQUE -NOT +TABLE +foo(id INT4 UNIQUE NOT NULL, id2 TEXT NOT NULL PRIMARY KEY, id3 INTEGER NOT NUL, +id4 INT4 +UNIQUE +NOT +NULL, +id5 TEXT +UNIQUE +NOT NULL) ; -- long line to be truncated on the right, many lines -CREATE +CREATE TEMPORARY -TABLE +TABLE foo( id3 INTEGER NOT NUL, id4 INT4 UNIQUE NOT NULL, id5 TEXT UNIQUE NOT NULL, id INT4 UNIQUE NOT NULL, id2 TEXT NOT NULL PRIMARY KEY) ; -- long line to be truncated both ways, many lines -CREATE +CREATE TEMPORARY -TABLE +TABLE foo -(id -INT4 -UNIQUE NOT NULL, idx INT4 UNIQUE NOT NULL, idy INT4 UNIQUE NOT NULL, id2 TEXT NOT NULL PRIMARY KEY, id3 INTEGER NOT NUL, id4 INT4 UNIQUE NOT NULL, id5 TEXT UNIQUE NOT NULL, -idz INT4 UNIQUE NOT NULL, +(id +INT4 +UNIQUE NOT NULL, idx INT4 UNIQUE NOT NULL, idy INT4 UNIQUE NOT NULL, id2 TEXT NOT NULL PRIMARY KEY, id3 INTEGER NOT NUL, id4 INT4 UNIQUE NOT NULL, id5 TEXT UNIQUE NOT NULL, +idz INT4 UNIQUE NOT NULL, idv INT4 UNIQUE NOT NULL); -- more than 10 lines... -CREATE +CREATE TEMPORARY -TABLE +TABLE foo -(id -INT4 -UNIQUE -NOT +(id +INT4 +UNIQUE +NOT NULL -, +, idm -INT4 -UNIQUE -NOT +INT4 +UNIQUE +NOT NULL, -idx INT4 UNIQUE NOT NULL, idy INT4 UNIQUE NOT NULL, id2 TEXT NOT NULL PRIMARY KEY, id3 INTEGER NOT NUL, id4 INT4 UNIQUE NOT NULL, id5 TEXT UNIQUE NOT NULL, -idz INT4 UNIQUE NOT NULL, -idv -INT4 -UNIQUE -NOT +idx INT4 UNIQUE NOT NULL, idy INT4 UNIQUE NOT NULL, id2 TEXT NOT NULL PRIMARY KEY, id3 INTEGER NOT NUL, id4 INT4 UNIQUE NOT NULL, id5 TEXT UNIQUE NOT NULL, +idz INT4 UNIQUE NOT NULL, +idv +INT4 +UNIQUE +NOT NULL); -- Check that stack depth detection mechanism works and diff --git a/src/test/regress/sql/float4.sql b/src/test/regress/sql/float4.sql index 4ce6d9ea6e..3b363f9463 100644 --- a/src/test/regress/sql/float4.sql +++ b/src/test/regress/sql/float4.sql @@ -10,7 +10,7 @@ INSERT INTO FLOAT4_TBL(f1) VALUES (' -34.84 '); INSERT INTO FLOAT4_TBL(f1) VALUES ('1.2345678901234e+20'); INSERT INTO FLOAT4_TBL(f1) VALUES ('1.2345678901234e-20'); --- test for over and under flow +-- test for over and under flow INSERT INTO FLOAT4_TBL(f1) VALUES ('10e70'); INSERT INTO FLOAT4_TBL(f1) VALUES ('-10e70'); INSERT INTO FLOAT4_TBL(f1) VALUES ('10e-70'); @@ -73,7 +73,7 @@ SELECT '' AS bad, f.f1 / '0.0' from FLOAT4_TBL f; SELECT '' AS five, * FROM FLOAT4_TBL; --- test the unary float4abs operator +-- test the unary float4abs operator SELECT '' AS five, f.f1, @f.f1 AS abs_f1 FROM FLOAT4_TBL f; UPDATE FLOAT4_TBL diff --git a/src/test/regress/sql/float8.sql b/src/test/regress/sql/float8.sql index 40f488d959..92a574ab7b 100644 --- a/src/test/regress/sql/float8.sql +++ b/src/test/regress/sql/float8.sql @@ -56,7 +56,7 @@ SELECT '' AS four, f.* FROM FLOAT8_TBL f WHERE '1004.3' >= f.f1; SELECT '' AS four, f.* FROM FLOAT8_TBL f WHERE f.f1 <= '1004.3'; -SELECT '' AS three, f.f1, f.f1 * '-10' AS x +SELECT '' AS three, f.f1, f.f1 * '-10' AS x FROM FLOAT8_TBL f WHERE f.f1 > '0.0'; @@ -75,15 +75,15 @@ SELECT '' AS three, f.f1, f.f1 - '-10' AS x SELECT '' AS one, f.f1 ^ '2.0' AS square_f1 FROM FLOAT8_TBL f where f.f1 = '1004.3'; --- absolute value -SELECT '' AS five, f.f1, @f.f1 AS abs_f1 +-- absolute value +SELECT '' AS five, f.f1, @f.f1 AS abs_f1 FROM FLOAT8_TBL f; --- truncate +-- truncate SELECT '' AS five, f.f1, trunc(f.f1) AS trunc_f1 FROM FLOAT8_TBL f; --- round +-- round SELECT '' AS five, f.f1, round(f.f1) AS round_f1 FROM FLOAT8_TBL f; @@ -97,7 +97,7 @@ select floor(f1) as floor_f1 from float8_tbl f; -- sign select sign(f1) as sign_f1 from float8_tbl f; --- square root +-- square root SELECT sqrt(float8 '64') AS eight; SELECT |/ float8 '64' AS eight; @@ -109,12 +109,12 @@ SELECT '' AS three, f.f1, |/f.f1 AS sqrt_f1 -- power SELECT power(float8 '144', float8 '0.5'); --- take exp of ln(f.f1) +-- take exp of ln(f.f1) SELECT '' AS three, f.f1, exp(ln(f.f1)) AS exp_ln_f1 FROM FLOAT8_TBL f WHERE f.f1 > '0.0'; --- cube root +-- cube root SELECT ||/ float8 '27' AS three; SELECT '' AS five, f.f1, ||/f.f1 AS cbrt_f1 FROM FLOAT8_TBL f; @@ -142,7 +142,7 @@ SELECT '' AS bad, f.f1 / '0.0' from FLOAT8_TBL f; SELECT '' AS five, * FROM FLOAT8_TBL; --- test for over- and underflow +-- test for over- and underflow INSERT INTO FLOAT8_TBL(f1) VALUES ('10e400'); INSERT INTO FLOAT8_TBL(f1) VALUES ('-10e400'); diff --git a/src/test/regress/sql/foreign_key.sql b/src/test/regress/sql/foreign_key.sql index cc7b23f113..6d7bdbe77a 100644 --- a/src/test/regress/sql/foreign_key.sql +++ b/src/test/regress/sql/foreign_key.sql @@ -47,7 +47,7 @@ DROP TABLE PKTABLE; -- check set NULL and table constraint on multiple columns -- CREATE TABLE PKTABLE ( ptest1 int, ptest2 int, ptest3 text, PRIMARY KEY(ptest1, ptest2) ); -CREATE TABLE FKTABLE ( ftest1 int, ftest2 int, ftest3 int, CONSTRAINT constrname FOREIGN KEY(ftest1, ftest2) +CREATE TABLE FKTABLE ( ftest1 int, ftest2 int, ftest3 int, CONSTRAINT constrname FOREIGN KEY(ftest1, ftest2) REFERENCES PKTABLE MATCH FULL ON DELETE SET NULL ON UPDATE SET NULL); -- Test comments @@ -110,7 +110,7 @@ DROP TABLE FKTABLE; -- check set default and table constraint on multiple columns -- CREATE TABLE PKTABLE ( ptest1 int, ptest2 int, ptest3 text, PRIMARY KEY(ptest1, ptest2) ); -CREATE TABLE FKTABLE ( ftest1 int DEFAULT -1, ftest2 int DEFAULT -2, ftest3 int, CONSTRAINT constrname2 FOREIGN KEY(ftest1, ftest2) +CREATE TABLE FKTABLE ( ftest1 int DEFAULT -1, ftest2 int DEFAULT -2, ftest3 int, CONSTRAINT constrname2 FOREIGN KEY(ftest1, ftest2) REFERENCES PKTABLE MATCH FULL ON DELETE SET DEFAULT ON UPDATE SET DEFAULT); -- Insert a value in PKTABLE for default @@ -228,7 +228,7 @@ INSERT INTO PKTABLE VALUES (2, 3, 4, 'test3'); INSERT INTO PKTABLE VALUES (2, 4, 5, 'test4'); -- Insert Foreign Key values -INSERT INTO FKTABLE VALUES (1, 2, 3, 1); +INSERT INTO FKTABLE VALUES (1, 2, 3, 1); INSERT INTO FKTABLE VALUES (NULL, 2, 3, 2); INSERT INTO FKTABLE VALUES (2, NULL, 3, 3); INSERT INTO FKTABLE VALUES (NULL, 2, 7, 4); @@ -273,7 +273,7 @@ INSERT INTO PKTABLE VALUES (2, 3, 4, 'test3'); INSERT INTO PKTABLE VALUES (2, 4, 5, 'test4'); -- Insert Foreign Key values -INSERT INTO FKTABLE VALUES (1, 2, 3, 1); +INSERT INTO FKTABLE VALUES (1, 2, 3, 1); INSERT INTO FKTABLE VALUES (NULL, 2, 3, 2); INSERT INTO FKTABLE VALUES (2, NULL, 3, 3); INSERT INTO FKTABLE VALUES (NULL, 2, 7, 4); @@ -325,8 +325,8 @@ INSERT INTO PKTABLE VALUES (2, 3, 4, 'test3'); INSERT INTO PKTABLE VALUES (2, 4, 5, 'test4'); -- Insert Foreign Key values -INSERT INTO FKTABLE VALUES (1, 2, 3, 1); -INSERT INTO FKTABLE VALUES (2, 3, 4, 1); +INSERT INTO FKTABLE VALUES (1, 2, 3, 1); +INSERT INTO FKTABLE VALUES (2, 3, 4, 1); INSERT INTO FKTABLE VALUES (NULL, 2, 3, 2); INSERT INTO FKTABLE VALUES (2, NULL, 3, 3); INSERT INTO FKTABLE VALUES (NULL, 2, 7, 4); @@ -379,8 +379,8 @@ INSERT INTO PKTABLE VALUES (2, 4, 5, 'test4'); INSERT INTO PKTABLE VALUES (2, -1, 5, 'test5'); -- Insert Foreign Key values -INSERT INTO FKTABLE VALUES (1, 2, 3, 1); -INSERT INTO FKTABLE VALUES (2, 3, 4, 1); +INSERT INTO FKTABLE VALUES (1, 2, 3, 1); +INSERT INTO FKTABLE VALUES (2, 3, 4, 1); INSERT INTO FKTABLE VALUES (2, 4, 5, 1); INSERT INTO FKTABLE VALUES (NULL, 2, 3, 2); INSERT INTO FKTABLE VALUES (2, NULL, 3, 3); @@ -442,7 +442,7 @@ DROP TABLE PKTABLE; -- -- Tests for mismatched types -- --- Basic one column, two table setup +-- Basic one column, two table setup CREATE TABLE PKTABLE (ptest1 int PRIMARY KEY); INSERT INTO PKTABLE VALUES(42); -- This next should fail, because int=inet does not exist @@ -502,7 +502,7 @@ DROP TABLE PKTABLE; CREATE TABLE PKTABLE (ptest1 int, ptest2 inet, ptest3 int, ptest4 inet, PRIMARY KEY(ptest1, ptest2), FOREIGN KEY(ptest3, ptest4) REFERENCES pktable(ptest1, ptest2)); DROP TABLE PKTABLE; --- And this, +-- And this, CREATE TABLE PKTABLE (ptest1 int, ptest2 inet, ptest3 int, ptest4 inet, PRIMARY KEY(ptest1, ptest2), FOREIGN KEY(ptest3, ptest4) REFERENCES pktable); DROP TABLE PKTABLE; diff --git a/src/test/regress/sql/hash_index.sql b/src/test/regress/sql/hash_index.sql index 13ef74a1cb..411e8aed39 100644 --- a/src/test/regress/sql/hash_index.sql +++ b/src/test/regress/sql/hash_index.sql @@ -80,15 +80,15 @@ SELECT h.seqno AS i1492, h.random AS i1 FROM hash_i4_heap h WHERE h.random = 1; -UPDATE hash_i4_heap - SET seqno = 20000 +UPDATE hash_i4_heap + SET seqno = 20000 WHERE hash_i4_heap.random = 1492795354; -SELECT h.seqno AS i20000 +SELECT h.seqno AS i20000 FROM hash_i4_heap h WHERE h.random = 1492795354; -UPDATE hash_name_heap +UPDATE hash_name_heap SET random = '0123456789abcdef'::name WHERE hash_name_heap.seqno = 6543; @@ -101,13 +101,13 @@ UPDATE hash_name_heap WHERE hash_name_heap.random = '76652222'::name; -- --- this is the row we just replaced; index scan should return zero rows +-- this is the row we just replaced; index scan should return zero rows -- SELECT h.seqno AS emptyset FROM hash_name_heap h WHERE h.random = '76652222'::name; -UPDATE hash_txt_heap +UPDATE hash_txt_heap SET random = '0123456789abcdefghijklmnop'::text WHERE hash_txt_heap.seqno = 4002; @@ -127,11 +127,11 @@ UPDATE hash_f8_heap SET random = '-1234.1234'::float8 WHERE hash_f8_heap.seqno = 8906; -SELECT h.seqno AS i8096, h.random AS f1234_1234 +SELECT h.seqno AS i8096, h.random AS f1234_1234 FROM hash_f8_heap h WHERE h.random = '-1234.1234'::float8; -UPDATE hash_f8_heap +UPDATE hash_f8_heap SET seqno = 20000 WHERE hash_f8_heap.random = '488912369'::float8; diff --git a/src/test/regress/sql/hs_primary_extremes.sql b/src/test/regress/sql/hs_primary_extremes.sql index 2796bc3818..629efb4be5 100644 --- a/src/test/regress/sql/hs_primary_extremes.sql +++ b/src/test/regress/sql/hs_primary_extremes.sql @@ -8,8 +8,8 @@ drop table if exists hs_extreme; create table hs_extreme (col1 integer); CREATE OR REPLACE FUNCTION hs_subxids (n integer) -RETURNS void -LANGUAGE plpgsql +RETURNS void +LANGUAGE plpgsql AS $$ BEGIN IF n <= 0 THEN RETURN; END IF; @@ -29,13 +29,13 @@ COMMIT; set client_min_messages = 'warning'; CREATE OR REPLACE FUNCTION hs_locks_create (n integer) -RETURNS void -LANGUAGE plpgsql +RETURNS void +LANGUAGE plpgsql AS $$ BEGIN IF n <= 0 THEN CHECKPOINT; - RETURN; + RETURN; END IF; EXECUTE 'CREATE TABLE hs_locks_' || n::text || ' ()'; PERFORM hs_locks_create(n - 1); @@ -44,13 +44,13 @@ AS $$ $$; CREATE OR REPLACE FUNCTION hs_locks_drop (n integer) -RETURNS void -LANGUAGE plpgsql +RETURNS void +LANGUAGE plpgsql AS $$ BEGIN IF n <= 0 THEN CHECKPOINT; - RETURN; + RETURN; END IF; EXECUTE 'DROP TABLE IF EXISTS hs_locks_' || n::text; PERFORM hs_locks_drop(n - 1); diff --git a/src/test/regress/sql/inet.sql b/src/test/regress/sql/inet.sql index f88a17eabc..328f14907b 100644 --- a/src/test/regress/sql/inet.sql +++ b/src/test/regress/sql/inet.sql @@ -49,7 +49,7 @@ SELECT '' AS six, c AS cidr, i AS inet FROM INET_TBL WHERE c = i; SELECT '' AS ten, i, c, - i < c AS lt, i <= c AS le, i = c AS eq, + i < c AS lt, i <= c AS le, i = c AS eq, i >= c AS ge, i > c AS gt, i <> c AS ne, i << c AS sb, i <<= c AS sbe, i >> c AS sup, i >>= c AS spe diff --git a/src/test/regress/sql/inherit.sql b/src/test/regress/sql/inherit.sql index e87cf66110..3087a14b72 100644 --- a/src/test/regress/sql/inherit.sql +++ b/src/test/regress/sql/inherit.sql @@ -140,7 +140,7 @@ CREATE TABLE inhx (xx text DEFAULT 'text'); * Test double inheritance * * Ensure that defaults are NOT included unless - * INCLUDING DEFAULTS is specified + * INCLUDING DEFAULTS is specified */ CREATE TABLE inhe (ee text, LIKE inhx) inherits (b); INSERT INTO inhe VALUES ('ee-col1', 'ee-col2', DEFAULT, 'ee-col4'); diff --git a/src/test/regress/sql/int2.sql b/src/test/regress/sql/int2.sql index 351f68a84e..f11eb283c6 100644 --- a/src/test/regress/sql/int2.sql +++ b/src/test/regress/sql/int2.sql @@ -53,10 +53,10 @@ SELECT '' AS three, i.* FROM INT2_TBL i WHERE i.f1 >= int2 '0'; SELECT '' AS three, i.* FROM INT2_TBL i WHERE i.f1 >= int4 '0'; --- positive odds +-- positive odds SELECT '' AS one, i.* FROM INT2_TBL i WHERE (i.f1 % int2 '2') = int2 '1'; --- any evens +-- any evens SELECT '' AS three, i.* FROM INT2_TBL i WHERE (i.f1 % int4 '2') = int2 '0'; SELECT '' AS five, i.f1, i.f1 * int2 '2' AS x FROM INT2_TBL i; diff --git a/src/test/regress/sql/int8.sql b/src/test/regress/sql/int8.sql index 597a9a2deb..27e0696b32 100644 --- a/src/test/regress/sql/int8.sql +++ b/src/test/regress/sql/int8.sql @@ -96,27 +96,27 @@ SELECT max(q1), max(q2) FROM INT8_TBL; -- TO_CHAR() -- -SELECT '' AS to_char_1, to_char(q1, '9G999G999G999G999G999'), to_char(q2, '9,999,999,999,999,999') +SELECT '' AS to_char_1, to_char(q1, '9G999G999G999G999G999'), to_char(q2, '9,999,999,999,999,999') FROM INT8_TBL; -SELECT '' AS to_char_2, to_char(q1, '9G999G999G999G999G999D999G999'), to_char(q2, '9,999,999,999,999,999.999,999') - FROM INT8_TBL; +SELECT '' AS to_char_2, to_char(q1, '9G999G999G999G999G999D999G999'), to_char(q2, '9,999,999,999,999,999.999,999') + FROM INT8_TBL; -SELECT '' AS to_char_3, to_char( (q1 * -1), '9999999999999999PR'), to_char( (q2 * -1), '9999999999999999.999PR') +SELECT '' AS to_char_3, to_char( (q1 * -1), '9999999999999999PR'), to_char( (q2 * -1), '9999999999999999.999PR') FROM INT8_TBL; -SELECT '' AS to_char_4, to_char( (q1 * -1), '9999999999999999S'), to_char( (q2 * -1), 'S9999999999999999') +SELECT '' AS to_char_4, to_char( (q1 * -1), '9999999999999999S'), to_char( (q2 * -1), 'S9999999999999999') FROM INT8_TBL; -SELECT '' AS to_char_5, to_char(q2, 'MI9999999999999999') FROM INT8_TBL; +SELECT '' AS to_char_5, to_char(q2, 'MI9999999999999999') FROM INT8_TBL; SELECT '' AS to_char_6, to_char(q2, 'FMS9999999999999999') FROM INT8_TBL; SELECT '' AS to_char_7, to_char(q2, 'FM9999999999999999THPR') FROM INT8_TBL; -SELECT '' AS to_char_8, to_char(q2, 'SG9999999999999999th') FROM INT8_TBL; -SELECT '' AS to_char_9, to_char(q2, '0999999999999999') FROM INT8_TBL; -SELECT '' AS to_char_10, to_char(q2, 'S0999999999999999') FROM INT8_TBL; -SELECT '' AS to_char_11, to_char(q2, 'FM0999999999999999') FROM INT8_TBL; +SELECT '' AS to_char_8, to_char(q2, 'SG9999999999999999th') FROM INT8_TBL; +SELECT '' AS to_char_9, to_char(q2, '0999999999999999') FROM INT8_TBL; +SELECT '' AS to_char_10, to_char(q2, 'S0999999999999999') FROM INT8_TBL; +SELECT '' AS to_char_11, to_char(q2, 'FM0999999999999999') FROM INT8_TBL; SELECT '' AS to_char_12, to_char(q2, 'FM9999999999999999.000') FROM INT8_TBL; -SELECT '' AS to_char_13, to_char(q2, 'L9999999999999999.000') FROM INT8_TBL; +SELECT '' AS to_char_13, to_char(q2, 'L9999999999999999.000') FROM INT8_TBL; SELECT '' AS to_char_14, to_char(q2, 'FM9999999999999999.999') FROM INT8_TBL; SELECT '' AS to_char_15, to_char(q2, 'S 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 . 9 9 9') FROM INT8_TBL; SELECT '' AS to_char_16, to_char(q2, E'99999 "text" 9999 "9999" 999 "\\"text between quote marks\\"" 9999') FROM INT8_TBL; diff --git a/src/test/regress/sql/interval.sql b/src/test/regress/sql/interval.sql index f342a18af2..9da2dc63e8 100644 --- a/src/test/regress/sql/interval.sql +++ b/src/test/regress/sql/interval.sql @@ -48,7 +48,7 @@ SELECT '' AS three, * FROM INTERVAL_TBL SELECT '' AS one, * FROM INTERVAL_TBL WHERE INTERVAL_TBL.f1 = interval '@ 34 years'; -SELECT '' AS five, * FROM INTERVAL_TBL +SELECT '' AS five, * FROM INTERVAL_TBL WHERE INTERVAL_TBL.f1 >= interval '@ 1 month'; SELECT '' AS nine, * FROM INTERVAL_TBL @@ -61,11 +61,11 @@ SELECT '' AS fortyfive, r1.*, r2.* -- Test multiplication and division with intervals. --- Floating point arithmetic rounding errors can lead to unexpected results, --- though the code attempts to do the right thing and round up to days and --- minutes to avoid results such as '3 days 24:00 hours' or '14:20:60'. --- Note that it is expected for some day components to be greater than 29 and --- some time components be greater than 23:59:59 due to how intervals are +-- Floating point arithmetic rounding errors can lead to unexpected results, +-- though the code attempts to do the right thing and round up to days and +-- minutes to avoid results such as '3 days 24:00 hours' or '14:20:60'. +-- Note that it is expected for some day components to be greater than 29 and +-- some time components be greater than 23:59:59 due to how intervals are -- stored internally. CREATE TABLE INTERVAL_MULDIV_TBL (span interval); @@ -249,7 +249,7 @@ select interval 'P0002' AS "year only", SET IntervalStyle to postgres_verbose; select interval '-10 mons -3 days +03:55:06.70'; select interval '1 year 2 mons 3 days 04:05:06.699999'; -select interval '0:0:0.7', interval '@ 0.70 secs', interval '0.7 seconds'; +select interval '0:0:0.7', interval '@ 0.70 secs', interval '0.7 seconds'; -- check that '30 days' equals '1 month' according to the hash function select '30 days'::interval = '1 month'::interval as t; diff --git a/src/test/regress/sql/limit.sql b/src/test/regress/sql/limit.sql index 3004550b65..fb86b6f6f7 100644 --- a/src/test/regress/sql/limit.sql +++ b/src/test/regress/sql/limit.sql @@ -3,31 +3,31 @@ -- Check the LIMIT/OFFSET feature of SELECT -- -SELECT ''::text AS two, unique1, unique2, stringu1 - FROM onek WHERE unique1 > 50 +SELECT ''::text AS two, unique1, unique2, stringu1 + FROM onek WHERE unique1 > 50 ORDER BY unique1 LIMIT 2; -SELECT ''::text AS five, unique1, unique2, stringu1 - FROM onek WHERE unique1 > 60 +SELECT ''::text AS five, unique1, unique2, stringu1 + FROM onek WHERE unique1 > 60 ORDER BY unique1 LIMIT 5; -SELECT ''::text AS two, unique1, unique2, stringu1 +SELECT ''::text AS two, unique1, unique2, stringu1 FROM onek WHERE unique1 > 60 AND unique1 < 63 ORDER BY unique1 LIMIT 5; -SELECT ''::text AS three, unique1, unique2, stringu1 - FROM onek WHERE unique1 > 100 +SELECT ''::text AS three, unique1, unique2, stringu1 + FROM onek WHERE unique1 > 100 ORDER BY unique1 LIMIT 3 OFFSET 20; -SELECT ''::text AS zero, unique1, unique2, stringu1 - FROM onek WHERE unique1 < 50 +SELECT ''::text AS zero, unique1, unique2, stringu1 + FROM onek WHERE unique1 < 50 ORDER BY unique1 DESC LIMIT 8 OFFSET 99; -SELECT ''::text AS eleven, unique1, unique2, stringu1 - FROM onek WHERE unique1 < 50 +SELECT ''::text AS eleven, unique1, unique2, stringu1 + FROM onek WHERE unique1 < 50 ORDER BY unique1 DESC LIMIT 20 OFFSET 39; -SELECT ''::text AS ten, unique1, unique2, stringu1 +SELECT ''::text AS ten, unique1, unique2, stringu1 FROM onek ORDER BY unique1 OFFSET 990; -SELECT ''::text AS five, unique1, unique2, stringu1 +SELECT ''::text AS five, unique1, unique2, stringu1 FROM onek ORDER BY unique1 OFFSET 990 LIMIT 5; -SELECT ''::text AS five, unique1, unique2, stringu1 +SELECT ''::text AS five, unique1, unique2, stringu1 FROM onek ORDER BY unique1 LIMIT 5 OFFSET 900; diff --git a/src/test/regress/sql/numeric.sql b/src/test/regress/sql/numeric.sql index 8814bba486..a1435ec85e 100644 --- a/src/test/regress/sql/numeric.sql +++ b/src/test/regress/sql/numeric.sql @@ -732,7 +732,7 @@ DROP TABLE width_bucket_test; -- TO_CHAR() -- -SELECT '' AS to_char_1, to_char(val, '9G999G999G999G999G999') +SELECT '' AS to_char_1, to_char(val, '9G999G999G999G999G999') FROM num_data; SELECT '' AS to_char_2, to_char(val, '9G999G999G999G999G999D999G999G999G999G999') @@ -744,18 +744,18 @@ SELECT '' AS to_char_3, to_char(val, '9999999999999999.999999999999999PR') SELECT '' AS to_char_4, to_char(val, '9999999999999999.999999999999999S') FROM num_data; -SELECT '' AS to_char_5, to_char(val, 'MI9999999999999999.999999999999999') FROM num_data; +SELECT '' AS to_char_5, to_char(val, 'MI9999999999999999.999999999999999') FROM num_data; SELECT '' AS to_char_6, to_char(val, 'FMS9999999999999999.999999999999999') FROM num_data; SELECT '' AS to_char_7, to_char(val, 'FM9999999999999999.999999999999999THPR') FROM num_data; -SELECT '' AS to_char_8, to_char(val, 'SG9999999999999999.999999999999999th') FROM num_data; -SELECT '' AS to_char_9, to_char(val, '0999999999999999.999999999999999') FROM num_data; -SELECT '' AS to_char_10, to_char(val, 'S0999999999999999.999999999999999') FROM num_data; -SELECT '' AS to_char_11, to_char(val, 'FM0999999999999999.999999999999999') FROM num_data; +SELECT '' AS to_char_8, to_char(val, 'SG9999999999999999.999999999999999th') FROM num_data; +SELECT '' AS to_char_9, to_char(val, '0999999999999999.999999999999999') FROM num_data; +SELECT '' AS to_char_10, to_char(val, 'S0999999999999999.999999999999999') FROM num_data; +SELECT '' AS to_char_11, to_char(val, 'FM0999999999999999.999999999999999') FROM num_data; SELECT '' AS to_char_12, to_char(val, 'FM9999999999999999.099999999999999') FROM num_data; SELECT '' AS to_char_13, to_char(val, 'FM9999999999990999.990999999999999') FROM num_data; SELECT '' AS to_char_14, to_char(val, 'FM0999999999999999.999909999999999') FROM num_data; SELECT '' AS to_char_15, to_char(val, 'FM9999999990999999.099999999999999') FROM num_data; -SELECT '' AS to_char_16, to_char(val, 'L9999999999999999.099999999999999') FROM num_data; +SELECT '' AS to_char_16, to_char(val, 'L9999999999999999.099999999999999') FROM num_data; SELECT '' AS to_char_17, to_char(val, 'FM9999999999999999.99999999999999') FROM num_data; SELECT '' AS to_char_18, to_char(val, 'S 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 . 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9') FROM num_data; SELECT '' AS to_char_19, to_char(val, 'FMS 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 . 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9') FROM num_data; diff --git a/src/test/regress/sql/oid.sql b/src/test/regress/sql/oid.sql index 1bdb127a4a..4a096891f5 100644 --- a/src/test/regress/sql/oid.sql +++ b/src/test/regress/sql/oid.sql @@ -14,7 +14,7 @@ INSERT INTO OID_TBL(f1) VALUES (' 10 '); -- leading/trailing hard tab is also allowed INSERT INTO OID_TBL(f1) VALUES (' 15 '); --- bad inputs +-- bad inputs INSERT INTO OID_TBL(f1) VALUES (''); INSERT INTO OID_TBL(f1) VALUES (' '); INSERT INTO OID_TBL(f1) VALUES ('asdfasd'); diff --git a/src/test/regress/sql/oidjoins.sql b/src/test/regress/sql/oidjoins.sql index 2f112fe489..995271b690 100644 --- a/src/test/regress/sql/oidjoins.sql +++ b/src/test/regress/sql/oidjoins.sql @@ -1,479 +1,479 @@ -- -- This is created by pgsql/src/tools/findoidjoins/make_oidjoins_check -- -SELECT ctid, aggfnoid -FROM pg_catalog.pg_aggregate fk -WHERE aggfnoid != 0 AND +SELECT ctid, aggfnoid +FROM pg_catalog.pg_aggregate fk +WHERE aggfnoid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.aggfnoid); -SELECT ctid, aggtransfn -FROM pg_catalog.pg_aggregate fk -WHERE aggtransfn != 0 AND +SELECT ctid, aggtransfn +FROM pg_catalog.pg_aggregate fk +WHERE aggtransfn != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.aggtransfn); -SELECT ctid, aggfinalfn -FROM pg_catalog.pg_aggregate fk -WHERE aggfinalfn != 0 AND +SELECT ctid, aggfinalfn +FROM pg_catalog.pg_aggregate fk +WHERE aggfinalfn != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.aggfinalfn); -SELECT ctid, aggsortop -FROM pg_catalog.pg_aggregate fk -WHERE aggsortop != 0 AND +SELECT ctid, aggsortop +FROM pg_catalog.pg_aggregate fk +WHERE aggsortop != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_operator pk WHERE pk.oid = fk.aggsortop); -SELECT ctid, aggtranstype -FROM pg_catalog.pg_aggregate fk -WHERE aggtranstype != 0 AND +SELECT ctid, aggtranstype +FROM pg_catalog.pg_aggregate fk +WHERE aggtranstype != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.aggtranstype); -SELECT ctid, amkeytype -FROM pg_catalog.pg_am fk -WHERE amkeytype != 0 AND +SELECT ctid, amkeytype +FROM pg_catalog.pg_am fk +WHERE amkeytype != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.amkeytype); -SELECT ctid, aminsert -FROM pg_catalog.pg_am fk -WHERE aminsert != 0 AND +SELECT ctid, aminsert +FROM pg_catalog.pg_am fk +WHERE aminsert != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.aminsert); -SELECT ctid, ambeginscan -FROM pg_catalog.pg_am fk -WHERE ambeginscan != 0 AND +SELECT ctid, ambeginscan +FROM pg_catalog.pg_am fk +WHERE ambeginscan != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.ambeginscan); -SELECT ctid, amgettuple -FROM pg_catalog.pg_am fk -WHERE amgettuple != 0 AND +SELECT ctid, amgettuple +FROM pg_catalog.pg_am fk +WHERE amgettuple != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.amgettuple); -SELECT ctid, amgetbitmap -FROM pg_catalog.pg_am fk -WHERE amgetbitmap != 0 AND +SELECT ctid, amgetbitmap +FROM pg_catalog.pg_am fk +WHERE amgetbitmap != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.amgetbitmap); -SELECT ctid, amrescan -FROM pg_catalog.pg_am fk -WHERE amrescan != 0 AND +SELECT ctid, amrescan +FROM pg_catalog.pg_am fk +WHERE amrescan != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.amrescan); -SELECT ctid, amendscan -FROM pg_catalog.pg_am fk -WHERE amendscan != 0 AND +SELECT ctid, amendscan +FROM pg_catalog.pg_am fk +WHERE amendscan != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.amendscan); -SELECT ctid, ammarkpos -FROM pg_catalog.pg_am fk -WHERE ammarkpos != 0 AND +SELECT ctid, ammarkpos +FROM pg_catalog.pg_am fk +WHERE ammarkpos != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.ammarkpos); -SELECT ctid, amrestrpos -FROM pg_catalog.pg_am fk -WHERE amrestrpos != 0 AND +SELECT ctid, amrestrpos +FROM pg_catalog.pg_am fk +WHERE amrestrpos != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.amrestrpos); -SELECT ctid, ambuild -FROM pg_catalog.pg_am fk -WHERE ambuild != 0 AND +SELECT ctid, ambuild +FROM pg_catalog.pg_am fk +WHERE ambuild != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.ambuild); -SELECT ctid, ambulkdelete -FROM pg_catalog.pg_am fk -WHERE ambulkdelete != 0 AND +SELECT ctid, ambulkdelete +FROM pg_catalog.pg_am fk +WHERE ambulkdelete != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.ambulkdelete); -SELECT ctid, amvacuumcleanup -FROM pg_catalog.pg_am fk -WHERE amvacuumcleanup != 0 AND +SELECT ctid, amvacuumcleanup +FROM pg_catalog.pg_am fk +WHERE amvacuumcleanup != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.amvacuumcleanup); -SELECT ctid, amcostestimate -FROM pg_catalog.pg_am fk -WHERE amcostestimate != 0 AND +SELECT ctid, amcostestimate +FROM pg_catalog.pg_am fk +WHERE amcostestimate != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.amcostestimate); -SELECT ctid, amoptions -FROM pg_catalog.pg_am fk -WHERE amoptions != 0 AND +SELECT ctid, amoptions +FROM pg_catalog.pg_am fk +WHERE amoptions != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.amoptions); -SELECT ctid, amopfamily -FROM pg_catalog.pg_amop fk -WHERE amopfamily != 0 AND +SELECT ctid, amopfamily +FROM pg_catalog.pg_amop fk +WHERE amopfamily != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_opfamily pk WHERE pk.oid = fk.amopfamily); -SELECT ctid, amoplefttype -FROM pg_catalog.pg_amop fk -WHERE amoplefttype != 0 AND +SELECT ctid, amoplefttype +FROM pg_catalog.pg_amop fk +WHERE amoplefttype != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.amoplefttype); -SELECT ctid, amoprighttype -FROM pg_catalog.pg_amop fk -WHERE amoprighttype != 0 AND +SELECT ctid, amoprighttype +FROM pg_catalog.pg_amop fk +WHERE amoprighttype != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.amoprighttype); -SELECT ctid, amopopr -FROM pg_catalog.pg_amop fk -WHERE amopopr != 0 AND +SELECT ctid, amopopr +FROM pg_catalog.pg_amop fk +WHERE amopopr != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_operator pk WHERE pk.oid = fk.amopopr); -SELECT ctid, amopmethod -FROM pg_catalog.pg_amop fk -WHERE amopmethod != 0 AND +SELECT ctid, amopmethod +FROM pg_catalog.pg_amop fk +WHERE amopmethod != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_am pk WHERE pk.oid = fk.amopmethod); -SELECT ctid, amprocfamily -FROM pg_catalog.pg_amproc fk -WHERE amprocfamily != 0 AND +SELECT ctid, amprocfamily +FROM pg_catalog.pg_amproc fk +WHERE amprocfamily != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_opfamily pk WHERE pk.oid = fk.amprocfamily); -SELECT ctid, amproclefttype -FROM pg_catalog.pg_amproc fk -WHERE amproclefttype != 0 AND +SELECT ctid, amproclefttype +FROM pg_catalog.pg_amproc fk +WHERE amproclefttype != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.amproclefttype); -SELECT ctid, amprocrighttype -FROM pg_catalog.pg_amproc fk -WHERE amprocrighttype != 0 AND +SELECT ctid, amprocrighttype +FROM pg_catalog.pg_amproc fk +WHERE amprocrighttype != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.amprocrighttype); -SELECT ctid, amproc -FROM pg_catalog.pg_amproc fk -WHERE amproc != 0 AND +SELECT ctid, amproc +FROM pg_catalog.pg_amproc fk +WHERE amproc != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.amproc); -SELECT ctid, attrelid -FROM pg_catalog.pg_attribute fk -WHERE attrelid != 0 AND +SELECT ctid, attrelid +FROM pg_catalog.pg_attribute fk +WHERE attrelid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.attrelid); -SELECT ctid, atttypid -FROM pg_catalog.pg_attribute fk -WHERE atttypid != 0 AND +SELECT ctid, atttypid +FROM pg_catalog.pg_attribute fk +WHERE atttypid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.atttypid); -SELECT ctid, castsource -FROM pg_catalog.pg_cast fk -WHERE castsource != 0 AND +SELECT ctid, castsource +FROM pg_catalog.pg_cast fk +WHERE castsource != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.castsource); -SELECT ctid, casttarget -FROM pg_catalog.pg_cast fk -WHERE casttarget != 0 AND +SELECT ctid, casttarget +FROM pg_catalog.pg_cast fk +WHERE casttarget != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.casttarget); -SELECT ctid, castfunc -FROM pg_catalog.pg_cast fk -WHERE castfunc != 0 AND +SELECT ctid, castfunc +FROM pg_catalog.pg_cast fk +WHERE castfunc != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.castfunc); -SELECT ctid, relnamespace -FROM pg_catalog.pg_class fk -WHERE relnamespace != 0 AND +SELECT ctid, relnamespace +FROM pg_catalog.pg_class fk +WHERE relnamespace != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_namespace pk WHERE pk.oid = fk.relnamespace); -SELECT ctid, reltype -FROM pg_catalog.pg_class fk -WHERE reltype != 0 AND +SELECT ctid, reltype +FROM pg_catalog.pg_class fk +WHERE reltype != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.reltype); -SELECT ctid, relowner -FROM pg_catalog.pg_class fk -WHERE relowner != 0 AND +SELECT ctid, relowner +FROM pg_catalog.pg_class fk +WHERE relowner != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.relowner); -SELECT ctid, relam -FROM pg_catalog.pg_class fk -WHERE relam != 0 AND +SELECT ctid, relam +FROM pg_catalog.pg_class fk +WHERE relam != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_am pk WHERE pk.oid = fk.relam); -SELECT ctid, reltablespace -FROM pg_catalog.pg_class fk -WHERE reltablespace != 0 AND +SELECT ctid, reltablespace +FROM pg_catalog.pg_class fk +WHERE reltablespace != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_tablespace pk WHERE pk.oid = fk.reltablespace); -SELECT ctid, reltoastrelid -FROM pg_catalog.pg_class fk -WHERE reltoastrelid != 0 AND +SELECT ctid, reltoastrelid +FROM pg_catalog.pg_class fk +WHERE reltoastrelid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.reltoastrelid); -SELECT ctid, reltoastidxid -FROM pg_catalog.pg_class fk -WHERE reltoastidxid != 0 AND +SELECT ctid, reltoastidxid +FROM pg_catalog.pg_class fk +WHERE reltoastidxid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.reltoastidxid); -SELECT ctid, connamespace -FROM pg_catalog.pg_constraint fk -WHERE connamespace != 0 AND +SELECT ctid, connamespace +FROM pg_catalog.pg_constraint fk +WHERE connamespace != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_namespace pk WHERE pk.oid = fk.connamespace); -SELECT ctid, contypid -FROM pg_catalog.pg_constraint fk -WHERE contypid != 0 AND +SELECT ctid, contypid +FROM pg_catalog.pg_constraint fk +WHERE contypid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.contypid); -SELECT ctid, connamespace -FROM pg_catalog.pg_conversion fk -WHERE connamespace != 0 AND +SELECT ctid, connamespace +FROM pg_catalog.pg_conversion fk +WHERE connamespace != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_namespace pk WHERE pk.oid = fk.connamespace); -SELECT ctid, conowner -FROM pg_catalog.pg_conversion fk -WHERE conowner != 0 AND +SELECT ctid, conowner +FROM pg_catalog.pg_conversion fk +WHERE conowner != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.conowner); -SELECT ctid, conproc -FROM pg_catalog.pg_conversion fk -WHERE conproc != 0 AND +SELECT ctid, conproc +FROM pg_catalog.pg_conversion fk +WHERE conproc != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.conproc); -SELECT ctid, datdba -FROM pg_catalog.pg_database fk -WHERE datdba != 0 AND +SELECT ctid, datdba +FROM pg_catalog.pg_database fk +WHERE datdba != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.datdba); -SELECT ctid, dattablespace -FROM pg_catalog.pg_database fk -WHERE dattablespace != 0 AND +SELECT ctid, dattablespace +FROM pg_catalog.pg_database fk +WHERE dattablespace != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_tablespace pk WHERE pk.oid = fk.dattablespace); -SELECT ctid, setdatabase -FROM pg_catalog.pg_db_role_setting fk -WHERE setdatabase != 0 AND +SELECT ctid, setdatabase +FROM pg_catalog.pg_db_role_setting fk +WHERE setdatabase != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_database pk WHERE pk.oid = fk.setdatabase); -SELECT ctid, classid -FROM pg_catalog.pg_depend fk -WHERE classid != 0 AND +SELECT ctid, classid +FROM pg_catalog.pg_depend fk +WHERE classid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.classid); -SELECT ctid, refclassid -FROM pg_catalog.pg_depend fk -WHERE refclassid != 0 AND +SELECT ctid, refclassid +FROM pg_catalog.pg_depend fk +WHERE refclassid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.refclassid); -SELECT ctid, classoid -FROM pg_catalog.pg_description fk -WHERE classoid != 0 AND +SELECT ctid, classoid +FROM pg_catalog.pg_description fk +WHERE classoid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.classoid); -SELECT ctid, indexrelid -FROM pg_catalog.pg_index fk -WHERE indexrelid != 0 AND +SELECT ctid, indexrelid +FROM pg_catalog.pg_index fk +WHERE indexrelid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.indexrelid); -SELECT ctid, indrelid -FROM pg_catalog.pg_index fk -WHERE indrelid != 0 AND +SELECT ctid, indrelid +FROM pg_catalog.pg_index fk +WHERE indrelid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.indrelid); -SELECT ctid, lanowner -FROM pg_catalog.pg_language fk -WHERE lanowner != 0 AND +SELECT ctid, lanowner +FROM pg_catalog.pg_language fk +WHERE lanowner != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.lanowner); -SELECT ctid, lanplcallfoid -FROM pg_catalog.pg_language fk -WHERE lanplcallfoid != 0 AND +SELECT ctid, lanplcallfoid +FROM pg_catalog.pg_language fk +WHERE lanplcallfoid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.lanplcallfoid); -SELECT ctid, laninline -FROM pg_catalog.pg_language fk -WHERE laninline != 0 AND +SELECT ctid, laninline +FROM pg_catalog.pg_language fk +WHERE laninline != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.laninline); -SELECT ctid, lanvalidator -FROM pg_catalog.pg_language fk -WHERE lanvalidator != 0 AND +SELECT ctid, lanvalidator +FROM pg_catalog.pg_language fk +WHERE lanvalidator != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.lanvalidator); -SELECT ctid, nspowner -FROM pg_catalog.pg_namespace fk -WHERE nspowner != 0 AND +SELECT ctid, nspowner +FROM pg_catalog.pg_namespace fk +WHERE nspowner != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.nspowner); -SELECT ctid, opcmethod -FROM pg_catalog.pg_opclass fk -WHERE opcmethod != 0 AND +SELECT ctid, opcmethod +FROM pg_catalog.pg_opclass fk +WHERE opcmethod != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_am pk WHERE pk.oid = fk.opcmethod); -SELECT ctid, opcnamespace -FROM pg_catalog.pg_opclass fk -WHERE opcnamespace != 0 AND +SELECT ctid, opcnamespace +FROM pg_catalog.pg_opclass fk +WHERE opcnamespace != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_namespace pk WHERE pk.oid = fk.opcnamespace); -SELECT ctid, opcowner -FROM pg_catalog.pg_opclass fk -WHERE opcowner != 0 AND +SELECT ctid, opcowner +FROM pg_catalog.pg_opclass fk +WHERE opcowner != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.opcowner); -SELECT ctid, opcfamily -FROM pg_catalog.pg_opclass fk -WHERE opcfamily != 0 AND +SELECT ctid, opcfamily +FROM pg_catalog.pg_opclass fk +WHERE opcfamily != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_opfamily pk WHERE pk.oid = fk.opcfamily); -SELECT ctid, opcintype -FROM pg_catalog.pg_opclass fk -WHERE opcintype != 0 AND +SELECT ctid, opcintype +FROM pg_catalog.pg_opclass fk +WHERE opcintype != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.opcintype); -SELECT ctid, opckeytype -FROM pg_catalog.pg_opclass fk -WHERE opckeytype != 0 AND +SELECT ctid, opckeytype +FROM pg_catalog.pg_opclass fk +WHERE opckeytype != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.opckeytype); -SELECT ctid, oprnamespace -FROM pg_catalog.pg_operator fk -WHERE oprnamespace != 0 AND +SELECT ctid, oprnamespace +FROM pg_catalog.pg_operator fk +WHERE oprnamespace != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_namespace pk WHERE pk.oid = fk.oprnamespace); -SELECT ctid, oprowner -FROM pg_catalog.pg_operator fk -WHERE oprowner != 0 AND +SELECT ctid, oprowner +FROM pg_catalog.pg_operator fk +WHERE oprowner != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.oprowner); -SELECT ctid, oprleft -FROM pg_catalog.pg_operator fk -WHERE oprleft != 0 AND +SELECT ctid, oprleft +FROM pg_catalog.pg_operator fk +WHERE oprleft != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.oprleft); -SELECT ctid, oprright -FROM pg_catalog.pg_operator fk -WHERE oprright != 0 AND +SELECT ctid, oprright +FROM pg_catalog.pg_operator fk +WHERE oprright != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.oprright); -SELECT ctid, oprresult -FROM pg_catalog.pg_operator fk -WHERE oprresult != 0 AND +SELECT ctid, oprresult +FROM pg_catalog.pg_operator fk +WHERE oprresult != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.oprresult); -SELECT ctid, oprcom -FROM pg_catalog.pg_operator fk -WHERE oprcom != 0 AND +SELECT ctid, oprcom +FROM pg_catalog.pg_operator fk +WHERE oprcom != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_operator pk WHERE pk.oid = fk.oprcom); -SELECT ctid, oprnegate -FROM pg_catalog.pg_operator fk -WHERE oprnegate != 0 AND +SELECT ctid, oprnegate +FROM pg_catalog.pg_operator fk +WHERE oprnegate != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_operator pk WHERE pk.oid = fk.oprnegate); -SELECT ctid, oprcode -FROM pg_catalog.pg_operator fk -WHERE oprcode != 0 AND +SELECT ctid, oprcode +FROM pg_catalog.pg_operator fk +WHERE oprcode != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.oprcode); -SELECT ctid, oprrest -FROM pg_catalog.pg_operator fk -WHERE oprrest != 0 AND +SELECT ctid, oprrest +FROM pg_catalog.pg_operator fk +WHERE oprrest != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.oprrest); -SELECT ctid, oprjoin -FROM pg_catalog.pg_operator fk -WHERE oprjoin != 0 AND +SELECT ctid, oprjoin +FROM pg_catalog.pg_operator fk +WHERE oprjoin != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.oprjoin); -SELECT ctid, opfmethod -FROM pg_catalog.pg_opfamily fk -WHERE opfmethod != 0 AND +SELECT ctid, opfmethod +FROM pg_catalog.pg_opfamily fk +WHERE opfmethod != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_am pk WHERE pk.oid = fk.opfmethod); -SELECT ctid, opfnamespace -FROM pg_catalog.pg_opfamily fk -WHERE opfnamespace != 0 AND +SELECT ctid, opfnamespace +FROM pg_catalog.pg_opfamily fk +WHERE opfnamespace != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_namespace pk WHERE pk.oid = fk.opfnamespace); -SELECT ctid, opfowner -FROM pg_catalog.pg_opfamily fk -WHERE opfowner != 0 AND +SELECT ctid, opfowner +FROM pg_catalog.pg_opfamily fk +WHERE opfowner != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.opfowner); -SELECT ctid, pronamespace -FROM pg_catalog.pg_proc fk -WHERE pronamespace != 0 AND +SELECT ctid, pronamespace +FROM pg_catalog.pg_proc fk +WHERE pronamespace != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_namespace pk WHERE pk.oid = fk.pronamespace); -SELECT ctid, proowner -FROM pg_catalog.pg_proc fk -WHERE proowner != 0 AND +SELECT ctid, proowner +FROM pg_catalog.pg_proc fk +WHERE proowner != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.proowner); -SELECT ctid, prolang -FROM pg_catalog.pg_proc fk -WHERE prolang != 0 AND +SELECT ctid, prolang +FROM pg_catalog.pg_proc fk +WHERE prolang != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_language pk WHERE pk.oid = fk.prolang); -SELECT ctid, prorettype -FROM pg_catalog.pg_proc fk -WHERE prorettype != 0 AND +SELECT ctid, prorettype +FROM pg_catalog.pg_proc fk +WHERE prorettype != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.prorettype); -SELECT ctid, ev_class -FROM pg_catalog.pg_rewrite fk -WHERE ev_class != 0 AND +SELECT ctid, ev_class +FROM pg_catalog.pg_rewrite fk +WHERE ev_class != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.ev_class); -SELECT ctid, refclassid -FROM pg_catalog.pg_shdepend fk -WHERE refclassid != 0 AND +SELECT ctid, refclassid +FROM pg_catalog.pg_shdepend fk +WHERE refclassid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.refclassid); -SELECT ctid, classoid -FROM pg_catalog.pg_shdescription fk -WHERE classoid != 0 AND +SELECT ctid, classoid +FROM pg_catalog.pg_shdescription fk +WHERE classoid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.classoid); -SELECT ctid, starelid -FROM pg_catalog.pg_statistic fk -WHERE starelid != 0 AND +SELECT ctid, starelid +FROM pg_catalog.pg_statistic fk +WHERE starelid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.starelid); -SELECT ctid, staop1 -FROM pg_catalog.pg_statistic fk -WHERE staop1 != 0 AND +SELECT ctid, staop1 +FROM pg_catalog.pg_statistic fk +WHERE staop1 != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_operator pk WHERE pk.oid = fk.staop1); -SELECT ctid, staop2 -FROM pg_catalog.pg_statistic fk -WHERE staop2 != 0 AND +SELECT ctid, staop2 +FROM pg_catalog.pg_statistic fk +WHERE staop2 != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_operator pk WHERE pk.oid = fk.staop2); -SELECT ctid, staop3 -FROM pg_catalog.pg_statistic fk -WHERE staop3 != 0 AND +SELECT ctid, staop3 +FROM pg_catalog.pg_statistic fk +WHERE staop3 != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_operator pk WHERE pk.oid = fk.staop3); -SELECT ctid, spcowner -FROM pg_catalog.pg_tablespace fk -WHERE spcowner != 0 AND +SELECT ctid, spcowner +FROM pg_catalog.pg_tablespace fk +WHERE spcowner != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.spcowner); -SELECT ctid, cfgnamespace -FROM pg_catalog.pg_ts_config fk -WHERE cfgnamespace != 0 AND +SELECT ctid, cfgnamespace +FROM pg_catalog.pg_ts_config fk +WHERE cfgnamespace != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_namespace pk WHERE pk.oid = fk.cfgnamespace); -SELECT ctid, cfgowner -FROM pg_catalog.pg_ts_config fk -WHERE cfgowner != 0 AND +SELECT ctid, cfgowner +FROM pg_catalog.pg_ts_config fk +WHERE cfgowner != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.cfgowner); -SELECT ctid, cfgparser -FROM pg_catalog.pg_ts_config fk -WHERE cfgparser != 0 AND +SELECT ctid, cfgparser +FROM pg_catalog.pg_ts_config fk +WHERE cfgparser != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_ts_parser pk WHERE pk.oid = fk.cfgparser); -SELECT ctid, mapcfg -FROM pg_catalog.pg_ts_config_map fk -WHERE mapcfg != 0 AND +SELECT ctid, mapcfg +FROM pg_catalog.pg_ts_config_map fk +WHERE mapcfg != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_ts_config pk WHERE pk.oid = fk.mapcfg); -SELECT ctid, mapdict -FROM pg_catalog.pg_ts_config_map fk -WHERE mapdict != 0 AND +SELECT ctid, mapdict +FROM pg_catalog.pg_ts_config_map fk +WHERE mapdict != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_ts_dict pk WHERE pk.oid = fk.mapdict); -SELECT ctid, dictnamespace -FROM pg_catalog.pg_ts_dict fk -WHERE dictnamespace != 0 AND +SELECT ctid, dictnamespace +FROM pg_catalog.pg_ts_dict fk +WHERE dictnamespace != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_namespace pk WHERE pk.oid = fk.dictnamespace); -SELECT ctid, dictowner -FROM pg_catalog.pg_ts_dict fk -WHERE dictowner != 0 AND +SELECT ctid, dictowner +FROM pg_catalog.pg_ts_dict fk +WHERE dictowner != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.dictowner); -SELECT ctid, dicttemplate -FROM pg_catalog.pg_ts_dict fk -WHERE dicttemplate != 0 AND +SELECT ctid, dicttemplate +FROM pg_catalog.pg_ts_dict fk +WHERE dicttemplate != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_ts_template pk WHERE pk.oid = fk.dicttemplate); -SELECT ctid, prsnamespace -FROM pg_catalog.pg_ts_parser fk -WHERE prsnamespace != 0 AND +SELECT ctid, prsnamespace +FROM pg_catalog.pg_ts_parser fk +WHERE prsnamespace != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_namespace pk WHERE pk.oid = fk.prsnamespace); -SELECT ctid, prsstart -FROM pg_catalog.pg_ts_parser fk -WHERE prsstart != 0 AND +SELECT ctid, prsstart +FROM pg_catalog.pg_ts_parser fk +WHERE prsstart != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.prsstart); -SELECT ctid, prstoken -FROM pg_catalog.pg_ts_parser fk -WHERE prstoken != 0 AND +SELECT ctid, prstoken +FROM pg_catalog.pg_ts_parser fk +WHERE prstoken != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.prstoken); -SELECT ctid, prsend -FROM pg_catalog.pg_ts_parser fk -WHERE prsend != 0 AND +SELECT ctid, prsend +FROM pg_catalog.pg_ts_parser fk +WHERE prsend != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.prsend); -SELECT ctid, prsheadline -FROM pg_catalog.pg_ts_parser fk -WHERE prsheadline != 0 AND +SELECT ctid, prsheadline +FROM pg_catalog.pg_ts_parser fk +WHERE prsheadline != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.prsheadline); -SELECT ctid, prslextype -FROM pg_catalog.pg_ts_parser fk -WHERE prslextype != 0 AND +SELECT ctid, prslextype +FROM pg_catalog.pg_ts_parser fk +WHERE prslextype != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.prslextype); -SELECT ctid, tmplnamespace -FROM pg_catalog.pg_ts_template fk -WHERE tmplnamespace != 0 AND +SELECT ctid, tmplnamespace +FROM pg_catalog.pg_ts_template fk +WHERE tmplnamespace != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_namespace pk WHERE pk.oid = fk.tmplnamespace); -SELECT ctid, tmplinit -FROM pg_catalog.pg_ts_template fk -WHERE tmplinit != 0 AND +SELECT ctid, tmplinit +FROM pg_catalog.pg_ts_template fk +WHERE tmplinit != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.tmplinit); -SELECT ctid, tmpllexize -FROM pg_catalog.pg_ts_template fk -WHERE tmpllexize != 0 AND +SELECT ctid, tmpllexize +FROM pg_catalog.pg_ts_template fk +WHERE tmpllexize != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.tmpllexize); -SELECT ctid, typnamespace -FROM pg_catalog.pg_type fk -WHERE typnamespace != 0 AND +SELECT ctid, typnamespace +FROM pg_catalog.pg_type fk +WHERE typnamespace != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_namespace pk WHERE pk.oid = fk.typnamespace); -SELECT ctid, typowner -FROM pg_catalog.pg_type fk -WHERE typowner != 0 AND +SELECT ctid, typowner +FROM pg_catalog.pg_type fk +WHERE typowner != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.typowner); -SELECT ctid, typrelid -FROM pg_catalog.pg_type fk -WHERE typrelid != 0 AND +SELECT ctid, typrelid +FROM pg_catalog.pg_type fk +WHERE typrelid != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.typrelid); -SELECT ctid, typelem -FROM pg_catalog.pg_type fk -WHERE typelem != 0 AND +SELECT ctid, typelem +FROM pg_catalog.pg_type fk +WHERE typelem != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.typelem); -SELECT ctid, typarray -FROM pg_catalog.pg_type fk -WHERE typarray != 0 AND +SELECT ctid, typarray +FROM pg_catalog.pg_type fk +WHERE typarray != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.typarray); -SELECT ctid, typinput -FROM pg_catalog.pg_type fk -WHERE typinput != 0 AND +SELECT ctid, typinput +FROM pg_catalog.pg_type fk +WHERE typinput != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.typinput); -SELECT ctid, typoutput -FROM pg_catalog.pg_type fk -WHERE typoutput != 0 AND +SELECT ctid, typoutput +FROM pg_catalog.pg_type fk +WHERE typoutput != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.typoutput); -SELECT ctid, typreceive -FROM pg_catalog.pg_type fk -WHERE typreceive != 0 AND +SELECT ctid, typreceive +FROM pg_catalog.pg_type fk +WHERE typreceive != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.typreceive); -SELECT ctid, typsend -FROM pg_catalog.pg_type fk -WHERE typsend != 0 AND +SELECT ctid, typsend +FROM pg_catalog.pg_type fk +WHERE typsend != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.typsend); -SELECT ctid, typmodin -FROM pg_catalog.pg_type fk -WHERE typmodin != 0 AND +SELECT ctid, typmodin +FROM pg_catalog.pg_type fk +WHERE typmodin != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.typmodin); -SELECT ctid, typmodout -FROM pg_catalog.pg_type fk -WHERE typmodout != 0 AND +SELECT ctid, typmodout +FROM pg_catalog.pg_type fk +WHERE typmodout != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.typmodout); -SELECT ctid, typanalyze -FROM pg_catalog.pg_type fk -WHERE typanalyze != 0 AND +SELECT ctid, typanalyze +FROM pg_catalog.pg_type fk +WHERE typanalyze != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.typanalyze); -SELECT ctid, typbasetype -FROM pg_catalog.pg_type fk -WHERE typbasetype != 0 AND +SELECT ctid, typbasetype +FROM pg_catalog.pg_type fk +WHERE typbasetype != 0 AND NOT EXISTS(SELECT 1 FROM pg_catalog.pg_type pk WHERE pk.oid = fk.typbasetype); diff --git a/src/test/regress/sql/plpgsql.sql b/src/test/regress/sql/plpgsql.sql index 015fbd6317..d0f4e3b5e1 100644 --- a/src/test/regress/sql/plpgsql.sql +++ b/src/test/regress/sql/plpgsql.sql @@ -2657,7 +2657,7 @@ select exc_using(5, 'foobar'); drop function exc_using(int, text); create or replace function exc_using(int) returns void as $$ -declare +declare c refcursor; i int; begin @@ -2668,7 +2668,7 @@ begin raise notice '%', i; end loop; close c; - return; + return; end; $$ language plpgsql; diff --git a/src/test/regress/sql/point.sql b/src/test/regress/sql/point.sql index 40cd4ec022..1b62b10d40 100644 --- a/src/test/regress/sql/point.sql +++ b/src/test/regress/sql/point.sql @@ -14,7 +14,7 @@ INSERT INTO POINT_TBL(f1) VALUES ('(5.1, 34.5)'); INSERT INTO POINT_TBL(f1) VALUES ('(-5.0,-12.0)'); --- bad format points +-- bad format points INSERT INTO POINT_TBL(f1) VALUES ('asdfasdf'); INSERT INTO POINT_TBL(f1) VALUES ('10.0,10.0'); @@ -26,22 +26,22 @@ INSERT INTO POINT_TBL(f1) VALUES ('(10.0,10.0'); SELECT '' AS six, * FROM POINT_TBL; --- left of +-- left of SELECT '' AS three, p.* FROM POINT_TBL p WHERE p.f1 << '(0.0, 0.0)'; --- right of +-- right of SELECT '' AS three, p.* FROM POINT_TBL p WHERE '(0.0,0.0)' >> p.f1; --- above +-- above SELECT '' AS one, p.* FROM POINT_TBL p WHERE '(0.0,0.0)' >^ p.f1; --- below +-- below SELECT '' AS one, p.* FROM POINT_TBL p WHERE p.f1 <^ '(0.0, 0.0)'; --- equal +-- equal SELECT '' AS one, p.* FROM POINT_TBL p WHERE p.f1 ~= '(5.1, 34.5)'; --- point in box +-- point in box SELECT '' AS three, p.* FROM POINT_TBL p WHERE p.f1 <@ box '(0,0,100,100)'; @@ -77,6 +77,6 @@ SELECT '' AS fifteen, p1.f1 AS point1, p2.f1 AS point2, (p1.f1 <-> p2.f1) AS dis -- put distance result into output to allow sorting with GEQ optimizer - tgl 97/05/10 SELECT '' AS three, p1.f1 AS point1, p2.f1 AS point2, (p1.f1 <-> p2.f1) AS distance - FROM POINT_TBL p1, POINT_TBL p2 + FROM POINT_TBL p1, POINT_TBL p2 WHERE (p1.f1 <-> p2.f1) > 3 and p1.f1 << p2.f1 and p1.f1 >^ p2.f1 ORDER BY distance; diff --git a/src/test/regress/sql/polygon.sql b/src/test/regress/sql/polygon.sql index 1b3903b782..2dad566f37 100644 --- a/src/test/regress/sql/polygon.sql +++ b/src/test/regress/sql/polygon.sql @@ -21,12 +21,12 @@ INSERT INTO POLYGON_TBL(f1) VALUES ('(2.0,0.0),(2.0,4.0),(0.0,0.0)'); INSERT INTO POLYGON_TBL(f1) VALUES ('(3.0,1.0),(3.0,3.0),(1.0,0.0)'); --- degenerate polygons +-- degenerate polygons INSERT INTO POLYGON_TBL(f1) VALUES ('(0.0,0.0)'); INSERT INTO POLYGON_TBL(f1) VALUES ('(0.0,1.0),(0.0,1.0)'); --- bad polygon input strings +-- bad polygon input strings INSERT INTO POLYGON_TBL(f1) VALUES ('0.0'); INSERT INTO POLYGON_TBL(f1) VALUES ('(0.0 0.0'); @@ -40,42 +40,42 @@ INSERT INTO POLYGON_TBL(f1) VALUES ('asdf'); SELECT '' AS four, * FROM POLYGON_TBL; --- overlap +-- overlap SELECT '' AS three, p.* FROM POLYGON_TBL p WHERE p.f1 && '(3.0,1.0),(3.0,3.0),(1.0,0.0)'; --- left overlap -SELECT '' AS four, p.* +-- left overlap +SELECT '' AS four, p.* FROM POLYGON_TBL p WHERE p.f1 &< '(3.0,1.0),(3.0,3.0),(1.0,0.0)'; --- right overlap -SELECT '' AS two, p.* +-- right overlap +SELECT '' AS two, p.* FROM POLYGON_TBL p WHERE p.f1 &> '(3.0,1.0),(3.0,3.0),(1.0,0.0)'; --- left of +-- left of SELECT '' AS one, p.* FROM POLYGON_TBL p WHERE p.f1 << '(3.0,1.0),(3.0,3.0),(1.0,0.0)'; --- right of +-- right of SELECT '' AS zero, p.* FROM POLYGON_TBL p WHERE p.f1 >> '(3.0,1.0),(3.0,3.0),(1.0,0.0)'; --- contained -SELECT '' AS one, p.* +-- contained +SELECT '' AS one, p.* FROM POLYGON_TBL p WHERE p.f1 <@ polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)'; --- same +-- same SELECT '' AS one, p.* FROM POLYGON_TBL p WHERE p.f1 ~= polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)'; --- contains +-- contains SELECT '' AS one, p.* FROM POLYGON_TBL p WHERE p.f1 @> polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)'; @@ -93,27 +93,27 @@ SELECT '' AS one, p.* -- -- 0 1 2 3 4 -- --- left of +-- left of SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' << polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)' AS false; --- left overlap +-- left overlap SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' << polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)' AS true; --- right overlap +-- right overlap SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' &> polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)' AS false; --- right of +-- right of SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' >> polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)' AS false; --- contained in +-- contained in SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' <@ polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)' AS false; --- contains +-- contains SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' @> polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)' AS false; -- +------------------------+ -- | *---* 1 --- | + | | +-- | + | | -- | 2 *---* -- +------------------------+ -- 3 @@ -122,10 +122,10 @@ SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' @> polygon '(3.0,1.0),(3.0,3.0),( SELECT '((0,4),(6,4),(1,2),(6,0),(0,0))'::polygon @> '((2,1),(2,3),(3,3),(3,1))'::polygon AS "false"; -- +-----------+ --- | *---* / --- | | |/ --- | | + --- | | |\ +-- | *---* / +-- | | |/ +-- | | + +-- | | |\ -- | *---* \ -- +-----------+ SELECT '((0,4),(6,4),(3,2),(6,0),(0,0))'::polygon @> '((2,1),(2,3),(3,3),(3,1))'::polygon AS "true"; @@ -148,15 +148,15 @@ SELECT '((1,1),(1,4),(5,4),(5,3),(2,3),(2,2),(5,2),(5,1))'::polygon @> '((3,2),( -- +---------+ SELECT '((0,0),(0,3),(3,3),(3,0))'::polygon @> '((2,1),(2,2),(3,2),(3,1))'::polygon AS "true"; --- same +-- same SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' ~= polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)' AS false; --- overlap +-- overlap SELECT polygon '(2.0,0.0),(2.0,4.0),(0.0,0.0)' && polygon '(3.0,1.0),(3.0,3.0),(1.0,0.0)' AS true; -- +--------------------+ -- | *---* 1 --- | + | | +-- | + | | -- | 2 *---* -- +--------------------+ -- 3 diff --git a/src/test/regress/sql/portals.sql b/src/test/regress/sql/portals.sql index 585a7c25ea..02286c4096 100644 --- a/src/test/regress/sql/portals.sql +++ b/src/test/regress/sql/portals.sql @@ -461,12 +461,12 @@ ROLLBACK; -- Make sure snapshot management works okay, per bug report in -- 235395b90909301035v7228ce63q392931f15aa74b31@mail.gmail.com -BEGIN; -SET TRANSACTION ISOLATION LEVEL SERIALIZABLE; -CREATE TABLE cursor (a int); -INSERT INTO cursor VALUES (1); -DECLARE c1 NO SCROLL CURSOR FOR SELECT * FROM cursor FOR UPDATE; -UPDATE cursor SET a = 2; -FETCH ALL FROM c1; -COMMIT; +BEGIN; +SET TRANSACTION ISOLATION LEVEL SERIALIZABLE; +CREATE TABLE cursor (a int); +INSERT INTO cursor VALUES (1); +DECLARE c1 NO SCROLL CURSOR FOR SELECT * FROM cursor FOR UPDATE; +UPDATE cursor SET a = 2; +FETCH ALL FROM c1; +COMMIT; DROP TABLE cursor; diff --git a/src/test/regress/sql/portals_p2.sql b/src/test/regress/sql/portals_p2.sql index 190035ae01..555820da39 100644 --- a/src/test/regress/sql/portals_p2.sql +++ b/src/test/regress/sql/portals_p2.sql @@ -4,43 +4,43 @@ BEGIN; -DECLARE foo13 CURSOR FOR +DECLARE foo13 CURSOR FOR SELECT * FROM onek WHERE unique1 = 50; -DECLARE foo14 CURSOR FOR +DECLARE foo14 CURSOR FOR SELECT * FROM onek WHERE unique1 = 51; -DECLARE foo15 CURSOR FOR +DECLARE foo15 CURSOR FOR SELECT * FROM onek WHERE unique1 = 52; -DECLARE foo16 CURSOR FOR +DECLARE foo16 CURSOR FOR SELECT * FROM onek WHERE unique1 = 53; -DECLARE foo17 CURSOR FOR +DECLARE foo17 CURSOR FOR SELECT * FROM onek WHERE unique1 = 54; -DECLARE foo18 CURSOR FOR +DECLARE foo18 CURSOR FOR SELECT * FROM onek WHERE unique1 = 55; -DECLARE foo19 CURSOR FOR +DECLARE foo19 CURSOR FOR SELECT * FROM onek WHERE unique1 = 56; -DECLARE foo20 CURSOR FOR +DECLARE foo20 CURSOR FOR SELECT * FROM onek WHERE unique1 = 57; -DECLARE foo21 CURSOR FOR +DECLARE foo21 CURSOR FOR SELECT * FROM onek WHERE unique1 = 58; -DECLARE foo22 CURSOR FOR +DECLARE foo22 CURSOR FOR SELECT * FROM onek WHERE unique1 = 59; -DECLARE foo23 CURSOR FOR +DECLARE foo23 CURSOR FOR SELECT * FROM onek WHERE unique1 = 60; -DECLARE foo24 CURSOR FOR +DECLARE foo24 CURSOR FOR SELECT * FROM onek2 WHERE unique1 = 50; -DECLARE foo25 CURSOR FOR +DECLARE foo25 CURSOR FOR SELECT * FROM onek2 WHERE unique1 = 60; FETCH all in foo13; diff --git a/src/test/regress/sql/rules.sql b/src/test/regress/sql/rules.sql index c7cf788b20..16dc106ab0 100644 --- a/src/test/regress/sql/rules.sql +++ b/src/test/regress/sql/rules.sql @@ -37,9 +37,9 @@ create table rtest_person (pname text, pdesc text); create table rtest_admin (pname text, sysname text); create rule rtest_sys_upd as on update to rtest_system do also ( - update rtest_interface set sysname = new.sysname + update rtest_interface set sysname = new.sysname where sysname = old.sysname; - update rtest_admin set sysname = new.sysname + update rtest_admin set sysname = new.sysname where sysname = old.sysname ); @@ -75,7 +75,7 @@ create rule rtest_emp_del as on delete to rtest_emp do -- -- Tables and rules for the multiple cascaded qualified instead --- rule test +-- rule test -- create table rtest_t4 (a int4, b text); create table rtest_t5 (a int4, b text); @@ -420,7 +420,7 @@ create table rtest_view1 (a int4, b text, v bool); create table rtest_view2 (a int4); create table rtest_view3 (a int4, b text); create table rtest_view4 (a int4, b text, c int4); -create view rtest_vview1 as select a, b from rtest_view1 X +create view rtest_vview1 as select a, b from rtest_view1 X where 0 < (select count(*) from rtest_view2 Y where Y.a = X.a); create view rtest_vview2 as select a, b from rtest_view1 where v; create view rtest_vview3 as select a, b from rtest_vview2 X @@ -493,7 +493,7 @@ create table rtest_unitfact ( factor float ); -create view rtest_vcomp as +create view rtest_vcomp as select X.part, (X.size * Y.factor) as size_in_cm from rtest_comp X, rtest_unitfact Y where X.unit = Y.unit; @@ -746,7 +746,7 @@ create rule rrule as on update to vview do instead ( insert into cchild (pid, descrip) - select old.pid, new.descrip where old.descrip isnull; + select old.pid, new.descrip where old.descrip isnull; update cchild set descrip = new.descrip where cchild.pid = old.pid; ); @@ -770,7 +770,7 @@ drop table cchild; -- SELECT viewname, definition FROM pg_views WHERE schemaname <> 'information_schema' ORDER BY viewname; -SELECT tablename, rulename, definition FROM pg_rules +SELECT tablename, rulename, definition FROM pg_rules ORDER BY tablename, rulename; -- @@ -797,14 +797,14 @@ SELECT * FROM ruletest_tbl2; create table rule_and_refint_t1 ( id1a integer, id1b integer, - + primary key (id1a, id1b) ); create table rule_and_refint_t2 ( id2a integer, id2c integer, - + primary key (id2a, id2c) ); @@ -901,11 +901,11 @@ create temp table t1 (a integer primary key); create temp table t1_1 (check (a >= 0 and a < 10)) inherits (t1); create temp table t1_2 (check (a >= 10 and a < 20)) inherits (t1); -create rule t1_ins_1 as on insert to t1 +create rule t1_ins_1 as on insert to t1 where new.a >= 0 and new.a < 10 do instead insert into t1_1 values (new.a); -create rule t1_ins_2 as on insert to t1 +create rule t1_ins_2 as on insert to t1 where new.a >= 10 and new.a < 20 do instead insert into t1_2 values (new.a); diff --git a/src/test/regress/sql/select.sql b/src/test/regress/sql/select.sql index 451fcf78d9..b99fb13c7d 100644 --- a/src/test/regress/sql/select.sql +++ b/src/test/regress/sql/select.sql @@ -13,24 +13,24 @@ SELECT * FROM onek -- awk '{if($1<20){print $1,$14;}else{next;}}' onek.data | sort +0nr -1 -- SELECT onek.unique1, onek.stringu1 FROM onek - WHERE onek.unique1 < 20 + WHERE onek.unique1 < 20 ORDER BY unique1 using >; -- -- awk '{if($1>980){print $1,$14;}else{next;}}' onek.data | sort +1d -2 -- SELECT onek.unique1, onek.stringu1 FROM onek - WHERE onek.unique1 > 980 + WHERE onek.unique1 > 980 ORDER BY stringu1 using <; - + -- -- awk '{if($1>980){print $1,$16;}else{next;}}' onek.data | -- sort +1d -2 +0nr -1 -- SELECT onek.unique1, onek.string4 FROM onek - WHERE onek.unique1 > 980 + WHERE onek.unique1 > 980 ORDER BY string4 using <, unique1 using >; - + -- -- awk '{if($1>980){print $1,$16;}else{next;}}' onek.data | -- sort +1dr -2 +0n -1 @@ -38,7 +38,7 @@ SELECT onek.unique1, onek.string4 FROM onek SELECT onek.unique1, onek.string4 FROM onek WHERE onek.unique1 > 980 ORDER BY string4 using >, unique1 using <; - + -- -- awk '{if($1<20){print $1,$16;}else{next;}}' onek.data | -- sort +0nr -1 +1d -2 @@ -52,7 +52,7 @@ SELECT onek.unique1, onek.string4 FROM onek -- sort +0n -1 +1dr -2 -- SELECT onek.unique1, onek.string4 FROM onek - WHERE onek.unique1 < 20 + WHERE onek.unique1 < 20 ORDER BY unique1 using <, string4 using >; -- @@ -77,7 +77,7 @@ SELECT onek2.* FROM onek2 WHERE onek2.unique1 < 10; -- awk '{if($1<20){print $1,$14;}else{next;}}' onek.data | sort +0nr -1 -- SELECT onek2.unique1, onek2.stringu1 FROM onek2 - WHERE onek2.unique1 < 20 + WHERE onek2.unique1 < 20 ORDER BY unique1 using >; -- diff --git a/src/test/regress/sql/select_implicit.sql b/src/test/regress/sql/select_implicit.sql index 448405bb1e..d815504222 100644 --- a/src/test/regress/sql/select_implicit.sql +++ b/src/test/regress/sql/select_implicit.sql @@ -55,7 +55,7 @@ SELECT c, count(*) FROM test_missing_target GROUP BY 3; -- group w/o existing GROUP BY and ORDER BY target under ambiguous condition -- failure expected -SELECT count(*) FROM test_missing_target x, test_missing_target y +SELECT count(*) FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY b ORDER BY b; @@ -75,19 +75,19 @@ SELECT a/2, a/2 FROM test_missing_target GROUP BY a/2 ORDER BY a/2; -- group w/ existing GROUP BY target under ambiguous condition -SELECT x.b, count(*) FROM test_missing_target x, test_missing_target y +SELECT x.b, count(*) FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY x.b ORDER BY x.b; -- group w/o existing GROUP BY target under ambiguous condition -SELECT count(*) FROM test_missing_target x, test_missing_target y +SELECT count(*) FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY x.b ORDER BY x.b; -- group w/o existing GROUP BY target under ambiguous condition -- into a table -SELECT count(*) INTO TABLE test_missing_target2 -FROM test_missing_target x, test_missing_target y +SELECT count(*) INTO TABLE test_missing_target2 +FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY x.b ORDER BY x.b; SELECT * FROM test_missing_target2; @@ -125,25 +125,25 @@ SELECT count(b) FROM test_missing_target -- group w/o existing GROUP BY and ORDER BY target under ambiguous condition -- failure expected -SELECT count(x.a) FROM test_missing_target x, test_missing_target y +SELECT count(x.a) FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY b/2 ORDER BY b/2; -- group w/ existing GROUP BY target under ambiguous condition -SELECT x.b/2, count(x.b) FROM test_missing_target x, test_missing_target y +SELECT x.b/2, count(x.b) FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY x.b/2 ORDER BY x.b/2; -- group w/o existing GROUP BY target under ambiguous condition -- failure expected due to ambiguous b in count(b) -SELECT count(b) FROM test_missing_target x, test_missing_target y +SELECT count(b) FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY x.b/2; -- group w/o existing GROUP BY target under ambiguous condition -- into a table -SELECT count(x.b) INTO TABLE test_missing_target3 -FROM test_missing_target x, test_missing_target y +SELECT count(x.b) INTO TABLE test_missing_target3 +FROM test_missing_target x, test_missing_target y WHERE x.a = y.a GROUP BY x.b/2 ORDER BY x.b/2; SELECT * FROM test_missing_target3; diff --git a/src/test/regress/sql/sequence.sql b/src/test/regress/sql/sequence.sql index af35a054d8..433e992994 100644 --- a/src/test/regress/sql/sequence.sql +++ b/src/test/regress/sql/sequence.sql @@ -1,19 +1,19 @@ --- --- test creation of SERIAL column --- - + CREATE TABLE serialTest (f1 text, f2 serial); - + INSERT INTO serialTest VALUES ('foo'); INSERT INTO serialTest VALUES ('bar'); INSERT INTO serialTest VALUES ('force', 100); INSERT INTO serialTest VALUES ('wrong', NULL); - + SELECT * FROM serialTest; -- basic sequence operations using both text and oid references CREATE SEQUENCE sequence_test; - + SELECT nextval('sequence_test'::text); SELECT nextval('sequence_test'::regclass); SELECT currval('sequence_test'::text); diff --git a/src/test/regress/sql/subselect.sql b/src/test/regress/sql/subselect.sql index 9d13c39c8a..296e38b8c1 100644 --- a/src/test/regress/sql/subselect.sql +++ b/src/test/regress/sql/subselect.sql @@ -169,7 +169,7 @@ SELECT *, ELSE 'Approved' END) ELSE 'PO' - END) + END) END) AS "Status", (CASE WHEN ord.ordercancelled @@ -184,7 +184,7 @@ END) AS "Status", ELSE 'Approved' END) ELSE 'PO' - END) + END) END) AS "Status_OK" FROM orderstest ord; diff --git a/src/test/regress/sql/timestamp.sql b/src/test/regress/sql/timestamp.sql index 790ade3137..c4ed4eee3b 100644 --- a/src/test/regress/sql/timestamp.sql +++ b/src/test/regress/sql/timestamp.sql @@ -141,7 +141,7 @@ INSERT INTO TIMESTAMP_TBL VALUES ('Jan 01 17:32:01 2001'); INSERT INTO TIMESTAMP_TBL VALUES ('Feb 16 17:32:01 -0097'); INSERT INTO TIMESTAMP_TBL VALUES ('Feb 16 17:32:01 5097 BC'); -SELECT '' AS "64", d1 FROM TIMESTAMP_TBL; +SELECT '' AS "64", d1 FROM TIMESTAMP_TBL; -- Demonstrate functions and operators SELECT '' AS "48", d1 FROM TIMESTAMP_TBL @@ -190,7 +190,7 @@ SELECT '' AS "54", d1 as "timestamp", FROM TIMESTAMP_TBL WHERE d1 BETWEEN '1902-01-01' AND '2038-01-01'; -- TO_CHAR() -SELECT '' AS to_char_1, to_char(d1, 'DAY Day day DY Dy dy MONTH Month month RM MON Mon mon') +SELECT '' AS to_char_1, to_char(d1, 'DAY Day day DY Dy dy MONTH Month month RM MON Mon mon') FROM TIMESTAMP_TBL; SELECT '' AS to_char_2, to_char(d1, 'FMDAY FMDay FMday FMMONTH FMMonth FMmonth FMRM') @@ -199,23 +199,23 @@ SELECT '' AS to_char_2, to_char(d1, 'FMDAY FMDay FMday FMMONTH FMMonth FMmonth F SELECT '' AS to_char_3, to_char(d1, 'Y,YYY YYYY YYY YY Y CC Q MM WW DDD DD D J') FROM TIMESTAMP_TBL; -SELECT '' AS to_char_4, to_char(d1, 'FMY,YYY FMYYYY FMYYY FMYY FMY FMCC FMQ FMMM FMWW FMDDD FMDD FMD FMJ') +SELECT '' AS to_char_4, to_char(d1, 'FMY,YYY FMYYYY FMYYY FMYY FMY FMCC FMQ FMMM FMWW FMDDD FMDD FMD FMJ') FROM TIMESTAMP_TBL; -SELECT '' AS to_char_5, to_char(d1, 'HH HH12 HH24 MI SS SSSS') +SELECT '' AS to_char_5, to_char(d1, 'HH HH12 HH24 MI SS SSSS') FROM TIMESTAMP_TBL; -SELECT '' AS to_char_6, to_char(d1, E'"HH:MI:SS is" HH:MI:SS "\\"text between quote marks\\""') +SELECT '' AS to_char_6, to_char(d1, E'"HH:MI:SS is" HH:MI:SS "\\"text between quote marks\\""') FROM TIMESTAMP_TBL; SELECT '' AS to_char_7, to_char(d1, 'HH24--text--MI--text--SS') FROM TIMESTAMP_TBL; -SELECT '' AS to_char_8, to_char(d1, 'YYYYTH YYYYth Jth') +SELECT '' AS to_char_8, to_char(d1, 'YYYYTH YYYYth Jth') + FROM TIMESTAMP_TBL; + +SELECT '' AS to_char_9, to_char(d1, 'YYYY A.D. YYYY a.d. YYYY bc HH:MI:SS P.M. HH:MI:SS p.m. HH:MI:SS pm') FROM TIMESTAMP_TBL; - -SELECT '' AS to_char_9, to_char(d1, 'YYYY A.D. YYYY a.d. YYYY bc HH:MI:SS P.M. HH:MI:SS p.m. HH:MI:SS pm') - FROM TIMESTAMP_TBL; SELECT '' AS to_char_10, to_char(d1, 'IYYY IYY IY I IW IDDD ID') FROM TIMESTAMP_TBL; diff --git a/src/test/regress/sql/timestamptz.sql b/src/test/regress/sql/timestamptz.sql index e74691cc04..863b2865cb 100644 --- a/src/test/regress/sql/timestamptz.sql +++ b/src/test/regress/sql/timestamptz.sql @@ -160,7 +160,7 @@ SELECT 'Wed Jul 11 10:51:14 GMT+4 2001'::timestamptz; SELECT 'Wed Jul 11 10:51:14 PST-03:00 2001'::timestamptz; SELECT 'Wed Jul 11 10:51:14 PST+03:00 2001'::timestamptz; -SELECT '' AS "64", d1 FROM TIMESTAMPTZ_TBL; +SELECT '' AS "64", d1 FROM TIMESTAMPTZ_TBL; -- Demonstrate functions and operators SELECT '' AS "48", d1 FROM TIMESTAMPTZ_TBL @@ -208,32 +208,32 @@ SELECT '' AS "54", d1 as timestamptz, FROM TIMESTAMPTZ_TBL WHERE d1 BETWEEN '1902-01-01' AND '2038-01-01'; -- TO_CHAR() -SELECT '' AS to_char_1, to_char(d1, 'DAY Day day DY Dy dy MONTH Month month RM MON Mon mon') +SELECT '' AS to_char_1, to_char(d1, 'DAY Day day DY Dy dy MONTH Month month RM MON Mon mon') FROM TIMESTAMPTZ_TBL; - + SELECT '' AS to_char_2, to_char(d1, 'FMDAY FMDay FMday FMMONTH FMMonth FMmonth FMRM') - FROM TIMESTAMPTZ_TBL; + FROM TIMESTAMPTZ_TBL; SELECT '' AS to_char_3, to_char(d1, 'Y,YYY YYYY YYY YY Y CC Q MM WW DDD DD D J') FROM TIMESTAMPTZ_TBL; - -SELECT '' AS to_char_4, to_char(d1, 'FMY,YYY FMYYYY FMYYY FMYY FMY FMCC FMQ FMMM FMWW FMDDD FMDD FMD FMJ') - FROM TIMESTAMPTZ_TBL; - -SELECT '' AS to_char_5, to_char(d1, 'HH HH12 HH24 MI SS SSSS') + +SELECT '' AS to_char_4, to_char(d1, 'FMY,YYY FMYYYY FMYYY FMYY FMY FMCC FMQ FMMM FMWW FMDDD FMDD FMD FMJ') + FROM TIMESTAMPTZ_TBL; + +SELECT '' AS to_char_5, to_char(d1, 'HH HH12 HH24 MI SS SSSS') + FROM TIMESTAMPTZ_TBL; + +SELECT '' AS to_char_6, to_char(d1, E'"HH:MI:SS is" HH:MI:SS "\\"text between quote marks\\""') FROM TIMESTAMPTZ_TBL; -SELECT '' AS to_char_6, to_char(d1, E'"HH:MI:SS is" HH:MI:SS "\\"text between quote marks\\""') - FROM TIMESTAMPTZ_TBL; - SELECT '' AS to_char_7, to_char(d1, 'HH24--text--MI--text--SS') - FROM TIMESTAMPTZ_TBL; + FROM TIMESTAMPTZ_TBL; + +SELECT '' AS to_char_8, to_char(d1, 'YYYYTH YYYYth Jth') + FROM TIMESTAMPTZ_TBL; -SELECT '' AS to_char_8, to_char(d1, 'YYYYTH YYYYth Jth') +SELECT '' AS to_char_9, to_char(d1, 'YYYY A.D. YYYY a.d. YYYY bc HH:MI:SS P.M. HH:MI:SS p.m. HH:MI:SS pm') FROM TIMESTAMPTZ_TBL; - -SELECT '' AS to_char_9, to_char(d1, 'YYYY A.D. YYYY a.d. YYYY bc HH:MI:SS P.M. HH:MI:SS p.m. HH:MI:SS pm') - FROM TIMESTAMPTZ_TBL; SELECT '' AS to_char_10, to_char(d1, 'IYYY IYY IY I IW IDDD ID') FROM TIMESTAMPTZ_TBL; diff --git a/src/test/regress/sql/tinterval.sql b/src/test/regress/sql/tinterval.sql index 5abdb6d106..42399ce694 100644 --- a/src/test/regress/sql/tinterval.sql +++ b/src/test/regress/sql/tinterval.sql @@ -23,7 +23,7 @@ INSERT INTO TINTERVAL_TBL (f1) VALUES ('["Feb 15 1990 12:15:03" "2001-09-23 11:12:13"]'); --- badly formatted tintervals +-- badly formatted tintervals INSERT INTO TINTERVAL_TBL (f1) VALUES ('["bad time specifications" ""]'); @@ -84,7 +84,7 @@ SELECT '' AS fourteen, t1.f1 AS interval1, t2.f1 AS interval2 -- contains SELECT '' AS five, t1.f1 FROM TINTERVAL_TBL t1 - WHERE not t1.f1 << + WHERE not t1.f1 << tinterval '["Aug 15 14:23:19 1980" "Sep 16 14:23:19 1990"]' ORDER BY t1.f1; diff --git a/src/test/regress/sql/transactions.sql b/src/test/regress/sql/transactions.sql index c670ae18d0..17e830e7a4 100644 --- a/src/test/regress/sql/transactions.sql +++ b/src/test/regress/sql/transactions.sql @@ -4,7 +4,7 @@ BEGIN; -SELECT * +SELECT * INTO TABLE xacttest FROM aggtest; @@ -27,10 +27,10 @@ SELECT * FROM aggtest; ABORT; --- should not exist +-- should not exist SELECT oid FROM pg_class WHERE relname = 'disappear'; --- should have members again +-- should have members again SELECT * FROM aggtest; @@ -129,7 +129,7 @@ BEGIN; DELETE FROM savepoints WHERE a=2; ROLLBACK; COMMIT; -- should not be in a transaction block - + SELECT * FROM savepoints; -- test whole-tree commit on an aborted subtransaction diff --git a/src/test/regress/sql/triggers.sql b/src/test/regress/sql/triggers.sql index a830b3b392..28928d5a93 100644 --- a/src/test/regress/sql/triggers.sql +++ b/src/test/regress/sql/triggers.sql @@ -23,25 +23,25 @@ create unique index pkeys_i on pkeys (pkey1, pkey2); -- (fkey1, fkey2) --> pkeys (pkey1, pkey2) -- (fkey3) --> fkeys2 (pkey23) -- -create trigger check_fkeys_pkey_exist - before insert or update on fkeys - for each row - execute procedure +create trigger check_fkeys_pkey_exist + before insert or update on fkeys + for each row + execute procedure check_primary_key ('fkey1', 'fkey2', 'pkeys', 'pkey1', 'pkey2'); -create trigger check_fkeys_pkey2_exist - before insert or update on fkeys - for each row +create trigger check_fkeys_pkey2_exist + before insert or update on fkeys + for each row execute procedure check_primary_key ('fkey3', 'fkeys2', 'pkey23'); -- -- For fkeys2: -- (fkey21, fkey22) --> pkeys (pkey1, pkey2) -- -create trigger check_fkeys2_pkey_exist - before insert or update on fkeys2 - for each row - execute procedure +create trigger check_fkeys2_pkey_exist + before insert or update on fkeys2 + for each row + execute procedure check_primary_key ('fkey21', 'fkey22', 'pkeys', 'pkey1', 'pkey2'); -- Test comments @@ -55,10 +55,10 @@ COMMENT ON TRIGGER check_fkeys2_pkey_exist ON fkeys2 IS NULL; -- fkeys (fkey1, fkey2) and fkeys2 (fkey21, fkey22) -- create trigger check_pkeys_fkey_cascade - before delete or update on pkeys - for each row - execute procedure - check_foreign_key (2, 'cascade', 'pkey1', 'pkey2', + before delete or update on pkeys + for each row + execute procedure + check_foreign_key (2, 'cascade', 'pkey1', 'pkey2', 'fkeys', 'fkey1', 'fkey2', 'fkeys2', 'fkey21', 'fkey22'); -- @@ -66,9 +66,9 @@ create trigger check_pkeys_fkey_cascade -- ON DELETE/UPDATE (pkey23) RESTRICT: -- fkeys (fkey3) -- -create trigger check_fkeys2_fkey_restrict +create trigger check_fkeys2_fkey_restrict before delete or update on fkeys2 - for each row + for each row execute procedure check_foreign_key (1, 'restrict', 'pkey23', 'fkeys', 'fkey3'); insert into fkeys2 values (10, '1', 1); @@ -103,53 +103,53 @@ DROP TABLE fkeys2; -- -- Jan -- -- create table dup17 (x int4); --- --- create trigger dup17_before +-- +-- create trigger dup17_before -- before insert on dup17 --- for each row --- execute procedure +-- for each row +-- execute procedure -- funny_dup17 () -- ; --- +-- -- insert into dup17 values (17); -- select count(*) from dup17; -- insert into dup17 values (17); -- select count(*) from dup17; --- +-- -- drop trigger dup17_before on dup17; --- +-- -- create trigger dup17_after -- after insert on dup17 --- for each row --- execute procedure +-- for each row +-- execute procedure -- funny_dup17 () -- ; -- insert into dup17 values (13); -- select count(*) from dup17 where x = 13; -- insert into dup17 values (13); -- select count(*) from dup17 where x = 13; --- +-- -- DROP TABLE dup17; create sequence ttdummy_seq increment 10 start 0 minvalue 0; create table tttest ( - price_id int4, - price_val int4, + price_id int4, + price_val int4, price_on int4, price_off int4 default 999999 ); -create trigger ttdummy +create trigger ttdummy before delete or update on tttest - for each row - execute procedure + for each row + execute procedure ttdummy (price_on, price_off); -create trigger ttserial +create trigger ttserial before insert or update on tttest - for each row - execute procedure + for each row + execute procedure autoinc (price_on, ttdummy_seq); insert into tttest values (1, 1, null); @@ -386,7 +386,7 @@ CREATE TABLE trigger_test ( v varchar ); -CREATE OR REPLACE FUNCTION trigger_data() RETURNS trigger +CREATE OR REPLACE FUNCTION trigger_data() RETURNS trigger LANGUAGE plpgsql AS $$ declare @@ -399,7 +399,7 @@ begin relid := TG_relid::regclass; -- plpgsql can't discover its trigger data in a hash like perl and python - -- can, or by a sort of reflection like tcl can, + -- can, or by a sort of reflection like tcl can, -- so we have to hard code the names. raise NOTICE 'TG_NAME: %', TG_name; raise NOTICE 'TG_WHEN: %', TG_when; @@ -438,16 +438,16 @@ begin end; $$; -CREATE TRIGGER show_trigger_data_trig +CREATE TRIGGER show_trigger_data_trig BEFORE INSERT OR UPDATE OR DELETE ON trigger_test FOR EACH ROW EXECUTE PROCEDURE trigger_data(23,'skidoo'); insert into trigger_test values(1,'insert'); update trigger_test set v = 'update' where i = 1; delete from trigger_test; - + DROP TRIGGER show_trigger_data_trig on trigger_test; - + DROP FUNCTION trigger_data(); DROP TABLE trigger_test; @@ -547,11 +547,11 @@ INSERT INTO min_updates_test VALUES ('a',1,2),('b','2',null); INSERT INTO min_updates_test_oids VALUES ('a',1,2),('b','2',null); -CREATE TRIGGER z_min_update +CREATE TRIGGER z_min_update BEFORE UPDATE ON min_updates_test FOR EACH ROW EXECUTE PROCEDURE suppress_redundant_updates_trigger(); -CREATE TRIGGER z_min_update +CREATE TRIGGER z_min_update BEFORE UPDATE ON min_updates_test_oids FOR EACH ROW EXECUTE PROCEDURE suppress_redundant_updates_trigger(); diff --git a/src/test/regress/sql/truncate.sql b/src/test/regress/sql/truncate.sql index a3e324db21..a3d6f5368f 100644 --- a/src/test/regress/sql/truncate.sql +++ b/src/test/regress/sql/truncate.sql @@ -148,7 +148,7 @@ INSERT INTO trunc_trigger_test VALUES(1, 'foo', 'bar'), (2, 'baz', 'quux'); CREATE TRIGGER t BEFORE TRUNCATE ON trunc_trigger_test -FOR EACH STATEMENT +FOR EACH STATEMENT EXECUTE PROCEDURE trunctrigger('before trigger truncate'); SELECT count(*) as "Row count in test table" FROM trunc_trigger_test; @@ -166,7 +166,7 @@ INSERT INTO trunc_trigger_test VALUES(1, 'foo', 'bar'), (2, 'baz', 'quux'); CREATE TRIGGER tt AFTER TRUNCATE ON trunc_trigger_test -FOR EACH STATEMENT +FOR EACH STATEMENT EXECUTE PROCEDURE trunctrigger('after trigger truncate'); SELECT count(*) as "Row count in test table" FROM trunc_trigger_test; diff --git a/src/test/regress/sql/tsdicts.sql b/src/test/regress/sql/tsdicts.sql index 000f6eb2e7..55afcec906 100644 --- a/src/test/regress/sql/tsdicts.sql +++ b/src/test/regress/sql/tsdicts.sql @@ -50,7 +50,7 @@ SELECT ts_lexize('hunspell', 'footballyklubber'); -- Synonim dictionary CREATE TEXT SEARCH DICTIONARY synonym ( - Template=synonym, + Template=synonym, Synonyms=synonym_sample ); @@ -63,7 +63,7 @@ SELECT ts_lexize('synonym', 'indices'); -- cannot pass more than one word to thesaurus. CREATE TEXT SEARCH DICTIONARY thesaurus ( Template=thesaurus, - DictFile=thesaurus_sample, + DictFile=thesaurus_sample, Dictionary=english_stem ); @@ -99,8 +99,8 @@ CREATE TEXT SEARCH CONFIGURATION synonym_tst ( COPY=english ); -ALTER TEXT SEARCH CONFIGURATION synonym_tst ALTER MAPPING FOR - asciiword, hword_asciipart, asciihword +ALTER TEXT SEARCH CONFIGURATION synonym_tst ALTER MAPPING FOR + asciiword, hword_asciipart, asciihword WITH synonym, english_stem; SELECT to_tsvector('synonym_tst', 'Postgresql is often called as postgres or pgsql and pronounced as postgre'); @@ -114,8 +114,8 @@ CREATE TEXT SEARCH CONFIGURATION thesaurus_tst ( COPY=synonym_tst ); -ALTER TEXT SEARCH CONFIGURATION thesaurus_tst ALTER MAPPING FOR - asciiword, hword_asciipart, asciihword +ALTER TEXT SEARCH CONFIGURATION thesaurus_tst ALTER MAPPING FOR + asciiword, hword_asciipart, asciihword WITH synonym, thesaurus, english_stem; SELECT to_tsvector('thesaurus_tst', 'one postgres one two one two three one'); diff --git a/src/test/regress/sql/tsearch.sql b/src/test/regress/sql/tsearch.sql index 3c0a7dd82a..d261da2104 100644 --- a/src/test/regress/sql/tsearch.sql +++ b/src/test/regress/sql/tsearch.sql @@ -33,7 +33,7 @@ WHERE mapcfg = 0 OR mapdict = 0; -- Look for pg_ts_config_map entries that aren't one of parser's token types SELECT * FROM ( SELECT oid AS cfgid, (ts_token_type(cfgparser)).tokid AS tokid - FROM pg_ts_config ) AS tt + FROM pg_ts_config ) AS tt RIGHT JOIN pg_ts_config_map AS m ON (tt.cfgid=m.mapcfg AND tt.tokid=m.maptokentype) WHERE @@ -76,7 +76,7 @@ SELECT count(*) FROM test_tsvector WHERE a @@ 'eq|yt'; SELECT count(*) FROM test_tsvector WHERE a @@ '(eq&yt)|(wr&qh)'; SELECT count(*) FROM test_tsvector WHERE a @@ '(eq|yt)&(wr|qh)'; SELECT count(*) FROM test_tsvector WHERE a @@ 'w:*|q:*'; - + RESET enable_seqscan; INSERT INTO test_tsvector VALUES ('???', 'DFG:1A,2B,6C,10 FGH'); SELECT * FROM ts_stat('SELECT a FROM test_tsvector') ORDER BY ndoc DESC, nentry DESC, word LIMIT 10; @@ -214,7 +214,7 @@ ff-bg ', to_tsquery('english', 'sea&foo'), 'HighlightAll=true'); ---Check if headline fragments work +--Check if headline fragments work SELECT ts_headline('english', ' Day after day, day after day, We stuck, nor breath nor motion, diff --git a/src/test/regress/sql/type_sanity.sql b/src/test/regress/sql/type_sanity.sql index 479bf8542a..af7aa2d8b3 100644 --- a/src/test/regress/sql/type_sanity.sql +++ b/src/test/regress/sql/type_sanity.sql @@ -61,7 +61,7 @@ WHERE p1.typtype in ('b','e') AND p1.typname NOT LIKE E'\\_%' AND NOT EXISTS p2.typelem = p1.oid and p1.typarray = p2.oid); -- Make sure typarray points to a varlena array type of our own base -SELECT p1.oid, p1.typname as basetype, p2.typname as arraytype, +SELECT p1.oid, p1.typname as basetype, p2.typname as arraytype, p2.typelem, p2.typlen FROM pg_type p1 LEFT JOIN pg_type p2 ON (p1.typarray = p2.oid) WHERE p1.typarray <> 0 AND diff --git a/src/test/regress/sql/varchar.sql b/src/test/regress/sql/varchar.sql index 414c585d9a..58d29ca4ba 100644 --- a/src/test/regress/sql/varchar.sql +++ b/src/test/regress/sql/varchar.sql @@ -8,17 +8,17 @@ INSERT INTO VARCHAR_TBL (f1) VALUES ('a'); INSERT INTO VARCHAR_TBL (f1) VALUES ('A'); --- any of the following three input formats are acceptable +-- any of the following three input formats are acceptable INSERT INTO VARCHAR_TBL (f1) VALUES ('1'); INSERT INTO VARCHAR_TBL (f1) VALUES (2); INSERT INTO VARCHAR_TBL (f1) VALUES ('3'); --- zero-length char +-- zero-length char INSERT INTO VARCHAR_TBL (f1) VALUES (''); --- try varchar's of greater than 1 length +-- try varchar's of greater than 1 length INSERT INTO VARCHAR_TBL (f1) VALUES ('cd'); INSERT INTO VARCHAR_TBL (f1) VALUES ('c '); diff --git a/src/test/regress/sql/window.sql b/src/test/regress/sql/window.sql index 1cfc64bd8b..6a5c855ead 100644 --- a/src/test/regress/sql/window.sql +++ b/src/test/regress/sql/window.sql @@ -73,7 +73,7 @@ SELECT lead(ten * 2, 1, -1) OVER (PARTITION BY four ORDER BY ten), ten, four FRO SELECT first_value(ten) OVER (PARTITION BY four ORDER BY ten), ten, four FROM tenk1 WHERE unique2 < 10; -- last_value returns the last row of the frame, which is CURRENT ROW in ORDER BY window. -SELECT last_value(four) OVER (ORDER BY ten), ten, four FROM tenk1 WHERE unique2 < 10; +SELECT last_value(four) OVER (ORDER BY ten), ten, four FROM tenk1 WHERE unique2 < 10; SELECT last_value(ten) OVER (PARTITION BY four), ten, four FROM (SELECT * FROM tenk1 WHERE unique2 < 10 ORDER BY four, ten)s @@ -82,19 +82,19 @@ SELECT last_value(ten) OVER (PARTITION BY four), ten, four FROM SELECT nth_value(ten, four + 1) OVER (PARTITION BY four), ten, four FROM (SELECT * FROM tenk1 WHERE unique2 < 10 ORDER BY four, ten)s; -SELECT ten, two, sum(hundred) AS gsum, sum(sum(hundred)) OVER (PARTITION BY two ORDER BY ten) AS wsum +SELECT ten, two, sum(hundred) AS gsum, sum(sum(hundred)) OVER (PARTITION BY two ORDER BY ten) AS wsum FROM tenk1 GROUP BY ten, two; SELECT count(*) OVER (PARTITION BY four), four FROM (SELECT * FROM tenk1 WHERE two = 1)s WHERE unique2 < 10; -SELECT (count(*) OVER (PARTITION BY four ORDER BY ten) + - sum(hundred) OVER (PARTITION BY four ORDER BY ten))::varchar AS cntsum +SELECT (count(*) OVER (PARTITION BY four ORDER BY ten) + + sum(hundred) OVER (PARTITION BY four ORDER BY ten))::varchar AS cntsum FROM tenk1 WHERE unique2 < 10; -- opexpr with different windows evaluation. SELECT * FROM( - SELECT count(*) OVER (PARTITION BY four ORDER BY ten) + - sum(hundred) OVER (PARTITION BY two ORDER BY ten) AS total, + SELECT count(*) OVER (PARTITION BY four ORDER BY ten) + + sum(hundred) OVER (PARTITION BY two ORDER BY ten) AS total, count(*) OVER (PARTITION BY four ORDER BY ten) AS fourcount, sum(hundred) OVER (PARTITION BY two ORDER BY ten) AS twosum FROM tenk1 @@ -103,7 +103,7 @@ WHERE total <> fourcount + twosum; SELECT avg(four) OVER (PARTITION BY four ORDER BY thousand / 100) FROM tenk1 WHERE unique2 < 10; -SELECT ten, two, sum(hundred) AS gsum, sum(sum(hundred)) OVER win AS wsum +SELECT ten, two, sum(hundred) AS gsum, sum(sum(hundred)) OVER win AS wsum FROM tenk1 GROUP BY ten, two WINDOW win AS (PARTITION BY two ORDER BY ten); -- more than one window with GROUP BY diff --git a/src/test/thread/README b/src/test/thread/README index 509f3dc24e..00ec2fff06 100644 --- a/src/test/thread/README +++ b/src/test/thread/README @@ -17,21 +17,21 @@ To use this program manually, you must: o compile and run this program If your platform requires special thread flags that are not tested by -/config/acx_pthread.m4, add PTHREAD_CFLAGS and PTHREAD_LIBS defines to +/config/acx_pthread.m4, add PTHREAD_CFLAGS and PTHREAD_LIBS defines to your template/${port} file. Windows Systems =============== Windows systems do not vary in their thread-safeness in the same way that -other systems might, nor do they generally have pthreads installed, hence -on Windows this test is skipped by the configure program (pthreads is +other systems might, nor do they generally have pthreads installed, hence +on Windows this test is skipped by the configure program (pthreads is required by the test program, but not PostgreSQL itself). If you do wish to test your system however, you can do so as follows: 1) Install pthreads in you Mingw/Msys environment. You can download pthreads from ftp://sources.redhat.com/pub/pthreads-win32/. - + 2) Build the test program: gcc -o thread_test.exe \ diff --git a/src/tools/RELEASE_CHANGES b/src/tools/RELEASE_CHANGES index de994b2b50..8e54793f1d 100644 --- a/src/tools/RELEASE_CHANGES +++ b/src/tools/RELEASE_CHANGES @@ -143,7 +143,7 @@ function: } If we wanted to add a third argument: - + void print_stuff(int arg1, int arg2, int arg3) { printf("stuff: %d %d %d\n", arg1, arg2, arg3); diff --git a/src/tools/backend/README b/src/tools/backend/README index d779c0e11a..2b8692d393 100644 --- a/src/tools/backend/README +++ b/src/tools/backend/README @@ -1,4 +1,4 @@ src/tools/backend/README -Just point your browser at the index.html file, and click on the +Just point your browser at the index.html file, and click on the flowchart to see the description and source code. diff --git a/src/tools/backend/backend_dirs.html b/src/tools/backend/backend_dirs.html index 9b675c3e2a..16bd894582 100644 --- a/src/tools/backend/backend_dirs.html +++ b/src/tools/backend/backend_dirs.html @@ -339,7 +339,7 @@ i.e. '~'.

href="../../backend/port">port - compatibility routines
- +
Maintainer: Bruce Momjian ( pgman@candle.pha.pa.us diff --git a/src/tools/check_keywords.pl b/src/tools/check_keywords.pl index 24d7bf6f20..3b68638614 100755 --- a/src/tools/check_keywords.pl +++ b/src/tools/check_keywords.pl @@ -13,7 +13,7 @@ if (@ARGV) { $path = $ARGV[0]; shift @ARGV; } else { - $path = "."; + $path = "."; } $[ = 1; # set array base to 1 @@ -86,7 +86,7 @@ line: while () { if ($arr[$fieldIndexer] eq '|') { next; } - + # Put this keyword into the right list push @{$keywords{$kcat}}, $arr[$fieldIndexer]; } diff --git a/src/tools/editors/emacs.samples b/src/tools/editors/emacs.samples index c1820f28c5..f755843d40 100644 --- a/src/tools/editors/emacs.samples +++ b/src/tools/editors/emacs.samples @@ -64,11 +64,11 @@ (add-hook 'c-mode-hook (function - (lambda nil + (lambda nil (if (string-match "pgsql" buffer-file-name) (progn (c-set-style "bsd") - (setq c-basic-offset 4) + (setq c-basic-offset 4) (setq tab-width 4) (c-set-offset 'case-label '+) (setq indent-tabs-mode t) diff --git a/src/tools/entab/Makefile b/src/tools/entab/Makefile index b252432e14..de8181828a 100644 --- a/src/tools/entab/Makefile +++ b/src/tools/entab/Makefile @@ -4,17 +4,17 @@ # TARGET = entab BINDIR = /usr/local/bin -XFLAGS = +XFLAGS = CFLAGS = -O -LIBS = +LIBS = $(TARGET) : entab.o halt.o $(CC) -o $(TARGET) $(XFLAGS) $(CFLAGS) entab.o halt.o $(LIBS) -entab.o : entab.c +entab.o : entab.c $(CC) -c $(XFLAGS) $(CFLAGS) entab.c -halt.o : halt.c +halt.o : halt.c $(CC) -c $(XFLAGS) $(CFLAGS) halt.c clean: diff --git a/src/tools/entab/entab.man b/src/tools/entab/entab.man index 1692ee631b..362ec730f4 100644 --- a/src/tools/entab/entab.man +++ b/src/tools/entab/entab.man @@ -41,7 +41,7 @@ leaving a large gap. The quote-protection option allows tab replacement without quoted strings being changed. Useful when strings in source code will not have the same tab stops -when executed in the program. +when executed in the program. .LP To change a text file created on a system with one size of tab stop to display properly on a device with different tab setting, diff --git a/src/tools/find_static b/src/tools/find_static index 28762728af..c7014e6014 100755 --- a/src/tools/find_static +++ b/src/tools/find_static @@ -26,8 +26,8 @@ echo " copy debug from '/tmp/"$$"'; - select * - into table debug2 + select * + into table debug2 from debug; create index idebug on debug(scope,func); @@ -35,8 +35,8 @@ echo " vacuum debug; vacuum debug2; - update debug2 - set scope = '_' + update debug2 + set scope = '_' from debug where debug2.func = debug.func and debug2.scope = 'T' and debug.scope = 'U'; diff --git a/src/tools/find_typedef b/src/tools/find_typedef index 838c29b881..8b07de62ef 100755 --- a/src/tools/find_typedef +++ b/src/tools/find_typedef @@ -4,12 +4,12 @@ # This script attempts to find all typedef's in the postgres binaries # by using 'nm' to report all typedef debugging symbols. -# -# For this program to work, you must have compiled all binaries with +# +# For this program to work, you must have compiled all binaries with # debugging symbols. # # This is run on BSD/OS 4.0 or Linux, so you may need to make changes. -# +# # Ignore the nm errors about a file not being a binary file. # # It gets typedefs by reading "STABS": diff --git a/src/tools/make_diff/README b/src/tools/make_diff/README index bc5cea4ceb..9401a74a64 100644 --- a/src/tools/make_diff/README +++ b/src/tools/make_diff/README @@ -14,7 +14,7 @@ for every file in the current directory. I can: cporig `grep -l HeapTuple *` If I use mkid (from ftp.postgreSQL.org), I can do: - + cporig `lid -kn 'fsyncOff'` and get a copy of every file containing that word. I can then do: @@ -29,7 +29,7 @@ to edit all those files. When I am ready to generate a patch, I run 'difforig' command from the top of the source tree: - + I pipe the output of this to a file to hold my patch, and the file names it processes appear on my screen. It creates a nice patch for me of all the files I used with cporig. diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm index bb1aed7b7c..1e0c9d6e1e 100644 --- a/src/tools/msvc/Mkvcbuild.pm +++ b/src/tools/msvc/Mkvcbuild.pm @@ -25,9 +25,9 @@ my $postgres; my $libpq; my $contrib_defines = {'refint' => 'REFINT_VERBOSE'}; -my @contrib_uselibpq = ('dblink', 'oid2name', 'pgbench', 'pg_upgrade', +my @contrib_uselibpq = ('dblink', 'oid2name', 'pgbench', 'pg_upgrade', 'vacuumlo'); -my @contrib_uselibpgport = ('oid2name', 'pgbench', 'pg_standby', +my @contrib_uselibpgport = ('oid2name', 'pgbench', 'pg_standby', 'pg_archivecleanup', 'pg_upgrade', 'vacuumlo'); my $contrib_extralibs = {'pgbench' => ['wsock32.lib']}; my $contrib_extraincludes = {'tsearch2' => ['contrib/tsearch2'], 'dblink' => ['src/backend']}; diff --git a/src/tools/msvc/README b/src/tools/msvc/README index 531c286f47..58e266e11f 100644 --- a/src/tools/msvc/README +++ b/src/tools/msvc/README @@ -18,13 +18,13 @@ perltidy -b -bl -nsfs -naws -l=100 -ole=unix *.pl *.pm Notes about Visual Studio Express --------------------------------- To build PostgreSQL using Visual Studio Express, the Platform SDK -has to be installed. Since this is not included in the product +has to be installed. Since this is not included in the product originally, extra steps are needed to make it work. -First, download and install the latest Platform SDK from -www.microsoft.com. +First, download and install the latest Platform SDK from +www.microsoft.com. -Locate the files vcprojectengine.dll.express.config and +Locate the files vcprojectengine.dll.express.config and vcprojectengine.dll.config in the vc\vcpackages directory of the Visual C++ Express installation. In these files, add the paths to the Platform SDK to the Include, Library and Path tags. Be sure diff --git a/src/tools/pginclude/pgrminclude b/src/tools/pginclude/pgrminclude index 1e99b12b73..a8ec10a486 100755 --- a/src/tools/pginclude/pgrminclude +++ b/src/tools/pginclude/pgrminclude @@ -4,7 +4,7 @@ # src/tools/pginclude/pgrminclude trap "rm -f /tmp/$$.c /tmp/$$.o /tmp/$$ /tmp/$$a /tmp/$$b" 0 1 2 3 15 -find . \( -name CVS -a -prune \) -o -type f -name '*.[ch]' -print | +find . \( -name CVS -a -prune \) -o -type f -name '*.[ch]' -print | grep -v '\./postgres.h' | grep -v '\./pg_config.h' | grep -v '\./c.h' | @@ -14,7 +14,7 @@ do then IS_INCLUDE="Y" else IS_INCLUDE="N" fi - + # loop through all includes cat "$FILE" | grep "^#include" | sed 's/^#include[ ]*[<"]\([^>"]*\).*$/\1/g' | @@ -39,7 +39,7 @@ do # remove defines from include files if [ "$IS_INCLUDE" = "Y" ] - then cat "$FILE" | grep -v "^#if" | grep -v "^#else" | + then cat "$FILE" | grep -v "^#if" | grep -v "^#else" | grep -v "^#endif" | sed 's/->[a-zA-Z0-9_\.]*//g' >/tmp/$$a else cat "$FILE" >/tmp/$$a fi diff --git a/src/tools/pgindent/README b/src/tools/pgindent/README index 49e0893575..0fedfa99ff 100644 --- a/src/tools/pgindent/README +++ b/src/tools/pgindent/README @@ -4,7 +4,7 @@ pgindent ======== This can format all PostgreSQL *.c and *.h files, but excludes *.y, and -*.l files. +*.l files. 1) Change directory to the top of the build tree. @@ -36,8 +36,8 @@ This can format all PostgreSQL *.c and *.h files, but excludes *.y, and --------------------------------------------------------------------------- -We have standardized on NetBSD's indent. We have fixed a few bugs which -requre the NetBSD source to be patched with indent.bsd.patch patch. A +We have standardized on NetBSD's indent. We have fixed a few bugs which +requre the NetBSD source to be patched with indent.bsd.patch patch. A fully patched version is available at ftp://ftp.postgresql.org/pub/dev. GNU indent, version 2.2.6, has several problems, and is not recommended. diff --git a/src/tools/pgindent/pgindent b/src/tools/pgindent/pgindent index 00267ec845..429dc7c64b 100755 --- a/src/tools/pgindent/pgindent +++ b/src/tools/pgindent/pgindent @@ -39,7 +39,7 @@ if [ "$?" -eq 0 ] then echo "You appear to have GNU indent rather than BSD indent." >&2 echo "See the pgindent/README file for a description of its problems." >&2 EXTRA_OPTS="-cdb -bli0 -npcs -cli4 -sc" -else +else EXTRA_OPTS="-cli1" fi @@ -193,7 +193,7 @@ do # isn't needed for general use. # awk ' # { -# line3 = $0; +# line3 = $0; # if (skips > 0) # skips--; # if (line1 ~ / *{$/ && @@ -221,7 +221,7 @@ do # Remove blank line between opening brace and block comment. awk ' { - line3 = $0; + line3 = $0; if (skips > 0) skips--; if (line1 ~ / *{$/ && @@ -326,10 +326,10 @@ do print line1; }' | -# Move prototype names to the same line as return type. Useful for ctags. +# Move prototype names to the same line as return type. Useful for ctags. # Indent should do this, but it does not. It formats prototypes just # like real functions. - awk ' BEGIN {paren_level = 0} + awk ' BEGIN {paren_level = 0} { if ($0 ~ /^[a-zA-Z_][a-zA-Z_0-9]*[^\(]*$/) { diff --git a/src/tools/pgtest b/src/tools/pgtest index 11223f31cc..c5356fced8 100755 --- a/src/tools/pgtest +++ b/src/tools/pgtest @@ -18,12 +18,12 @@ TMP="/tmp/$$" [ "X$1" != "X-n" ] && PGCLEAN=clean -(gmake $PGCLEAN check 2>&1; echo "$?" > $TMP/ret) | +(gmake $PGCLEAN check 2>&1; echo "$?" > $TMP/ret) | (tee $TMP/0; exit `cat $TMP/ret`) && cat $TMP/0 | -# The following grep's have to be adjusted for your setup because +# The following grep's have to be adjusted for your setup because # certain warnings are acceptable. -grep -i warning | -grep -v setproctitle | -grep -v find_rule | +grep -i warning | +grep -v setproctitle | +grep -v find_rule | grep -v yy_flex_realloc diff --git a/src/tutorial/advanced.source b/src/tutorial/advanced.source index 2717d4c51a..1dada88e62 100644 --- a/src/tutorial/advanced.source +++ b/src/tutorial/advanced.source @@ -17,7 +17,7 @@ -- descendants. ----------------------------- --- For example, the capitals table inherits from cities table. (It inherits +-- For example, the capitals table inherits from cities table. (It inherits -- all data fields from cities.) CREATE TABLE cities ( diff --git a/src/tutorial/basics.source b/src/tutorial/basics.source index 1092cdf971..9dbd75eb15 100644 --- a/src/tutorial/basics.source +++ b/src/tutorial/basics.source @@ -31,17 +31,17 @@ CREATE TABLE cities ( ----------------------------- -- Populating a Table With Rows: --- An INSERT statement is used to insert a new row into a table. There +-- An INSERT statement is used to insert a new row into a table. There -- are several ways you can specify what columns the data should go to. ----------------------------- -- 1. The simplest case is when the list of value correspond to the order of -- the columns specified in CREATE TABLE. -INSERT INTO weather +INSERT INTO weather VALUES ('San Francisco', 46, 50, 0.25, '1994-11-27'); -INSERT INTO cities +INSERT INTO cities VALUES ('San Francisco', '(-194.0, 53.0)'); -- 2. You can also specify what column the values correspond to. (The columns @@ -76,7 +76,7 @@ SELECT city, (temp_hi+temp_lo)/2 AS temp_avg, date FROM weather; SELECT * FROM weather - WHERE city = 'San Francisco' + WHERE city = 'San Francisco' AND prcp > 0.0; -- Here is a more complicated one. Duplicates are removed when DISTINCT is @@ -128,10 +128,10 @@ SELECT * -- Suppose we want to find all the records that are in the temperature range -- of other records. W1 and W2 are aliases for weather. -SELECT W1.city, W1.temp_lo, W1.temp_hi, +SELECT W1.city, W1.temp_lo, W1.temp_hi, W2.city, W2.temp_lo, W2.temp_hi FROM weather W1, weather W2 -WHERE W1.temp_lo < W2.temp_lo +WHERE W1.temp_lo < W2.temp_lo and W1.temp_hi > W2.temp_hi; @@ -147,7 +147,7 @@ SELECT city FROM weather -- Aggregate with GROUP BY SELECT city, max(temp_lo) - FROM weather + FROM weather GROUP BY city; -- ... and HAVING @@ -185,7 +185,7 @@ DELETE FROM weather WHERE city = 'Hayward'; SELECT * FROM weather; -- You can also delete all the rows in a table by doing the following. (This --- is different from DROP TABLE which removes the table in addition to the +-- is different from DROP TABLE which removes the table in addition to the -- removing the rows.) DELETE FROM weather; diff --git a/src/tutorial/complex.source b/src/tutorial/complex.source index 30b1e82406..d893c2fef4 100644 --- a/src/tutorial/complex.source +++ b/src/tutorial/complex.source @@ -3,7 +3,7 @@ -- complex.sql- -- This file shows how to create a new user-defined type and how to -- use this new type. --- +-- -- -- Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group -- Portions Copyright (c) 1994, Regents of the University of California @@ -28,7 +28,7 @@ -- C code. We also mark them IMMUTABLE, since they always return the -- same outputs given the same inputs. --- the input function 'complex_in' takes a null-terminated string (the +-- the input function 'complex_in' takes a null-terminated string (the -- textual representation of the type) and turns it into the internal -- (in memory) representation. You will get a message telling you 'complex' -- does not exist yet but that's okay. @@ -67,7 +67,7 @@ CREATE FUNCTION complex_send(complex) -- memory block required to hold the type (we need two 8-byte doubles). CREATE TYPE complex ( - internallength = 16, + internallength = 16, input = complex_in, output = complex_out, receive = complex_recv, @@ -89,7 +89,7 @@ CREATE TABLE test_complex ( ); -- data for user-defined types are just strings in the proper textual --- representation. +-- representation. INSERT INTO test_complex VALUES ('(1.0, 2.5)', '(4.2, 3.55 )'); INSERT INTO test_complex VALUES ('(33.0, 51.4)', '(100.42, 93.55)'); @@ -100,7 +100,7 @@ SELECT * FROM test_complex; -- Creating an operator for the new type: -- Let's define an add operator for complex types. Since POSTGRES -- supports function overloading, we'll use + as the add operator. --- (Operator names can be reused with different numbers and types of +-- (Operator names can be reused with different numbers and types of -- arguments.) ----------------------------- @@ -112,7 +112,7 @@ CREATE FUNCTION complex_add(complex, complex) -- we can now define the operator. We show a binary operator here but you -- can also define unary operators by omitting either of leftarg or rightarg. -CREATE OPERATOR + ( +CREATE OPERATOR + ( leftarg = complex, rightarg = complex, procedure = complex_add, diff --git a/src/tutorial/funcs.source b/src/tutorial/funcs.source index d4d61fa09c..7bbda599a6 100644 --- a/src/tutorial/funcs.source +++ b/src/tutorial/funcs.source @@ -18,14 +18,14 @@ ----------------------------- -- --- let's create a simple SQL function that takes no arguments and +-- let's create a simple SQL function that takes no arguments and -- returns 1 CREATE FUNCTION one() RETURNS integer AS 'SELECT 1 as ONE' LANGUAGE SQL; -- --- functions can be used in any expressions (eg. in the target list or +-- functions can be used in any expressions (eg. in the target list or -- qualifications) SELECT one() AS answer; @@ -61,7 +61,7 @@ INSERT INTO EMP VALUES ('Andy', -1000, 2, '(1,3)'); INSERT INTO EMP VALUES ('Bill', 4200, 36, '(2,1)'); INSERT INTO EMP VALUES ('Ginger', 4800, 30, '(2,4)'); --- the argument of a function can also be a tuple. For instance, +-- the argument of a function can also be a tuple. For instance, -- double_salary takes a tuple of the EMP table CREATE FUNCTION double_salary(EMP) RETURNS integer @@ -71,8 +71,8 @@ SELECT name, double_salary(EMP) AS dream FROM EMP WHERE EMP.cubicle ~= '(2,1)'::point; --- the return value of a function can also be a tuple. However, make sure --- that the expressions in the target list is in the same order as the +-- the return value of a function can also be a tuple. However, make sure +-- that the expressions in the target list is in the same order as the -- columns of EMP. CREATE FUNCTION new_emp() RETURNS EMP @@ -121,7 +121,7 @@ SELECT name(high_pay()) AS overpaid; ----------------------------- -- Creating C Functions --- in addition to SQL functions, you can also create C functions. +-- in addition to SQL functions, you can also create C functions. -- See funcs.c for the definition of the C functions. ----------------------------- @@ -144,7 +144,7 @@ SELECT makepoint('(1,2)'::point, '(3,4)'::point ) AS newpoint; SELECT copytext('hello world!'); SELECT name, c_overpaid(EMP, 1500) AS overpaid -FROM EMP +FROM EMP WHERE name = 'Bill' or name = 'Sam'; -- remove functions that were created in this file diff --git a/src/tutorial/syscat.source b/src/tutorial/syscat.source index ad50d10fd4..10edf62e16 100644 --- a/src/tutorial/syscat.source +++ b/src/tutorial/syscat.source @@ -42,8 +42,8 @@ SELECT n.nspname, c.relname -- column reference) -- SELECT n.nspname AS schema_name, - bc.relname AS class_name, - ic.relname AS index_name, + bc.relname AS class_name, + ic.relname AS index_name, a.attname FROM pg_namespace n, pg_class bc, -- base class @@ -64,7 +64,7 @@ SELECT n.nspname AS schema_name, -- classes -- SELECT n.nspname, c.relname, a.attname, format_type(t.oid, null) as typname - FROM pg_namespace n, pg_class c, + FROM pg_namespace n, pg_class c, pg_attribute a, pg_type t WHERE n.oid = c.relnamespace and c.relkind = 'r' -- no indices @@ -94,10 +94,10 @@ SELECT n.nspname, r.rolname, format_type(t.oid, null) as typname -- -- lists all left unary operators -- -SELECT n.nspname, o.oprname AS left_unary, +SELECT n.nspname, o.oprname AS left_unary, format_type(right_type.oid, null) AS operand, format_type(result.oid, null) AS return_type - FROM pg_namespace n, pg_operator o, + FROM pg_namespace n, pg_operator o, pg_type right_type, pg_type result WHERE o.oprnamespace = n.oid and o.oprkind = 'l' -- left unary @@ -109,10 +109,10 @@ SELECT n.nspname, o.oprname AS left_unary, -- -- lists all right unary operators -- -SELECT n.nspname, o.oprname AS right_unary, +SELECT n.nspname, o.oprname AS right_unary, format_type(left_type.oid, null) AS operand, format_type(result.oid, null) AS return_type - FROM pg_namespace n, pg_operator o, + FROM pg_namespace n, pg_operator o, pg_type left_type, pg_type result WHERE o.oprnamespace = n.oid and o.oprkind = 'r' -- right unary @@ -127,7 +127,7 @@ SELECT n.nspname, o.oprname AS binary_op, format_type(left_type.oid, null) AS left_opr, format_type(right_type.oid, null) AS right_opr, format_type(result.oid, null) AS return_type - FROM pg_namespace n, pg_operator o, pg_type left_type, + FROM pg_namespace n, pg_operator o, pg_type left_type, pg_type right_type, pg_type result WHERE o.oprnamespace = n.oid and o.oprkind = 'b' -- binary @@ -142,12 +142,12 @@ SELECT n.nspname, o.oprname AS binary_op, -- C functions -- SELECT n.nspname, p.proname, p.pronargs, format_type(t.oid, null) as return_type - FROM pg_namespace n, pg_proc p, + FROM pg_namespace n, pg_proc p, pg_language l, pg_type t WHERE p.pronamespace = n.oid and n.nspname not like 'pg\\_%' -- no catalogs and n.nspname != 'information_schema' -- no information_schema - and p.prolang = l.oid + and p.prolang = l.oid and p.prorettype = t.oid and l.lanname = 'c' ORDER BY nspname, proname, pronargs, return_type; @@ -156,7 +156,7 @@ SELECT n.nspname, p.proname, p.pronargs, format_type(t.oid, null) as return_type -- lists all aggregate functions and the types to which they can be applied -- SELECT n.nspname, p.proname, format_type(t.oid, null) as typname - FROM pg_namespace n, pg_aggregate a, + FROM pg_namespace n, pg_aggregate a, pg_proc p, pg_type t WHERE p.pronamespace = n.oid and a.aggfnoid = p.oid @@ -170,7 +170,7 @@ SELECT n.nspname, p.proname, format_type(t.oid, null) as typname -- families -- SELECT am.amname, n.nspname, opf.opfname, opr.oprname - FROM pg_namespace n, pg_am am, pg_opfamily opf, + FROM pg_namespace n, pg_am am, pg_opfamily opf, pg_amop amop, pg_operator opr WHERE opf.opfnamespace = n.oid and opf.opfmethod = am.oid diff --git a/src/win32.mak b/src/win32.mak index 05ed2db114..7bbc988ff6 100644 --- a/src/win32.mak +++ b/src/win32.mak @@ -5,11 +5,11 @@ !IF "$(OS)" == "Windows_NT" NULL= -!ELSE +!ELSE NULL=nul -!ENDIF +!ENDIF -ALL: +ALL: cd include if not exist pg_config.h copy pg_config.h.win32 pg_config.h if not exist pg_config_os.h copy port\win32.h pg_config_os.h -- cgit v1.2.3 From 4a2516a7f976e2f6671930904d4e97a4832eff9f Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Fri, 26 Nov 2010 15:20:51 -0500 Subject: Fix significant memory leak in contrib/xml2 functions. Most of the functions that execute XPath queries leaked the data structures created by libxml2. This memory would not be recovered until end of session, so it mounts up pretty quickly in any serious use of the feature. Per report from Pavel Stehule, though this isn't his patch. Back-patch to all supported branches. --- contrib/xml2/xpath.c | 162 ++++++++++++++++++++++++++++----------------------- 1 file changed, 90 insertions(+), 72 deletions(-) (limited to 'contrib/xml2') diff --git a/contrib/xml2/xpath.c b/contrib/xml2/xpath.c index 0df764770b..e92ab66491 100644 --- a/contrib/xml2/xpath.c +++ b/contrib/xml2/xpath.c @@ -40,6 +40,15 @@ Datum xpath_table(PG_FUNCTION_ARGS); void pgxml_parser_init(void); +/* workspace for pgxml_xpath() */ + +typedef struct +{ + xmlDocPtr doctree; + xmlXPathContextPtr ctxt; + xmlXPathObjectPtr res; +} xpath_workspace; + /* local declarations */ static xmlChar *pgxmlNodeSetToText(xmlNodeSetPtr nodeset, @@ -51,7 +60,10 @@ static text *pgxml_result_to_text(xmlXPathObjectPtr res, xmlChar *toptag, static xmlChar *pgxml_texttoxmlchar(text *textstring); -static xmlXPathObjectPtr pgxml_xpath(text *document, xmlChar *xpath); +static xmlXPathObjectPtr pgxml_xpath(text *document, xmlChar *xpath, + xpath_workspace *workspace); + +static void cleanup_workspace(xpath_workspace *workspace); /* @@ -221,25 +233,22 @@ PG_FUNCTION_INFO_V1(xpath_nodeset); Datum xpath_nodeset(PG_FUNCTION_ARGS) { - xmlChar *xpath, - *toptag, - *septag; - int32 pathsize; - text *xpathsupp, - *xpres; - - /* PG_GETARG_TEXT_P(0) is document buffer */ - xpathsupp = PG_GETARG_TEXT_P(1); /* XPath expression */ + text *document = PG_GETARG_TEXT_P(0); + text *xpathsupp = PG_GETARG_TEXT_P(1); /* XPath expression */ + xmlChar *toptag = pgxml_texttoxmlchar(PG_GETARG_TEXT_P(2)); + xmlChar *septag = pgxml_texttoxmlchar(PG_GETARG_TEXT_P(3)); + xmlChar *xpath; + text *xpres; + xmlXPathObjectPtr res; + xpath_workspace workspace; - toptag = pgxml_texttoxmlchar(PG_GETARG_TEXT_P(2)); - septag = pgxml_texttoxmlchar(PG_GETARG_TEXT_P(3)); + xpath = pgxml_texttoxmlchar(xpathsupp); - pathsize = VARSIZE(xpathsupp) - VARHDRSZ; + res = pgxml_xpath(document, xpath, &workspace); - xpath = pgxml_texttoxmlchar(xpathsupp); + xpres = pgxml_result_to_text(res, toptag, septag, NULL); - xpres = pgxml_result_to_text(pgxml_xpath(PG_GETARG_TEXT_P(0), xpath), - toptag, septag, NULL); + cleanup_workspace(&workspace); pfree(xpath); @@ -257,23 +266,21 @@ PG_FUNCTION_INFO_V1(xpath_list); Datum xpath_list(PG_FUNCTION_ARGS) { - xmlChar *xpath, - *plainsep; - int32 pathsize; - text *xpathsupp, - *xpres; - - /* PG_GETARG_TEXT_P(0) is document buffer */ - xpathsupp = PG_GETARG_TEXT_P(1); /* XPath expression */ + text *document = PG_GETARG_TEXT_P(0); + text *xpathsupp = PG_GETARG_TEXT_P(1); /* XPath expression */ + xmlChar *plainsep = pgxml_texttoxmlchar(PG_GETARG_TEXT_P(2)); + xmlChar *xpath; + text *xpres; + xmlXPathObjectPtr res; + xpath_workspace workspace; - plainsep = pgxml_texttoxmlchar(PG_GETARG_TEXT_P(2)); + xpath = pgxml_texttoxmlchar(xpathsupp); - pathsize = VARSIZE(xpathsupp) - VARHDRSZ; + res = pgxml_xpath(document, xpath, &workspace); - xpath = pgxml_texttoxmlchar(xpathsupp); + xpres = pgxml_result_to_text(res, NULL, NULL, plainsep); - xpres = pgxml_result_to_text(pgxml_xpath(PG_GETARG_TEXT_P(0), xpath), - NULL, NULL, plainsep); + cleanup_workspace(&workspace); pfree(xpath); @@ -288,13 +295,13 @@ PG_FUNCTION_INFO_V1(xpath_string); Datum xpath_string(PG_FUNCTION_ARGS) { + text *document = PG_GETARG_TEXT_P(0); + text *xpathsupp = PG_GETARG_TEXT_P(1); /* XPath expression */ xmlChar *xpath; int32 pathsize; - text *xpathsupp, - *xpres; - - /* PG_GETARG_TEXT_P(0) is document buffer */ - xpathsupp = PG_GETARG_TEXT_P(1); /* XPath expression */ + text *xpres; + xmlXPathObjectPtr res; + xpath_workspace workspace; pathsize = VARSIZE(xpathsupp) - VARHDRSZ; @@ -305,13 +312,16 @@ xpath_string(PG_FUNCTION_ARGS) /* We could try casting to string using the libxml function? */ xpath = (xmlChar *) palloc(pathsize + 9); - memcpy((char *) (xpath + 7), VARDATA(xpathsupp), pathsize); strncpy((char *) xpath, "string(", 7); + memcpy((char *) (xpath + 7), VARDATA(xpathsupp), pathsize); xpath[pathsize + 7] = ')'; xpath[pathsize + 8] = '\0'; - xpres = pgxml_result_to_text(pgxml_xpath(PG_GETARG_TEXT_P(0), xpath), - NULL, NULL, NULL); + res = pgxml_xpath(document, xpath, &workspace); + + xpres = pgxml_result_to_text(res, NULL, NULL, NULL); + + cleanup_workspace(&workspace); pfree(xpath); @@ -326,21 +336,17 @@ PG_FUNCTION_INFO_V1(xpath_number); Datum xpath_number(PG_FUNCTION_ARGS) { + text *document = PG_GETARG_TEXT_P(0); + text *xpathsupp = PG_GETARG_TEXT_P(1); /* XPath expression */ xmlChar *xpath; - int32 pathsize; - text *xpathsupp; float4 fRes; - xmlXPathObjectPtr res; - - /* PG_GETARG_TEXT_P(0) is document buffer */ - xpathsupp = PG_GETARG_TEXT_P(1); /* XPath expression */ - - pathsize = VARSIZE(xpathsupp) - VARHDRSZ; + xpath_workspace workspace; xpath = pgxml_texttoxmlchar(xpathsupp); - res = pgxml_xpath(PG_GETARG_TEXT_P(0), xpath); + res = pgxml_xpath(document, xpath, &workspace); + pfree(xpath); if (res == NULL) @@ -348,6 +354,8 @@ xpath_number(PG_FUNCTION_ARGS) fRes = xmlXPathCastToNumber(res); + cleanup_workspace(&workspace); + if (xmlXPathIsNaN(fRes)) PG_RETURN_NULL(); @@ -360,21 +368,17 @@ PG_FUNCTION_INFO_V1(xpath_bool); Datum xpath_bool(PG_FUNCTION_ARGS) { + text *document = PG_GETARG_TEXT_P(0); + text *xpathsupp = PG_GETARG_TEXT_P(1); /* XPath expression */ xmlChar *xpath; - int32 pathsize; - text *xpathsupp; int bRes; - xmlXPathObjectPtr res; - - /* PG_GETARG_TEXT_P(0) is document buffer */ - xpathsupp = PG_GETARG_TEXT_P(1); /* XPath expression */ - - pathsize = VARSIZE(xpathsupp) - VARHDRSZ; + xpath_workspace workspace; xpath = pgxml_texttoxmlchar(xpathsupp); - res = pgxml_xpath(PG_GETARG_TEXT_P(0), xpath); + res = pgxml_xpath(document, xpath, &workspace); + pfree(xpath); if (res == NULL) @@ -382,6 +386,8 @@ xpath_bool(PG_FUNCTION_ARGS) bRes = xmlXPathCastToBoolean(res); + cleanup_workspace(&workspace); + PG_RETURN_BOOL(bRes); } @@ -390,49 +396,61 @@ xpath_bool(PG_FUNCTION_ARGS) /* Core function to evaluate XPath query */ static xmlXPathObjectPtr -pgxml_xpath(text *document, xmlChar *xpath) +pgxml_xpath(text *document, xmlChar *xpath, xpath_workspace *workspace) { - xmlDocPtr doctree; - xmlXPathContextPtr ctxt; + int32 docsize = VARSIZE(document) - VARHDRSZ; xmlXPathObjectPtr res; xmlXPathCompExprPtr comppath; - int32 docsize; - docsize = VARSIZE(document) - VARHDRSZ; + workspace->doctree = NULL; + workspace->ctxt = NULL; + workspace->res = NULL; pgxml_parser_init(); - doctree = xmlParseMemory((char *) VARDATA(document), docsize); - if (doctree == NULL) + workspace->doctree = xmlParseMemory((char *) VARDATA(document), docsize); + if (workspace->doctree == NULL) return NULL; /* not well-formed */ - ctxt = xmlXPathNewContext(doctree); - ctxt->node = xmlDocGetRootElement(doctree); + workspace->ctxt = xmlXPathNewContext(workspace->doctree); + workspace->ctxt->node = xmlDocGetRootElement(workspace->doctree); /* compile the path */ comppath = xmlXPathCompile(xpath); if (comppath == NULL) { - xmlFreeDoc(doctree); + cleanup_workspace(workspace); xml_ereport(ERROR, ERRCODE_EXTERNAL_ROUTINE_EXCEPTION, "XPath Syntax Error"); } /* Now evaluate the path expression. */ - res = xmlXPathCompiledEval(comppath, ctxt); + res = xmlXPathCompiledEval(comppath, workspace->ctxt); + workspace->res = res; + xmlXPathFreeCompExpr(comppath); if (res == NULL) - { - xmlXPathFreeContext(ctxt); - xmlFreeDoc(doctree); + cleanup_workspace(workspace); - return NULL; - } - /* xmlFreeDoc(doctree); */ return res; } +/* Clean up after processing the result of pgxml_xpath() */ +static void +cleanup_workspace(xpath_workspace *workspace) +{ + if (workspace->res) + xmlXPathFreeObject(workspace->res); + workspace->res = NULL; + if (workspace->ctxt) + xmlXPathFreeContext(workspace->ctxt); + workspace->ctxt = NULL; + if (workspace->doctree) + xmlFreeDoc(workspace->doctree); + workspace->doctree = NULL; +} + static text * pgxml_result_to_text(xmlXPathObjectPtr res, xmlChar *toptag, -- cgit v1.2.3 From 629b3af27d5c2bc9d6e16b22b943ad651d4ecb56 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Sun, 13 Feb 2011 20:06:41 -0500 Subject: Convert contrib modules to use the extension facility. This isn't fully tested as yet, in particular I'm not sure that the "foo--unpackaged--1.0.sql" scripts are OK. But it's time to get some buildfarm cycles on it. sepgsql is not converted to an extension, mainly because it seems to require a very nonstandard installation process. Dimitri Fontaine and Tom Lane --- contrib/adminpack/.gitignore | 1 - contrib/adminpack/Makefile | 7 +- contrib/adminpack/adminpack--1.0.sql | 50 + contrib/adminpack/adminpack--unpackaged--1.0.sql | 10 + contrib/adminpack/adminpack.control | 6 + contrib/adminpack/adminpack.sql.in | 50 - contrib/adminpack/uninstall_adminpack.sql | 10 - contrib/btree_gin/.gitignore | 1 - contrib/btree_gin/Makefile | 5 +- contrib/btree_gin/btree_gin--1.0.sql | 686 +++++ contrib/btree_gin/btree_gin--unpackaged--1.0.sql | 116 + contrib/btree_gin/btree_gin.control | 5 + contrib/btree_gin/btree_gin.sql.in | 689 ----- contrib/btree_gin/expected/install_btree_gin.out | 4 +- contrib/btree_gin/sql/install_btree_gin.sql | 6 +- contrib/btree_gin/uninstall_btree_gin.sql | 98 - contrib/btree_gist/.gitignore | 1 - contrib/btree_gist/Makefile | 4 +- contrib/btree_gist/btree_gist--1.0.sql | 1209 ++++++++ contrib/btree_gist/btree_gist--unpackaged--1.0.sql | 172 ++ contrib/btree_gist/btree_gist.control | 5 + contrib/btree_gist/btree_gist.sql.in | 1212 -------- contrib/btree_gist/expected/init.out | 8 +- contrib/btree_gist/sql/init.sql | 10 +- contrib/btree_gist/uninstall_btree_gist.sql | 280 -- contrib/chkpass/.gitignore | 1 - contrib/chkpass/Makefile | 6 +- contrib/chkpass/chkpass--1.0.sql | 64 + contrib/chkpass/chkpass--unpackaged--1.0.sql | 10 + contrib/chkpass/chkpass.control | 5 + contrib/chkpass/chkpass.sql.in | 67 - contrib/chkpass/uninstall_chkpass.sql | 16 - contrib/citext/.gitignore | 1 - contrib/citext/Makefile | 6 +- contrib/citext/citext--1.0.sql | 486 +++ contrib/citext/citext--unpackaged--1.0.sql | 76 + contrib/citext/citext.control | 5 + contrib/citext/citext.sql.in | 489 --- contrib/citext/expected/citext.out | 7 +- contrib/citext/expected/citext_1.out | 7 +- contrib/citext/sql/citext.sql | 10 +- contrib/citext/uninstall_citext.sql | 80 - contrib/cube/.gitignore | 1 - contrib/cube/Makefile | 5 +- contrib/cube/cube--1.0.sql | 322 ++ contrib/cube/cube--unpackaged--1.0.sql | 53 + contrib/cube/cube.control | 5 + contrib/cube/cube.sql.in | 326 -- contrib/cube/expected/cube.out | 8 +- contrib/cube/expected/cube_1.out | 8 +- contrib/cube/expected/cube_2.out | 8 +- contrib/cube/sql/cube.sql | 10 +- contrib/cube/uninstall_cube.sql | 98 - contrib/dblink/.gitignore | 1 - contrib/dblink/Makefile | 8 +- contrib/dblink/dblink--1.0.sql | 220 ++ contrib/dblink/dblink--unpackaged--1.0.sql | 43 + contrib/dblink/dblink.control | 5 + contrib/dblink/dblink.sql.in | 223 -- contrib/dblink/expected/dblink.out | 12 +- contrib/dblink/sql/dblink.sql | 15 +- contrib/dblink/uninstall_dblink.sql | 86 - contrib/dict_int/.gitignore | 1 - contrib/dict_int/Makefile | 6 +- contrib/dict_int/dict_int--1.0.sql | 22 + contrib/dict_int/dict_int--unpackaged--1.0.sql | 6 + contrib/dict_int/dict_int.control | 5 + contrib/dict_int/dict_int.sql.in | 25 - contrib/dict_int/expected/dict_int.out | 8 +- contrib/dict_int/sql/dict_int.sql | 10 +- contrib/dict_int/uninstall_dict_int.sql | 12 - contrib/dict_xsyn/.gitignore | 1 - contrib/dict_xsyn/Makefile | 6 +- contrib/dict_xsyn/dict_xsyn--1.0.sql | 22 + contrib/dict_xsyn/dict_xsyn--unpackaged--1.0.sql | 6 + contrib/dict_xsyn/dict_xsyn.control | 5 + contrib/dict_xsyn/dict_xsyn.sql.in | 25 - contrib/dict_xsyn/expected/dict_xsyn.out | 8 +- contrib/dict_xsyn/sql/dict_xsyn.sql | 10 +- contrib/dict_xsyn/uninstall_dict_xsyn.sql | 12 - contrib/earthdistance/.gitignore | 1 - contrib/earthdistance/Makefile | 6 +- contrib/earthdistance/earthdistance--1.0.sql | 88 + .../earthdistance--unpackaged--1.0.sql | 13 + contrib/earthdistance/earthdistance.control | 6 + contrib/earthdistance/earthdistance.sql.in | 93 - contrib/earthdistance/expected/earthdistance.out | 9 +- contrib/earthdistance/sql/earthdistance.sql | 12 +- contrib/earthdistance/uninstall_earthdistance.sql | 26 - contrib/fuzzystrmatch/.gitignore | 1 - contrib/fuzzystrmatch/Makefile | 5 +- contrib/fuzzystrmatch/fuzzystrmatch--1.0.sql | 41 + .../fuzzystrmatch--unpackaged--1.0.sql | 12 + contrib/fuzzystrmatch/fuzzystrmatch.control | 5 + contrib/fuzzystrmatch/fuzzystrmatch.sql.in | 44 - contrib/fuzzystrmatch/uninstall_fuzzystrmatch.sql | 24 - contrib/hstore/.gitignore | 1 - contrib/hstore/Makefile | 5 +- contrib/hstore/expected/hstore.out | 10 +- contrib/hstore/hstore--1.0.sql | 527 ++++ contrib/hstore/hstore--unpackaged--1.0.sql | 89 + contrib/hstore/hstore.control | 5 + contrib/hstore/hstore.sql.in | 530 ---- contrib/hstore/sql/hstore.sql | 10 +- contrib/hstore/uninstall_hstore.sql | 86 - contrib/intagg/Makefile | 3 +- contrib/intagg/int_aggregate--1.0.sql | 32 + contrib/intagg/int_aggregate--unpackaged--1.0.sql | 6 + contrib/intagg/int_aggregate.control | 4 + contrib/intagg/int_aggregate.sql | 35 - contrib/intagg/uninstall_int_aggregate.sql | 12 - contrib/intarray/.gitignore | 1 - contrib/intarray/Makefile | 6 +- contrib/intarray/_int.sql.in | 485 --- contrib/intarray/expected/_int.out | 8 +- contrib/intarray/intarray--1.0.sql | 482 +++ contrib/intarray/intarray--unpackaged--1.0.sql | 71 + contrib/intarray/intarray.control | 5 + contrib/intarray/sql/_int.sql | 10 +- contrib/intarray/uninstall__int.sql | 128 - contrib/isn/.gitignore | 1 - contrib/isn/Makefile | 5 +- contrib/isn/isn--1.0.sql | 3193 +++++++++++++++++++ contrib/isn/isn--unpackaged--1.0.sql | 461 +++ contrib/isn/isn.control | 5 + contrib/isn/isn.sql.in | 3196 -------------------- contrib/isn/uninstall_isn.sql | 24 - contrib/lo/.gitignore | 1 - contrib/lo/Makefile | 5 +- contrib/lo/lo--1.0.sql | 22 + contrib/lo/lo--unpackaged--1.0.sql | 5 + contrib/lo/lo.control | 5 + contrib/lo/lo.sql.in | 25 - contrib/lo/uninstall_lo.sql | 17 - contrib/ltree/.gitignore | 1 - contrib/ltree/Makefile | 8 +- contrib/ltree/expected/ltree.out | 8 +- contrib/ltree/ltree--1.0.sql | 869 ++++++ contrib/ltree/ltree--unpackaged--1.0.sql | 131 + contrib/ltree/ltree.control | 5 + contrib/ltree/ltree.sql.in | 872 ------ contrib/ltree/sql/ltree.sql | 10 +- contrib/ltree/uninstall_ltree.sql | 240 -- contrib/pageinspect/.gitignore | 1 - contrib/pageinspect/Makefile | 11 +- contrib/pageinspect/pageinspect--1.0.sql | 104 + .../pageinspect/pageinspect--unpackaged--1.0.sql | 10 + contrib/pageinspect/pageinspect.control | 5 + contrib/pageinspect/pageinspect.sql.in | 107 - contrib/pageinspect/uninstall_pageinspect.sql | 13 - contrib/pg_buffercache/.gitignore | 1 - contrib/pg_buffercache/Makefile | 4 +- contrib/pg_buffercache/pg_buffercache--1.0.sql | 17 + .../pg_buffercache--unpackaged--1.0.sql | 4 + contrib/pg_buffercache/pg_buffercache.control | 5 + contrib/pg_buffercache/pg_buffercache.sql.in | 20 - .../pg_buffercache/uninstall_pg_buffercache.sql | 8 - contrib/pg_freespacemap/.gitignore | 1 - contrib/pg_freespacemap/Makefile | 4 +- contrib/pg_freespacemap/pg_freespacemap--1.0.sql | 22 + .../pg_freespacemap--unpackaged--1.0.sql | 4 + contrib/pg_freespacemap/pg_freespacemap.control | 5 + contrib/pg_freespacemap/pg_freespacemap.sql.in | 26 - .../pg_freespacemap/uninstall_pg_freespacemap.sql | 7 - contrib/pg_stat_statements/.gitignore | 1 - contrib/pg_stat_statements/Makefile | 5 +- .../pg_stat_statements/pg_stat_statements--1.0.sql | 36 + .../pg_stat_statements--unpackaged--1.0.sql | 5 + .../pg_stat_statements/pg_stat_statements.control | 5 + .../pg_stat_statements/pg_stat_statements.sql.in | 39 - .../uninstall_pg_stat_statements.sql | 8 - contrib/pg_test_fsync/Makefile | 3 - contrib/pg_trgm/.gitignore | 1 - contrib/pg_trgm/Makefile | 5 +- contrib/pg_trgm/expected/pg_trgm.out | 8 +- contrib/pg_trgm/pg_trgm--1.0.sql | 152 + contrib/pg_trgm/pg_trgm--unpackaged--1.0.sql | 28 + contrib/pg_trgm/pg_trgm.control | 5 + contrib/pg_trgm/pg_trgm.sql.in | 155 - contrib/pg_trgm/sql/pg_trgm.sql | 10 +- contrib/pg_trgm/uninstall_pg_trgm.sql | 48 - contrib/pg_upgrade/Makefile | 3 - contrib/pg_upgrade_support/Makefile | 3 - contrib/pgcrypto/.gitignore | 1 - contrib/pgcrypto/Makefile | 9 +- contrib/pgcrypto/expected/init.out | 8 +- contrib/pgcrypto/pgcrypto--1.0.sql | 199 ++ contrib/pgcrypto/pgcrypto--unpackaged--1.0.sql | 35 + contrib/pgcrypto/pgcrypto.control | 5 + contrib/pgcrypto/pgcrypto.sql.in | 202 -- contrib/pgcrypto/sql/init.sql | 10 +- contrib/pgcrypto/uninstall_pgcrypto.sql | 45 - contrib/pgrowlocks/.gitignore | 1 - contrib/pgrowlocks/Makefile | 11 +- contrib/pgrowlocks/pgrowlocks--1.0.sql | 12 + contrib/pgrowlocks/pgrowlocks--unpackaged--1.0.sql | 3 + contrib/pgrowlocks/pgrowlocks.control | 5 + contrib/pgrowlocks/pgrowlocks.sql.in | 15 - contrib/pgrowlocks/uninstall_pgrowlocks.sql | 6 - contrib/pgstattuple/.gitignore | 1 - contrib/pgstattuple/Makefile | 11 +- contrib/pgstattuple/pgstattuple--1.0.sql | 46 + .../pgstattuple/pgstattuple--unpackaged--1.0.sql | 6 + contrib/pgstattuple/pgstattuple.control | 5 + contrib/pgstattuple/pgstattuple.sql.in | 49 - contrib/pgstattuple/uninstall_pgstattuple.sql | 9 - contrib/seg/.gitignore | 1 - contrib/seg/Makefile | 6 +- contrib/seg/expected/seg.out | 8 +- contrib/seg/expected/seg_1.out | 8 +- contrib/seg/seg--1.0.sql | 392 +++ contrib/seg/seg--unpackaged--1.0.sql | 51 + contrib/seg/seg.control | 5 + contrib/seg/seg.sql.in | 396 --- contrib/seg/sql/seg.sql | 10 +- contrib/seg/uninstall_seg.sql | 94 - contrib/spi/.gitignore | 5 - contrib/spi/Makefile | 10 +- contrib/spi/autoinc--1.0.sql | 6 + contrib/spi/autoinc--unpackaged--1.0.sql | 3 + contrib/spi/autoinc.control | 5 + contrib/spi/autoinc.sql.in | 9 - contrib/spi/insert_username--1.0.sql | 6 + contrib/spi/insert_username--unpackaged--1.0.sql | 3 + contrib/spi/insert_username.control | 5 + contrib/spi/insert_username.sql.in | 9 - contrib/spi/moddatetime--1.0.sql | 6 + contrib/spi/moddatetime--unpackaged--1.0.sql | 3 + contrib/spi/moddatetime.control | 5 + contrib/spi/moddatetime.sql.in | 9 - contrib/spi/refint--1.0.sql | 11 + contrib/spi/refint--unpackaged--1.0.sql | 4 + contrib/spi/refint.control | 5 + contrib/spi/refint.sql.in | 14 - contrib/spi/timetravel--1.0.sql | 16 + contrib/spi/timetravel--unpackaged--1.0.sql | 5 + contrib/spi/timetravel.control | 5 + contrib/spi/timetravel.sql.in | 19 - contrib/sslinfo/.gitignore | 1 - contrib/sslinfo/Makefile | 5 +- contrib/sslinfo/sslinfo--1.0.sql | 37 + contrib/sslinfo/sslinfo--unpackaged--1.0.sql | 11 + contrib/sslinfo/sslinfo.control | 5 + contrib/sslinfo/sslinfo.sql.in | 40 - contrib/sslinfo/uninstall_sslinfo.sql | 14 - contrib/tablefunc/.gitignore | 1 - contrib/tablefunc/Makefile | 6 +- contrib/tablefunc/expected/tablefunc.out | 8 +- contrib/tablefunc/sql/tablefunc.sql | 10 +- contrib/tablefunc/tablefunc--1.0.sql | 85 + contrib/tablefunc/tablefunc--unpackaged--1.0.sql | 16 + contrib/tablefunc/tablefunc.control | 5 + contrib/tablefunc/tablefunc.sql.in | 88 - contrib/tablefunc/uninstall_tablefunc.sql | 32 - contrib/test_parser/.gitignore | 1 - contrib/test_parser/Makefile | 6 +- contrib/test_parser/expected/test_parser.out | 8 +- contrib/test_parser/sql/test_parser.sql | 10 +- contrib/test_parser/test_parser--1.0.sql | 29 + .../test_parser/test_parser--unpackaged--1.0.sql | 7 + contrib/test_parser/test_parser.control | 5 + contrib/test_parser/test_parser.sql.in | 32 - contrib/test_parser/uninstall_test_parser.sql | 14 - contrib/tsearch2/.gitignore | 1 - contrib/tsearch2/Makefile | 6 +- contrib/tsearch2/expected/tsearch2.out | 8 +- contrib/tsearch2/expected/tsearch2_1.out | 8 +- contrib/tsearch2/sql/tsearch2.sql | 10 +- contrib/tsearch2/tsearch2--1.0.sql | 573 ++++ contrib/tsearch2/tsearch2--unpackaged--1.0.sql | 100 + contrib/tsearch2/tsearch2.control | 5 + contrib/tsearch2/tsearch2.sql.in | 576 ---- contrib/tsearch2/uninstall_tsearch2.sql | 96 - contrib/unaccent/.gitignore | 1 - contrib/unaccent/Makefile | 5 +- contrib/unaccent/expected/unaccent.out | 4 +- contrib/unaccent/sql/unaccent.sql | 6 +- contrib/unaccent/unaccent--1.0.sql | 31 + contrib/unaccent/unaccent--unpackaged--1.0.sql | 8 + contrib/unaccent/unaccent.control | 5 + contrib/unaccent/unaccent.sql.in | 34 - contrib/unaccent/uninstall_unaccent.sql | 11 - contrib/uuid-ossp/.gitignore | 1 - contrib/uuid-ossp/Makefile | 5 +- contrib/uuid-ossp/uninstall_uuid-ossp.sql | 16 - contrib/uuid-ossp/uuid-ossp--1.0.sql | 51 + contrib/uuid-ossp/uuid-ossp--unpackaged--1.0.sql | 12 + contrib/uuid-ossp/uuid-ossp.control | 5 + contrib/uuid-ossp/uuid-ossp.sql.in | 54 - contrib/xml2/.gitignore | 1 - contrib/xml2/Makefile | 8 +- contrib/xml2/expected/xml2.out | 8 +- contrib/xml2/expected/xml2_1.out | 8 +- contrib/xml2/pgxml.sql.in | 73 - contrib/xml2/sql/xml2.sql | 10 +- contrib/xml2/uninstall_pgxml.sql | 31 - contrib/xml2/xml2--1.0.sql | 70 + contrib/xml2/xml2--unpackaged--1.0.sql | 16 + contrib/xml2/xml2.control | 5 + 299 files changed, 12208 insertions(+), 12531 deletions(-) delete mode 100644 contrib/adminpack/.gitignore create mode 100644 contrib/adminpack/adminpack--1.0.sql create mode 100644 contrib/adminpack/adminpack--unpackaged--1.0.sql create mode 100644 contrib/adminpack/adminpack.control delete mode 100644 contrib/adminpack/adminpack.sql.in delete mode 100644 contrib/adminpack/uninstall_adminpack.sql create mode 100644 contrib/btree_gin/btree_gin--1.0.sql create mode 100644 contrib/btree_gin/btree_gin--unpackaged--1.0.sql create mode 100644 contrib/btree_gin/btree_gin.control delete mode 100644 contrib/btree_gin/btree_gin.sql.in delete mode 100644 contrib/btree_gin/uninstall_btree_gin.sql create mode 100644 contrib/btree_gist/btree_gist--1.0.sql create mode 100644 contrib/btree_gist/btree_gist--unpackaged--1.0.sql create mode 100644 contrib/btree_gist/btree_gist.control delete mode 100644 contrib/btree_gist/btree_gist.sql.in delete mode 100644 contrib/btree_gist/uninstall_btree_gist.sql delete mode 100644 contrib/chkpass/.gitignore create mode 100644 contrib/chkpass/chkpass--1.0.sql create mode 100644 contrib/chkpass/chkpass--unpackaged--1.0.sql create mode 100644 contrib/chkpass/chkpass.control delete mode 100644 contrib/chkpass/chkpass.sql.in delete mode 100644 contrib/chkpass/uninstall_chkpass.sql create mode 100644 contrib/citext/citext--1.0.sql create mode 100644 contrib/citext/citext--unpackaged--1.0.sql create mode 100644 contrib/citext/citext.control delete mode 100644 contrib/citext/citext.sql.in delete mode 100644 contrib/citext/uninstall_citext.sql create mode 100644 contrib/cube/cube--1.0.sql create mode 100644 contrib/cube/cube--unpackaged--1.0.sql create mode 100644 contrib/cube/cube.control delete mode 100644 contrib/cube/cube.sql.in delete mode 100644 contrib/cube/uninstall_cube.sql create mode 100644 contrib/dblink/dblink--1.0.sql create mode 100644 contrib/dblink/dblink--unpackaged--1.0.sql create mode 100644 contrib/dblink/dblink.control delete mode 100644 contrib/dblink/dblink.sql.in delete mode 100644 contrib/dblink/uninstall_dblink.sql create mode 100644 contrib/dict_int/dict_int--1.0.sql create mode 100644 contrib/dict_int/dict_int--unpackaged--1.0.sql create mode 100644 contrib/dict_int/dict_int.control delete mode 100644 contrib/dict_int/dict_int.sql.in delete mode 100644 contrib/dict_int/uninstall_dict_int.sql create mode 100644 contrib/dict_xsyn/dict_xsyn--1.0.sql create mode 100644 contrib/dict_xsyn/dict_xsyn--unpackaged--1.0.sql create mode 100644 contrib/dict_xsyn/dict_xsyn.control delete mode 100644 contrib/dict_xsyn/dict_xsyn.sql.in delete mode 100644 contrib/dict_xsyn/uninstall_dict_xsyn.sql create mode 100644 contrib/earthdistance/earthdistance--1.0.sql create mode 100644 contrib/earthdistance/earthdistance--unpackaged--1.0.sql create mode 100644 contrib/earthdistance/earthdistance.control delete mode 100644 contrib/earthdistance/earthdistance.sql.in delete mode 100644 contrib/earthdistance/uninstall_earthdistance.sql delete mode 100644 contrib/fuzzystrmatch/.gitignore create mode 100644 contrib/fuzzystrmatch/fuzzystrmatch--1.0.sql create mode 100644 contrib/fuzzystrmatch/fuzzystrmatch--unpackaged--1.0.sql create mode 100644 contrib/fuzzystrmatch/fuzzystrmatch.control delete mode 100644 contrib/fuzzystrmatch/fuzzystrmatch.sql.in delete mode 100644 contrib/fuzzystrmatch/uninstall_fuzzystrmatch.sql create mode 100644 contrib/hstore/hstore--1.0.sql create mode 100644 contrib/hstore/hstore--unpackaged--1.0.sql create mode 100644 contrib/hstore/hstore.control delete mode 100644 contrib/hstore/hstore.sql.in delete mode 100644 contrib/hstore/uninstall_hstore.sql create mode 100644 contrib/intagg/int_aggregate--1.0.sql create mode 100644 contrib/intagg/int_aggregate--unpackaged--1.0.sql create mode 100644 contrib/intagg/int_aggregate.control delete mode 100644 contrib/intagg/int_aggregate.sql delete mode 100644 contrib/intagg/uninstall_int_aggregate.sql delete mode 100644 contrib/intarray/_int.sql.in create mode 100644 contrib/intarray/intarray--1.0.sql create mode 100644 contrib/intarray/intarray--unpackaged--1.0.sql create mode 100644 contrib/intarray/intarray.control delete mode 100644 contrib/intarray/uninstall__int.sql delete mode 100644 contrib/isn/.gitignore create mode 100644 contrib/isn/isn--1.0.sql create mode 100644 contrib/isn/isn--unpackaged--1.0.sql create mode 100644 contrib/isn/isn.control delete mode 100644 contrib/isn/isn.sql.in delete mode 100644 contrib/isn/uninstall_isn.sql delete mode 100644 contrib/lo/.gitignore create mode 100644 contrib/lo/lo--1.0.sql create mode 100644 contrib/lo/lo--unpackaged--1.0.sql create mode 100644 contrib/lo/lo.control delete mode 100644 contrib/lo/lo.sql.in delete mode 100644 contrib/lo/uninstall_lo.sql create mode 100644 contrib/ltree/ltree--1.0.sql create mode 100644 contrib/ltree/ltree--unpackaged--1.0.sql create mode 100644 contrib/ltree/ltree.control delete mode 100644 contrib/ltree/ltree.sql.in delete mode 100644 contrib/ltree/uninstall_ltree.sql delete mode 100644 contrib/pageinspect/.gitignore create mode 100644 contrib/pageinspect/pageinspect--1.0.sql create mode 100644 contrib/pageinspect/pageinspect--unpackaged--1.0.sql create mode 100644 contrib/pageinspect/pageinspect.control delete mode 100644 contrib/pageinspect/pageinspect.sql.in delete mode 100644 contrib/pageinspect/uninstall_pageinspect.sql delete mode 100644 contrib/pg_buffercache/.gitignore create mode 100644 contrib/pg_buffercache/pg_buffercache--1.0.sql create mode 100644 contrib/pg_buffercache/pg_buffercache--unpackaged--1.0.sql create mode 100644 contrib/pg_buffercache/pg_buffercache.control delete mode 100644 contrib/pg_buffercache/pg_buffercache.sql.in delete mode 100644 contrib/pg_buffercache/uninstall_pg_buffercache.sql delete mode 100644 contrib/pg_freespacemap/.gitignore create mode 100644 contrib/pg_freespacemap/pg_freespacemap--1.0.sql create mode 100644 contrib/pg_freespacemap/pg_freespacemap--unpackaged--1.0.sql create mode 100644 contrib/pg_freespacemap/pg_freespacemap.control delete mode 100644 contrib/pg_freespacemap/pg_freespacemap.sql.in delete mode 100644 contrib/pg_freespacemap/uninstall_pg_freespacemap.sql delete mode 100644 contrib/pg_stat_statements/.gitignore create mode 100644 contrib/pg_stat_statements/pg_stat_statements--1.0.sql create mode 100644 contrib/pg_stat_statements/pg_stat_statements--unpackaged--1.0.sql create mode 100644 contrib/pg_stat_statements/pg_stat_statements.control delete mode 100644 contrib/pg_stat_statements/pg_stat_statements.sql.in delete mode 100644 contrib/pg_stat_statements/uninstall_pg_stat_statements.sql create mode 100644 contrib/pg_trgm/pg_trgm--1.0.sql create mode 100644 contrib/pg_trgm/pg_trgm--unpackaged--1.0.sql create mode 100644 contrib/pg_trgm/pg_trgm.control delete mode 100644 contrib/pg_trgm/pg_trgm.sql.in delete mode 100644 contrib/pg_trgm/uninstall_pg_trgm.sql create mode 100644 contrib/pgcrypto/pgcrypto--1.0.sql create mode 100644 contrib/pgcrypto/pgcrypto--unpackaged--1.0.sql create mode 100644 contrib/pgcrypto/pgcrypto.control delete mode 100644 contrib/pgcrypto/pgcrypto.sql.in delete mode 100644 contrib/pgcrypto/uninstall_pgcrypto.sql delete mode 100644 contrib/pgrowlocks/.gitignore create mode 100644 contrib/pgrowlocks/pgrowlocks--1.0.sql create mode 100644 contrib/pgrowlocks/pgrowlocks--unpackaged--1.0.sql create mode 100644 contrib/pgrowlocks/pgrowlocks.control delete mode 100644 contrib/pgrowlocks/pgrowlocks.sql.in delete mode 100644 contrib/pgrowlocks/uninstall_pgrowlocks.sql delete mode 100644 contrib/pgstattuple/.gitignore create mode 100644 contrib/pgstattuple/pgstattuple--1.0.sql create mode 100644 contrib/pgstattuple/pgstattuple--unpackaged--1.0.sql create mode 100644 contrib/pgstattuple/pgstattuple.control delete mode 100644 contrib/pgstattuple/pgstattuple.sql.in delete mode 100644 contrib/pgstattuple/uninstall_pgstattuple.sql create mode 100644 contrib/seg/seg--1.0.sql create mode 100644 contrib/seg/seg--unpackaged--1.0.sql create mode 100644 contrib/seg/seg.control delete mode 100644 contrib/seg/seg.sql.in delete mode 100644 contrib/seg/uninstall_seg.sql delete mode 100644 contrib/spi/.gitignore create mode 100644 contrib/spi/autoinc--1.0.sql create mode 100644 contrib/spi/autoinc--unpackaged--1.0.sql create mode 100644 contrib/spi/autoinc.control delete mode 100644 contrib/spi/autoinc.sql.in create mode 100644 contrib/spi/insert_username--1.0.sql create mode 100644 contrib/spi/insert_username--unpackaged--1.0.sql create mode 100644 contrib/spi/insert_username.control delete mode 100644 contrib/spi/insert_username.sql.in create mode 100644 contrib/spi/moddatetime--1.0.sql create mode 100644 contrib/spi/moddatetime--unpackaged--1.0.sql create mode 100644 contrib/spi/moddatetime.control delete mode 100644 contrib/spi/moddatetime.sql.in create mode 100644 contrib/spi/refint--1.0.sql create mode 100644 contrib/spi/refint--unpackaged--1.0.sql create mode 100644 contrib/spi/refint.control delete mode 100644 contrib/spi/refint.sql.in create mode 100644 contrib/spi/timetravel--1.0.sql create mode 100644 contrib/spi/timetravel--unpackaged--1.0.sql create mode 100644 contrib/spi/timetravel.control delete mode 100644 contrib/spi/timetravel.sql.in delete mode 100644 contrib/sslinfo/.gitignore create mode 100644 contrib/sslinfo/sslinfo--1.0.sql create mode 100644 contrib/sslinfo/sslinfo--unpackaged--1.0.sql create mode 100644 contrib/sslinfo/sslinfo.control delete mode 100644 contrib/sslinfo/sslinfo.sql.in delete mode 100644 contrib/sslinfo/uninstall_sslinfo.sql create mode 100644 contrib/tablefunc/tablefunc--1.0.sql create mode 100644 contrib/tablefunc/tablefunc--unpackaged--1.0.sql create mode 100644 contrib/tablefunc/tablefunc.control delete mode 100644 contrib/tablefunc/tablefunc.sql.in delete mode 100644 contrib/tablefunc/uninstall_tablefunc.sql create mode 100644 contrib/test_parser/test_parser--1.0.sql create mode 100644 contrib/test_parser/test_parser--unpackaged--1.0.sql create mode 100644 contrib/test_parser/test_parser.control delete mode 100644 contrib/test_parser/test_parser.sql.in delete mode 100644 contrib/test_parser/uninstall_test_parser.sql create mode 100644 contrib/tsearch2/tsearch2--1.0.sql create mode 100644 contrib/tsearch2/tsearch2--unpackaged--1.0.sql create mode 100644 contrib/tsearch2/tsearch2.control delete mode 100644 contrib/tsearch2/tsearch2.sql.in delete mode 100644 contrib/tsearch2/uninstall_tsearch2.sql create mode 100644 contrib/unaccent/unaccent--1.0.sql create mode 100644 contrib/unaccent/unaccent--unpackaged--1.0.sql create mode 100644 contrib/unaccent/unaccent.control delete mode 100644 contrib/unaccent/unaccent.sql.in delete mode 100644 contrib/unaccent/uninstall_unaccent.sql delete mode 100644 contrib/uuid-ossp/.gitignore delete mode 100644 contrib/uuid-ossp/uninstall_uuid-ossp.sql create mode 100644 contrib/uuid-ossp/uuid-ossp--1.0.sql create mode 100644 contrib/uuid-ossp/uuid-ossp--unpackaged--1.0.sql create mode 100644 contrib/uuid-ossp/uuid-ossp.control delete mode 100644 contrib/uuid-ossp/uuid-ossp.sql.in delete mode 100644 contrib/xml2/pgxml.sql.in delete mode 100644 contrib/xml2/uninstall_pgxml.sql create mode 100644 contrib/xml2/xml2--1.0.sql create mode 100644 contrib/xml2/xml2--unpackaged--1.0.sql create mode 100644 contrib/xml2/xml2.control (limited to 'contrib/xml2') diff --git a/contrib/adminpack/.gitignore b/contrib/adminpack/.gitignore deleted file mode 100644 index ea9a442f3a..0000000000 --- a/contrib/adminpack/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/adminpack.sql diff --git a/contrib/adminpack/Makefile b/contrib/adminpack/Makefile index d4413ad133..a127653d70 100644 --- a/contrib/adminpack/Makefile +++ b/contrib/adminpack/Makefile @@ -1,10 +1,11 @@ # contrib/adminpack/Makefile MODULE_big = adminpack -PG_CPPFLAGS = -I$(libpq_srcdir) -DATA_built = adminpack.sql -DATA = uninstall_adminpack.sql OBJS = adminpack.o +PG_CPPFLAGS = -I$(libpq_srcdir) + +EXTENSION = adminpack +DATA = adminpack--1.0.sql adminpack--unpackaged--1.0.sql ifdef USE_PGXS PG_CONFIG = pg_config diff --git a/contrib/adminpack/adminpack--1.0.sql b/contrib/adminpack/adminpack--1.0.sql new file mode 100644 index 0000000000..0502a4c01f --- /dev/null +++ b/contrib/adminpack/adminpack--1.0.sql @@ -0,0 +1,50 @@ +/* contrib/adminpack/adminpack--1.0.sql */ + +/* *********************************************** + * Administrative functions for PostgreSQL + * *********************************************** */ + +/* generic file access functions */ + +CREATE OR REPLACE FUNCTION pg_catalog.pg_file_write(text, text, bool) +RETURNS bigint +AS 'MODULE_PATHNAME', 'pg_file_write' +LANGUAGE C VOLATILE STRICT; + +CREATE OR REPLACE FUNCTION pg_catalog.pg_file_rename(text, text, text) +RETURNS bool +AS 'MODULE_PATHNAME', 'pg_file_rename' +LANGUAGE C VOLATILE; + +CREATE OR REPLACE FUNCTION pg_catalog.pg_file_rename(text, text) +RETURNS bool +AS 'SELECT pg_catalog.pg_file_rename($1, $2, NULL::pg_catalog.text);' +LANGUAGE SQL VOLATILE STRICT; + +CREATE OR REPLACE FUNCTION pg_catalog.pg_file_unlink(text) +RETURNS bool +AS 'MODULE_PATHNAME', 'pg_file_unlink' +LANGUAGE C VOLATILE STRICT; + +CREATE OR REPLACE FUNCTION pg_catalog.pg_logdir_ls() +RETURNS setof record +AS 'MODULE_PATHNAME', 'pg_logdir_ls' +LANGUAGE C VOLATILE STRICT; + + +/* Renaming of existing backend functions for pgAdmin compatibility */ + +CREATE OR REPLACE FUNCTION pg_catalog.pg_file_read(text, bigint, bigint) +RETURNS text +AS 'pg_read_file' +LANGUAGE INTERNAL VOLATILE STRICT; + +CREATE OR REPLACE FUNCTION pg_catalog.pg_file_length(text) +RETURNS bigint +AS 'SELECT size FROM pg_catalog.pg_stat_file($1)' +LANGUAGE SQL VOLATILE STRICT; + +CREATE OR REPLACE FUNCTION pg_catalog.pg_logfile_rotate() +RETURNS int4 +AS 'pg_rotate_logfile' +LANGUAGE INTERNAL VOLATILE STRICT; diff --git a/contrib/adminpack/adminpack--unpackaged--1.0.sql b/contrib/adminpack/adminpack--unpackaged--1.0.sql new file mode 100644 index 0000000000..d1c6aade9c --- /dev/null +++ b/contrib/adminpack/adminpack--unpackaged--1.0.sql @@ -0,0 +1,10 @@ +/* contrib/adminpack/adminpack--unpackaged--1.0.sql */ + +ALTER EXTENSION adminpack ADD function pg_catalog.pg_file_write(text,text,boolean); +ALTER EXTENSION adminpack ADD function pg_catalog.pg_file_rename(text,text,text); +ALTER EXTENSION adminpack ADD function pg_catalog.pg_file_rename(text,text); +ALTER EXTENSION adminpack ADD function pg_catalog.pg_file_unlink(text); +ALTER EXTENSION adminpack ADD function pg_catalog.pg_logdir_ls(); +ALTER EXTENSION adminpack ADD function pg_catalog.pg_file_read(text,bigint,bigint); +ALTER EXTENSION adminpack ADD function pg_catalog.pg_file_length(text); +ALTER EXTENSION adminpack ADD function pg_catalog.pg_logfile_rotate(); diff --git a/contrib/adminpack/adminpack.control b/contrib/adminpack/adminpack.control new file mode 100644 index 0000000000..c79413f378 --- /dev/null +++ b/contrib/adminpack/adminpack.control @@ -0,0 +1,6 @@ +# adminpack extension +comment = 'administrative functions for PostgreSQL' +default_version = '1.0' +module_pathname = '$libdir/adminpack' +relocatable = false +schema = pg_catalog diff --git a/contrib/adminpack/adminpack.sql.in b/contrib/adminpack/adminpack.sql.in deleted file mode 100644 index 6e389975d0..0000000000 --- a/contrib/adminpack/adminpack.sql.in +++ /dev/null @@ -1,50 +0,0 @@ -/* contrib/adminpack/adminpack.sql.in */ - -/* *********************************************** - * Administrative functions for PostgreSQL - * *********************************************** */ - -/* generic file access functions */ - -CREATE OR REPLACE FUNCTION pg_catalog.pg_file_write(text, text, bool) -RETURNS bigint -AS 'MODULE_PATHNAME', 'pg_file_write' -LANGUAGE C VOLATILE STRICT; - -CREATE OR REPLACE FUNCTION pg_catalog.pg_file_rename(text, text, text) -RETURNS bool -AS 'MODULE_PATHNAME', 'pg_file_rename' -LANGUAGE C VOLATILE; - -CREATE OR REPLACE FUNCTION pg_catalog.pg_file_rename(text, text) -RETURNS bool -AS 'SELECT pg_catalog.pg_file_rename($1, $2, NULL::pg_catalog.text);' -LANGUAGE SQL VOLATILE STRICT; - -CREATE OR REPLACE FUNCTION pg_catalog.pg_file_unlink(text) -RETURNS bool -AS 'MODULE_PATHNAME', 'pg_file_unlink' -LANGUAGE C VOLATILE STRICT; - -CREATE OR REPLACE FUNCTION pg_catalog.pg_logdir_ls() -RETURNS setof record -AS 'MODULE_PATHNAME', 'pg_logdir_ls' -LANGUAGE C VOLATILE STRICT; - - -/* Renaming of existing backend functions for pgAdmin compatibility */ - -CREATE OR REPLACE FUNCTION pg_catalog.pg_file_read(text, bigint, bigint) -RETURNS text -AS 'pg_read_file' -LANGUAGE INTERNAL VOLATILE STRICT; - -CREATE OR REPLACE FUNCTION pg_catalog.pg_file_length(text) -RETURNS bigint -AS 'SELECT size FROM pg_catalog.pg_stat_file($1)' -LANGUAGE SQL VOLATILE STRICT; - -CREATE OR REPLACE FUNCTION pg_catalog.pg_logfile_rotate() -RETURNS int4 -AS 'pg_rotate_logfile' -LANGUAGE INTERNAL VOLATILE STRICT; diff --git a/contrib/adminpack/uninstall_adminpack.sql b/contrib/adminpack/uninstall_adminpack.sql deleted file mode 100644 index 682cf67760..0000000000 --- a/contrib/adminpack/uninstall_adminpack.sql +++ /dev/null @@ -1,10 +0,0 @@ -/* contrib/adminpack/uninstall_adminpack.sql */ - -DROP FUNCTION pg_catalog.pg_file_write(text, text, bool) ; -DROP FUNCTION pg_catalog.pg_file_rename(text, text, text) ; -DROP FUNCTION pg_catalog.pg_file_rename(text, text) ; -DROP FUNCTION pg_catalog.pg_file_unlink(text) ; -DROP FUNCTION pg_catalog.pg_logdir_ls() ; -DROP FUNCTION pg_catalog.pg_file_read(text, bigint, bigint) ; -DROP FUNCTION pg_catalog.pg_file_length(text) ; -DROP FUNCTION pg_catalog.pg_logfile_rotate() ; diff --git a/contrib/btree_gin/.gitignore b/contrib/btree_gin/.gitignore index 7cebcf00f8..19b6c5ba42 100644 --- a/contrib/btree_gin/.gitignore +++ b/contrib/btree_gin/.gitignore @@ -1,3 +1,2 @@ -/btree_gin.sql # Generated subdirectories /results/ diff --git a/contrib/btree_gin/Makefile b/contrib/btree_gin/Makefile index 8bc53f72da..09fd3e6e11 100644 --- a/contrib/btree_gin/Makefile +++ b/contrib/btree_gin/Makefile @@ -3,8 +3,9 @@ MODULE_big = btree_gin OBJS = btree_gin.o -DATA_built = btree_gin.sql -DATA = uninstall_btree_gin.sql +EXTENSION = btree_gin +DATA = btree_gin--1.0.sql btree_gin--unpackaged--1.0.sql + REGRESS = install_btree_gin int2 int4 int8 float4 float8 money oid \ timestamp timestamptz time timetz date interval \ macaddr inet cidr text varchar char bytea bit varbit \ diff --git a/contrib/btree_gin/btree_gin--1.0.sql b/contrib/btree_gin/btree_gin--1.0.sql new file mode 100644 index 0000000000..08bbff721f --- /dev/null +++ b/contrib/btree_gin/btree_gin--1.0.sql @@ -0,0 +1,686 @@ +/* contrib/btree_gin/btree_gin--1.0.sql */ + +CREATE OR REPLACE FUNCTION gin_btree_consistent(internal, int2, anyelement, int4, internal, internal) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION gin_extract_value_int2(int2, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION gin_compare_prefix_int2(int2, int2, int2, internal) +RETURNS int4 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION gin_extract_query_int2(int2, internal, int2, internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OPERATOR CLASS int2_ops +DEFAULT FOR TYPE int2 USING gin +AS + OPERATOR 1 <, + OPERATOR 2 <=, + OPERATOR 3 =, + OPERATOR 4 >=, + OPERATOR 5 >, + FUNCTION 1 btint2cmp(int2,int2), + FUNCTION 2 gin_extract_value_int2(int2, internal), + FUNCTION 3 gin_extract_query_int2(int2, internal, int2, internal, internal), + FUNCTION 4 gin_btree_consistent(internal, int2, anyelement, int4, internal, internal), + FUNCTION 5 gin_compare_prefix_int2(int2,int2,int2, internal), +STORAGE int2; + +CREATE OR REPLACE FUNCTION gin_extract_value_int4(int4, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION gin_compare_prefix_int4(int4, int4, int2, internal) +RETURNS int4 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION gin_extract_query_int4(int4, internal, int2, internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OPERATOR CLASS int4_ops +DEFAULT FOR TYPE int4 USING gin +AS + OPERATOR 1 <, + OPERATOR 2 <=, + OPERATOR 3 =, + OPERATOR 4 >=, + OPERATOR 5 >, + FUNCTION 1 btint4cmp(int4,int4), + FUNCTION 2 gin_extract_value_int4(int4, internal), + FUNCTION 3 gin_extract_query_int4(int4, internal, int2, internal, internal), + FUNCTION 4 gin_btree_consistent(internal, int2, anyelement, int4, internal, internal), + FUNCTION 5 gin_compare_prefix_int4(int4,int4,int2, internal), +STORAGE int4; + +CREATE OR REPLACE FUNCTION gin_extract_value_int8(int8, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION gin_compare_prefix_int8(int8, int8, int2, internal) +RETURNS int4 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION gin_extract_query_int8(int8, internal, int2, internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OPERATOR CLASS int8_ops +DEFAULT FOR TYPE int8 USING gin +AS + OPERATOR 1 <, + OPERATOR 2 <=, + OPERATOR 3 =, + OPERATOR 4 >=, + OPERATOR 5 >, + FUNCTION 1 btint8cmp(int8,int8), + FUNCTION 2 gin_extract_value_int8(int8, internal), + FUNCTION 3 gin_extract_query_int8(int8, internal, int2, internal, internal), + FUNCTION 4 gin_btree_consistent(internal, int2, anyelement, int4, internal, internal), + FUNCTION 5 gin_compare_prefix_int8(int8,int8,int2, internal), +STORAGE int8; + +CREATE OR REPLACE FUNCTION gin_extract_value_float4(float4, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION gin_compare_prefix_float4(float4, float4, int2, internal) +RETURNS int4 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION gin_extract_query_float4(float4, internal, int2, internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OPERATOR CLASS float4_ops +DEFAULT FOR TYPE float4 USING gin +AS + OPERATOR 1 <, + OPERATOR 2 <=, + OPERATOR 3 =, + OPERATOR 4 >=, + OPERATOR 5 >, + FUNCTION 1 btfloat4cmp(float4,float4), + FUNCTION 2 gin_extract_value_float4(float4, internal), + FUNCTION 3 gin_extract_query_float4(float4, internal, int2, internal, internal), + FUNCTION 4 gin_btree_consistent(internal, int2, anyelement, int4, internal, internal), + FUNCTION 5 gin_compare_prefix_float4(float4,float4,int2, internal), +STORAGE float4; + +CREATE OR REPLACE FUNCTION gin_extract_value_float8(float8, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION gin_compare_prefix_float8(float8, float8, int2, internal) +RETURNS int4 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION gin_extract_query_float8(float8, internal, int2, internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OPERATOR CLASS float8_ops +DEFAULT FOR TYPE float8 USING gin +AS + OPERATOR 1 <, + OPERATOR 2 <=, + OPERATOR 3 =, + OPERATOR 4 >=, + OPERATOR 5 >, + FUNCTION 1 btfloat8cmp(float8,float8), + FUNCTION 2 gin_extract_value_float8(float8, internal), + FUNCTION 3 gin_extract_query_float8(float8, internal, int2, internal, internal), + FUNCTION 4 gin_btree_consistent(internal, int2, anyelement, int4, internal, internal), + FUNCTION 5 gin_compare_prefix_float8(float8,float8,int2, internal), +STORAGE float8; + +CREATE OR REPLACE FUNCTION gin_extract_value_money(money, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION gin_compare_prefix_money(money, money, int2, internal) +RETURNS int4 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION gin_extract_query_money(money, internal, int2, internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OPERATOR CLASS money_ops +DEFAULT FOR TYPE money USING gin +AS + OPERATOR 1 <, + OPERATOR 2 <=, + OPERATOR 3 =, + OPERATOR 4 >=, + OPERATOR 5 >, + FUNCTION 1 cash_cmp(money,money), + FUNCTION 2 gin_extract_value_money(money, internal), + FUNCTION 3 gin_extract_query_money(money, internal, int2, internal, internal), + FUNCTION 4 gin_btree_consistent(internal, int2, anyelement, int4, internal, internal), + FUNCTION 5 gin_compare_prefix_money(money,money,int2, internal), +STORAGE money; + +CREATE OR REPLACE FUNCTION gin_extract_value_oid(oid, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION gin_compare_prefix_oid(oid, oid, int2, internal) +RETURNS int4 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION gin_extract_query_oid(oid, internal, int2, internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OPERATOR CLASS oid_ops +DEFAULT FOR TYPE oid USING gin +AS + OPERATOR 1 <, + OPERATOR 2 <=, + OPERATOR 3 =, + OPERATOR 4 >=, + OPERATOR 5 >, + FUNCTION 1 btoidcmp(oid,oid), + FUNCTION 2 gin_extract_value_oid(oid, internal), + FUNCTION 3 gin_extract_query_oid(oid, internal, int2, internal, internal), + FUNCTION 4 gin_btree_consistent(internal, int2, anyelement, int4, internal, internal), + FUNCTION 5 gin_compare_prefix_oid(oid,oid,int2, internal), +STORAGE oid; + +CREATE OR REPLACE FUNCTION gin_extract_value_timestamp(timestamp, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION gin_compare_prefix_timestamp(timestamp, timestamp, int2, internal) +RETURNS int4 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION gin_extract_query_timestamp(timestamp, internal, int2, internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OPERATOR CLASS timestamp_ops +DEFAULT FOR TYPE timestamp USING gin +AS + OPERATOR 1 <, + OPERATOR 2 <=, + OPERATOR 3 =, + OPERATOR 4 >=, + OPERATOR 5 >, + FUNCTION 1 timestamp_cmp(timestamp,timestamp), + FUNCTION 2 gin_extract_value_timestamp(timestamp, internal), + FUNCTION 3 gin_extract_query_timestamp(timestamp, internal, int2, internal, internal), + FUNCTION 4 gin_btree_consistent(internal, int2, anyelement, int4, internal, internal), + FUNCTION 5 gin_compare_prefix_timestamp(timestamp,timestamp,int2, internal), +STORAGE timestamp; + +CREATE OR REPLACE FUNCTION gin_extract_value_timestamptz(timestamptz, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION gin_compare_prefix_timestamptz(timestamptz, timestamptz, int2, internal) +RETURNS int4 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION gin_extract_query_timestamptz(timestamptz, internal, int2, internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OPERATOR CLASS timestamptz_ops +DEFAULT FOR TYPE timestamptz USING gin +AS + OPERATOR 1 <, + OPERATOR 2 <=, + OPERATOR 3 =, + OPERATOR 4 >=, + OPERATOR 5 >, + FUNCTION 1 timestamptz_cmp(timestamptz,timestamptz), + FUNCTION 2 gin_extract_value_timestamptz(timestamptz, internal), + FUNCTION 3 gin_extract_query_timestamptz(timestamptz, internal, int2, internal, internal), + FUNCTION 4 gin_btree_consistent(internal, int2, anyelement, int4, internal, internal), + FUNCTION 5 gin_compare_prefix_timestamptz(timestamptz,timestamptz,int2, internal), +STORAGE timestamptz; + +CREATE OR REPLACE FUNCTION gin_extract_value_time(time, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION gin_compare_prefix_time(time, time, int2, internal) +RETURNS int4 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION gin_extract_query_time(time, internal, int2, internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OPERATOR CLASS time_ops +DEFAULT FOR TYPE time USING gin +AS + OPERATOR 1 <, + OPERATOR 2 <=, + OPERATOR 3 =, + OPERATOR 4 >=, + OPERATOR 5 >, + FUNCTION 1 time_cmp(time,time), + FUNCTION 2 gin_extract_value_time(time, internal), + FUNCTION 3 gin_extract_query_time(time, internal, int2, internal, internal), + FUNCTION 4 gin_btree_consistent(internal, int2, anyelement, int4, internal, internal), + FUNCTION 5 gin_compare_prefix_time(time,time,int2, internal), +STORAGE time; + +CREATE OR REPLACE FUNCTION gin_extract_value_timetz(timetz, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION gin_compare_prefix_timetz(timetz, timetz, int2, internal) +RETURNS int4 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION gin_extract_query_timetz(timetz, internal, int2, internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OPERATOR CLASS timetz_ops +DEFAULT FOR TYPE timetz USING gin +AS + OPERATOR 1 <, + OPERATOR 2 <=, + OPERATOR 3 =, + OPERATOR 4 >=, + OPERATOR 5 >, + FUNCTION 1 timetz_cmp(timetz,timetz), + FUNCTION 2 gin_extract_value_timetz(timetz, internal), + FUNCTION 3 gin_extract_query_timetz(timetz, internal, int2, internal, internal), + FUNCTION 4 gin_btree_consistent(internal, int2, anyelement, int4, internal, internal), + FUNCTION 5 gin_compare_prefix_timetz(timetz,timetz,int2, internal), +STORAGE timetz; + +CREATE OR REPLACE FUNCTION gin_extract_value_date(date, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION gin_compare_prefix_date(date, date, int2, internal) +RETURNS int4 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION gin_extract_query_date(date, internal, int2, internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OPERATOR CLASS date_ops +DEFAULT FOR TYPE date USING gin +AS + OPERATOR 1 <, + OPERATOR 2 <=, + OPERATOR 3 =, + OPERATOR 4 >=, + OPERATOR 5 >, + FUNCTION 1 date_cmp(date,date), + FUNCTION 2 gin_extract_value_date(date, internal), + FUNCTION 3 gin_extract_query_date(date, internal, int2, internal, internal), + FUNCTION 4 gin_btree_consistent(internal, int2, anyelement, int4, internal, internal), + FUNCTION 5 gin_compare_prefix_date(date,date,int2, internal), +STORAGE date; + +CREATE OR REPLACE FUNCTION gin_extract_value_interval(interval, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION gin_compare_prefix_interval(interval, interval, int2, internal) +RETURNS int4 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION gin_extract_query_interval(interval, internal, int2, internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OPERATOR CLASS interval_ops +DEFAULT FOR TYPE interval USING gin +AS + OPERATOR 1 <, + OPERATOR 2 <=, + OPERATOR 3 =, + OPERATOR 4 >=, + OPERATOR 5 >, + FUNCTION 1 interval_cmp(interval,interval), + FUNCTION 2 gin_extract_value_interval(interval, internal), + FUNCTION 3 gin_extract_query_interval(interval, internal, int2, internal, internal), + FUNCTION 4 gin_btree_consistent(internal, int2, anyelement, int4, internal, internal), + FUNCTION 5 gin_compare_prefix_interval(interval,interval,int2, internal), +STORAGE interval; + +CREATE OR REPLACE FUNCTION gin_extract_value_macaddr(macaddr, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION gin_compare_prefix_macaddr(macaddr, macaddr, int2, internal) +RETURNS int4 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION gin_extract_query_macaddr(macaddr, internal, int2, internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OPERATOR CLASS macaddr_ops +DEFAULT FOR TYPE macaddr USING gin +AS + OPERATOR 1 <, + OPERATOR 2 <=, + OPERATOR 3 =, + OPERATOR 4 >=, + OPERATOR 5 >, + FUNCTION 1 macaddr_cmp(macaddr,macaddr), + FUNCTION 2 gin_extract_value_macaddr(macaddr, internal), + FUNCTION 3 gin_extract_query_macaddr(macaddr, internal, int2, internal, internal), + FUNCTION 4 gin_btree_consistent(internal, int2, anyelement, int4, internal, internal), + FUNCTION 5 gin_compare_prefix_macaddr(macaddr,macaddr,int2, internal), +STORAGE macaddr; + +CREATE OR REPLACE FUNCTION gin_extract_value_inet(inet, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION gin_compare_prefix_inet(inet, inet, int2, internal) +RETURNS int4 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION gin_extract_query_inet(inet, internal, int2, internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OPERATOR CLASS inet_ops +DEFAULT FOR TYPE inet USING gin +AS + OPERATOR 1 <, + OPERATOR 2 <=, + OPERATOR 3 =, + OPERATOR 4 >=, + OPERATOR 5 >, + FUNCTION 1 network_cmp(inet,inet), + FUNCTION 2 gin_extract_value_inet(inet, internal), + FUNCTION 3 gin_extract_query_inet(inet, internal, int2, internal, internal), + FUNCTION 4 gin_btree_consistent(internal, int2, anyelement, int4, internal, internal), + FUNCTION 5 gin_compare_prefix_inet(inet,inet,int2, internal), +STORAGE inet; + +CREATE OR REPLACE FUNCTION gin_extract_value_cidr(cidr, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION gin_compare_prefix_cidr(cidr, cidr, int2, internal) +RETURNS int4 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION gin_extract_query_cidr(cidr, internal, int2, internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OPERATOR CLASS cidr_ops +DEFAULT FOR TYPE cidr USING gin +AS + OPERATOR 1 <(inet,inet), + OPERATOR 2 <=(inet,inet), + OPERATOR 3 =(inet,inet), + OPERATOR 4 >=(inet,inet), + OPERATOR 5 >(inet,inet), + FUNCTION 1 network_cmp(inet,inet), + FUNCTION 2 gin_extract_value_cidr(cidr, internal), + FUNCTION 3 gin_extract_query_cidr(cidr, internal, int2, internal, internal), + FUNCTION 4 gin_btree_consistent(internal, int2, anyelement, int4, internal, internal), + FUNCTION 5 gin_compare_prefix_cidr(cidr,cidr,int2, internal), +STORAGE cidr; + +CREATE OR REPLACE FUNCTION gin_extract_value_text(text, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION gin_compare_prefix_text(text, text, int2, internal) +RETURNS int4 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION gin_extract_query_text(text, internal, int2, internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OPERATOR CLASS text_ops +DEFAULT FOR TYPE text USING gin +AS + OPERATOR 1 <, + OPERATOR 2 <=, + OPERATOR 3 =, + OPERATOR 4 >=, + OPERATOR 5 >, + FUNCTION 1 bttextcmp(text,text), + FUNCTION 2 gin_extract_value_text(text, internal), + FUNCTION 3 gin_extract_query_text(text, internal, int2, internal, internal), + FUNCTION 4 gin_btree_consistent(internal, int2, anyelement, int4, internal, internal), + FUNCTION 5 gin_compare_prefix_text(text,text,int2, internal), +STORAGE text; + +CREATE OPERATOR CLASS varchar_ops +DEFAULT FOR TYPE varchar USING gin +AS + OPERATOR 1 <(text,text), + OPERATOR 2 <=(text,text), + OPERATOR 3 =(text,text), + OPERATOR 4 >=(text,text), + OPERATOR 5 >(text,text), + FUNCTION 1 bttextcmp(text,text), + FUNCTION 2 gin_extract_value_text(text, internal), + FUNCTION 3 gin_extract_query_text(text, internal, int2, internal, internal), + FUNCTION 4 gin_btree_consistent(internal, int2, anyelement, int4, internal, internal), + FUNCTION 5 gin_compare_prefix_text(text,text,int2, internal), +STORAGE varchar; + +CREATE OR REPLACE FUNCTION gin_extract_value_char("char", internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION gin_compare_prefix_char("char", "char", int2, internal) +RETURNS int4 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION gin_extract_query_char("char", internal, int2, internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OPERATOR CLASS char_ops +DEFAULT FOR TYPE "char" USING gin +AS + OPERATOR 1 <, + OPERATOR 2 <=, + OPERATOR 3 =, + OPERATOR 4 >=, + OPERATOR 5 >, + FUNCTION 1 btcharcmp("char","char"), + FUNCTION 2 gin_extract_value_char("char", internal), + FUNCTION 3 gin_extract_query_char("char", internal, int2, internal, internal), + FUNCTION 4 gin_btree_consistent(internal, int2, anyelement, int4, internal, internal), + FUNCTION 5 gin_compare_prefix_char("char","char",int2, internal), +STORAGE "char"; + +CREATE OR REPLACE FUNCTION gin_extract_value_bytea(bytea, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION gin_compare_prefix_bytea(bytea, bytea, int2, internal) +RETURNS int4 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION gin_extract_query_bytea(bytea, internal, int2, internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OPERATOR CLASS bytea_ops +DEFAULT FOR TYPE bytea USING gin +AS + OPERATOR 1 <, + OPERATOR 2 <=, + OPERATOR 3 =, + OPERATOR 4 >=, + OPERATOR 5 >, + FUNCTION 1 byteacmp(bytea,bytea), + FUNCTION 2 gin_extract_value_bytea(bytea, internal), + FUNCTION 3 gin_extract_query_bytea(bytea, internal, int2, internal, internal), + FUNCTION 4 gin_btree_consistent(internal, int2, anyelement, int4, internal, internal), + FUNCTION 5 gin_compare_prefix_bytea(bytea,bytea,int2, internal), +STORAGE bytea; + +CREATE OR REPLACE FUNCTION gin_extract_value_bit(bit, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION gin_compare_prefix_bit(bit, bit, int2, internal) +RETURNS int4 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION gin_extract_query_bit(bit, internal, int2, internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OPERATOR CLASS bit_ops +DEFAULT FOR TYPE bit USING gin +AS + OPERATOR 1 <, + OPERATOR 2 <=, + OPERATOR 3 =, + OPERATOR 4 >=, + OPERATOR 5 >, + FUNCTION 1 bitcmp(bit,bit), + FUNCTION 2 gin_extract_value_bit(bit, internal), + FUNCTION 3 gin_extract_query_bit(bit, internal, int2, internal, internal), + FUNCTION 4 gin_btree_consistent(internal, int2, anyelement, int4, internal, internal), + FUNCTION 5 gin_compare_prefix_bit(bit,bit,int2, internal), +STORAGE bit; + +CREATE OR REPLACE FUNCTION gin_extract_value_varbit(varbit, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION gin_compare_prefix_varbit(varbit, varbit, int2, internal) +RETURNS int4 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION gin_extract_query_varbit(varbit, internal, int2, internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OPERATOR CLASS varbit_ops +DEFAULT FOR TYPE varbit USING gin +AS + OPERATOR 1 <, + OPERATOR 2 <=, + OPERATOR 3 =, + OPERATOR 4 >=, + OPERATOR 5 >, + FUNCTION 1 varbitcmp(varbit,varbit), + FUNCTION 2 gin_extract_value_varbit(varbit, internal), + FUNCTION 3 gin_extract_query_varbit(varbit, internal, int2, internal, internal), + FUNCTION 4 gin_btree_consistent(internal, int2, anyelement, int4, internal, internal), + FUNCTION 5 gin_compare_prefix_varbit(varbit,varbit,int2, internal), +STORAGE varbit; + +CREATE OR REPLACE FUNCTION gin_extract_value_numeric(numeric, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION gin_compare_prefix_numeric(numeric, numeric, int2, internal) +RETURNS int4 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION gin_extract_query_numeric(numeric, internal, int2, internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION gin_numeric_cmp(numeric, numeric) +RETURNS int4 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OPERATOR CLASS numeric_ops +DEFAULT FOR TYPE numeric USING gin +AS + OPERATOR 1 <, + OPERATOR 2 <=, + OPERATOR 3 =, + OPERATOR 4 >=, + OPERATOR 5 >, + FUNCTION 1 gin_numeric_cmp(numeric,numeric), + FUNCTION 2 gin_extract_value_numeric(numeric, internal), + FUNCTION 3 gin_extract_query_numeric(numeric, internal, int2, internal, internal), + FUNCTION 4 gin_btree_consistent(internal, int2, anyelement, int4, internal, internal), + FUNCTION 5 gin_compare_prefix_numeric(numeric,numeric,int2, internal), +STORAGE numeric; diff --git a/contrib/btree_gin/btree_gin--unpackaged--1.0.sql b/contrib/btree_gin/btree_gin--unpackaged--1.0.sql new file mode 100644 index 0000000000..fe1ddeab87 --- /dev/null +++ b/contrib/btree_gin/btree_gin--unpackaged--1.0.sql @@ -0,0 +1,116 @@ +/* contrib/btree_gin/btree_gin--unpackaged--1.0.sql */ + +ALTER EXTENSION btree_gin ADD function gin_btree_consistent(internal,smallint,anyelement,integer,internal,internal); +ALTER EXTENSION btree_gin ADD function gin_extract_value_int2(smallint,internal); +ALTER EXTENSION btree_gin ADD function gin_compare_prefix_int2(smallint,smallint,smallint,internal); +ALTER EXTENSION btree_gin ADD function gin_extract_query_int2(smallint,internal,smallint,internal,internal); +ALTER EXTENSION btree_gin ADD operator family int2_ops using gin; +ALTER EXTENSION btree_gin ADD operator class int2_ops using gin; +ALTER EXTENSION btree_gin ADD function gin_extract_value_int4(integer,internal); +ALTER EXTENSION btree_gin ADD function gin_compare_prefix_int4(integer,integer,smallint,internal); +ALTER EXTENSION btree_gin ADD function gin_extract_query_int4(integer,internal,smallint,internal,internal); +ALTER EXTENSION btree_gin ADD operator family int4_ops using gin; +ALTER EXTENSION btree_gin ADD operator class int4_ops using gin; +ALTER EXTENSION btree_gin ADD function gin_extract_value_int8(bigint,internal); +ALTER EXTENSION btree_gin ADD function gin_compare_prefix_int8(bigint,bigint,smallint,internal); +ALTER EXTENSION btree_gin ADD function gin_extract_query_int8(bigint,internal,smallint,internal,internal); +ALTER EXTENSION btree_gin ADD operator family int8_ops using gin; +ALTER EXTENSION btree_gin ADD operator class int8_ops using gin; +ALTER EXTENSION btree_gin ADD function gin_extract_value_float4(real,internal); +ALTER EXTENSION btree_gin ADD function gin_compare_prefix_float4(real,real,smallint,internal); +ALTER EXTENSION btree_gin ADD function gin_extract_query_float4(real,internal,smallint,internal,internal); +ALTER EXTENSION btree_gin ADD operator family float4_ops using gin; +ALTER EXTENSION btree_gin ADD operator class float4_ops using gin; +ALTER EXTENSION btree_gin ADD function gin_extract_value_float8(double precision,internal); +ALTER EXTENSION btree_gin ADD function gin_compare_prefix_float8(double precision,double precision,smallint,internal); +ALTER EXTENSION btree_gin ADD function gin_extract_query_float8(double precision,internal,smallint,internal,internal); +ALTER EXTENSION btree_gin ADD operator family float8_ops using gin; +ALTER EXTENSION btree_gin ADD operator class float8_ops using gin; +ALTER EXTENSION btree_gin ADD function gin_extract_value_money(money,internal); +ALTER EXTENSION btree_gin ADD function gin_compare_prefix_money(money,money,smallint,internal); +ALTER EXTENSION btree_gin ADD function gin_extract_query_money(money,internal,smallint,internal,internal); +ALTER EXTENSION btree_gin ADD operator family money_ops using gin; +ALTER EXTENSION btree_gin ADD operator class money_ops using gin; +ALTER EXTENSION btree_gin ADD function gin_extract_value_oid(oid,internal); +ALTER EXTENSION btree_gin ADD function gin_compare_prefix_oid(oid,oid,smallint,internal); +ALTER EXTENSION btree_gin ADD function gin_extract_query_oid(oid,internal,smallint,internal,internal); +ALTER EXTENSION btree_gin ADD operator family oid_ops using gin; +ALTER EXTENSION btree_gin ADD operator class oid_ops using gin; +ALTER EXTENSION btree_gin ADD function gin_extract_value_timestamp(timestamp without time zone,internal); +ALTER EXTENSION btree_gin ADD function gin_compare_prefix_timestamp(timestamp without time zone,timestamp without time zone,smallint,internal); +ALTER EXTENSION btree_gin ADD function gin_extract_query_timestamp(timestamp without time zone,internal,smallint,internal,internal); +ALTER EXTENSION btree_gin ADD operator family timestamp_ops using gin; +ALTER EXTENSION btree_gin ADD operator class timestamp_ops using gin; +ALTER EXTENSION btree_gin ADD function gin_extract_value_timestamptz(timestamp with time zone,internal); +ALTER EXTENSION btree_gin ADD function gin_compare_prefix_timestamptz(timestamp with time zone,timestamp with time zone,smallint,internal); +ALTER EXTENSION btree_gin ADD function gin_extract_query_timestamptz(timestamp with time zone,internal,smallint,internal,internal); +ALTER EXTENSION btree_gin ADD operator family timestamptz_ops using gin; +ALTER EXTENSION btree_gin ADD operator class timestamptz_ops using gin; +ALTER EXTENSION btree_gin ADD function gin_extract_value_time(time without time zone,internal); +ALTER EXTENSION btree_gin ADD function gin_compare_prefix_time(time without time zone,time without time zone,smallint,internal); +ALTER EXTENSION btree_gin ADD function gin_extract_query_time(time without time zone,internal,smallint,internal,internal); +ALTER EXTENSION btree_gin ADD operator family time_ops using gin; +ALTER EXTENSION btree_gin ADD operator class time_ops using gin; +ALTER EXTENSION btree_gin ADD function gin_extract_value_timetz(time with time zone,internal); +ALTER EXTENSION btree_gin ADD function gin_compare_prefix_timetz(time with time zone,time with time zone,smallint,internal); +ALTER EXTENSION btree_gin ADD function gin_extract_query_timetz(time with time zone,internal,smallint,internal,internal); +ALTER EXTENSION btree_gin ADD operator family timetz_ops using gin; +ALTER EXTENSION btree_gin ADD operator class timetz_ops using gin; +ALTER EXTENSION btree_gin ADD function gin_extract_value_date(date,internal); +ALTER EXTENSION btree_gin ADD function gin_compare_prefix_date(date,date,smallint,internal); +ALTER EXTENSION btree_gin ADD function gin_extract_query_date(date,internal,smallint,internal,internal); +ALTER EXTENSION btree_gin ADD operator family date_ops using gin; +ALTER EXTENSION btree_gin ADD operator class date_ops using gin; +ALTER EXTENSION btree_gin ADD function gin_extract_value_interval(interval,internal); +ALTER EXTENSION btree_gin ADD function gin_compare_prefix_interval(interval,interval,smallint,internal); +ALTER EXTENSION btree_gin ADD function gin_extract_query_interval(interval,internal,smallint,internal,internal); +ALTER EXTENSION btree_gin ADD operator family interval_ops using gin; +ALTER EXTENSION btree_gin ADD operator class interval_ops using gin; +ALTER EXTENSION btree_gin ADD function gin_extract_value_macaddr(macaddr,internal); +ALTER EXTENSION btree_gin ADD function gin_compare_prefix_macaddr(macaddr,macaddr,smallint,internal); +ALTER EXTENSION btree_gin ADD function gin_extract_query_macaddr(macaddr,internal,smallint,internal,internal); +ALTER EXTENSION btree_gin ADD operator family macaddr_ops using gin; +ALTER EXTENSION btree_gin ADD operator class macaddr_ops using gin; +ALTER EXTENSION btree_gin ADD function gin_extract_value_inet(inet,internal); +ALTER EXTENSION btree_gin ADD function gin_compare_prefix_inet(inet,inet,smallint,internal); +ALTER EXTENSION btree_gin ADD function gin_extract_query_inet(inet,internal,smallint,internal,internal); +ALTER EXTENSION btree_gin ADD operator family inet_ops using gin; +ALTER EXTENSION btree_gin ADD operator class inet_ops using gin; +ALTER EXTENSION btree_gin ADD function gin_extract_value_cidr(cidr,internal); +ALTER EXTENSION btree_gin ADD function gin_compare_prefix_cidr(cidr,cidr,smallint,internal); +ALTER EXTENSION btree_gin ADD function gin_extract_query_cidr(cidr,internal,smallint,internal,internal); +ALTER EXTENSION btree_gin ADD operator family cidr_ops using gin; +ALTER EXTENSION btree_gin ADD operator class cidr_ops using gin; +ALTER EXTENSION btree_gin ADD function gin_extract_value_text(text,internal); +ALTER EXTENSION btree_gin ADD function gin_compare_prefix_text(text,text,smallint,internal); +ALTER EXTENSION btree_gin ADD function gin_extract_query_text(text,internal,smallint,internal,internal); +ALTER EXTENSION btree_gin ADD operator family text_ops using gin; +ALTER EXTENSION btree_gin ADD operator class text_ops using gin; +ALTER EXTENSION btree_gin ADD operator family varchar_ops using gin; +ALTER EXTENSION btree_gin ADD operator class varchar_ops using gin; +ALTER EXTENSION btree_gin ADD function gin_extract_value_char("char",internal); +ALTER EXTENSION btree_gin ADD function gin_compare_prefix_char("char","char",smallint,internal); +ALTER EXTENSION btree_gin ADD function gin_extract_query_char("char",internal,smallint,internal,internal); +ALTER EXTENSION btree_gin ADD operator family char_ops using gin; +ALTER EXTENSION btree_gin ADD operator class char_ops using gin; +ALTER EXTENSION btree_gin ADD function gin_extract_value_bytea(bytea,internal); +ALTER EXTENSION btree_gin ADD function gin_compare_prefix_bytea(bytea,bytea,smallint,internal); +ALTER EXTENSION btree_gin ADD function gin_extract_query_bytea(bytea,internal,smallint,internal,internal); +ALTER EXTENSION btree_gin ADD operator family bytea_ops using gin; +ALTER EXTENSION btree_gin ADD operator class bytea_ops using gin; +ALTER EXTENSION btree_gin ADD function gin_extract_value_bit(bit,internal); +ALTER EXTENSION btree_gin ADD function gin_compare_prefix_bit(bit,bit,smallint,internal); +ALTER EXTENSION btree_gin ADD function gin_extract_query_bit(bit,internal,smallint,internal,internal); +ALTER EXTENSION btree_gin ADD operator family bit_ops using gin; +ALTER EXTENSION btree_gin ADD operator class bit_ops using gin; +ALTER EXTENSION btree_gin ADD function gin_extract_value_varbit(bit varying,internal); +ALTER EXTENSION btree_gin ADD function gin_compare_prefix_varbit(bit varying,bit varying,smallint,internal); +ALTER EXTENSION btree_gin ADD function gin_extract_query_varbit(bit varying,internal,smallint,internal,internal); +ALTER EXTENSION btree_gin ADD operator family varbit_ops using gin; +ALTER EXTENSION btree_gin ADD operator class varbit_ops using gin; +ALTER EXTENSION btree_gin ADD function gin_extract_value_numeric(numeric,internal); +ALTER EXTENSION btree_gin ADD function gin_compare_prefix_numeric(numeric,numeric,smallint,internal); +ALTER EXTENSION btree_gin ADD function gin_extract_query_numeric(numeric,internal,smallint,internal,internal); +ALTER EXTENSION btree_gin ADD function gin_numeric_cmp(numeric,numeric); +ALTER EXTENSION btree_gin ADD operator family numeric_ops using gin; +ALTER EXTENSION btree_gin ADD operator class numeric_ops using gin; diff --git a/contrib/btree_gin/btree_gin.control b/contrib/btree_gin/btree_gin.control new file mode 100644 index 0000000000..3b2cb2d709 --- /dev/null +++ b/contrib/btree_gin/btree_gin.control @@ -0,0 +1,5 @@ +# btree_gin extension +comment = 'support for indexing common datatypes in GIN' +default_version = '1.0' +module_pathname = '$libdir/btree_gin' +relocatable = true diff --git a/contrib/btree_gin/btree_gin.sql.in b/contrib/btree_gin/btree_gin.sql.in deleted file mode 100644 index 19cc0b3df4..0000000000 --- a/contrib/btree_gin/btree_gin.sql.in +++ /dev/null @@ -1,689 +0,0 @@ -/* contrib/btree_gin/btree_gin.sql.in */ - --- Adjust this setting to control where the objects get created. -SET search_path = public; - -CREATE OR REPLACE FUNCTION gin_btree_consistent(internal, int2, anyelement, int4, internal, internal) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION gin_extract_value_int2(int2, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION gin_compare_prefix_int2(int2, int2, int2, internal) -RETURNS int4 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION gin_extract_query_int2(int2, internal, int2, internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OPERATOR CLASS int2_ops -DEFAULT FOR TYPE int2 USING gin -AS - OPERATOR 1 <, - OPERATOR 2 <=, - OPERATOR 3 =, - OPERATOR 4 >=, - OPERATOR 5 >, - FUNCTION 1 btint2cmp(int2,int2), - FUNCTION 2 gin_extract_value_int2(int2, internal), - FUNCTION 3 gin_extract_query_int2(int2, internal, int2, internal, internal), - FUNCTION 4 gin_btree_consistent(internal, int2, anyelement, int4, internal, internal), - FUNCTION 5 gin_compare_prefix_int2(int2,int2,int2, internal), -STORAGE int2; - -CREATE OR REPLACE FUNCTION gin_extract_value_int4(int4, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION gin_compare_prefix_int4(int4, int4, int2, internal) -RETURNS int4 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION gin_extract_query_int4(int4, internal, int2, internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OPERATOR CLASS int4_ops -DEFAULT FOR TYPE int4 USING gin -AS - OPERATOR 1 <, - OPERATOR 2 <=, - OPERATOR 3 =, - OPERATOR 4 >=, - OPERATOR 5 >, - FUNCTION 1 btint4cmp(int4,int4), - FUNCTION 2 gin_extract_value_int4(int4, internal), - FUNCTION 3 gin_extract_query_int4(int4, internal, int2, internal, internal), - FUNCTION 4 gin_btree_consistent(internal, int2, anyelement, int4, internal, internal), - FUNCTION 5 gin_compare_prefix_int4(int4,int4,int2, internal), -STORAGE int4; - -CREATE OR REPLACE FUNCTION gin_extract_value_int8(int8, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION gin_compare_prefix_int8(int8, int8, int2, internal) -RETURNS int4 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION gin_extract_query_int8(int8, internal, int2, internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OPERATOR CLASS int8_ops -DEFAULT FOR TYPE int8 USING gin -AS - OPERATOR 1 <, - OPERATOR 2 <=, - OPERATOR 3 =, - OPERATOR 4 >=, - OPERATOR 5 >, - FUNCTION 1 btint8cmp(int8,int8), - FUNCTION 2 gin_extract_value_int8(int8, internal), - FUNCTION 3 gin_extract_query_int8(int8, internal, int2, internal, internal), - FUNCTION 4 gin_btree_consistent(internal, int2, anyelement, int4, internal, internal), - FUNCTION 5 gin_compare_prefix_int8(int8,int8,int2, internal), -STORAGE int8; - -CREATE OR REPLACE FUNCTION gin_extract_value_float4(float4, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION gin_compare_prefix_float4(float4, float4, int2, internal) -RETURNS int4 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION gin_extract_query_float4(float4, internal, int2, internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OPERATOR CLASS float4_ops -DEFAULT FOR TYPE float4 USING gin -AS - OPERATOR 1 <, - OPERATOR 2 <=, - OPERATOR 3 =, - OPERATOR 4 >=, - OPERATOR 5 >, - FUNCTION 1 btfloat4cmp(float4,float4), - FUNCTION 2 gin_extract_value_float4(float4, internal), - FUNCTION 3 gin_extract_query_float4(float4, internal, int2, internal, internal), - FUNCTION 4 gin_btree_consistent(internal, int2, anyelement, int4, internal, internal), - FUNCTION 5 gin_compare_prefix_float4(float4,float4,int2, internal), -STORAGE float4; - -CREATE OR REPLACE FUNCTION gin_extract_value_float8(float8, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION gin_compare_prefix_float8(float8, float8, int2, internal) -RETURNS int4 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION gin_extract_query_float8(float8, internal, int2, internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OPERATOR CLASS float8_ops -DEFAULT FOR TYPE float8 USING gin -AS - OPERATOR 1 <, - OPERATOR 2 <=, - OPERATOR 3 =, - OPERATOR 4 >=, - OPERATOR 5 >, - FUNCTION 1 btfloat8cmp(float8,float8), - FUNCTION 2 gin_extract_value_float8(float8, internal), - FUNCTION 3 gin_extract_query_float8(float8, internal, int2, internal, internal), - FUNCTION 4 gin_btree_consistent(internal, int2, anyelement, int4, internal, internal), - FUNCTION 5 gin_compare_prefix_float8(float8,float8,int2, internal), -STORAGE float8; - -CREATE OR REPLACE FUNCTION gin_extract_value_money(money, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION gin_compare_prefix_money(money, money, int2, internal) -RETURNS int4 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION gin_extract_query_money(money, internal, int2, internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OPERATOR CLASS money_ops -DEFAULT FOR TYPE money USING gin -AS - OPERATOR 1 <, - OPERATOR 2 <=, - OPERATOR 3 =, - OPERATOR 4 >=, - OPERATOR 5 >, - FUNCTION 1 cash_cmp(money,money), - FUNCTION 2 gin_extract_value_money(money, internal), - FUNCTION 3 gin_extract_query_money(money, internal, int2, internal, internal), - FUNCTION 4 gin_btree_consistent(internal, int2, anyelement, int4, internal, internal), - FUNCTION 5 gin_compare_prefix_money(money,money,int2, internal), -STORAGE money; - -CREATE OR REPLACE FUNCTION gin_extract_value_oid(oid, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION gin_compare_prefix_oid(oid, oid, int2, internal) -RETURNS int4 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION gin_extract_query_oid(oid, internal, int2, internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OPERATOR CLASS oid_ops -DEFAULT FOR TYPE oid USING gin -AS - OPERATOR 1 <, - OPERATOR 2 <=, - OPERATOR 3 =, - OPERATOR 4 >=, - OPERATOR 5 >, - FUNCTION 1 btoidcmp(oid,oid), - FUNCTION 2 gin_extract_value_oid(oid, internal), - FUNCTION 3 gin_extract_query_oid(oid, internal, int2, internal, internal), - FUNCTION 4 gin_btree_consistent(internal, int2, anyelement, int4, internal, internal), - FUNCTION 5 gin_compare_prefix_oid(oid,oid,int2, internal), -STORAGE oid; - -CREATE OR REPLACE FUNCTION gin_extract_value_timestamp(timestamp, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION gin_compare_prefix_timestamp(timestamp, timestamp, int2, internal) -RETURNS int4 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION gin_extract_query_timestamp(timestamp, internal, int2, internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OPERATOR CLASS timestamp_ops -DEFAULT FOR TYPE timestamp USING gin -AS - OPERATOR 1 <, - OPERATOR 2 <=, - OPERATOR 3 =, - OPERATOR 4 >=, - OPERATOR 5 >, - FUNCTION 1 timestamp_cmp(timestamp,timestamp), - FUNCTION 2 gin_extract_value_timestamp(timestamp, internal), - FUNCTION 3 gin_extract_query_timestamp(timestamp, internal, int2, internal, internal), - FUNCTION 4 gin_btree_consistent(internal, int2, anyelement, int4, internal, internal), - FUNCTION 5 gin_compare_prefix_timestamp(timestamp,timestamp,int2, internal), -STORAGE timestamp; - -CREATE OR REPLACE FUNCTION gin_extract_value_timestamptz(timestamptz, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION gin_compare_prefix_timestamptz(timestamptz, timestamptz, int2, internal) -RETURNS int4 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION gin_extract_query_timestamptz(timestamptz, internal, int2, internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OPERATOR CLASS timestamptz_ops -DEFAULT FOR TYPE timestamptz USING gin -AS - OPERATOR 1 <, - OPERATOR 2 <=, - OPERATOR 3 =, - OPERATOR 4 >=, - OPERATOR 5 >, - FUNCTION 1 timestamptz_cmp(timestamptz,timestamptz), - FUNCTION 2 gin_extract_value_timestamptz(timestamptz, internal), - FUNCTION 3 gin_extract_query_timestamptz(timestamptz, internal, int2, internal, internal), - FUNCTION 4 gin_btree_consistent(internal, int2, anyelement, int4, internal, internal), - FUNCTION 5 gin_compare_prefix_timestamptz(timestamptz,timestamptz,int2, internal), -STORAGE timestamptz; - -CREATE OR REPLACE FUNCTION gin_extract_value_time(time, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION gin_compare_prefix_time(time, time, int2, internal) -RETURNS int4 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION gin_extract_query_time(time, internal, int2, internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OPERATOR CLASS time_ops -DEFAULT FOR TYPE time USING gin -AS - OPERATOR 1 <, - OPERATOR 2 <=, - OPERATOR 3 =, - OPERATOR 4 >=, - OPERATOR 5 >, - FUNCTION 1 time_cmp(time,time), - FUNCTION 2 gin_extract_value_time(time, internal), - FUNCTION 3 gin_extract_query_time(time, internal, int2, internal, internal), - FUNCTION 4 gin_btree_consistent(internal, int2, anyelement, int4, internal, internal), - FUNCTION 5 gin_compare_prefix_time(time,time,int2, internal), -STORAGE time; - -CREATE OR REPLACE FUNCTION gin_extract_value_timetz(timetz, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION gin_compare_prefix_timetz(timetz, timetz, int2, internal) -RETURNS int4 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION gin_extract_query_timetz(timetz, internal, int2, internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OPERATOR CLASS timetz_ops -DEFAULT FOR TYPE timetz USING gin -AS - OPERATOR 1 <, - OPERATOR 2 <=, - OPERATOR 3 =, - OPERATOR 4 >=, - OPERATOR 5 >, - FUNCTION 1 timetz_cmp(timetz,timetz), - FUNCTION 2 gin_extract_value_timetz(timetz, internal), - FUNCTION 3 gin_extract_query_timetz(timetz, internal, int2, internal, internal), - FUNCTION 4 gin_btree_consistent(internal, int2, anyelement, int4, internal, internal), - FUNCTION 5 gin_compare_prefix_timetz(timetz,timetz,int2, internal), -STORAGE timetz; - -CREATE OR REPLACE FUNCTION gin_extract_value_date(date, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION gin_compare_prefix_date(date, date, int2, internal) -RETURNS int4 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION gin_extract_query_date(date, internal, int2, internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OPERATOR CLASS date_ops -DEFAULT FOR TYPE date USING gin -AS - OPERATOR 1 <, - OPERATOR 2 <=, - OPERATOR 3 =, - OPERATOR 4 >=, - OPERATOR 5 >, - FUNCTION 1 date_cmp(date,date), - FUNCTION 2 gin_extract_value_date(date, internal), - FUNCTION 3 gin_extract_query_date(date, internal, int2, internal, internal), - FUNCTION 4 gin_btree_consistent(internal, int2, anyelement, int4, internal, internal), - FUNCTION 5 gin_compare_prefix_date(date,date,int2, internal), -STORAGE date; - -CREATE OR REPLACE FUNCTION gin_extract_value_interval(interval, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION gin_compare_prefix_interval(interval, interval, int2, internal) -RETURNS int4 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION gin_extract_query_interval(interval, internal, int2, internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OPERATOR CLASS interval_ops -DEFAULT FOR TYPE interval USING gin -AS - OPERATOR 1 <, - OPERATOR 2 <=, - OPERATOR 3 =, - OPERATOR 4 >=, - OPERATOR 5 >, - FUNCTION 1 interval_cmp(interval,interval), - FUNCTION 2 gin_extract_value_interval(interval, internal), - FUNCTION 3 gin_extract_query_interval(interval, internal, int2, internal, internal), - FUNCTION 4 gin_btree_consistent(internal, int2, anyelement, int4, internal, internal), - FUNCTION 5 gin_compare_prefix_interval(interval,interval,int2, internal), -STORAGE interval; - -CREATE OR REPLACE FUNCTION gin_extract_value_macaddr(macaddr, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION gin_compare_prefix_macaddr(macaddr, macaddr, int2, internal) -RETURNS int4 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION gin_extract_query_macaddr(macaddr, internal, int2, internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OPERATOR CLASS macaddr_ops -DEFAULT FOR TYPE macaddr USING gin -AS - OPERATOR 1 <, - OPERATOR 2 <=, - OPERATOR 3 =, - OPERATOR 4 >=, - OPERATOR 5 >, - FUNCTION 1 macaddr_cmp(macaddr,macaddr), - FUNCTION 2 gin_extract_value_macaddr(macaddr, internal), - FUNCTION 3 gin_extract_query_macaddr(macaddr, internal, int2, internal, internal), - FUNCTION 4 gin_btree_consistent(internal, int2, anyelement, int4, internal, internal), - FUNCTION 5 gin_compare_prefix_macaddr(macaddr,macaddr,int2, internal), -STORAGE macaddr; - -CREATE OR REPLACE FUNCTION gin_extract_value_inet(inet, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION gin_compare_prefix_inet(inet, inet, int2, internal) -RETURNS int4 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION gin_extract_query_inet(inet, internal, int2, internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OPERATOR CLASS inet_ops -DEFAULT FOR TYPE inet USING gin -AS - OPERATOR 1 <, - OPERATOR 2 <=, - OPERATOR 3 =, - OPERATOR 4 >=, - OPERATOR 5 >, - FUNCTION 1 network_cmp(inet,inet), - FUNCTION 2 gin_extract_value_inet(inet, internal), - FUNCTION 3 gin_extract_query_inet(inet, internal, int2, internal, internal), - FUNCTION 4 gin_btree_consistent(internal, int2, anyelement, int4, internal, internal), - FUNCTION 5 gin_compare_prefix_inet(inet,inet,int2, internal), -STORAGE inet; - -CREATE OR REPLACE FUNCTION gin_extract_value_cidr(cidr, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION gin_compare_prefix_cidr(cidr, cidr, int2, internal) -RETURNS int4 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION gin_extract_query_cidr(cidr, internal, int2, internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OPERATOR CLASS cidr_ops -DEFAULT FOR TYPE cidr USING gin -AS - OPERATOR 1 <(inet,inet), - OPERATOR 2 <=(inet,inet), - OPERATOR 3 =(inet,inet), - OPERATOR 4 >=(inet,inet), - OPERATOR 5 >(inet,inet), - FUNCTION 1 network_cmp(inet,inet), - FUNCTION 2 gin_extract_value_cidr(cidr, internal), - FUNCTION 3 gin_extract_query_cidr(cidr, internal, int2, internal, internal), - FUNCTION 4 gin_btree_consistent(internal, int2, anyelement, int4, internal, internal), - FUNCTION 5 gin_compare_prefix_cidr(cidr,cidr,int2, internal), -STORAGE cidr; - -CREATE OR REPLACE FUNCTION gin_extract_value_text(text, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION gin_compare_prefix_text(text, text, int2, internal) -RETURNS int4 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION gin_extract_query_text(text, internal, int2, internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OPERATOR CLASS text_ops -DEFAULT FOR TYPE text USING gin -AS - OPERATOR 1 <, - OPERATOR 2 <=, - OPERATOR 3 =, - OPERATOR 4 >=, - OPERATOR 5 >, - FUNCTION 1 bttextcmp(text,text), - FUNCTION 2 gin_extract_value_text(text, internal), - FUNCTION 3 gin_extract_query_text(text, internal, int2, internal, internal), - FUNCTION 4 gin_btree_consistent(internal, int2, anyelement, int4, internal, internal), - FUNCTION 5 gin_compare_prefix_text(text,text,int2, internal), -STORAGE text; - -CREATE OPERATOR CLASS varchar_ops -DEFAULT FOR TYPE varchar USING gin -AS - OPERATOR 1 <(text,text), - OPERATOR 2 <=(text,text), - OPERATOR 3 =(text,text), - OPERATOR 4 >=(text,text), - OPERATOR 5 >(text,text), - FUNCTION 1 bttextcmp(text,text), - FUNCTION 2 gin_extract_value_text(text, internal), - FUNCTION 3 gin_extract_query_text(text, internal, int2, internal, internal), - FUNCTION 4 gin_btree_consistent(internal, int2, anyelement, int4, internal, internal), - FUNCTION 5 gin_compare_prefix_text(text,text,int2, internal), -STORAGE varchar; - -CREATE OR REPLACE FUNCTION gin_extract_value_char("char", internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION gin_compare_prefix_char("char", "char", int2, internal) -RETURNS int4 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION gin_extract_query_char("char", internal, int2, internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OPERATOR CLASS char_ops -DEFAULT FOR TYPE "char" USING gin -AS - OPERATOR 1 <, - OPERATOR 2 <=, - OPERATOR 3 =, - OPERATOR 4 >=, - OPERATOR 5 >, - FUNCTION 1 btcharcmp("char","char"), - FUNCTION 2 gin_extract_value_char("char", internal), - FUNCTION 3 gin_extract_query_char("char", internal, int2, internal, internal), - FUNCTION 4 gin_btree_consistent(internal, int2, anyelement, int4, internal, internal), - FUNCTION 5 gin_compare_prefix_char("char","char",int2, internal), -STORAGE "char"; - -CREATE OR REPLACE FUNCTION gin_extract_value_bytea(bytea, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION gin_compare_prefix_bytea(bytea, bytea, int2, internal) -RETURNS int4 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION gin_extract_query_bytea(bytea, internal, int2, internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OPERATOR CLASS bytea_ops -DEFAULT FOR TYPE bytea USING gin -AS - OPERATOR 1 <, - OPERATOR 2 <=, - OPERATOR 3 =, - OPERATOR 4 >=, - OPERATOR 5 >, - FUNCTION 1 byteacmp(bytea,bytea), - FUNCTION 2 gin_extract_value_bytea(bytea, internal), - FUNCTION 3 gin_extract_query_bytea(bytea, internal, int2, internal, internal), - FUNCTION 4 gin_btree_consistent(internal, int2, anyelement, int4, internal, internal), - FUNCTION 5 gin_compare_prefix_bytea(bytea,bytea,int2, internal), -STORAGE bytea; - -CREATE OR REPLACE FUNCTION gin_extract_value_bit(bit, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION gin_compare_prefix_bit(bit, bit, int2, internal) -RETURNS int4 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION gin_extract_query_bit(bit, internal, int2, internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OPERATOR CLASS bit_ops -DEFAULT FOR TYPE bit USING gin -AS - OPERATOR 1 <, - OPERATOR 2 <=, - OPERATOR 3 =, - OPERATOR 4 >=, - OPERATOR 5 >, - FUNCTION 1 bitcmp(bit,bit), - FUNCTION 2 gin_extract_value_bit(bit, internal), - FUNCTION 3 gin_extract_query_bit(bit, internal, int2, internal, internal), - FUNCTION 4 gin_btree_consistent(internal, int2, anyelement, int4, internal, internal), - FUNCTION 5 gin_compare_prefix_bit(bit,bit,int2, internal), -STORAGE bit; - -CREATE OR REPLACE FUNCTION gin_extract_value_varbit(varbit, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION gin_compare_prefix_varbit(varbit, varbit, int2, internal) -RETURNS int4 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION gin_extract_query_varbit(varbit, internal, int2, internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OPERATOR CLASS varbit_ops -DEFAULT FOR TYPE varbit USING gin -AS - OPERATOR 1 <, - OPERATOR 2 <=, - OPERATOR 3 =, - OPERATOR 4 >=, - OPERATOR 5 >, - FUNCTION 1 varbitcmp(varbit,varbit), - FUNCTION 2 gin_extract_value_varbit(varbit, internal), - FUNCTION 3 gin_extract_query_varbit(varbit, internal, int2, internal, internal), - FUNCTION 4 gin_btree_consistent(internal, int2, anyelement, int4, internal, internal), - FUNCTION 5 gin_compare_prefix_varbit(varbit,varbit,int2, internal), -STORAGE varbit; - -CREATE OR REPLACE FUNCTION gin_extract_value_numeric(numeric, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION gin_compare_prefix_numeric(numeric, numeric, int2, internal) -RETURNS int4 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION gin_extract_query_numeric(numeric, internal, int2, internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION gin_numeric_cmp(numeric, numeric) -RETURNS int4 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OPERATOR CLASS numeric_ops -DEFAULT FOR TYPE numeric USING gin -AS - OPERATOR 1 <, - OPERATOR 2 <=, - OPERATOR 3 =, - OPERATOR 4 >=, - OPERATOR 5 >, - FUNCTION 1 gin_numeric_cmp(numeric,numeric), - FUNCTION 2 gin_extract_value_numeric(numeric, internal), - FUNCTION 3 gin_extract_query_numeric(numeric, internal, int2, internal, internal), - FUNCTION 4 gin_btree_consistent(internal, int2, anyelement, int4, internal, internal), - FUNCTION 5 gin_compare_prefix_numeric(numeric,numeric,int2, internal), -STORAGE numeric; diff --git a/contrib/btree_gin/expected/install_btree_gin.out b/contrib/btree_gin/expected/install_btree_gin.out index 43f11fa263..0fae4c5bfe 100644 --- a/contrib/btree_gin/expected/install_btree_gin.out +++ b/contrib/btree_gin/expected/install_btree_gin.out @@ -1,3 +1 @@ -SET client_min_messages = warning; -\set ECHO none -RESET client_min_messages; +CREATE EXTENSION btree_gin; diff --git a/contrib/btree_gin/sql/install_btree_gin.sql b/contrib/btree_gin/sql/install_btree_gin.sql index f54c8b4a0f..0fae4c5bfe 100644 --- a/contrib/btree_gin/sql/install_btree_gin.sql +++ b/contrib/btree_gin/sql/install_btree_gin.sql @@ -1,5 +1 @@ -SET client_min_messages = warning; -\set ECHO none -\i btree_gin.sql -\set ECHO all -RESET client_min_messages; +CREATE EXTENSION btree_gin; diff --git a/contrib/btree_gin/uninstall_btree_gin.sql b/contrib/btree_gin/uninstall_btree_gin.sql deleted file mode 100644 index 30324dc709..0000000000 --- a/contrib/btree_gin/uninstall_btree_gin.sql +++ /dev/null @@ -1,98 +0,0 @@ -/* contrib/btree_gin/uninstall_btree_gin.sql */ - --- Adjust this setting to control where the objects get dropped. -SET search_path = public; - -DROP OPERATOR FAMILY int2_ops USING gin CASCADE; -DROP OPERATOR FAMILY int4_ops USING gin CASCADE; -DROP OPERATOR FAMILY int8_ops USING gin CASCADE; -DROP OPERATOR FAMILY float4_ops USING gin CASCADE; -DROP OPERATOR FAMILY float8_ops USING gin CASCADE; -DROP OPERATOR FAMILY money_ops USING gin CASCADE; -DROP OPERATOR FAMILY oid_ops USING gin CASCADE; -DROP OPERATOR FAMILY timestamp_ops USING gin CASCADE; -DROP OPERATOR FAMILY timestamptz_ops USING gin CASCADE; -DROP OPERATOR FAMILY time_ops USING gin CASCADE; -DROP OPERATOR FAMILY timetz_ops USING gin CASCADE; -DROP OPERATOR FAMILY date_ops USING gin CASCADE; -DROP OPERATOR FAMILY interval_ops USING gin CASCADE; -DROP OPERATOR FAMILY macaddr_ops USING gin CASCADE; -DROP OPERATOR FAMILY inet_ops USING gin CASCADE; -DROP OPERATOR FAMILY cidr_ops USING gin CASCADE; -DROP OPERATOR FAMILY text_ops USING gin CASCADE; -DROP OPERATOR FAMILY varchar_ops USING gin CASCADE; -DROP OPERATOR FAMILY char_ops USING gin CASCADE; -DROP OPERATOR FAMILY bytea_ops USING gin CASCADE; -DROP OPERATOR FAMILY bit_ops USING gin CASCADE; -DROP OPERATOR FAMILY varbit_ops USING gin CASCADE; -DROP OPERATOR FAMILY numeric_ops USING gin CASCADE; - -DROP FUNCTION gin_btree_consistent(internal, int2, anyelement, int4, internal, internal); - -DROP FUNCTION gin_extract_value_int2(int2, internal); -DROP FUNCTION gin_compare_prefix_int2(int2, int2, int2, internal); -DROP FUNCTION gin_extract_query_int2(int2, internal, int2, internal, internal); -DROP FUNCTION gin_extract_value_int4(int4, internal); -DROP FUNCTION gin_compare_prefix_int4(int4, int4, int2, internal); -DROP FUNCTION gin_extract_query_int4(int4, internal, int2, internal, internal); -DROP FUNCTION gin_extract_value_int8(int8, internal); -DROP FUNCTION gin_compare_prefix_int8(int8, int8, int2, internal); -DROP FUNCTION gin_extract_query_int8(int8, internal, int2, internal, internal); -DROP FUNCTION gin_extract_value_float4(float4, internal); -DROP FUNCTION gin_compare_prefix_float4(float4, float4, int2, internal); -DROP FUNCTION gin_extract_query_float4(float4, internal, int2, internal, internal); -DROP FUNCTION gin_extract_value_float8(float8, internal); -DROP FUNCTION gin_compare_prefix_float8(float8, float8, int2, internal); -DROP FUNCTION gin_extract_query_float8(float8, internal, int2, internal, internal); -DROP FUNCTION gin_extract_value_money(money, internal); -DROP FUNCTION gin_compare_prefix_money(money, money, int2, internal); -DROP FUNCTION gin_extract_query_money(money, internal, int2, internal, internal); -DROP FUNCTION gin_extract_value_oid(oid, internal); -DROP FUNCTION gin_compare_prefix_oid(oid, oid, int2, internal); -DROP FUNCTION gin_extract_query_oid(oid, internal, int2, internal, internal); -DROP FUNCTION gin_extract_value_timestamp(timestamp, internal); -DROP FUNCTION gin_compare_prefix_timestamp(timestamp, timestamp, int2, internal); -DROP FUNCTION gin_extract_query_timestamp(timestamp, internal, int2, internal, internal); -DROP FUNCTION gin_extract_value_timestamptz(timestamptz, internal); -DROP FUNCTION gin_compare_prefix_timestamptz(timestamptz, timestamptz, int2, internal); -DROP FUNCTION gin_extract_query_timestamptz(timestamptz, internal, int2, internal, internal); -DROP FUNCTION gin_extract_value_time(time, internal); -DROP FUNCTION gin_compare_prefix_time(time, time, int2, internal); -DROP FUNCTION gin_extract_query_time(time, internal, int2, internal, internal); -DROP FUNCTION gin_extract_value_timetz(timetz, internal); -DROP FUNCTION gin_compare_prefix_timetz(timetz, timetz, int2, internal); -DROP FUNCTION gin_extract_query_timetz(timetz, internal, int2, internal, internal); -DROP FUNCTION gin_extract_value_date(date, internal); -DROP FUNCTION gin_compare_prefix_date(date, date, int2, internal); -DROP FUNCTION gin_extract_query_date(date, internal, int2, internal, internal); -DROP FUNCTION gin_extract_value_interval(interval, internal); -DROP FUNCTION gin_compare_prefix_interval(interval, interval, int2, internal); -DROP FUNCTION gin_extract_query_interval(interval, internal, int2, internal, internal); -DROP FUNCTION gin_extract_value_macaddr(macaddr, internal); -DROP FUNCTION gin_compare_prefix_macaddr(macaddr, macaddr, int2, internal); -DROP FUNCTION gin_extract_query_macaddr(macaddr, internal, int2, internal, internal); -DROP FUNCTION gin_extract_value_inet(inet, internal); -DROP FUNCTION gin_compare_prefix_inet(inet, inet, int2, internal); -DROP FUNCTION gin_extract_query_inet(inet, internal, int2, internal, internal); -DROP FUNCTION gin_extract_value_cidr(cidr, internal); -DROP FUNCTION gin_compare_prefix_cidr(cidr, cidr, int2, internal); -DROP FUNCTION gin_extract_query_cidr(cidr, internal, int2, internal, internal); -DROP FUNCTION gin_extract_value_text(text, internal); -DROP FUNCTION gin_compare_prefix_text(text, text, int2, internal); -DROP FUNCTION gin_extract_query_text(text, internal, int2, internal, internal); -DROP FUNCTION gin_extract_value_char("char", internal); -DROP FUNCTION gin_compare_prefix_char("char", "char", int2, internal); -DROP FUNCTION gin_extract_query_char("char", internal, int2, internal, internal); -DROP FUNCTION gin_extract_value_bytea(bytea, internal); -DROP FUNCTION gin_compare_prefix_bytea(bytea, bytea, int2, internal); -DROP FUNCTION gin_extract_query_bytea(bytea, internal, int2, internal, internal); -DROP FUNCTION gin_extract_value_bit(bit, internal); -DROP FUNCTION gin_compare_prefix_bit(bit, bit, int2, internal); -DROP FUNCTION gin_extract_query_bit(bit, internal, int2, internal, internal); -DROP FUNCTION gin_extract_value_varbit(varbit, internal); -DROP FUNCTION gin_compare_prefix_varbit(varbit, varbit, int2, internal); -DROP FUNCTION gin_extract_query_varbit(varbit, internal, int2, internal, internal); -DROP FUNCTION gin_extract_value_numeric(numeric, internal); -DROP FUNCTION gin_compare_prefix_numeric(numeric, numeric, int2, internal); -DROP FUNCTION gin_extract_query_numeric(numeric, internal, int2, internal, internal); -DROP FUNCTION gin_numeric_cmp(numeric, numeric); diff --git a/contrib/btree_gist/.gitignore b/contrib/btree_gist/.gitignore index 46318eaa7b..19b6c5ba42 100644 --- a/contrib/btree_gist/.gitignore +++ b/contrib/btree_gist/.gitignore @@ -1,3 +1,2 @@ -/btree_gist.sql # Generated subdirectories /results/ diff --git a/contrib/btree_gist/Makefile b/contrib/btree_gist/Makefile index e152cd881d..4b931de08a 100644 --- a/contrib/btree_gist/Makefile +++ b/contrib/btree_gist/Makefile @@ -7,8 +7,8 @@ OBJS = btree_gist.o btree_utils_num.o btree_utils_var.o btree_int2.o btre btree_date.o btree_interval.o btree_macaddr.o btree_inet.o btree_text.o \ btree_bytea.o btree_bit.o btree_numeric.o -DATA_built = btree_gist.sql -DATA = uninstall_btree_gist.sql +EXTENSION = btree_gist +DATA = btree_gist--1.0.sql btree_gist--unpackaged--1.0.sql REGRESS = init int2 int4 int8 float4 float8 cash oid timestamp timestamptz time timetz \ date interval macaddr inet cidr text varchar char bytea bit varbit numeric not_equal diff --git a/contrib/btree_gist/btree_gist--1.0.sql b/contrib/btree_gist/btree_gist--1.0.sql new file mode 100644 index 0000000000..ab6c8c3936 --- /dev/null +++ b/contrib/btree_gist/btree_gist--1.0.sql @@ -0,0 +1,1209 @@ +/* contrib/btree_gist/btree_gist--1.0.sql */ + +CREATE OR REPLACE FUNCTION gbtreekey4_in(cstring) +RETURNS gbtreekey4 +AS 'MODULE_PATHNAME', 'gbtreekey_in' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbtreekey4_out(gbtreekey4) +RETURNS cstring +AS 'MODULE_PATHNAME', 'gbtreekey_out' +LANGUAGE C IMMUTABLE STRICT; + +CREATE TYPE gbtreekey4 ( + INTERNALLENGTH = 4, + INPUT = gbtreekey4_in, + OUTPUT = gbtreekey4_out +); + +CREATE OR REPLACE FUNCTION gbtreekey8_in(cstring) +RETURNS gbtreekey8 +AS 'MODULE_PATHNAME', 'gbtreekey_in' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbtreekey8_out(gbtreekey8) +RETURNS cstring +AS 'MODULE_PATHNAME', 'gbtreekey_out' +LANGUAGE C IMMUTABLE STRICT; + +CREATE TYPE gbtreekey8 ( + INTERNALLENGTH = 8, + INPUT = gbtreekey8_in, + OUTPUT = gbtreekey8_out +); + +CREATE OR REPLACE FUNCTION gbtreekey16_in(cstring) +RETURNS gbtreekey16 +AS 'MODULE_PATHNAME', 'gbtreekey_in' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbtreekey16_out(gbtreekey16) +RETURNS cstring +AS 'MODULE_PATHNAME', 'gbtreekey_out' +LANGUAGE C IMMUTABLE STRICT; + +CREATE TYPE gbtreekey16 ( + INTERNALLENGTH = 16, + INPUT = gbtreekey16_in, + OUTPUT = gbtreekey16_out +); + +CREATE OR REPLACE FUNCTION gbtreekey32_in(cstring) +RETURNS gbtreekey32 +AS 'MODULE_PATHNAME', 'gbtreekey_in' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbtreekey32_out(gbtreekey32) +RETURNS cstring +AS 'MODULE_PATHNAME', 'gbtreekey_out' +LANGUAGE C IMMUTABLE STRICT; + +CREATE TYPE gbtreekey32 ( + INTERNALLENGTH = 32, + INPUT = gbtreekey32_in, + OUTPUT = gbtreekey32_out +); + +CREATE OR REPLACE FUNCTION gbtreekey_var_in(cstring) +RETURNS gbtreekey_var +AS 'MODULE_PATHNAME', 'gbtreekey_in' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbtreekey_var_out(gbtreekey_var) +RETURNS cstring +AS 'MODULE_PATHNAME', 'gbtreekey_out' +LANGUAGE C IMMUTABLE STRICT; + +CREATE TYPE gbtreekey_var ( + INTERNALLENGTH = VARIABLE, + INPUT = gbtreekey_var_in, + OUTPUT = gbtreekey_var_out, + STORAGE = EXTENDED +); + + + +-- +-- +-- +-- oid ops +-- +-- +-- +-- define the GiST support methods +CREATE OR REPLACE FUNCTION gbt_oid_consistent(internal,oid,int2,oid,internal) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_oid_compress(internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_decompress(internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_var_decompress(internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_oid_penalty(internal,internal,internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_oid_picksplit(internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_oid_union(bytea, internal) +RETURNS gbtreekey8 +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_oid_same(internal, internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +-- Create the operator class +CREATE OPERATOR CLASS gist_oid_ops +DEFAULT FOR TYPE oid USING gist +AS + OPERATOR 1 < , + OPERATOR 2 <= , + OPERATOR 3 = , + OPERATOR 4 >= , + OPERATOR 5 > , + OPERATOR 6 <> , + FUNCTION 1 gbt_oid_consistent (internal, oid, int2, oid, internal), + FUNCTION 2 gbt_oid_union (bytea, internal), + FUNCTION 3 gbt_oid_compress (internal), + FUNCTION 4 gbt_decompress (internal), + FUNCTION 5 gbt_oid_penalty (internal, internal, internal), + FUNCTION 6 gbt_oid_picksplit (internal, internal), + FUNCTION 7 gbt_oid_same (internal, internal, internal), + STORAGE gbtreekey8; + + +-- +-- +-- +-- int2 ops +-- +-- +-- +-- define the GiST support methods +CREATE OR REPLACE FUNCTION gbt_int2_consistent(internal,int2,int2,oid,internal) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_int2_compress(internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_int2_penalty(internal,internal,internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_int2_picksplit(internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_int2_union(bytea, internal) +RETURNS gbtreekey4 +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_int2_same(internal, internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +-- Create the operator class +CREATE OPERATOR CLASS gist_int2_ops +DEFAULT FOR TYPE int2 USING gist +AS + OPERATOR 1 < , + OPERATOR 2 <= , + OPERATOR 3 = , + OPERATOR 4 >= , + OPERATOR 5 > , + OPERATOR 6 <> , + FUNCTION 1 gbt_int2_consistent (internal, int2, int2, oid, internal), + FUNCTION 2 gbt_int2_union (bytea, internal), + FUNCTION 3 gbt_int2_compress (internal), + FUNCTION 4 gbt_decompress (internal), + FUNCTION 5 gbt_int2_penalty (internal, internal, internal), + FUNCTION 6 gbt_int2_picksplit (internal, internal), + FUNCTION 7 gbt_int2_same (internal, internal, internal), + STORAGE gbtreekey4; + +-- +-- +-- +-- int4 ops +-- +-- +-- +-- define the GiST support methods +CREATE OR REPLACE FUNCTION gbt_int4_consistent(internal,int4,int2,oid,internal) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_int4_compress(internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_int4_penalty(internal,internal,internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_int4_picksplit(internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_int4_union(bytea, internal) +RETURNS gbtreekey8 +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_int4_same(internal, internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +-- Create the operator class +CREATE OPERATOR CLASS gist_int4_ops +DEFAULT FOR TYPE int4 USING gist +AS + OPERATOR 1 < , + OPERATOR 2 <= , + OPERATOR 3 = , + OPERATOR 4 >= , + OPERATOR 5 > , + OPERATOR 6 <> , + FUNCTION 1 gbt_int4_consistent (internal, int4, int2, oid, internal), + FUNCTION 2 gbt_int4_union (bytea, internal), + FUNCTION 3 gbt_int4_compress (internal), + FUNCTION 4 gbt_decompress (internal), + FUNCTION 5 gbt_int4_penalty (internal, internal, internal), + FUNCTION 6 gbt_int4_picksplit (internal, internal), + FUNCTION 7 gbt_int4_same (internal, internal, internal), + STORAGE gbtreekey8; + +-- +-- +-- +-- int8 ops +-- +-- +-- +-- define the GiST support methods +CREATE OR REPLACE FUNCTION gbt_int8_consistent(internal,int8,int2,oid,internal) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_int8_compress(internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_int8_penalty(internal,internal,internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_int8_picksplit(internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_int8_union(bytea, internal) +RETURNS gbtreekey16 +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_int8_same(internal, internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +-- Create the operator class +CREATE OPERATOR CLASS gist_int8_ops +DEFAULT FOR TYPE int8 USING gist +AS + OPERATOR 1 < , + OPERATOR 2 <= , + OPERATOR 3 = , + OPERATOR 4 >= , + OPERATOR 5 > , + OPERATOR 6 <> , + FUNCTION 1 gbt_int8_consistent (internal, int8, int2, oid, internal), + FUNCTION 2 gbt_int8_union (bytea, internal), + FUNCTION 3 gbt_int8_compress (internal), + FUNCTION 4 gbt_decompress (internal), + FUNCTION 5 gbt_int8_penalty (internal, internal, internal), + FUNCTION 6 gbt_int8_picksplit (internal, internal), + FUNCTION 7 gbt_int8_same (internal, internal, internal), + STORAGE gbtreekey16; + + +-- +-- +-- +-- float4 ops +-- +-- +-- +-- define the GiST support methods +CREATE OR REPLACE FUNCTION gbt_float4_consistent(internal,float4,int2,oid,internal) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_float4_compress(internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_float4_penalty(internal,internal,internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_float4_picksplit(internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_float4_union(bytea, internal) +RETURNS gbtreekey8 +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_float4_same(internal, internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +-- Create the operator class +CREATE OPERATOR CLASS gist_float4_ops +DEFAULT FOR TYPE float4 USING gist +AS + OPERATOR 1 < , + OPERATOR 2 <= , + OPERATOR 3 = , + OPERATOR 4 >= , + OPERATOR 5 > , + OPERATOR 6 <> , + FUNCTION 1 gbt_float4_consistent (internal, float4, int2, oid, internal), + FUNCTION 2 gbt_float4_union (bytea, internal), + FUNCTION 3 gbt_float4_compress (internal), + FUNCTION 4 gbt_decompress (internal), + FUNCTION 5 gbt_float4_penalty (internal, internal, internal), + FUNCTION 6 gbt_float4_picksplit (internal, internal), + FUNCTION 7 gbt_float4_same (internal, internal, internal), + STORAGE gbtreekey8; + + + + +-- +-- +-- +-- float8 ops +-- +-- +-- +-- define the GiST support methods +CREATE OR REPLACE FUNCTION gbt_float8_consistent(internal,float8,int2,oid,internal) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_float8_compress(internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_float8_penalty(internal,internal,internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_float8_picksplit(internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_float8_union(bytea, internal) +RETURNS gbtreekey16 +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_float8_same(internal, internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +-- Create the operator class +CREATE OPERATOR CLASS gist_float8_ops +DEFAULT FOR TYPE float8 USING gist +AS + OPERATOR 1 < , + OPERATOR 2 <= , + OPERATOR 3 = , + OPERATOR 4 >= , + OPERATOR 5 > , + OPERATOR 6 <> , + FUNCTION 1 gbt_float8_consistent (internal, float8, int2, oid, internal), + FUNCTION 2 gbt_float8_union (bytea, internal), + FUNCTION 3 gbt_float8_compress (internal), + FUNCTION 4 gbt_decompress (internal), + FUNCTION 5 gbt_float8_penalty (internal, internal, internal), + FUNCTION 6 gbt_float8_picksplit (internal, internal), + FUNCTION 7 gbt_float8_same (internal, internal, internal), + STORAGE gbtreekey16; + + +-- +-- +-- +-- timestamp ops +-- +-- +-- + +CREATE OR REPLACE FUNCTION gbt_ts_consistent(internal,timestamp,int2,oid,internal) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_tstz_consistent(internal,timestamptz,int2,oid,internal) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_ts_compress(internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_tstz_compress(internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_ts_penalty(internal,internal,internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_ts_picksplit(internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_ts_union(bytea, internal) +RETURNS gbtreekey16 +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_ts_same(internal, internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +-- Create the operator class +CREATE OPERATOR CLASS gist_timestamp_ops +DEFAULT FOR TYPE timestamp USING gist +AS + OPERATOR 1 < , + OPERATOR 2 <= , + OPERATOR 3 = , + OPERATOR 4 >= , + OPERATOR 5 > , + OPERATOR 6 <> , + FUNCTION 1 gbt_ts_consistent (internal, timestamp, int2, oid, internal), + FUNCTION 2 gbt_ts_union (bytea, internal), + FUNCTION 3 gbt_ts_compress (internal), + FUNCTION 4 gbt_decompress (internal), + FUNCTION 5 gbt_ts_penalty (internal, internal, internal), + FUNCTION 6 gbt_ts_picksplit (internal, internal), + FUNCTION 7 gbt_ts_same (internal, internal, internal), + STORAGE gbtreekey16; + + +-- Create the operator class +CREATE OPERATOR CLASS gist_timestamptz_ops +DEFAULT FOR TYPE timestamptz USING gist +AS + OPERATOR 1 < , + OPERATOR 2 <= , + OPERATOR 3 = , + OPERATOR 4 >= , + OPERATOR 5 > , + OPERATOR 6 <> , + FUNCTION 1 gbt_tstz_consistent (internal, timestamptz, int2, oid, internal), + FUNCTION 2 gbt_ts_union (bytea, internal), + FUNCTION 3 gbt_tstz_compress (internal), + FUNCTION 4 gbt_decompress (internal), + FUNCTION 5 gbt_ts_penalty (internal, internal, internal), + FUNCTION 6 gbt_ts_picksplit (internal, internal), + FUNCTION 7 gbt_ts_same (internal, internal, internal), + STORAGE gbtreekey16; + + +-- +-- +-- +-- time ops +-- +-- +-- + +CREATE OR REPLACE FUNCTION gbt_time_consistent(internal,time,int2,oid,internal) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_timetz_consistent(internal,timetz,int2,oid,internal) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_time_compress(internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_timetz_compress(internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_time_penalty(internal,internal,internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_time_picksplit(internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_time_union(bytea, internal) +RETURNS gbtreekey16 +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_time_same(internal, internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +-- Create the operator class +CREATE OPERATOR CLASS gist_time_ops +DEFAULT FOR TYPE time USING gist +AS + OPERATOR 1 < , + OPERATOR 2 <= , + OPERATOR 3 = , + OPERATOR 4 >= , + OPERATOR 5 > , + OPERATOR 6 <> , + FUNCTION 1 gbt_time_consistent (internal, time, int2, oid, internal), + FUNCTION 2 gbt_time_union (bytea, internal), + FUNCTION 3 gbt_time_compress (internal), + FUNCTION 4 gbt_decompress (internal), + FUNCTION 5 gbt_time_penalty (internal, internal, internal), + FUNCTION 6 gbt_time_picksplit (internal, internal), + FUNCTION 7 gbt_time_same (internal, internal, internal), + STORAGE gbtreekey16; + +CREATE OPERATOR CLASS gist_timetz_ops +DEFAULT FOR TYPE timetz USING gist +AS + OPERATOR 1 < , + OPERATOR 2 <= , + OPERATOR 3 = , + OPERATOR 4 >= , + OPERATOR 5 > , + OPERATOR 6 <> , + FUNCTION 1 gbt_timetz_consistent (internal, timetz, int2, oid, internal), + FUNCTION 2 gbt_time_union (bytea, internal), + FUNCTION 3 gbt_timetz_compress (internal), + FUNCTION 4 gbt_decompress (internal), + FUNCTION 5 gbt_time_penalty (internal, internal, internal), + FUNCTION 6 gbt_time_picksplit (internal, internal), + FUNCTION 7 gbt_time_same (internal, internal, internal), + STORAGE gbtreekey16; + + +-- +-- +-- +-- date ops +-- +-- +-- + +CREATE OR REPLACE FUNCTION gbt_date_consistent(internal,date,int2,oid,internal) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_date_compress(internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_date_penalty(internal,internal,internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_date_picksplit(internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_date_union(bytea, internal) +RETURNS gbtreekey8 +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_date_same(internal, internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +-- Create the operator class +CREATE OPERATOR CLASS gist_date_ops +DEFAULT FOR TYPE date USING gist +AS + OPERATOR 1 < , + OPERATOR 2 <= , + OPERATOR 3 = , + OPERATOR 4 >= , + OPERATOR 5 > , + OPERATOR 6 <> , + FUNCTION 1 gbt_date_consistent (internal, date, int2, oid, internal), + FUNCTION 2 gbt_date_union (bytea, internal), + FUNCTION 3 gbt_date_compress (internal), + FUNCTION 4 gbt_decompress (internal), + FUNCTION 5 gbt_date_penalty (internal, internal, internal), + FUNCTION 6 gbt_date_picksplit (internal, internal), + FUNCTION 7 gbt_date_same (internal, internal, internal), + STORAGE gbtreekey8; + + +-- +-- +-- +-- interval ops +-- +-- +-- + +CREATE OR REPLACE FUNCTION gbt_intv_consistent(internal,interval,int2,oid,internal) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_intv_compress(internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_intv_decompress(internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_intv_penalty(internal,internal,internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_intv_picksplit(internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_intv_union(bytea, internal) +RETURNS gbtreekey32 +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_intv_same(internal, internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +-- Create the operator class +CREATE OPERATOR CLASS gist_interval_ops +DEFAULT FOR TYPE interval USING gist +AS + OPERATOR 1 < , + OPERATOR 2 <= , + OPERATOR 3 = , + OPERATOR 4 >= , + OPERATOR 5 > , + OPERATOR 6 <> , + FUNCTION 1 gbt_intv_consistent (internal, interval, int2, oid, internal), + FUNCTION 2 gbt_intv_union (bytea, internal), + FUNCTION 3 gbt_intv_compress (internal), + FUNCTION 4 gbt_intv_decompress (internal), + FUNCTION 5 gbt_intv_penalty (internal, internal, internal), + FUNCTION 6 gbt_intv_picksplit (internal, internal), + FUNCTION 7 gbt_intv_same (internal, internal, internal), + STORAGE gbtreekey32; + +-- +-- +-- +-- cash ops +-- +-- +-- +-- define the GiST support methods +CREATE OR REPLACE FUNCTION gbt_cash_consistent(internal,money,int2,oid,internal) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_cash_compress(internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_cash_penalty(internal,internal,internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_cash_picksplit(internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_cash_union(bytea, internal) +RETURNS gbtreekey8 +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_cash_same(internal, internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +-- Create the operator class +CREATE OPERATOR CLASS gist_cash_ops +DEFAULT FOR TYPE money USING gist +AS + OPERATOR 1 < , + OPERATOR 2 <= , + OPERATOR 3 = , + OPERATOR 4 >= , + OPERATOR 5 > , + OPERATOR 6 <> , + FUNCTION 1 gbt_cash_consistent (internal, money, int2, oid, internal), + FUNCTION 2 gbt_cash_union (bytea, internal), + FUNCTION 3 gbt_cash_compress (internal), + FUNCTION 4 gbt_decompress (internal), + FUNCTION 5 gbt_cash_penalty (internal, internal, internal), + FUNCTION 6 gbt_cash_picksplit (internal, internal), + FUNCTION 7 gbt_cash_same (internal, internal, internal), + STORAGE gbtreekey16; + +-- +-- +-- +-- macaddr ops +-- +-- +-- +-- define the GiST support methods +CREATE OR REPLACE FUNCTION gbt_macad_consistent(internal,macaddr,int2,oid,internal) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_macad_compress(internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_macad_penalty(internal,internal,internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_macad_picksplit(internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_macad_union(bytea, internal) +RETURNS gbtreekey16 +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_macad_same(internal, internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +-- Create the operator class +CREATE OPERATOR CLASS gist_macaddr_ops +DEFAULT FOR TYPE macaddr USING gist +AS + OPERATOR 1 < , + OPERATOR 2 <= , + OPERATOR 3 = , + OPERATOR 4 >= , + OPERATOR 5 > , + OPERATOR 6 <> , + FUNCTION 1 gbt_macad_consistent (internal, macaddr, int2, oid, internal), + FUNCTION 2 gbt_macad_union (bytea, internal), + FUNCTION 3 gbt_macad_compress (internal), + FUNCTION 4 gbt_decompress (internal), + FUNCTION 5 gbt_macad_penalty (internal, internal, internal), + FUNCTION 6 gbt_macad_picksplit (internal, internal), + FUNCTION 7 gbt_macad_same (internal, internal, internal), + STORAGE gbtreekey16; + + + +-- +-- +-- +-- text/ bpchar ops +-- +-- +-- +-- define the GiST support methods +CREATE OR REPLACE FUNCTION gbt_text_consistent(internal,text,int2,oid,internal) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_bpchar_consistent(internal,bpchar,int2,oid,internal) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_text_compress(internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_bpchar_compress(internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_text_penalty(internal,internal,internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_text_picksplit(internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_text_union(bytea, internal) +RETURNS gbtreekey_var +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_text_same(internal, internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +-- Create the operator class +CREATE OPERATOR CLASS gist_text_ops +DEFAULT FOR TYPE text USING gist +AS + OPERATOR 1 < , + OPERATOR 2 <= , + OPERATOR 3 = , + OPERATOR 4 >= , + OPERATOR 5 > , + OPERATOR 6 <> , + FUNCTION 1 gbt_text_consistent (internal, text, int2, oid, internal), + FUNCTION 2 gbt_text_union (bytea, internal), + FUNCTION 3 gbt_text_compress (internal), + FUNCTION 4 gbt_var_decompress (internal), + FUNCTION 5 gbt_text_penalty (internal, internal, internal), + FUNCTION 6 gbt_text_picksplit (internal, internal), + FUNCTION 7 gbt_text_same (internal, internal, internal), + STORAGE gbtreekey_var; + + +---- Create the operator class +CREATE OPERATOR CLASS gist_bpchar_ops +DEFAULT FOR TYPE bpchar USING gist +AS + OPERATOR 1 < , + OPERATOR 2 <= , + OPERATOR 3 = , + OPERATOR 4 >= , + OPERATOR 5 > , + OPERATOR 6 <> , + FUNCTION 1 gbt_bpchar_consistent (internal, bpchar , int2, oid, internal), + FUNCTION 2 gbt_text_union (bytea, internal), + FUNCTION 3 gbt_bpchar_compress (internal), + FUNCTION 4 gbt_var_decompress (internal), + FUNCTION 5 gbt_text_penalty (internal, internal, internal), + FUNCTION 6 gbt_text_picksplit (internal, internal), + FUNCTION 7 gbt_text_same (internal, internal, internal), + STORAGE gbtreekey_var; + + + +-- +-- +-- bytea ops +-- +-- +-- +-- define the GiST support methods +CREATE OR REPLACE FUNCTION gbt_bytea_consistent(internal,bytea,int2,oid,internal) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_bytea_compress(internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_bytea_penalty(internal,internal,internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_bytea_picksplit(internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_bytea_union(bytea, internal) +RETURNS gbtreekey_var +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_bytea_same(internal, internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +-- Create the operator class +CREATE OPERATOR CLASS gist_bytea_ops +DEFAULT FOR TYPE bytea USING gist +AS + OPERATOR 1 < , + OPERATOR 2 <= , + OPERATOR 3 = , + OPERATOR 4 >= , + OPERATOR 5 > , + OPERATOR 6 <> , + FUNCTION 1 gbt_bytea_consistent (internal, bytea, int2, oid, internal), + FUNCTION 2 gbt_bytea_union (bytea, internal), + FUNCTION 3 gbt_bytea_compress (internal), + FUNCTION 4 gbt_var_decompress (internal), + FUNCTION 5 gbt_bytea_penalty (internal, internal, internal), + FUNCTION 6 gbt_bytea_picksplit (internal, internal), + FUNCTION 7 gbt_bytea_same (internal, internal, internal), + STORAGE gbtreekey_var; + + +-- +-- +-- +-- numeric ops +-- +-- +-- +-- define the GiST support methods +CREATE OR REPLACE FUNCTION gbt_numeric_consistent(internal,numeric,int2,oid,internal) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_numeric_compress(internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_numeric_penalty(internal,internal,internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_numeric_picksplit(internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_numeric_union(bytea, internal) +RETURNS gbtreekey_var +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_numeric_same(internal, internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +-- Create the operator class +CREATE OPERATOR CLASS gist_numeric_ops +DEFAULT FOR TYPE numeric USING gist +AS + OPERATOR 1 < , + OPERATOR 2 <= , + OPERATOR 3 = , + OPERATOR 4 >= , + OPERATOR 5 > , + OPERATOR 6 <> , + FUNCTION 1 gbt_numeric_consistent (internal, numeric, int2, oid, internal), + FUNCTION 2 gbt_numeric_union (bytea, internal), + FUNCTION 3 gbt_numeric_compress (internal), + FUNCTION 4 gbt_var_decompress (internal), + FUNCTION 5 gbt_numeric_penalty (internal, internal, internal), + FUNCTION 6 gbt_numeric_picksplit (internal, internal), + FUNCTION 7 gbt_numeric_same (internal, internal, internal), + STORAGE gbtreekey_var; + +-- +-- +-- bit ops +-- +-- +-- +-- define the GiST support methods +CREATE OR REPLACE FUNCTION gbt_bit_consistent(internal,bit,int2,oid,internal) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_bit_compress(internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_bit_penalty(internal,internal,internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_bit_picksplit(internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_bit_union(bytea, internal) +RETURNS gbtreekey_var +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_bit_same(internal, internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +-- Create the operator class +CREATE OPERATOR CLASS gist_bit_ops +DEFAULT FOR TYPE bit USING gist +AS + OPERATOR 1 < , + OPERATOR 2 <= , + OPERATOR 3 = , + OPERATOR 4 >= , + OPERATOR 5 > , + OPERATOR 6 <> , + FUNCTION 1 gbt_bit_consistent (internal, bit, int2, oid, internal), + FUNCTION 2 gbt_bit_union (bytea, internal), + FUNCTION 3 gbt_bit_compress (internal), + FUNCTION 4 gbt_var_decompress (internal), + FUNCTION 5 gbt_bit_penalty (internal, internal, internal), + FUNCTION 6 gbt_bit_picksplit (internal, internal), + FUNCTION 7 gbt_bit_same (internal, internal, internal), + STORAGE gbtreekey_var; + + +-- Create the operator class +CREATE OPERATOR CLASS gist_vbit_ops +DEFAULT FOR TYPE varbit USING gist +AS + OPERATOR 1 < , + OPERATOR 2 <= , + OPERATOR 3 = , + OPERATOR 4 >= , + OPERATOR 5 > , + OPERATOR 6 <> , + FUNCTION 1 gbt_bit_consistent (internal, bit, int2, oid, internal), + FUNCTION 2 gbt_bit_union (bytea, internal), + FUNCTION 3 gbt_bit_compress (internal), + FUNCTION 4 gbt_var_decompress (internal), + FUNCTION 5 gbt_bit_penalty (internal, internal, internal), + FUNCTION 6 gbt_bit_picksplit (internal, internal), + FUNCTION 7 gbt_bit_same (internal, internal, internal), + STORAGE gbtreekey_var; + + + +-- +-- +-- +-- inet/cidr ops +-- +-- +-- +-- define the GiST support methods +CREATE OR REPLACE FUNCTION gbt_inet_consistent(internal,inet,int2,oid,internal) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_inet_compress(internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_inet_penalty(internal,internal,internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_inet_picksplit(internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_inet_union(bytea, internal) +RETURNS gbtreekey16 +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gbt_inet_same(internal, internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +-- Create the operator class +CREATE OPERATOR CLASS gist_inet_ops +DEFAULT FOR TYPE inet USING gist +AS + OPERATOR 1 < , + OPERATOR 2 <= , + OPERATOR 3 = , + OPERATOR 4 >= , + OPERATOR 5 > , + OPERATOR 6 <> , + FUNCTION 1 gbt_inet_consistent (internal, inet, int2, oid, internal), + FUNCTION 2 gbt_inet_union (bytea, internal), + FUNCTION 3 gbt_inet_compress (internal), + FUNCTION 4 gbt_decompress (internal), + FUNCTION 5 gbt_inet_penalty (internal, internal, internal), + FUNCTION 6 gbt_inet_picksplit (internal, internal), + FUNCTION 7 gbt_inet_same (internal, internal, internal), + STORAGE gbtreekey16; + +-- Create the operator class +CREATE OPERATOR CLASS gist_cidr_ops +DEFAULT FOR TYPE cidr USING gist +AS + OPERATOR 1 < (inet, inet) , + OPERATOR 2 <= (inet, inet) , + OPERATOR 3 = (inet, inet) , + OPERATOR 4 >= (inet, inet) , + OPERATOR 5 > (inet, inet) , + OPERATOR 6 <> (inet, inet) , + FUNCTION 1 gbt_inet_consistent (internal, inet, int2, oid, internal), + FUNCTION 2 gbt_inet_union (bytea, internal), + FUNCTION 3 gbt_inet_compress (internal), + FUNCTION 4 gbt_decompress (internal), + FUNCTION 5 gbt_inet_penalty (internal, internal, internal), + FUNCTION 6 gbt_inet_picksplit (internal, internal), + FUNCTION 7 gbt_inet_same (internal, internal, internal), + STORAGE gbtreekey16; diff --git a/contrib/btree_gist/btree_gist--unpackaged--1.0.sql b/contrib/btree_gist/btree_gist--unpackaged--1.0.sql new file mode 100644 index 0000000000..18c1464991 --- /dev/null +++ b/contrib/btree_gist/btree_gist--unpackaged--1.0.sql @@ -0,0 +1,172 @@ +/* contrib/btree_gist/btree_gist--unpackaged--1.0.sql */ + +ALTER EXTENSION btree_gist ADD type gbtreekey4; +ALTER EXTENSION btree_gist ADD function gbtreekey4_in(cstring); +ALTER EXTENSION btree_gist ADD function gbtreekey4_out(gbtreekey4); +ALTER EXTENSION btree_gist ADD type gbtreekey8; +ALTER EXTENSION btree_gist ADD function gbtreekey8_in(cstring); +ALTER EXTENSION btree_gist ADD function gbtreekey8_out(gbtreekey8); +ALTER EXTENSION btree_gist ADD type gbtreekey16; +ALTER EXTENSION btree_gist ADD function gbtreekey16_in(cstring); +ALTER EXTENSION btree_gist ADD function gbtreekey16_out(gbtreekey16); +ALTER EXTENSION btree_gist ADD type gbtreekey32; +ALTER EXTENSION btree_gist ADD function gbtreekey32_in(cstring); +ALTER EXTENSION btree_gist ADD function gbtreekey32_out(gbtreekey32); +ALTER EXTENSION btree_gist ADD type gbtreekey_var; +ALTER EXTENSION btree_gist ADD function gbtreekey_var_in(cstring); +ALTER EXTENSION btree_gist ADD function gbtreekey_var_out(gbtreekey_var); +ALTER EXTENSION btree_gist ADD function gbt_oid_consistent(internal,oid,smallint,oid,internal); +ALTER EXTENSION btree_gist ADD function gbt_oid_compress(internal); +ALTER EXTENSION btree_gist ADD function gbt_decompress(internal); +ALTER EXTENSION btree_gist ADD function gbt_var_decompress(internal); +ALTER EXTENSION btree_gist ADD function gbt_oid_penalty(internal,internal,internal); +ALTER EXTENSION btree_gist ADD function gbt_oid_picksplit(internal,internal); +ALTER EXTENSION btree_gist ADD function gbt_oid_union(bytea,internal); +ALTER EXTENSION btree_gist ADD function gbt_oid_same(internal,internal,internal); +ALTER EXTENSION btree_gist ADD operator family gist_oid_ops using gist; +ALTER EXTENSION btree_gist ADD operator class gist_oid_ops using gist; +ALTER EXTENSION btree_gist ADD function gbt_int2_consistent(internal,smallint,smallint,oid,internal); +ALTER EXTENSION btree_gist ADD function gbt_int2_compress(internal); +ALTER EXTENSION btree_gist ADD function gbt_int2_penalty(internal,internal,internal); +ALTER EXTENSION btree_gist ADD function gbt_int2_picksplit(internal,internal); +ALTER EXTENSION btree_gist ADD function gbt_int2_union(bytea,internal); +ALTER EXTENSION btree_gist ADD function gbt_int2_same(internal,internal,internal); +ALTER EXTENSION btree_gist ADD operator family gist_int2_ops using gist; +ALTER EXTENSION btree_gist ADD operator class gist_int2_ops using gist; +ALTER EXTENSION btree_gist ADD function gbt_int4_consistent(internal,integer,smallint,oid,internal); +ALTER EXTENSION btree_gist ADD function gbt_int4_compress(internal); +ALTER EXTENSION btree_gist ADD function gbt_int4_penalty(internal,internal,internal); +ALTER EXTENSION btree_gist ADD function gbt_int4_picksplit(internal,internal); +ALTER EXTENSION btree_gist ADD function gbt_int4_union(bytea,internal); +ALTER EXTENSION btree_gist ADD function gbt_int4_same(internal,internal,internal); +ALTER EXTENSION btree_gist ADD operator family gist_int4_ops using gist; +ALTER EXTENSION btree_gist ADD operator class gist_int4_ops using gist; +ALTER EXTENSION btree_gist ADD function gbt_int8_consistent(internal,bigint,smallint,oid,internal); +ALTER EXTENSION btree_gist ADD function gbt_int8_compress(internal); +ALTER EXTENSION btree_gist ADD function gbt_int8_penalty(internal,internal,internal); +ALTER EXTENSION btree_gist ADD function gbt_int8_picksplit(internal,internal); +ALTER EXTENSION btree_gist ADD function gbt_int8_union(bytea,internal); +ALTER EXTENSION btree_gist ADD function gbt_int8_same(internal,internal,internal); +ALTER EXTENSION btree_gist ADD operator family gist_int8_ops using gist; +ALTER EXTENSION btree_gist ADD operator class gist_int8_ops using gist; +ALTER EXTENSION btree_gist ADD function gbt_float4_consistent(internal,real,smallint,oid,internal); +ALTER EXTENSION btree_gist ADD function gbt_float4_compress(internal); +ALTER EXTENSION btree_gist ADD function gbt_float4_penalty(internal,internal,internal); +ALTER EXTENSION btree_gist ADD function gbt_float4_picksplit(internal,internal); +ALTER EXTENSION btree_gist ADD function gbt_float4_union(bytea,internal); +ALTER EXTENSION btree_gist ADD function gbt_float4_same(internal,internal,internal); +ALTER EXTENSION btree_gist ADD operator family gist_float4_ops using gist; +ALTER EXTENSION btree_gist ADD operator class gist_float4_ops using gist; +ALTER EXTENSION btree_gist ADD function gbt_float8_consistent(internal,double precision,smallint,oid,internal); +ALTER EXTENSION btree_gist ADD function gbt_float8_compress(internal); +ALTER EXTENSION btree_gist ADD function gbt_float8_penalty(internal,internal,internal); +ALTER EXTENSION btree_gist ADD function gbt_float8_picksplit(internal,internal); +ALTER EXTENSION btree_gist ADD function gbt_float8_union(bytea,internal); +ALTER EXTENSION btree_gist ADD function gbt_float8_same(internal,internal,internal); +ALTER EXTENSION btree_gist ADD operator family gist_float8_ops using gist; +ALTER EXTENSION btree_gist ADD operator class gist_float8_ops using gist; +ALTER EXTENSION btree_gist ADD function gbt_ts_consistent(internal,timestamp without time zone,smallint,oid,internal); +ALTER EXTENSION btree_gist ADD function gbt_tstz_consistent(internal,timestamp with time zone,smallint,oid,internal); +ALTER EXTENSION btree_gist ADD function gbt_ts_compress(internal); +ALTER EXTENSION btree_gist ADD function gbt_tstz_compress(internal); +ALTER EXTENSION btree_gist ADD function gbt_ts_penalty(internal,internal,internal); +ALTER EXTENSION btree_gist ADD function gbt_ts_picksplit(internal,internal); +ALTER EXTENSION btree_gist ADD function gbt_ts_union(bytea,internal); +ALTER EXTENSION btree_gist ADD function gbt_ts_same(internal,internal,internal); +ALTER EXTENSION btree_gist ADD operator family gist_timestamp_ops using gist; +ALTER EXTENSION btree_gist ADD operator class gist_timestamp_ops using gist; +ALTER EXTENSION btree_gist ADD operator family gist_timestamptz_ops using gist; +ALTER EXTENSION btree_gist ADD operator class gist_timestamptz_ops using gist; +ALTER EXTENSION btree_gist ADD function gbt_time_consistent(internal,time without time zone,smallint,oid,internal); +ALTER EXTENSION btree_gist ADD function gbt_timetz_consistent(internal,time with time zone,smallint,oid,internal); +ALTER EXTENSION btree_gist ADD function gbt_time_compress(internal); +ALTER EXTENSION btree_gist ADD function gbt_timetz_compress(internal); +ALTER EXTENSION btree_gist ADD function gbt_time_penalty(internal,internal,internal); +ALTER EXTENSION btree_gist ADD function gbt_time_picksplit(internal,internal); +ALTER EXTENSION btree_gist ADD function gbt_time_union(bytea,internal); +ALTER EXTENSION btree_gist ADD function gbt_time_same(internal,internal,internal); +ALTER EXTENSION btree_gist ADD operator family gist_time_ops using gist; +ALTER EXTENSION btree_gist ADD operator class gist_time_ops using gist; +ALTER EXTENSION btree_gist ADD operator family gist_timetz_ops using gist; +ALTER EXTENSION btree_gist ADD operator class gist_timetz_ops using gist; +ALTER EXTENSION btree_gist ADD function gbt_date_consistent(internal,date,smallint,oid,internal); +ALTER EXTENSION btree_gist ADD function gbt_date_compress(internal); +ALTER EXTENSION btree_gist ADD function gbt_date_penalty(internal,internal,internal); +ALTER EXTENSION btree_gist ADD function gbt_date_picksplit(internal,internal); +ALTER EXTENSION btree_gist ADD function gbt_date_union(bytea,internal); +ALTER EXTENSION btree_gist ADD function gbt_date_same(internal,internal,internal); +ALTER EXTENSION btree_gist ADD operator family gist_date_ops using gist; +ALTER EXTENSION btree_gist ADD operator class gist_date_ops using gist; +ALTER EXTENSION btree_gist ADD function gbt_intv_consistent(internal,interval,smallint,oid,internal); +ALTER EXTENSION btree_gist ADD function gbt_intv_compress(internal); +ALTER EXTENSION btree_gist ADD function gbt_intv_decompress(internal); +ALTER EXTENSION btree_gist ADD function gbt_intv_penalty(internal,internal,internal); +ALTER EXTENSION btree_gist ADD function gbt_intv_picksplit(internal,internal); +ALTER EXTENSION btree_gist ADD function gbt_intv_union(bytea,internal); +ALTER EXTENSION btree_gist ADD function gbt_intv_same(internal,internal,internal); +ALTER EXTENSION btree_gist ADD operator family gist_interval_ops using gist; +ALTER EXTENSION btree_gist ADD operator class gist_interval_ops using gist; +ALTER EXTENSION btree_gist ADD function gbt_cash_consistent(internal,money,smallint,oid,internal); +ALTER EXTENSION btree_gist ADD function gbt_cash_compress(internal); +ALTER EXTENSION btree_gist ADD function gbt_cash_penalty(internal,internal,internal); +ALTER EXTENSION btree_gist ADD function gbt_cash_picksplit(internal,internal); +ALTER EXTENSION btree_gist ADD function gbt_cash_union(bytea,internal); +ALTER EXTENSION btree_gist ADD function gbt_cash_same(internal,internal,internal); +ALTER EXTENSION btree_gist ADD operator family gist_cash_ops using gist; +ALTER EXTENSION btree_gist ADD operator class gist_cash_ops using gist; +ALTER EXTENSION btree_gist ADD function gbt_macad_consistent(internal,macaddr,smallint,oid,internal); +ALTER EXTENSION btree_gist ADD function gbt_macad_compress(internal); +ALTER EXTENSION btree_gist ADD function gbt_macad_penalty(internal,internal,internal); +ALTER EXTENSION btree_gist ADD function gbt_macad_picksplit(internal,internal); +ALTER EXTENSION btree_gist ADD function gbt_macad_union(bytea,internal); +ALTER EXTENSION btree_gist ADD function gbt_macad_same(internal,internal,internal); +ALTER EXTENSION btree_gist ADD operator family gist_macaddr_ops using gist; +ALTER EXTENSION btree_gist ADD operator class gist_macaddr_ops using gist; +ALTER EXTENSION btree_gist ADD function gbt_text_consistent(internal,text,smallint,oid,internal); +ALTER EXTENSION btree_gist ADD function gbt_bpchar_consistent(internal,character,smallint,oid,internal); +ALTER EXTENSION btree_gist ADD function gbt_text_compress(internal); +ALTER EXTENSION btree_gist ADD function gbt_bpchar_compress(internal); +ALTER EXTENSION btree_gist ADD function gbt_text_penalty(internal,internal,internal); +ALTER EXTENSION btree_gist ADD function gbt_text_picksplit(internal,internal); +ALTER EXTENSION btree_gist ADD function gbt_text_union(bytea,internal); +ALTER EXTENSION btree_gist ADD function gbt_text_same(internal,internal,internal); +ALTER EXTENSION btree_gist ADD operator family gist_text_ops using gist; +ALTER EXTENSION btree_gist ADD operator class gist_text_ops using gist; +ALTER EXTENSION btree_gist ADD operator family gist_bpchar_ops using gist; +ALTER EXTENSION btree_gist ADD operator class gist_bpchar_ops using gist; +ALTER EXTENSION btree_gist ADD function gbt_bytea_consistent(internal,bytea,smallint,oid,internal); +ALTER EXTENSION btree_gist ADD function gbt_bytea_compress(internal); +ALTER EXTENSION btree_gist ADD function gbt_bytea_penalty(internal,internal,internal); +ALTER EXTENSION btree_gist ADD function gbt_bytea_picksplit(internal,internal); +ALTER EXTENSION btree_gist ADD function gbt_bytea_union(bytea,internal); +ALTER EXTENSION btree_gist ADD function gbt_bytea_same(internal,internal,internal); +ALTER EXTENSION btree_gist ADD operator family gist_bytea_ops using gist; +ALTER EXTENSION btree_gist ADD operator class gist_bytea_ops using gist; +ALTER EXTENSION btree_gist ADD function gbt_numeric_consistent(internal,numeric,smallint,oid,internal); +ALTER EXTENSION btree_gist ADD function gbt_numeric_compress(internal); +ALTER EXTENSION btree_gist ADD function gbt_numeric_penalty(internal,internal,internal); +ALTER EXTENSION btree_gist ADD function gbt_numeric_picksplit(internal,internal); +ALTER EXTENSION btree_gist ADD function gbt_numeric_union(bytea,internal); +ALTER EXTENSION btree_gist ADD function gbt_numeric_same(internal,internal,internal); +ALTER EXTENSION btree_gist ADD operator family gist_numeric_ops using gist; +ALTER EXTENSION btree_gist ADD operator class gist_numeric_ops using gist; +ALTER EXTENSION btree_gist ADD function gbt_bit_consistent(internal,bit,smallint,oid,internal); +ALTER EXTENSION btree_gist ADD function gbt_bit_compress(internal); +ALTER EXTENSION btree_gist ADD function gbt_bit_penalty(internal,internal,internal); +ALTER EXTENSION btree_gist ADD function gbt_bit_picksplit(internal,internal); +ALTER EXTENSION btree_gist ADD function gbt_bit_union(bytea,internal); +ALTER EXTENSION btree_gist ADD function gbt_bit_same(internal,internal,internal); +ALTER EXTENSION btree_gist ADD operator family gist_bit_ops using gist; +ALTER EXTENSION btree_gist ADD operator class gist_bit_ops using gist; +ALTER EXTENSION btree_gist ADD operator family gist_vbit_ops using gist; +ALTER EXTENSION btree_gist ADD operator class gist_vbit_ops using gist; +ALTER EXTENSION btree_gist ADD function gbt_inet_consistent(internal,inet,smallint,oid,internal); +ALTER EXTENSION btree_gist ADD function gbt_inet_compress(internal); +ALTER EXTENSION btree_gist ADD function gbt_inet_penalty(internal,internal,internal); +ALTER EXTENSION btree_gist ADD function gbt_inet_picksplit(internal,internal); +ALTER EXTENSION btree_gist ADD function gbt_inet_union(bytea,internal); +ALTER EXTENSION btree_gist ADD function gbt_inet_same(internal,internal,internal); +ALTER EXTENSION btree_gist ADD operator family gist_inet_ops using gist; +ALTER EXTENSION btree_gist ADD operator class gist_inet_ops using gist; +ALTER EXTENSION btree_gist ADD operator family gist_cidr_ops using gist; +ALTER EXTENSION btree_gist ADD operator class gist_cidr_ops using gist; diff --git a/contrib/btree_gist/btree_gist.control b/contrib/btree_gist/btree_gist.control new file mode 100644 index 0000000000..10e2f949c1 --- /dev/null +++ b/contrib/btree_gist/btree_gist.control @@ -0,0 +1,5 @@ +# btree_gist extension +comment = 'support for indexing common datatypes in GiST' +default_version = '1.0' +module_pathname = '$libdir/btree_gist' +relocatable = true diff --git a/contrib/btree_gist/btree_gist.sql.in b/contrib/btree_gist/btree_gist.sql.in deleted file mode 100644 index 01cd30f2de..0000000000 --- a/contrib/btree_gist/btree_gist.sql.in +++ /dev/null @@ -1,1212 +0,0 @@ -/* contrib/btree_gist/btree_gist.sql.in */ - --- Adjust this setting to control where the objects get created. -SET search_path = public; - -CREATE OR REPLACE FUNCTION gbtreekey4_in(cstring) -RETURNS gbtreekey4 -AS 'MODULE_PATHNAME', 'gbtreekey_in' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbtreekey4_out(gbtreekey4) -RETURNS cstring -AS 'MODULE_PATHNAME', 'gbtreekey_out' -LANGUAGE C IMMUTABLE STRICT; - -CREATE TYPE gbtreekey4 ( - INTERNALLENGTH = 4, - INPUT = gbtreekey4_in, - OUTPUT = gbtreekey4_out -); - -CREATE OR REPLACE FUNCTION gbtreekey8_in(cstring) -RETURNS gbtreekey8 -AS 'MODULE_PATHNAME', 'gbtreekey_in' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbtreekey8_out(gbtreekey8) -RETURNS cstring -AS 'MODULE_PATHNAME', 'gbtreekey_out' -LANGUAGE C IMMUTABLE STRICT; - -CREATE TYPE gbtreekey8 ( - INTERNALLENGTH = 8, - INPUT = gbtreekey8_in, - OUTPUT = gbtreekey8_out -); - -CREATE OR REPLACE FUNCTION gbtreekey16_in(cstring) -RETURNS gbtreekey16 -AS 'MODULE_PATHNAME', 'gbtreekey_in' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbtreekey16_out(gbtreekey16) -RETURNS cstring -AS 'MODULE_PATHNAME', 'gbtreekey_out' -LANGUAGE C IMMUTABLE STRICT; - -CREATE TYPE gbtreekey16 ( - INTERNALLENGTH = 16, - INPUT = gbtreekey16_in, - OUTPUT = gbtreekey16_out -); - -CREATE OR REPLACE FUNCTION gbtreekey32_in(cstring) -RETURNS gbtreekey32 -AS 'MODULE_PATHNAME', 'gbtreekey_in' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbtreekey32_out(gbtreekey32) -RETURNS cstring -AS 'MODULE_PATHNAME', 'gbtreekey_out' -LANGUAGE C IMMUTABLE STRICT; - -CREATE TYPE gbtreekey32 ( - INTERNALLENGTH = 32, - INPUT = gbtreekey32_in, - OUTPUT = gbtreekey32_out -); - -CREATE OR REPLACE FUNCTION gbtreekey_var_in(cstring) -RETURNS gbtreekey_var -AS 'MODULE_PATHNAME', 'gbtreekey_in' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbtreekey_var_out(gbtreekey_var) -RETURNS cstring -AS 'MODULE_PATHNAME', 'gbtreekey_out' -LANGUAGE C IMMUTABLE STRICT; - -CREATE TYPE gbtreekey_var ( - INTERNALLENGTH = VARIABLE, - INPUT = gbtreekey_var_in, - OUTPUT = gbtreekey_var_out, - STORAGE = EXTENDED -); - - - --- --- --- --- oid ops --- --- --- --- define the GiST support methods -CREATE OR REPLACE FUNCTION gbt_oid_consistent(internal,oid,int2,oid,internal) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_oid_compress(internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_decompress(internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_var_decompress(internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_oid_penalty(internal,internal,internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_oid_picksplit(internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_oid_union(bytea, internal) -RETURNS gbtreekey8 -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_oid_same(internal, internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - --- Create the operator class -CREATE OPERATOR CLASS gist_oid_ops -DEFAULT FOR TYPE oid USING gist -AS - OPERATOR 1 < , - OPERATOR 2 <= , - OPERATOR 3 = , - OPERATOR 4 >= , - OPERATOR 5 > , - OPERATOR 6 <> , - FUNCTION 1 gbt_oid_consistent (internal, oid, int2, oid, internal), - FUNCTION 2 gbt_oid_union (bytea, internal), - FUNCTION 3 gbt_oid_compress (internal), - FUNCTION 4 gbt_decompress (internal), - FUNCTION 5 gbt_oid_penalty (internal, internal, internal), - FUNCTION 6 gbt_oid_picksplit (internal, internal), - FUNCTION 7 gbt_oid_same (internal, internal, internal), - STORAGE gbtreekey8; - - --- --- --- --- int2 ops --- --- --- --- define the GiST support methods -CREATE OR REPLACE FUNCTION gbt_int2_consistent(internal,int2,int2,oid,internal) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_int2_compress(internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_int2_penalty(internal,internal,internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_int2_picksplit(internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_int2_union(bytea, internal) -RETURNS gbtreekey4 -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_int2_same(internal, internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - --- Create the operator class -CREATE OPERATOR CLASS gist_int2_ops -DEFAULT FOR TYPE int2 USING gist -AS - OPERATOR 1 < , - OPERATOR 2 <= , - OPERATOR 3 = , - OPERATOR 4 >= , - OPERATOR 5 > , - OPERATOR 6 <> , - FUNCTION 1 gbt_int2_consistent (internal, int2, int2, oid, internal), - FUNCTION 2 gbt_int2_union (bytea, internal), - FUNCTION 3 gbt_int2_compress (internal), - FUNCTION 4 gbt_decompress (internal), - FUNCTION 5 gbt_int2_penalty (internal, internal, internal), - FUNCTION 6 gbt_int2_picksplit (internal, internal), - FUNCTION 7 gbt_int2_same (internal, internal, internal), - STORAGE gbtreekey4; - --- --- --- --- int4 ops --- --- --- --- define the GiST support methods -CREATE OR REPLACE FUNCTION gbt_int4_consistent(internal,int4,int2,oid,internal) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_int4_compress(internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_int4_penalty(internal,internal,internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_int4_picksplit(internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_int4_union(bytea, internal) -RETURNS gbtreekey8 -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_int4_same(internal, internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - --- Create the operator class -CREATE OPERATOR CLASS gist_int4_ops -DEFAULT FOR TYPE int4 USING gist -AS - OPERATOR 1 < , - OPERATOR 2 <= , - OPERATOR 3 = , - OPERATOR 4 >= , - OPERATOR 5 > , - OPERATOR 6 <> , - FUNCTION 1 gbt_int4_consistent (internal, int4, int2, oid, internal), - FUNCTION 2 gbt_int4_union (bytea, internal), - FUNCTION 3 gbt_int4_compress (internal), - FUNCTION 4 gbt_decompress (internal), - FUNCTION 5 gbt_int4_penalty (internal, internal, internal), - FUNCTION 6 gbt_int4_picksplit (internal, internal), - FUNCTION 7 gbt_int4_same (internal, internal, internal), - STORAGE gbtreekey8; - --- --- --- --- int8 ops --- --- --- --- define the GiST support methods -CREATE OR REPLACE FUNCTION gbt_int8_consistent(internal,int8,int2,oid,internal) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_int8_compress(internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_int8_penalty(internal,internal,internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_int8_picksplit(internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_int8_union(bytea, internal) -RETURNS gbtreekey16 -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_int8_same(internal, internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - --- Create the operator class -CREATE OPERATOR CLASS gist_int8_ops -DEFAULT FOR TYPE int8 USING gist -AS - OPERATOR 1 < , - OPERATOR 2 <= , - OPERATOR 3 = , - OPERATOR 4 >= , - OPERATOR 5 > , - OPERATOR 6 <> , - FUNCTION 1 gbt_int8_consistent (internal, int8, int2, oid, internal), - FUNCTION 2 gbt_int8_union (bytea, internal), - FUNCTION 3 gbt_int8_compress (internal), - FUNCTION 4 gbt_decompress (internal), - FUNCTION 5 gbt_int8_penalty (internal, internal, internal), - FUNCTION 6 gbt_int8_picksplit (internal, internal), - FUNCTION 7 gbt_int8_same (internal, internal, internal), - STORAGE gbtreekey16; - - --- --- --- --- float4 ops --- --- --- --- define the GiST support methods -CREATE OR REPLACE FUNCTION gbt_float4_consistent(internal,float4,int2,oid,internal) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_float4_compress(internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_float4_penalty(internal,internal,internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_float4_picksplit(internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_float4_union(bytea, internal) -RETURNS gbtreekey8 -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_float4_same(internal, internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - --- Create the operator class -CREATE OPERATOR CLASS gist_float4_ops -DEFAULT FOR TYPE float4 USING gist -AS - OPERATOR 1 < , - OPERATOR 2 <= , - OPERATOR 3 = , - OPERATOR 4 >= , - OPERATOR 5 > , - OPERATOR 6 <> , - FUNCTION 1 gbt_float4_consistent (internal, float4, int2, oid, internal), - FUNCTION 2 gbt_float4_union (bytea, internal), - FUNCTION 3 gbt_float4_compress (internal), - FUNCTION 4 gbt_decompress (internal), - FUNCTION 5 gbt_float4_penalty (internal, internal, internal), - FUNCTION 6 gbt_float4_picksplit (internal, internal), - FUNCTION 7 gbt_float4_same (internal, internal, internal), - STORAGE gbtreekey8; - - - - --- --- --- --- float8 ops --- --- --- --- define the GiST support methods -CREATE OR REPLACE FUNCTION gbt_float8_consistent(internal,float8,int2,oid,internal) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_float8_compress(internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_float8_penalty(internal,internal,internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_float8_picksplit(internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_float8_union(bytea, internal) -RETURNS gbtreekey16 -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_float8_same(internal, internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - --- Create the operator class -CREATE OPERATOR CLASS gist_float8_ops -DEFAULT FOR TYPE float8 USING gist -AS - OPERATOR 1 < , - OPERATOR 2 <= , - OPERATOR 3 = , - OPERATOR 4 >= , - OPERATOR 5 > , - OPERATOR 6 <> , - FUNCTION 1 gbt_float8_consistent (internal, float8, int2, oid, internal), - FUNCTION 2 gbt_float8_union (bytea, internal), - FUNCTION 3 gbt_float8_compress (internal), - FUNCTION 4 gbt_decompress (internal), - FUNCTION 5 gbt_float8_penalty (internal, internal, internal), - FUNCTION 6 gbt_float8_picksplit (internal, internal), - FUNCTION 7 gbt_float8_same (internal, internal, internal), - STORAGE gbtreekey16; - - --- --- --- --- timestamp ops --- --- --- - -CREATE OR REPLACE FUNCTION gbt_ts_consistent(internal,timestamp,int2,oid,internal) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_tstz_consistent(internal,timestamptz,int2,oid,internal) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_ts_compress(internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_tstz_compress(internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_ts_penalty(internal,internal,internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_ts_picksplit(internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_ts_union(bytea, internal) -RETURNS gbtreekey16 -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_ts_same(internal, internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - --- Create the operator class -CREATE OPERATOR CLASS gist_timestamp_ops -DEFAULT FOR TYPE timestamp USING gist -AS - OPERATOR 1 < , - OPERATOR 2 <= , - OPERATOR 3 = , - OPERATOR 4 >= , - OPERATOR 5 > , - OPERATOR 6 <> , - FUNCTION 1 gbt_ts_consistent (internal, timestamp, int2, oid, internal), - FUNCTION 2 gbt_ts_union (bytea, internal), - FUNCTION 3 gbt_ts_compress (internal), - FUNCTION 4 gbt_decompress (internal), - FUNCTION 5 gbt_ts_penalty (internal, internal, internal), - FUNCTION 6 gbt_ts_picksplit (internal, internal), - FUNCTION 7 gbt_ts_same (internal, internal, internal), - STORAGE gbtreekey16; - - --- Create the operator class -CREATE OPERATOR CLASS gist_timestamptz_ops -DEFAULT FOR TYPE timestamptz USING gist -AS - OPERATOR 1 < , - OPERATOR 2 <= , - OPERATOR 3 = , - OPERATOR 4 >= , - OPERATOR 5 > , - OPERATOR 6 <> , - FUNCTION 1 gbt_tstz_consistent (internal, timestamptz, int2, oid, internal), - FUNCTION 2 gbt_ts_union (bytea, internal), - FUNCTION 3 gbt_tstz_compress (internal), - FUNCTION 4 gbt_decompress (internal), - FUNCTION 5 gbt_ts_penalty (internal, internal, internal), - FUNCTION 6 gbt_ts_picksplit (internal, internal), - FUNCTION 7 gbt_ts_same (internal, internal, internal), - STORAGE gbtreekey16; - - --- --- --- --- time ops --- --- --- - -CREATE OR REPLACE FUNCTION gbt_time_consistent(internal,time,int2,oid,internal) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_timetz_consistent(internal,timetz,int2,oid,internal) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_time_compress(internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_timetz_compress(internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_time_penalty(internal,internal,internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_time_picksplit(internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_time_union(bytea, internal) -RETURNS gbtreekey16 -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_time_same(internal, internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - --- Create the operator class -CREATE OPERATOR CLASS gist_time_ops -DEFAULT FOR TYPE time USING gist -AS - OPERATOR 1 < , - OPERATOR 2 <= , - OPERATOR 3 = , - OPERATOR 4 >= , - OPERATOR 5 > , - OPERATOR 6 <> , - FUNCTION 1 gbt_time_consistent (internal, time, int2, oid, internal), - FUNCTION 2 gbt_time_union (bytea, internal), - FUNCTION 3 gbt_time_compress (internal), - FUNCTION 4 gbt_decompress (internal), - FUNCTION 5 gbt_time_penalty (internal, internal, internal), - FUNCTION 6 gbt_time_picksplit (internal, internal), - FUNCTION 7 gbt_time_same (internal, internal, internal), - STORAGE gbtreekey16; - -CREATE OPERATOR CLASS gist_timetz_ops -DEFAULT FOR TYPE timetz USING gist -AS - OPERATOR 1 < , - OPERATOR 2 <= , - OPERATOR 3 = , - OPERATOR 4 >= , - OPERATOR 5 > , - OPERATOR 6 <> , - FUNCTION 1 gbt_timetz_consistent (internal, timetz, int2, oid, internal), - FUNCTION 2 gbt_time_union (bytea, internal), - FUNCTION 3 gbt_timetz_compress (internal), - FUNCTION 4 gbt_decompress (internal), - FUNCTION 5 gbt_time_penalty (internal, internal, internal), - FUNCTION 6 gbt_time_picksplit (internal, internal), - FUNCTION 7 gbt_time_same (internal, internal, internal), - STORAGE gbtreekey16; - - --- --- --- --- date ops --- --- --- - -CREATE OR REPLACE FUNCTION gbt_date_consistent(internal,date,int2,oid,internal) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_date_compress(internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_date_penalty(internal,internal,internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_date_picksplit(internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_date_union(bytea, internal) -RETURNS gbtreekey8 -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_date_same(internal, internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - --- Create the operator class -CREATE OPERATOR CLASS gist_date_ops -DEFAULT FOR TYPE date USING gist -AS - OPERATOR 1 < , - OPERATOR 2 <= , - OPERATOR 3 = , - OPERATOR 4 >= , - OPERATOR 5 > , - OPERATOR 6 <> , - FUNCTION 1 gbt_date_consistent (internal, date, int2, oid, internal), - FUNCTION 2 gbt_date_union (bytea, internal), - FUNCTION 3 gbt_date_compress (internal), - FUNCTION 4 gbt_decompress (internal), - FUNCTION 5 gbt_date_penalty (internal, internal, internal), - FUNCTION 6 gbt_date_picksplit (internal, internal), - FUNCTION 7 gbt_date_same (internal, internal, internal), - STORAGE gbtreekey8; - - --- --- --- --- interval ops --- --- --- - -CREATE OR REPLACE FUNCTION gbt_intv_consistent(internal,interval,int2,oid,internal) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_intv_compress(internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_intv_decompress(internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_intv_penalty(internal,internal,internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_intv_picksplit(internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_intv_union(bytea, internal) -RETURNS gbtreekey32 -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_intv_same(internal, internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - --- Create the operator class -CREATE OPERATOR CLASS gist_interval_ops -DEFAULT FOR TYPE interval USING gist -AS - OPERATOR 1 < , - OPERATOR 2 <= , - OPERATOR 3 = , - OPERATOR 4 >= , - OPERATOR 5 > , - OPERATOR 6 <> , - FUNCTION 1 gbt_intv_consistent (internal, interval, int2, oid, internal), - FUNCTION 2 gbt_intv_union (bytea, internal), - FUNCTION 3 gbt_intv_compress (internal), - FUNCTION 4 gbt_intv_decompress (internal), - FUNCTION 5 gbt_intv_penalty (internal, internal, internal), - FUNCTION 6 gbt_intv_picksplit (internal, internal), - FUNCTION 7 gbt_intv_same (internal, internal, internal), - STORAGE gbtreekey32; - --- --- --- --- cash ops --- --- --- --- define the GiST support methods -CREATE OR REPLACE FUNCTION gbt_cash_consistent(internal,money,int2,oid,internal) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_cash_compress(internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_cash_penalty(internal,internal,internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_cash_picksplit(internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_cash_union(bytea, internal) -RETURNS gbtreekey8 -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_cash_same(internal, internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - --- Create the operator class -CREATE OPERATOR CLASS gist_cash_ops -DEFAULT FOR TYPE money USING gist -AS - OPERATOR 1 < , - OPERATOR 2 <= , - OPERATOR 3 = , - OPERATOR 4 >= , - OPERATOR 5 > , - OPERATOR 6 <> , - FUNCTION 1 gbt_cash_consistent (internal, money, int2, oid, internal), - FUNCTION 2 gbt_cash_union (bytea, internal), - FUNCTION 3 gbt_cash_compress (internal), - FUNCTION 4 gbt_decompress (internal), - FUNCTION 5 gbt_cash_penalty (internal, internal, internal), - FUNCTION 6 gbt_cash_picksplit (internal, internal), - FUNCTION 7 gbt_cash_same (internal, internal, internal), - STORAGE gbtreekey16; - --- --- --- --- macaddr ops --- --- --- --- define the GiST support methods -CREATE OR REPLACE FUNCTION gbt_macad_consistent(internal,macaddr,int2,oid,internal) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_macad_compress(internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_macad_penalty(internal,internal,internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_macad_picksplit(internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_macad_union(bytea, internal) -RETURNS gbtreekey16 -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_macad_same(internal, internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - --- Create the operator class -CREATE OPERATOR CLASS gist_macaddr_ops -DEFAULT FOR TYPE macaddr USING gist -AS - OPERATOR 1 < , - OPERATOR 2 <= , - OPERATOR 3 = , - OPERATOR 4 >= , - OPERATOR 5 > , - OPERATOR 6 <> , - FUNCTION 1 gbt_macad_consistent (internal, macaddr, int2, oid, internal), - FUNCTION 2 gbt_macad_union (bytea, internal), - FUNCTION 3 gbt_macad_compress (internal), - FUNCTION 4 gbt_decompress (internal), - FUNCTION 5 gbt_macad_penalty (internal, internal, internal), - FUNCTION 6 gbt_macad_picksplit (internal, internal), - FUNCTION 7 gbt_macad_same (internal, internal, internal), - STORAGE gbtreekey16; - - - --- --- --- --- text/ bpchar ops --- --- --- --- define the GiST support methods -CREATE OR REPLACE FUNCTION gbt_text_consistent(internal,text,int2,oid,internal) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_bpchar_consistent(internal,bpchar,int2,oid,internal) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_text_compress(internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_bpchar_compress(internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_text_penalty(internal,internal,internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_text_picksplit(internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_text_union(bytea, internal) -RETURNS gbtreekey_var -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_text_same(internal, internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - --- Create the operator class -CREATE OPERATOR CLASS gist_text_ops -DEFAULT FOR TYPE text USING gist -AS - OPERATOR 1 < , - OPERATOR 2 <= , - OPERATOR 3 = , - OPERATOR 4 >= , - OPERATOR 5 > , - OPERATOR 6 <> , - FUNCTION 1 gbt_text_consistent (internal, text, int2, oid, internal), - FUNCTION 2 gbt_text_union (bytea, internal), - FUNCTION 3 gbt_text_compress (internal), - FUNCTION 4 gbt_var_decompress (internal), - FUNCTION 5 gbt_text_penalty (internal, internal, internal), - FUNCTION 6 gbt_text_picksplit (internal, internal), - FUNCTION 7 gbt_text_same (internal, internal, internal), - STORAGE gbtreekey_var; - - ----- Create the operator class -CREATE OPERATOR CLASS gist_bpchar_ops -DEFAULT FOR TYPE bpchar USING gist -AS - OPERATOR 1 < , - OPERATOR 2 <= , - OPERATOR 3 = , - OPERATOR 4 >= , - OPERATOR 5 > , - OPERATOR 6 <> , - FUNCTION 1 gbt_bpchar_consistent (internal, bpchar , int2, oid, internal), - FUNCTION 2 gbt_text_union (bytea, internal), - FUNCTION 3 gbt_bpchar_compress (internal), - FUNCTION 4 gbt_var_decompress (internal), - FUNCTION 5 gbt_text_penalty (internal, internal, internal), - FUNCTION 6 gbt_text_picksplit (internal, internal), - FUNCTION 7 gbt_text_same (internal, internal, internal), - STORAGE gbtreekey_var; - - - --- --- --- bytea ops --- --- --- --- define the GiST support methods -CREATE OR REPLACE FUNCTION gbt_bytea_consistent(internal,bytea,int2,oid,internal) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_bytea_compress(internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_bytea_penalty(internal,internal,internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_bytea_picksplit(internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_bytea_union(bytea, internal) -RETURNS gbtreekey_var -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_bytea_same(internal, internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - --- Create the operator class -CREATE OPERATOR CLASS gist_bytea_ops -DEFAULT FOR TYPE bytea USING gist -AS - OPERATOR 1 < , - OPERATOR 2 <= , - OPERATOR 3 = , - OPERATOR 4 >= , - OPERATOR 5 > , - OPERATOR 6 <> , - FUNCTION 1 gbt_bytea_consistent (internal, bytea, int2, oid, internal), - FUNCTION 2 gbt_bytea_union (bytea, internal), - FUNCTION 3 gbt_bytea_compress (internal), - FUNCTION 4 gbt_var_decompress (internal), - FUNCTION 5 gbt_bytea_penalty (internal, internal, internal), - FUNCTION 6 gbt_bytea_picksplit (internal, internal), - FUNCTION 7 gbt_bytea_same (internal, internal, internal), - STORAGE gbtreekey_var; - - --- --- --- --- numeric ops --- --- --- --- define the GiST support methods -CREATE OR REPLACE FUNCTION gbt_numeric_consistent(internal,numeric,int2,oid,internal) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_numeric_compress(internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_numeric_penalty(internal,internal,internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_numeric_picksplit(internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_numeric_union(bytea, internal) -RETURNS gbtreekey_var -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_numeric_same(internal, internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - --- Create the operator class -CREATE OPERATOR CLASS gist_numeric_ops -DEFAULT FOR TYPE numeric USING gist -AS - OPERATOR 1 < , - OPERATOR 2 <= , - OPERATOR 3 = , - OPERATOR 4 >= , - OPERATOR 5 > , - OPERATOR 6 <> , - FUNCTION 1 gbt_numeric_consistent (internal, numeric, int2, oid, internal), - FUNCTION 2 gbt_numeric_union (bytea, internal), - FUNCTION 3 gbt_numeric_compress (internal), - FUNCTION 4 gbt_var_decompress (internal), - FUNCTION 5 gbt_numeric_penalty (internal, internal, internal), - FUNCTION 6 gbt_numeric_picksplit (internal, internal), - FUNCTION 7 gbt_numeric_same (internal, internal, internal), - STORAGE gbtreekey_var; - --- --- --- bit ops --- --- --- --- define the GiST support methods -CREATE OR REPLACE FUNCTION gbt_bit_consistent(internal,bit,int2,oid,internal) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_bit_compress(internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_bit_penalty(internal,internal,internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_bit_picksplit(internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_bit_union(bytea, internal) -RETURNS gbtreekey_var -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_bit_same(internal, internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - --- Create the operator class -CREATE OPERATOR CLASS gist_bit_ops -DEFAULT FOR TYPE bit USING gist -AS - OPERATOR 1 < , - OPERATOR 2 <= , - OPERATOR 3 = , - OPERATOR 4 >= , - OPERATOR 5 > , - OPERATOR 6 <> , - FUNCTION 1 gbt_bit_consistent (internal, bit, int2, oid, internal), - FUNCTION 2 gbt_bit_union (bytea, internal), - FUNCTION 3 gbt_bit_compress (internal), - FUNCTION 4 gbt_var_decompress (internal), - FUNCTION 5 gbt_bit_penalty (internal, internal, internal), - FUNCTION 6 gbt_bit_picksplit (internal, internal), - FUNCTION 7 gbt_bit_same (internal, internal, internal), - STORAGE gbtreekey_var; - - --- Create the operator class -CREATE OPERATOR CLASS gist_vbit_ops -DEFAULT FOR TYPE varbit USING gist -AS - OPERATOR 1 < , - OPERATOR 2 <= , - OPERATOR 3 = , - OPERATOR 4 >= , - OPERATOR 5 > , - OPERATOR 6 <> , - FUNCTION 1 gbt_bit_consistent (internal, bit, int2, oid, internal), - FUNCTION 2 gbt_bit_union (bytea, internal), - FUNCTION 3 gbt_bit_compress (internal), - FUNCTION 4 gbt_var_decompress (internal), - FUNCTION 5 gbt_bit_penalty (internal, internal, internal), - FUNCTION 6 gbt_bit_picksplit (internal, internal), - FUNCTION 7 gbt_bit_same (internal, internal, internal), - STORAGE gbtreekey_var; - - - --- --- --- --- inet/cidr ops --- --- --- --- define the GiST support methods -CREATE OR REPLACE FUNCTION gbt_inet_consistent(internal,inet,int2,oid,internal) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_inet_compress(internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_inet_penalty(internal,internal,internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_inet_picksplit(internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_inet_union(bytea, internal) -RETURNS gbtreekey16 -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gbt_inet_same(internal, internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - --- Create the operator class -CREATE OPERATOR CLASS gist_inet_ops -DEFAULT FOR TYPE inet USING gist -AS - OPERATOR 1 < , - OPERATOR 2 <= , - OPERATOR 3 = , - OPERATOR 4 >= , - OPERATOR 5 > , - OPERATOR 6 <> , - FUNCTION 1 gbt_inet_consistent (internal, inet, int2, oid, internal), - FUNCTION 2 gbt_inet_union (bytea, internal), - FUNCTION 3 gbt_inet_compress (internal), - FUNCTION 4 gbt_decompress (internal), - FUNCTION 5 gbt_inet_penalty (internal, internal, internal), - FUNCTION 6 gbt_inet_picksplit (internal, internal), - FUNCTION 7 gbt_inet_same (internal, internal, internal), - STORAGE gbtreekey16; - --- Create the operator class -CREATE OPERATOR CLASS gist_cidr_ops -DEFAULT FOR TYPE cidr USING gist -AS - OPERATOR 1 < (inet, inet) , - OPERATOR 2 <= (inet, inet) , - OPERATOR 3 = (inet, inet) , - OPERATOR 4 >= (inet, inet) , - OPERATOR 5 > (inet, inet) , - OPERATOR 6 <> (inet, inet) , - FUNCTION 1 gbt_inet_consistent (internal, inet, int2, oid, internal), - FUNCTION 2 gbt_inet_union (bytea, internal), - FUNCTION 3 gbt_inet_compress (internal), - FUNCTION 4 gbt_decompress (internal), - FUNCTION 5 gbt_inet_penalty (internal, internal, internal), - FUNCTION 6 gbt_inet_picksplit (internal, internal), - FUNCTION 7 gbt_inet_same (internal, internal, internal), - STORAGE gbtreekey16; diff --git a/contrib/btree_gist/expected/init.out b/contrib/btree_gist/expected/init.out index c808249545..afe0534682 100644 --- a/contrib/btree_gist/expected/init.out +++ b/contrib/btree_gist/expected/init.out @@ -1,7 +1 @@ --- --- first, define the datatype. Turn off echoing so that expected file --- does not depend on contents of btree_gist.sql. --- -SET client_min_messages = warning; -\set ECHO none -RESET client_min_messages; +CREATE EXTENSION btree_gist; diff --git a/contrib/btree_gist/sql/init.sql b/contrib/btree_gist/sql/init.sql index 7fafde12d8..afe0534682 100644 --- a/contrib/btree_gist/sql/init.sql +++ b/contrib/btree_gist/sql/init.sql @@ -1,9 +1 @@ --- --- first, define the datatype. Turn off echoing so that expected file --- does not depend on contents of btree_gist.sql. --- -SET client_min_messages = warning; -\set ECHO none -\i btree_gist.sql -\set ECHO all -RESET client_min_messages; +CREATE EXTENSION btree_gist; diff --git a/contrib/btree_gist/uninstall_btree_gist.sql b/contrib/btree_gist/uninstall_btree_gist.sql deleted file mode 100644 index 30b9da4c73..0000000000 --- a/contrib/btree_gist/uninstall_btree_gist.sql +++ /dev/null @@ -1,280 +0,0 @@ -/* contrib/btree_gist/uninstall_btree_gist.sql */ - --- Adjust this setting to control where the objects get dropped. -SET search_path = public; - -DROP OPERATOR CLASS gist_cidr_ops USING gist; - -DROP OPERATOR CLASS gist_inet_ops USING gist; - -DROP FUNCTION gbt_inet_same(internal, internal, internal); - -DROP FUNCTION gbt_inet_union(bytea, internal); - -DROP FUNCTION gbt_inet_picksplit(internal, internal); - -DROP FUNCTION gbt_inet_penalty(internal,internal,internal); - -DROP FUNCTION gbt_inet_compress(internal); - -DROP FUNCTION gbt_inet_consistent(internal,inet,int2,oid,internal); - -DROP OPERATOR CLASS gist_vbit_ops USING gist; - -DROP OPERATOR CLASS gist_bit_ops USING gist; - -DROP FUNCTION gbt_bit_same(internal, internal, internal); - -DROP FUNCTION gbt_bit_union(bytea, internal); - -DROP FUNCTION gbt_bit_picksplit(internal, internal); - -DROP FUNCTION gbt_bit_penalty(internal,internal,internal); - -DROP FUNCTION gbt_bit_compress(internal); - -DROP FUNCTION gbt_bit_consistent(internal,bit,int2,oid,internal); - -DROP OPERATOR CLASS gist_numeric_ops USING gist; - -DROP FUNCTION gbt_numeric_same(internal, internal, internal); - -DROP FUNCTION gbt_numeric_union(bytea, internal); - -DROP FUNCTION gbt_numeric_picksplit(internal, internal); - -DROP FUNCTION gbt_numeric_penalty(internal,internal,internal); - -DROP FUNCTION gbt_numeric_compress(internal); - -DROP FUNCTION gbt_numeric_consistent(internal,numeric,int2,oid,internal); - -DROP OPERATOR CLASS gist_bytea_ops USING gist; - -DROP FUNCTION gbt_bytea_same(internal, internal, internal); - -DROP FUNCTION gbt_bytea_union(bytea, internal); - -DROP FUNCTION gbt_bytea_picksplit(internal, internal); - -DROP FUNCTION gbt_bytea_penalty(internal,internal,internal); - -DROP FUNCTION gbt_bytea_compress(internal); - -DROP FUNCTION gbt_bytea_consistent(internal,bytea,int2,oid,internal); - -DROP OPERATOR CLASS gist_bpchar_ops USING gist; - -DROP OPERATOR CLASS gist_text_ops USING gist; - -DROP FUNCTION gbt_text_same(internal, internal, internal); - -DROP FUNCTION gbt_text_union(bytea, internal); - -DROP FUNCTION gbt_text_picksplit(internal, internal); - -DROP FUNCTION gbt_text_penalty(internal,internal,internal); - -DROP FUNCTION gbt_bpchar_compress(internal); - -DROP FUNCTION gbt_text_compress(internal); - -DROP FUNCTION gbt_bpchar_consistent(internal,bpchar,int2,oid,internal); - -DROP FUNCTION gbt_text_consistent(internal,text,int2,oid,internal); - -DROP OPERATOR CLASS gist_macaddr_ops USING gist; - -DROP FUNCTION gbt_macad_same(internal, internal, internal); - -DROP FUNCTION gbt_macad_union(bytea, internal); - -DROP FUNCTION gbt_macad_picksplit(internal, internal); - -DROP FUNCTION gbt_macad_penalty(internal,internal,internal); - -DROP FUNCTION gbt_macad_compress(internal); - -DROP FUNCTION gbt_macad_consistent(internal,macaddr,int2,oid,internal); - -DROP OPERATOR CLASS gist_cash_ops USING gist; - -DROP FUNCTION gbt_cash_same(internal, internal, internal); - -DROP FUNCTION gbt_cash_union(bytea, internal); - -DROP FUNCTION gbt_cash_picksplit(internal, internal); - -DROP FUNCTION gbt_cash_penalty(internal,internal,internal); - -DROP FUNCTION gbt_cash_compress(internal); - -DROP FUNCTION gbt_cash_consistent(internal,money,int2,oid,internal); - -DROP OPERATOR CLASS gist_interval_ops USING gist; - -DROP FUNCTION gbt_intv_same(internal, internal, internal); - -DROP FUNCTION gbt_intv_union(bytea, internal); - -DROP FUNCTION gbt_intv_picksplit(internal, internal); - -DROP FUNCTION gbt_intv_penalty(internal,internal,internal); - -DROP FUNCTION gbt_intv_decompress(internal); - -DROP FUNCTION gbt_intv_compress(internal); - -DROP FUNCTION gbt_intv_consistent(internal,interval,int2,oid,internal); - -DROP OPERATOR CLASS gist_date_ops USING gist; - -DROP FUNCTION gbt_date_same(internal, internal, internal); - -DROP FUNCTION gbt_date_union(bytea, internal); - -DROP FUNCTION gbt_date_picksplit(internal, internal); - -DROP FUNCTION gbt_date_penalty(internal,internal,internal); - -DROP FUNCTION gbt_date_compress(internal); - -DROP FUNCTION gbt_date_consistent(internal,date,int2,oid,internal); - -DROP OPERATOR CLASS gist_timetz_ops USING gist; - -DROP OPERATOR CLASS gist_time_ops USING gist; - -DROP FUNCTION gbt_time_same(internal, internal, internal); - -DROP FUNCTION gbt_time_union(bytea, internal); - -DROP FUNCTION gbt_time_picksplit(internal, internal); - -DROP FUNCTION gbt_time_penalty(internal,internal,internal); - -DROP FUNCTION gbt_timetz_compress(internal); - -DROP FUNCTION gbt_time_compress(internal); - -DROP FUNCTION gbt_timetz_consistent(internal,timetz,int2,oid,internal); - -DROP FUNCTION gbt_time_consistent(internal,time,int2,oid,internal); - -DROP OPERATOR CLASS gist_timestamptz_ops USING gist; - -DROP OPERATOR CLASS gist_timestamp_ops USING gist; - -DROP FUNCTION gbt_ts_same(internal, internal, internal); - -DROP FUNCTION gbt_ts_union(bytea, internal); - -DROP FUNCTION gbt_ts_picksplit(internal, internal); - -DROP FUNCTION gbt_ts_penalty(internal,internal,internal); - -DROP FUNCTION gbt_tstz_compress(internal); - -DROP FUNCTION gbt_ts_compress(internal); - -DROP FUNCTION gbt_tstz_consistent(internal,timestamptz,int2,oid,internal); - -DROP FUNCTION gbt_ts_consistent(internal,timestamp,int2,oid,internal); - -DROP OPERATOR CLASS gist_float8_ops USING gist; - -DROP FUNCTION gbt_float8_same(internal, internal, internal); - -DROP FUNCTION gbt_float8_union(bytea, internal); - -DROP FUNCTION gbt_float8_picksplit(internal, internal); - -DROP FUNCTION gbt_float8_penalty(internal,internal,internal); - -DROP FUNCTION gbt_float8_compress(internal); - -DROP FUNCTION gbt_float8_consistent(internal,float8,int2,oid,internal); - -DROP OPERATOR CLASS gist_float4_ops USING gist; - -DROP FUNCTION gbt_float4_same(internal, internal, internal); - -DROP FUNCTION gbt_float4_union(bytea, internal); - -DROP FUNCTION gbt_float4_picksplit(internal, internal); - -DROP FUNCTION gbt_float4_penalty(internal,internal,internal); - -DROP FUNCTION gbt_float4_compress(internal); - -DROP FUNCTION gbt_float4_consistent(internal,float4,int2,oid,internal); - -DROP OPERATOR CLASS gist_int8_ops USING gist; - -DROP FUNCTION gbt_int8_same(internal, internal, internal); - -DROP FUNCTION gbt_int8_union(bytea, internal); - -DROP FUNCTION gbt_int8_picksplit(internal, internal); - -DROP FUNCTION gbt_int8_penalty(internal,internal,internal); - -DROP FUNCTION gbt_int8_compress(internal); - -DROP FUNCTION gbt_int8_consistent(internal,int8,int2,oid,internal); - -DROP OPERATOR CLASS gist_int4_ops USING gist; - -DROP FUNCTION gbt_int4_same(internal, internal, internal); - -DROP FUNCTION gbt_int4_union(bytea, internal); - -DROP FUNCTION gbt_int4_picksplit(internal, internal); - -DROP FUNCTION gbt_int4_penalty(internal,internal,internal); - -DROP FUNCTION gbt_int4_compress(internal); - -DROP FUNCTION gbt_int4_consistent(internal,int4,int2,oid,internal); - -DROP OPERATOR CLASS gist_int2_ops USING gist; - -DROP FUNCTION gbt_int2_same(internal, internal, internal); - -DROP FUNCTION gbt_int2_union(bytea, internal); - -DROP FUNCTION gbt_int2_picksplit(internal, internal); - -DROP FUNCTION gbt_int2_penalty(internal,internal,internal); - -DROP FUNCTION gbt_int2_compress(internal); - -DROP FUNCTION gbt_int2_consistent(internal,int2,int2,oid,internal); - -DROP OPERATOR CLASS gist_oid_ops USING gist; - -DROP FUNCTION gbt_oid_same(internal, internal, internal); - -DROP FUNCTION gbt_oid_union(bytea, internal); - -DROP FUNCTION gbt_oid_picksplit(internal, internal); - -DROP FUNCTION gbt_oid_penalty(internal,internal,internal); - -DROP FUNCTION gbt_var_decompress(internal); - -DROP FUNCTION gbt_decompress(internal); - -DROP FUNCTION gbt_oid_compress(internal); - -DROP FUNCTION gbt_oid_consistent(internal,oid,int2,oid,internal); - -DROP TYPE gbtreekey_var CASCADE; - -DROP TYPE gbtreekey32 CASCADE; - -DROP TYPE gbtreekey16 CASCADE; - -DROP TYPE gbtreekey8 CASCADE; - -DROP TYPE gbtreekey4 CASCADE; diff --git a/contrib/chkpass/.gitignore b/contrib/chkpass/.gitignore deleted file mode 100644 index 9029d666aa..0000000000 --- a/contrib/chkpass/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/chkpass.sql diff --git a/contrib/chkpass/Makefile b/contrib/chkpass/Makefile index 3677dfcb56..b775aef17d 100644 --- a/contrib/chkpass/Makefile +++ b/contrib/chkpass/Makefile @@ -2,9 +2,11 @@ MODULE_big = chkpass OBJS = chkpass.o + +EXTENSION = chkpass +DATA = chkpass--1.0.sql chkpass--unpackaged--1.0.sql + SHLIB_LINK = $(filter -lcrypt, $(LIBS)) -DATA_built = chkpass.sql -DATA = uninstall_chkpass.sql ifdef USE_PGXS PG_CONFIG = pg_config diff --git a/contrib/chkpass/chkpass--1.0.sql b/contrib/chkpass/chkpass--1.0.sql new file mode 100644 index 0000000000..aad74683f7 --- /dev/null +++ b/contrib/chkpass/chkpass--1.0.sql @@ -0,0 +1,64 @@ +/* contrib/chkpass/chkpass--1.0.sql */ + +-- +-- Input and output functions and the type itself: +-- + +CREATE OR REPLACE FUNCTION chkpass_in(cstring) + RETURNS chkpass + AS 'MODULE_PATHNAME' + LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION chkpass_out(chkpass) + RETURNS cstring + AS 'MODULE_PATHNAME' + LANGUAGE C STRICT; + +CREATE TYPE chkpass ( + internallength = 16, + input = chkpass_in, + output = chkpass_out +); + +CREATE OR REPLACE FUNCTION raw(chkpass) + RETURNS text + AS 'MODULE_PATHNAME', 'chkpass_rout' + LANGUAGE C STRICT; + +-- +-- The various boolean tests: +-- + +CREATE OR REPLACE FUNCTION eq(chkpass, text) + RETURNS bool + AS 'MODULE_PATHNAME', 'chkpass_eq' + LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION ne(chkpass, text) + RETURNS bool + AS 'MODULE_PATHNAME', 'chkpass_ne' + LANGUAGE C STRICT; + +-- +-- Now the operators. +-- + +CREATE OPERATOR = ( + leftarg = chkpass, + rightarg = text, + negator = <>, + procedure = eq +); + +CREATE OPERATOR <> ( + leftarg = chkpass, + rightarg = text, + negator = =, + procedure = ne +); + +COMMENT ON TYPE chkpass IS 'password type with checks'; + +-- +-- eof +-- diff --git a/contrib/chkpass/chkpass--unpackaged--1.0.sql b/contrib/chkpass/chkpass--unpackaged--1.0.sql new file mode 100644 index 0000000000..bf91950f3c --- /dev/null +++ b/contrib/chkpass/chkpass--unpackaged--1.0.sql @@ -0,0 +1,10 @@ +/* contrib/chkpass/chkpass--unpackaged--1.0.sql */ + +ALTER EXTENSION chkpass ADD type chkpass; +ALTER EXTENSION chkpass ADD function chkpass_in(cstring); +ALTER EXTENSION chkpass ADD function chkpass_out(chkpass); +ALTER EXTENSION chkpass ADD function raw(chkpass); +ALTER EXTENSION chkpass ADD function eq(chkpass,text); +ALTER EXTENSION chkpass ADD function ne(chkpass,text); +ALTER EXTENSION chkpass ADD operator <>(chkpass,text); +ALTER EXTENSION chkpass ADD operator =(chkpass,text); diff --git a/contrib/chkpass/chkpass.control b/contrib/chkpass/chkpass.control new file mode 100644 index 0000000000..bd4b3d3d0d --- /dev/null +++ b/contrib/chkpass/chkpass.control @@ -0,0 +1,5 @@ +# chkpass extension +comment = 'data type for auto-encrypted passwords' +default_version = '1.0' +module_pathname = '$libdir/chkpass' +relocatable = true diff --git a/contrib/chkpass/chkpass.sql.in b/contrib/chkpass/chkpass.sql.in deleted file mode 100644 index 3cec0224b0..0000000000 --- a/contrib/chkpass/chkpass.sql.in +++ /dev/null @@ -1,67 +0,0 @@ -/* contrib/chkpass/chkpass.sql.in */ - --- Adjust this setting to control where the objects get created. -SET search_path = public; - --- --- Input and output functions and the type itself: --- - -CREATE OR REPLACE FUNCTION chkpass_in(cstring) - RETURNS chkpass - AS 'MODULE_PATHNAME' - LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION chkpass_out(chkpass) - RETURNS cstring - AS 'MODULE_PATHNAME' - LANGUAGE C STRICT; - -CREATE TYPE chkpass ( - internallength = 16, - input = chkpass_in, - output = chkpass_out -); - -CREATE OR REPLACE FUNCTION raw(chkpass) - RETURNS text - AS 'MODULE_PATHNAME', 'chkpass_rout' - LANGUAGE C STRICT; - --- --- The various boolean tests: --- - -CREATE OR REPLACE FUNCTION eq(chkpass, text) - RETURNS bool - AS 'MODULE_PATHNAME', 'chkpass_eq' - LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION ne(chkpass, text) - RETURNS bool - AS 'MODULE_PATHNAME', 'chkpass_ne' - LANGUAGE C STRICT; - --- --- Now the operators. --- - -CREATE OPERATOR = ( - leftarg = chkpass, - rightarg = text, - negator = <>, - procedure = eq -); - -CREATE OPERATOR <> ( - leftarg = chkpass, - rightarg = text, - negator = =, - procedure = ne -); - -COMMENT ON TYPE chkpass IS 'password type with checks'; - --- --- eof --- diff --git a/contrib/chkpass/uninstall_chkpass.sql b/contrib/chkpass/uninstall_chkpass.sql deleted file mode 100644 index 93ab6eb4eb..0000000000 --- a/contrib/chkpass/uninstall_chkpass.sql +++ /dev/null @@ -1,16 +0,0 @@ -/* contrib/chkpass/uninstall_chkpass.sql */ - --- Adjust this setting to control where the objects get dropped. -SET search_path = public; - -DROP OPERATOR <>(chkpass, text); - -DROP OPERATOR =(chkpass, text); - -DROP FUNCTION ne(chkpass, text); - -DROP FUNCTION eq(chkpass, text); - -DROP FUNCTION raw(chkpass); - -DROP TYPE chkpass CASCADE; diff --git a/contrib/citext/.gitignore b/contrib/citext/.gitignore index e626817156..19b6c5ba42 100644 --- a/contrib/citext/.gitignore +++ b/contrib/citext/.gitignore @@ -1,3 +1,2 @@ -/citext.sql # Generated subdirectories /results/ diff --git a/contrib/citext/Makefile b/contrib/citext/Makefile index c868eca884..65942528dd 100644 --- a/contrib/citext/Makefile +++ b/contrib/citext/Makefile @@ -1,8 +1,10 @@ # contrib/citext/Makefile MODULES = citext -DATA_built = citext.sql -DATA = uninstall_citext.sql + +EXTENSION = citext +DATA = citext--1.0.sql citext--unpackaged--1.0.sql + REGRESS = citext ifdef USE_PGXS diff --git a/contrib/citext/citext--1.0.sql b/contrib/citext/citext--1.0.sql new file mode 100644 index 0000000000..13cff8134a --- /dev/null +++ b/contrib/citext/citext--1.0.sql @@ -0,0 +1,486 @@ +/* contrib/citext/citext--1.0.sql */ + +-- +-- PostgreSQL code for CITEXT. +-- +-- Most I/O functions, and a few others, piggyback on the "text" type +-- functions via the implicit cast to text. +-- + +-- +-- Shell type to keep things a bit quieter. +-- + +CREATE TYPE citext; + +-- +-- Input and output functions. +-- +CREATE OR REPLACE FUNCTION citextin(cstring) +RETURNS citext +AS 'textin' +LANGUAGE internal IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION citextout(citext) +RETURNS cstring +AS 'textout' +LANGUAGE internal IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION citextrecv(internal) +RETURNS citext +AS 'textrecv' +LANGUAGE internal STABLE STRICT; + +CREATE OR REPLACE FUNCTION citextsend(citext) +RETURNS bytea +AS 'textsend' +LANGUAGE internal STABLE STRICT; + +-- +-- The type itself. +-- + +CREATE TYPE citext ( + INPUT = citextin, + OUTPUT = citextout, + RECEIVE = citextrecv, + SEND = citextsend, + INTERNALLENGTH = VARIABLE, + STORAGE = extended, + -- make it a non-preferred member of string type category + CATEGORY = 'S', + PREFERRED = false, + COLLATABLE = true +); + +-- +-- Type casting functions for those situations where the I/O casts don't +-- automatically kick in. +-- + +CREATE OR REPLACE FUNCTION citext(bpchar) +RETURNS citext +AS 'rtrim1' +LANGUAGE internal IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION citext(boolean) +RETURNS citext +AS 'booltext' +LANGUAGE internal IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION citext(inet) +RETURNS citext +AS 'network_show' +LANGUAGE internal IMMUTABLE STRICT; + +-- +-- Implicit and assignment type casts. +-- + +CREATE CAST (citext AS text) WITHOUT FUNCTION AS IMPLICIT; +CREATE CAST (citext AS varchar) WITHOUT FUNCTION AS IMPLICIT; +CREATE CAST (citext AS bpchar) WITHOUT FUNCTION AS ASSIGNMENT; +CREATE CAST (text AS citext) WITHOUT FUNCTION AS ASSIGNMENT; +CREATE CAST (varchar AS citext) WITHOUT FUNCTION AS ASSIGNMENT; +CREATE CAST (bpchar AS citext) WITH FUNCTION citext(bpchar) AS ASSIGNMENT; +CREATE CAST (boolean AS citext) WITH FUNCTION citext(boolean) AS ASSIGNMENT; +CREATE CAST (inet AS citext) WITH FUNCTION citext(inet) AS ASSIGNMENT; + +-- +-- Operator Functions. +-- + +CREATE OR REPLACE FUNCTION citext_eq( citext, citext ) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION citext_ne( citext, citext ) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION citext_lt( citext, citext ) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION citext_le( citext, citext ) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION citext_gt( citext, citext ) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION citext_ge( citext, citext ) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +-- +-- Operators. +-- + +CREATE OPERATOR = ( + LEFTARG = CITEXT, + RIGHTARG = CITEXT, + COMMUTATOR = =, + NEGATOR = <>, + PROCEDURE = citext_eq, + RESTRICT = eqsel, + JOIN = eqjoinsel, + HASHES, + MERGES +); + +CREATE OPERATOR <> ( + LEFTARG = CITEXT, + RIGHTARG = CITEXT, + NEGATOR = =, + COMMUTATOR = <>, + PROCEDURE = citext_ne, + RESTRICT = neqsel, + JOIN = neqjoinsel +); + +CREATE OPERATOR < ( + LEFTARG = CITEXT, + RIGHTARG = CITEXT, + NEGATOR = >=, + COMMUTATOR = >, + PROCEDURE = citext_lt, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel +); + +CREATE OPERATOR <= ( + LEFTARG = CITEXT, + RIGHTARG = CITEXT, + NEGATOR = >, + COMMUTATOR = >=, + PROCEDURE = citext_le, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel +); + +CREATE OPERATOR >= ( + LEFTARG = CITEXT, + RIGHTARG = CITEXT, + NEGATOR = <, + COMMUTATOR = <=, + PROCEDURE = citext_ge, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel +); + +CREATE OPERATOR > ( + LEFTARG = CITEXT, + RIGHTARG = CITEXT, + NEGATOR = <=, + COMMUTATOR = <, + PROCEDURE = citext_gt, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel +); + +-- +-- Support functions for indexing. +-- + +CREATE OR REPLACE FUNCTION citext_cmp(citext, citext) +RETURNS int4 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION citext_hash(citext) +RETURNS int4 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +-- +-- The btree indexing operator class. +-- + +CREATE OPERATOR CLASS citext_ops +DEFAULT FOR TYPE CITEXT USING btree AS + OPERATOR 1 < (citext, citext), + OPERATOR 2 <= (citext, citext), + OPERATOR 3 = (citext, citext), + OPERATOR 4 >= (citext, citext), + OPERATOR 5 > (citext, citext), + FUNCTION 1 citext_cmp(citext, citext); + +-- +-- The hash indexing operator class. +-- + +CREATE OPERATOR CLASS citext_ops +DEFAULT FOR TYPE citext USING hash AS + OPERATOR 1 = (citext, citext), + FUNCTION 1 citext_hash(citext); + +-- +-- Aggregates. +-- + +CREATE OR REPLACE FUNCTION citext_smaller(citext, citext) +RETURNS citext +AS 'MODULE_PATHNAME' +LANGUAGE 'C' IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION citext_larger(citext, citext) +RETURNS citext +AS 'MODULE_PATHNAME' +LANGUAGE 'C' IMMUTABLE STRICT; + +CREATE AGGREGATE min(citext) ( + SFUNC = citext_smaller, + STYPE = citext, + SORTOP = < +); + +CREATE AGGREGATE max(citext) ( + SFUNC = citext_larger, + STYPE = citext, + SORTOP = > +); + +-- +-- CITEXT pattern matching. +-- + +CREATE OR REPLACE FUNCTION texticlike(citext, citext) +RETURNS bool AS 'texticlike' +LANGUAGE internal IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION texticnlike(citext, citext) +RETURNS bool AS 'texticnlike' +LANGUAGE internal IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION texticregexeq(citext, citext) +RETURNS bool AS 'texticregexeq' +LANGUAGE internal IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION texticregexne(citext, citext) +RETURNS bool AS 'texticregexne' +LANGUAGE internal IMMUTABLE STRICT; + +CREATE OPERATOR ~ ( + PROCEDURE = texticregexeq, + LEFTARG = citext, + RIGHTARG = citext, + NEGATOR = !~, + RESTRICT = icregexeqsel, + JOIN = icregexeqjoinsel +); + +CREATE OPERATOR ~* ( + PROCEDURE = texticregexeq, + LEFTARG = citext, + RIGHTARG = citext, + NEGATOR = !~*, + RESTRICT = icregexeqsel, + JOIN = icregexeqjoinsel +); + +CREATE OPERATOR !~ ( + PROCEDURE = texticregexne, + LEFTARG = citext, + RIGHTARG = citext, + NEGATOR = ~, + RESTRICT = icregexnesel, + JOIN = icregexnejoinsel +); + +CREATE OPERATOR !~* ( + PROCEDURE = texticregexne, + LEFTARG = citext, + RIGHTARG = citext, + NEGATOR = ~*, + RESTRICT = icregexnesel, + JOIN = icregexnejoinsel +); + +CREATE OPERATOR ~~ ( + PROCEDURE = texticlike, + LEFTARG = citext, + RIGHTARG = citext, + NEGATOR = !~~, + RESTRICT = iclikesel, + JOIN = iclikejoinsel +); + +CREATE OPERATOR ~~* ( + PROCEDURE = texticlike, + LEFTARG = citext, + RIGHTARG = citext, + NEGATOR = !~~*, + RESTRICT = iclikesel, + JOIN = iclikejoinsel +); + +CREATE OPERATOR !~~ ( + PROCEDURE = texticnlike, + LEFTARG = citext, + RIGHTARG = citext, + NEGATOR = ~~, + RESTRICT = icnlikesel, + JOIN = icnlikejoinsel +); + +CREATE OPERATOR !~~* ( + PROCEDURE = texticnlike, + LEFTARG = citext, + RIGHTARG = citext, + NEGATOR = ~~*, + RESTRICT = icnlikesel, + JOIN = icnlikejoinsel +); + +-- +-- Matching citext to text. +-- + +CREATE OR REPLACE FUNCTION texticlike(citext, text) +RETURNS bool AS 'texticlike' +LANGUAGE internal IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION texticnlike(citext, text) +RETURNS bool AS 'texticnlike' +LANGUAGE internal IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION texticregexeq(citext, text) +RETURNS bool AS 'texticregexeq' +LANGUAGE internal IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION texticregexne(citext, text) +RETURNS bool AS 'texticregexne' +LANGUAGE internal IMMUTABLE STRICT; + +CREATE OPERATOR ~ ( + PROCEDURE = texticregexeq, + LEFTARG = citext, + RIGHTARG = text, + NEGATOR = !~, + RESTRICT = icregexeqsel, + JOIN = icregexeqjoinsel +); + +CREATE OPERATOR ~* ( + PROCEDURE = texticregexeq, + LEFTARG = citext, + RIGHTARG = text, + NEGATOR = !~*, + RESTRICT = icregexeqsel, + JOIN = icregexeqjoinsel +); + +CREATE OPERATOR !~ ( + PROCEDURE = texticregexne, + LEFTARG = citext, + RIGHTARG = text, + NEGATOR = ~, + RESTRICT = icregexnesel, + JOIN = icregexnejoinsel +); + +CREATE OPERATOR !~* ( + PROCEDURE = texticregexne, + LEFTARG = citext, + RIGHTARG = text, + NEGATOR = ~*, + RESTRICT = icregexnesel, + JOIN = icregexnejoinsel +); + +CREATE OPERATOR ~~ ( + PROCEDURE = texticlike, + LEFTARG = citext, + RIGHTARG = text, + NEGATOR = !~~, + RESTRICT = iclikesel, + JOIN = iclikejoinsel +); + +CREATE OPERATOR ~~* ( + PROCEDURE = texticlike, + LEFTARG = citext, + RIGHTARG = text, + NEGATOR = !~~*, + RESTRICT = iclikesel, + JOIN = iclikejoinsel +); + +CREATE OPERATOR !~~ ( + PROCEDURE = texticnlike, + LEFTARG = citext, + RIGHTARG = text, + NEGATOR = ~~, + RESTRICT = icnlikesel, + JOIN = icnlikejoinsel +); + +CREATE OPERATOR !~~* ( + PROCEDURE = texticnlike, + LEFTARG = citext, + RIGHTARG = text, + NEGATOR = ~~*, + RESTRICT = icnlikesel, + JOIN = icnlikejoinsel +); + +-- +-- Matching citext in string comparison functions. +-- XXX TODO Ideally these would be implemented in C. +-- + +CREATE OR REPLACE FUNCTION regexp_matches( citext, citext ) RETURNS TEXT[] AS $$ + SELECT pg_catalog.regexp_matches( $1::pg_catalog.text, $2::pg_catalog.text, 'i' ); +$$ LANGUAGE SQL IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION regexp_matches( citext, citext, text ) RETURNS TEXT[] AS $$ + SELECT pg_catalog.regexp_matches( $1::pg_catalog.text, $2::pg_catalog.text, CASE WHEN pg_catalog.strpos($3, 'c') = 0 THEN $3 || 'i' ELSE $3 END ); +$$ LANGUAGE SQL IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION regexp_replace( citext, citext, text ) returns TEXT AS $$ + SELECT pg_catalog.regexp_replace( $1::pg_catalog.text, $2::pg_catalog.text, $3, 'i'); +$$ LANGUAGE SQL IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION regexp_replace( citext, citext, text, text ) returns TEXT AS $$ + SELECT pg_catalog.regexp_replace( $1::pg_catalog.text, $2::pg_catalog.text, $3, CASE WHEN pg_catalog.strpos($4, 'c') = 0 THEN $4 || 'i' ELSE $4 END); +$$ LANGUAGE SQL IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION regexp_split_to_array( citext, citext ) RETURNS TEXT[] AS $$ + SELECT pg_catalog.regexp_split_to_array( $1::pg_catalog.text, $2::pg_catalog.text, 'i' ); +$$ LANGUAGE SQL IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION regexp_split_to_array( citext, citext, text ) RETURNS TEXT[] AS $$ + SELECT pg_catalog.regexp_split_to_array( $1::pg_catalog.text, $2::pg_catalog.text, CASE WHEN pg_catalog.strpos($3, 'c') = 0 THEN $3 || 'i' ELSE $3 END ); +$$ LANGUAGE SQL IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION regexp_split_to_table( citext, citext ) RETURNS SETOF TEXT AS $$ + SELECT pg_catalog.regexp_split_to_table( $1::pg_catalog.text, $2::pg_catalog.text, 'i' ); +$$ LANGUAGE SQL IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION regexp_split_to_table( citext, citext, text ) RETURNS SETOF TEXT AS $$ + SELECT pg_catalog.regexp_split_to_table( $1::pg_catalog.text, $2::pg_catalog.text, CASE WHEN pg_catalog.strpos($3, 'c') = 0 THEN $3 || 'i' ELSE $3 END ); +$$ LANGUAGE SQL IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION strpos( citext, citext ) RETURNS INT AS $$ + SELECT pg_catalog.strpos( pg_catalog.lower( $1::pg_catalog.text ), pg_catalog.lower( $2::pg_catalog.text ) ); +$$ LANGUAGE SQL IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION replace( citext, citext, citext ) RETURNS TEXT AS $$ + SELECT pg_catalog.regexp_replace( $1::pg_catalog.text, pg_catalog.regexp_replace($2::pg_catalog.text, '([^a-zA-Z_0-9])', E'\\\\\\1', 'g'), $3::pg_catalog.text, 'gi' ); +$$ LANGUAGE SQL IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION split_part( citext, citext, int ) RETURNS TEXT AS $$ + SELECT (pg_catalog.regexp_split_to_array( $1::pg_catalog.text, pg_catalog.regexp_replace($2::pg_catalog.text, '([^a-zA-Z_0-9])', E'\\\\\\1', 'g'), 'i'))[$3]; +$$ LANGUAGE SQL IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION translate( citext, citext, text ) RETURNS TEXT AS $$ + SELECT pg_catalog.translate( pg_catalog.translate( $1::pg_catalog.text, pg_catalog.lower($2::pg_catalog.text), $3), pg_catalog.upper($2::pg_catalog.text), $3); +$$ LANGUAGE SQL IMMUTABLE STRICT; diff --git a/contrib/citext/citext--unpackaged--1.0.sql b/contrib/citext/citext--unpackaged--1.0.sql new file mode 100644 index 0000000000..7dcdc39413 --- /dev/null +++ b/contrib/citext/citext--unpackaged--1.0.sql @@ -0,0 +1,76 @@ +/* contrib/citext/citext--unpackaged--1.0.sql */ + +ALTER EXTENSION citext ADD type citext; +ALTER EXTENSION citext ADD function citextin(cstring); +ALTER EXTENSION citext ADD function citextout(citext); +ALTER EXTENSION citext ADD function citextrecv(internal); +ALTER EXTENSION citext ADD function citextsend(citext); +ALTER EXTENSION citext ADD function citext(character); +ALTER EXTENSION citext ADD function citext(boolean); +ALTER EXTENSION citext ADD function citext(inet); +ALTER EXTENSION citext ADD cast (citext as text); +ALTER EXTENSION citext ADD cast (citext as character varying); +ALTER EXTENSION citext ADD cast (citext as character); +ALTER EXTENSION citext ADD cast (text as citext); +ALTER EXTENSION citext ADD cast (character varying as citext); +ALTER EXTENSION citext ADD cast (character as citext); +ALTER EXTENSION citext ADD cast (boolean as citext); +ALTER EXTENSION citext ADD cast (inet as citext); +ALTER EXTENSION citext ADD function citext_eq(citext,citext); +ALTER EXTENSION citext ADD function citext_ne(citext,citext); +ALTER EXTENSION citext ADD function citext_lt(citext,citext); +ALTER EXTENSION citext ADD function citext_le(citext,citext); +ALTER EXTENSION citext ADD function citext_gt(citext,citext); +ALTER EXTENSION citext ADD function citext_ge(citext,citext); +ALTER EXTENSION citext ADD operator <>(citext,citext); +ALTER EXTENSION citext ADD operator =(citext,citext); +ALTER EXTENSION citext ADD operator >(citext,citext); +ALTER EXTENSION citext ADD operator >=(citext,citext); +ALTER EXTENSION citext ADD operator <(citext,citext); +ALTER EXTENSION citext ADD operator <=(citext,citext); +ALTER EXTENSION citext ADD function citext_cmp(citext,citext); +ALTER EXTENSION citext ADD function citext_hash(citext); +ALTER EXTENSION citext ADD operator family citext_ops using btree; +ALTER EXTENSION citext ADD operator class citext_ops using btree; +ALTER EXTENSION citext ADD operator family citext_ops using hash; +ALTER EXTENSION citext ADD operator class citext_ops using hash; +ALTER EXTENSION citext ADD function citext_smaller(citext,citext); +ALTER EXTENSION citext ADD function citext_larger(citext,citext); +ALTER EXTENSION citext ADD function min(citext); +ALTER EXTENSION citext ADD function max(citext); +ALTER EXTENSION citext ADD function texticlike(citext,citext); +ALTER EXTENSION citext ADD function texticnlike(citext,citext); +ALTER EXTENSION citext ADD function texticregexeq(citext,citext); +ALTER EXTENSION citext ADD function texticregexne(citext,citext); +ALTER EXTENSION citext ADD operator !~(citext,citext); +ALTER EXTENSION citext ADD operator ~(citext,citext); +ALTER EXTENSION citext ADD operator !~*(citext,citext); +ALTER EXTENSION citext ADD operator ~*(citext,citext); +ALTER EXTENSION citext ADD operator !~~(citext,citext); +ALTER EXTENSION citext ADD operator ~~(citext,citext); +ALTER EXTENSION citext ADD operator !~~*(citext,citext); +ALTER EXTENSION citext ADD operator ~~*(citext,citext); +ALTER EXTENSION citext ADD function texticlike(citext,text); +ALTER EXTENSION citext ADD function texticnlike(citext,text); +ALTER EXTENSION citext ADD function texticregexeq(citext,text); +ALTER EXTENSION citext ADD function texticregexne(citext,text); +ALTER EXTENSION citext ADD operator !~(citext,text); +ALTER EXTENSION citext ADD operator ~(citext,text); +ALTER EXTENSION citext ADD operator !~*(citext,text); +ALTER EXTENSION citext ADD operator ~*(citext,text); +ALTER EXTENSION citext ADD operator !~~(citext,text); +ALTER EXTENSION citext ADD operator ~~(citext,text); +ALTER EXTENSION citext ADD operator !~~*(citext,text); +ALTER EXTENSION citext ADD operator ~~*(citext,text); +ALTER EXTENSION citext ADD function regexp_matches(citext,citext); +ALTER EXTENSION citext ADD function regexp_matches(citext,citext,text); +ALTER EXTENSION citext ADD function regexp_replace(citext,citext,text); +ALTER EXTENSION citext ADD function regexp_replace(citext,citext,text,text); +ALTER EXTENSION citext ADD function regexp_split_to_array(citext,citext); +ALTER EXTENSION citext ADD function regexp_split_to_array(citext,citext,text); +ALTER EXTENSION citext ADD function regexp_split_to_table(citext,citext); +ALTER EXTENSION citext ADD function regexp_split_to_table(citext,citext,text); +ALTER EXTENSION citext ADD function strpos(citext,citext); +ALTER EXTENSION citext ADD function replace(citext,citext,citext); +ALTER EXTENSION citext ADD function split_part(citext,citext,integer); +ALTER EXTENSION citext ADD function translate(citext,citext,text); diff --git a/contrib/citext/citext.control b/contrib/citext/citext.control new file mode 100644 index 0000000000..3eb01a3360 --- /dev/null +++ b/contrib/citext/citext.control @@ -0,0 +1,5 @@ +# citext extension +comment = 'data type for case-insensitive character strings' +default_version = '1.0' +module_pathname = '$libdir/citext' +relocatable = true diff --git a/contrib/citext/citext.sql.in b/contrib/citext/citext.sql.in deleted file mode 100644 index 7056d0ead3..0000000000 --- a/contrib/citext/citext.sql.in +++ /dev/null @@ -1,489 +0,0 @@ -/* contrib/citext/citext.sql.in */ - --- Adjust this setting to control where the objects get created. -SET search_path = public; - --- --- PostgreSQL code for CITEXT. --- --- Most I/O functions, and a few others, piggyback on the "text" type --- functions via the implicit cast to text. --- - --- --- Shell type to keep things a bit quieter. --- - -CREATE TYPE citext; - --- --- Input and output functions. --- -CREATE OR REPLACE FUNCTION citextin(cstring) -RETURNS citext -AS 'textin' -LANGUAGE internal IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION citextout(citext) -RETURNS cstring -AS 'textout' -LANGUAGE internal IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION citextrecv(internal) -RETURNS citext -AS 'textrecv' -LANGUAGE internal STABLE STRICT; - -CREATE OR REPLACE FUNCTION citextsend(citext) -RETURNS bytea -AS 'textsend' -LANGUAGE internal STABLE STRICT; - --- --- The type itself. --- - -CREATE TYPE citext ( - INPUT = citextin, - OUTPUT = citextout, - RECEIVE = citextrecv, - SEND = citextsend, - INTERNALLENGTH = VARIABLE, - STORAGE = extended, - -- make it a non-preferred member of string type category - CATEGORY = 'S', - PREFERRED = false, - COLLATABLE = true -); - --- --- Type casting functions for those situations where the I/O casts don't --- automatically kick in. --- - -CREATE OR REPLACE FUNCTION citext(bpchar) -RETURNS citext -AS 'rtrim1' -LANGUAGE internal IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION citext(boolean) -RETURNS citext -AS 'booltext' -LANGUAGE internal IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION citext(inet) -RETURNS citext -AS 'network_show' -LANGUAGE internal IMMUTABLE STRICT; - --- --- Implicit and assignment type casts. --- - -CREATE CAST (citext AS text) WITHOUT FUNCTION AS IMPLICIT; -CREATE CAST (citext AS varchar) WITHOUT FUNCTION AS IMPLICIT; -CREATE CAST (citext AS bpchar) WITHOUT FUNCTION AS ASSIGNMENT; -CREATE CAST (text AS citext) WITHOUT FUNCTION AS ASSIGNMENT; -CREATE CAST (varchar AS citext) WITHOUT FUNCTION AS ASSIGNMENT; -CREATE CAST (bpchar AS citext) WITH FUNCTION citext(bpchar) AS ASSIGNMENT; -CREATE CAST (boolean AS citext) WITH FUNCTION citext(boolean) AS ASSIGNMENT; -CREATE CAST (inet AS citext) WITH FUNCTION citext(inet) AS ASSIGNMENT; - --- --- Operator Functions. --- - -CREATE OR REPLACE FUNCTION citext_eq( citext, citext ) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION citext_ne( citext, citext ) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION citext_lt( citext, citext ) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION citext_le( citext, citext ) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION citext_gt( citext, citext ) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION citext_ge( citext, citext ) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - --- --- Operators. --- - -CREATE OPERATOR = ( - LEFTARG = CITEXT, - RIGHTARG = CITEXT, - COMMUTATOR = =, - NEGATOR = <>, - PROCEDURE = citext_eq, - RESTRICT = eqsel, - JOIN = eqjoinsel, - HASHES, - MERGES -); - -CREATE OPERATOR <> ( - LEFTARG = CITEXT, - RIGHTARG = CITEXT, - NEGATOR = =, - COMMUTATOR = <>, - PROCEDURE = citext_ne, - RESTRICT = neqsel, - JOIN = neqjoinsel -); - -CREATE OPERATOR < ( - LEFTARG = CITEXT, - RIGHTARG = CITEXT, - NEGATOR = >=, - COMMUTATOR = >, - PROCEDURE = citext_lt, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel -); - -CREATE OPERATOR <= ( - LEFTARG = CITEXT, - RIGHTARG = CITEXT, - NEGATOR = >, - COMMUTATOR = >=, - PROCEDURE = citext_le, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel -); - -CREATE OPERATOR >= ( - LEFTARG = CITEXT, - RIGHTARG = CITEXT, - NEGATOR = <, - COMMUTATOR = <=, - PROCEDURE = citext_ge, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel -); - -CREATE OPERATOR > ( - LEFTARG = CITEXT, - RIGHTARG = CITEXT, - NEGATOR = <=, - COMMUTATOR = <, - PROCEDURE = citext_gt, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel -); - --- --- Support functions for indexing. --- - -CREATE OR REPLACE FUNCTION citext_cmp(citext, citext) -RETURNS int4 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION citext_hash(citext) -RETURNS int4 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - --- --- The btree indexing operator class. --- - -CREATE OPERATOR CLASS citext_ops -DEFAULT FOR TYPE CITEXT USING btree AS - OPERATOR 1 < (citext, citext), - OPERATOR 2 <= (citext, citext), - OPERATOR 3 = (citext, citext), - OPERATOR 4 >= (citext, citext), - OPERATOR 5 > (citext, citext), - FUNCTION 1 citext_cmp(citext, citext); - --- --- The hash indexing operator class. --- - -CREATE OPERATOR CLASS citext_ops -DEFAULT FOR TYPE citext USING hash AS - OPERATOR 1 = (citext, citext), - FUNCTION 1 citext_hash(citext); - --- --- Aggregates. --- - -CREATE OR REPLACE FUNCTION citext_smaller(citext, citext) -RETURNS citext -AS 'MODULE_PATHNAME' -LANGUAGE 'C' IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION citext_larger(citext, citext) -RETURNS citext -AS 'MODULE_PATHNAME' -LANGUAGE 'C' IMMUTABLE STRICT; - -CREATE AGGREGATE min(citext) ( - SFUNC = citext_smaller, - STYPE = citext, - SORTOP = < -); - -CREATE AGGREGATE max(citext) ( - SFUNC = citext_larger, - STYPE = citext, - SORTOP = > -); - --- --- CITEXT pattern matching. --- - -CREATE OR REPLACE FUNCTION texticlike(citext, citext) -RETURNS bool AS 'texticlike' -LANGUAGE internal IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION texticnlike(citext, citext) -RETURNS bool AS 'texticnlike' -LANGUAGE internal IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION texticregexeq(citext, citext) -RETURNS bool AS 'texticregexeq' -LANGUAGE internal IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION texticregexne(citext, citext) -RETURNS bool AS 'texticregexne' -LANGUAGE internal IMMUTABLE STRICT; - -CREATE OPERATOR ~ ( - PROCEDURE = texticregexeq, - LEFTARG = citext, - RIGHTARG = citext, - NEGATOR = !~, - RESTRICT = icregexeqsel, - JOIN = icregexeqjoinsel -); - -CREATE OPERATOR ~* ( - PROCEDURE = texticregexeq, - LEFTARG = citext, - RIGHTARG = citext, - NEGATOR = !~*, - RESTRICT = icregexeqsel, - JOIN = icregexeqjoinsel -); - -CREATE OPERATOR !~ ( - PROCEDURE = texticregexne, - LEFTARG = citext, - RIGHTARG = citext, - NEGATOR = ~, - RESTRICT = icregexnesel, - JOIN = icregexnejoinsel -); - -CREATE OPERATOR !~* ( - PROCEDURE = texticregexne, - LEFTARG = citext, - RIGHTARG = citext, - NEGATOR = ~*, - RESTRICT = icregexnesel, - JOIN = icregexnejoinsel -); - -CREATE OPERATOR ~~ ( - PROCEDURE = texticlike, - LEFTARG = citext, - RIGHTARG = citext, - NEGATOR = !~~, - RESTRICT = iclikesel, - JOIN = iclikejoinsel -); - -CREATE OPERATOR ~~* ( - PROCEDURE = texticlike, - LEFTARG = citext, - RIGHTARG = citext, - NEGATOR = !~~*, - RESTRICT = iclikesel, - JOIN = iclikejoinsel -); - -CREATE OPERATOR !~~ ( - PROCEDURE = texticnlike, - LEFTARG = citext, - RIGHTARG = citext, - NEGATOR = ~~, - RESTRICT = icnlikesel, - JOIN = icnlikejoinsel -); - -CREATE OPERATOR !~~* ( - PROCEDURE = texticnlike, - LEFTARG = citext, - RIGHTARG = citext, - NEGATOR = ~~*, - RESTRICT = icnlikesel, - JOIN = icnlikejoinsel -); - --- --- Matching citext to text. --- - -CREATE OR REPLACE FUNCTION texticlike(citext, text) -RETURNS bool AS 'texticlike' -LANGUAGE internal IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION texticnlike(citext, text) -RETURNS bool AS 'texticnlike' -LANGUAGE internal IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION texticregexeq(citext, text) -RETURNS bool AS 'texticregexeq' -LANGUAGE internal IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION texticregexne(citext, text) -RETURNS bool AS 'texticregexne' -LANGUAGE internal IMMUTABLE STRICT; - -CREATE OPERATOR ~ ( - PROCEDURE = texticregexeq, - LEFTARG = citext, - RIGHTARG = text, - NEGATOR = !~, - RESTRICT = icregexeqsel, - JOIN = icregexeqjoinsel -); - -CREATE OPERATOR ~* ( - PROCEDURE = texticregexeq, - LEFTARG = citext, - RIGHTARG = text, - NEGATOR = !~*, - RESTRICT = icregexeqsel, - JOIN = icregexeqjoinsel -); - -CREATE OPERATOR !~ ( - PROCEDURE = texticregexne, - LEFTARG = citext, - RIGHTARG = text, - NEGATOR = ~, - RESTRICT = icregexnesel, - JOIN = icregexnejoinsel -); - -CREATE OPERATOR !~* ( - PROCEDURE = texticregexne, - LEFTARG = citext, - RIGHTARG = text, - NEGATOR = ~*, - RESTRICT = icregexnesel, - JOIN = icregexnejoinsel -); - -CREATE OPERATOR ~~ ( - PROCEDURE = texticlike, - LEFTARG = citext, - RIGHTARG = text, - NEGATOR = !~~, - RESTRICT = iclikesel, - JOIN = iclikejoinsel -); - -CREATE OPERATOR ~~* ( - PROCEDURE = texticlike, - LEFTARG = citext, - RIGHTARG = text, - NEGATOR = !~~*, - RESTRICT = iclikesel, - JOIN = iclikejoinsel -); - -CREATE OPERATOR !~~ ( - PROCEDURE = texticnlike, - LEFTARG = citext, - RIGHTARG = text, - NEGATOR = ~~, - RESTRICT = icnlikesel, - JOIN = icnlikejoinsel -); - -CREATE OPERATOR !~~* ( - PROCEDURE = texticnlike, - LEFTARG = citext, - RIGHTARG = text, - NEGATOR = ~~*, - RESTRICT = icnlikesel, - JOIN = icnlikejoinsel -); - --- --- Matching citext in string comparison functions. --- XXX TODO Ideally these would be implemented in C. --- - -CREATE OR REPLACE FUNCTION regexp_matches( citext, citext ) RETURNS TEXT[] AS $$ - SELECT pg_catalog.regexp_matches( $1::pg_catalog.text, $2::pg_catalog.text, 'i' ); -$$ LANGUAGE SQL IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION regexp_matches( citext, citext, text ) RETURNS TEXT[] AS $$ - SELECT pg_catalog.regexp_matches( $1::pg_catalog.text, $2::pg_catalog.text, CASE WHEN pg_catalog.strpos($3, 'c') = 0 THEN $3 || 'i' ELSE $3 END ); -$$ LANGUAGE SQL IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION regexp_replace( citext, citext, text ) returns TEXT AS $$ - SELECT pg_catalog.regexp_replace( $1::pg_catalog.text, $2::pg_catalog.text, $3, 'i'); -$$ LANGUAGE SQL IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION regexp_replace( citext, citext, text, text ) returns TEXT AS $$ - SELECT pg_catalog.regexp_replace( $1::pg_catalog.text, $2::pg_catalog.text, $3, CASE WHEN pg_catalog.strpos($4, 'c') = 0 THEN $4 || 'i' ELSE $4 END); -$$ LANGUAGE SQL IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION regexp_split_to_array( citext, citext ) RETURNS TEXT[] AS $$ - SELECT pg_catalog.regexp_split_to_array( $1::pg_catalog.text, $2::pg_catalog.text, 'i' ); -$$ LANGUAGE SQL IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION regexp_split_to_array( citext, citext, text ) RETURNS TEXT[] AS $$ - SELECT pg_catalog.regexp_split_to_array( $1::pg_catalog.text, $2::pg_catalog.text, CASE WHEN pg_catalog.strpos($3, 'c') = 0 THEN $3 || 'i' ELSE $3 END ); -$$ LANGUAGE SQL IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION regexp_split_to_table( citext, citext ) RETURNS SETOF TEXT AS $$ - SELECT pg_catalog.regexp_split_to_table( $1::pg_catalog.text, $2::pg_catalog.text, 'i' ); -$$ LANGUAGE SQL IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION regexp_split_to_table( citext, citext, text ) RETURNS SETOF TEXT AS $$ - SELECT pg_catalog.regexp_split_to_table( $1::pg_catalog.text, $2::pg_catalog.text, CASE WHEN pg_catalog.strpos($3, 'c') = 0 THEN $3 || 'i' ELSE $3 END ); -$$ LANGUAGE SQL IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION strpos( citext, citext ) RETURNS INT AS $$ - SELECT pg_catalog.strpos( pg_catalog.lower( $1::pg_catalog.text ), pg_catalog.lower( $2::pg_catalog.text ) ); -$$ LANGUAGE SQL IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION replace( citext, citext, citext ) RETURNS TEXT AS $$ - SELECT pg_catalog.regexp_replace( $1::pg_catalog.text, pg_catalog.regexp_replace($2::pg_catalog.text, '([^a-zA-Z_0-9])', E'\\\\\\1', 'g'), $3::pg_catalog.text, 'gi' ); -$$ LANGUAGE SQL IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION split_part( citext, citext, int ) RETURNS TEXT AS $$ - SELECT (pg_catalog.regexp_split_to_array( $1::pg_catalog.text, pg_catalog.regexp_replace($2::pg_catalog.text, '([^a-zA-Z_0-9])', E'\\\\\\1', 'g'), 'i'))[$3]; -$$ LANGUAGE SQL IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION translate( citext, citext, text ) RETURNS TEXT AS $$ - SELECT pg_catalog.translate( pg_catalog.translate( $1::pg_catalog.text, pg_catalog.lower($2::pg_catalog.text), $3), pg_catalog.upper($2::pg_catalog.text), $3); -$$ LANGUAGE SQL IMMUTABLE STRICT; diff --git a/contrib/citext/expected/citext.out b/contrib/citext/expected/citext.out index 66ea5ee6ff..5392a7d1f3 100644 --- a/contrib/citext/expected/citext.out +++ b/contrib/citext/expected/citext.out @@ -1,12 +1,7 @@ -- -- Test citext datatype -- --- --- first, define the datatype. Turn off echoing so that expected file --- does not depend on contents of citext.sql. --- -SET client_min_messages = warning; -\set ECHO none +CREATE EXTENSION citext; -- Test the operators and indexing functions -- Test = and <>. SELECT 'a'::citext = 'a'::citext AS t; diff --git a/contrib/citext/expected/citext_1.out b/contrib/citext/expected/citext_1.out index c5ca1f6c54..5316ad0cda 100644 --- a/contrib/citext/expected/citext_1.out +++ b/contrib/citext/expected/citext_1.out @@ -1,12 +1,7 @@ -- -- Test citext datatype -- --- --- first, define the datatype. Turn off echoing so that expected file --- does not depend on contents of citext.sql. --- -SET client_min_messages = warning; -\set ECHO none +CREATE EXTENSION citext; -- Test the operators and indexing functions -- Test = and <>. SELECT 'a'::citext = 'a'::citext AS t; diff --git a/contrib/citext/sql/citext.sql b/contrib/citext/sql/citext.sql index 2f9b46665c..07497401a4 100644 --- a/contrib/citext/sql/citext.sql +++ b/contrib/citext/sql/citext.sql @@ -2,15 +2,7 @@ -- Test citext datatype -- --- --- first, define the datatype. Turn off echoing so that expected file --- does not depend on contents of citext.sql. --- -SET client_min_messages = warning; -\set ECHO none -\i citext.sql -RESET client_min_messages; -\set ECHO all +CREATE EXTENSION citext; -- Test the operators and indexing functions diff --git a/contrib/citext/uninstall_citext.sql b/contrib/citext/uninstall_citext.sql deleted file mode 100644 index 468987ad82..0000000000 --- a/contrib/citext/uninstall_citext.sql +++ /dev/null @@ -1,80 +0,0 @@ -/* contrib/citext/uninstall_citext.sql */ - --- Adjust this setting to control where the objects get dropped. -SET search_path = public; - -DROP OPERATOR CLASS citext_ops USING btree CASCADE; -DROP OPERATOR CLASS citext_ops USING hash CASCADE; - -DROP AGGREGATE min(citext); -DROP AGGREGATE max(citext); - -DROP OPERATOR = (citext, citext); -DROP OPERATOR <> (citext, citext); -DROP OPERATOR < (citext, citext); -DROP OPERATOR <= (citext, citext); -DROP OPERATOR >= (citext, citext); -DROP OPERATOR > (citext, citext); - -DROP OPERATOR ~ (citext, citext); -DROP OPERATOR ~* (citext, citext); -DROP OPERATOR !~ (citext, citext); -DROP OPERATOR !~* (citext, citext); -DROP OPERATOR ~~ (citext, citext); -DROP OPERATOR ~~* (citext, citext); -DROP OPERATOR !~~ (citext, citext); -DROP OPERATOR !~~* (citext, citext); - -DROP OPERATOR ~ (citext, text); -DROP OPERATOR ~* (citext, text); -DROP OPERATOR !~ (citext, text); -DROP OPERATOR !~* (citext, text); -DROP OPERATOR ~~ (citext, text); -DROP OPERATOR ~~* (citext, text); -DROP OPERATOR !~~ (citext, text); -DROP OPERATOR !~~* (citext, text); - -DROP CAST (citext AS text); -DROP CAST (citext AS varchar); -DROP CAST (citext AS bpchar); -DROP CAST (text AS citext); -DROP CAST (varchar AS citext); -DROP CAST (bpchar AS citext); -DROP CAST (boolean AS citext); -DROP CAST (inet AS citext); - -DROP FUNCTION citext(bpchar); -DROP FUNCTION citext(boolean); -DROP FUNCTION citext(inet); -DROP FUNCTION citext_eq(citext, citext); -DROP FUNCTION citext_ne(citext, citext); -DROP FUNCTION citext_lt(citext, citext); -DROP FUNCTION citext_le(citext, citext); -DROP FUNCTION citext_gt(citext, citext); -DROP FUNCTION citext_ge(citext, citext); -DROP FUNCTION citext_cmp(citext, citext); -DROP FUNCTION citext_hash(citext); -DROP FUNCTION citext_smaller(citext, citext); -DROP FUNCTION citext_larger(citext, citext); -DROP FUNCTION texticlike(citext, citext); -DROP FUNCTION texticnlike(citext, citext); -DROP FUNCTION texticregexeq(citext, citext); -DROP FUNCTION texticregexne(citext, citext); -DROP FUNCTION texticlike(citext, text); -DROP FUNCTION texticnlike(citext, text); -DROP FUNCTION texticregexeq(citext, text); -DROP FUNCTION texticregexne(citext, text); -DROP FUNCTION regexp_matches( citext, citext ); -DROP FUNCTION regexp_matches( citext, citext, text ); -DROP FUNCTION regexp_replace( citext, citext, text ); -DROP FUNCTION regexp_replace( citext, citext, text, text ); -DROP FUNCTION regexp_split_to_array( citext, citext ); -DROP FUNCTION regexp_split_to_array( citext, citext, text ); -DROP FUNCTION regexp_split_to_table( citext, citext ); -DROP FUNCTION regexp_split_to_table( citext, citext, text ); -DROP FUNCTION strpos( citext, citext ); -DROP FUNCTION replace( citext, citext, citext ); -DROP FUNCTION split_part( citext, citext, int ); -DROP FUNCTION translate( citext, citext, text ); - -DROP TYPE citext CASCADE; diff --git a/contrib/cube/.gitignore b/contrib/cube/.gitignore index 9f60da5078..a6484a05e7 100644 --- a/contrib/cube/.gitignore +++ b/contrib/cube/.gitignore @@ -1,5 +1,4 @@ /cubeparse.c /cubescan.c -/cube.sql # Generated subdirectories /results/ diff --git a/contrib/cube/Makefile b/contrib/cube/Makefile index 4fee79f84e..19fd7dc658 100644 --- a/contrib/cube/Makefile +++ b/contrib/cube/Makefile @@ -3,8 +3,9 @@ MODULE_big = cube OBJS= cube.o cubeparse.o -DATA_built = cube.sql -DATA = uninstall_cube.sql +EXTENSION = cube +DATA = cube--1.0.sql cube--unpackaged--1.0.sql + REGRESS = cube EXTRA_CLEAN = y.tab.c y.tab.h diff --git a/contrib/cube/cube--1.0.sql b/contrib/cube/cube--1.0.sql new file mode 100644 index 0000000000..18d69a5488 --- /dev/null +++ b/contrib/cube/cube--1.0.sql @@ -0,0 +1,322 @@ +/* contrib/cube/cube--1.0.sql */ + +-- Create the user-defined type for N-dimensional boxes + +CREATE OR REPLACE FUNCTION cube_in(cstring) +RETURNS cube +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION cube(float8[], float8[]) RETURNS cube +AS 'MODULE_PATHNAME', 'cube_a_f8_f8' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION cube(float8[]) RETURNS cube +AS 'MODULE_PATHNAME', 'cube_a_f8' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION cube_out(cube) +RETURNS cstring +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE TYPE cube ( + INTERNALLENGTH = variable, + INPUT = cube_in, + OUTPUT = cube_out, + ALIGNMENT = double +); + +COMMENT ON TYPE cube IS 'multi-dimensional cube ''(FLOAT-1, FLOAT-2, ..., FLOAT-N), (FLOAT-1, FLOAT-2, ..., FLOAT-N)'''; + +-- +-- External C-functions for R-tree methods +-- + +-- Comparison methods + +CREATE OR REPLACE FUNCTION cube_eq(cube, cube) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +COMMENT ON FUNCTION cube_eq(cube, cube) IS 'same as'; + +CREATE OR REPLACE FUNCTION cube_ne(cube, cube) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +COMMENT ON FUNCTION cube_ne(cube, cube) IS 'different'; + +CREATE OR REPLACE FUNCTION cube_lt(cube, cube) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +COMMENT ON FUNCTION cube_lt(cube, cube) IS 'lower than'; + +CREATE OR REPLACE FUNCTION cube_gt(cube, cube) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +COMMENT ON FUNCTION cube_gt(cube, cube) IS 'greater than'; + +CREATE OR REPLACE FUNCTION cube_le(cube, cube) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +COMMENT ON FUNCTION cube_le(cube, cube) IS 'lower than or equal to'; + +CREATE OR REPLACE FUNCTION cube_ge(cube, cube) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +COMMENT ON FUNCTION cube_ge(cube, cube) IS 'greater than or equal to'; + +CREATE OR REPLACE FUNCTION cube_cmp(cube, cube) +RETURNS int4 +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +COMMENT ON FUNCTION cube_cmp(cube, cube) IS 'btree comparison function'; + +CREATE OR REPLACE FUNCTION cube_contains(cube, cube) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +COMMENT ON FUNCTION cube_contains(cube, cube) IS 'contains'; + +CREATE OR REPLACE FUNCTION cube_contained(cube, cube) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +COMMENT ON FUNCTION cube_contained(cube, cube) IS 'contained in'; + +CREATE OR REPLACE FUNCTION cube_overlap(cube, cube) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +COMMENT ON FUNCTION cube_overlap(cube, cube) IS 'overlaps'; + +-- support routines for indexing + +CREATE OR REPLACE FUNCTION cube_union(cube, cube) +RETURNS cube +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION cube_inter(cube, cube) +RETURNS cube +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION cube_size(cube) +RETURNS float8 +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + + +-- Misc N-dimensional functions + +CREATE OR REPLACE FUNCTION cube_subset(cube, int4[]) +RETURNS cube +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +-- proximity routines + +CREATE OR REPLACE FUNCTION cube_distance(cube, cube) +RETURNS float8 +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +-- Extracting elements functions + +CREATE OR REPLACE FUNCTION cube_dim(cube) +RETURNS int4 +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION cube_ll_coord(cube, int4) +RETURNS float8 +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION cube_ur_coord(cube, int4) +RETURNS float8 +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION cube(float8) RETURNS cube +AS 'MODULE_PATHNAME', 'cube_f8' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION cube(float8, float8) RETURNS cube +AS 'MODULE_PATHNAME', 'cube_f8_f8' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION cube(cube, float8) RETURNS cube +AS 'MODULE_PATHNAME', 'cube_c_f8' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION cube(cube, float8, float8) RETURNS cube +AS 'MODULE_PATHNAME', 'cube_c_f8_f8' +LANGUAGE C IMMUTABLE STRICT; + +-- Test if cube is also a point + +CREATE OR REPLACE FUNCTION cube_is_point(cube) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +-- Increasing the size of a cube by a radius in at least n dimensions + +CREATE OR REPLACE FUNCTION cube_enlarge(cube, float8, int4) +RETURNS cube +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +-- +-- OPERATORS +-- + +CREATE OPERATOR < ( + LEFTARG = cube, RIGHTARG = cube, PROCEDURE = cube_lt, + COMMUTATOR = '>', NEGATOR = '>=', + RESTRICT = scalarltsel, JOIN = scalarltjoinsel +); + +CREATE OPERATOR > ( + LEFTARG = cube, RIGHTARG = cube, PROCEDURE = cube_gt, + COMMUTATOR = '<', NEGATOR = '<=', + RESTRICT = scalargtsel, JOIN = scalargtjoinsel +); + +CREATE OPERATOR <= ( + LEFTARG = cube, RIGHTARG = cube, PROCEDURE = cube_le, + COMMUTATOR = '>=', NEGATOR = '>', + RESTRICT = scalarltsel, JOIN = scalarltjoinsel +); + +CREATE OPERATOR >= ( + LEFTARG = cube, RIGHTARG = cube, PROCEDURE = cube_ge, + COMMUTATOR = '<=', NEGATOR = '<', + RESTRICT = scalargtsel, JOIN = scalargtjoinsel +); + +CREATE OPERATOR && ( + LEFTARG = cube, RIGHTARG = cube, PROCEDURE = cube_overlap, + COMMUTATOR = '&&', + RESTRICT = areasel, JOIN = areajoinsel +); + +CREATE OPERATOR = ( + LEFTARG = cube, RIGHTARG = cube, PROCEDURE = cube_eq, + COMMUTATOR = '=', NEGATOR = '<>', + RESTRICT = eqsel, JOIN = eqjoinsel, + MERGES +); + +CREATE OPERATOR <> ( + LEFTARG = cube, RIGHTARG = cube, PROCEDURE = cube_ne, + COMMUTATOR = '<>', NEGATOR = '=', + RESTRICT = neqsel, JOIN = neqjoinsel +); + +CREATE OPERATOR @> ( + LEFTARG = cube, RIGHTARG = cube, PROCEDURE = cube_contains, + COMMUTATOR = '<@', + RESTRICT = contsel, JOIN = contjoinsel +); + +CREATE OPERATOR <@ ( + LEFTARG = cube, RIGHTARG = cube, PROCEDURE = cube_contained, + COMMUTATOR = '@>', + RESTRICT = contsel, JOIN = contjoinsel +); + +-- these are obsolete/deprecated: +CREATE OPERATOR @ ( + LEFTARG = cube, RIGHTARG = cube, PROCEDURE = cube_contains, + COMMUTATOR = '~', + RESTRICT = contsel, JOIN = contjoinsel +); + +CREATE OPERATOR ~ ( + LEFTARG = cube, RIGHTARG = cube, PROCEDURE = cube_contained, + COMMUTATOR = '@', + RESTRICT = contsel, JOIN = contjoinsel +); + + +-- define the GiST support methods +CREATE OR REPLACE FUNCTION g_cube_consistent(internal,cube,int,oid,internal) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION g_cube_compress(internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION g_cube_decompress(internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION g_cube_penalty(internal,internal,internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION g_cube_picksplit(internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION g_cube_union(internal, internal) +RETURNS cube +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION g_cube_same(cube, cube, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + + +-- Create the operator classes for indexing + +CREATE OPERATOR CLASS cube_ops + DEFAULT FOR TYPE cube USING btree AS + OPERATOR 1 < , + OPERATOR 2 <= , + OPERATOR 3 = , + OPERATOR 4 >= , + OPERATOR 5 > , + FUNCTION 1 cube_cmp(cube, cube); + +CREATE OPERATOR CLASS gist_cube_ops + DEFAULT FOR TYPE cube USING gist AS + OPERATOR 3 && , + OPERATOR 6 = , + OPERATOR 7 @> , + OPERATOR 8 <@ , + OPERATOR 13 @ , + OPERATOR 14 ~ , + FUNCTION 1 g_cube_consistent (internal, cube, int, oid, internal), + FUNCTION 2 g_cube_union (internal, internal), + FUNCTION 3 g_cube_compress (internal), + FUNCTION 4 g_cube_decompress (internal), + FUNCTION 5 g_cube_penalty (internal, internal, internal), + FUNCTION 6 g_cube_picksplit (internal, internal), + FUNCTION 7 g_cube_same (cube, cube, internal); diff --git a/contrib/cube/cube--unpackaged--1.0.sql b/contrib/cube/cube--unpackaged--1.0.sql new file mode 100644 index 0000000000..866c18a289 --- /dev/null +++ b/contrib/cube/cube--unpackaged--1.0.sql @@ -0,0 +1,53 @@ +/* contrib/cube/cube--unpackaged--1.0.sql */ + +ALTER EXTENSION cube ADD type cube; +ALTER EXTENSION cube ADD function cube_in(cstring); +ALTER EXTENSION cube ADD function cube(double precision[],double precision[]); +ALTER EXTENSION cube ADD function cube(double precision[]); +ALTER EXTENSION cube ADD function cube_out(cube); +ALTER EXTENSION cube ADD function cube_eq(cube,cube); +ALTER EXTENSION cube ADD function cube_ne(cube,cube); +ALTER EXTENSION cube ADD function cube_lt(cube,cube); +ALTER EXTENSION cube ADD function cube_gt(cube,cube); +ALTER EXTENSION cube ADD function cube_le(cube,cube); +ALTER EXTENSION cube ADD function cube_ge(cube,cube); +ALTER EXTENSION cube ADD function cube_cmp(cube,cube); +ALTER EXTENSION cube ADD function cube_contains(cube,cube); +ALTER EXTENSION cube ADD function cube_contained(cube,cube); +ALTER EXTENSION cube ADD function cube_overlap(cube,cube); +ALTER EXTENSION cube ADD function cube_union(cube,cube); +ALTER EXTENSION cube ADD function cube_inter(cube,cube); +ALTER EXTENSION cube ADD function cube_size(cube); +ALTER EXTENSION cube ADD function cube_subset(cube,integer[]); +ALTER EXTENSION cube ADD function cube_distance(cube,cube); +ALTER EXTENSION cube ADD function cube_dim(cube); +ALTER EXTENSION cube ADD function cube_ll_coord(cube,integer); +ALTER EXTENSION cube ADD function cube_ur_coord(cube,integer); +ALTER EXTENSION cube ADD function cube(double precision); +ALTER EXTENSION cube ADD function cube(double precision,double precision); +ALTER EXTENSION cube ADD function cube(cube,double precision); +ALTER EXTENSION cube ADD function cube(cube,double precision,double precision); +ALTER EXTENSION cube ADD function cube_is_point(cube); +ALTER EXTENSION cube ADD function cube_enlarge(cube,double precision,integer); +ALTER EXTENSION cube ADD operator >(cube,cube); +ALTER EXTENSION cube ADD operator >=(cube,cube); +ALTER EXTENSION cube ADD operator <(cube,cube); +ALTER EXTENSION cube ADD operator <=(cube,cube); +ALTER EXTENSION cube ADD operator &&(cube,cube); +ALTER EXTENSION cube ADD operator <>(cube,cube); +ALTER EXTENSION cube ADD operator =(cube,cube); +ALTER EXTENSION cube ADD operator <@(cube,cube); +ALTER EXTENSION cube ADD operator @>(cube,cube); +ALTER EXTENSION cube ADD operator ~(cube,cube); +ALTER EXTENSION cube ADD operator @(cube,cube); +ALTER EXTENSION cube ADD function g_cube_consistent(internal,cube,integer,oid,internal); +ALTER EXTENSION cube ADD function g_cube_compress(internal); +ALTER EXTENSION cube ADD function g_cube_decompress(internal); +ALTER EXTENSION cube ADD function g_cube_penalty(internal,internal,internal); +ALTER EXTENSION cube ADD function g_cube_picksplit(internal,internal); +ALTER EXTENSION cube ADD function g_cube_union(internal,internal); +ALTER EXTENSION cube ADD function g_cube_same(cube,cube,internal); +ALTER EXTENSION cube ADD operator family cube_ops using btree; +ALTER EXTENSION cube ADD operator class cube_ops using btree; +ALTER EXTENSION cube ADD operator family gist_cube_ops using gist; +ALTER EXTENSION cube ADD operator class gist_cube_ops using gist; diff --git a/contrib/cube/cube.control b/contrib/cube/cube.control new file mode 100644 index 0000000000..ddc8d2e5d1 --- /dev/null +++ b/contrib/cube/cube.control @@ -0,0 +1,5 @@ +# cube extension +comment = 'data type for multidimensional cubes' +default_version = '1.0' +module_pathname = '$libdir/cube' +relocatable = true diff --git a/contrib/cube/cube.sql.in b/contrib/cube/cube.sql.in deleted file mode 100644 index a7e6b1d2b9..0000000000 --- a/contrib/cube/cube.sql.in +++ /dev/null @@ -1,326 +0,0 @@ -/* contrib/cube/cube.sql.in */ - --- Adjust this setting to control where the objects get created. -SET search_path = public; - --- Create the user-defined type for N-dimensional boxes --- - -CREATE OR REPLACE FUNCTION cube_in(cstring) -RETURNS cube -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION cube(float8[], float8[]) RETURNS cube -AS 'MODULE_PATHNAME', 'cube_a_f8_f8' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION cube(float8[]) RETURNS cube -AS 'MODULE_PATHNAME', 'cube_a_f8' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION cube_out(cube) -RETURNS cstring -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE TYPE cube ( - INTERNALLENGTH = variable, - INPUT = cube_in, - OUTPUT = cube_out, - ALIGNMENT = double -); - -COMMENT ON TYPE cube IS 'multi-dimensional cube ''(FLOAT-1, FLOAT-2, ..., FLOAT-N), (FLOAT-1, FLOAT-2, ..., FLOAT-N)'''; - --- --- External C-functions for R-tree methods --- - --- Comparison methods - -CREATE OR REPLACE FUNCTION cube_eq(cube, cube) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -COMMENT ON FUNCTION cube_eq(cube, cube) IS 'same as'; - -CREATE OR REPLACE FUNCTION cube_ne(cube, cube) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -COMMENT ON FUNCTION cube_ne(cube, cube) IS 'different'; - -CREATE OR REPLACE FUNCTION cube_lt(cube, cube) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -COMMENT ON FUNCTION cube_lt(cube, cube) IS 'lower than'; - -CREATE OR REPLACE FUNCTION cube_gt(cube, cube) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -COMMENT ON FUNCTION cube_gt(cube, cube) IS 'greater than'; - -CREATE OR REPLACE FUNCTION cube_le(cube, cube) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -COMMENT ON FUNCTION cube_le(cube, cube) IS 'lower than or equal to'; - -CREATE OR REPLACE FUNCTION cube_ge(cube, cube) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -COMMENT ON FUNCTION cube_ge(cube, cube) IS 'greater than or equal to'; - -CREATE OR REPLACE FUNCTION cube_cmp(cube, cube) -RETURNS int4 -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -COMMENT ON FUNCTION cube_cmp(cube, cube) IS 'btree comparison function'; - -CREATE OR REPLACE FUNCTION cube_contains(cube, cube) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -COMMENT ON FUNCTION cube_contains(cube, cube) IS 'contains'; - -CREATE OR REPLACE FUNCTION cube_contained(cube, cube) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -COMMENT ON FUNCTION cube_contained(cube, cube) IS 'contained in'; - -CREATE OR REPLACE FUNCTION cube_overlap(cube, cube) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -COMMENT ON FUNCTION cube_overlap(cube, cube) IS 'overlaps'; - --- support routines for indexing - -CREATE OR REPLACE FUNCTION cube_union(cube, cube) -RETURNS cube -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION cube_inter(cube, cube) -RETURNS cube -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION cube_size(cube) -RETURNS float8 -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - - --- Misc N-dimensional functions - -CREATE OR REPLACE FUNCTION cube_subset(cube, int4[]) -RETURNS cube -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - --- proximity routines - -CREATE OR REPLACE FUNCTION cube_distance(cube, cube) -RETURNS float8 -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - --- Extracting elements functions - -CREATE OR REPLACE FUNCTION cube_dim(cube) -RETURNS int4 -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION cube_ll_coord(cube, int4) -RETURNS float8 -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION cube_ur_coord(cube, int4) -RETURNS float8 -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION cube(float8) RETURNS cube -AS 'MODULE_PATHNAME', 'cube_f8' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION cube(float8, float8) RETURNS cube -AS 'MODULE_PATHNAME', 'cube_f8_f8' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION cube(cube, float8) RETURNS cube -AS 'MODULE_PATHNAME', 'cube_c_f8' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION cube(cube, float8, float8) RETURNS cube -AS 'MODULE_PATHNAME', 'cube_c_f8_f8' -LANGUAGE C IMMUTABLE STRICT; - --- Test if cube is also a point - -CREATE OR REPLACE FUNCTION cube_is_point(cube) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - --- Increasing the size of a cube by a radius in at least n dimensions - -CREATE OR REPLACE FUNCTION cube_enlarge(cube, float8, int4) -RETURNS cube -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - --- --- OPERATORS --- - -CREATE OPERATOR < ( - LEFTARG = cube, RIGHTARG = cube, PROCEDURE = cube_lt, - COMMUTATOR = '>', NEGATOR = '>=', - RESTRICT = scalarltsel, JOIN = scalarltjoinsel -); - -CREATE OPERATOR > ( - LEFTARG = cube, RIGHTARG = cube, PROCEDURE = cube_gt, - COMMUTATOR = '<', NEGATOR = '<=', - RESTRICT = scalargtsel, JOIN = scalargtjoinsel -); - -CREATE OPERATOR <= ( - LEFTARG = cube, RIGHTARG = cube, PROCEDURE = cube_le, - COMMUTATOR = '>=', NEGATOR = '>', - RESTRICT = scalarltsel, JOIN = scalarltjoinsel -); - -CREATE OPERATOR >= ( - LEFTARG = cube, RIGHTARG = cube, PROCEDURE = cube_ge, - COMMUTATOR = '<=', NEGATOR = '<', - RESTRICT = scalargtsel, JOIN = scalargtjoinsel -); - -CREATE OPERATOR && ( - LEFTARG = cube, RIGHTARG = cube, PROCEDURE = cube_overlap, - COMMUTATOR = '&&', - RESTRICT = areasel, JOIN = areajoinsel -); - -CREATE OPERATOR = ( - LEFTARG = cube, RIGHTARG = cube, PROCEDURE = cube_eq, - COMMUTATOR = '=', NEGATOR = '<>', - RESTRICT = eqsel, JOIN = eqjoinsel, - MERGES -); - -CREATE OPERATOR <> ( - LEFTARG = cube, RIGHTARG = cube, PROCEDURE = cube_ne, - COMMUTATOR = '<>', NEGATOR = '=', - RESTRICT = neqsel, JOIN = neqjoinsel -); - -CREATE OPERATOR @> ( - LEFTARG = cube, RIGHTARG = cube, PROCEDURE = cube_contains, - COMMUTATOR = '<@', - RESTRICT = contsel, JOIN = contjoinsel -); - -CREATE OPERATOR <@ ( - LEFTARG = cube, RIGHTARG = cube, PROCEDURE = cube_contained, - COMMUTATOR = '@>', - RESTRICT = contsel, JOIN = contjoinsel -); - --- these are obsolete/deprecated: -CREATE OPERATOR @ ( - LEFTARG = cube, RIGHTARG = cube, PROCEDURE = cube_contains, - COMMUTATOR = '~', - RESTRICT = contsel, JOIN = contjoinsel -); - -CREATE OPERATOR ~ ( - LEFTARG = cube, RIGHTARG = cube, PROCEDURE = cube_contained, - COMMUTATOR = '@', - RESTRICT = contsel, JOIN = contjoinsel -); - - --- define the GiST support methods -CREATE OR REPLACE FUNCTION g_cube_consistent(internal,cube,int,oid,internal) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION g_cube_compress(internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION g_cube_decompress(internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION g_cube_penalty(internal,internal,internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION g_cube_picksplit(internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION g_cube_union(internal, internal) -RETURNS cube -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION g_cube_same(cube, cube, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - - --- Create the operator classes for indexing - -CREATE OPERATOR CLASS cube_ops - DEFAULT FOR TYPE cube USING btree AS - OPERATOR 1 < , - OPERATOR 2 <= , - OPERATOR 3 = , - OPERATOR 4 >= , - OPERATOR 5 > , - FUNCTION 1 cube_cmp(cube, cube); - -CREATE OPERATOR CLASS gist_cube_ops - DEFAULT FOR TYPE cube USING gist AS - OPERATOR 3 && , - OPERATOR 6 = , - OPERATOR 7 @> , - OPERATOR 8 <@ , - OPERATOR 13 @ , - OPERATOR 14 ~ , - FUNCTION 1 g_cube_consistent (internal, cube, int, oid, internal), - FUNCTION 2 g_cube_union (internal, internal), - FUNCTION 3 g_cube_compress (internal), - FUNCTION 4 g_cube_decompress (internal), - FUNCTION 5 g_cube_penalty (internal, internal, internal), - FUNCTION 6 g_cube_picksplit (internal, internal), - FUNCTION 7 g_cube_same (cube, cube, internal); diff --git a/contrib/cube/expected/cube.out b/contrib/cube/expected/cube.out index ae7b5b22c2..05cf3eae3c 100644 --- a/contrib/cube/expected/cube.out +++ b/contrib/cube/expected/cube.out @@ -1,13 +1,7 @@ -- -- Test cube datatype -- --- --- first, define the datatype. Turn off echoing so that expected file --- does not depend on contents of cube.sql. --- -SET client_min_messages = warning; -\set ECHO none -RESET client_min_messages; +CREATE EXTENSION cube; -- -- testing the input and output functions -- diff --git a/contrib/cube/expected/cube_1.out b/contrib/cube/expected/cube_1.out index f27e832d63..fefebf5fb9 100644 --- a/contrib/cube/expected/cube_1.out +++ b/contrib/cube/expected/cube_1.out @@ -1,13 +1,7 @@ -- -- Test cube datatype -- --- --- first, define the datatype. Turn off echoing so that expected file --- does not depend on contents of cube.sql. --- -SET client_min_messages = warning; -\set ECHO none -RESET client_min_messages; +CREATE EXTENSION cube; -- -- testing the input and output functions -- diff --git a/contrib/cube/expected/cube_2.out b/contrib/cube/expected/cube_2.out index f534ccf0b5..6d15d63570 100644 --- a/contrib/cube/expected/cube_2.out +++ b/contrib/cube/expected/cube_2.out @@ -1,13 +1,7 @@ -- -- Test cube datatype -- --- --- first, define the datatype. Turn off echoing so that expected file --- does not depend on contents of cube.sql. --- -SET client_min_messages = warning; -\set ECHO none -RESET client_min_messages; +CREATE EXTENSION cube; -- -- testing the input and output functions -- diff --git a/contrib/cube/sql/cube.sql b/contrib/cube/sql/cube.sql index 5c12183dfd..02e068edf4 100644 --- a/contrib/cube/sql/cube.sql +++ b/contrib/cube/sql/cube.sql @@ -2,15 +2,7 @@ -- Test cube datatype -- --- --- first, define the datatype. Turn off echoing so that expected file --- does not depend on contents of cube.sql. --- -SET client_min_messages = warning; -\set ECHO none -\i cube.sql -\set ECHO all -RESET client_min_messages; +CREATE EXTENSION cube; -- -- testing the input and output functions diff --git a/contrib/cube/uninstall_cube.sql b/contrib/cube/uninstall_cube.sql deleted file mode 100644 index aa7119e0d0..0000000000 --- a/contrib/cube/uninstall_cube.sql +++ /dev/null @@ -1,98 +0,0 @@ -/* contrib/cube/uninstall_cube.sql */ - --- Adjust this setting to control where the objects get dropped. -SET search_path = public; - -DROP OPERATOR CLASS gist_cube_ops USING gist; - -DROP OPERATOR CLASS cube_ops USING btree; - -DROP FUNCTION g_cube_same(cube, cube, internal); - -DROP FUNCTION g_cube_union(internal, internal); - -DROP FUNCTION g_cube_picksplit(internal, internal); - -DROP FUNCTION g_cube_penalty(internal,internal,internal); - -DROP FUNCTION g_cube_decompress(internal); - -DROP FUNCTION g_cube_compress(internal); - -DROP FUNCTION g_cube_consistent(internal,cube,int,oid,internal); - -DROP OPERATOR ~ (cube, cube); - -DROP OPERATOR @ (cube, cube); - -DROP OPERATOR <@ (cube, cube); - -DROP OPERATOR @> (cube, cube); - -DROP OPERATOR <> (cube, cube); - -DROP OPERATOR = (cube, cube); - -DROP OPERATOR && (cube, cube); - -DROP OPERATOR >= (cube, cube); - -DROP OPERATOR <= (cube, cube); - -DROP OPERATOR > (cube, cube); - -DROP OPERATOR < (cube, cube); - -DROP FUNCTION cube_enlarge(cube, float8, int4); - -DROP FUNCTION cube_is_point(cube); - -DROP FUNCTION cube(cube, float8, float8); - -DROP FUNCTION cube(cube, float8); - -DROP FUNCTION cube(float8, float8); - -DROP FUNCTION cube(float8[], float8[]); - -DROP FUNCTION cube(float8[]); - -DROP FUNCTION cube_subset(cube, int4[]); - -DROP FUNCTION cube(float8); - -DROP FUNCTION cube_ur_coord(cube, int4); - -DROP FUNCTION cube_ll_coord(cube, int4); - -DROP FUNCTION cube_dim(cube); - -DROP FUNCTION cube_distance(cube, cube); - -DROP FUNCTION cube_size(cube); - -DROP FUNCTION cube_inter(cube, cube); - -DROP FUNCTION cube_union(cube, cube); - -DROP FUNCTION cube_overlap(cube, cube); - -DROP FUNCTION cube_contained(cube, cube); - -DROP FUNCTION cube_contains(cube, cube); - -DROP FUNCTION cube_cmp(cube, cube); - -DROP FUNCTION cube_ge(cube, cube); - -DROP FUNCTION cube_le(cube, cube); - -DROP FUNCTION cube_gt(cube, cube); - -DROP FUNCTION cube_lt(cube, cube); - -DROP FUNCTION cube_ne(cube, cube); - -DROP FUNCTION cube_eq(cube, cube); - -DROP TYPE cube CASCADE; diff --git a/contrib/dblink/.gitignore b/contrib/dblink/.gitignore index fb7e8728bc..19b6c5ba42 100644 --- a/contrib/dblink/.gitignore +++ b/contrib/dblink/.gitignore @@ -1,3 +1,2 @@ -/dblink.sql # Generated subdirectories /results/ diff --git a/contrib/dblink/Makefile b/contrib/dblink/Makefile index fdfd03a4cf..ac637480eb 100644 --- a/contrib/dblink/Makefile +++ b/contrib/dblink/Makefile @@ -1,15 +1,15 @@ # contrib/dblink/Makefile MODULE_big = dblink -PG_CPPFLAGS = -I$(libpq_srcdir) OBJS = dblink.o +PG_CPPFLAGS = -I$(libpq_srcdir) SHLIB_LINK = $(libpq) SHLIB_PREREQS = submake-libpq -DATA_built = dblink.sql -DATA = uninstall_dblink.sql -REGRESS = dblink +EXTENSION = dblink +DATA = dblink--1.0.sql dblink--unpackaged--1.0.sql +REGRESS = dblink ifdef USE_PGXS PG_CONFIG = pg_config diff --git a/contrib/dblink/dblink--1.0.sql b/contrib/dblink/dblink--1.0.sql new file mode 100644 index 0000000000..e9137828f1 --- /dev/null +++ b/contrib/dblink/dblink--1.0.sql @@ -0,0 +1,220 @@ +/* contrib/dblink/dblink--1.0.sql */ + +-- dblink_connect now restricts non-superusers to password +-- authenticated connections +CREATE OR REPLACE FUNCTION dblink_connect (text) +RETURNS text +AS 'MODULE_PATHNAME','dblink_connect' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION dblink_connect (text, text) +RETURNS text +AS 'MODULE_PATHNAME','dblink_connect' +LANGUAGE C STRICT; + +-- dblink_connect_u allows non-superusers to use +-- non-password authenticated connections, but initially +-- privileges are revoked from public +CREATE OR REPLACE FUNCTION dblink_connect_u (text) +RETURNS text +AS 'MODULE_PATHNAME','dblink_connect' +LANGUAGE C STRICT SECURITY DEFINER; + +CREATE OR REPLACE FUNCTION dblink_connect_u (text, text) +RETURNS text +AS 'MODULE_PATHNAME','dblink_connect' +LANGUAGE C STRICT SECURITY DEFINER; + +REVOKE ALL ON FUNCTION dblink_connect_u (text) FROM public; +REVOKE ALL ON FUNCTION dblink_connect_u (text, text) FROM public; + +CREATE OR REPLACE FUNCTION dblink_disconnect () +RETURNS text +AS 'MODULE_PATHNAME','dblink_disconnect' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION dblink_disconnect (text) +RETURNS text +AS 'MODULE_PATHNAME','dblink_disconnect' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION dblink_open (text, text) +RETURNS text +AS 'MODULE_PATHNAME','dblink_open' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION dblink_open (text, text, boolean) +RETURNS text +AS 'MODULE_PATHNAME','dblink_open' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION dblink_open (text, text, text) +RETURNS text +AS 'MODULE_PATHNAME','dblink_open' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION dblink_open (text, text, text, boolean) +RETURNS text +AS 'MODULE_PATHNAME','dblink_open' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION dblink_fetch (text, int) +RETURNS setof record +AS 'MODULE_PATHNAME','dblink_fetch' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION dblink_fetch (text, int, boolean) +RETURNS setof record +AS 'MODULE_PATHNAME','dblink_fetch' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION dblink_fetch (text, text, int) +RETURNS setof record +AS 'MODULE_PATHNAME','dblink_fetch' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION dblink_fetch (text, text, int, boolean) +RETURNS setof record +AS 'MODULE_PATHNAME','dblink_fetch' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION dblink_close (text) +RETURNS text +AS 'MODULE_PATHNAME','dblink_close' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION dblink_close (text, boolean) +RETURNS text +AS 'MODULE_PATHNAME','dblink_close' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION dblink_close (text, text) +RETURNS text +AS 'MODULE_PATHNAME','dblink_close' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION dblink_close (text, text, boolean) +RETURNS text +AS 'MODULE_PATHNAME','dblink_close' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION dblink (text, text) +RETURNS setof record +AS 'MODULE_PATHNAME','dblink_record' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION dblink (text, text, boolean) +RETURNS setof record +AS 'MODULE_PATHNAME','dblink_record' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION dblink (text) +RETURNS setof record +AS 'MODULE_PATHNAME','dblink_record' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION dblink (text, boolean) +RETURNS setof record +AS 'MODULE_PATHNAME','dblink_record' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION dblink_exec (text, text) +RETURNS text +AS 'MODULE_PATHNAME','dblink_exec' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION dblink_exec (text, text, boolean) +RETURNS text +AS 'MODULE_PATHNAME','dblink_exec' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION dblink_exec (text) +RETURNS text +AS 'MODULE_PATHNAME','dblink_exec' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION dblink_exec (text,boolean) +RETURNS text +AS 'MODULE_PATHNAME','dblink_exec' +LANGUAGE C STRICT; + +CREATE TYPE dblink_pkey_results AS (position int, colname text); + +CREATE OR REPLACE FUNCTION dblink_get_pkey (text) +RETURNS setof dblink_pkey_results +AS 'MODULE_PATHNAME','dblink_get_pkey' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION dblink_build_sql_insert (text, int2vector, int, _text, _text) +RETURNS text +AS 'MODULE_PATHNAME','dblink_build_sql_insert' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION dblink_build_sql_delete (text, int2vector, int, _text) +RETURNS text +AS 'MODULE_PATHNAME','dblink_build_sql_delete' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION dblink_build_sql_update (text, int2vector, int, _text, _text) +RETURNS text +AS 'MODULE_PATHNAME','dblink_build_sql_update' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION dblink_current_query () +RETURNS text +AS 'MODULE_PATHNAME','dblink_current_query' +LANGUAGE C; + +CREATE OR REPLACE FUNCTION dblink_send_query(text, text) +RETURNS int4 +AS 'MODULE_PATHNAME', 'dblink_send_query' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION dblink_is_busy(text) +RETURNS int4 +AS 'MODULE_PATHNAME', 'dblink_is_busy' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION dblink_get_result(text) +RETURNS SETOF record +AS 'MODULE_PATHNAME', 'dblink_get_result' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION dblink_get_result(text, bool) +RETURNS SETOF record +AS 'MODULE_PATHNAME', 'dblink_get_result' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION dblink_get_connections() +RETURNS text[] +AS 'MODULE_PATHNAME', 'dblink_get_connections' +LANGUAGE C; + +CREATE OR REPLACE FUNCTION dblink_cancel_query(text) +RETURNS text +AS 'MODULE_PATHNAME', 'dblink_cancel_query' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION dblink_error_message(text) +RETURNS text +AS 'MODULE_PATHNAME', 'dblink_error_message' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION dblink_get_notify( + OUT notify_name TEXT, + OUT be_pid INT4, + OUT extra TEXT +) +RETURNS setof record +AS 'MODULE_PATHNAME', 'dblink_get_notify' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION dblink_get_notify( + conname TEXT, + OUT notify_name TEXT, + OUT be_pid INT4, + OUT extra TEXT +) +RETURNS setof record +AS 'MODULE_PATHNAME', 'dblink_get_notify' +LANGUAGE C STRICT; diff --git a/contrib/dblink/dblink--unpackaged--1.0.sql b/contrib/dblink/dblink--unpackaged--1.0.sql new file mode 100644 index 0000000000..b6d184b4a2 --- /dev/null +++ b/contrib/dblink/dblink--unpackaged--1.0.sql @@ -0,0 +1,43 @@ +/* contrib/dblink/dblink--unpackaged--1.0.sql */ + +ALTER EXTENSION dblink ADD function dblink_connect(text); +ALTER EXTENSION dblink ADD function dblink_connect(text,text); +ALTER EXTENSION dblink ADD function dblink_connect_u(text); +ALTER EXTENSION dblink ADD function dblink_connect_u(text,text); +ALTER EXTENSION dblink ADD function dblink_disconnect(); +ALTER EXTENSION dblink ADD function dblink_disconnect(text); +ALTER EXTENSION dblink ADD function dblink_open(text,text); +ALTER EXTENSION dblink ADD function dblink_open(text,text,boolean); +ALTER EXTENSION dblink ADD function dblink_open(text,text,text); +ALTER EXTENSION dblink ADD function dblink_open(text,text,text,boolean); +ALTER EXTENSION dblink ADD function dblink_fetch(text,integer); +ALTER EXTENSION dblink ADD function dblink_fetch(text,integer,boolean); +ALTER EXTENSION dblink ADD function dblink_fetch(text,text,integer); +ALTER EXTENSION dblink ADD function dblink_fetch(text,text,integer,boolean); +ALTER EXTENSION dblink ADD function dblink_close(text); +ALTER EXTENSION dblink ADD function dblink_close(text,boolean); +ALTER EXTENSION dblink ADD function dblink_close(text,text); +ALTER EXTENSION dblink ADD function dblink_close(text,text,boolean); +ALTER EXTENSION dblink ADD function dblink(text,text); +ALTER EXTENSION dblink ADD function dblink(text,text,boolean); +ALTER EXTENSION dblink ADD function dblink(text); +ALTER EXTENSION dblink ADD function dblink(text,boolean); +ALTER EXTENSION dblink ADD function dblink_exec(text,text); +ALTER EXTENSION dblink ADD function dblink_exec(text,text,boolean); +ALTER EXTENSION dblink ADD function dblink_exec(text); +ALTER EXTENSION dblink ADD function dblink_exec(text,boolean); +ALTER EXTENSION dblink ADD type dblink_pkey_results; +ALTER EXTENSION dblink ADD function dblink_get_pkey(text); +ALTER EXTENSION dblink ADD function dblink_build_sql_insert(text,int2vector,integer,text[],text[]); +ALTER EXTENSION dblink ADD function dblink_build_sql_delete(text,int2vector,integer,text[]); +ALTER EXTENSION dblink ADD function dblink_build_sql_update(text,int2vector,integer,text[],text[]); +ALTER EXTENSION dblink ADD function dblink_current_query(); +ALTER EXTENSION dblink ADD function dblink_send_query(text,text); +ALTER EXTENSION dblink ADD function dblink_is_busy(text); +ALTER EXTENSION dblink ADD function dblink_get_result(text); +ALTER EXTENSION dblink ADD function dblink_get_result(text,boolean); +ALTER EXTENSION dblink ADD function dblink_get_connections(); +ALTER EXTENSION dblink ADD function dblink_cancel_query(text); +ALTER EXTENSION dblink ADD function dblink_error_message(text); +ALTER EXTENSION dblink ADD function dblink_get_notify(); +ALTER EXTENSION dblink ADD function dblink_get_notify(text); diff --git a/contrib/dblink/dblink.control b/contrib/dblink/dblink.control new file mode 100644 index 0000000000..4333a9b618 --- /dev/null +++ b/contrib/dblink/dblink.control @@ -0,0 +1,5 @@ +# dblink extension +comment = 'connect to other PostgreSQL databases from within a database' +default_version = '1.0' +module_pathname = '$libdir/dblink' +relocatable = true diff --git a/contrib/dblink/dblink.sql.in b/contrib/dblink/dblink.sql.in deleted file mode 100644 index 3c9d66e7df..0000000000 --- a/contrib/dblink/dblink.sql.in +++ /dev/null @@ -1,223 +0,0 @@ -/* contrib/dblink/dblink.sql.in */ - --- Adjust this setting to control where the objects get created. -SET search_path = public; - --- dblink_connect now restricts non-superusers to password --- authenticated connections -CREATE OR REPLACE FUNCTION dblink_connect (text) -RETURNS text -AS 'MODULE_PATHNAME','dblink_connect' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION dblink_connect (text, text) -RETURNS text -AS 'MODULE_PATHNAME','dblink_connect' -LANGUAGE C STRICT; - --- dblink_connect_u allows non-superusers to use --- non-password authenticated connections, but initially --- privileges are revoked from public -CREATE OR REPLACE FUNCTION dblink_connect_u (text) -RETURNS text -AS 'MODULE_PATHNAME','dblink_connect' -LANGUAGE C STRICT SECURITY DEFINER; - -CREATE OR REPLACE FUNCTION dblink_connect_u (text, text) -RETURNS text -AS 'MODULE_PATHNAME','dblink_connect' -LANGUAGE C STRICT SECURITY DEFINER; - -REVOKE ALL ON FUNCTION dblink_connect_u (text) FROM public; -REVOKE ALL ON FUNCTION dblink_connect_u (text, text) FROM public; - -CREATE OR REPLACE FUNCTION dblink_disconnect () -RETURNS text -AS 'MODULE_PATHNAME','dblink_disconnect' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION dblink_disconnect (text) -RETURNS text -AS 'MODULE_PATHNAME','dblink_disconnect' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION dblink_open (text, text) -RETURNS text -AS 'MODULE_PATHNAME','dblink_open' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION dblink_open (text, text, boolean) -RETURNS text -AS 'MODULE_PATHNAME','dblink_open' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION dblink_open (text, text, text) -RETURNS text -AS 'MODULE_PATHNAME','dblink_open' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION dblink_open (text, text, text, boolean) -RETURNS text -AS 'MODULE_PATHNAME','dblink_open' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION dblink_fetch (text, int) -RETURNS setof record -AS 'MODULE_PATHNAME','dblink_fetch' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION dblink_fetch (text, int, boolean) -RETURNS setof record -AS 'MODULE_PATHNAME','dblink_fetch' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION dblink_fetch (text, text, int) -RETURNS setof record -AS 'MODULE_PATHNAME','dblink_fetch' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION dblink_fetch (text, text, int, boolean) -RETURNS setof record -AS 'MODULE_PATHNAME','dblink_fetch' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION dblink_close (text) -RETURNS text -AS 'MODULE_PATHNAME','dblink_close' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION dblink_close (text, boolean) -RETURNS text -AS 'MODULE_PATHNAME','dblink_close' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION dblink_close (text, text) -RETURNS text -AS 'MODULE_PATHNAME','dblink_close' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION dblink_close (text, text, boolean) -RETURNS text -AS 'MODULE_PATHNAME','dblink_close' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION dblink (text, text) -RETURNS setof record -AS 'MODULE_PATHNAME','dblink_record' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION dblink (text, text, boolean) -RETURNS setof record -AS 'MODULE_PATHNAME','dblink_record' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION dblink (text) -RETURNS setof record -AS 'MODULE_PATHNAME','dblink_record' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION dblink (text, boolean) -RETURNS setof record -AS 'MODULE_PATHNAME','dblink_record' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION dblink_exec (text, text) -RETURNS text -AS 'MODULE_PATHNAME','dblink_exec' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION dblink_exec (text, text, boolean) -RETURNS text -AS 'MODULE_PATHNAME','dblink_exec' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION dblink_exec (text) -RETURNS text -AS 'MODULE_PATHNAME','dblink_exec' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION dblink_exec (text,boolean) -RETURNS text -AS 'MODULE_PATHNAME','dblink_exec' -LANGUAGE C STRICT; - -CREATE TYPE dblink_pkey_results AS (position int, colname text); - -CREATE OR REPLACE FUNCTION dblink_get_pkey (text) -RETURNS setof dblink_pkey_results -AS 'MODULE_PATHNAME','dblink_get_pkey' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION dblink_build_sql_insert (text, int2vector, int, _text, _text) -RETURNS text -AS 'MODULE_PATHNAME','dblink_build_sql_insert' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION dblink_build_sql_delete (text, int2vector, int, _text) -RETURNS text -AS 'MODULE_PATHNAME','dblink_build_sql_delete' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION dblink_build_sql_update (text, int2vector, int, _text, _text) -RETURNS text -AS 'MODULE_PATHNAME','dblink_build_sql_update' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION dblink_current_query () -RETURNS text -AS 'MODULE_PATHNAME','dblink_current_query' -LANGUAGE C; - -CREATE OR REPLACE FUNCTION dblink_send_query(text, text) -RETURNS int4 -AS 'MODULE_PATHNAME', 'dblink_send_query' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION dblink_is_busy(text) -RETURNS int4 -AS 'MODULE_PATHNAME', 'dblink_is_busy' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION dblink_get_result(text) -RETURNS SETOF record -AS 'MODULE_PATHNAME', 'dblink_get_result' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION dblink_get_result(text, bool) -RETURNS SETOF record -AS 'MODULE_PATHNAME', 'dblink_get_result' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION dblink_get_connections() -RETURNS text[] -AS 'MODULE_PATHNAME', 'dblink_get_connections' -LANGUAGE C; - -CREATE OR REPLACE FUNCTION dblink_cancel_query(text) -RETURNS text -AS 'MODULE_PATHNAME', 'dblink_cancel_query' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION dblink_error_message(text) -RETURNS text -AS 'MODULE_PATHNAME', 'dblink_error_message' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION dblink_get_notify( - OUT notify_name TEXT, - OUT be_pid INT4, - OUT extra TEXT -) -RETURNS setof record -AS 'MODULE_PATHNAME', 'dblink_get_notify' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION dblink_get_notify( - conname TEXT, - OUT notify_name TEXT, - OUT be_pid INT4, - OUT extra TEXT -) -RETURNS setof record -AS 'MODULE_PATHNAME', 'dblink_get_notify' -LANGUAGE C STRICT; diff --git a/contrib/dblink/expected/dblink.out b/contrib/dblink/expected/dblink.out index 15848dd922..511dd5efcf 100644 --- a/contrib/dblink/expected/dblink.out +++ b/contrib/dblink/expected/dblink.out @@ -1,14 +1,4 @@ --- Adjust this setting to control where the objects get created. -SET search_path = public; --- --- Define the functions and test data --- therein. --- --- Turn off echoing so that expected file does not depend on --- contents of dblink.sql. -SET client_min_messages = warning; -\set ECHO none -RESET client_min_messages; +CREATE EXTENSION dblink; CREATE TABLE foo(f1 int, f2 text, f3 text[], primary key (f1,f2)); NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index "foo_pkey" for table "foo" INSERT INTO foo VALUES (0,'a','{"a0","b0","c0"}'); diff --git a/contrib/dblink/sql/dblink.sql b/contrib/dblink/sql/dblink.sql index 062bc9ee0e..8c8ffe233c 100644 --- a/contrib/dblink/sql/dblink.sql +++ b/contrib/dblink/sql/dblink.sql @@ -1,17 +1,4 @@ --- Adjust this setting to control where the objects get created. -SET search_path = public; - --- --- Define the functions and test data --- therein. --- --- Turn off echoing so that expected file does not depend on --- contents of dblink.sql. -SET client_min_messages = warning; -\set ECHO none -\i dblink.sql -\set ECHO all -RESET client_min_messages; +CREATE EXTENSION dblink; CREATE TABLE foo(f1 int, f2 text, f3 text[], primary key (f1,f2)); INSERT INTO foo VALUES (0,'a','{"a0","b0","c0"}'); diff --git a/contrib/dblink/uninstall_dblink.sql b/contrib/dblink/uninstall_dblink.sql deleted file mode 100644 index 365728a6d7..0000000000 --- a/contrib/dblink/uninstall_dblink.sql +++ /dev/null @@ -1,86 +0,0 @@ -/* contrib/dblink/uninstall_dblink.sql */ - --- Adjust this setting to control where the objects get dropped. -SET search_path = public; - -DROP FUNCTION dblink_current_query (); - -DROP FUNCTION dblink_build_sql_update (text, int2vector, int4, _text, _text); - -DROP FUNCTION dblink_build_sql_delete (text, int2vector, int4, _text); - -DROP FUNCTION dblink_build_sql_insert (text, int2vector, int4, _text, _text); - -DROP FUNCTION dblink_get_pkey (text); - -DROP TYPE dblink_pkey_results; - -DROP FUNCTION dblink_exec (text,bool); - -DROP FUNCTION dblink_exec (text); - -DROP FUNCTION dblink_exec (text,text,bool); - -DROP FUNCTION dblink_exec (text,text); - -DROP FUNCTION dblink (text,bool); - -DROP FUNCTION dblink (text); - -DROP FUNCTION dblink (text,text,bool); - -DROP FUNCTION dblink (text,text); - -DROP FUNCTION dblink_close (text,text,bool); - -DROP FUNCTION dblink_close (text,text); - -DROP FUNCTION dblink_close (text,bool); - -DROP FUNCTION dblink_close (text); - -DROP FUNCTION dblink_fetch (text,text,int,bool); - -DROP FUNCTION dblink_fetch (text,text,int); - -DROP FUNCTION dblink_fetch (text,int,bool); - -DROP FUNCTION dblink_fetch (text,int); - -DROP FUNCTION dblink_open (text,text,text,bool); - -DROP FUNCTION dblink_open (text,text,text); - -DROP FUNCTION dblink_open (text,text,bool); - -DROP FUNCTION dblink_open (text,text); - -DROP FUNCTION dblink_disconnect (text); - -DROP FUNCTION dblink_disconnect (); - -DROP FUNCTION dblink_connect (text, text); - -DROP FUNCTION dblink_connect (text); - -DROP FUNCTION dblink_connect_u (text, text); - -DROP FUNCTION dblink_connect_u (text); - -DROP FUNCTION dblink_cancel_query(text); - -DROP FUNCTION dblink_error_message(text); - -DROP FUNCTION dblink_get_connections(); - -DROP FUNCTION dblink_get_result(text); - -DROP FUNCTION dblink_get_result(text, boolean); - -DROP FUNCTION dblink_is_busy(text); - -DROP FUNCTION dblink_send_query(text, text); - -DROP FUNCTION dblink_get_notify(); - -DROP FUNCTION dblink_get_notify(text); diff --git a/contrib/dict_int/.gitignore b/contrib/dict_int/.gitignore index 932dda6d84..19b6c5ba42 100644 --- a/contrib/dict_int/.gitignore +++ b/contrib/dict_int/.gitignore @@ -1,3 +1,2 @@ -/dict_int.sql # Generated subdirectories /results/ diff --git a/contrib/dict_int/Makefile b/contrib/dict_int/Makefile index 17d9eaa5f7..3a3fc368dc 100644 --- a/contrib/dict_int/Makefile +++ b/contrib/dict_int/Makefile @@ -2,8 +2,10 @@ MODULE_big = dict_int OBJS = dict_int.o -DATA_built = dict_int.sql -DATA = uninstall_dict_int.sql + +EXTENSION = dict_int +DATA = dict_int--1.0.sql dict_int--unpackaged--1.0.sql + REGRESS = dict_int ifdef USE_PGXS diff --git a/contrib/dict_int/dict_int--1.0.sql b/contrib/dict_int/dict_int--1.0.sql new file mode 100644 index 0000000000..a0e2b9af64 --- /dev/null +++ b/contrib/dict_int/dict_int--1.0.sql @@ -0,0 +1,22 @@ +/* contrib/dict_int/dict_int--1.0.sql */ + +CREATE OR REPLACE FUNCTION dintdict_init(internal) + RETURNS internal + AS 'MODULE_PATHNAME' + LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION dintdict_lexize(internal, internal, internal, internal) + RETURNS internal + AS 'MODULE_PATHNAME' + LANGUAGE C STRICT; + +CREATE TEXT SEARCH TEMPLATE intdict_template ( + LEXIZE = dintdict_lexize, + INIT = dintdict_init +); + +CREATE TEXT SEARCH DICTIONARY intdict ( + TEMPLATE = intdict_template +); + +COMMENT ON TEXT SEARCH DICTIONARY intdict IS 'dictionary for integers'; diff --git a/contrib/dict_int/dict_int--unpackaged--1.0.sql b/contrib/dict_int/dict_int--unpackaged--1.0.sql new file mode 100644 index 0000000000..f89218a565 --- /dev/null +++ b/contrib/dict_int/dict_int--unpackaged--1.0.sql @@ -0,0 +1,6 @@ +/* contrib/dict_int/dict_int--unpackaged--1.0.sql */ + +ALTER EXTENSION dict_int ADD function dintdict_init(internal); +ALTER EXTENSION dict_int ADD function dintdict_lexize(internal,internal,internal,internal); +ALTER EXTENSION dict_int ADD text search template intdict_template; +ALTER EXTENSION dict_int ADD text search dictionary intdict; diff --git a/contrib/dict_int/dict_int.control b/contrib/dict_int/dict_int.control new file mode 100644 index 0000000000..6e2d2b351a --- /dev/null +++ b/contrib/dict_int/dict_int.control @@ -0,0 +1,5 @@ +# dict_int extension +comment = 'text search dictionary template for integers' +default_version = '1.0' +module_pathname = '$libdir/dict_int' +relocatable = true diff --git a/contrib/dict_int/dict_int.sql.in b/contrib/dict_int/dict_int.sql.in deleted file mode 100644 index 9d7ef7d9c1..0000000000 --- a/contrib/dict_int/dict_int.sql.in +++ /dev/null @@ -1,25 +0,0 @@ -/* contrib/dict_int/dict_int.sql.in */ - --- Adjust this setting to control where the objects get created. -SET search_path = public; - -CREATE OR REPLACE FUNCTION dintdict_init(internal) - RETURNS internal - AS 'MODULE_PATHNAME' - LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION dintdict_lexize(internal, internal, internal, internal) - RETURNS internal - AS 'MODULE_PATHNAME' - LANGUAGE C STRICT; - -CREATE TEXT SEARCH TEMPLATE intdict_template ( - LEXIZE = dintdict_lexize, - INIT = dintdict_init -); - -CREATE TEXT SEARCH DICTIONARY intdict ( - TEMPLATE = intdict_template -); - -COMMENT ON TEXT SEARCH DICTIONARY intdict IS 'dictionary for integers'; diff --git a/contrib/dict_int/expected/dict_int.out b/contrib/dict_int/expected/dict_int.out index 7feb493e15..3b766ec52a 100644 --- a/contrib/dict_int/expected/dict_int.out +++ b/contrib/dict_int/expected/dict_int.out @@ -1,10 +1,4 @@ --- --- first, define the datatype. Turn off echoing so that expected file --- does not depend on contents of this file. --- -SET client_min_messages = warning; -\set ECHO none -RESET client_min_messages; +CREATE EXTENSION dict_int; --lexize select ts_lexize('intdict', '511673'); ts_lexize diff --git a/contrib/dict_int/sql/dict_int.sql b/contrib/dict_int/sql/dict_int.sql index 3a335f8f3d..8ffec6b770 100644 --- a/contrib/dict_int/sql/dict_int.sql +++ b/contrib/dict_int/sql/dict_int.sql @@ -1,12 +1,4 @@ --- --- first, define the datatype. Turn off echoing so that expected file --- does not depend on contents of this file. --- -SET client_min_messages = warning; -\set ECHO none -\i dict_int.sql -\set ECHO all -RESET client_min_messages; +CREATE EXTENSION dict_int; --lexize select ts_lexize('intdict', '511673'); diff --git a/contrib/dict_int/uninstall_dict_int.sql b/contrib/dict_int/uninstall_dict_int.sql deleted file mode 100644 index 0467fa22ba..0000000000 --- a/contrib/dict_int/uninstall_dict_int.sql +++ /dev/null @@ -1,12 +0,0 @@ -/* contrib/dict_int/uninstall_dict_int.sql */ - --- Adjust this setting to control where the objects get dropped. -SET search_path = public; - -DROP TEXT SEARCH DICTIONARY intdict; - -DROP TEXT SEARCH TEMPLATE intdict_template; - -DROP FUNCTION dintdict_init(internal); - -DROP FUNCTION dintdict_lexize(internal,internal,internal,internal); diff --git a/contrib/dict_xsyn/.gitignore b/contrib/dict_xsyn/.gitignore index 0ebd61caaf..19b6c5ba42 100644 --- a/contrib/dict_xsyn/.gitignore +++ b/contrib/dict_xsyn/.gitignore @@ -1,3 +1,2 @@ -/dict_xsyn.sql # Generated subdirectories /results/ diff --git a/contrib/dict_xsyn/Makefile b/contrib/dict_xsyn/Makefile index 8b737f09fc..ce92baa478 100644 --- a/contrib/dict_xsyn/Makefile +++ b/contrib/dict_xsyn/Makefile @@ -2,9 +2,11 @@ MODULE_big = dict_xsyn OBJS = dict_xsyn.o -DATA_built = dict_xsyn.sql -DATA = uninstall_dict_xsyn.sql + +EXTENSION = dict_xsyn +DATA = dict_xsyn--1.0.sql dict_xsyn--unpackaged--1.0.sql DATA_TSEARCH = xsyn_sample.rules + REGRESS = dict_xsyn ifdef USE_PGXS diff --git a/contrib/dict_xsyn/dict_xsyn--1.0.sql b/contrib/dict_xsyn/dict_xsyn--1.0.sql new file mode 100644 index 0000000000..0b6a21730f --- /dev/null +++ b/contrib/dict_xsyn/dict_xsyn--1.0.sql @@ -0,0 +1,22 @@ +/* contrib/dict_xsyn/dict_xsyn--1.0.sql */ + +CREATE OR REPLACE FUNCTION dxsyn_init(internal) + RETURNS internal + AS 'MODULE_PATHNAME' + LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION dxsyn_lexize(internal, internal, internal, internal) + RETURNS internal + AS 'MODULE_PATHNAME' + LANGUAGE C STRICT; + +CREATE TEXT SEARCH TEMPLATE xsyn_template ( + LEXIZE = dxsyn_lexize, + INIT = dxsyn_init +); + +CREATE TEXT SEARCH DICTIONARY xsyn ( + TEMPLATE = xsyn_template +); + +COMMENT ON TEXT SEARCH DICTIONARY xsyn IS 'eXtended synonym dictionary'; diff --git a/contrib/dict_xsyn/dict_xsyn--unpackaged--1.0.sql b/contrib/dict_xsyn/dict_xsyn--unpackaged--1.0.sql new file mode 100644 index 0000000000..6fe0285f79 --- /dev/null +++ b/contrib/dict_xsyn/dict_xsyn--unpackaged--1.0.sql @@ -0,0 +1,6 @@ +/* contrib/dict_xsyn/dict_xsyn--unpackaged--1.0.sql */ + +ALTER EXTENSION dict_xsyn ADD function dxsyn_init(internal); +ALTER EXTENSION dict_xsyn ADD function dxsyn_lexize(internal,internal,internal,internal); +ALTER EXTENSION dict_xsyn ADD text search template xsyn_template; +ALTER EXTENSION dict_xsyn ADD text search dictionary xsyn; diff --git a/contrib/dict_xsyn/dict_xsyn.control b/contrib/dict_xsyn/dict_xsyn.control new file mode 100644 index 0000000000..3fd465a955 --- /dev/null +++ b/contrib/dict_xsyn/dict_xsyn.control @@ -0,0 +1,5 @@ +# dict_xsyn extension +comment = 'text search dictionary template for extended synonym processing' +default_version = '1.0' +module_pathname = '$libdir/dict_xsyn' +relocatable = true diff --git a/contrib/dict_xsyn/dict_xsyn.sql.in b/contrib/dict_xsyn/dict_xsyn.sql.in deleted file mode 100644 index 7d48c9209f..0000000000 --- a/contrib/dict_xsyn/dict_xsyn.sql.in +++ /dev/null @@ -1,25 +0,0 @@ -/* contrib/dict_xsyn/dict_xsyn.sql.in */ - --- Adjust this setting to control where the objects get created. -SET search_path = public; - -CREATE OR REPLACE FUNCTION dxsyn_init(internal) - RETURNS internal - AS 'MODULE_PATHNAME' - LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION dxsyn_lexize(internal, internal, internal, internal) - RETURNS internal - AS 'MODULE_PATHNAME' - LANGUAGE C STRICT; - -CREATE TEXT SEARCH TEMPLATE xsyn_template ( - LEXIZE = dxsyn_lexize, - INIT = dxsyn_init -); - -CREATE TEXT SEARCH DICTIONARY xsyn ( - TEMPLATE = xsyn_template -); - -COMMENT ON TEXT SEARCH DICTIONARY xsyn IS 'eXtended synonym dictionary'; diff --git a/contrib/dict_xsyn/expected/dict_xsyn.out b/contrib/dict_xsyn/expected/dict_xsyn.out index d91697a97e..9b95e13559 100644 --- a/contrib/dict_xsyn/expected/dict_xsyn.out +++ b/contrib/dict_xsyn/expected/dict_xsyn.out @@ -1,10 +1,4 @@ --- --- first, define the datatype. Turn off echoing so that expected file --- does not depend on contents of this file. --- -SET client_min_messages = warning; -\set ECHO none -RESET client_min_messages; +CREATE EXTENSION dict_xsyn; -- default configuration - match first word and return it among with all synonyms ALTER TEXT SEARCH DICTIONARY xsyn (RULES='xsyn_sample', KEEPORIG=true, MATCHORIG=true, KEEPSYNONYMS=true, MATCHSYNONYMS=false); --lexize diff --git a/contrib/dict_xsyn/sql/dict_xsyn.sql b/contrib/dict_xsyn/sql/dict_xsyn.sql index 9db0851700..49511061d0 100644 --- a/contrib/dict_xsyn/sql/dict_xsyn.sql +++ b/contrib/dict_xsyn/sql/dict_xsyn.sql @@ -1,12 +1,4 @@ --- --- first, define the datatype. Turn off echoing so that expected file --- does not depend on contents of this file. --- -SET client_min_messages = warning; -\set ECHO none -\i dict_xsyn.sql -\set ECHO all -RESET client_min_messages; +CREATE EXTENSION dict_xsyn; -- default configuration - match first word and return it among with all synonyms ALTER TEXT SEARCH DICTIONARY xsyn (RULES='xsyn_sample', KEEPORIG=true, MATCHORIG=true, KEEPSYNONYMS=true, MATCHSYNONYMS=false); diff --git a/contrib/dict_xsyn/uninstall_dict_xsyn.sql b/contrib/dict_xsyn/uninstall_dict_xsyn.sql deleted file mode 100644 index 68f9579c05..0000000000 --- a/contrib/dict_xsyn/uninstall_dict_xsyn.sql +++ /dev/null @@ -1,12 +0,0 @@ -/* contrib/dict_xsyn/uninstall_dict_xsyn.sql */ - --- Adjust this setting to control where the objects get dropped. -SET search_path = public; - -DROP TEXT SEARCH DICTIONARY xsyn; - -DROP TEXT SEARCH TEMPLATE xsyn_template; - -DROP FUNCTION dxsyn_init(internal); - -DROP FUNCTION dxsyn_lexize(internal,internal,internal,internal); diff --git a/contrib/earthdistance/.gitignore b/contrib/earthdistance/.gitignore index 366a0a399e..19b6c5ba42 100644 --- a/contrib/earthdistance/.gitignore +++ b/contrib/earthdistance/.gitignore @@ -1,3 +1,2 @@ -/earthdistance.sql # Generated subdirectories /results/ diff --git a/contrib/earthdistance/Makefile b/contrib/earthdistance/Makefile index 8328e5f828..49f6e6675f 100644 --- a/contrib/earthdistance/Makefile +++ b/contrib/earthdistance/Makefile @@ -1,8 +1,10 @@ # contrib/earthdistance/Makefile MODULES = earthdistance -DATA_built = earthdistance.sql -DATA = uninstall_earthdistance.sql + +EXTENSION = earthdistance +DATA = earthdistance--1.0.sql earthdistance--unpackaged--1.0.sql + REGRESS = earthdistance LDFLAGS_SL += $(filter -lm, $(LIBS)) diff --git a/contrib/earthdistance/earthdistance--1.0.sql b/contrib/earthdistance/earthdistance--1.0.sql new file mode 100644 index 0000000000..0a2af648de --- /dev/null +++ b/contrib/earthdistance/earthdistance--1.0.sql @@ -0,0 +1,88 @@ +/* contrib/earthdistance/earthdistance--1.0.sql */ + +-- earth() returns the radius of the earth in meters. This is the only +-- place you need to change things for the cube base distance functions +-- in order to use different units (or a better value for the Earth's radius). + +CREATE OR REPLACE FUNCTION earth() RETURNS float8 +LANGUAGE SQL IMMUTABLE +AS 'SELECT ''6378168''::float8'; + +-- Astromers may want to change the earth function so that distances will be +-- returned in degrees. To do this comment out the above definition and +-- uncomment the one below. Note that doing this will break the regression +-- tests. +-- +-- CREATE OR REPLACE FUNCTION earth() RETURNS float8 +-- LANGUAGE SQL IMMUTABLE +-- AS 'SELECT 180/pi()'; + +-- Define domain for locations on the surface of the earth using a cube +-- datatype with constraints. cube provides 3D indexing. +-- The cube is restricted to be a point, no more than 3 dimensions +-- (for less than 3 dimensions 0 is assumed for the missing coordinates) +-- and that the point must be very near the surface of the sphere +-- centered about the origin with the radius of the earth. + +CREATE DOMAIN earth AS cube + CONSTRAINT not_point check(cube_is_point(value)) + CONSTRAINT not_3d check(cube_dim(value) <= 3) + CONSTRAINT on_surface check(abs(cube_distance(value, '(0)'::cube) / + earth() - 1) < '10e-7'::float8); + +CREATE OR REPLACE FUNCTION sec_to_gc(float8) +RETURNS float8 +LANGUAGE SQL +IMMUTABLE STRICT +AS 'SELECT CASE WHEN $1 < 0 THEN 0::float8 WHEN $1/(2*earth()) > 1 THEN pi()*earth() ELSE 2*earth()*asin($1/(2*earth())) END'; + +CREATE OR REPLACE FUNCTION gc_to_sec(float8) +RETURNS float8 +LANGUAGE SQL +IMMUTABLE STRICT +AS 'SELECT CASE WHEN $1 < 0 THEN 0::float8 WHEN $1/earth() > pi() THEN 2*earth() ELSE 2*earth()*sin($1/(2*earth())) END'; + +CREATE OR REPLACE FUNCTION ll_to_earth(float8, float8) +RETURNS earth +LANGUAGE SQL +IMMUTABLE STRICT +AS 'SELECT cube(cube(cube(earth()*cos(radians($1))*cos(radians($2))),earth()*cos(radians($1))*sin(radians($2))),earth()*sin(radians($1)))::earth'; + +CREATE OR REPLACE FUNCTION latitude(earth) +RETURNS float8 +LANGUAGE SQL +IMMUTABLE STRICT +AS 'SELECT CASE WHEN cube_ll_coord($1, 3)/earth() < -1 THEN -90::float8 WHEN cube_ll_coord($1, 3)/earth() > 1 THEN 90::float8 ELSE degrees(asin(cube_ll_coord($1, 3)/earth())) END'; + +CREATE OR REPLACE FUNCTION longitude(earth) +RETURNS float8 +LANGUAGE SQL +IMMUTABLE STRICT +AS 'SELECT degrees(atan2(cube_ll_coord($1, 2), cube_ll_coord($1, 1)))'; + +CREATE OR REPLACE FUNCTION earth_distance(earth, earth) +RETURNS float8 +LANGUAGE SQL +IMMUTABLE STRICT +AS 'SELECT sec_to_gc(cube_distance($1, $2))'; + +CREATE OR REPLACE FUNCTION earth_box(earth, float8) +RETURNS cube +LANGUAGE SQL +IMMUTABLE STRICT +AS 'SELECT cube_enlarge($1, gc_to_sec($2), 3)'; + +--------------- geo_distance + +CREATE OR REPLACE FUNCTION geo_distance (point, point) +RETURNS float8 +LANGUAGE C IMMUTABLE STRICT AS 'MODULE_PATHNAME'; + +--------------- geo_distance as operator <@> + +CREATE OPERATOR <@> ( + LEFTARG = point, + RIGHTARG = point, + PROCEDURE = geo_distance, + COMMUTATOR = <@> +); diff --git a/contrib/earthdistance/earthdistance--unpackaged--1.0.sql b/contrib/earthdistance/earthdistance--unpackaged--1.0.sql new file mode 100644 index 0000000000..2d5919cc72 --- /dev/null +++ b/contrib/earthdistance/earthdistance--unpackaged--1.0.sql @@ -0,0 +1,13 @@ +/* contrib/earthdistance/earthdistance--unpackaged--1.0.sql */ + +ALTER EXTENSION earthdistance ADD function earth(); +ALTER EXTENSION earthdistance ADD type earth; +ALTER EXTENSION earthdistance ADD function sec_to_gc(double precision); +ALTER EXTENSION earthdistance ADD function gc_to_sec(double precision); +ALTER EXTENSION earthdistance ADD function ll_to_earth(double precision,double precision); +ALTER EXTENSION earthdistance ADD function latitude(earth); +ALTER EXTENSION earthdistance ADD function longitude(earth); +ALTER EXTENSION earthdistance ADD function earth_distance(earth,earth); +ALTER EXTENSION earthdistance ADD function earth_box(earth,double precision); +ALTER EXTENSION earthdistance ADD function geo_distance(point,point); +ALTER EXTENSION earthdistance ADD operator <@>(point,point); diff --git a/contrib/earthdistance/earthdistance.control b/contrib/earthdistance/earthdistance.control new file mode 100644 index 0000000000..afd2ff4f95 --- /dev/null +++ b/contrib/earthdistance/earthdistance.control @@ -0,0 +1,6 @@ +# earthdistance extension +comment = 'calculate great-circle distances on the surface of the Earth' +default_version = '1.0' +module_pathname = '$libdir/earthdistance' +relocatable = true +requires = 'cube' diff --git a/contrib/earthdistance/earthdistance.sql.in b/contrib/earthdistance/earthdistance.sql.in deleted file mode 100644 index a4ce812584..0000000000 --- a/contrib/earthdistance/earthdistance.sql.in +++ /dev/null @@ -1,93 +0,0 @@ -/* contrib/earthdistance/earthdistance.sql.in */ - --- Adjust this setting to control where the objects get created. -SET search_path = public; - --- The earth functions rely on contrib/cube having been installed and loaded. - --- earth() returns the radius of the earth in meters. This is the only --- place you need to change things for the cube base distance functions --- in order to use different units (or a better value for the Earth's radius). - -CREATE OR REPLACE FUNCTION earth() RETURNS float8 -LANGUAGE SQL IMMUTABLE -AS 'SELECT ''6378168''::float8'; - --- Astromers may want to change the earth function so that distances will be --- returned in degrees. To do this comment out the above definition and --- uncomment the one below. Note that doing this will break the regression --- tests. --- --- CREATE OR REPLACE FUNCTION earth() RETURNS float8 --- LANGUAGE SQL IMMUTABLE --- AS 'SELECT 180/pi()'; - --- Define domain for locations on the surface of the earth using a cube --- datatype with constraints. cube provides 3D indexing. --- The cube is restricted to be a point, no more than 3 dimensions --- (for less than 3 dimensions 0 is assumed for the missing coordinates) --- and that the point must be very near the surface of the sphere --- centered about the origin with the radius of the earth. - -CREATE DOMAIN earth AS cube - CONSTRAINT not_point check(cube_is_point(value)) - CONSTRAINT not_3d check(cube_dim(value) <= 3) - CONSTRAINT on_surface check(abs(cube_distance(value, '(0)'::cube) / - earth() - 1) < '10e-7'::float8); - -CREATE OR REPLACE FUNCTION sec_to_gc(float8) -RETURNS float8 -LANGUAGE SQL -IMMUTABLE STRICT -AS 'SELECT CASE WHEN $1 < 0 THEN 0::float8 WHEN $1/(2*earth()) > 1 THEN pi()*earth() ELSE 2*earth()*asin($1/(2*earth())) END'; - -CREATE OR REPLACE FUNCTION gc_to_sec(float8) -RETURNS float8 -LANGUAGE SQL -IMMUTABLE STRICT -AS 'SELECT CASE WHEN $1 < 0 THEN 0::float8 WHEN $1/earth() > pi() THEN 2*earth() ELSE 2*earth()*sin($1/(2*earth())) END'; - -CREATE OR REPLACE FUNCTION ll_to_earth(float8, float8) -RETURNS earth -LANGUAGE SQL -IMMUTABLE STRICT -AS 'SELECT cube(cube(cube(earth()*cos(radians($1))*cos(radians($2))),earth()*cos(radians($1))*sin(radians($2))),earth()*sin(radians($1)))::earth'; - -CREATE OR REPLACE FUNCTION latitude(earth) -RETURNS float8 -LANGUAGE SQL -IMMUTABLE STRICT -AS 'SELECT CASE WHEN cube_ll_coord($1, 3)/earth() < -1 THEN -90::float8 WHEN cube_ll_coord($1, 3)/earth() > 1 THEN 90::float8 ELSE degrees(asin(cube_ll_coord($1, 3)/earth())) END'; - -CREATE OR REPLACE FUNCTION longitude(earth) -RETURNS float8 -LANGUAGE SQL -IMMUTABLE STRICT -AS 'SELECT degrees(atan2(cube_ll_coord($1, 2), cube_ll_coord($1, 1)))'; - -CREATE OR REPLACE FUNCTION earth_distance(earth, earth) -RETURNS float8 -LANGUAGE SQL -IMMUTABLE STRICT -AS 'SELECT sec_to_gc(cube_distance($1, $2))'; - -CREATE OR REPLACE FUNCTION earth_box(earth, float8) -RETURNS cube -LANGUAGE SQL -IMMUTABLE STRICT -AS 'SELECT cube_enlarge($1, gc_to_sec($2), 3)'; - ---------------- geo_distance - -CREATE OR REPLACE FUNCTION geo_distance (point, point) -RETURNS float8 -LANGUAGE C IMMUTABLE STRICT AS 'MODULE_PATHNAME'; - ---------------- geo_distance as operator <@> - -CREATE OPERATOR <@> ( - LEFTARG = point, - RIGHTARG = point, - PROCEDURE = geo_distance, - COMMUTATOR = <@> -); diff --git a/contrib/earthdistance/expected/earthdistance.out b/contrib/earthdistance/expected/earthdistance.out index 5f5645b700..8a3fc749c1 100644 --- a/contrib/earthdistance/expected/earthdistance.out +++ b/contrib/earthdistance/expected/earthdistance.out @@ -1,13 +1,8 @@ -- -- Test earth distance functions -- --- --- first, define the datatype. Turn off echoing so that expected file --- does not depend on contents of earthdistance.sql or cube.sql. --- -SET client_min_messages = warning; -\set ECHO none -RESET client_min_messages; +CREATE EXTENSION cube; +CREATE EXTENSION earthdistance; -- -- The radius of the Earth we are using. -- diff --git a/contrib/earthdistance/sql/earthdistance.sql b/contrib/earthdistance/sql/earthdistance.sql index ad68b5635d..e494c350ce 100644 --- a/contrib/earthdistance/sql/earthdistance.sql +++ b/contrib/earthdistance/sql/earthdistance.sql @@ -2,16 +2,8 @@ -- Test earth distance functions -- --- --- first, define the datatype. Turn off echoing so that expected file --- does not depend on contents of earthdistance.sql or cube.sql. --- -SET client_min_messages = warning; -\set ECHO none -\i ../cube/cube.sql -\i earthdistance.sql -\set ECHO all -RESET client_min_messages; +CREATE EXTENSION cube; +CREATE EXTENSION earthdistance; -- -- The radius of the Earth we are using. diff --git a/contrib/earthdistance/uninstall_earthdistance.sql b/contrib/earthdistance/uninstall_earthdistance.sql deleted file mode 100644 index dfd7d524ab..0000000000 --- a/contrib/earthdistance/uninstall_earthdistance.sql +++ /dev/null @@ -1,26 +0,0 @@ -/* contrib/earthdistance/uninstall_earthdistance.sql */ - --- Adjust this setting to control where the objects get dropped. -SET search_path = public; - -DROP OPERATOR <@> (point, point); - -DROP FUNCTION geo_distance (point, point); - -DROP FUNCTION earth_box(earth, float8); - -DROP FUNCTION earth_distance(earth, earth); - -DROP FUNCTION longitude(earth); - -DROP FUNCTION latitude(earth); - -DROP FUNCTION ll_to_earth(float8, float8); - -DROP FUNCTION gc_to_sec(float8); - -DROP FUNCTION sec_to_gc(float8); - -DROP DOMAIN earth; - -DROP FUNCTION earth(); diff --git a/contrib/fuzzystrmatch/.gitignore b/contrib/fuzzystrmatch/.gitignore deleted file mode 100644 index f4962c630b..0000000000 --- a/contrib/fuzzystrmatch/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/fuzzystrmatch.sql diff --git a/contrib/fuzzystrmatch/Makefile b/contrib/fuzzystrmatch/Makefile index 9cdf3f87e3..74728a30b5 100644 --- a/contrib/fuzzystrmatch/Makefile +++ b/contrib/fuzzystrmatch/Makefile @@ -2,8 +2,9 @@ MODULE_big = fuzzystrmatch OBJS = fuzzystrmatch.o dmetaphone.o -DATA_built = fuzzystrmatch.sql -DATA = uninstall_fuzzystrmatch.sql + +EXTENSION = fuzzystrmatch +DATA = fuzzystrmatch--1.0.sql fuzzystrmatch--unpackaged--1.0.sql ifdef USE_PGXS PG_CONFIG = pg_config diff --git a/contrib/fuzzystrmatch/fuzzystrmatch--1.0.sql b/contrib/fuzzystrmatch/fuzzystrmatch--1.0.sql new file mode 100644 index 0000000000..1d27f5c3dd --- /dev/null +++ b/contrib/fuzzystrmatch/fuzzystrmatch--1.0.sql @@ -0,0 +1,41 @@ +/* contrib/fuzzystrmatch/fuzzystrmatch--1.0.sql */ + +CREATE OR REPLACE FUNCTION levenshtein (text,text) RETURNS int +AS 'MODULE_PATHNAME','levenshtein' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION levenshtein (text,text,int,int,int) RETURNS int +AS 'MODULE_PATHNAME','levenshtein_with_costs' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION levenshtein_less_equal (text,text,int) RETURNS int +AS 'MODULE_PATHNAME','levenshtein_less_equal' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION levenshtein_less_equal (text,text,int,int,int,int) RETURNS int +AS 'MODULE_PATHNAME','levenshtein_less_equal_with_costs' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION metaphone (text,int) RETURNS text +AS 'MODULE_PATHNAME','metaphone' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION soundex(text) RETURNS text +AS 'MODULE_PATHNAME', 'soundex' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION text_soundex(text) RETURNS text +AS 'MODULE_PATHNAME', 'soundex' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION difference(text,text) RETURNS int +AS 'MODULE_PATHNAME', 'difference' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION dmetaphone (text) RETURNS text +AS 'MODULE_PATHNAME', 'dmetaphone' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION dmetaphone_alt (text) RETURNS text +AS 'MODULE_PATHNAME', 'dmetaphone_alt' +LANGUAGE C IMMUTABLE STRICT; diff --git a/contrib/fuzzystrmatch/fuzzystrmatch--unpackaged--1.0.sql b/contrib/fuzzystrmatch/fuzzystrmatch--unpackaged--1.0.sql new file mode 100644 index 0000000000..12077a84ae --- /dev/null +++ b/contrib/fuzzystrmatch/fuzzystrmatch--unpackaged--1.0.sql @@ -0,0 +1,12 @@ +/* contrib/fuzzystrmatch/fuzzystrmatch--unpackaged--1.0.sql */ + +ALTER EXTENSION fuzzystrmatch ADD function levenshtein(text,text); +ALTER EXTENSION fuzzystrmatch ADD function levenshtein(text,text,integer,integer,integer); +ALTER EXTENSION fuzzystrmatch ADD function levenshtein_less_equal(text,text,integer); +ALTER EXTENSION fuzzystrmatch ADD function levenshtein_less_equal(text,text,integer,integer,integer,integer); +ALTER EXTENSION fuzzystrmatch ADD function metaphone(text,integer); +ALTER EXTENSION fuzzystrmatch ADD function soundex(text); +ALTER EXTENSION fuzzystrmatch ADD function text_soundex(text); +ALTER EXTENSION fuzzystrmatch ADD function difference(text,text); +ALTER EXTENSION fuzzystrmatch ADD function dmetaphone(text); +ALTER EXTENSION fuzzystrmatch ADD function dmetaphone_alt(text); diff --git a/contrib/fuzzystrmatch/fuzzystrmatch.control b/contrib/fuzzystrmatch/fuzzystrmatch.control new file mode 100644 index 0000000000..e257f09611 --- /dev/null +++ b/contrib/fuzzystrmatch/fuzzystrmatch.control @@ -0,0 +1,5 @@ +# fuzzystrmatch extension +comment = 'determine similarities and distance between strings' +default_version = '1.0' +module_pathname = '$libdir/fuzzystrmatch' +relocatable = true diff --git a/contrib/fuzzystrmatch/fuzzystrmatch.sql.in b/contrib/fuzzystrmatch/fuzzystrmatch.sql.in deleted file mode 100644 index 0f2ea85e48..0000000000 --- a/contrib/fuzzystrmatch/fuzzystrmatch.sql.in +++ /dev/null @@ -1,44 +0,0 @@ -/* contrib/fuzzystrmatch/fuzzystrmatch.sql.in */ - --- Adjust this setting to control where the objects get created. -SET search_path = public; - -CREATE OR REPLACE FUNCTION levenshtein (text,text) RETURNS int -AS 'MODULE_PATHNAME','levenshtein' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION levenshtein (text,text,int,int,int) RETURNS int -AS 'MODULE_PATHNAME','levenshtein_with_costs' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION levenshtein_less_equal (text,text,int) RETURNS int -AS 'MODULE_PATHNAME','levenshtein_less_equal' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION levenshtein_less_equal (text,text,int,int,int,int) RETURNS int -AS 'MODULE_PATHNAME','levenshtein_less_equal_with_costs' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION metaphone (text,int) RETURNS text -AS 'MODULE_PATHNAME','metaphone' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION soundex(text) RETURNS text -AS 'MODULE_PATHNAME', 'soundex' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION text_soundex(text) RETURNS text -AS 'MODULE_PATHNAME', 'soundex' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION difference(text,text) RETURNS int -AS 'MODULE_PATHNAME', 'difference' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION dmetaphone (text) RETURNS text -AS 'MODULE_PATHNAME', 'dmetaphone' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION dmetaphone_alt (text) RETURNS text -AS 'MODULE_PATHNAME', 'dmetaphone_alt' -LANGUAGE C IMMUTABLE STRICT; diff --git a/contrib/fuzzystrmatch/uninstall_fuzzystrmatch.sql b/contrib/fuzzystrmatch/uninstall_fuzzystrmatch.sql deleted file mode 100644 index a39c7bfc94..0000000000 --- a/contrib/fuzzystrmatch/uninstall_fuzzystrmatch.sql +++ /dev/null @@ -1,24 +0,0 @@ -/* contrib/fuzzystrmatch/uninstall_fuzzystrmatch.sql */ - --- Adjust this setting to control where the objects get dropped. -SET search_path = public; - -DROP FUNCTION dmetaphone_alt (text); - -DROP FUNCTION dmetaphone (text); - -DROP FUNCTION difference(text,text); - -DROP FUNCTION text_soundex(text); - -DROP FUNCTION soundex(text); - -DROP FUNCTION metaphone (text,int); - -DROP FUNCTION levenshtein (text,text,int,int,int); - -DROP FUNCTION levenshtein (text,text); - -DROP FUNCTION levenshtein_less_equal (text,text,int); - -DROP FUNCTION levenshtein_less_equal (text,text,int,int,int,int); diff --git a/contrib/hstore/.gitignore b/contrib/hstore/.gitignore index d7af95330c..19b6c5ba42 100644 --- a/contrib/hstore/.gitignore +++ b/contrib/hstore/.gitignore @@ -1,3 +1,2 @@ -/hstore.sql # Generated subdirectories /results/ diff --git a/contrib/hstore/Makefile b/contrib/hstore/Makefile index 1d533fdd60..fce1a32328 100644 --- a/contrib/hstore/Makefile +++ b/contrib/hstore/Makefile @@ -4,8 +4,9 @@ MODULE_big = hstore OBJS = hstore_io.o hstore_op.o hstore_gist.o hstore_gin.o hstore_compat.o \ crc32.o -DATA_built = hstore.sql -DATA = uninstall_hstore.sql +EXTENSION = hstore +DATA = hstore--1.0.sql hstore--unpackaged--1.0.sql + REGRESS = hstore ifdef USE_PGXS diff --git a/contrib/hstore/expected/hstore.out b/contrib/hstore/expected/hstore.out index 354fff20fe..083faf8d9c 100644 --- a/contrib/hstore/expected/hstore.out +++ b/contrib/hstore/expected/hstore.out @@ -1,12 +1,6 @@ --- --- first, define the datatype. Turn off echoing so that expected file --- does not depend on contents of hstore.sql. --- -SET client_min_messages = warning; -\set ECHO none -psql:hstore.sql:228: WARNING: => is deprecated as an operator name +CREATE EXTENSION hstore; +WARNING: => is deprecated as an operator name DETAIL: This name may be disallowed altogether in future versions of PostgreSQL. -RESET client_min_messages; set escape_string_warning=off; --hstore; select ''::hstore; diff --git a/contrib/hstore/hstore--1.0.sql b/contrib/hstore/hstore--1.0.sql new file mode 100644 index 0000000000..d77b14286b --- /dev/null +++ b/contrib/hstore/hstore--1.0.sql @@ -0,0 +1,527 @@ +/* contrib/hstore/hstore--1.0.sql */ + +CREATE TYPE hstore; + +CREATE OR REPLACE FUNCTION hstore_in(cstring) +RETURNS hstore +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION hstore_out(hstore) +RETURNS cstring +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION hstore_recv(internal) +RETURNS hstore +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION hstore_send(hstore) +RETURNS bytea +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE TYPE hstore ( + INTERNALLENGTH = -1, + INPUT = hstore_in, + OUTPUT = hstore_out, + RECEIVE = hstore_recv, + SEND = hstore_send, + STORAGE = extended +); + +CREATE OR REPLACE FUNCTION hstore_version_diag(hstore) +RETURNS integer +AS 'MODULE_PATHNAME','hstore_version_diag' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION fetchval(hstore,text) +RETURNS text +AS 'MODULE_PATHNAME','hstore_fetchval' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OPERATOR -> ( + LEFTARG = hstore, + RIGHTARG = text, + PROCEDURE = fetchval +); + +CREATE OR REPLACE FUNCTION slice_array(hstore,text[]) +RETURNS text[] +AS 'MODULE_PATHNAME','hstore_slice_to_array' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OPERATOR -> ( + LEFTARG = hstore, + RIGHTARG = text[], + PROCEDURE = slice_array +); + +CREATE OR REPLACE FUNCTION slice(hstore,text[]) +RETURNS hstore +AS 'MODULE_PATHNAME','hstore_slice_to_hstore' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION isexists(hstore,text) +RETURNS bool +AS 'MODULE_PATHNAME','hstore_exists' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION exist(hstore,text) +RETURNS bool +AS 'MODULE_PATHNAME','hstore_exists' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OPERATOR ? ( + LEFTARG = hstore, + RIGHTARG = text, + PROCEDURE = exist, + RESTRICT = contsel, + JOIN = contjoinsel +); + +CREATE OR REPLACE FUNCTION exists_any(hstore,text[]) +RETURNS bool +AS 'MODULE_PATHNAME','hstore_exists_any' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OPERATOR ?| ( + LEFTARG = hstore, + RIGHTARG = text[], + PROCEDURE = exists_any, + RESTRICT = contsel, + JOIN = contjoinsel +); + +CREATE OR REPLACE FUNCTION exists_all(hstore,text[]) +RETURNS bool +AS 'MODULE_PATHNAME','hstore_exists_all' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OPERATOR ?& ( + LEFTARG = hstore, + RIGHTARG = text[], + PROCEDURE = exists_all, + RESTRICT = contsel, + JOIN = contjoinsel +); + +CREATE OR REPLACE FUNCTION isdefined(hstore,text) +RETURNS bool +AS 'MODULE_PATHNAME','hstore_defined' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION defined(hstore,text) +RETURNS bool +AS 'MODULE_PATHNAME','hstore_defined' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION delete(hstore,text) +RETURNS hstore +AS 'MODULE_PATHNAME','hstore_delete' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION delete(hstore,text[]) +RETURNS hstore +AS 'MODULE_PATHNAME','hstore_delete_array' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION delete(hstore,hstore) +RETURNS hstore +AS 'MODULE_PATHNAME','hstore_delete_hstore' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OPERATOR - ( + LEFTARG = hstore, + RIGHTARG = text, + PROCEDURE = delete +); + +CREATE OPERATOR - ( + LEFTARG = hstore, + RIGHTARG = text[], + PROCEDURE = delete +); + +CREATE OPERATOR - ( + LEFTARG = hstore, + RIGHTARG = hstore, + PROCEDURE = delete +); + +CREATE OR REPLACE FUNCTION hs_concat(hstore,hstore) +RETURNS hstore +AS 'MODULE_PATHNAME','hstore_concat' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OPERATOR || ( + LEFTARG = hstore, + RIGHTARG = hstore, + PROCEDURE = hs_concat +); + +CREATE OR REPLACE FUNCTION hs_contains(hstore,hstore) +RETURNS bool +AS 'MODULE_PATHNAME','hstore_contains' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION hs_contained(hstore,hstore) +RETURNS bool +AS 'MODULE_PATHNAME','hstore_contained' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OPERATOR @> ( + LEFTARG = hstore, + RIGHTARG = hstore, + PROCEDURE = hs_contains, + COMMUTATOR = '<@', + RESTRICT = contsel, + JOIN = contjoinsel +); + +CREATE OPERATOR <@ ( + LEFTARG = hstore, + RIGHTARG = hstore, + PROCEDURE = hs_contained, + COMMUTATOR = '@>', + RESTRICT = contsel, + JOIN = contjoinsel +); + +-- obsolete: +CREATE OPERATOR @ ( + LEFTARG = hstore, + RIGHTARG = hstore, + PROCEDURE = hs_contains, + COMMUTATOR = '~', + RESTRICT = contsel, + JOIN = contjoinsel +); + +CREATE OPERATOR ~ ( + LEFTARG = hstore, + RIGHTARG = hstore, + PROCEDURE = hs_contained, + COMMUTATOR = '@', + RESTRICT = contsel, + JOIN = contjoinsel +); + +CREATE OR REPLACE FUNCTION tconvert(text,text) +RETURNS hstore +AS 'MODULE_PATHNAME','hstore_from_text' +LANGUAGE C IMMUTABLE; -- not STRICT; needs to allow (key,NULL) + +CREATE OR REPLACE FUNCTION hstore(text,text) +RETURNS hstore +AS 'MODULE_PATHNAME','hstore_from_text' +LANGUAGE C IMMUTABLE; -- not STRICT; needs to allow (key,NULL) + +CREATE OPERATOR => ( + LEFTARG = text, + RIGHTARG = text, + PROCEDURE = hstore +); + +CREATE OR REPLACE FUNCTION hstore(text[],text[]) +RETURNS hstore +AS 'MODULE_PATHNAME', 'hstore_from_arrays' +LANGUAGE C IMMUTABLE; -- not STRICT; allows (keys,null) + +CREATE FUNCTION hstore(text[]) +RETURNS hstore +AS 'MODULE_PATHNAME', 'hstore_from_array' +LANGUAGE C IMMUTABLE STRICT; + +CREATE CAST (text[] AS hstore) + WITH FUNCTION hstore(text[]); + +CREATE OR REPLACE FUNCTION hstore(record) +RETURNS hstore +AS 'MODULE_PATHNAME', 'hstore_from_record' +LANGUAGE C IMMUTABLE; -- not STRICT; allows (null::recordtype) + +CREATE OR REPLACE FUNCTION hstore_to_array(hstore) +RETURNS text[] +AS 'MODULE_PATHNAME','hstore_to_array' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OPERATOR %% ( + RIGHTARG = hstore, + PROCEDURE = hstore_to_array +); + +CREATE OR REPLACE FUNCTION hstore_to_matrix(hstore) +RETURNS text[] +AS 'MODULE_PATHNAME','hstore_to_matrix' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OPERATOR %# ( + RIGHTARG = hstore, + PROCEDURE = hstore_to_matrix +); + +CREATE OR REPLACE FUNCTION akeys(hstore) +RETURNS text[] +AS 'MODULE_PATHNAME','hstore_akeys' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION avals(hstore) +RETURNS text[] +AS 'MODULE_PATHNAME','hstore_avals' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION skeys(hstore) +RETURNS setof text +AS 'MODULE_PATHNAME','hstore_skeys' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION svals(hstore) +RETURNS setof text +AS 'MODULE_PATHNAME','hstore_svals' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION each(IN hs hstore, + OUT key text, + OUT value text) +RETURNS SETOF record +AS 'MODULE_PATHNAME','hstore_each' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION populate_record(anyelement,hstore) +RETURNS anyelement +AS 'MODULE_PATHNAME', 'hstore_populate_record' +LANGUAGE C IMMUTABLE; -- not STRICT; allows (null::rectype,hstore) + +CREATE OPERATOR #= ( + LEFTARG = anyelement, + RIGHTARG = hstore, + PROCEDURE = populate_record +); + +-- btree support + +CREATE OR REPLACE FUNCTION hstore_eq(hstore,hstore) +RETURNS boolean +AS 'MODULE_PATHNAME','hstore_eq' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION hstore_ne(hstore,hstore) +RETURNS boolean +AS 'MODULE_PATHNAME','hstore_ne' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION hstore_gt(hstore,hstore) +RETURNS boolean +AS 'MODULE_PATHNAME','hstore_gt' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION hstore_ge(hstore,hstore) +RETURNS boolean +AS 'MODULE_PATHNAME','hstore_ge' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION hstore_lt(hstore,hstore) +RETURNS boolean +AS 'MODULE_PATHNAME','hstore_lt' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION hstore_le(hstore,hstore) +RETURNS boolean +AS 'MODULE_PATHNAME','hstore_le' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION hstore_cmp(hstore,hstore) +RETURNS integer +AS 'MODULE_PATHNAME','hstore_cmp' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OPERATOR = ( + LEFTARG = hstore, + RIGHTARG = hstore, + PROCEDURE = hstore_eq, + COMMUTATOR = =, + NEGATOR = <>, + RESTRICT = eqsel, + JOIN = eqjoinsel, + MERGES, + HASHES +); +CREATE OPERATOR <> ( + LEFTARG = hstore, + RIGHTARG = hstore, + PROCEDURE = hstore_ne, + COMMUTATOR = <>, + NEGATOR = =, + RESTRICT = neqsel, + JOIN = neqjoinsel +); + +-- the comparison operators have funky names (and are undocumented) +-- in an attempt to discourage anyone from actually using them. they +-- only exist to support the btree opclass + +CREATE OPERATOR #<# ( + LEFTARG = hstore, + RIGHTARG = hstore, + PROCEDURE = hstore_lt, + COMMUTATOR = #>#, + NEGATOR = #>=#, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel +); +CREATE OPERATOR #<=# ( + LEFTARG = hstore, + RIGHTARG = hstore, + PROCEDURE = hstore_le, + COMMUTATOR = #>=#, + NEGATOR = #>#, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel +); +CREATE OPERATOR #># ( + LEFTARG = hstore, + RIGHTARG = hstore, + PROCEDURE = hstore_gt, + COMMUTATOR = #<#, + NEGATOR = #<=#, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel +); +CREATE OPERATOR #>=# ( + LEFTARG = hstore, + RIGHTARG = hstore, + PROCEDURE = hstore_ge, + COMMUTATOR = #<=#, + NEGATOR = #<#, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel +); + +CREATE OPERATOR CLASS btree_hstore_ops +DEFAULT FOR TYPE hstore USING btree +AS + OPERATOR 1 #<# , + OPERATOR 2 #<=# , + OPERATOR 3 = , + OPERATOR 4 #>=# , + OPERATOR 5 #># , + FUNCTION 1 hstore_cmp(hstore,hstore); + +-- hash support + +CREATE OR REPLACE FUNCTION hstore_hash(hstore) +RETURNS integer +AS 'MODULE_PATHNAME','hstore_hash' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OPERATOR CLASS hash_hstore_ops +DEFAULT FOR TYPE hstore USING hash +AS + OPERATOR 1 = , + FUNCTION 1 hstore_hash(hstore); + +-- GiST support + +CREATE TYPE ghstore; + +CREATE OR REPLACE FUNCTION ghstore_in(cstring) +RETURNS ghstore +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION ghstore_out(ghstore) +RETURNS cstring +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE TYPE ghstore ( + INTERNALLENGTH = -1, + INPUT = ghstore_in, + OUTPUT = ghstore_out +); + +CREATE OR REPLACE FUNCTION ghstore_compress(internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION ghstore_decompress(internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION ghstore_penalty(internal,internal,internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION ghstore_picksplit(internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION ghstore_union(internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION ghstore_same(internal, internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION ghstore_consistent(internal,internal,int,oid,internal) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OPERATOR CLASS gist_hstore_ops +DEFAULT FOR TYPE hstore USING gist +AS + OPERATOR 7 @> , + OPERATOR 9 ?(hstore,text) , + OPERATOR 10 ?|(hstore,text[]) , + OPERATOR 11 ?&(hstore,text[]) , + --OPERATOR 8 <@ , + OPERATOR 13 @ , + --OPERATOR 14 ~ , + FUNCTION 1 ghstore_consistent (internal, internal, int, oid, internal), + FUNCTION 2 ghstore_union (internal, internal), + FUNCTION 3 ghstore_compress (internal), + FUNCTION 4 ghstore_decompress (internal), + FUNCTION 5 ghstore_penalty (internal, internal, internal), + FUNCTION 6 ghstore_picksplit (internal, internal), + FUNCTION 7 ghstore_same (internal, internal, internal), + STORAGE ghstore; + +-- GIN support + +CREATE OR REPLACE FUNCTION gin_extract_hstore(internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gin_extract_hstore_query(internal, internal, int2, internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gin_consistent_hstore(internal, int2, internal, int4, internal, internal) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OPERATOR CLASS gin_hstore_ops +DEFAULT FOR TYPE hstore USING gin +AS + OPERATOR 7 @>, + OPERATOR 9 ?(hstore,text), + OPERATOR 10 ?|(hstore,text[]), + OPERATOR 11 ?&(hstore,text[]), + FUNCTION 1 bttextcmp(text,text), + FUNCTION 2 gin_extract_hstore(internal, internal), + FUNCTION 3 gin_extract_hstore_query(internal, internal, int2, internal, internal), + FUNCTION 4 gin_consistent_hstore(internal, int2, internal, int4, internal, internal), + STORAGE text; diff --git a/contrib/hstore/hstore--unpackaged--1.0.sql b/contrib/hstore/hstore--unpackaged--1.0.sql new file mode 100644 index 0000000000..0eb300ecf5 --- /dev/null +++ b/contrib/hstore/hstore--unpackaged--1.0.sql @@ -0,0 +1,89 @@ +/* contrib/hstore/hstore--unpackaged--1.0.sql */ + +ALTER EXTENSION hstore ADD type hstore; +ALTER EXTENSION hstore ADD function hstore_in(cstring); +ALTER EXTENSION hstore ADD function hstore_out(hstore); +ALTER EXTENSION hstore ADD function hstore_recv(internal); +ALTER EXTENSION hstore ADD function hstore_send(hstore); +ALTER EXTENSION hstore ADD function hstore_version_diag(hstore); +ALTER EXTENSION hstore ADD function fetchval(hstore,text); +ALTER EXTENSION hstore ADD operator ->(hstore,text); +ALTER EXTENSION hstore ADD function slice_array(hstore,text[]); +ALTER EXTENSION hstore ADD operator ->(hstore,text[]); +ALTER EXTENSION hstore ADD function slice(hstore,text[]); +ALTER EXTENSION hstore ADD function isexists(hstore,text); +ALTER EXTENSION hstore ADD function exist(hstore,text); +ALTER EXTENSION hstore ADD operator ?(hstore,text); +ALTER EXTENSION hstore ADD function exists_any(hstore,text[]); +ALTER EXTENSION hstore ADD operator ?|(hstore,text[]); +ALTER EXTENSION hstore ADD function exists_all(hstore,text[]); +ALTER EXTENSION hstore ADD operator ?&(hstore,text[]); +ALTER EXTENSION hstore ADD function isdefined(hstore,text); +ALTER EXTENSION hstore ADD function defined(hstore,text); +ALTER EXTENSION hstore ADD function delete(hstore,text); +ALTER EXTENSION hstore ADD function delete(hstore,text[]); +ALTER EXTENSION hstore ADD function delete(hstore,hstore); +ALTER EXTENSION hstore ADD operator -(hstore,text); +ALTER EXTENSION hstore ADD operator -(hstore,text[]); +ALTER EXTENSION hstore ADD operator -(hstore,hstore); +ALTER EXTENSION hstore ADD function hs_concat(hstore,hstore); +ALTER EXTENSION hstore ADD operator ||(hstore,hstore); +ALTER EXTENSION hstore ADD function hs_contains(hstore,hstore); +ALTER EXTENSION hstore ADD function hs_contained(hstore,hstore); +ALTER EXTENSION hstore ADD operator <@(hstore,hstore); +ALTER EXTENSION hstore ADD operator @>(hstore,hstore); +ALTER EXTENSION hstore ADD operator ~(hstore,hstore); +ALTER EXTENSION hstore ADD operator @(hstore,hstore); +ALTER EXTENSION hstore ADD function tconvert(text,text); +ALTER EXTENSION hstore ADD function hstore(text,text); +ALTER EXTENSION hstore ADD operator =>(text,text); +ALTER EXTENSION hstore ADD function hstore(text[],text[]); +ALTER EXTENSION hstore ADD function hstore(text[]); +ALTER EXTENSION hstore ADD cast (text[] as hstore); +ALTER EXTENSION hstore ADD function hstore(record); +ALTER EXTENSION hstore ADD function hstore_to_array(hstore); +ALTER EXTENSION hstore ADD operator %%(NONE,hstore); +ALTER EXTENSION hstore ADD function hstore_to_matrix(hstore); +ALTER EXTENSION hstore ADD operator %#(NONE,hstore); +ALTER EXTENSION hstore ADD function akeys(hstore); +ALTER EXTENSION hstore ADD function avals(hstore); +ALTER EXTENSION hstore ADD function skeys(hstore); +ALTER EXTENSION hstore ADD function svals(hstore); +ALTER EXTENSION hstore ADD function each(hstore); +ALTER EXTENSION hstore ADD function populate_record(anyelement,hstore); +ALTER EXTENSION hstore ADD operator #=(anyelement,hstore); +ALTER EXTENSION hstore ADD function hstore_eq(hstore,hstore); +ALTER EXTENSION hstore ADD function hstore_ne(hstore,hstore); +ALTER EXTENSION hstore ADD function hstore_gt(hstore,hstore); +ALTER EXTENSION hstore ADD function hstore_ge(hstore,hstore); +ALTER EXTENSION hstore ADD function hstore_lt(hstore,hstore); +ALTER EXTENSION hstore ADD function hstore_le(hstore,hstore); +ALTER EXTENSION hstore ADD function hstore_cmp(hstore,hstore); +ALTER EXTENSION hstore ADD operator <>(hstore,hstore); +ALTER EXTENSION hstore ADD operator =(hstore,hstore); +ALTER EXTENSION hstore ADD operator #>#(hstore,hstore); +ALTER EXTENSION hstore ADD operator #>=#(hstore,hstore); +ALTER EXTENSION hstore ADD operator #<#(hstore,hstore); +ALTER EXTENSION hstore ADD operator #<=#(hstore,hstore); +ALTER EXTENSION hstore ADD operator family btree_hstore_ops using btree; +ALTER EXTENSION hstore ADD operator class btree_hstore_ops using btree; +ALTER EXTENSION hstore ADD function hstore_hash(hstore); +ALTER EXTENSION hstore ADD operator family hash_hstore_ops using hash; +ALTER EXTENSION hstore ADD operator class hash_hstore_ops using hash; +ALTER EXTENSION hstore ADD type ghstore; +ALTER EXTENSION hstore ADD function ghstore_in(cstring); +ALTER EXTENSION hstore ADD function ghstore_out(ghstore); +ALTER EXTENSION hstore ADD function ghstore_compress(internal); +ALTER EXTENSION hstore ADD function ghstore_decompress(internal); +ALTER EXTENSION hstore ADD function ghstore_penalty(internal,internal,internal); +ALTER EXTENSION hstore ADD function ghstore_picksplit(internal,internal); +ALTER EXTENSION hstore ADD function ghstore_union(internal,internal); +ALTER EXTENSION hstore ADD function ghstore_same(internal,internal,internal); +ALTER EXTENSION hstore ADD function ghstore_consistent(internal,internal,integer,oid,internal); +ALTER EXTENSION hstore ADD operator family gist_hstore_ops using gist; +ALTER EXTENSION hstore ADD operator class gist_hstore_ops using gist; +ALTER EXTENSION hstore ADD function gin_extract_hstore(internal,internal); +ALTER EXTENSION hstore ADD function gin_extract_hstore_query(internal,internal,smallint,internal,internal); +ALTER EXTENSION hstore ADD function gin_consistent_hstore(internal,smallint,internal,integer,internal,internal); +ALTER EXTENSION hstore ADD operator family gin_hstore_ops using gin; +ALTER EXTENSION hstore ADD operator class gin_hstore_ops using gin; diff --git a/contrib/hstore/hstore.control b/contrib/hstore/hstore.control new file mode 100644 index 0000000000..0a57b3487b --- /dev/null +++ b/contrib/hstore/hstore.control @@ -0,0 +1,5 @@ +# hstore extension +comment = 'store sets of (key, value) pairs' +default_version = '1.0' +module_pathname = '$libdir/hstore' +relocatable = true diff --git a/contrib/hstore/hstore.sql.in b/contrib/hstore/hstore.sql.in deleted file mode 100644 index 5b39c189e1..0000000000 --- a/contrib/hstore/hstore.sql.in +++ /dev/null @@ -1,530 +0,0 @@ -/* contrib/hstore/hstore.sql.in */ - --- Adjust this setting to control where the objects get created. -SET search_path = public; - -CREATE TYPE hstore; - -CREATE OR REPLACE FUNCTION hstore_in(cstring) -RETURNS hstore -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION hstore_out(hstore) -RETURNS cstring -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION hstore_recv(internal) -RETURNS hstore -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION hstore_send(hstore) -RETURNS bytea -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE TYPE hstore ( - INTERNALLENGTH = -1, - INPUT = hstore_in, - OUTPUT = hstore_out, - RECEIVE = hstore_recv, - SEND = hstore_send, - STORAGE = extended -); - -CREATE OR REPLACE FUNCTION hstore_version_diag(hstore) -RETURNS integer -AS 'MODULE_PATHNAME','hstore_version_diag' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION fetchval(hstore,text) -RETURNS text -AS 'MODULE_PATHNAME','hstore_fetchval' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OPERATOR -> ( - LEFTARG = hstore, - RIGHTARG = text, - PROCEDURE = fetchval -); - -CREATE OR REPLACE FUNCTION slice_array(hstore,text[]) -RETURNS text[] -AS 'MODULE_PATHNAME','hstore_slice_to_array' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OPERATOR -> ( - LEFTARG = hstore, - RIGHTARG = text[], - PROCEDURE = slice_array -); - -CREATE OR REPLACE FUNCTION slice(hstore,text[]) -RETURNS hstore -AS 'MODULE_PATHNAME','hstore_slice_to_hstore' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION isexists(hstore,text) -RETURNS bool -AS 'MODULE_PATHNAME','hstore_exists' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION exist(hstore,text) -RETURNS bool -AS 'MODULE_PATHNAME','hstore_exists' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OPERATOR ? ( - LEFTARG = hstore, - RIGHTARG = text, - PROCEDURE = exist, - RESTRICT = contsel, - JOIN = contjoinsel -); - -CREATE OR REPLACE FUNCTION exists_any(hstore,text[]) -RETURNS bool -AS 'MODULE_PATHNAME','hstore_exists_any' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OPERATOR ?| ( - LEFTARG = hstore, - RIGHTARG = text[], - PROCEDURE = exists_any, - RESTRICT = contsel, - JOIN = contjoinsel -); - -CREATE OR REPLACE FUNCTION exists_all(hstore,text[]) -RETURNS bool -AS 'MODULE_PATHNAME','hstore_exists_all' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OPERATOR ?& ( - LEFTARG = hstore, - RIGHTARG = text[], - PROCEDURE = exists_all, - RESTRICT = contsel, - JOIN = contjoinsel -); - -CREATE OR REPLACE FUNCTION isdefined(hstore,text) -RETURNS bool -AS 'MODULE_PATHNAME','hstore_defined' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION defined(hstore,text) -RETURNS bool -AS 'MODULE_PATHNAME','hstore_defined' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION delete(hstore,text) -RETURNS hstore -AS 'MODULE_PATHNAME','hstore_delete' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION delete(hstore,text[]) -RETURNS hstore -AS 'MODULE_PATHNAME','hstore_delete_array' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION delete(hstore,hstore) -RETURNS hstore -AS 'MODULE_PATHNAME','hstore_delete_hstore' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OPERATOR - ( - LEFTARG = hstore, - RIGHTARG = text, - PROCEDURE = delete -); - -CREATE OPERATOR - ( - LEFTARG = hstore, - RIGHTARG = text[], - PROCEDURE = delete -); - -CREATE OPERATOR - ( - LEFTARG = hstore, - RIGHTARG = hstore, - PROCEDURE = delete -); - -CREATE OR REPLACE FUNCTION hs_concat(hstore,hstore) -RETURNS hstore -AS 'MODULE_PATHNAME','hstore_concat' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OPERATOR || ( - LEFTARG = hstore, - RIGHTARG = hstore, - PROCEDURE = hs_concat -); - -CREATE OR REPLACE FUNCTION hs_contains(hstore,hstore) -RETURNS bool -AS 'MODULE_PATHNAME','hstore_contains' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION hs_contained(hstore,hstore) -RETURNS bool -AS 'MODULE_PATHNAME','hstore_contained' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OPERATOR @> ( - LEFTARG = hstore, - RIGHTARG = hstore, - PROCEDURE = hs_contains, - COMMUTATOR = '<@', - RESTRICT = contsel, - JOIN = contjoinsel -); - -CREATE OPERATOR <@ ( - LEFTARG = hstore, - RIGHTARG = hstore, - PROCEDURE = hs_contained, - COMMUTATOR = '@>', - RESTRICT = contsel, - JOIN = contjoinsel -); - --- obsolete: -CREATE OPERATOR @ ( - LEFTARG = hstore, - RIGHTARG = hstore, - PROCEDURE = hs_contains, - COMMUTATOR = '~', - RESTRICT = contsel, - JOIN = contjoinsel -); - -CREATE OPERATOR ~ ( - LEFTARG = hstore, - RIGHTARG = hstore, - PROCEDURE = hs_contained, - COMMUTATOR = '@', - RESTRICT = contsel, - JOIN = contjoinsel -); - -CREATE OR REPLACE FUNCTION tconvert(text,text) -RETURNS hstore -AS 'MODULE_PATHNAME','hstore_from_text' -LANGUAGE C IMMUTABLE; -- not STRICT; needs to allow (key,NULL) - -CREATE OR REPLACE FUNCTION hstore(text,text) -RETURNS hstore -AS 'MODULE_PATHNAME','hstore_from_text' -LANGUAGE C IMMUTABLE; -- not STRICT; needs to allow (key,NULL) - -CREATE OPERATOR => ( - LEFTARG = text, - RIGHTARG = text, - PROCEDURE = hstore -); - -CREATE OR REPLACE FUNCTION hstore(text[],text[]) -RETURNS hstore -AS 'MODULE_PATHNAME', 'hstore_from_arrays' -LANGUAGE C IMMUTABLE; -- not STRICT; allows (keys,null) - -CREATE FUNCTION hstore(text[]) -RETURNS hstore -AS 'MODULE_PATHNAME', 'hstore_from_array' -LANGUAGE C IMMUTABLE STRICT; - -CREATE CAST (text[] AS hstore) - WITH FUNCTION hstore(text[]); - -CREATE OR REPLACE FUNCTION hstore(record) -RETURNS hstore -AS 'MODULE_PATHNAME', 'hstore_from_record' -LANGUAGE C IMMUTABLE; -- not STRICT; allows (null::recordtype) - -CREATE OR REPLACE FUNCTION hstore_to_array(hstore) -RETURNS text[] -AS 'MODULE_PATHNAME','hstore_to_array' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OPERATOR %% ( - RIGHTARG = hstore, - PROCEDURE = hstore_to_array -); - -CREATE OR REPLACE FUNCTION hstore_to_matrix(hstore) -RETURNS text[] -AS 'MODULE_PATHNAME','hstore_to_matrix' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OPERATOR %# ( - RIGHTARG = hstore, - PROCEDURE = hstore_to_matrix -); - -CREATE OR REPLACE FUNCTION akeys(hstore) -RETURNS text[] -AS 'MODULE_PATHNAME','hstore_akeys' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION avals(hstore) -RETURNS text[] -AS 'MODULE_PATHNAME','hstore_avals' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION skeys(hstore) -RETURNS setof text -AS 'MODULE_PATHNAME','hstore_skeys' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION svals(hstore) -RETURNS setof text -AS 'MODULE_PATHNAME','hstore_svals' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION each(IN hs hstore, - OUT key text, - OUT value text) -RETURNS SETOF record -AS 'MODULE_PATHNAME','hstore_each' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION populate_record(anyelement,hstore) -RETURNS anyelement -AS 'MODULE_PATHNAME', 'hstore_populate_record' -LANGUAGE C IMMUTABLE; -- not STRICT; allows (null::rectype,hstore) - -CREATE OPERATOR #= ( - LEFTARG = anyelement, - RIGHTARG = hstore, - PROCEDURE = populate_record -); - --- btree support - -CREATE OR REPLACE FUNCTION hstore_eq(hstore,hstore) -RETURNS boolean -AS 'MODULE_PATHNAME','hstore_eq' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION hstore_ne(hstore,hstore) -RETURNS boolean -AS 'MODULE_PATHNAME','hstore_ne' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION hstore_gt(hstore,hstore) -RETURNS boolean -AS 'MODULE_PATHNAME','hstore_gt' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION hstore_ge(hstore,hstore) -RETURNS boolean -AS 'MODULE_PATHNAME','hstore_ge' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION hstore_lt(hstore,hstore) -RETURNS boolean -AS 'MODULE_PATHNAME','hstore_lt' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION hstore_le(hstore,hstore) -RETURNS boolean -AS 'MODULE_PATHNAME','hstore_le' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION hstore_cmp(hstore,hstore) -RETURNS integer -AS 'MODULE_PATHNAME','hstore_cmp' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OPERATOR = ( - LEFTARG = hstore, - RIGHTARG = hstore, - PROCEDURE = hstore_eq, - COMMUTATOR = =, - NEGATOR = <>, - RESTRICT = eqsel, - JOIN = eqjoinsel, - MERGES, - HASHES -); -CREATE OPERATOR <> ( - LEFTARG = hstore, - RIGHTARG = hstore, - PROCEDURE = hstore_ne, - COMMUTATOR = <>, - NEGATOR = =, - RESTRICT = neqsel, - JOIN = neqjoinsel -); - --- the comparison operators have funky names (and are undocumented) --- in an attempt to discourage anyone from actually using them. they --- only exist to support the btree opclass - -CREATE OPERATOR #<# ( - LEFTARG = hstore, - RIGHTARG = hstore, - PROCEDURE = hstore_lt, - COMMUTATOR = #>#, - NEGATOR = #>=#, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel -); -CREATE OPERATOR #<=# ( - LEFTARG = hstore, - RIGHTARG = hstore, - PROCEDURE = hstore_le, - COMMUTATOR = #>=#, - NEGATOR = #>#, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel -); -CREATE OPERATOR #># ( - LEFTARG = hstore, - RIGHTARG = hstore, - PROCEDURE = hstore_gt, - COMMUTATOR = #<#, - NEGATOR = #<=#, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel -); -CREATE OPERATOR #>=# ( - LEFTARG = hstore, - RIGHTARG = hstore, - PROCEDURE = hstore_ge, - COMMUTATOR = #<=#, - NEGATOR = #<#, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel -); - -CREATE OPERATOR CLASS btree_hstore_ops -DEFAULT FOR TYPE hstore USING btree -AS - OPERATOR 1 #<# , - OPERATOR 2 #<=# , - OPERATOR 3 = , - OPERATOR 4 #>=# , - OPERATOR 5 #># , - FUNCTION 1 hstore_cmp(hstore,hstore); - --- hash support - -CREATE OR REPLACE FUNCTION hstore_hash(hstore) -RETURNS integer -AS 'MODULE_PATHNAME','hstore_hash' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OPERATOR CLASS hash_hstore_ops -DEFAULT FOR TYPE hstore USING hash -AS - OPERATOR 1 = , - FUNCTION 1 hstore_hash(hstore); - --- GiST support - -CREATE TYPE ghstore; - -CREATE OR REPLACE FUNCTION ghstore_in(cstring) -RETURNS ghstore -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION ghstore_out(ghstore) -RETURNS cstring -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE TYPE ghstore ( - INTERNALLENGTH = -1, - INPUT = ghstore_in, - OUTPUT = ghstore_out -); - -CREATE OR REPLACE FUNCTION ghstore_compress(internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION ghstore_decompress(internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION ghstore_penalty(internal,internal,internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION ghstore_picksplit(internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION ghstore_union(internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION ghstore_same(internal, internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION ghstore_consistent(internal,internal,int,oid,internal) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OPERATOR CLASS gist_hstore_ops -DEFAULT FOR TYPE hstore USING gist -AS - OPERATOR 7 @> , - OPERATOR 9 ?(hstore,text) , - OPERATOR 10 ?|(hstore,text[]) , - OPERATOR 11 ?&(hstore,text[]) , - --OPERATOR 8 <@ , - OPERATOR 13 @ , - --OPERATOR 14 ~ , - FUNCTION 1 ghstore_consistent (internal, internal, int, oid, internal), - FUNCTION 2 ghstore_union (internal, internal), - FUNCTION 3 ghstore_compress (internal), - FUNCTION 4 ghstore_decompress (internal), - FUNCTION 5 ghstore_penalty (internal, internal, internal), - FUNCTION 6 ghstore_picksplit (internal, internal), - FUNCTION 7 ghstore_same (internal, internal, internal), - STORAGE ghstore; - --- GIN support - -CREATE OR REPLACE FUNCTION gin_extract_hstore(internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gin_extract_hstore_query(internal, internal, int2, internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gin_consistent_hstore(internal, int2, internal, int4, internal, internal) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OPERATOR CLASS gin_hstore_ops -DEFAULT FOR TYPE hstore USING gin -AS - OPERATOR 7 @>, - OPERATOR 9 ?(hstore,text), - OPERATOR 10 ?|(hstore,text[]), - OPERATOR 11 ?&(hstore,text[]), - FUNCTION 1 bttextcmp(text,text), - FUNCTION 2 gin_extract_hstore(internal, internal), - FUNCTION 3 gin_extract_hstore_query(internal, internal, int2, internal, internal), - FUNCTION 4 gin_consistent_hstore(internal, int2, internal, int4, internal, internal), - STORAGE text; diff --git a/contrib/hstore/sql/hstore.sql b/contrib/hstore/sql/hstore.sql index 58a7967526..fb6bb59f8a 100644 --- a/contrib/hstore/sql/hstore.sql +++ b/contrib/hstore/sql/hstore.sql @@ -1,12 +1,4 @@ --- --- first, define the datatype. Turn off echoing so that expected file --- does not depend on contents of hstore.sql. --- -SET client_min_messages = warning; -\set ECHO none -\i hstore.sql -\set ECHO all -RESET client_min_messages; +CREATE EXTENSION hstore; set escape_string_warning=off; diff --git a/contrib/hstore/uninstall_hstore.sql b/contrib/hstore/uninstall_hstore.sql deleted file mode 100644 index a03e43164f..0000000000 --- a/contrib/hstore/uninstall_hstore.sql +++ /dev/null @@ -1,86 +0,0 @@ -/* contrib/hstore/uninstall_hstore.sql */ - --- Adjust this setting to control where the objects get dropped. -SET search_path = public; - -DROP OPERATOR CLASS gist_hstore_ops USING gist CASCADE; -DROP OPERATOR CLASS gin_hstore_ops USING gin CASCADE; -DROP OPERATOR CLASS hash_hstore_ops USING hash CASCADE; -DROP OPERATOR CLASS btree_hstore_ops USING btree CASCADE; - -DROP OPERATOR - ( hstore, text ); -DROP OPERATOR - ( hstore, text[] ); -DROP OPERATOR - ( hstore, hstore ); -DROP OPERATOR ? ( hstore, text ); -DROP OPERATOR ?& ( hstore, text[] ); -DROP OPERATOR ?| ( hstore, text[] ); -DROP OPERATOR -> ( hstore, text ); -DROP OPERATOR -> ( hstore, text[] ); -DROP OPERATOR || ( hstore, hstore ); -DROP OPERATOR @> ( hstore, hstore ); -DROP OPERATOR <@ ( hstore, hstore ); -DROP OPERATOR @ ( hstore, hstore ); -DROP OPERATOR ~ ( hstore, hstore ); -DROP OPERATOR => ( text, text ); -DROP OPERATOR #= ( anyelement, hstore ); -DROP OPERATOR %% ( NONE, hstore ); -DROP OPERATOR %# ( NONE, hstore ); -DROP OPERATOR = ( hstore, hstore ); -DROP OPERATOR <> ( hstore, hstore ); -DROP OPERATOR #<# ( hstore, hstore ); -DROP OPERATOR #<=# ( hstore, hstore ); -DROP OPERATOR #># ( hstore, hstore ); -DROP OPERATOR #>=# ( hstore, hstore ); - -DROP CAST (text[] AS hstore); - -DROP FUNCTION hstore_eq(hstore,hstore); -DROP FUNCTION hstore_ne(hstore,hstore); -DROP FUNCTION hstore_gt(hstore,hstore); -DROP FUNCTION hstore_ge(hstore,hstore); -DROP FUNCTION hstore_lt(hstore,hstore); -DROP FUNCTION hstore_le(hstore,hstore); -DROP FUNCTION hstore_cmp(hstore,hstore); -DROP FUNCTION hstore_hash(hstore); -DROP FUNCTION slice_array(hstore,text[]); -DROP FUNCTION slice(hstore,text[]); -DROP FUNCTION fetchval(hstore,text); -DROP FUNCTION isexists(hstore,text); -DROP FUNCTION exist(hstore,text); -DROP FUNCTION exists_any(hstore,text[]); -DROP FUNCTION exists_all(hstore,text[]); -DROP FUNCTION isdefined(hstore,text); -DROP FUNCTION defined(hstore,text); -DROP FUNCTION delete(hstore,text); -DROP FUNCTION delete(hstore,text[]); -DROP FUNCTION delete(hstore,hstore); -DROP FUNCTION hs_concat(hstore,hstore); -DROP FUNCTION hs_contains(hstore,hstore); -DROP FUNCTION hs_contained(hstore,hstore); -DROP FUNCTION tconvert(text,text); -DROP FUNCTION hstore(text,text); -DROP FUNCTION hstore(text[],text[]); -DROP FUNCTION hstore_to_array(hstore); -DROP FUNCTION hstore_to_matrix(hstore); -DROP FUNCTION hstore(record); -DROP FUNCTION hstore(text[]); -DROP FUNCTION akeys(hstore); -DROP FUNCTION avals(hstore); -DROP FUNCTION skeys(hstore); -DROP FUNCTION svals(hstore); -DROP FUNCTION each(hstore); -DROP FUNCTION populate_record(anyelement,hstore); -DROP FUNCTION ghstore_compress(internal); -DROP FUNCTION ghstore_decompress(internal); -DROP FUNCTION ghstore_penalty(internal,internal,internal); -DROP FUNCTION ghstore_picksplit(internal, internal); -DROP FUNCTION ghstore_union(internal, internal); -DROP FUNCTION ghstore_same(internal, internal, internal); -DROP FUNCTION ghstore_consistent(internal,internal,int,oid,internal); -DROP FUNCTION gin_consistent_hstore(internal, int2, internal, int4, internal, internal); -DROP FUNCTION gin_extract_hstore(internal, internal); -DROP FUNCTION gin_extract_hstore_query(internal, internal, smallint, internal, internal); -DROP FUNCTION hstore_version_diag(hstore); - -DROP TYPE hstore CASCADE; -DROP TYPE ghstore CASCADE; diff --git a/contrib/intagg/Makefile b/contrib/intagg/Makefile index 9bb1866e78..372c0919a7 100644 --- a/contrib/intagg/Makefile +++ b/contrib/intagg/Makefile @@ -1,6 +1,7 @@ # contrib/intagg/Makefile -DATA = int_aggregate.sql uninstall_int_aggregate.sql +EXTENSION = int_aggregate +DATA = int_aggregate--1.0.sql int_aggregate--unpackaged--1.0.sql ifdef USE_PGXS PG_CONFIG = pg_config diff --git a/contrib/intagg/int_aggregate--1.0.sql b/contrib/intagg/int_aggregate--1.0.sql new file mode 100644 index 0000000000..3df72c18cf --- /dev/null +++ b/contrib/intagg/int_aggregate--1.0.sql @@ -0,0 +1,32 @@ +/* contrib/intagg/int_aggregate--1.0.sql */ + +-- Internal function for the aggregate +-- Is called for each item in an aggregation +CREATE OR REPLACE FUNCTION int_agg_state (internal, int4) +RETURNS internal +AS 'array_agg_transfn' +LANGUAGE INTERNAL; + +-- Internal function for the aggregate +-- Is called at the end of the aggregation, and returns an array. +CREATE OR REPLACE FUNCTION int_agg_final_array (internal) +RETURNS int4[] +AS 'array_agg_finalfn' +LANGUAGE INTERNAL; + +-- The aggregate function itself +-- uses the above functions to create an array of integers from an aggregation. +CREATE AGGREGATE int_array_aggregate ( + BASETYPE = int4, + SFUNC = int_agg_state, + STYPE = internal, + FINALFUNC = int_agg_final_array +); + +-- The enumeration function +-- returns each element in a one dimensional integer array +-- as a row. +CREATE OR REPLACE FUNCTION int_array_enum(int4[]) +RETURNS setof integer +AS 'array_unnest' +LANGUAGE INTERNAL IMMUTABLE STRICT; diff --git a/contrib/intagg/int_aggregate--unpackaged--1.0.sql b/contrib/intagg/int_aggregate--unpackaged--1.0.sql new file mode 100644 index 0000000000..0bc874e645 --- /dev/null +++ b/contrib/intagg/int_aggregate--unpackaged--1.0.sql @@ -0,0 +1,6 @@ +/* contrib/intagg/int_aggregate--unpackaged--1.0.sql */ + +ALTER EXTENSION int_aggregate ADD function int_agg_state(internal,integer); +ALTER EXTENSION int_aggregate ADD function int_agg_final_array(internal); +ALTER EXTENSION int_aggregate ADD function int_array_aggregate(integer); +ALTER EXTENSION int_aggregate ADD function int_array_enum(integer[]); diff --git a/contrib/intagg/int_aggregate.control b/contrib/intagg/int_aggregate.control new file mode 100644 index 0000000000..f8e47d5a7f --- /dev/null +++ b/contrib/intagg/int_aggregate.control @@ -0,0 +1,4 @@ +# int_aggregate extension +comment = 'integer aggregator and enumerator (obsolete)' +default_version = '1.0' +relocatable = true diff --git a/contrib/intagg/int_aggregate.sql b/contrib/intagg/int_aggregate.sql deleted file mode 100644 index 289e41b671..0000000000 --- a/contrib/intagg/int_aggregate.sql +++ /dev/null @@ -1,35 +0,0 @@ -/* contrib/intagg/int_aggregate.sql */ - --- Adjust this setting to control where the objects get created. -SET search_path = public; - --- Internal function for the aggregate --- Is called for each item in an aggregation -CREATE OR REPLACE FUNCTION int_agg_state (internal, int4) -RETURNS internal -AS 'array_agg_transfn' -LANGUAGE INTERNAL; - --- Internal function for the aggregate --- Is called at the end of the aggregation, and returns an array. -CREATE OR REPLACE FUNCTION int_agg_final_array (internal) -RETURNS int4[] -AS 'array_agg_finalfn' -LANGUAGE INTERNAL; - --- The aggregate function itself --- uses the above functions to create an array of integers from an aggregation. -CREATE AGGREGATE int_array_aggregate ( - BASETYPE = int4, - SFUNC = int_agg_state, - STYPE = internal, - FINALFUNC = int_agg_final_array -); - --- The enumeration function --- returns each element in a one dimensional integer array --- as a row. -CREATE OR REPLACE FUNCTION int_array_enum(int4[]) -RETURNS setof integer -AS 'array_unnest' -LANGUAGE INTERNAL IMMUTABLE STRICT; diff --git a/contrib/intagg/uninstall_int_aggregate.sql b/contrib/intagg/uninstall_int_aggregate.sql deleted file mode 100644 index 2e55345325..0000000000 --- a/contrib/intagg/uninstall_int_aggregate.sql +++ /dev/null @@ -1,12 +0,0 @@ -/* contrib/intagg/uninstall_int_aggregate.sql */ - --- Adjust this setting to control where the objects get dropped. -SET search_path = public; - -DROP FUNCTION int_array_enum(int4[]); - -DROP AGGREGATE int_array_aggregate (int4); - -DROP FUNCTION int_agg_final_array (internal); - -DROP FUNCTION int_agg_state (internal, int4); diff --git a/contrib/intarray/.gitignore b/contrib/intarray/.gitignore index 761a9b2607..19b6c5ba42 100644 --- a/contrib/intarray/.gitignore +++ b/contrib/intarray/.gitignore @@ -1,3 +1,2 @@ -/_int.sql # Generated subdirectories /results/ diff --git a/contrib/intarray/Makefile b/contrib/intarray/Makefile index a10d7c6b1f..71f820ec4a 100644 --- a/contrib/intarray/Makefile +++ b/contrib/intarray/Makefile @@ -2,8 +2,10 @@ MODULE_big = _int OBJS = _int_bool.o _int_gist.o _int_op.o _int_tool.o _intbig_gist.o _int_gin.o -DATA_built = _int.sql -DATA = uninstall__int.sql + +EXTENSION = intarray +DATA = intarray--1.0.sql intarray--unpackaged--1.0.sql + REGRESS = _int ifdef USE_PGXS diff --git a/contrib/intarray/_int.sql.in b/contrib/intarray/_int.sql.in deleted file mode 100644 index ad224e319b..0000000000 --- a/contrib/intarray/_int.sql.in +++ /dev/null @@ -1,485 +0,0 @@ -/* contrib/intarray/_int.sql.in */ - --- Adjust this setting to control where the objects get created. -SET search_path = public; - --- --- Create the user-defined type for the 1-D integer arrays (_int4) --- - --- Query type -CREATE OR REPLACE FUNCTION bqarr_in(cstring) -RETURNS query_int -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION bqarr_out(query_int) -RETURNS cstring -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE TYPE query_int ( - INTERNALLENGTH = -1, - INPUT = bqarr_in, - OUTPUT = bqarr_out -); - ---only for debug -CREATE OR REPLACE FUNCTION querytree(query_int) -RETURNS text -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - - -CREATE OR REPLACE FUNCTION boolop(_int4, query_int) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -COMMENT ON FUNCTION boolop(_int4, query_int) IS 'boolean operation with array'; - -CREATE OR REPLACE FUNCTION rboolop(query_int, _int4) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -COMMENT ON FUNCTION rboolop(query_int, _int4) IS 'boolean operation with array'; - -CREATE OPERATOR @@ ( - LEFTARG = _int4, - RIGHTARG = query_int, - PROCEDURE = boolop, - COMMUTATOR = '~~', - RESTRICT = contsel, - JOIN = contjoinsel -); - -CREATE OPERATOR ~~ ( - LEFTARG = query_int, - RIGHTARG = _int4, - PROCEDURE = rboolop, - COMMUTATOR = '@@', - RESTRICT = contsel, - JOIN = contjoinsel -); - - --- --- External C-functions for R-tree methods --- - --- Comparison methods - -CREATE OR REPLACE FUNCTION _int_contains(_int4, _int4) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -COMMENT ON FUNCTION _int_contains(_int4, _int4) IS 'contains'; - -CREATE OR REPLACE FUNCTION _int_contained(_int4, _int4) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -COMMENT ON FUNCTION _int_contained(_int4, _int4) IS 'contained in'; - -CREATE OR REPLACE FUNCTION _int_overlap(_int4, _int4) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -COMMENT ON FUNCTION _int_overlap(_int4, _int4) IS 'overlaps'; - -CREATE OR REPLACE FUNCTION _int_same(_int4, _int4) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -COMMENT ON FUNCTION _int_same(_int4, _int4) IS 'same as'; - -CREATE OR REPLACE FUNCTION _int_different(_int4, _int4) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -COMMENT ON FUNCTION _int_different(_int4, _int4) IS 'different'; - --- support routines for indexing - -CREATE OR REPLACE FUNCTION _int_union(_int4, _int4) -RETURNS _int4 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION _int_inter(_int4, _int4) -RETURNS _int4 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - --- --- OPERATORS --- - -CREATE OPERATOR && ( - LEFTARG = _int4, - RIGHTARG = _int4, - PROCEDURE = _int_overlap, - COMMUTATOR = '&&', - RESTRICT = contsel, - JOIN = contjoinsel -); - ---CREATE OPERATOR = ( --- LEFTARG = _int4, --- RIGHTARG = _int4, --- PROCEDURE = _int_same, --- COMMUTATOR = '=', --- NEGATOR = '<>', --- RESTRICT = eqsel, --- JOIN = eqjoinsel, --- SORT1 = '<', --- SORT2 = '<' ---); - ---CREATE OPERATOR <> ( --- LEFTARG = _int4, --- RIGHTARG = _int4, --- PROCEDURE = _int_different, --- COMMUTATOR = '<>', --- NEGATOR = '=', --- RESTRICT = neqsel, --- JOIN = neqjoinsel ---); - -CREATE OPERATOR @> ( - LEFTARG = _int4, - RIGHTARG = _int4, - PROCEDURE = _int_contains, - COMMUTATOR = '<@', - RESTRICT = contsel, - JOIN = contjoinsel -); - -CREATE OPERATOR <@ ( - LEFTARG = _int4, - RIGHTARG = _int4, - PROCEDURE = _int_contained, - COMMUTATOR = '@>', - RESTRICT = contsel, - JOIN = contjoinsel -); - --- obsolete: -CREATE OPERATOR @ ( - LEFTARG = _int4, - RIGHTARG = _int4, - PROCEDURE = _int_contains, - COMMUTATOR = '~', - RESTRICT = contsel, - JOIN = contjoinsel -); - -CREATE OPERATOR ~ ( - LEFTARG = _int4, - RIGHTARG = _int4, - PROCEDURE = _int_contained, - COMMUTATOR = '@', - RESTRICT = contsel, - JOIN = contjoinsel -); - --------------- -CREATE OR REPLACE FUNCTION intset(int4) -RETURNS _int4 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION icount(_int4) -RETURNS int4 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OPERATOR # ( - RIGHTARG = _int4, - PROCEDURE = icount -); - -CREATE OR REPLACE FUNCTION sort(_int4, text) -RETURNS _int4 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION sort(_int4) -RETURNS _int4 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION sort_asc(_int4) -RETURNS _int4 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION sort_desc(_int4) -RETURNS _int4 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION uniq(_int4) -RETURNS _int4 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION idx(_int4, int4) -RETURNS int4 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OPERATOR # ( - LEFTARG = _int4, - RIGHTARG = int4, - PROCEDURE = idx -); - -CREATE OR REPLACE FUNCTION subarray(_int4, int4, int4) -RETURNS _int4 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION subarray(_int4, int4) -RETURNS _int4 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION intarray_push_elem(_int4, int4) -RETURNS _int4 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OPERATOR + ( - LEFTARG = _int4, - RIGHTARG = int4, - PROCEDURE = intarray_push_elem -); - -CREATE OR REPLACE FUNCTION intarray_push_array(_int4, _int4) -RETURNS _int4 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OPERATOR + ( - LEFTARG = _int4, - RIGHTARG = _int4, - COMMUTATOR = +, - PROCEDURE = intarray_push_array -); - -CREATE OR REPLACE FUNCTION intarray_del_elem(_int4, int4) -RETURNS _int4 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OPERATOR - ( - LEFTARG = _int4, - RIGHTARG = int4, - PROCEDURE = intarray_del_elem -); - -CREATE OR REPLACE FUNCTION intset_union_elem(_int4, int4) -RETURNS _int4 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OPERATOR | ( - LEFTARG = _int4, - RIGHTARG = int4, - PROCEDURE = intset_union_elem -); - -CREATE OPERATOR | ( - LEFTARG = _int4, - RIGHTARG = _int4, - COMMUTATOR = |, - PROCEDURE = _int_union -); - -CREATE OR REPLACE FUNCTION intset_subtract(_int4, _int4) -RETURNS _int4 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OPERATOR - ( - LEFTARG = _int4, - RIGHTARG = _int4, - PROCEDURE = intset_subtract -); - -CREATE OPERATOR & ( - LEFTARG = _int4, - RIGHTARG = _int4, - COMMUTATOR = &, - PROCEDURE = _int_inter -); --------------- - --- define the GiST support methods -CREATE OR REPLACE FUNCTION g_int_consistent(internal,_int4,int,oid,internal) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION g_int_compress(internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION g_int_decompress(internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION g_int_penalty(internal,internal,internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION g_int_picksplit(internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION g_int_union(internal, internal) -RETURNS _int4 -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION g_int_same(_int4, _int4, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - - --- Create the operator class for indexing - -CREATE OPERATOR CLASS gist__int_ops -DEFAULT FOR TYPE _int4 USING gist AS - OPERATOR 3 &&, - OPERATOR 6 = (anyarray, anyarray), - OPERATOR 7 @>, - OPERATOR 8 <@, - OPERATOR 13 @, - OPERATOR 14 ~, - OPERATOR 20 @@ (_int4, query_int), - FUNCTION 1 g_int_consistent (internal, _int4, int, oid, internal), - FUNCTION 2 g_int_union (internal, internal), - FUNCTION 3 g_int_compress (internal), - FUNCTION 4 g_int_decompress (internal), - FUNCTION 5 g_int_penalty (internal, internal, internal), - FUNCTION 6 g_int_picksplit (internal, internal), - FUNCTION 7 g_int_same (_int4, _int4, internal); - - ---------------------------------------------- --- intbig ---------------------------------------------- --- define the GiST support methods - -CREATE OR REPLACE FUNCTION _intbig_in(cstring) -RETURNS intbig_gkey -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION _intbig_out(intbig_gkey) -RETURNS cstring -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE TYPE intbig_gkey ( - INTERNALLENGTH = -1, - INPUT = _intbig_in, - OUTPUT = _intbig_out -); - -CREATE OR REPLACE FUNCTION g_intbig_consistent(internal,internal,int,oid,internal) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION g_intbig_compress(internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION g_intbig_decompress(internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION g_intbig_penalty(internal,internal,internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION g_intbig_picksplit(internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION g_intbig_union(internal, internal) -RETURNS _int4 -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION g_intbig_same(internal, internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - --- register the opclass for indexing (not as default) - -CREATE OPERATOR CLASS gist__intbig_ops -FOR TYPE _int4 USING gist -AS - OPERATOR 3 &&, - OPERATOR 6 = (anyarray, anyarray), - OPERATOR 7 @>, - OPERATOR 8 <@, - OPERATOR 13 @, - OPERATOR 14 ~, - OPERATOR 20 @@ (_int4, query_int), - FUNCTION 1 g_intbig_consistent (internal, internal, int, oid, internal), - FUNCTION 2 g_intbig_union (internal, internal), - FUNCTION 3 g_intbig_compress (internal), - FUNCTION 4 g_intbig_decompress (internal), - FUNCTION 5 g_intbig_penalty (internal, internal, internal), - FUNCTION 6 g_intbig_picksplit (internal, internal), - FUNCTION 7 g_intbig_same (internal, internal, internal), - STORAGE intbig_gkey; - ---GIN - -CREATE OR REPLACE FUNCTION ginint4_queryextract(internal, internal, int2, internal, internal, internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION ginint4_consistent(internal, int2, internal, int4, internal, internal, internal, internal) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OPERATOR CLASS gin__int_ops -FOR TYPE _int4 USING gin -AS - OPERATOR 3 &&, - OPERATOR 6 = (anyarray, anyarray), - OPERATOR 7 @>, - OPERATOR 8 <@, - OPERATOR 13 @, - OPERATOR 14 ~, - OPERATOR 20 @@ (_int4, query_int), - FUNCTION 1 btint4cmp (int4, int4), - FUNCTION 2 ginarrayextract (anyarray, internal, internal), - FUNCTION 3 ginint4_queryextract (internal, internal, int2, internal, internal, internal, internal), - FUNCTION 4 ginint4_consistent (internal, int2, internal, int4, internal, internal, internal, internal), - STORAGE int4; diff --git a/contrib/intarray/expected/_int.out b/contrib/intarray/expected/_int.out index 596439d314..6ed3cc6ced 100644 --- a/contrib/intarray/expected/_int.out +++ b/contrib/intarray/expected/_int.out @@ -1,10 +1,4 @@ --- --- first, define the datatype. Turn off echoing so that expected file --- does not depend on contents of _int.sql. --- -SET client_min_messages = warning; -\set ECHO none -RESET client_min_messages; +CREATE EXTENSION intarray; SELECT intset(1234); intset -------- diff --git a/contrib/intarray/intarray--1.0.sql b/contrib/intarray/intarray--1.0.sql new file mode 100644 index 0000000000..5f86ee607f --- /dev/null +++ b/contrib/intarray/intarray--1.0.sql @@ -0,0 +1,482 @@ +/* contrib/intarray/intarray--1.0.sql */ + +-- +-- Create the user-defined type for the 1-D integer arrays (_int4) +-- + +-- Query type +CREATE OR REPLACE FUNCTION bqarr_in(cstring) +RETURNS query_int +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION bqarr_out(query_int) +RETURNS cstring +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE TYPE query_int ( + INTERNALLENGTH = -1, + INPUT = bqarr_in, + OUTPUT = bqarr_out +); + +--only for debug +CREATE OR REPLACE FUNCTION querytree(query_int) +RETURNS text +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + + +CREATE OR REPLACE FUNCTION boolop(_int4, query_int) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +COMMENT ON FUNCTION boolop(_int4, query_int) IS 'boolean operation with array'; + +CREATE OR REPLACE FUNCTION rboolop(query_int, _int4) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +COMMENT ON FUNCTION rboolop(query_int, _int4) IS 'boolean operation with array'; + +CREATE OPERATOR @@ ( + LEFTARG = _int4, + RIGHTARG = query_int, + PROCEDURE = boolop, + COMMUTATOR = '~~', + RESTRICT = contsel, + JOIN = contjoinsel +); + +CREATE OPERATOR ~~ ( + LEFTARG = query_int, + RIGHTARG = _int4, + PROCEDURE = rboolop, + COMMUTATOR = '@@', + RESTRICT = contsel, + JOIN = contjoinsel +); + + +-- +-- External C-functions for R-tree methods +-- + +-- Comparison methods + +CREATE OR REPLACE FUNCTION _int_contains(_int4, _int4) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +COMMENT ON FUNCTION _int_contains(_int4, _int4) IS 'contains'; + +CREATE OR REPLACE FUNCTION _int_contained(_int4, _int4) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +COMMENT ON FUNCTION _int_contained(_int4, _int4) IS 'contained in'; + +CREATE OR REPLACE FUNCTION _int_overlap(_int4, _int4) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +COMMENT ON FUNCTION _int_overlap(_int4, _int4) IS 'overlaps'; + +CREATE OR REPLACE FUNCTION _int_same(_int4, _int4) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +COMMENT ON FUNCTION _int_same(_int4, _int4) IS 'same as'; + +CREATE OR REPLACE FUNCTION _int_different(_int4, _int4) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +COMMENT ON FUNCTION _int_different(_int4, _int4) IS 'different'; + +-- support routines for indexing + +CREATE OR REPLACE FUNCTION _int_union(_int4, _int4) +RETURNS _int4 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION _int_inter(_int4, _int4) +RETURNS _int4 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +-- +-- OPERATORS +-- + +CREATE OPERATOR && ( + LEFTARG = _int4, + RIGHTARG = _int4, + PROCEDURE = _int_overlap, + COMMUTATOR = '&&', + RESTRICT = contsel, + JOIN = contjoinsel +); + +--CREATE OPERATOR = ( +-- LEFTARG = _int4, +-- RIGHTARG = _int4, +-- PROCEDURE = _int_same, +-- COMMUTATOR = '=', +-- NEGATOR = '<>', +-- RESTRICT = eqsel, +-- JOIN = eqjoinsel, +-- SORT1 = '<', +-- SORT2 = '<' +--); + +--CREATE OPERATOR <> ( +-- LEFTARG = _int4, +-- RIGHTARG = _int4, +-- PROCEDURE = _int_different, +-- COMMUTATOR = '<>', +-- NEGATOR = '=', +-- RESTRICT = neqsel, +-- JOIN = neqjoinsel +--); + +CREATE OPERATOR @> ( + LEFTARG = _int4, + RIGHTARG = _int4, + PROCEDURE = _int_contains, + COMMUTATOR = '<@', + RESTRICT = contsel, + JOIN = contjoinsel +); + +CREATE OPERATOR <@ ( + LEFTARG = _int4, + RIGHTARG = _int4, + PROCEDURE = _int_contained, + COMMUTATOR = '@>', + RESTRICT = contsel, + JOIN = contjoinsel +); + +-- obsolete: +CREATE OPERATOR @ ( + LEFTARG = _int4, + RIGHTARG = _int4, + PROCEDURE = _int_contains, + COMMUTATOR = '~', + RESTRICT = contsel, + JOIN = contjoinsel +); + +CREATE OPERATOR ~ ( + LEFTARG = _int4, + RIGHTARG = _int4, + PROCEDURE = _int_contained, + COMMUTATOR = '@', + RESTRICT = contsel, + JOIN = contjoinsel +); + +-------------- +CREATE OR REPLACE FUNCTION intset(int4) +RETURNS _int4 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION icount(_int4) +RETURNS int4 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OPERATOR # ( + RIGHTARG = _int4, + PROCEDURE = icount +); + +CREATE OR REPLACE FUNCTION sort(_int4, text) +RETURNS _int4 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION sort(_int4) +RETURNS _int4 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION sort_asc(_int4) +RETURNS _int4 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION sort_desc(_int4) +RETURNS _int4 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION uniq(_int4) +RETURNS _int4 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION idx(_int4, int4) +RETURNS int4 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OPERATOR # ( + LEFTARG = _int4, + RIGHTARG = int4, + PROCEDURE = idx +); + +CREATE OR REPLACE FUNCTION subarray(_int4, int4, int4) +RETURNS _int4 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION subarray(_int4, int4) +RETURNS _int4 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION intarray_push_elem(_int4, int4) +RETURNS _int4 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OPERATOR + ( + LEFTARG = _int4, + RIGHTARG = int4, + PROCEDURE = intarray_push_elem +); + +CREATE OR REPLACE FUNCTION intarray_push_array(_int4, _int4) +RETURNS _int4 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OPERATOR + ( + LEFTARG = _int4, + RIGHTARG = _int4, + COMMUTATOR = +, + PROCEDURE = intarray_push_array +); + +CREATE OR REPLACE FUNCTION intarray_del_elem(_int4, int4) +RETURNS _int4 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OPERATOR - ( + LEFTARG = _int4, + RIGHTARG = int4, + PROCEDURE = intarray_del_elem +); + +CREATE OR REPLACE FUNCTION intset_union_elem(_int4, int4) +RETURNS _int4 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OPERATOR | ( + LEFTARG = _int4, + RIGHTARG = int4, + PROCEDURE = intset_union_elem +); + +CREATE OPERATOR | ( + LEFTARG = _int4, + RIGHTARG = _int4, + COMMUTATOR = |, + PROCEDURE = _int_union +); + +CREATE OR REPLACE FUNCTION intset_subtract(_int4, _int4) +RETURNS _int4 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OPERATOR - ( + LEFTARG = _int4, + RIGHTARG = _int4, + PROCEDURE = intset_subtract +); + +CREATE OPERATOR & ( + LEFTARG = _int4, + RIGHTARG = _int4, + COMMUTATOR = &, + PROCEDURE = _int_inter +); +-------------- + +-- define the GiST support methods +CREATE OR REPLACE FUNCTION g_int_consistent(internal,_int4,int,oid,internal) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION g_int_compress(internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION g_int_decompress(internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION g_int_penalty(internal,internal,internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION g_int_picksplit(internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION g_int_union(internal, internal) +RETURNS _int4 +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION g_int_same(_int4, _int4, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + + +-- Create the operator class for indexing + +CREATE OPERATOR CLASS gist__int_ops +DEFAULT FOR TYPE _int4 USING gist AS + OPERATOR 3 &&, + OPERATOR 6 = (anyarray, anyarray), + OPERATOR 7 @>, + OPERATOR 8 <@, + OPERATOR 13 @, + OPERATOR 14 ~, + OPERATOR 20 @@ (_int4, query_int), + FUNCTION 1 g_int_consistent (internal, _int4, int, oid, internal), + FUNCTION 2 g_int_union (internal, internal), + FUNCTION 3 g_int_compress (internal), + FUNCTION 4 g_int_decompress (internal), + FUNCTION 5 g_int_penalty (internal, internal, internal), + FUNCTION 6 g_int_picksplit (internal, internal), + FUNCTION 7 g_int_same (_int4, _int4, internal); + + +--------------------------------------------- +-- intbig +--------------------------------------------- +-- define the GiST support methods + +CREATE OR REPLACE FUNCTION _intbig_in(cstring) +RETURNS intbig_gkey +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION _intbig_out(intbig_gkey) +RETURNS cstring +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE TYPE intbig_gkey ( + INTERNALLENGTH = -1, + INPUT = _intbig_in, + OUTPUT = _intbig_out +); + +CREATE OR REPLACE FUNCTION g_intbig_consistent(internal,internal,int,oid,internal) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION g_intbig_compress(internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION g_intbig_decompress(internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION g_intbig_penalty(internal,internal,internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION g_intbig_picksplit(internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION g_intbig_union(internal, internal) +RETURNS _int4 +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION g_intbig_same(internal, internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +-- register the opclass for indexing (not as default) + +CREATE OPERATOR CLASS gist__intbig_ops +FOR TYPE _int4 USING gist +AS + OPERATOR 3 &&, + OPERATOR 6 = (anyarray, anyarray), + OPERATOR 7 @>, + OPERATOR 8 <@, + OPERATOR 13 @, + OPERATOR 14 ~, + OPERATOR 20 @@ (_int4, query_int), + FUNCTION 1 g_intbig_consistent (internal, internal, int, oid, internal), + FUNCTION 2 g_intbig_union (internal, internal), + FUNCTION 3 g_intbig_compress (internal), + FUNCTION 4 g_intbig_decompress (internal), + FUNCTION 5 g_intbig_penalty (internal, internal, internal), + FUNCTION 6 g_intbig_picksplit (internal, internal), + FUNCTION 7 g_intbig_same (internal, internal, internal), + STORAGE intbig_gkey; + +--GIN + +CREATE OR REPLACE FUNCTION ginint4_queryextract(internal, internal, int2, internal, internal, internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION ginint4_consistent(internal, int2, internal, int4, internal, internal, internal, internal) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OPERATOR CLASS gin__int_ops +FOR TYPE _int4 USING gin +AS + OPERATOR 3 &&, + OPERATOR 6 = (anyarray, anyarray), + OPERATOR 7 @>, + OPERATOR 8 <@, + OPERATOR 13 @, + OPERATOR 14 ~, + OPERATOR 20 @@ (_int4, query_int), + FUNCTION 1 btint4cmp (int4, int4), + FUNCTION 2 ginarrayextract (anyarray, internal, internal), + FUNCTION 3 ginint4_queryextract (internal, internal, int2, internal, internal, internal, internal), + FUNCTION 4 ginint4_consistent (internal, int2, internal, int4, internal, internal, internal, internal), + STORAGE int4; diff --git a/contrib/intarray/intarray--unpackaged--1.0.sql b/contrib/intarray/intarray--unpackaged--1.0.sql new file mode 100644 index 0000000000..7fd739b0ed --- /dev/null +++ b/contrib/intarray/intarray--unpackaged--1.0.sql @@ -0,0 +1,71 @@ +/* contrib/intarray/intarray--unpackaged--1.0.sql */ + +ALTER EXTENSION intarray ADD type query_int; +ALTER EXTENSION intarray ADD function bqarr_in(cstring); +ALTER EXTENSION intarray ADD function bqarr_out(query_int); +ALTER EXTENSION intarray ADD function querytree(query_int); +ALTER EXTENSION intarray ADD function boolop(integer[],query_int); +ALTER EXTENSION intarray ADD function rboolop(query_int,integer[]); +ALTER EXTENSION intarray ADD operator ~~(query_int,integer[]); +ALTER EXTENSION intarray ADD operator @@(integer[],query_int); +ALTER EXTENSION intarray ADD function _int_contains(integer[],integer[]); +ALTER EXTENSION intarray ADD function _int_contained(integer[],integer[]); +ALTER EXTENSION intarray ADD function _int_overlap(integer[],integer[]); +ALTER EXTENSION intarray ADD function _int_same(integer[],integer[]); +ALTER EXTENSION intarray ADD function _int_different(integer[],integer[]); +ALTER EXTENSION intarray ADD function _int_union(integer[],integer[]); +ALTER EXTENSION intarray ADD function _int_inter(integer[],integer[]); +ALTER EXTENSION intarray ADD operator &&(integer[],integer[]); +ALTER EXTENSION intarray ADD operator <@(integer[],integer[]); +ALTER EXTENSION intarray ADD operator @>(integer[],integer[]); +ALTER EXTENSION intarray ADD operator ~(integer[],integer[]); +ALTER EXTENSION intarray ADD operator @(integer[],integer[]); +ALTER EXTENSION intarray ADD function intset(integer); +ALTER EXTENSION intarray ADD function icount(integer[]); +ALTER EXTENSION intarray ADD operator #(NONE,integer[]); +ALTER EXTENSION intarray ADD function sort(integer[],text); +ALTER EXTENSION intarray ADD function sort(integer[]); +ALTER EXTENSION intarray ADD function sort_asc(integer[]); +ALTER EXTENSION intarray ADD function sort_desc(integer[]); +ALTER EXTENSION intarray ADD function uniq(integer[]); +ALTER EXTENSION intarray ADD function idx(integer[],integer); +ALTER EXTENSION intarray ADD operator #(integer[],integer); +ALTER EXTENSION intarray ADD function subarray(integer[],integer,integer); +ALTER EXTENSION intarray ADD function subarray(integer[],integer); +ALTER EXTENSION intarray ADD function intarray_push_elem(integer[],integer); +ALTER EXTENSION intarray ADD operator +(integer[],integer); +ALTER EXTENSION intarray ADD function intarray_push_array(integer[],integer[]); +ALTER EXTENSION intarray ADD operator +(integer[],integer[]); +ALTER EXTENSION intarray ADD function intarray_del_elem(integer[],integer); +ALTER EXTENSION intarray ADD operator -(integer[],integer); +ALTER EXTENSION intarray ADD function intset_union_elem(integer[],integer); +ALTER EXTENSION intarray ADD operator |(integer[],integer); +ALTER EXTENSION intarray ADD operator |(integer[],integer[]); +ALTER EXTENSION intarray ADD function intset_subtract(integer[],integer[]); +ALTER EXTENSION intarray ADD operator -(integer[],integer[]); +ALTER EXTENSION intarray ADD operator &(integer[],integer[]); +ALTER EXTENSION intarray ADD function g_int_consistent(internal,integer[],integer,oid,internal); +ALTER EXTENSION intarray ADD function g_int_compress(internal); +ALTER EXTENSION intarray ADD function g_int_decompress(internal); +ALTER EXTENSION intarray ADD function g_int_penalty(internal,internal,internal); +ALTER EXTENSION intarray ADD function g_int_picksplit(internal,internal); +ALTER EXTENSION intarray ADD function g_int_union(internal,internal); +ALTER EXTENSION intarray ADD function g_int_same(integer[],integer[],internal); +ALTER EXTENSION intarray ADD operator family gist__int_ops using gist; +ALTER EXTENSION intarray ADD operator class gist__int_ops using gist; +ALTER EXTENSION intarray ADD type intbig_gkey; +ALTER EXTENSION intarray ADD function _intbig_in(cstring); +ALTER EXTENSION intarray ADD function _intbig_out(intbig_gkey); +ALTER EXTENSION intarray ADD function g_intbig_consistent(internal,internal,integer,oid,internal); +ALTER EXTENSION intarray ADD function g_intbig_compress(internal); +ALTER EXTENSION intarray ADD function g_intbig_decompress(internal); +ALTER EXTENSION intarray ADD function g_intbig_penalty(internal,internal,internal); +ALTER EXTENSION intarray ADD function g_intbig_picksplit(internal,internal); +ALTER EXTENSION intarray ADD function g_intbig_union(internal,internal); +ALTER EXTENSION intarray ADD function g_intbig_same(internal,internal,internal); +ALTER EXTENSION intarray ADD operator family gist__intbig_ops using gist; +ALTER EXTENSION intarray ADD operator class gist__intbig_ops using gist; +ALTER EXTENSION intarray ADD function ginint4_queryextract(internal,internal,smallint,internal,internal,internal,internal); +ALTER EXTENSION intarray ADD function ginint4_consistent(internal,smallint,internal,integer,internal,internal,internal,internal); +ALTER EXTENSION intarray ADD operator family gin__int_ops using gin; +ALTER EXTENSION intarray ADD operator class gin__int_ops using gin; diff --git a/contrib/intarray/intarray.control b/contrib/intarray/intarray.control new file mode 100644 index 0000000000..7b3d4f78f0 --- /dev/null +++ b/contrib/intarray/intarray.control @@ -0,0 +1,5 @@ +# intarray extension +comment = 'functions, operators, and index support for 1-D arrays of integers' +default_version = '1.0' +module_pathname = '$libdir/_int' +relocatable = true diff --git a/contrib/intarray/sql/_int.sql b/contrib/intarray/sql/_int.sql index 1588e3b514..b60e936dc5 100644 --- a/contrib/intarray/sql/_int.sql +++ b/contrib/intarray/sql/_int.sql @@ -1,12 +1,4 @@ --- --- first, define the datatype. Turn off echoing so that expected file --- does not depend on contents of _int.sql. --- -SET client_min_messages = warning; -\set ECHO none -\i _int.sql -\set ECHO all -RESET client_min_messages; +CREATE EXTENSION intarray; SELECT intset(1234); SELECT icount('{1234234,234234}'); diff --git a/contrib/intarray/uninstall__int.sql b/contrib/intarray/uninstall__int.sql deleted file mode 100644 index 345ad4464b..0000000000 --- a/contrib/intarray/uninstall__int.sql +++ /dev/null @@ -1,128 +0,0 @@ -/* contrib/intarray/uninstall__int.sql */ - --- Adjust this setting to control where the objects get created. -SET search_path = public; - -DROP OPERATOR CLASS gin__int_ops USING gin; - -DROP FUNCTION ginint4_queryextract(internal, internal, int2, internal, internal, internal, internal); - -DROP FUNCTION ginint4_consistent(internal, int2, internal, int4, internal, internal, internal, internal); - -DROP OPERATOR CLASS gist__intbig_ops USING gist; - -DROP FUNCTION g_intbig_same(internal, internal, internal); - -DROP FUNCTION g_intbig_union(internal, internal); - -DROP FUNCTION g_intbig_picksplit(internal, internal); - -DROP FUNCTION g_intbig_penalty(internal,internal,internal); - -DROP FUNCTION g_intbig_decompress(internal); - -DROP FUNCTION g_intbig_compress(internal); - -DROP FUNCTION g_intbig_consistent(internal,internal,int,oid,internal); - -DROP TYPE intbig_gkey CASCADE; - -DROP OPERATOR CLASS gist__int_ops USING gist; - -DROP FUNCTION g_int_same(_int4, _int4, internal); - -DROP FUNCTION g_int_union(internal, internal); - -DROP FUNCTION g_int_picksplit(internal, internal); - -DROP FUNCTION g_int_penalty(internal,internal,internal); - -DROP FUNCTION g_int_decompress(internal); - -DROP FUNCTION g_int_compress(internal); - -DROP FUNCTION g_int_consistent(internal,_int4,int,oid,internal); - -DROP OPERATOR & (_int4, _int4); - -DROP OPERATOR - (_int4, _int4); - -DROP FUNCTION intset_subtract(_int4, _int4); - -DROP OPERATOR | (_int4, _int4); - -DROP OPERATOR | (_int4, int4); - -DROP FUNCTION intset_union_elem(_int4, int4); - -DROP OPERATOR - (_int4, int4); - -DROP FUNCTION intarray_del_elem(_int4, int4); - -DROP OPERATOR + (_int4, _int4); - -DROP FUNCTION intarray_push_array(_int4, _int4); - -DROP OPERATOR + (_int4, int4); - -DROP FUNCTION intarray_push_elem(_int4, int4); - -DROP FUNCTION subarray(_int4, int4); - -DROP FUNCTION subarray(_int4, int4, int4); - -DROP OPERATOR # (_int4, int4); - -DROP FUNCTION idx(_int4, int4); - -DROP FUNCTION uniq(_int4); - -DROP FUNCTION sort_desc(_int4); - -DROP FUNCTION sort_asc(_int4); - -DROP FUNCTION sort(_int4); - -DROP FUNCTION sort(_int4, text); - -DROP OPERATOR # (NONE, _int4); - -DROP FUNCTION icount(_int4); - -DROP FUNCTION intset(int4); - -DROP OPERATOR <@ (_int4, _int4); - -DROP OPERATOR @> (_int4, _int4); - -DROP OPERATOR ~ (_int4, _int4); - -DROP OPERATOR @ (_int4, _int4); - -DROP OPERATOR && (_int4, _int4); - -DROP FUNCTION _int_inter(_int4, _int4); - -DROP FUNCTION _int_union(_int4, _int4); - -DROP FUNCTION _int_different(_int4, _int4); - -DROP FUNCTION _int_same(_int4, _int4); - -DROP FUNCTION _int_overlap(_int4, _int4); - -DROP FUNCTION _int_contained(_int4, _int4); - -DROP FUNCTION _int_contains(_int4, _int4); - -DROP OPERATOR ~~ (query_int, _int4); - -DROP OPERATOR @@ (_int4, query_int); - -DROP FUNCTION rboolop(query_int, _int4); - -DROP FUNCTION boolop(_int4, query_int); - -DROP FUNCTION querytree(query_int); - -DROP TYPE query_int CASCADE; diff --git a/contrib/isn/.gitignore b/contrib/isn/.gitignore deleted file mode 100644 index 1df12e3b75..0000000000 --- a/contrib/isn/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/isn.sql diff --git a/contrib/isn/Makefile b/contrib/isn/Makefile index ae33b758fb..bd8f193e93 100644 --- a/contrib/isn/Makefile +++ b/contrib/isn/Makefile @@ -1,8 +1,9 @@ # contrib/isn/Makefile MODULES = isn -DATA_built = isn.sql -DATA = uninstall_isn.sql + +EXTENSION = isn +DATA = isn--1.0.sql isn--unpackaged--1.0.sql ifdef USE_PGXS PG_CONFIG = pg_config diff --git a/contrib/isn/isn--1.0.sql b/contrib/isn/isn--1.0.sql new file mode 100644 index 0000000000..a6499f267a --- /dev/null +++ b/contrib/isn/isn--1.0.sql @@ -0,0 +1,3193 @@ +/* contrib/isn/isn--1.0.sql */ + +-- Example: +-- create table test ( id isbn ); +-- insert into test values('978-0-393-04002-9'); +-- +-- select isbn('978-0-393-04002-9'); +-- select isbn13('0-901690-54-6'); +-- + +-- +-- Input and output functions and data types: +-- +--------------------------------------------------- +CREATE OR REPLACE FUNCTION ean13_in(cstring) + RETURNS ean13 + AS 'MODULE_PATHNAME' + LANGUAGE 'C' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION ean13_out(ean13) + RETURNS cstring + AS 'MODULE_PATHNAME' + LANGUAGE 'C' + IMMUTABLE STRICT; +CREATE TYPE ean13 ( + INPUT = ean13_in, + OUTPUT = ean13_out, + LIKE = pg_catalog.int8 +); +COMMENT ON TYPE ean13 + IS 'International European Article Number (EAN13)'; + +CREATE OR REPLACE FUNCTION isbn13_in(cstring) + RETURNS isbn13 + AS 'MODULE_PATHNAME', 'isbn_in' + LANGUAGE 'C' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION ean13_out(isbn13) + RETURNS cstring + AS 'MODULE_PATHNAME' + LANGUAGE 'C' + IMMUTABLE STRICT; +CREATE TYPE isbn13 ( + INPUT = isbn13_in, + OUTPUT = ean13_out, + LIKE = pg_catalog.int8 +); +COMMENT ON TYPE isbn13 + IS 'International Standard Book Number 13 (ISBN13)'; + +CREATE OR REPLACE FUNCTION ismn13_in(cstring) + RETURNS ismn13 + AS 'MODULE_PATHNAME', 'ismn_in' + LANGUAGE 'C' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION ean13_out(ismn13) + RETURNS cstring + AS 'MODULE_PATHNAME' + LANGUAGE 'C' + IMMUTABLE STRICT; +CREATE TYPE ismn13 ( + INPUT = ismn13_in, + OUTPUT = ean13_out, + LIKE = pg_catalog.int8 +); +COMMENT ON TYPE ismn13 + IS 'International Standard Music Number 13 (ISMN13)'; + +CREATE OR REPLACE FUNCTION issn13_in(cstring) + RETURNS issn13 + AS 'MODULE_PATHNAME', 'issn_in' + LANGUAGE 'C' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION ean13_out(issn13) + RETURNS cstring + AS 'MODULE_PATHNAME' + LANGUAGE 'C' + IMMUTABLE STRICT; +CREATE TYPE issn13 ( + INPUT = issn13_in, + OUTPUT = ean13_out, + LIKE = pg_catalog.int8 +); +COMMENT ON TYPE issn13 + IS 'International Standard Serial Number 13 (ISSN13)'; + +-- Short format: + +CREATE OR REPLACE FUNCTION isbn_in(cstring) + RETURNS isbn + AS 'MODULE_PATHNAME' + LANGUAGE 'C' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isn_out(isbn) + RETURNS cstring + AS 'MODULE_PATHNAME' + LANGUAGE 'C' + IMMUTABLE STRICT; +CREATE TYPE isbn ( + INPUT = isbn_in, + OUTPUT = isn_out, + LIKE = pg_catalog.int8 +); +COMMENT ON TYPE isbn + IS 'International Standard Book Number (ISBN)'; + +CREATE OR REPLACE FUNCTION ismn_in(cstring) + RETURNS ismn + AS 'MODULE_PATHNAME' + LANGUAGE 'C' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isn_out(ismn) + RETURNS cstring + AS 'MODULE_PATHNAME' + LANGUAGE 'C' + IMMUTABLE STRICT; +CREATE TYPE ismn ( + INPUT = ismn_in, + OUTPUT = isn_out, + LIKE = pg_catalog.int8 +); +COMMENT ON TYPE ismn + IS 'International Standard Music Number (ISMN)'; + +CREATE OR REPLACE FUNCTION issn_in(cstring) + RETURNS issn + AS 'MODULE_PATHNAME' + LANGUAGE 'C' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isn_out(issn) + RETURNS cstring + AS 'MODULE_PATHNAME' + LANGUAGE 'C' + IMMUTABLE STRICT; +CREATE TYPE issn ( + INPUT = issn_in, + OUTPUT = isn_out, + LIKE = pg_catalog.int8 +); +COMMENT ON TYPE issn + IS 'International Standard Serial Number (ISSN)'; + +CREATE OR REPLACE FUNCTION upc_in(cstring) + RETURNS upc + AS 'MODULE_PATHNAME' + LANGUAGE 'C' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isn_out(upc) + RETURNS cstring + AS 'MODULE_PATHNAME' + LANGUAGE 'C' + IMMUTABLE STRICT; +CREATE TYPE upc ( + INPUT = upc_in, + OUTPUT = isn_out, + LIKE = pg_catalog.int8 +); +COMMENT ON TYPE upc + IS 'Universal Product Code (UPC)'; + +-- +-- Operator functions: +-- +--------------------------------------------------- +-- EAN13: +CREATE OR REPLACE FUNCTION isnlt(ean13, ean13) + RETURNS boolean + AS 'int8lt' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnle(ean13, ean13) + RETURNS boolean + AS 'int8le' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isneq(ean13, ean13) + RETURNS boolean + AS 'int8eq' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnge(ean13, ean13) + RETURNS boolean + AS 'int8ge' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isngt(ean13, ean13) + RETURNS boolean + AS 'int8gt' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnne(ean13, ean13) + RETURNS boolean + AS 'int8ne' + LANGUAGE 'internal' + IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION isnlt(ean13, isbn13) + RETURNS boolean + AS 'int8lt' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnle(ean13, isbn13) + RETURNS boolean + AS 'int8le' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isneq(ean13, isbn13) + RETURNS boolean + AS 'int8eq' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnge(ean13, isbn13) + RETURNS boolean + AS 'int8ge' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isngt(ean13, isbn13) + RETURNS boolean + AS 'int8gt' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnne(ean13, isbn13) + RETURNS boolean + AS 'int8ne' + LANGUAGE 'internal' + IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION isnlt(ean13, ismn13) + RETURNS boolean + AS 'int8lt' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnle(ean13, ismn13) + RETURNS boolean + AS 'int8le' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isneq(ean13, ismn13) + RETURNS boolean + AS 'int8eq' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnge(ean13, ismn13) + RETURNS boolean + AS 'int8ge' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isngt(ean13, ismn13) + RETURNS boolean + AS 'int8gt' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnne(ean13, ismn13) + RETURNS boolean + AS 'int8ne' + LANGUAGE 'internal' + IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION isnlt(ean13, issn13) + RETURNS boolean + AS 'int8lt' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnle(ean13, issn13) + RETURNS boolean + AS 'int8le' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isneq(ean13, issn13) + RETURNS boolean + AS 'int8eq' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnge(ean13, issn13) + RETURNS boolean + AS 'int8ge' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isngt(ean13, issn13) + RETURNS boolean + AS 'int8gt' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnne(ean13, issn13) + RETURNS boolean + AS 'int8ne' + LANGUAGE 'internal' + IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION isnlt(ean13, isbn) + RETURNS boolean + AS 'int8lt' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnle(ean13, isbn) + RETURNS boolean + AS 'int8le' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isneq(ean13, isbn) + RETURNS boolean + AS 'int8eq' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnge(ean13, isbn) + RETURNS boolean + AS 'int8ge' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isngt(ean13, isbn) + RETURNS boolean + AS 'int8gt' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnne(ean13, isbn) + RETURNS boolean + AS 'int8ne' + LANGUAGE 'internal' + IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION isnlt(ean13, ismn) + RETURNS boolean + AS 'int8lt' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnle(ean13, ismn) + RETURNS boolean + AS 'int8le' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isneq(ean13, ismn) + RETURNS boolean + AS 'int8eq' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnge(ean13, ismn) + RETURNS boolean + AS 'int8ge' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isngt(ean13, ismn) + RETURNS boolean + AS 'int8gt' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnne(ean13, ismn) + RETURNS boolean + AS 'int8ne' + LANGUAGE 'internal' + IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION isnlt(ean13, issn) + RETURNS boolean + AS 'int8lt' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnle(ean13, issn) + RETURNS boolean + AS 'int8le' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isneq(ean13, issn) + RETURNS boolean + AS 'int8eq' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnge(ean13, issn) + RETURNS boolean + AS 'int8ge' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isngt(ean13, issn) + RETURNS boolean + AS 'int8gt' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnne(ean13, issn) + RETURNS boolean + AS 'int8ne' + LANGUAGE 'internal' + IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION isnlt(ean13, upc) + RETURNS boolean + AS 'int8lt' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnle(ean13, upc) + RETURNS boolean + AS 'int8le' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isneq(ean13, upc) + RETURNS boolean + AS 'int8eq' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnge(ean13, upc) + RETURNS boolean + AS 'int8ge' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isngt(ean13, upc) + RETURNS boolean + AS 'int8gt' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnne(ean13, upc) + RETURNS boolean + AS 'int8ne' + LANGUAGE 'internal' + IMMUTABLE STRICT; + +--------------------------------------------------- +-- ISBN13: +CREATE OR REPLACE FUNCTION isnlt(isbn13, isbn13) + RETURNS boolean + AS 'int8lt' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnle(isbn13, isbn13) + RETURNS boolean + AS 'int8le' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isneq(isbn13, isbn13) + RETURNS boolean + AS 'int8eq' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnge(isbn13, isbn13) + RETURNS boolean + AS 'int8ge' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isngt(isbn13, isbn13) + RETURNS boolean + AS 'int8gt' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnne(isbn13, isbn13) + RETURNS boolean + AS 'int8ne' + LANGUAGE 'internal' + IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION isnlt(isbn13, isbn) + RETURNS boolean + AS 'int8lt' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnle(isbn13, isbn) + RETURNS boolean + AS 'int8le' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isneq(isbn13, isbn) + RETURNS boolean + AS 'int8eq' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnge(isbn13, isbn) + RETURNS boolean + AS 'int8ge' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isngt(isbn13, isbn) + RETURNS boolean + AS 'int8gt' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnne(isbn13, isbn) + RETURNS boolean + AS 'int8ne' + LANGUAGE 'internal' + IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION isnlt(isbn13, ean13) + RETURNS boolean + AS 'int8lt' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnle(isbn13, ean13) + RETURNS boolean + AS 'int8le' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isneq(isbn13, ean13) + RETURNS boolean + AS 'int8eq' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnge(isbn13, ean13) + RETURNS boolean + AS 'int8ge' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isngt(isbn13, ean13) + RETURNS boolean + AS 'int8gt' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnne(isbn13, ean13) + RETURNS boolean + AS 'int8ne' + LANGUAGE 'internal' + IMMUTABLE STRICT; + +--------------------------------------------------- +-- ISBN: +CREATE OR REPLACE FUNCTION isnlt(isbn, isbn) + RETURNS boolean + AS 'int8lt' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnle(isbn, isbn) + RETURNS boolean + AS 'int8le' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isneq(isbn, isbn) + RETURNS boolean + AS 'int8eq' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnge(isbn, isbn) + RETURNS boolean + AS 'int8ge' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isngt(isbn, isbn) + RETURNS boolean + AS 'int8gt' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnne(isbn, isbn) + RETURNS boolean + AS 'int8ne' + LANGUAGE 'internal' + IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION isnlt(isbn, isbn13) + RETURNS boolean + AS 'int8lt' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnle(isbn, isbn13) + RETURNS boolean + AS 'int8le' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isneq(isbn, isbn13) + RETURNS boolean + AS 'int8eq' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnge(isbn, isbn13) + RETURNS boolean + AS 'int8ge' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isngt(isbn, isbn13) + RETURNS boolean + AS 'int8gt' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnne(isbn, isbn13) + RETURNS boolean + AS 'int8ne' + LANGUAGE 'internal' + IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION isnlt(isbn, ean13) + RETURNS boolean + AS 'int8lt' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnle(isbn, ean13) + RETURNS boolean + AS 'int8le' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isneq(isbn, ean13) + RETURNS boolean + AS 'int8eq' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnge(isbn, ean13) + RETURNS boolean + AS 'int8ge' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isngt(isbn, ean13) + RETURNS boolean + AS 'int8gt' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnne(isbn, ean13) + RETURNS boolean + AS 'int8ne' + LANGUAGE 'internal' + IMMUTABLE STRICT; + +--------------------------------------------------- +-- ISMN13: +CREATE OR REPLACE FUNCTION isnlt(ismn13, ismn13) + RETURNS boolean + AS 'int8lt' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnle(ismn13, ismn13) + RETURNS boolean + AS 'int8le' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isneq(ismn13, ismn13) + RETURNS boolean + AS 'int8eq' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnge(ismn13, ismn13) + RETURNS boolean + AS 'int8ge' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isngt(ismn13, ismn13) + RETURNS boolean + AS 'int8gt' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnne(ismn13, ismn13) + RETURNS boolean + AS 'int8ne' + LANGUAGE 'internal' + IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION isnlt(ismn13, ismn) + RETURNS boolean + AS 'int8lt' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnle(ismn13, ismn) + RETURNS boolean + AS 'int8le' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isneq(ismn13, ismn) + RETURNS boolean + AS 'int8eq' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnge(ismn13, ismn) + RETURNS boolean + AS 'int8ge' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isngt(ismn13, ismn) + RETURNS boolean + AS 'int8gt' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnne(ismn13, ismn) + RETURNS boolean + AS 'int8ne' + LANGUAGE 'internal' + IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION isnlt(ismn13, ean13) + RETURNS boolean + AS 'int8lt' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnle(ismn13, ean13) + RETURNS boolean + AS 'int8le' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isneq(ismn13, ean13) + RETURNS boolean + AS 'int8eq' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnge(ismn13, ean13) + RETURNS boolean + AS 'int8ge' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isngt(ismn13, ean13) + RETURNS boolean + AS 'int8gt' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnne(ismn13, ean13) + RETURNS boolean + AS 'int8ne' + LANGUAGE 'internal' + IMMUTABLE STRICT; + +--------------------------------------------------- +-- ISMN: +CREATE OR REPLACE FUNCTION isnlt(ismn, ismn) + RETURNS boolean + AS 'int8lt' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnle(ismn, ismn) + RETURNS boolean + AS 'int8le' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isneq(ismn, ismn) + RETURNS boolean + AS 'int8eq' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnge(ismn, ismn) + RETURNS boolean + AS 'int8ge' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isngt(ismn, ismn) + RETURNS boolean + AS 'int8gt' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnne(ismn, ismn) + RETURNS boolean + AS 'int8ne' + LANGUAGE 'internal' + IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION isnlt(ismn, ismn13) + RETURNS boolean + AS 'int8lt' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnle(ismn, ismn13) + RETURNS boolean + AS 'int8le' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isneq(ismn, ismn13) + RETURNS boolean + AS 'int8eq' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnge(ismn, ismn13) + RETURNS boolean + AS 'int8ge' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isngt(ismn, ismn13) + RETURNS boolean + AS 'int8gt' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnne(ismn, ismn13) + RETURNS boolean + AS 'int8ne' + LANGUAGE 'internal' + IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION isnlt(ismn, ean13) + RETURNS boolean + AS 'int8lt' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnle(ismn, ean13) + RETURNS boolean + AS 'int8le' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isneq(ismn, ean13) + RETURNS boolean + AS 'int8eq' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnge(ismn, ean13) + RETURNS boolean + AS 'int8ge' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isngt(ismn, ean13) + RETURNS boolean + AS 'int8gt' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnne(ismn, ean13) + RETURNS boolean + AS 'int8ne' + LANGUAGE 'internal' + IMMUTABLE STRICT; + +--------------------------------------------------- +-- ISSN13: +CREATE OR REPLACE FUNCTION isnlt(issn13, issn13) + RETURNS boolean + AS 'int8lt' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnle(issn13, issn13) + RETURNS boolean + AS 'int8le' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isneq(issn13, issn13) + RETURNS boolean + AS 'int8eq' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnge(issn13, issn13) + RETURNS boolean + AS 'int8ge' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isngt(issn13, issn13) + RETURNS boolean + AS 'int8gt' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnne(issn13, issn13) + RETURNS boolean + AS 'int8ne' + LANGUAGE 'internal' + IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION isnlt(issn13, issn) + RETURNS boolean + AS 'int8lt' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnle(issn13, issn) + RETURNS boolean + AS 'int8le' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isneq(issn13, issn) + RETURNS boolean + AS 'int8eq' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnge(issn13, issn) + RETURNS boolean + AS 'int8ge' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isngt(issn13, issn) + RETURNS boolean + AS 'int8gt' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnne(issn13, issn) + RETURNS boolean + AS 'int8ne' + LANGUAGE 'internal' + IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION isnlt(issn13, ean13) + RETURNS boolean + AS 'int8lt' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnle(issn13, ean13) + RETURNS boolean + AS 'int8le' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isneq(issn13, ean13) + RETURNS boolean + AS 'int8eq' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnge(issn13, ean13) + RETURNS boolean + AS 'int8ge' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isngt(issn13, ean13) + RETURNS boolean + AS 'int8gt' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnne(issn13, ean13) + RETURNS boolean + AS 'int8ne' + LANGUAGE 'internal' + IMMUTABLE STRICT; + +--------------------------------------------------- +-- ISSN: +CREATE OR REPLACE FUNCTION isnlt(issn, issn) + RETURNS boolean + AS 'int8lt' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnle(issn, issn) + RETURNS boolean + AS 'int8le' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isneq(issn, issn) + RETURNS boolean + AS 'int8eq' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnge(issn, issn) + RETURNS boolean + AS 'int8ge' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isngt(issn, issn) + RETURNS boolean + AS 'int8gt' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnne(issn, issn) + RETURNS boolean + AS 'int8ne' + LANGUAGE 'internal' + IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION isnlt(issn, issn13) + RETURNS boolean + AS 'int8lt' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnle(issn, issn13) + RETURNS boolean + AS 'int8le' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isneq(issn, issn13) + RETURNS boolean + AS 'int8eq' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnge(issn, issn13) + RETURNS boolean + AS 'int8ge' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isngt(issn, issn13) + RETURNS boolean + AS 'int8gt' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnne(issn, issn13) + RETURNS boolean + AS 'int8ne' + LANGUAGE 'internal' + IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION isnlt(issn, ean13) + RETURNS boolean + AS 'int8lt' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnle(issn, ean13) + RETURNS boolean + AS 'int8le' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isneq(issn, ean13) + RETURNS boolean + AS 'int8eq' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnge(issn, ean13) + RETURNS boolean + AS 'int8ge' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isngt(issn, ean13) + RETURNS boolean + AS 'int8gt' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnne(issn, ean13) + RETURNS boolean + AS 'int8ne' + LANGUAGE 'internal' + IMMUTABLE STRICT; + +--------------------------------------------------- +-- UPC: +CREATE OR REPLACE FUNCTION isnlt(upc, upc) + RETURNS boolean + AS 'int8lt' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnle(upc, upc) + RETURNS boolean + AS 'int8le' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isneq(upc, upc) + RETURNS boolean + AS 'int8eq' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnge(upc, upc) + RETURNS boolean + AS 'int8ge' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isngt(upc, upc) + RETURNS boolean + AS 'int8gt' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnne(upc, upc) + RETURNS boolean + AS 'int8ne' + LANGUAGE 'internal' + IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION isnlt(upc, ean13) + RETURNS boolean + AS 'int8lt' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnle(upc, ean13) + RETURNS boolean + AS 'int8le' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isneq(upc, ean13) + RETURNS boolean + AS 'int8eq' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnge(upc, ean13) + RETURNS boolean + AS 'int8ge' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isngt(upc, ean13) + RETURNS boolean + AS 'int8gt' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isnne(upc, ean13) + RETURNS boolean + AS 'int8ne' + LANGUAGE 'internal' + IMMUTABLE STRICT; + +-- +-- Now the operators: +-- + +-- +-- EAN13 operators: +-- +--------------------------------------------------- +CREATE OPERATOR < ( + PROCEDURE = isnlt, + LEFTARG = ean13, + RIGHTARG = ean13, + COMMUTATOR = >, + NEGATOR = >=, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); +CREATE OPERATOR <= ( + PROCEDURE = isnle, + LEFTARG = ean13, + RIGHTARG = ean13, + COMMUTATOR = >=, + NEGATOR = >, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); +CREATE OPERATOR = ( + PROCEDURE = isneq, + LEFTARG = ean13, + RIGHTARG = ean13, + COMMUTATOR = =, + NEGATOR = <>, + RESTRICT = eqsel, + JOIN = eqjoinsel, + MERGES, + HASHES); +CREATE OPERATOR >= ( + PROCEDURE = isnge, + LEFTARG = ean13, + RIGHTARG = ean13, + COMMUTATOR = <=, + NEGATOR = <, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel ); +CREATE OPERATOR > ( + PROCEDURE = isngt, + LEFTARG = ean13, + RIGHTARG = ean13, + COMMUTATOR = <, + NEGATOR = <=, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel ); +CREATE OPERATOR <> ( + PROCEDURE = isnne, + LEFTARG = ean13, + RIGHTARG = ean13, + COMMUTATOR = <>, + NEGATOR = =, + RESTRICT = neqsel, + JOIN = neqjoinsel); + +CREATE OPERATOR < ( + PROCEDURE = isnlt, + LEFTARG = ean13, + RIGHTARG = isbn13, + COMMUTATOR = >, + NEGATOR = >=, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); +CREATE OPERATOR <= ( + PROCEDURE = isnle, + LEFTARG = ean13, + RIGHTARG = isbn13, + COMMUTATOR = >=, + NEGATOR = >, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); +CREATE OPERATOR = ( + PROCEDURE = isneq, + LEFTARG = ean13, + RIGHTARG = isbn13, + COMMUTATOR = =, + NEGATOR = <>, + RESTRICT = eqsel, + JOIN = eqjoinsel, + MERGES, + HASHES); +CREATE OPERATOR >= ( + PROCEDURE = isnge, + LEFTARG = ean13, + RIGHTARG = isbn13, + COMMUTATOR = <=, + NEGATOR = <, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel ); +CREATE OPERATOR > ( + PROCEDURE = isngt, + LEFTARG = ean13, + RIGHTARG = isbn13, + COMMUTATOR = <, + NEGATOR = <=, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel ); +CREATE OPERATOR <> ( + PROCEDURE = isnne, + LEFTARG = ean13, + RIGHTARG = isbn13, + COMMUTATOR = <>, + NEGATOR = =, + RESTRICT = neqsel, + JOIN = neqjoinsel); + +CREATE OPERATOR < ( + PROCEDURE = isnlt, + LEFTARG = isbn13, + RIGHTARG = ean13, + COMMUTATOR = >, + NEGATOR = >=, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); +CREATE OPERATOR <= ( + PROCEDURE = isnle, + LEFTARG = isbn13, + RIGHTARG = ean13, + COMMUTATOR = >=, + NEGATOR = >, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); +CREATE OPERATOR = ( + PROCEDURE = isneq, + LEFTARG = isbn13, + RIGHTARG = ean13, + COMMUTATOR = =, + NEGATOR = <>, + RESTRICT = eqsel, + JOIN = eqjoinsel, + MERGES, + HASHES); +CREATE OPERATOR >= ( + PROCEDURE = isnge, + LEFTARG = isbn13, + RIGHTARG = ean13, + COMMUTATOR = <=, + NEGATOR = <, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel ); +CREATE OPERATOR > ( + PROCEDURE = isngt, + LEFTARG = isbn13, + RIGHTARG = ean13, + COMMUTATOR = <, + NEGATOR = <=, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel ); +CREATE OPERATOR <> ( + PROCEDURE = isnne, + LEFTARG = isbn13, + RIGHTARG = ean13, + COMMUTATOR = <>, + NEGATOR = =, + RESTRICT = neqsel, + JOIN = neqjoinsel); + +CREATE OPERATOR < ( + PROCEDURE = isnlt, + LEFTARG = ean13, + RIGHTARG = ismn13, + COMMUTATOR = >, + NEGATOR = >=, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); +CREATE OPERATOR <= ( + PROCEDURE = isnle, + LEFTARG = ean13, + RIGHTARG = ismn13, + COMMUTATOR = >=, + NEGATOR = >, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); +CREATE OPERATOR = ( + PROCEDURE = isneq, + LEFTARG = ean13, + RIGHTARG = ismn13, + COMMUTATOR = =, + NEGATOR = <>, + RESTRICT = eqsel, + JOIN = eqjoinsel, + MERGES, + HASHES); +CREATE OPERATOR >= ( + PROCEDURE = isnge, + LEFTARG = ean13, + RIGHTARG = ismn13, + COMMUTATOR = <=, + NEGATOR = <, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel); +CREATE OPERATOR > ( + PROCEDURE = isngt, + LEFTARG = ean13, + RIGHTARG = ismn13, + COMMUTATOR = <, + NEGATOR = <=, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel); +CREATE OPERATOR <> ( + PROCEDURE = isnne, + LEFTARG = ean13, + RIGHTARG = ismn13, + COMMUTATOR = <>, + NEGATOR = =, + RESTRICT = neqsel, + JOIN = neqjoinsel); + +CREATE OPERATOR < ( + PROCEDURE = isnlt, + LEFTARG = ismn13, + RIGHTARG = ean13, + COMMUTATOR = >, + NEGATOR = >=, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); +CREATE OPERATOR <= ( + PROCEDURE = isnle, + LEFTARG = ismn13, + RIGHTARG = ean13, + COMMUTATOR = >=, + NEGATOR = >, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); +CREATE OPERATOR = ( + PROCEDURE = isneq, + LEFTARG = ismn13, + RIGHTARG = ean13, + COMMUTATOR = =, + NEGATOR = <>, + RESTRICT = eqsel, + JOIN = eqjoinsel, + MERGES, + HASHES); +CREATE OPERATOR >= ( + PROCEDURE = isnge, + LEFTARG = ismn13, + RIGHTARG = ean13, + COMMUTATOR = <=, + NEGATOR = <, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel ); +CREATE OPERATOR > ( + PROCEDURE = isngt, + LEFTARG = ismn13, + RIGHTARG = ean13, + COMMUTATOR = <, + NEGATOR = <=, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel ); +CREATE OPERATOR <> ( + PROCEDURE = isnne, + LEFTARG = ismn13, + RIGHTARG = ean13, + COMMUTATOR = <>, + NEGATOR = =, + RESTRICT = neqsel, + JOIN = neqjoinsel); + +CREATE OPERATOR < ( + PROCEDURE = isnlt, + LEFTARG = ean13, + RIGHTARG = issn13, + COMMUTATOR = >, + NEGATOR = >=, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); +CREATE OPERATOR <= ( + PROCEDURE = isnle, + LEFTARG = ean13, + RIGHTARG = issn13, + COMMUTATOR = >=, + NEGATOR = >, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); +CREATE OPERATOR = ( + PROCEDURE = isneq, + LEFTARG = ean13, + RIGHTARG = issn13, + COMMUTATOR = =, + NEGATOR = <>, + RESTRICT = eqsel, + JOIN = eqjoinsel, + MERGES, + HASHES); +CREATE OPERATOR >= ( + PROCEDURE = isnge, + LEFTARG = ean13, + RIGHTARG = issn13, + COMMUTATOR = <=, + NEGATOR = <, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel); +CREATE OPERATOR > ( + PROCEDURE = isngt, + LEFTARG = ean13, + RIGHTARG = issn13, + COMMUTATOR = <, + NEGATOR = <=, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel); +CREATE OPERATOR <> ( + PROCEDURE = isnne, + LEFTARG = ean13, + RIGHTARG = issn13, + COMMUTATOR = <>, + NEGATOR = =, + RESTRICT = neqsel, + JOIN = neqjoinsel); + +CREATE OPERATOR < ( + PROCEDURE = isnlt, + LEFTARG = ean13, + RIGHTARG = isbn, + COMMUTATOR = >, + NEGATOR = >=, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); +CREATE OPERATOR <= ( + PROCEDURE = isnle, + LEFTARG = ean13, + RIGHTARG = isbn, + COMMUTATOR = >=, + NEGATOR = >, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); +CREATE OPERATOR = ( + PROCEDURE = isneq, + LEFTARG = ean13, + RIGHTARG = isbn, + COMMUTATOR = =, + NEGATOR = <>, + RESTRICT = eqsel, + JOIN = eqjoinsel, + MERGES, + HASHES); +CREATE OPERATOR >= ( + PROCEDURE = isnge, + LEFTARG = ean13, + RIGHTARG = isbn, + COMMUTATOR = <=, + NEGATOR = <, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel); +CREATE OPERATOR > ( + PROCEDURE = isngt, + LEFTARG = ean13, + RIGHTARG = isbn, + COMMUTATOR = <, + NEGATOR = <=, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel); +CREATE OPERATOR <> ( + PROCEDURE = isnne, + LEFTARG = ean13, + RIGHTARG = isbn, + COMMUTATOR = <>, + NEGATOR = =, + RESTRICT = neqsel, + JOIN = neqjoinsel); + +CREATE OPERATOR < ( + PROCEDURE = isnlt, + LEFTARG = ean13, + RIGHTARG = ismn, + COMMUTATOR = >, + NEGATOR = >=, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); +CREATE OPERATOR <= ( + PROCEDURE = isnle, + LEFTARG = ean13, + RIGHTARG = ismn, + COMMUTATOR = >=, + NEGATOR = >, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); +CREATE OPERATOR = ( + PROCEDURE = isneq, + LEFTARG = ean13, + RIGHTARG = ismn, + COMMUTATOR = =, + NEGATOR = <>, + RESTRICT = eqsel, + JOIN = eqjoinsel, + MERGES, + HASHES); +CREATE OPERATOR >= ( + PROCEDURE = isnge, + LEFTARG = ean13, + RIGHTARG = ismn, + COMMUTATOR = <=, + NEGATOR = <, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel); +CREATE OPERATOR > ( + PROCEDURE = isngt, + LEFTARG = ean13, + RIGHTARG = ismn, + COMMUTATOR = <, + NEGATOR = <=, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel); +CREATE OPERATOR <> ( + PROCEDURE = isnne, + LEFTARG = ean13, + RIGHTARG = ismn, + COMMUTATOR = <>, + NEGATOR = =, + RESTRICT = neqsel, + JOIN = neqjoinsel); + +CREATE OPERATOR < ( + PROCEDURE = isnlt, + LEFTARG = ean13, + RIGHTARG = issn, + COMMUTATOR = >, + NEGATOR = >=, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); +CREATE OPERATOR <= ( + PROCEDURE = isnle, + LEFTARG = ean13, + RIGHTARG = issn, + COMMUTATOR = >=, + NEGATOR = >, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); +CREATE OPERATOR = ( + PROCEDURE = isneq, + LEFTARG = ean13, + RIGHTARG = issn, + COMMUTATOR = =, + NEGATOR = <>, + RESTRICT = eqsel, + JOIN = eqjoinsel, + MERGES, + HASHES); +CREATE OPERATOR >= ( + PROCEDURE = isnge, + LEFTARG = ean13, + RIGHTARG = issn, + COMMUTATOR = <=, + NEGATOR = <, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel); +CREATE OPERATOR > ( + PROCEDURE = isngt, + LEFTARG = ean13, + RIGHTARG = issn, + COMMUTATOR = <, + NEGATOR = <=, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel); +CREATE OPERATOR <> ( + PROCEDURE = isnne, + LEFTARG = ean13, + RIGHTARG = issn, + COMMUTATOR = <>, + NEGATOR = =, + RESTRICT = neqsel, + JOIN = neqjoinsel); + +CREATE OPERATOR < ( + PROCEDURE = isnlt, + LEFTARG = ean13, + RIGHTARG = upc, + COMMUTATOR = >, + NEGATOR = >=, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); +CREATE OPERATOR <= ( + PROCEDURE = isnle, + LEFTARG = ean13, + RIGHTARG = upc, + COMMUTATOR = >=, + NEGATOR = >, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); +CREATE OPERATOR = ( + PROCEDURE = isneq, + LEFTARG = ean13, + RIGHTARG = upc, + COMMUTATOR = =, + NEGATOR = <>, + RESTRICT = eqsel, + JOIN = eqjoinsel, + MERGES, + HASHES); +CREATE OPERATOR >= ( + PROCEDURE = isnge, + LEFTARG = ean13, + RIGHTARG = upc, + COMMUTATOR = <=, + NEGATOR = <, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel); +CREATE OPERATOR > ( + PROCEDURE = isngt, + LEFTARG = ean13, + RIGHTARG = upc, + COMMUTATOR = <, + NEGATOR = <=, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel); +CREATE OPERATOR <> ( + PROCEDURE = isnne, + LEFTARG = ean13, + RIGHTARG = upc, + COMMUTATOR = <>, + NEGATOR = =, + RESTRICT = neqsel, + JOIN = neqjoinsel); + +-- +-- ISBN13 operators: +-- +--------------------------------------------------- +CREATE OPERATOR < ( + PROCEDURE = isnlt, + LEFTARG = isbn13, + RIGHTARG = isbn13, + COMMUTATOR = >, + NEGATOR = >=, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); +CREATE OPERATOR <= ( + PROCEDURE = isnle, + LEFTARG = isbn13, + RIGHTARG = isbn13, + COMMUTATOR = >=, + NEGATOR = >, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); +CREATE OPERATOR = ( + PROCEDURE = isneq, + LEFTARG = isbn13, + RIGHTARG = isbn13, + COMMUTATOR = =, + NEGATOR = <>, + RESTRICT = eqsel, + JOIN = eqjoinsel, + MERGES, + HASHES); +CREATE OPERATOR >= ( + PROCEDURE = isnge, + LEFTARG = isbn13, + RIGHTARG = isbn13, + COMMUTATOR = <=, + NEGATOR = <, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel ); +CREATE OPERATOR > ( + PROCEDURE = isngt, + LEFTARG = isbn13, + RIGHTARG = isbn13, + COMMUTATOR = <, + NEGATOR = <=, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel ); +CREATE OPERATOR <> ( + PROCEDURE = isnne, + LEFTARG = isbn13, + RIGHTARG = isbn13, + COMMUTATOR = <>, + NEGATOR = =, + RESTRICT = neqsel, + JOIN = neqjoinsel); + +CREATE OPERATOR < ( + PROCEDURE = isnlt, + LEFTARG = isbn13, + RIGHTARG = isbn, + COMMUTATOR = >, + NEGATOR = >=, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); +CREATE OPERATOR <= ( + PROCEDURE = isnle, + LEFTARG = isbn13, + RIGHTARG = isbn, + COMMUTATOR = >=, + NEGATOR = >, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); +CREATE OPERATOR = ( + PROCEDURE = isneq, + LEFTARG = isbn13, + RIGHTARG = isbn, + COMMUTATOR = =, + NEGATOR = <>, + RESTRICT = eqsel, + JOIN = eqjoinsel, + MERGES, + HASHES); +CREATE OPERATOR >= ( + PROCEDURE = isnge, + LEFTARG = isbn13, + RIGHTARG = isbn, + COMMUTATOR = <=, + NEGATOR = <, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel ); +CREATE OPERATOR > ( + PROCEDURE = isngt, + LEFTARG = isbn13, + RIGHTARG = isbn, + COMMUTATOR = <, + NEGATOR = <=, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel ); +CREATE OPERATOR <> ( + PROCEDURE = isnne, + LEFTARG = isbn13, + RIGHTARG = isbn, + COMMUTATOR = <>, + NEGATOR = =, + RESTRICT = neqsel, + JOIN = neqjoinsel); + +-- +-- ISBN operators: +-- +--------------------------------------------------- +CREATE OPERATOR < ( + PROCEDURE = isnlt, + LEFTARG = isbn, + RIGHTARG = isbn, + COMMUTATOR = >, + NEGATOR = >=, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); +CREATE OPERATOR <= ( + PROCEDURE = isnle, + LEFTARG = isbn, + RIGHTARG = isbn, + COMMUTATOR = >=, + NEGATOR = >, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); +CREATE OPERATOR = ( + PROCEDURE = isneq, + LEFTARG = isbn, + RIGHTARG = isbn, + COMMUTATOR = =, + NEGATOR = <>, + RESTRICT = eqsel, + JOIN = eqjoinsel, + MERGES, + HASHES); +CREATE OPERATOR >= ( + PROCEDURE = isnge, + LEFTARG = isbn, + RIGHTARG = isbn, + COMMUTATOR = <=, + NEGATOR = <, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel ); +CREATE OPERATOR > ( + PROCEDURE = isngt, + LEFTARG = isbn, + RIGHTARG = isbn, + COMMUTATOR = <, + NEGATOR = <=, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel ); +CREATE OPERATOR <> ( + PROCEDURE = isnne, + LEFTARG = isbn, + RIGHTARG = isbn, + COMMUTATOR = <>, + NEGATOR = =, + RESTRICT = neqsel, + JOIN = neqjoinsel); + +CREATE OPERATOR < ( + PROCEDURE = isnlt, + LEFTARG = isbn, + RIGHTARG = isbn13, + COMMUTATOR = >, + NEGATOR = >=, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); +CREATE OPERATOR <= ( + PROCEDURE = isnle, + LEFTARG = isbn, + RIGHTARG = isbn13, + COMMUTATOR = >=, + NEGATOR = >, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); +CREATE OPERATOR = ( + PROCEDURE = isneq, + LEFTARG = isbn, + RIGHTARG = isbn13, + COMMUTATOR = =, + NEGATOR = <>, + RESTRICT = eqsel, + JOIN = eqjoinsel, + MERGES, + HASHES); +CREATE OPERATOR >= ( + PROCEDURE = isnge, + LEFTARG = isbn, + RIGHTARG = isbn13, + COMMUTATOR = <=, + NEGATOR = <, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel ); +CREATE OPERATOR > ( + PROCEDURE = isngt, + LEFTARG = isbn, + RIGHTARG = isbn13, + COMMUTATOR = <, + NEGATOR = <=, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel ); +CREATE OPERATOR <> ( + PROCEDURE = isnne, + LEFTARG = isbn, + RIGHTARG = isbn13, + COMMUTATOR = <>, + NEGATOR = =, + RESTRICT = neqsel, + JOIN = neqjoinsel); + +CREATE OPERATOR < ( + PROCEDURE = isnlt, + LEFTARG = isbn, + RIGHTARG = ean13, + COMMUTATOR = >, + NEGATOR = >=, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); +CREATE OPERATOR <= ( + PROCEDURE = isnle, + LEFTARG = isbn, + RIGHTARG = ean13, + COMMUTATOR = >=, + NEGATOR = >, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); +CREATE OPERATOR = ( + PROCEDURE = isneq, + LEFTARG = isbn, + RIGHTARG = ean13, + COMMUTATOR = =, + NEGATOR = <>, + RESTRICT = eqsel, + JOIN = eqjoinsel, + MERGES, + HASHES); +CREATE OPERATOR >= ( + PROCEDURE = isnge, + LEFTARG = isbn, + RIGHTARG = ean13, + COMMUTATOR = <=, + NEGATOR = <, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel ); +CREATE OPERATOR > ( + PROCEDURE = isngt, + LEFTARG = isbn, + RIGHTARG = ean13, + COMMUTATOR = <, + NEGATOR = <=, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel ); +CREATE OPERATOR <> ( + PROCEDURE = isnne, + LEFTARG = isbn, + RIGHTARG = ean13, + COMMUTATOR = <>, + NEGATOR = =, + RESTRICT = neqsel, + JOIN = neqjoinsel); + +-- +-- ISMN13 operators: +-- +--------------------------------------------------- +CREATE OPERATOR < ( + PROCEDURE = isnlt, + LEFTARG = ismn13, + RIGHTARG = ismn13, + COMMUTATOR = >, + NEGATOR = >=, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); +CREATE OPERATOR <= ( + PROCEDURE = isnle, + LEFTARG = ismn13, + RIGHTARG = ismn13, + COMMUTATOR = >=, + NEGATOR = >, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); +CREATE OPERATOR = ( + PROCEDURE = isneq, + LEFTARG = ismn13, + RIGHTARG = ismn13, + COMMUTATOR = =, + NEGATOR = <>, + RESTRICT = eqsel, + JOIN = eqjoinsel, + MERGES, + HASHES); +CREATE OPERATOR >= ( + PROCEDURE = isnge, + LEFTARG = ismn13, + RIGHTARG = ismn13, + COMMUTATOR = <=, + NEGATOR = <, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel ); +CREATE OPERATOR > ( + PROCEDURE = isngt, + LEFTARG = ismn13, + RIGHTARG = ismn13, + COMMUTATOR = <, + NEGATOR = <=, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel ); +CREATE OPERATOR <> ( + PROCEDURE = isnne, + LEFTARG = ismn13, + RIGHTARG = ismn13, + COMMUTATOR = <>, + NEGATOR = =, + RESTRICT = neqsel, + JOIN = neqjoinsel); + +CREATE OPERATOR < ( + PROCEDURE = isnlt, + LEFTARG = ismn13, + RIGHTARG = ismn, + COMMUTATOR = >, + NEGATOR = >=, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); +CREATE OPERATOR <= ( + PROCEDURE = isnle, + LEFTARG = ismn13, + RIGHTARG = ismn, + COMMUTATOR = >=, + NEGATOR = >, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); +CREATE OPERATOR = ( + PROCEDURE = isneq, + LEFTARG = ismn13, + RIGHTARG = ismn, + COMMUTATOR = =, + NEGATOR = <>, + RESTRICT = eqsel, + JOIN = eqjoinsel, + MERGES, + HASHES); +CREATE OPERATOR >= ( + PROCEDURE = isnge, + LEFTARG = ismn13, + RIGHTARG = ismn, + COMMUTATOR = <=, + NEGATOR = <, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel ); +CREATE OPERATOR > ( + PROCEDURE = isngt, + LEFTARG = ismn13, + RIGHTARG = ismn, + COMMUTATOR = <, + NEGATOR = <=, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel ); +CREATE OPERATOR <> ( + PROCEDURE = isnne, + LEFTARG = ismn13, + RIGHTARG = ismn, + COMMUTATOR = <>, + NEGATOR = =, + RESTRICT = neqsel, + JOIN = neqjoinsel); + +-- +-- ISMN operators: +-- +--------------------------------------------------- +CREATE OPERATOR < ( + PROCEDURE = isnlt, + LEFTARG = ismn, + RIGHTARG = ismn, + COMMUTATOR = >, + NEGATOR = >=, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); +CREATE OPERATOR <= ( + PROCEDURE = isnle, + LEFTARG = ismn, + RIGHTARG = ismn, + COMMUTATOR = >=, + NEGATOR = >, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); +CREATE OPERATOR = ( + PROCEDURE = isneq, + LEFTARG = ismn, + RIGHTARG = ismn, + COMMUTATOR = =, + NEGATOR = <>, + RESTRICT = eqsel, + JOIN = eqjoinsel, + MERGES, + HASHES); +CREATE OPERATOR >= ( + PROCEDURE = isnge, + LEFTARG = ismn, + RIGHTARG = ismn, + COMMUTATOR = <=, + NEGATOR = <, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel ); +CREATE OPERATOR > ( + PROCEDURE = isngt, + LEFTARG = ismn, + RIGHTARG = ismn, + COMMUTATOR = <, + NEGATOR = <=, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel ); +CREATE OPERATOR <> ( + PROCEDURE = isnne, + LEFTARG = ismn, + RIGHTARG = ismn, + COMMUTATOR = <>, + NEGATOR = =, + RESTRICT = neqsel, + JOIN = neqjoinsel); + +CREATE OPERATOR < ( + PROCEDURE = isnlt, + LEFTARG = ismn, + RIGHTARG = ismn13, + COMMUTATOR = >, + NEGATOR = >=, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); +CREATE OPERATOR <= ( + PROCEDURE = isnle, + LEFTARG = ismn, + RIGHTARG = ismn13, + COMMUTATOR = >=, + NEGATOR = >, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); +CREATE OPERATOR = ( + PROCEDURE = isneq, + LEFTARG = ismn, + RIGHTARG = ismn13, + COMMUTATOR = =, + NEGATOR = <>, + RESTRICT = eqsel, + JOIN = eqjoinsel, + MERGES, + HASHES); +CREATE OPERATOR >= ( + PROCEDURE = isnge, + LEFTARG = ismn, + RIGHTARG = ismn13, + COMMUTATOR = <=, + NEGATOR = <, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel ); +CREATE OPERATOR > ( + PROCEDURE = isngt, + LEFTARG = ismn, + RIGHTARG = ismn13, + COMMUTATOR = <, + NEGATOR = <=, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel ); +CREATE OPERATOR <> ( + PROCEDURE = isnne, + LEFTARG = ismn, + RIGHTARG = ismn13, + COMMUTATOR = <>, + NEGATOR = =, + RESTRICT = neqsel, + JOIN = neqjoinsel); + +CREATE OPERATOR < ( + PROCEDURE = isnlt, + LEFTARG = ismn, + RIGHTARG = ean13, + COMMUTATOR = >, + NEGATOR = >=, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); +CREATE OPERATOR <= ( + PROCEDURE = isnle, + LEFTARG = ismn, + RIGHTARG = ean13, + COMMUTATOR = >=, + NEGATOR = >, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); +CREATE OPERATOR = ( + PROCEDURE = isneq, + LEFTARG = ismn, + RIGHTARG = ean13, + COMMUTATOR = =, + NEGATOR = <>, + RESTRICT = eqsel, + JOIN = eqjoinsel, + MERGES, + HASHES); +CREATE OPERATOR >= ( + PROCEDURE = isnge, + LEFTARG = ismn, + RIGHTARG = ean13, + COMMUTATOR = <=, + NEGATOR = <, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel ); +CREATE OPERATOR > ( + PROCEDURE = isngt, + LEFTARG = ismn, + RIGHTARG = ean13, + COMMUTATOR = <, + NEGATOR = <=, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel ); +CREATE OPERATOR <> ( + PROCEDURE = isnne, + LEFTARG = ismn, + RIGHTARG = ean13, + COMMUTATOR = <>, + NEGATOR = =, + RESTRICT = neqsel, + JOIN = neqjoinsel); + +-- +-- ISSN13 operators: +-- +--------------------------------------------------- +CREATE OPERATOR < ( + PROCEDURE = isnlt, + LEFTARG = issn13, + RIGHTARG = issn13, + COMMUTATOR = >, + NEGATOR = >=, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); +CREATE OPERATOR <= ( + PROCEDURE = isnle, + LEFTARG = issn13, + RIGHTARG = issn13, + COMMUTATOR = >=, + NEGATOR = >, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); +CREATE OPERATOR = ( + PROCEDURE = isneq, + LEFTARG = issn13, + RIGHTARG = issn13, + COMMUTATOR = =, + NEGATOR = <>, + RESTRICT = eqsel, + JOIN = eqjoinsel, + MERGES, + HASHES); +CREATE OPERATOR >= ( + PROCEDURE = isnge, + LEFTARG = issn13, + RIGHTARG = issn13, + COMMUTATOR = <=, + NEGATOR = <, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel ); +CREATE OPERATOR > ( + PROCEDURE = isngt, + LEFTARG = issn13, + RIGHTARG = issn13, + COMMUTATOR = <, + NEGATOR = <=, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel ); +CREATE OPERATOR <> ( + PROCEDURE = isnne, + LEFTARG = issn13, + RIGHTARG = issn13, + COMMUTATOR = <>, + NEGATOR = =, + RESTRICT = neqsel, + JOIN = neqjoinsel); + +CREATE OPERATOR < ( + PROCEDURE = isnlt, + LEFTARG = issn13, + RIGHTARG = issn, + COMMUTATOR = >, + NEGATOR = >=, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); +CREATE OPERATOR <= ( + PROCEDURE = isnle, + LEFTARG = issn13, + RIGHTARG = issn, + COMMUTATOR = >=, + NEGATOR = >, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); +CREATE OPERATOR = ( + PROCEDURE = isneq, + LEFTARG = issn13, + RIGHTARG = issn, + COMMUTATOR = =, + NEGATOR = <>, + RESTRICT = eqsel, + JOIN = eqjoinsel, + MERGES, + HASHES); +CREATE OPERATOR >= ( + PROCEDURE = isnge, + LEFTARG = issn13, + RIGHTARG = issn, + COMMUTATOR = <=, + NEGATOR = <, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel ); +CREATE OPERATOR > ( + PROCEDURE = isngt, + LEFTARG = issn13, + RIGHTARG = issn, + COMMUTATOR = <, + NEGATOR = <=, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel ); +CREATE OPERATOR <> ( + PROCEDURE = isnne, + LEFTARG = issn13, + RIGHTARG = issn, + COMMUTATOR = <>, + NEGATOR = =, + RESTRICT = neqsel, + JOIN = neqjoinsel); + +CREATE OPERATOR < ( + PROCEDURE = isnlt, + LEFTARG = issn13, + RIGHTARG = ean13, + COMMUTATOR = >, + NEGATOR = >=, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); +CREATE OPERATOR <= ( + PROCEDURE = isnle, + LEFTARG = issn13, + RIGHTARG = ean13, + COMMUTATOR = >=, + NEGATOR = >, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); +CREATE OPERATOR = ( + PROCEDURE = isneq, + LEFTARG = issn13, + RIGHTARG = ean13, + COMMUTATOR = =, + NEGATOR = <>, + RESTRICT = eqsel, + JOIN = eqjoinsel, + MERGES, + HASHES); +CREATE OPERATOR >= ( + PROCEDURE = isnge, + LEFTARG = issn13, + RIGHTARG = ean13, + COMMUTATOR = <=, + NEGATOR = <, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel ); +CREATE OPERATOR > ( + PROCEDURE = isngt, + LEFTARG = issn13, + RIGHTARG = ean13, + COMMUTATOR = <, + NEGATOR = <=, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel ); +CREATE OPERATOR <> ( + PROCEDURE = isnne, + LEFTARG = issn13, + RIGHTARG = ean13, + COMMUTATOR = <>, + NEGATOR = =, + RESTRICT = neqsel, + JOIN = neqjoinsel); + +-- +-- ISSN operators: +-- +--------------------------------------------------- +CREATE OPERATOR < ( + PROCEDURE = isnlt, + LEFTARG = issn, + RIGHTARG = issn, + COMMUTATOR = >, + NEGATOR = >=, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); +CREATE OPERATOR <= ( + PROCEDURE = isnle, + LEFTARG = issn, + RIGHTARG = issn, + COMMUTATOR = >=, + NEGATOR = >, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); +CREATE OPERATOR = ( + PROCEDURE = isneq, + LEFTARG = issn, + RIGHTARG = issn, + COMMUTATOR = =, + NEGATOR = <>, + RESTRICT = eqsel, + JOIN = eqjoinsel, + MERGES, + HASHES); +CREATE OPERATOR >= ( + PROCEDURE = isnge, + LEFTARG = issn, + RIGHTARG = issn, + COMMUTATOR = <=, + NEGATOR = <, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel ); +CREATE OPERATOR > ( + PROCEDURE = isngt, + LEFTARG = issn, + RIGHTARG = issn, + COMMUTATOR = <, + NEGATOR = <=, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel ); +CREATE OPERATOR <> ( + PROCEDURE = isnne, + LEFTARG = issn, + RIGHTARG = issn, + COMMUTATOR = <>, + NEGATOR = =, + RESTRICT = neqsel, + JOIN = neqjoinsel); + +CREATE OPERATOR < ( + PROCEDURE = isnlt, + LEFTARG = issn, + RIGHTARG = issn13, + COMMUTATOR = >, + NEGATOR = >=, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); +CREATE OPERATOR <= ( + PROCEDURE = isnle, + LEFTARG = issn, + RIGHTARG = issn13, + COMMUTATOR = >=, + NEGATOR = >, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); +CREATE OPERATOR = ( + PROCEDURE = isneq, + LEFTARG = issn, + RIGHTARG = issn13, + COMMUTATOR = =, + NEGATOR = <>, + RESTRICT = eqsel, + JOIN = eqjoinsel, + MERGES, + HASHES); +CREATE OPERATOR >= ( + PROCEDURE = isnge, + LEFTARG = issn, + RIGHTARG = issn13, + COMMUTATOR = <=, + NEGATOR = <, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel ); +CREATE OPERATOR > ( + PROCEDURE = isngt, + LEFTARG = issn, + RIGHTARG = issn13, + COMMUTATOR = <, + NEGATOR = <=, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel ); +CREATE OPERATOR <> ( + PROCEDURE = isnne, + LEFTARG = issn, + RIGHTARG = issn13, + COMMUTATOR = <>, + NEGATOR = =, + RESTRICT = neqsel, + JOIN = neqjoinsel); + +CREATE OPERATOR < ( + PROCEDURE = isnlt, + LEFTARG = issn, + RIGHTARG = ean13, + COMMUTATOR = >, + NEGATOR = >=, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); +CREATE OPERATOR <= ( + PROCEDURE = isnle, + LEFTARG = issn, + RIGHTARG = ean13, + COMMUTATOR = >=, + NEGATOR = >, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); +CREATE OPERATOR = ( + PROCEDURE = isneq, + LEFTARG = issn, + RIGHTARG = ean13, + COMMUTATOR = =, + NEGATOR = <>, + RESTRICT = eqsel, + JOIN = eqjoinsel, + MERGES, + HASHES); +CREATE OPERATOR >= ( + PROCEDURE = isnge, + LEFTARG = issn, + RIGHTARG = ean13, + COMMUTATOR = <=, + NEGATOR = <, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel ); +CREATE OPERATOR > ( + PROCEDURE = isngt, + LEFTARG = issn, + RIGHTARG = ean13, + COMMUTATOR = <, + NEGATOR = <=, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel ); +CREATE OPERATOR <> ( + PROCEDURE = isnne, + LEFTARG = issn, + RIGHTARG = ean13, + COMMUTATOR = <>, + NEGATOR = =, + RESTRICT = neqsel, + JOIN = neqjoinsel); + +-- +-- UPC operators: +-- +--------------------------------------------------- +CREATE OPERATOR < ( + PROCEDURE = isnlt, + LEFTARG = upc, + RIGHTARG = upc, + COMMUTATOR = >, + NEGATOR = >=, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); +CREATE OPERATOR <= ( + PROCEDURE = isnle, + LEFTARG = upc, + RIGHTARG = upc, + COMMUTATOR = >=, + NEGATOR = >, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); +CREATE OPERATOR = ( + PROCEDURE = isneq, + LEFTARG = upc, + RIGHTARG = upc, + COMMUTATOR = =, + NEGATOR = <>, + RESTRICT = eqsel, + JOIN = eqjoinsel, + MERGES, + HASHES); +CREATE OPERATOR >= ( + PROCEDURE = isnge, + LEFTARG = upc, + RIGHTARG = upc, + COMMUTATOR = <=, + NEGATOR = <, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel ); +CREATE OPERATOR > ( + PROCEDURE = isngt, + LEFTARG = upc, + RIGHTARG = upc, + COMMUTATOR = <, + NEGATOR = <=, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel ); +CREATE OPERATOR <> ( + PROCEDURE = isnne, + LEFTARG = upc, + RIGHTARG = upc, + COMMUTATOR = <>, + NEGATOR = =, + RESTRICT = neqsel, + JOIN = neqjoinsel); + +CREATE OPERATOR < ( + PROCEDURE = isnlt, + LEFTARG = upc, + RIGHTARG = ean13, + COMMUTATOR = >, + NEGATOR = >=, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); +CREATE OPERATOR <= ( + PROCEDURE = isnle, + LEFTARG = upc, + RIGHTARG = ean13, + COMMUTATOR = >=, + NEGATOR = >, + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel); +CREATE OPERATOR = ( + PROCEDURE = isneq, + LEFTARG = upc, + RIGHTARG = ean13, + COMMUTATOR = =, + NEGATOR = <>, + RESTRICT = eqsel, + JOIN = eqjoinsel, + MERGES, + HASHES); +CREATE OPERATOR >= ( + PROCEDURE = isnge, + LEFTARG = upc, + RIGHTARG = ean13, + COMMUTATOR = <=, + NEGATOR = <, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel ); +CREATE OPERATOR > ( + PROCEDURE = isngt, + LEFTARG = upc, + RIGHTARG = ean13, + COMMUTATOR = <, + NEGATOR = <=, + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel ); +CREATE OPERATOR <> ( + PROCEDURE = isnne, + LEFTARG = upc, + RIGHTARG = ean13, + COMMUTATOR = <>, + NEGATOR = =, + RESTRICT = neqsel, + JOIN = neqjoinsel); + +-- +-- Operator families for the various operator classes: +-- +--------------------------------------------------- + +CREATE OPERATOR FAMILY isn_ops USING btree; +CREATE OPERATOR FAMILY isn_ops USING hash; + +-- +-- Operator classes: +-- +--------------------------------------------------- +-- EAN13: +CREATE OR REPLACE FUNCTION btean13cmp(ean13, ean13) + RETURNS int4 + AS 'btint8cmp' + LANGUAGE 'internal' + IMMUTABLE STRICT; + +CREATE OPERATOR CLASS ean13_ops DEFAULT + FOR TYPE ean13 USING btree FAMILY isn_ops AS + OPERATOR 1 <, + OPERATOR 2 <=, + OPERATOR 3 =, + OPERATOR 4 >=, + OPERATOR 5 >, + FUNCTION 1 btean13cmp(ean13, ean13); + +CREATE OR REPLACE FUNCTION hashean13(ean13) + RETURNS int4 + AS 'hashint8' + LANGUAGE 'internal' IMMUTABLE STRICT; + +CREATE OPERATOR CLASS ean13_ops DEFAULT + FOR TYPE ean13 USING hash FAMILY isn_ops AS + OPERATOR 1 =, + FUNCTION 1 hashean13(ean13); + +-- EAN13 vs other types: +CREATE OR REPLACE FUNCTION btean13cmp(ean13, isbn13) + RETURNS int4 + AS 'btint8cmp' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION btean13cmp(ean13, ismn13) + RETURNS int4 + AS 'btint8cmp' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION btean13cmp(ean13, issn13) + RETURNS int4 + AS 'btint8cmp' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION btean13cmp(ean13, isbn) + RETURNS int4 + AS 'btint8cmp' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION btean13cmp(ean13, ismn) + RETURNS int4 + AS 'btint8cmp' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION btean13cmp(ean13, issn) + RETURNS int4 + AS 'btint8cmp' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION btean13cmp(ean13, upc) + RETURNS int4 + AS 'btint8cmp' + LANGUAGE 'internal' + IMMUTABLE STRICT; + +ALTER OPERATOR FAMILY isn_ops USING btree ADD + OPERATOR 1 < (ean13, isbn13), + OPERATOR 1 < (ean13, ismn13), + OPERATOR 1 < (ean13, issn13), + OPERATOR 1 < (ean13, isbn), + OPERATOR 1 < (ean13, ismn), + OPERATOR 1 < (ean13, issn), + OPERATOR 1 < (ean13, upc), + OPERATOR 2 <= (ean13, isbn13), + OPERATOR 2 <= (ean13, ismn13), + OPERATOR 2 <= (ean13, issn13), + OPERATOR 2 <= (ean13, isbn), + OPERATOR 2 <= (ean13, ismn), + OPERATOR 2 <= (ean13, issn), + OPERATOR 2 <= (ean13, upc), + OPERATOR 3 = (ean13, isbn13), + OPERATOR 3 = (ean13, ismn13), + OPERATOR 3 = (ean13, issn13), + OPERATOR 3 = (ean13, isbn), + OPERATOR 3 = (ean13, ismn), + OPERATOR 3 = (ean13, issn), + OPERATOR 3 = (ean13, upc), + OPERATOR 4 >= (ean13, isbn13), + OPERATOR 4 >= (ean13, ismn13), + OPERATOR 4 >= (ean13, issn13), + OPERATOR 4 >= (ean13, isbn), + OPERATOR 4 >= (ean13, ismn), + OPERATOR 4 >= (ean13, issn), + OPERATOR 4 >= (ean13, upc), + OPERATOR 5 > (ean13, isbn13), + OPERATOR 5 > (ean13, ismn13), + OPERATOR 5 > (ean13, issn13), + OPERATOR 5 > (ean13, isbn), + OPERATOR 5 > (ean13, ismn), + OPERATOR 5 > (ean13, issn), + OPERATOR 5 > (ean13, upc), + FUNCTION 1 btean13cmp(ean13, isbn13), + FUNCTION 1 btean13cmp(ean13, ismn13), + FUNCTION 1 btean13cmp(ean13, issn13), + FUNCTION 1 btean13cmp(ean13, isbn), + FUNCTION 1 btean13cmp(ean13, ismn), + FUNCTION 1 btean13cmp(ean13, issn), + FUNCTION 1 btean13cmp(ean13, upc); + +ALTER OPERATOR FAMILY isn_ops USING hash ADD + OPERATOR 1 = (ean13, isbn13), + OPERATOR 1 = (ean13, ismn13), + OPERATOR 1 = (ean13, issn13), + OPERATOR 1 = (ean13, isbn), + OPERATOR 1 = (ean13, ismn), + OPERATOR 1 = (ean13, issn), + OPERATOR 1 = (ean13, upc); + +--------------------------------------------------- +-- ISBN13: +CREATE OR REPLACE FUNCTION btisbn13cmp(isbn13, isbn13) + RETURNS int4 + AS 'btint8cmp' + LANGUAGE 'internal' + IMMUTABLE STRICT; + +CREATE OPERATOR CLASS isbn13_ops DEFAULT + FOR TYPE isbn13 USING btree FAMILY isn_ops AS + OPERATOR 1 <, + OPERATOR 2 <=, + OPERATOR 3 =, + OPERATOR 4 >=, + OPERATOR 5 >, + FUNCTION 1 btisbn13cmp(isbn13, isbn13); + +CREATE OR REPLACE FUNCTION hashisbn13(isbn13) + RETURNS int4 + AS 'hashint8' + LANGUAGE 'internal' + IMMUTABLE STRICT; + +CREATE OPERATOR CLASS isbn13_ops DEFAULT + FOR TYPE isbn13 USING hash FAMILY isn_ops AS + OPERATOR 1 =, + FUNCTION 1 hashisbn13(isbn13); + +-- ISBN13 vs other types: +CREATE OR REPLACE FUNCTION btisbn13cmp(isbn13, ean13) + RETURNS int4 + AS 'btint8cmp' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION btisbn13cmp(isbn13, isbn) + RETURNS int4 + AS 'btint8cmp' + LANGUAGE 'internal' + IMMUTABLE STRICT; + +ALTER OPERATOR FAMILY isn_ops USING btree ADD + OPERATOR 1 < (isbn13, ean13), + OPERATOR 1 < (isbn13, isbn), + OPERATOR 2 <= (isbn13, ean13), + OPERATOR 2 <= (isbn13, isbn), + OPERATOR 3 = (isbn13, ean13), + OPERATOR 3 = (isbn13, isbn), + OPERATOR 4 >= (isbn13, ean13), + OPERATOR 4 >= (isbn13, isbn), + OPERATOR 5 > (isbn13, ean13), + OPERATOR 5 > (isbn13, isbn), + FUNCTION 1 btisbn13cmp(isbn13, ean13), + FUNCTION 1 btisbn13cmp(isbn13, isbn); + +ALTER OPERATOR FAMILY isn_ops USING hash ADD + OPERATOR 1 = (isbn13, ean13), + OPERATOR 1 = (isbn13, isbn); + +--------------------------------------------------- +-- ISBN: +CREATE OR REPLACE FUNCTION btisbncmp(isbn, isbn) + RETURNS int4 + AS 'btint8cmp' + LANGUAGE 'internal' + IMMUTABLE STRICT; + +CREATE OPERATOR CLASS isbn_ops DEFAULT + FOR TYPE isbn USING btree FAMILY isn_ops AS + OPERATOR 1 <, + OPERATOR 2 <=, + OPERATOR 3 =, + OPERATOR 4 >=, + OPERATOR 5 >, + FUNCTION 1 btisbncmp(isbn, isbn); + +CREATE OR REPLACE FUNCTION hashisbn(isbn) + RETURNS int4 + AS 'hashint8' + LANGUAGE 'internal' + IMMUTABLE STRICT; + +CREATE OPERATOR CLASS isbn_ops DEFAULT + FOR TYPE isbn USING hash FAMILY isn_ops AS + OPERATOR 1 =, + FUNCTION 1 hashisbn(isbn); + +-- ISBN vs other types: +CREATE OR REPLACE FUNCTION btisbncmp(isbn, ean13) + RETURNS int4 + AS 'btint8cmp' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION btisbncmp(isbn, isbn13) + RETURNS int4 + AS 'btint8cmp' + LANGUAGE 'internal' + IMMUTABLE STRICT; + +ALTER OPERATOR FAMILY isn_ops USING btree ADD + OPERATOR 1 < (isbn, ean13), + OPERATOR 1 < (isbn, isbn13), + OPERATOR 2 <= (isbn, ean13), + OPERATOR 2 <= (isbn, isbn13), + OPERATOR 3 = (isbn, ean13), + OPERATOR 3 = (isbn, isbn13), + OPERATOR 4 >= (isbn, ean13), + OPERATOR 4 >= (isbn, isbn13), + OPERATOR 5 > (isbn, ean13), + OPERATOR 5 > (isbn, isbn13), + FUNCTION 1 btisbncmp(isbn, ean13), + FUNCTION 1 btisbncmp(isbn, isbn13); + +ALTER OPERATOR FAMILY isn_ops USING hash ADD + OPERATOR 1 = (isbn, ean13), + OPERATOR 1 = (isbn, isbn13); + +--------------------------------------------------- +-- ISMN13: +CREATE OR REPLACE FUNCTION btismn13cmp(ismn13, ismn13) + RETURNS int4 + AS 'btint8cmp' + LANGUAGE 'internal' + IMMUTABLE STRICT; + +CREATE OPERATOR CLASS ismn13_ops DEFAULT + FOR TYPE ismn13 USING btree FAMILY isn_ops AS + OPERATOR 1 <, + OPERATOR 2 <=, + OPERATOR 3 =, + OPERATOR 4 >=, + OPERATOR 5 >, + FUNCTION 1 btismn13cmp(ismn13, ismn13); + +CREATE OR REPLACE FUNCTION hashismn13(ismn13) + RETURNS int4 + AS 'hashint8' + LANGUAGE 'internal' + IMMUTABLE STRICT; + +CREATE OPERATOR CLASS ismn13_ops DEFAULT + FOR TYPE ismn13 USING hash FAMILY isn_ops AS + OPERATOR 1 =, + FUNCTION 1 hashismn13(ismn13); + +-- ISMN13 vs other types: +CREATE OR REPLACE FUNCTION btismn13cmp(ismn13, ean13) + RETURNS int4 + AS 'btint8cmp' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION btismn13cmp(ismn13, ismn) + RETURNS int4 + AS 'btint8cmp' + LANGUAGE 'internal' + IMMUTABLE STRICT; + +ALTER OPERATOR FAMILY isn_ops USING btree ADD + OPERATOR 1 < (ismn13, ean13), + OPERATOR 1 < (ismn13, ismn), + OPERATOR 2 <= (ismn13, ean13), + OPERATOR 2 <= (ismn13, ismn), + OPERATOR 3 = (ismn13, ean13), + OPERATOR 3 = (ismn13, ismn), + OPERATOR 4 >= (ismn13, ean13), + OPERATOR 4 >= (ismn13, ismn), + OPERATOR 5 > (ismn13, ean13), + OPERATOR 5 > (ismn13, ismn), + FUNCTION 1 btismn13cmp(ismn13, ean13), + FUNCTION 1 btismn13cmp(ismn13, ismn); + +ALTER OPERATOR FAMILY isn_ops USING hash ADD + OPERATOR 1 = (ismn13, ean13), + OPERATOR 1 = (ismn13, ismn); + +--------------------------------------------------- +-- ISMN: +CREATE OR REPLACE FUNCTION btismncmp(ismn, ismn) + RETURNS int4 + AS 'btint8cmp' + LANGUAGE 'internal' + IMMUTABLE STRICT; + +CREATE OPERATOR CLASS ismn_ops DEFAULT + FOR TYPE ismn USING btree FAMILY isn_ops AS + OPERATOR 1 <, + OPERATOR 2 <=, + OPERATOR 3 =, + OPERATOR 4 >=, + OPERATOR 5 >, + FUNCTION 1 btismncmp(ismn, ismn); + +CREATE OR REPLACE FUNCTION hashismn(ismn) + RETURNS int4 + AS 'hashint8' + LANGUAGE 'internal' + IMMUTABLE STRICT; + +CREATE OPERATOR CLASS ismn_ops DEFAULT + FOR TYPE ismn USING hash FAMILY isn_ops AS + OPERATOR 1 =, + FUNCTION 1 hashismn(ismn); + +-- ISMN vs other types: +CREATE OR REPLACE FUNCTION btismncmp(ismn, ean13) + RETURNS int4 + AS 'btint8cmp' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION btismncmp(ismn, ismn13) + RETURNS int4 + AS 'btint8cmp' + LANGUAGE 'internal' + IMMUTABLE STRICT; + +ALTER OPERATOR FAMILY isn_ops USING btree ADD + OPERATOR 1 < (ismn, ean13), + OPERATOR 1 < (ismn, ismn13), + OPERATOR 2 <= (ismn, ean13), + OPERATOR 2 <= (ismn, ismn13), + OPERATOR 3 = (ismn, ean13), + OPERATOR 3 = (ismn, ismn13), + OPERATOR 4 >= (ismn, ean13), + OPERATOR 4 >= (ismn, ismn13), + OPERATOR 5 > (ismn, ean13), + OPERATOR 5 > (ismn, ismn13), + FUNCTION 1 btismncmp(ismn, ean13), + FUNCTION 1 btismncmp(ismn, ismn13); + +ALTER OPERATOR FAMILY isn_ops USING hash ADD + OPERATOR 1 = (ismn, ean13), + OPERATOR 1 = (ismn, ismn13); + +--------------------------------------------------- +-- ISSN13: +CREATE OR REPLACE FUNCTION btissn13cmp(issn13, issn13) + RETURNS int4 + AS 'btint8cmp' + LANGUAGE 'internal' + IMMUTABLE STRICT; + +CREATE OPERATOR CLASS issn13_ops DEFAULT + FOR TYPE issn13 USING btree FAMILY isn_ops AS + OPERATOR 1 <, + OPERATOR 2 <=, + OPERATOR 3 =, + OPERATOR 4 >=, + OPERATOR 5 >, + FUNCTION 1 btissn13cmp(issn13, issn13); + +CREATE OR REPLACE FUNCTION hashissn13(issn13) + RETURNS int4 + AS 'hashint8' + LANGUAGE 'internal' + IMMUTABLE STRICT; + +CREATE OPERATOR CLASS issn13_ops DEFAULT + FOR TYPE issn13 USING hash FAMILY isn_ops AS + OPERATOR 1 =, + FUNCTION 1 hashissn13(issn13); + +-- ISSN13 vs other types: +CREATE OR REPLACE FUNCTION btissn13cmp(issn13, ean13) + RETURNS int4 + AS 'btint8cmp' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION btissn13cmp(issn13, issn) + RETURNS int4 + AS 'btint8cmp' + LANGUAGE 'internal' + IMMUTABLE STRICT; + +ALTER OPERATOR FAMILY isn_ops USING btree ADD + OPERATOR 1 < (issn13, ean13), + OPERATOR 1 < (issn13, issn), + OPERATOR 2 <= (issn13, ean13), + OPERATOR 2 <= (issn13, issn), + OPERATOR 3 = (issn13, ean13), + OPERATOR 3 = (issn13, issn), + OPERATOR 4 >= (issn13, ean13), + OPERATOR 4 >= (issn13, issn), + OPERATOR 5 > (issn13, ean13), + OPERATOR 5 > (issn13, issn), + FUNCTION 1 btissn13cmp(issn13, ean13), + FUNCTION 1 btissn13cmp(issn13, issn); + +ALTER OPERATOR FAMILY isn_ops USING hash ADD + OPERATOR 1 = (issn13, ean13), + OPERATOR 1 = (issn13, issn); + +--------------------------------------------------- +-- ISSN: +CREATE OR REPLACE FUNCTION btissncmp(issn, issn) + RETURNS int4 + AS 'btint8cmp' + LANGUAGE 'internal' + IMMUTABLE STRICT; + +CREATE OPERATOR CLASS issn_ops DEFAULT + FOR TYPE issn USING btree FAMILY isn_ops AS + OPERATOR 1 <, + OPERATOR 2 <=, + OPERATOR 3 =, + OPERATOR 4 >=, + OPERATOR 5 >, + FUNCTION 1 btissncmp(issn, issn); + +CREATE OR REPLACE FUNCTION hashissn(issn) + RETURNS int4 + AS 'hashint8' + LANGUAGE 'internal' + IMMUTABLE STRICT; + +CREATE OPERATOR CLASS issn_ops DEFAULT + FOR TYPE issn USING hash FAMILY isn_ops AS + OPERATOR 1 =, + FUNCTION 1 hashissn(issn); + +-- ISSN vs other types: +CREATE OR REPLACE FUNCTION btissncmp(issn, ean13) + RETURNS int4 + AS 'btint8cmp' + LANGUAGE 'internal' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION btissncmp(issn, issn13) + RETURNS int4 + AS 'btint8cmp' + LANGUAGE 'internal' + IMMUTABLE STRICT; + +ALTER OPERATOR FAMILY isn_ops USING btree ADD + OPERATOR 1 < (issn, ean13), + OPERATOR 1 < (issn, issn13), + OPERATOR 2 <= (issn, ean13), + OPERATOR 2 <= (issn, issn13), + OPERATOR 3 = (issn, ean13), + OPERATOR 3 = (issn, issn13), + OPERATOR 4 >= (issn, ean13), + OPERATOR 4 >= (issn, issn13), + OPERATOR 5 > (issn, ean13), + OPERATOR 5 > (issn, issn13), + FUNCTION 1 btissncmp(issn, ean13), + FUNCTION 1 btissncmp(issn, issn13); + +ALTER OPERATOR FAMILY isn_ops USING hash ADD + OPERATOR 1 = (issn, ean13), + OPERATOR 1 = (issn, issn13); + +--------------------------------------------------- +-- UPC: +CREATE OR REPLACE FUNCTION btupccmp(upc, upc) + RETURNS int4 + AS 'btint8cmp' + LANGUAGE 'internal' + IMMUTABLE STRICT; + +CREATE OPERATOR CLASS upc_ops DEFAULT + FOR TYPE upc USING btree FAMILY isn_ops AS + OPERATOR 1 <, + OPERATOR 2 <=, + OPERATOR 3 =, + OPERATOR 4 >=, + OPERATOR 5 >, + FUNCTION 1 btupccmp(upc, upc); + +CREATE OR REPLACE FUNCTION hashupc(upc) + RETURNS int4 + AS 'hashint8' + LANGUAGE 'internal' + IMMUTABLE STRICT; + +CREATE OPERATOR CLASS upc_ops DEFAULT + FOR TYPE upc USING hash FAMILY isn_ops AS + OPERATOR 1 =, + FUNCTION 1 hashupc(upc); + +-- UPC vs other types: +CREATE OR REPLACE FUNCTION btupccmp(upc, ean13) + RETURNS int4 + AS 'btint8cmp' + LANGUAGE 'internal' + IMMUTABLE STRICT; + +ALTER OPERATOR FAMILY isn_ops USING btree ADD + OPERATOR 1 < (upc, ean13), + OPERATOR 2 <= (upc, ean13), + OPERATOR 3 = (upc, ean13), + OPERATOR 4 >= (upc, ean13), + OPERATOR 5 > (upc, ean13), + FUNCTION 1 btupccmp(upc, ean13); + +ALTER OPERATOR FAMILY isn_ops USING hash ADD + OPERATOR 1 = (upc, ean13); + +-- +-- Type casts: +-- +--------------------------------------------------- +CREATE OR REPLACE FUNCTION isbn13(ean13) +RETURNS isbn13 +AS 'MODULE_PATHNAME', 'isbn_cast_from_ean13' +LANGUAGE 'C' IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION ismn13(ean13) +RETURNS ismn13 +AS 'MODULE_PATHNAME', 'ismn_cast_from_ean13' +LANGUAGE 'C' IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION issn13(ean13) +RETURNS issn13 +AS 'MODULE_PATHNAME', 'issn_cast_from_ean13' +LANGUAGE 'C' IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION isbn(ean13) +RETURNS isbn +AS 'MODULE_PATHNAME', 'isbn_cast_from_ean13' +LANGUAGE 'C' IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION ismn(ean13) +RETURNS ismn +AS 'MODULE_PATHNAME', 'ismn_cast_from_ean13' +LANGUAGE 'C' IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION issn(ean13) +RETURNS issn +AS 'MODULE_PATHNAME', 'issn_cast_from_ean13' +LANGUAGE 'C' IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION upc(ean13) +RETURNS upc +AS 'MODULE_PATHNAME', 'upc_cast_from_ean13' +LANGUAGE 'C' IMMUTABLE STRICT; + + +CREATE CAST (ean13 AS isbn13) WITH FUNCTION isbn13(ean13); +CREATE CAST (ean13 AS isbn) WITH FUNCTION isbn(ean13); +CREATE CAST (ean13 AS ismn13) WITH FUNCTION ismn13(ean13); +CREATE CAST (ean13 AS ismn) WITH FUNCTION ismn(ean13); +CREATE CAST (ean13 AS issn13) WITH FUNCTION issn13(ean13); +CREATE CAST (ean13 AS issn) WITH FUNCTION issn(ean13); +CREATE CAST (ean13 AS upc) WITH FUNCTION upc(ean13); + +CREATE CAST (isbn13 AS ean13) WITHOUT FUNCTION AS ASSIGNMENT; +CREATE CAST (isbn AS ean13) WITHOUT FUNCTION AS ASSIGNMENT; +CREATE CAST (ismn13 AS ean13) WITHOUT FUNCTION AS ASSIGNMENT; +CREATE CAST (ismn AS ean13) WITHOUT FUNCTION AS ASSIGNMENT; +CREATE CAST (issn13 AS ean13) WITHOUT FUNCTION AS ASSIGNMENT; +CREATE CAST (issn AS ean13) WITHOUT FUNCTION AS ASSIGNMENT; +CREATE CAST (upc AS ean13) WITHOUT FUNCTION AS ASSIGNMENT; + +CREATE CAST (isbn AS isbn13) WITHOUT FUNCTION AS ASSIGNMENT; +CREATE CAST (isbn13 AS isbn) WITHOUT FUNCTION AS ASSIGNMENT; +CREATE CAST (ismn AS ismn13) WITHOUT FUNCTION AS ASSIGNMENT; +CREATE CAST (ismn13 AS ismn) WITHOUT FUNCTION AS ASSIGNMENT; +CREATE CAST (issn AS issn13) WITHOUT FUNCTION AS ASSIGNMENT; +CREATE CAST (issn13 AS issn) WITHOUT FUNCTION AS ASSIGNMENT; + +-- +-- Validation stuff for lose types: +-- +CREATE OR REPLACE FUNCTION make_valid(ean13) + RETURNS ean13 + AS 'MODULE_PATHNAME' + LANGUAGE 'C' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION make_valid(isbn13) + RETURNS isbn13 + AS 'MODULE_PATHNAME' + LANGUAGE 'C' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION make_valid(ismn13) + RETURNS ismn13 + AS 'MODULE_PATHNAME' + LANGUAGE 'C' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION make_valid(issn13) + RETURNS issn13 + AS 'MODULE_PATHNAME' + LANGUAGE 'C' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION make_valid(isbn) + RETURNS isbn + AS 'MODULE_PATHNAME' + LANGUAGE 'C' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION make_valid(ismn) + RETURNS ismn + AS 'MODULE_PATHNAME' + LANGUAGE 'C' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION make_valid(issn) + RETURNS issn + AS 'MODULE_PATHNAME' + LANGUAGE 'C' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION make_valid(upc) + RETURNS upc + AS 'MODULE_PATHNAME' + LANGUAGE 'C' + IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION is_valid(ean13) + RETURNS boolean + AS 'MODULE_PATHNAME' + LANGUAGE 'C' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION is_valid(isbn13) + RETURNS boolean + AS 'MODULE_PATHNAME' + LANGUAGE 'C' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION is_valid(ismn13) + RETURNS boolean + AS 'MODULE_PATHNAME' + LANGUAGE 'C' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION is_valid(issn13) + RETURNS boolean + AS 'MODULE_PATHNAME' + LANGUAGE 'C' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION is_valid(isbn) + RETURNS boolean + AS 'MODULE_PATHNAME' + LANGUAGE 'C' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION is_valid(ismn) + RETURNS boolean + AS 'MODULE_PATHNAME' + LANGUAGE 'C' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION is_valid(issn) + RETURNS boolean + AS 'MODULE_PATHNAME' + LANGUAGE 'C' + IMMUTABLE STRICT; +CREATE OR REPLACE FUNCTION is_valid(upc) + RETURNS boolean + AS 'MODULE_PATHNAME' + LANGUAGE 'C' + IMMUTABLE STRICT; + +-- +-- isn_weak(boolean) - Sets the weak input mode. +-- This function is intended for testing use only! +-- +CREATE OR REPLACE FUNCTION isn_weak(boolean) + RETURNS boolean + AS 'MODULE_PATHNAME', 'accept_weak_input' + LANGUAGE 'C' + IMMUTABLE STRICT; + +-- +-- isn_weak() - Gets the weak input mode status +-- +CREATE OR REPLACE FUNCTION isn_weak() + RETURNS boolean + AS 'MODULE_PATHNAME', 'weak_input_status' + LANGUAGE 'C' + IMMUTABLE STRICT; diff --git a/contrib/isn/isn--unpackaged--1.0.sql b/contrib/isn/isn--unpackaged--1.0.sql new file mode 100644 index 0000000000..6130a43e51 --- /dev/null +++ b/contrib/isn/isn--unpackaged--1.0.sql @@ -0,0 +1,461 @@ +/* contrib/isn/isn--unpackaged--1.0.sql */ + +ALTER EXTENSION isn ADD type ean13; +ALTER EXTENSION isn ADD function ean13_in(cstring); +ALTER EXTENSION isn ADD function ean13_out(ean13); +ALTER EXTENSION isn ADD type isbn13; +ALTER EXTENSION isn ADD function isbn13_in(cstring); +ALTER EXTENSION isn ADD function ean13_out(isbn13); +ALTER EXTENSION isn ADD type ismn13; +ALTER EXTENSION isn ADD function ismn13_in(cstring); +ALTER EXTENSION isn ADD function ean13_out(ismn13); +ALTER EXTENSION isn ADD type issn13; +ALTER EXTENSION isn ADD function issn13_in(cstring); +ALTER EXTENSION isn ADD function ean13_out(issn13); +ALTER EXTENSION isn ADD type isbn; +ALTER EXTENSION isn ADD function isbn_in(cstring); +ALTER EXTENSION isn ADD function isn_out(isbn); +ALTER EXTENSION isn ADD type ismn; +ALTER EXTENSION isn ADD function ismn_in(cstring); +ALTER EXTENSION isn ADD function isn_out(ismn); +ALTER EXTENSION isn ADD type issn; +ALTER EXTENSION isn ADD function issn_in(cstring); +ALTER EXTENSION isn ADD function isn_out(issn); +ALTER EXTENSION isn ADD type upc; +ALTER EXTENSION isn ADD function upc_in(cstring); +ALTER EXTENSION isn ADD function isn_out(upc); +ALTER EXTENSION isn ADD function isnlt(ean13,ean13); +ALTER EXTENSION isn ADD function isnle(ean13,ean13); +ALTER EXTENSION isn ADD function isneq(ean13,ean13); +ALTER EXTENSION isn ADD function isnge(ean13,ean13); +ALTER EXTENSION isn ADD function isngt(ean13,ean13); +ALTER EXTENSION isn ADD function isnne(ean13,ean13); +ALTER EXTENSION isn ADD function isnlt(ean13,isbn13); +ALTER EXTENSION isn ADD function isnle(ean13,isbn13); +ALTER EXTENSION isn ADD function isneq(ean13,isbn13); +ALTER EXTENSION isn ADD function isnge(ean13,isbn13); +ALTER EXTENSION isn ADD function isngt(ean13,isbn13); +ALTER EXTENSION isn ADD function isnne(ean13,isbn13); +ALTER EXTENSION isn ADD function isnlt(ean13,ismn13); +ALTER EXTENSION isn ADD function isnle(ean13,ismn13); +ALTER EXTENSION isn ADD function isneq(ean13,ismn13); +ALTER EXTENSION isn ADD function isnge(ean13,ismn13); +ALTER EXTENSION isn ADD function isngt(ean13,ismn13); +ALTER EXTENSION isn ADD function isnne(ean13,ismn13); +ALTER EXTENSION isn ADD function isnlt(ean13,issn13); +ALTER EXTENSION isn ADD function isnle(ean13,issn13); +ALTER EXTENSION isn ADD function isneq(ean13,issn13); +ALTER EXTENSION isn ADD function isnge(ean13,issn13); +ALTER EXTENSION isn ADD function isngt(ean13,issn13); +ALTER EXTENSION isn ADD function isnne(ean13,issn13); +ALTER EXTENSION isn ADD function isnlt(ean13,isbn); +ALTER EXTENSION isn ADD function isnle(ean13,isbn); +ALTER EXTENSION isn ADD function isneq(ean13,isbn); +ALTER EXTENSION isn ADD function isnge(ean13,isbn); +ALTER EXTENSION isn ADD function isngt(ean13,isbn); +ALTER EXTENSION isn ADD function isnne(ean13,isbn); +ALTER EXTENSION isn ADD function isnlt(ean13,ismn); +ALTER EXTENSION isn ADD function isnle(ean13,ismn); +ALTER EXTENSION isn ADD function isneq(ean13,ismn); +ALTER EXTENSION isn ADD function isnge(ean13,ismn); +ALTER EXTENSION isn ADD function isngt(ean13,ismn); +ALTER EXTENSION isn ADD function isnne(ean13,ismn); +ALTER EXTENSION isn ADD function isnlt(ean13,issn); +ALTER EXTENSION isn ADD function isnle(ean13,issn); +ALTER EXTENSION isn ADD function isneq(ean13,issn); +ALTER EXTENSION isn ADD function isnge(ean13,issn); +ALTER EXTENSION isn ADD function isngt(ean13,issn); +ALTER EXTENSION isn ADD function isnne(ean13,issn); +ALTER EXTENSION isn ADD function isnlt(ean13,upc); +ALTER EXTENSION isn ADD function isnle(ean13,upc); +ALTER EXTENSION isn ADD function isneq(ean13,upc); +ALTER EXTENSION isn ADD function isnge(ean13,upc); +ALTER EXTENSION isn ADD function isngt(ean13,upc); +ALTER EXTENSION isn ADD function isnne(ean13,upc); +ALTER EXTENSION isn ADD function isnlt(isbn13,isbn13); +ALTER EXTENSION isn ADD function isnle(isbn13,isbn13); +ALTER EXTENSION isn ADD function isneq(isbn13,isbn13); +ALTER EXTENSION isn ADD function isnge(isbn13,isbn13); +ALTER EXTENSION isn ADD function isngt(isbn13,isbn13); +ALTER EXTENSION isn ADD function isnne(isbn13,isbn13); +ALTER EXTENSION isn ADD function isnlt(isbn13,isbn); +ALTER EXTENSION isn ADD function isnle(isbn13,isbn); +ALTER EXTENSION isn ADD function isneq(isbn13,isbn); +ALTER EXTENSION isn ADD function isnge(isbn13,isbn); +ALTER EXTENSION isn ADD function isngt(isbn13,isbn); +ALTER EXTENSION isn ADD function isnne(isbn13,isbn); +ALTER EXTENSION isn ADD function isnlt(isbn13,ean13); +ALTER EXTENSION isn ADD function isnle(isbn13,ean13); +ALTER EXTENSION isn ADD function isneq(isbn13,ean13); +ALTER EXTENSION isn ADD function isnge(isbn13,ean13); +ALTER EXTENSION isn ADD function isngt(isbn13,ean13); +ALTER EXTENSION isn ADD function isnne(isbn13,ean13); +ALTER EXTENSION isn ADD function isnlt(isbn,isbn); +ALTER EXTENSION isn ADD function isnle(isbn,isbn); +ALTER EXTENSION isn ADD function isneq(isbn,isbn); +ALTER EXTENSION isn ADD function isnge(isbn,isbn); +ALTER EXTENSION isn ADD function isngt(isbn,isbn); +ALTER EXTENSION isn ADD function isnne(isbn,isbn); +ALTER EXTENSION isn ADD function isnlt(isbn,isbn13); +ALTER EXTENSION isn ADD function isnle(isbn,isbn13); +ALTER EXTENSION isn ADD function isneq(isbn,isbn13); +ALTER EXTENSION isn ADD function isnge(isbn,isbn13); +ALTER EXTENSION isn ADD function isngt(isbn,isbn13); +ALTER EXTENSION isn ADD function isnne(isbn,isbn13); +ALTER EXTENSION isn ADD function isnlt(isbn,ean13); +ALTER EXTENSION isn ADD function isnle(isbn,ean13); +ALTER EXTENSION isn ADD function isneq(isbn,ean13); +ALTER EXTENSION isn ADD function isnge(isbn,ean13); +ALTER EXTENSION isn ADD function isngt(isbn,ean13); +ALTER EXTENSION isn ADD function isnne(isbn,ean13); +ALTER EXTENSION isn ADD function isnlt(ismn13,ismn13); +ALTER EXTENSION isn ADD function isnle(ismn13,ismn13); +ALTER EXTENSION isn ADD function isneq(ismn13,ismn13); +ALTER EXTENSION isn ADD function isnge(ismn13,ismn13); +ALTER EXTENSION isn ADD function isngt(ismn13,ismn13); +ALTER EXTENSION isn ADD function isnne(ismn13,ismn13); +ALTER EXTENSION isn ADD function isnlt(ismn13,ismn); +ALTER EXTENSION isn ADD function isnle(ismn13,ismn); +ALTER EXTENSION isn ADD function isneq(ismn13,ismn); +ALTER EXTENSION isn ADD function isnge(ismn13,ismn); +ALTER EXTENSION isn ADD function isngt(ismn13,ismn); +ALTER EXTENSION isn ADD function isnne(ismn13,ismn); +ALTER EXTENSION isn ADD function isnlt(ismn13,ean13); +ALTER EXTENSION isn ADD function isnle(ismn13,ean13); +ALTER EXTENSION isn ADD function isneq(ismn13,ean13); +ALTER EXTENSION isn ADD function isnge(ismn13,ean13); +ALTER EXTENSION isn ADD function isngt(ismn13,ean13); +ALTER EXTENSION isn ADD function isnne(ismn13,ean13); +ALTER EXTENSION isn ADD function isnlt(ismn,ismn); +ALTER EXTENSION isn ADD function isnle(ismn,ismn); +ALTER EXTENSION isn ADD function isneq(ismn,ismn); +ALTER EXTENSION isn ADD function isnge(ismn,ismn); +ALTER EXTENSION isn ADD function isngt(ismn,ismn); +ALTER EXTENSION isn ADD function isnne(ismn,ismn); +ALTER EXTENSION isn ADD function isnlt(ismn,ismn13); +ALTER EXTENSION isn ADD function isnle(ismn,ismn13); +ALTER EXTENSION isn ADD function isneq(ismn,ismn13); +ALTER EXTENSION isn ADD function isnge(ismn,ismn13); +ALTER EXTENSION isn ADD function isngt(ismn,ismn13); +ALTER EXTENSION isn ADD function isnne(ismn,ismn13); +ALTER EXTENSION isn ADD function isnlt(ismn,ean13); +ALTER EXTENSION isn ADD function isnle(ismn,ean13); +ALTER EXTENSION isn ADD function isneq(ismn,ean13); +ALTER EXTENSION isn ADD function isnge(ismn,ean13); +ALTER EXTENSION isn ADD function isngt(ismn,ean13); +ALTER EXTENSION isn ADD function isnne(ismn,ean13); +ALTER EXTENSION isn ADD function isnlt(issn13,issn13); +ALTER EXTENSION isn ADD function isnle(issn13,issn13); +ALTER EXTENSION isn ADD function isneq(issn13,issn13); +ALTER EXTENSION isn ADD function isnge(issn13,issn13); +ALTER EXTENSION isn ADD function isngt(issn13,issn13); +ALTER EXTENSION isn ADD function isnne(issn13,issn13); +ALTER EXTENSION isn ADD function isnlt(issn13,issn); +ALTER EXTENSION isn ADD function isnle(issn13,issn); +ALTER EXTENSION isn ADD function isneq(issn13,issn); +ALTER EXTENSION isn ADD function isnge(issn13,issn); +ALTER EXTENSION isn ADD function isngt(issn13,issn); +ALTER EXTENSION isn ADD function isnne(issn13,issn); +ALTER EXTENSION isn ADD function isnlt(issn13,ean13); +ALTER EXTENSION isn ADD function isnle(issn13,ean13); +ALTER EXTENSION isn ADD function isneq(issn13,ean13); +ALTER EXTENSION isn ADD function isnge(issn13,ean13); +ALTER EXTENSION isn ADD function isngt(issn13,ean13); +ALTER EXTENSION isn ADD function isnne(issn13,ean13); +ALTER EXTENSION isn ADD function isnlt(issn,issn); +ALTER EXTENSION isn ADD function isnle(issn,issn); +ALTER EXTENSION isn ADD function isneq(issn,issn); +ALTER EXTENSION isn ADD function isnge(issn,issn); +ALTER EXTENSION isn ADD function isngt(issn,issn); +ALTER EXTENSION isn ADD function isnne(issn,issn); +ALTER EXTENSION isn ADD function isnlt(issn,issn13); +ALTER EXTENSION isn ADD function isnle(issn,issn13); +ALTER EXTENSION isn ADD function isneq(issn,issn13); +ALTER EXTENSION isn ADD function isnge(issn,issn13); +ALTER EXTENSION isn ADD function isngt(issn,issn13); +ALTER EXTENSION isn ADD function isnne(issn,issn13); +ALTER EXTENSION isn ADD function isnlt(issn,ean13); +ALTER EXTENSION isn ADD function isnle(issn,ean13); +ALTER EXTENSION isn ADD function isneq(issn,ean13); +ALTER EXTENSION isn ADD function isnge(issn,ean13); +ALTER EXTENSION isn ADD function isngt(issn,ean13); +ALTER EXTENSION isn ADD function isnne(issn,ean13); +ALTER EXTENSION isn ADD function isnlt(upc,upc); +ALTER EXTENSION isn ADD function isnle(upc,upc); +ALTER EXTENSION isn ADD function isneq(upc,upc); +ALTER EXTENSION isn ADD function isnge(upc,upc); +ALTER EXTENSION isn ADD function isngt(upc,upc); +ALTER EXTENSION isn ADD function isnne(upc,upc); +ALTER EXTENSION isn ADD function isnlt(upc,ean13); +ALTER EXTENSION isn ADD function isnle(upc,ean13); +ALTER EXTENSION isn ADD function isneq(upc,ean13); +ALTER EXTENSION isn ADD function isnge(upc,ean13); +ALTER EXTENSION isn ADD function isngt(upc,ean13); +ALTER EXTENSION isn ADD function isnne(upc,ean13); +ALTER EXTENSION isn ADD operator >(ean13,ean13); +ALTER EXTENSION isn ADD operator >=(ean13,ean13); +ALTER EXTENSION isn ADD operator <(ean13,ean13); +ALTER EXTENSION isn ADD operator <=(ean13,ean13); +ALTER EXTENSION isn ADD operator <>(ean13,ean13); +ALTER EXTENSION isn ADD operator =(ean13,ean13); +ALTER EXTENSION isn ADD operator >(isbn13,ean13); +ALTER EXTENSION isn ADD operator >=(ean13,isbn13); +ALTER EXTENSION isn ADD operator <(ean13,isbn13); +ALTER EXTENSION isn ADD operator >=(isbn13,ean13); +ALTER EXTENSION isn ADD operator >(ean13,isbn13); +ALTER EXTENSION isn ADD operator <=(ean13,isbn13); +ALTER EXTENSION isn ADD operator =(isbn13,ean13); +ALTER EXTENSION isn ADD operator <>(ean13,isbn13); +ALTER EXTENSION isn ADD operator =(ean13,isbn13); +ALTER EXTENSION isn ADD operator <=(isbn13,ean13); +ALTER EXTENSION isn ADD operator <(isbn13,ean13); +ALTER EXTENSION isn ADD operator <>(isbn13,ean13); +ALTER EXTENSION isn ADD operator >(ismn13,ean13); +ALTER EXTENSION isn ADD operator >=(ean13,ismn13); +ALTER EXTENSION isn ADD operator <(ean13,ismn13); +ALTER EXTENSION isn ADD operator >=(ismn13,ean13); +ALTER EXTENSION isn ADD operator >(ean13,ismn13); +ALTER EXTENSION isn ADD operator <=(ean13,ismn13); +ALTER EXTENSION isn ADD operator =(ismn13,ean13); +ALTER EXTENSION isn ADD operator <>(ean13,ismn13); +ALTER EXTENSION isn ADD operator =(ean13,ismn13); +ALTER EXTENSION isn ADD operator <=(ismn13,ean13); +ALTER EXTENSION isn ADD operator <(ismn13,ean13); +ALTER EXTENSION isn ADD operator <>(ismn13,ean13); +ALTER EXTENSION isn ADD operator >(issn13,ean13); +ALTER EXTENSION isn ADD operator >=(ean13,issn13); +ALTER EXTENSION isn ADD operator <(ean13,issn13); +ALTER EXTENSION isn ADD operator >=(issn13,ean13); +ALTER EXTENSION isn ADD operator >(ean13,issn13); +ALTER EXTENSION isn ADD operator <=(ean13,issn13); +ALTER EXTENSION isn ADD operator =(issn13,ean13); +ALTER EXTENSION isn ADD operator <>(ean13,issn13); +ALTER EXTENSION isn ADD operator =(ean13,issn13); +ALTER EXTENSION isn ADD operator <=(issn13,ean13); +ALTER EXTENSION isn ADD operator <(issn13,ean13); +ALTER EXTENSION isn ADD operator <>(issn13,ean13); +ALTER EXTENSION isn ADD operator >(isbn,ean13); +ALTER EXTENSION isn ADD operator >=(ean13,isbn); +ALTER EXTENSION isn ADD operator <(ean13,isbn); +ALTER EXTENSION isn ADD operator >=(isbn,ean13); +ALTER EXTENSION isn ADD operator >(ean13,isbn); +ALTER EXTENSION isn ADD operator <=(ean13,isbn); +ALTER EXTENSION isn ADD operator =(isbn,ean13); +ALTER EXTENSION isn ADD operator <>(ean13,isbn); +ALTER EXTENSION isn ADD operator =(ean13,isbn); +ALTER EXTENSION isn ADD operator <=(isbn,ean13); +ALTER EXTENSION isn ADD operator <(isbn,ean13); +ALTER EXTENSION isn ADD operator <>(isbn,ean13); +ALTER EXTENSION isn ADD operator >(ismn,ean13); +ALTER EXTENSION isn ADD operator >=(ean13,ismn); +ALTER EXTENSION isn ADD operator <(ean13,ismn); +ALTER EXTENSION isn ADD operator >=(ismn,ean13); +ALTER EXTENSION isn ADD operator >(ean13,ismn); +ALTER EXTENSION isn ADD operator <=(ean13,ismn); +ALTER EXTENSION isn ADD operator =(ismn,ean13); +ALTER EXTENSION isn ADD operator <>(ean13,ismn); +ALTER EXTENSION isn ADD operator =(ean13,ismn); +ALTER EXTENSION isn ADD operator <=(ismn,ean13); +ALTER EXTENSION isn ADD operator <(ismn,ean13); +ALTER EXTENSION isn ADD operator <>(ismn,ean13); +ALTER EXTENSION isn ADD operator >(issn,ean13); +ALTER EXTENSION isn ADD operator >=(ean13,issn); +ALTER EXTENSION isn ADD operator <(ean13,issn); +ALTER EXTENSION isn ADD operator >=(issn,ean13); +ALTER EXTENSION isn ADD operator >(ean13,issn); +ALTER EXTENSION isn ADD operator <=(ean13,issn); +ALTER EXTENSION isn ADD operator =(issn,ean13); +ALTER EXTENSION isn ADD operator <>(ean13,issn); +ALTER EXTENSION isn ADD operator =(ean13,issn); +ALTER EXTENSION isn ADD operator <=(issn,ean13); +ALTER EXTENSION isn ADD operator <(issn,ean13); +ALTER EXTENSION isn ADD operator <>(issn,ean13); +ALTER EXTENSION isn ADD operator >(upc,ean13); +ALTER EXTENSION isn ADD operator >=(ean13,upc); +ALTER EXTENSION isn ADD operator <(ean13,upc); +ALTER EXTENSION isn ADD operator >=(upc,ean13); +ALTER EXTENSION isn ADD operator >(ean13,upc); +ALTER EXTENSION isn ADD operator <=(ean13,upc); +ALTER EXTENSION isn ADD operator =(upc,ean13); +ALTER EXTENSION isn ADD operator <>(ean13,upc); +ALTER EXTENSION isn ADD operator =(ean13,upc); +ALTER EXTENSION isn ADD operator <=(upc,ean13); +ALTER EXTENSION isn ADD operator <(upc,ean13); +ALTER EXTENSION isn ADD operator <>(upc,ean13); +ALTER EXTENSION isn ADD operator >(isbn13,isbn13); +ALTER EXTENSION isn ADD operator >=(isbn13,isbn13); +ALTER EXTENSION isn ADD operator <(isbn13,isbn13); +ALTER EXTENSION isn ADD operator <=(isbn13,isbn13); +ALTER EXTENSION isn ADD operator <>(isbn13,isbn13); +ALTER EXTENSION isn ADD operator =(isbn13,isbn13); +ALTER EXTENSION isn ADD operator >(isbn,isbn13); +ALTER EXTENSION isn ADD operator >=(isbn13,isbn); +ALTER EXTENSION isn ADD operator <(isbn13,isbn); +ALTER EXTENSION isn ADD operator >=(isbn,isbn13); +ALTER EXTENSION isn ADD operator >(isbn13,isbn); +ALTER EXTENSION isn ADD operator <=(isbn13,isbn); +ALTER EXTENSION isn ADD operator =(isbn,isbn13); +ALTER EXTENSION isn ADD operator <>(isbn13,isbn); +ALTER EXTENSION isn ADD operator =(isbn13,isbn); +ALTER EXTENSION isn ADD operator <=(isbn,isbn13); +ALTER EXTENSION isn ADD operator <(isbn,isbn13); +ALTER EXTENSION isn ADD operator <>(isbn,isbn13); +ALTER EXTENSION isn ADD operator >(isbn,isbn); +ALTER EXTENSION isn ADD operator >=(isbn,isbn); +ALTER EXTENSION isn ADD operator <(isbn,isbn); +ALTER EXTENSION isn ADD operator <=(isbn,isbn); +ALTER EXTENSION isn ADD operator <>(isbn,isbn); +ALTER EXTENSION isn ADD operator =(isbn,isbn); +ALTER EXTENSION isn ADD operator >(ismn13,ismn13); +ALTER EXTENSION isn ADD operator >=(ismn13,ismn13); +ALTER EXTENSION isn ADD operator <(ismn13,ismn13); +ALTER EXTENSION isn ADD operator <=(ismn13,ismn13); +ALTER EXTENSION isn ADD operator <>(ismn13,ismn13); +ALTER EXTENSION isn ADD operator =(ismn13,ismn13); +ALTER EXTENSION isn ADD operator >(ismn,ismn13); +ALTER EXTENSION isn ADD operator >=(ismn13,ismn); +ALTER EXTENSION isn ADD operator <(ismn13,ismn); +ALTER EXTENSION isn ADD operator >=(ismn,ismn13); +ALTER EXTENSION isn ADD operator >(ismn13,ismn); +ALTER EXTENSION isn ADD operator <=(ismn13,ismn); +ALTER EXTENSION isn ADD operator =(ismn,ismn13); +ALTER EXTENSION isn ADD operator <>(ismn13,ismn); +ALTER EXTENSION isn ADD operator =(ismn13,ismn); +ALTER EXTENSION isn ADD operator <=(ismn,ismn13); +ALTER EXTENSION isn ADD operator <(ismn,ismn13); +ALTER EXTENSION isn ADD operator <>(ismn,ismn13); +ALTER EXTENSION isn ADD operator >(ismn,ismn); +ALTER EXTENSION isn ADD operator >=(ismn,ismn); +ALTER EXTENSION isn ADD operator <(ismn,ismn); +ALTER EXTENSION isn ADD operator <=(ismn,ismn); +ALTER EXTENSION isn ADD operator <>(ismn,ismn); +ALTER EXTENSION isn ADD operator =(ismn,ismn); +ALTER EXTENSION isn ADD operator >(issn13,issn13); +ALTER EXTENSION isn ADD operator >=(issn13,issn13); +ALTER EXTENSION isn ADD operator <(issn13,issn13); +ALTER EXTENSION isn ADD operator <=(issn13,issn13); +ALTER EXTENSION isn ADD operator <>(issn13,issn13); +ALTER EXTENSION isn ADD operator =(issn13,issn13); +ALTER EXTENSION isn ADD operator >(issn,issn13); +ALTER EXTENSION isn ADD operator >=(issn13,issn); +ALTER EXTENSION isn ADD operator <(issn13,issn); +ALTER EXTENSION isn ADD operator >=(issn,issn13); +ALTER EXTENSION isn ADD operator >(issn13,issn); +ALTER EXTENSION isn ADD operator <=(issn13,issn); +ALTER EXTENSION isn ADD operator =(issn,issn13); +ALTER EXTENSION isn ADD operator <>(issn13,issn); +ALTER EXTENSION isn ADD operator =(issn13,issn); +ALTER EXTENSION isn ADD operator <=(issn,issn13); +ALTER EXTENSION isn ADD operator <(issn,issn13); +ALTER EXTENSION isn ADD operator <>(issn,issn13); +ALTER EXTENSION isn ADD operator >(issn,issn); +ALTER EXTENSION isn ADD operator >=(issn,issn); +ALTER EXTENSION isn ADD operator <(issn,issn); +ALTER EXTENSION isn ADD operator <=(issn,issn); +ALTER EXTENSION isn ADD operator <>(issn,issn); +ALTER EXTENSION isn ADD operator =(issn,issn); +ALTER EXTENSION isn ADD operator >(upc,upc); +ALTER EXTENSION isn ADD operator >=(upc,upc); +ALTER EXTENSION isn ADD operator <(upc,upc); +ALTER EXTENSION isn ADD operator <=(upc,upc); +ALTER EXTENSION isn ADD operator <>(upc,upc); +ALTER EXTENSION isn ADD operator =(upc,upc); +ALTER EXTENSION isn ADD operator family isn_ops using btree; +ALTER EXTENSION isn ADD operator family isn_ops using hash; +ALTER EXTENSION isn ADD function btean13cmp(ean13,ean13); +ALTER EXTENSION isn ADD operator class ean13_ops using btree; +ALTER EXTENSION isn ADD function hashean13(ean13); +ALTER EXTENSION isn ADD operator class ean13_ops using hash; +ALTER EXTENSION isn ADD function btean13cmp(ean13,isbn13); +ALTER EXTENSION isn ADD function btean13cmp(ean13,ismn13); +ALTER EXTENSION isn ADD function btean13cmp(ean13,issn13); +ALTER EXTENSION isn ADD function btean13cmp(ean13,isbn); +ALTER EXTENSION isn ADD function btean13cmp(ean13,ismn); +ALTER EXTENSION isn ADD function btean13cmp(ean13,issn); +ALTER EXTENSION isn ADD function btean13cmp(ean13,upc); +ALTER EXTENSION isn ADD function btisbn13cmp(isbn13,isbn13); +ALTER EXTENSION isn ADD operator class isbn13_ops using btree; +ALTER EXTENSION isn ADD function hashisbn13(isbn13); +ALTER EXTENSION isn ADD operator class isbn13_ops using hash; +ALTER EXTENSION isn ADD function btisbn13cmp(isbn13,ean13); +ALTER EXTENSION isn ADD function btisbn13cmp(isbn13,isbn); +ALTER EXTENSION isn ADD function btisbncmp(isbn,isbn); +ALTER EXTENSION isn ADD operator class isbn_ops using btree; +ALTER EXTENSION isn ADD function hashisbn(isbn); +ALTER EXTENSION isn ADD operator class isbn_ops using hash; +ALTER EXTENSION isn ADD function btisbncmp(isbn,ean13); +ALTER EXTENSION isn ADD function btisbncmp(isbn,isbn13); +ALTER EXTENSION isn ADD function btismn13cmp(ismn13,ismn13); +ALTER EXTENSION isn ADD operator class ismn13_ops using btree; +ALTER EXTENSION isn ADD function hashismn13(ismn13); +ALTER EXTENSION isn ADD operator class ismn13_ops using hash; +ALTER EXTENSION isn ADD function btismn13cmp(ismn13,ean13); +ALTER EXTENSION isn ADD function btismn13cmp(ismn13,ismn); +ALTER EXTENSION isn ADD function btismncmp(ismn,ismn); +ALTER EXTENSION isn ADD operator class ismn_ops using btree; +ALTER EXTENSION isn ADD function hashismn(ismn); +ALTER EXTENSION isn ADD operator class ismn_ops using hash; +ALTER EXTENSION isn ADD function btismncmp(ismn,ean13); +ALTER EXTENSION isn ADD function btismncmp(ismn,ismn13); +ALTER EXTENSION isn ADD function btissn13cmp(issn13,issn13); +ALTER EXTENSION isn ADD operator class issn13_ops using btree; +ALTER EXTENSION isn ADD function hashissn13(issn13); +ALTER EXTENSION isn ADD operator class issn13_ops using hash; +ALTER EXTENSION isn ADD function btissn13cmp(issn13,ean13); +ALTER EXTENSION isn ADD function btissn13cmp(issn13,issn); +ALTER EXTENSION isn ADD function btissncmp(issn,issn); +ALTER EXTENSION isn ADD operator class issn_ops using btree; +ALTER EXTENSION isn ADD function hashissn(issn); +ALTER EXTENSION isn ADD operator class issn_ops using hash; +ALTER EXTENSION isn ADD function btissncmp(issn,ean13); +ALTER EXTENSION isn ADD function btissncmp(issn,issn13); +ALTER EXTENSION isn ADD function btupccmp(upc,upc); +ALTER EXTENSION isn ADD operator class upc_ops using btree; +ALTER EXTENSION isn ADD function hashupc(upc); +ALTER EXTENSION isn ADD operator class upc_ops using hash; +ALTER EXTENSION isn ADD function btupccmp(upc,ean13); +ALTER EXTENSION isn ADD function isbn13(ean13); +ALTER EXTENSION isn ADD function ismn13(ean13); +ALTER EXTENSION isn ADD function issn13(ean13); +ALTER EXTENSION isn ADD function isbn(ean13); +ALTER EXTENSION isn ADD function ismn(ean13); +ALTER EXTENSION isn ADD function issn(ean13); +ALTER EXTENSION isn ADD function upc(ean13); +ALTER EXTENSION isn ADD cast (ean13 as isbn13); +ALTER EXTENSION isn ADD cast (ean13 as isbn); +ALTER EXTENSION isn ADD cast (ean13 as ismn13); +ALTER EXTENSION isn ADD cast (ean13 as ismn); +ALTER EXTENSION isn ADD cast (ean13 as issn13); +ALTER EXTENSION isn ADD cast (ean13 as issn); +ALTER EXTENSION isn ADD cast (ean13 as upc); +ALTER EXTENSION isn ADD cast (isbn13 as ean13); +ALTER EXTENSION isn ADD cast (isbn as ean13); +ALTER EXTENSION isn ADD cast (ismn13 as ean13); +ALTER EXTENSION isn ADD cast (ismn as ean13); +ALTER EXTENSION isn ADD cast (issn13 as ean13); +ALTER EXTENSION isn ADD cast (issn as ean13); +ALTER EXTENSION isn ADD cast (upc as ean13); +ALTER EXTENSION isn ADD cast (isbn as isbn13); +ALTER EXTENSION isn ADD cast (isbn13 as isbn); +ALTER EXTENSION isn ADD cast (ismn as ismn13); +ALTER EXTENSION isn ADD cast (ismn13 as ismn); +ALTER EXTENSION isn ADD cast (issn as issn13); +ALTER EXTENSION isn ADD cast (issn13 as issn); +ALTER EXTENSION isn ADD function make_valid(ean13); +ALTER EXTENSION isn ADD function make_valid(isbn13); +ALTER EXTENSION isn ADD function make_valid(ismn13); +ALTER EXTENSION isn ADD function make_valid(issn13); +ALTER EXTENSION isn ADD function make_valid(isbn); +ALTER EXTENSION isn ADD function make_valid(ismn); +ALTER EXTENSION isn ADD function make_valid(issn); +ALTER EXTENSION isn ADD function make_valid(upc); +ALTER EXTENSION isn ADD function is_valid(ean13); +ALTER EXTENSION isn ADD function is_valid(isbn13); +ALTER EXTENSION isn ADD function is_valid(ismn13); +ALTER EXTENSION isn ADD function is_valid(issn13); +ALTER EXTENSION isn ADD function is_valid(isbn); +ALTER EXTENSION isn ADD function is_valid(ismn); +ALTER EXTENSION isn ADD function is_valid(issn); +ALTER EXTENSION isn ADD function is_valid(upc); +ALTER EXTENSION isn ADD function isn_weak(boolean); +ALTER EXTENSION isn ADD function isn_weak(); diff --git a/contrib/isn/isn.control b/contrib/isn/isn.control new file mode 100644 index 0000000000..cf0b2ebe38 --- /dev/null +++ b/contrib/isn/isn.control @@ -0,0 +1,5 @@ +# isn extension +comment = 'data types for international product numbering standards' +default_version = '1.0' +module_pathname = '$libdir/isn' +relocatable = true diff --git a/contrib/isn/isn.sql.in b/contrib/isn/isn.sql.in deleted file mode 100644 index 8f73c5c497..0000000000 --- a/contrib/isn/isn.sql.in +++ /dev/null @@ -1,3196 +0,0 @@ -/* contrib/isn/isn.sql.in */ - --- Adjust this setting to control where the objects get created. -SET search_path = public; - --- Example: --- create table test ( id isbn ); --- insert into test values('978-0-393-04002-9'); --- --- select isbn('978-0-393-04002-9'); --- select isbn13('0-901690-54-6'); --- - --- --- Input and output functions and data types: --- ---------------------------------------------------- -CREATE OR REPLACE FUNCTION ean13_in(cstring) - RETURNS ean13 - AS 'MODULE_PATHNAME' - LANGUAGE 'C' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION ean13_out(ean13) - RETURNS cstring - AS 'MODULE_PATHNAME' - LANGUAGE 'C' - IMMUTABLE STRICT; -CREATE TYPE ean13 ( - INPUT = ean13_in, - OUTPUT = ean13_out, - LIKE = pg_catalog.int8 -); -COMMENT ON TYPE ean13 - IS 'International European Article Number (EAN13)'; - -CREATE OR REPLACE FUNCTION isbn13_in(cstring) - RETURNS isbn13 - AS 'MODULE_PATHNAME', 'isbn_in' - LANGUAGE 'C' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION ean13_out(isbn13) - RETURNS cstring - AS 'MODULE_PATHNAME' - LANGUAGE 'C' - IMMUTABLE STRICT; -CREATE TYPE isbn13 ( - INPUT = isbn13_in, - OUTPUT = ean13_out, - LIKE = pg_catalog.int8 -); -COMMENT ON TYPE isbn13 - IS 'International Standard Book Number 13 (ISBN13)'; - -CREATE OR REPLACE FUNCTION ismn13_in(cstring) - RETURNS ismn13 - AS 'MODULE_PATHNAME', 'ismn_in' - LANGUAGE 'C' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION ean13_out(ismn13) - RETURNS cstring - AS 'MODULE_PATHNAME' - LANGUAGE 'C' - IMMUTABLE STRICT; -CREATE TYPE ismn13 ( - INPUT = ismn13_in, - OUTPUT = ean13_out, - LIKE = pg_catalog.int8 -); -COMMENT ON TYPE ismn13 - IS 'International Standard Music Number 13 (ISMN13)'; - -CREATE OR REPLACE FUNCTION issn13_in(cstring) - RETURNS issn13 - AS 'MODULE_PATHNAME', 'issn_in' - LANGUAGE 'C' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION ean13_out(issn13) - RETURNS cstring - AS 'MODULE_PATHNAME' - LANGUAGE 'C' - IMMUTABLE STRICT; -CREATE TYPE issn13 ( - INPUT = issn13_in, - OUTPUT = ean13_out, - LIKE = pg_catalog.int8 -); -COMMENT ON TYPE issn13 - IS 'International Standard Serial Number 13 (ISSN13)'; - --- Short format: - -CREATE OR REPLACE FUNCTION isbn_in(cstring) - RETURNS isbn - AS 'MODULE_PATHNAME' - LANGUAGE 'C' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isn_out(isbn) - RETURNS cstring - AS 'MODULE_PATHNAME' - LANGUAGE 'C' - IMMUTABLE STRICT; -CREATE TYPE isbn ( - INPUT = isbn_in, - OUTPUT = isn_out, - LIKE = pg_catalog.int8 -); -COMMENT ON TYPE isbn - IS 'International Standard Book Number (ISBN)'; - -CREATE OR REPLACE FUNCTION ismn_in(cstring) - RETURNS ismn - AS 'MODULE_PATHNAME' - LANGUAGE 'C' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isn_out(ismn) - RETURNS cstring - AS 'MODULE_PATHNAME' - LANGUAGE 'C' - IMMUTABLE STRICT; -CREATE TYPE ismn ( - INPUT = ismn_in, - OUTPUT = isn_out, - LIKE = pg_catalog.int8 -); -COMMENT ON TYPE ismn - IS 'International Standard Music Number (ISMN)'; - -CREATE OR REPLACE FUNCTION issn_in(cstring) - RETURNS issn - AS 'MODULE_PATHNAME' - LANGUAGE 'C' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isn_out(issn) - RETURNS cstring - AS 'MODULE_PATHNAME' - LANGUAGE 'C' - IMMUTABLE STRICT; -CREATE TYPE issn ( - INPUT = issn_in, - OUTPUT = isn_out, - LIKE = pg_catalog.int8 -); -COMMENT ON TYPE issn - IS 'International Standard Serial Number (ISSN)'; - -CREATE OR REPLACE FUNCTION upc_in(cstring) - RETURNS upc - AS 'MODULE_PATHNAME' - LANGUAGE 'C' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isn_out(upc) - RETURNS cstring - AS 'MODULE_PATHNAME' - LANGUAGE 'C' - IMMUTABLE STRICT; -CREATE TYPE upc ( - INPUT = upc_in, - OUTPUT = isn_out, - LIKE = pg_catalog.int8 -); -COMMENT ON TYPE upc - IS 'Universal Product Code (UPC)'; - --- --- Operator functions: --- ---------------------------------------------------- --- EAN13: -CREATE OR REPLACE FUNCTION isnlt(ean13, ean13) - RETURNS boolean - AS 'int8lt' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnle(ean13, ean13) - RETURNS boolean - AS 'int8le' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isneq(ean13, ean13) - RETURNS boolean - AS 'int8eq' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnge(ean13, ean13) - RETURNS boolean - AS 'int8ge' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isngt(ean13, ean13) - RETURNS boolean - AS 'int8gt' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnne(ean13, ean13) - RETURNS boolean - AS 'int8ne' - LANGUAGE 'internal' - IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION isnlt(ean13, isbn13) - RETURNS boolean - AS 'int8lt' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnle(ean13, isbn13) - RETURNS boolean - AS 'int8le' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isneq(ean13, isbn13) - RETURNS boolean - AS 'int8eq' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnge(ean13, isbn13) - RETURNS boolean - AS 'int8ge' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isngt(ean13, isbn13) - RETURNS boolean - AS 'int8gt' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnne(ean13, isbn13) - RETURNS boolean - AS 'int8ne' - LANGUAGE 'internal' - IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION isnlt(ean13, ismn13) - RETURNS boolean - AS 'int8lt' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnle(ean13, ismn13) - RETURNS boolean - AS 'int8le' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isneq(ean13, ismn13) - RETURNS boolean - AS 'int8eq' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnge(ean13, ismn13) - RETURNS boolean - AS 'int8ge' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isngt(ean13, ismn13) - RETURNS boolean - AS 'int8gt' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnne(ean13, ismn13) - RETURNS boolean - AS 'int8ne' - LANGUAGE 'internal' - IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION isnlt(ean13, issn13) - RETURNS boolean - AS 'int8lt' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnle(ean13, issn13) - RETURNS boolean - AS 'int8le' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isneq(ean13, issn13) - RETURNS boolean - AS 'int8eq' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnge(ean13, issn13) - RETURNS boolean - AS 'int8ge' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isngt(ean13, issn13) - RETURNS boolean - AS 'int8gt' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnne(ean13, issn13) - RETURNS boolean - AS 'int8ne' - LANGUAGE 'internal' - IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION isnlt(ean13, isbn) - RETURNS boolean - AS 'int8lt' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnle(ean13, isbn) - RETURNS boolean - AS 'int8le' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isneq(ean13, isbn) - RETURNS boolean - AS 'int8eq' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnge(ean13, isbn) - RETURNS boolean - AS 'int8ge' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isngt(ean13, isbn) - RETURNS boolean - AS 'int8gt' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnne(ean13, isbn) - RETURNS boolean - AS 'int8ne' - LANGUAGE 'internal' - IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION isnlt(ean13, ismn) - RETURNS boolean - AS 'int8lt' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnle(ean13, ismn) - RETURNS boolean - AS 'int8le' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isneq(ean13, ismn) - RETURNS boolean - AS 'int8eq' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnge(ean13, ismn) - RETURNS boolean - AS 'int8ge' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isngt(ean13, ismn) - RETURNS boolean - AS 'int8gt' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnne(ean13, ismn) - RETURNS boolean - AS 'int8ne' - LANGUAGE 'internal' - IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION isnlt(ean13, issn) - RETURNS boolean - AS 'int8lt' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnle(ean13, issn) - RETURNS boolean - AS 'int8le' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isneq(ean13, issn) - RETURNS boolean - AS 'int8eq' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnge(ean13, issn) - RETURNS boolean - AS 'int8ge' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isngt(ean13, issn) - RETURNS boolean - AS 'int8gt' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnne(ean13, issn) - RETURNS boolean - AS 'int8ne' - LANGUAGE 'internal' - IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION isnlt(ean13, upc) - RETURNS boolean - AS 'int8lt' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnle(ean13, upc) - RETURNS boolean - AS 'int8le' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isneq(ean13, upc) - RETURNS boolean - AS 'int8eq' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnge(ean13, upc) - RETURNS boolean - AS 'int8ge' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isngt(ean13, upc) - RETURNS boolean - AS 'int8gt' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnne(ean13, upc) - RETURNS boolean - AS 'int8ne' - LANGUAGE 'internal' - IMMUTABLE STRICT; - ---------------------------------------------------- --- ISBN13: -CREATE OR REPLACE FUNCTION isnlt(isbn13, isbn13) - RETURNS boolean - AS 'int8lt' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnle(isbn13, isbn13) - RETURNS boolean - AS 'int8le' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isneq(isbn13, isbn13) - RETURNS boolean - AS 'int8eq' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnge(isbn13, isbn13) - RETURNS boolean - AS 'int8ge' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isngt(isbn13, isbn13) - RETURNS boolean - AS 'int8gt' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnne(isbn13, isbn13) - RETURNS boolean - AS 'int8ne' - LANGUAGE 'internal' - IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION isnlt(isbn13, isbn) - RETURNS boolean - AS 'int8lt' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnle(isbn13, isbn) - RETURNS boolean - AS 'int8le' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isneq(isbn13, isbn) - RETURNS boolean - AS 'int8eq' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnge(isbn13, isbn) - RETURNS boolean - AS 'int8ge' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isngt(isbn13, isbn) - RETURNS boolean - AS 'int8gt' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnne(isbn13, isbn) - RETURNS boolean - AS 'int8ne' - LANGUAGE 'internal' - IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION isnlt(isbn13, ean13) - RETURNS boolean - AS 'int8lt' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnle(isbn13, ean13) - RETURNS boolean - AS 'int8le' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isneq(isbn13, ean13) - RETURNS boolean - AS 'int8eq' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnge(isbn13, ean13) - RETURNS boolean - AS 'int8ge' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isngt(isbn13, ean13) - RETURNS boolean - AS 'int8gt' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnne(isbn13, ean13) - RETURNS boolean - AS 'int8ne' - LANGUAGE 'internal' - IMMUTABLE STRICT; - ---------------------------------------------------- --- ISBN: -CREATE OR REPLACE FUNCTION isnlt(isbn, isbn) - RETURNS boolean - AS 'int8lt' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnle(isbn, isbn) - RETURNS boolean - AS 'int8le' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isneq(isbn, isbn) - RETURNS boolean - AS 'int8eq' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnge(isbn, isbn) - RETURNS boolean - AS 'int8ge' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isngt(isbn, isbn) - RETURNS boolean - AS 'int8gt' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnne(isbn, isbn) - RETURNS boolean - AS 'int8ne' - LANGUAGE 'internal' - IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION isnlt(isbn, isbn13) - RETURNS boolean - AS 'int8lt' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnle(isbn, isbn13) - RETURNS boolean - AS 'int8le' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isneq(isbn, isbn13) - RETURNS boolean - AS 'int8eq' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnge(isbn, isbn13) - RETURNS boolean - AS 'int8ge' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isngt(isbn, isbn13) - RETURNS boolean - AS 'int8gt' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnne(isbn, isbn13) - RETURNS boolean - AS 'int8ne' - LANGUAGE 'internal' - IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION isnlt(isbn, ean13) - RETURNS boolean - AS 'int8lt' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnle(isbn, ean13) - RETURNS boolean - AS 'int8le' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isneq(isbn, ean13) - RETURNS boolean - AS 'int8eq' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnge(isbn, ean13) - RETURNS boolean - AS 'int8ge' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isngt(isbn, ean13) - RETURNS boolean - AS 'int8gt' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnne(isbn, ean13) - RETURNS boolean - AS 'int8ne' - LANGUAGE 'internal' - IMMUTABLE STRICT; - ---------------------------------------------------- --- ISMN13: -CREATE OR REPLACE FUNCTION isnlt(ismn13, ismn13) - RETURNS boolean - AS 'int8lt' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnle(ismn13, ismn13) - RETURNS boolean - AS 'int8le' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isneq(ismn13, ismn13) - RETURNS boolean - AS 'int8eq' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnge(ismn13, ismn13) - RETURNS boolean - AS 'int8ge' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isngt(ismn13, ismn13) - RETURNS boolean - AS 'int8gt' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnne(ismn13, ismn13) - RETURNS boolean - AS 'int8ne' - LANGUAGE 'internal' - IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION isnlt(ismn13, ismn) - RETURNS boolean - AS 'int8lt' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnle(ismn13, ismn) - RETURNS boolean - AS 'int8le' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isneq(ismn13, ismn) - RETURNS boolean - AS 'int8eq' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnge(ismn13, ismn) - RETURNS boolean - AS 'int8ge' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isngt(ismn13, ismn) - RETURNS boolean - AS 'int8gt' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnne(ismn13, ismn) - RETURNS boolean - AS 'int8ne' - LANGUAGE 'internal' - IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION isnlt(ismn13, ean13) - RETURNS boolean - AS 'int8lt' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnle(ismn13, ean13) - RETURNS boolean - AS 'int8le' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isneq(ismn13, ean13) - RETURNS boolean - AS 'int8eq' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnge(ismn13, ean13) - RETURNS boolean - AS 'int8ge' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isngt(ismn13, ean13) - RETURNS boolean - AS 'int8gt' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnne(ismn13, ean13) - RETURNS boolean - AS 'int8ne' - LANGUAGE 'internal' - IMMUTABLE STRICT; - ---------------------------------------------------- --- ISMN: -CREATE OR REPLACE FUNCTION isnlt(ismn, ismn) - RETURNS boolean - AS 'int8lt' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnle(ismn, ismn) - RETURNS boolean - AS 'int8le' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isneq(ismn, ismn) - RETURNS boolean - AS 'int8eq' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnge(ismn, ismn) - RETURNS boolean - AS 'int8ge' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isngt(ismn, ismn) - RETURNS boolean - AS 'int8gt' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnne(ismn, ismn) - RETURNS boolean - AS 'int8ne' - LANGUAGE 'internal' - IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION isnlt(ismn, ismn13) - RETURNS boolean - AS 'int8lt' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnle(ismn, ismn13) - RETURNS boolean - AS 'int8le' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isneq(ismn, ismn13) - RETURNS boolean - AS 'int8eq' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnge(ismn, ismn13) - RETURNS boolean - AS 'int8ge' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isngt(ismn, ismn13) - RETURNS boolean - AS 'int8gt' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnne(ismn, ismn13) - RETURNS boolean - AS 'int8ne' - LANGUAGE 'internal' - IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION isnlt(ismn, ean13) - RETURNS boolean - AS 'int8lt' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnle(ismn, ean13) - RETURNS boolean - AS 'int8le' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isneq(ismn, ean13) - RETURNS boolean - AS 'int8eq' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnge(ismn, ean13) - RETURNS boolean - AS 'int8ge' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isngt(ismn, ean13) - RETURNS boolean - AS 'int8gt' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnne(ismn, ean13) - RETURNS boolean - AS 'int8ne' - LANGUAGE 'internal' - IMMUTABLE STRICT; - ---------------------------------------------------- --- ISSN13: -CREATE OR REPLACE FUNCTION isnlt(issn13, issn13) - RETURNS boolean - AS 'int8lt' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnle(issn13, issn13) - RETURNS boolean - AS 'int8le' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isneq(issn13, issn13) - RETURNS boolean - AS 'int8eq' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnge(issn13, issn13) - RETURNS boolean - AS 'int8ge' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isngt(issn13, issn13) - RETURNS boolean - AS 'int8gt' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnne(issn13, issn13) - RETURNS boolean - AS 'int8ne' - LANGUAGE 'internal' - IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION isnlt(issn13, issn) - RETURNS boolean - AS 'int8lt' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnle(issn13, issn) - RETURNS boolean - AS 'int8le' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isneq(issn13, issn) - RETURNS boolean - AS 'int8eq' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnge(issn13, issn) - RETURNS boolean - AS 'int8ge' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isngt(issn13, issn) - RETURNS boolean - AS 'int8gt' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnne(issn13, issn) - RETURNS boolean - AS 'int8ne' - LANGUAGE 'internal' - IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION isnlt(issn13, ean13) - RETURNS boolean - AS 'int8lt' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnle(issn13, ean13) - RETURNS boolean - AS 'int8le' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isneq(issn13, ean13) - RETURNS boolean - AS 'int8eq' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnge(issn13, ean13) - RETURNS boolean - AS 'int8ge' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isngt(issn13, ean13) - RETURNS boolean - AS 'int8gt' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnne(issn13, ean13) - RETURNS boolean - AS 'int8ne' - LANGUAGE 'internal' - IMMUTABLE STRICT; - ---------------------------------------------------- --- ISSN: -CREATE OR REPLACE FUNCTION isnlt(issn, issn) - RETURNS boolean - AS 'int8lt' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnle(issn, issn) - RETURNS boolean - AS 'int8le' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isneq(issn, issn) - RETURNS boolean - AS 'int8eq' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnge(issn, issn) - RETURNS boolean - AS 'int8ge' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isngt(issn, issn) - RETURNS boolean - AS 'int8gt' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnne(issn, issn) - RETURNS boolean - AS 'int8ne' - LANGUAGE 'internal' - IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION isnlt(issn, issn13) - RETURNS boolean - AS 'int8lt' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnle(issn, issn13) - RETURNS boolean - AS 'int8le' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isneq(issn, issn13) - RETURNS boolean - AS 'int8eq' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnge(issn, issn13) - RETURNS boolean - AS 'int8ge' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isngt(issn, issn13) - RETURNS boolean - AS 'int8gt' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnne(issn, issn13) - RETURNS boolean - AS 'int8ne' - LANGUAGE 'internal' - IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION isnlt(issn, ean13) - RETURNS boolean - AS 'int8lt' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnle(issn, ean13) - RETURNS boolean - AS 'int8le' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isneq(issn, ean13) - RETURNS boolean - AS 'int8eq' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnge(issn, ean13) - RETURNS boolean - AS 'int8ge' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isngt(issn, ean13) - RETURNS boolean - AS 'int8gt' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnne(issn, ean13) - RETURNS boolean - AS 'int8ne' - LANGUAGE 'internal' - IMMUTABLE STRICT; - ---------------------------------------------------- --- UPC: -CREATE OR REPLACE FUNCTION isnlt(upc, upc) - RETURNS boolean - AS 'int8lt' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnle(upc, upc) - RETURNS boolean - AS 'int8le' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isneq(upc, upc) - RETURNS boolean - AS 'int8eq' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnge(upc, upc) - RETURNS boolean - AS 'int8ge' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isngt(upc, upc) - RETURNS boolean - AS 'int8gt' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnne(upc, upc) - RETURNS boolean - AS 'int8ne' - LANGUAGE 'internal' - IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION isnlt(upc, ean13) - RETURNS boolean - AS 'int8lt' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnle(upc, ean13) - RETURNS boolean - AS 'int8le' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isneq(upc, ean13) - RETURNS boolean - AS 'int8eq' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnge(upc, ean13) - RETURNS boolean - AS 'int8ge' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isngt(upc, ean13) - RETURNS boolean - AS 'int8gt' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnne(upc, ean13) - RETURNS boolean - AS 'int8ne' - LANGUAGE 'internal' - IMMUTABLE STRICT; - --- --- Now the operators: --- - --- --- EAN13 operators: --- ---------------------------------------------------- -CREATE OPERATOR < ( - PROCEDURE = isnlt, - LEFTARG = ean13, - RIGHTARG = ean13, - COMMUTATOR = >, - NEGATOR = >=, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); -CREATE OPERATOR <= ( - PROCEDURE = isnle, - LEFTARG = ean13, - RIGHTARG = ean13, - COMMUTATOR = >=, - NEGATOR = >, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); -CREATE OPERATOR = ( - PROCEDURE = isneq, - LEFTARG = ean13, - RIGHTARG = ean13, - COMMUTATOR = =, - NEGATOR = <>, - RESTRICT = eqsel, - JOIN = eqjoinsel, - MERGES, - HASHES); -CREATE OPERATOR >= ( - PROCEDURE = isnge, - LEFTARG = ean13, - RIGHTARG = ean13, - COMMUTATOR = <=, - NEGATOR = <, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel ); -CREATE OPERATOR > ( - PROCEDURE = isngt, - LEFTARG = ean13, - RIGHTARG = ean13, - COMMUTATOR = <, - NEGATOR = <=, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel ); -CREATE OPERATOR <> ( - PROCEDURE = isnne, - LEFTARG = ean13, - RIGHTARG = ean13, - COMMUTATOR = <>, - NEGATOR = =, - RESTRICT = neqsel, - JOIN = neqjoinsel); - -CREATE OPERATOR < ( - PROCEDURE = isnlt, - LEFTARG = ean13, - RIGHTARG = isbn13, - COMMUTATOR = >, - NEGATOR = >=, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); -CREATE OPERATOR <= ( - PROCEDURE = isnle, - LEFTARG = ean13, - RIGHTARG = isbn13, - COMMUTATOR = >=, - NEGATOR = >, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); -CREATE OPERATOR = ( - PROCEDURE = isneq, - LEFTARG = ean13, - RIGHTARG = isbn13, - COMMUTATOR = =, - NEGATOR = <>, - RESTRICT = eqsel, - JOIN = eqjoinsel, - MERGES, - HASHES); -CREATE OPERATOR >= ( - PROCEDURE = isnge, - LEFTARG = ean13, - RIGHTARG = isbn13, - COMMUTATOR = <=, - NEGATOR = <, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel ); -CREATE OPERATOR > ( - PROCEDURE = isngt, - LEFTARG = ean13, - RIGHTARG = isbn13, - COMMUTATOR = <, - NEGATOR = <=, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel ); -CREATE OPERATOR <> ( - PROCEDURE = isnne, - LEFTARG = ean13, - RIGHTARG = isbn13, - COMMUTATOR = <>, - NEGATOR = =, - RESTRICT = neqsel, - JOIN = neqjoinsel); - -CREATE OPERATOR < ( - PROCEDURE = isnlt, - LEFTARG = isbn13, - RIGHTARG = ean13, - COMMUTATOR = >, - NEGATOR = >=, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); -CREATE OPERATOR <= ( - PROCEDURE = isnle, - LEFTARG = isbn13, - RIGHTARG = ean13, - COMMUTATOR = >=, - NEGATOR = >, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); -CREATE OPERATOR = ( - PROCEDURE = isneq, - LEFTARG = isbn13, - RIGHTARG = ean13, - COMMUTATOR = =, - NEGATOR = <>, - RESTRICT = eqsel, - JOIN = eqjoinsel, - MERGES, - HASHES); -CREATE OPERATOR >= ( - PROCEDURE = isnge, - LEFTARG = isbn13, - RIGHTARG = ean13, - COMMUTATOR = <=, - NEGATOR = <, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel ); -CREATE OPERATOR > ( - PROCEDURE = isngt, - LEFTARG = isbn13, - RIGHTARG = ean13, - COMMUTATOR = <, - NEGATOR = <=, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel ); -CREATE OPERATOR <> ( - PROCEDURE = isnne, - LEFTARG = isbn13, - RIGHTARG = ean13, - COMMUTATOR = <>, - NEGATOR = =, - RESTRICT = neqsel, - JOIN = neqjoinsel); - -CREATE OPERATOR < ( - PROCEDURE = isnlt, - LEFTARG = ean13, - RIGHTARG = ismn13, - COMMUTATOR = >, - NEGATOR = >=, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); -CREATE OPERATOR <= ( - PROCEDURE = isnle, - LEFTARG = ean13, - RIGHTARG = ismn13, - COMMUTATOR = >=, - NEGATOR = >, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); -CREATE OPERATOR = ( - PROCEDURE = isneq, - LEFTARG = ean13, - RIGHTARG = ismn13, - COMMUTATOR = =, - NEGATOR = <>, - RESTRICT = eqsel, - JOIN = eqjoinsel, - MERGES, - HASHES); -CREATE OPERATOR >= ( - PROCEDURE = isnge, - LEFTARG = ean13, - RIGHTARG = ismn13, - COMMUTATOR = <=, - NEGATOR = <, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel); -CREATE OPERATOR > ( - PROCEDURE = isngt, - LEFTARG = ean13, - RIGHTARG = ismn13, - COMMUTATOR = <, - NEGATOR = <=, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel); -CREATE OPERATOR <> ( - PROCEDURE = isnne, - LEFTARG = ean13, - RIGHTARG = ismn13, - COMMUTATOR = <>, - NEGATOR = =, - RESTRICT = neqsel, - JOIN = neqjoinsel); - -CREATE OPERATOR < ( - PROCEDURE = isnlt, - LEFTARG = ismn13, - RIGHTARG = ean13, - COMMUTATOR = >, - NEGATOR = >=, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); -CREATE OPERATOR <= ( - PROCEDURE = isnle, - LEFTARG = ismn13, - RIGHTARG = ean13, - COMMUTATOR = >=, - NEGATOR = >, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); -CREATE OPERATOR = ( - PROCEDURE = isneq, - LEFTARG = ismn13, - RIGHTARG = ean13, - COMMUTATOR = =, - NEGATOR = <>, - RESTRICT = eqsel, - JOIN = eqjoinsel, - MERGES, - HASHES); -CREATE OPERATOR >= ( - PROCEDURE = isnge, - LEFTARG = ismn13, - RIGHTARG = ean13, - COMMUTATOR = <=, - NEGATOR = <, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel ); -CREATE OPERATOR > ( - PROCEDURE = isngt, - LEFTARG = ismn13, - RIGHTARG = ean13, - COMMUTATOR = <, - NEGATOR = <=, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel ); -CREATE OPERATOR <> ( - PROCEDURE = isnne, - LEFTARG = ismn13, - RIGHTARG = ean13, - COMMUTATOR = <>, - NEGATOR = =, - RESTRICT = neqsel, - JOIN = neqjoinsel); - -CREATE OPERATOR < ( - PROCEDURE = isnlt, - LEFTARG = ean13, - RIGHTARG = issn13, - COMMUTATOR = >, - NEGATOR = >=, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); -CREATE OPERATOR <= ( - PROCEDURE = isnle, - LEFTARG = ean13, - RIGHTARG = issn13, - COMMUTATOR = >=, - NEGATOR = >, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); -CREATE OPERATOR = ( - PROCEDURE = isneq, - LEFTARG = ean13, - RIGHTARG = issn13, - COMMUTATOR = =, - NEGATOR = <>, - RESTRICT = eqsel, - JOIN = eqjoinsel, - MERGES, - HASHES); -CREATE OPERATOR >= ( - PROCEDURE = isnge, - LEFTARG = ean13, - RIGHTARG = issn13, - COMMUTATOR = <=, - NEGATOR = <, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel); -CREATE OPERATOR > ( - PROCEDURE = isngt, - LEFTARG = ean13, - RIGHTARG = issn13, - COMMUTATOR = <, - NEGATOR = <=, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel); -CREATE OPERATOR <> ( - PROCEDURE = isnne, - LEFTARG = ean13, - RIGHTARG = issn13, - COMMUTATOR = <>, - NEGATOR = =, - RESTRICT = neqsel, - JOIN = neqjoinsel); - -CREATE OPERATOR < ( - PROCEDURE = isnlt, - LEFTARG = ean13, - RIGHTARG = isbn, - COMMUTATOR = >, - NEGATOR = >=, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); -CREATE OPERATOR <= ( - PROCEDURE = isnle, - LEFTARG = ean13, - RIGHTARG = isbn, - COMMUTATOR = >=, - NEGATOR = >, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); -CREATE OPERATOR = ( - PROCEDURE = isneq, - LEFTARG = ean13, - RIGHTARG = isbn, - COMMUTATOR = =, - NEGATOR = <>, - RESTRICT = eqsel, - JOIN = eqjoinsel, - MERGES, - HASHES); -CREATE OPERATOR >= ( - PROCEDURE = isnge, - LEFTARG = ean13, - RIGHTARG = isbn, - COMMUTATOR = <=, - NEGATOR = <, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel); -CREATE OPERATOR > ( - PROCEDURE = isngt, - LEFTARG = ean13, - RIGHTARG = isbn, - COMMUTATOR = <, - NEGATOR = <=, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel); -CREATE OPERATOR <> ( - PROCEDURE = isnne, - LEFTARG = ean13, - RIGHTARG = isbn, - COMMUTATOR = <>, - NEGATOR = =, - RESTRICT = neqsel, - JOIN = neqjoinsel); - -CREATE OPERATOR < ( - PROCEDURE = isnlt, - LEFTARG = ean13, - RIGHTARG = ismn, - COMMUTATOR = >, - NEGATOR = >=, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); -CREATE OPERATOR <= ( - PROCEDURE = isnle, - LEFTARG = ean13, - RIGHTARG = ismn, - COMMUTATOR = >=, - NEGATOR = >, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); -CREATE OPERATOR = ( - PROCEDURE = isneq, - LEFTARG = ean13, - RIGHTARG = ismn, - COMMUTATOR = =, - NEGATOR = <>, - RESTRICT = eqsel, - JOIN = eqjoinsel, - MERGES, - HASHES); -CREATE OPERATOR >= ( - PROCEDURE = isnge, - LEFTARG = ean13, - RIGHTARG = ismn, - COMMUTATOR = <=, - NEGATOR = <, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel); -CREATE OPERATOR > ( - PROCEDURE = isngt, - LEFTARG = ean13, - RIGHTARG = ismn, - COMMUTATOR = <, - NEGATOR = <=, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel); -CREATE OPERATOR <> ( - PROCEDURE = isnne, - LEFTARG = ean13, - RIGHTARG = ismn, - COMMUTATOR = <>, - NEGATOR = =, - RESTRICT = neqsel, - JOIN = neqjoinsel); - -CREATE OPERATOR < ( - PROCEDURE = isnlt, - LEFTARG = ean13, - RIGHTARG = issn, - COMMUTATOR = >, - NEGATOR = >=, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); -CREATE OPERATOR <= ( - PROCEDURE = isnle, - LEFTARG = ean13, - RIGHTARG = issn, - COMMUTATOR = >=, - NEGATOR = >, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); -CREATE OPERATOR = ( - PROCEDURE = isneq, - LEFTARG = ean13, - RIGHTARG = issn, - COMMUTATOR = =, - NEGATOR = <>, - RESTRICT = eqsel, - JOIN = eqjoinsel, - MERGES, - HASHES); -CREATE OPERATOR >= ( - PROCEDURE = isnge, - LEFTARG = ean13, - RIGHTARG = issn, - COMMUTATOR = <=, - NEGATOR = <, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel); -CREATE OPERATOR > ( - PROCEDURE = isngt, - LEFTARG = ean13, - RIGHTARG = issn, - COMMUTATOR = <, - NEGATOR = <=, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel); -CREATE OPERATOR <> ( - PROCEDURE = isnne, - LEFTARG = ean13, - RIGHTARG = issn, - COMMUTATOR = <>, - NEGATOR = =, - RESTRICT = neqsel, - JOIN = neqjoinsel); - -CREATE OPERATOR < ( - PROCEDURE = isnlt, - LEFTARG = ean13, - RIGHTARG = upc, - COMMUTATOR = >, - NEGATOR = >=, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); -CREATE OPERATOR <= ( - PROCEDURE = isnle, - LEFTARG = ean13, - RIGHTARG = upc, - COMMUTATOR = >=, - NEGATOR = >, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); -CREATE OPERATOR = ( - PROCEDURE = isneq, - LEFTARG = ean13, - RIGHTARG = upc, - COMMUTATOR = =, - NEGATOR = <>, - RESTRICT = eqsel, - JOIN = eqjoinsel, - MERGES, - HASHES); -CREATE OPERATOR >= ( - PROCEDURE = isnge, - LEFTARG = ean13, - RIGHTARG = upc, - COMMUTATOR = <=, - NEGATOR = <, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel); -CREATE OPERATOR > ( - PROCEDURE = isngt, - LEFTARG = ean13, - RIGHTARG = upc, - COMMUTATOR = <, - NEGATOR = <=, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel); -CREATE OPERATOR <> ( - PROCEDURE = isnne, - LEFTARG = ean13, - RIGHTARG = upc, - COMMUTATOR = <>, - NEGATOR = =, - RESTRICT = neqsel, - JOIN = neqjoinsel); - --- --- ISBN13 operators: --- ---------------------------------------------------- -CREATE OPERATOR < ( - PROCEDURE = isnlt, - LEFTARG = isbn13, - RIGHTARG = isbn13, - COMMUTATOR = >, - NEGATOR = >=, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); -CREATE OPERATOR <= ( - PROCEDURE = isnle, - LEFTARG = isbn13, - RIGHTARG = isbn13, - COMMUTATOR = >=, - NEGATOR = >, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); -CREATE OPERATOR = ( - PROCEDURE = isneq, - LEFTARG = isbn13, - RIGHTARG = isbn13, - COMMUTATOR = =, - NEGATOR = <>, - RESTRICT = eqsel, - JOIN = eqjoinsel, - MERGES, - HASHES); -CREATE OPERATOR >= ( - PROCEDURE = isnge, - LEFTARG = isbn13, - RIGHTARG = isbn13, - COMMUTATOR = <=, - NEGATOR = <, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel ); -CREATE OPERATOR > ( - PROCEDURE = isngt, - LEFTARG = isbn13, - RIGHTARG = isbn13, - COMMUTATOR = <, - NEGATOR = <=, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel ); -CREATE OPERATOR <> ( - PROCEDURE = isnne, - LEFTARG = isbn13, - RIGHTARG = isbn13, - COMMUTATOR = <>, - NEGATOR = =, - RESTRICT = neqsel, - JOIN = neqjoinsel); - -CREATE OPERATOR < ( - PROCEDURE = isnlt, - LEFTARG = isbn13, - RIGHTARG = isbn, - COMMUTATOR = >, - NEGATOR = >=, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); -CREATE OPERATOR <= ( - PROCEDURE = isnle, - LEFTARG = isbn13, - RIGHTARG = isbn, - COMMUTATOR = >=, - NEGATOR = >, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); -CREATE OPERATOR = ( - PROCEDURE = isneq, - LEFTARG = isbn13, - RIGHTARG = isbn, - COMMUTATOR = =, - NEGATOR = <>, - RESTRICT = eqsel, - JOIN = eqjoinsel, - MERGES, - HASHES); -CREATE OPERATOR >= ( - PROCEDURE = isnge, - LEFTARG = isbn13, - RIGHTARG = isbn, - COMMUTATOR = <=, - NEGATOR = <, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel ); -CREATE OPERATOR > ( - PROCEDURE = isngt, - LEFTARG = isbn13, - RIGHTARG = isbn, - COMMUTATOR = <, - NEGATOR = <=, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel ); -CREATE OPERATOR <> ( - PROCEDURE = isnne, - LEFTARG = isbn13, - RIGHTARG = isbn, - COMMUTATOR = <>, - NEGATOR = =, - RESTRICT = neqsel, - JOIN = neqjoinsel); - --- --- ISBN operators: --- ---------------------------------------------------- -CREATE OPERATOR < ( - PROCEDURE = isnlt, - LEFTARG = isbn, - RIGHTARG = isbn, - COMMUTATOR = >, - NEGATOR = >=, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); -CREATE OPERATOR <= ( - PROCEDURE = isnle, - LEFTARG = isbn, - RIGHTARG = isbn, - COMMUTATOR = >=, - NEGATOR = >, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); -CREATE OPERATOR = ( - PROCEDURE = isneq, - LEFTARG = isbn, - RIGHTARG = isbn, - COMMUTATOR = =, - NEGATOR = <>, - RESTRICT = eqsel, - JOIN = eqjoinsel, - MERGES, - HASHES); -CREATE OPERATOR >= ( - PROCEDURE = isnge, - LEFTARG = isbn, - RIGHTARG = isbn, - COMMUTATOR = <=, - NEGATOR = <, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel ); -CREATE OPERATOR > ( - PROCEDURE = isngt, - LEFTARG = isbn, - RIGHTARG = isbn, - COMMUTATOR = <, - NEGATOR = <=, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel ); -CREATE OPERATOR <> ( - PROCEDURE = isnne, - LEFTARG = isbn, - RIGHTARG = isbn, - COMMUTATOR = <>, - NEGATOR = =, - RESTRICT = neqsel, - JOIN = neqjoinsel); - -CREATE OPERATOR < ( - PROCEDURE = isnlt, - LEFTARG = isbn, - RIGHTARG = isbn13, - COMMUTATOR = >, - NEGATOR = >=, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); -CREATE OPERATOR <= ( - PROCEDURE = isnle, - LEFTARG = isbn, - RIGHTARG = isbn13, - COMMUTATOR = >=, - NEGATOR = >, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); -CREATE OPERATOR = ( - PROCEDURE = isneq, - LEFTARG = isbn, - RIGHTARG = isbn13, - COMMUTATOR = =, - NEGATOR = <>, - RESTRICT = eqsel, - JOIN = eqjoinsel, - MERGES, - HASHES); -CREATE OPERATOR >= ( - PROCEDURE = isnge, - LEFTARG = isbn, - RIGHTARG = isbn13, - COMMUTATOR = <=, - NEGATOR = <, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel ); -CREATE OPERATOR > ( - PROCEDURE = isngt, - LEFTARG = isbn, - RIGHTARG = isbn13, - COMMUTATOR = <, - NEGATOR = <=, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel ); -CREATE OPERATOR <> ( - PROCEDURE = isnne, - LEFTARG = isbn, - RIGHTARG = isbn13, - COMMUTATOR = <>, - NEGATOR = =, - RESTRICT = neqsel, - JOIN = neqjoinsel); - -CREATE OPERATOR < ( - PROCEDURE = isnlt, - LEFTARG = isbn, - RIGHTARG = ean13, - COMMUTATOR = >, - NEGATOR = >=, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); -CREATE OPERATOR <= ( - PROCEDURE = isnle, - LEFTARG = isbn, - RIGHTARG = ean13, - COMMUTATOR = >=, - NEGATOR = >, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); -CREATE OPERATOR = ( - PROCEDURE = isneq, - LEFTARG = isbn, - RIGHTARG = ean13, - COMMUTATOR = =, - NEGATOR = <>, - RESTRICT = eqsel, - JOIN = eqjoinsel, - MERGES, - HASHES); -CREATE OPERATOR >= ( - PROCEDURE = isnge, - LEFTARG = isbn, - RIGHTARG = ean13, - COMMUTATOR = <=, - NEGATOR = <, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel ); -CREATE OPERATOR > ( - PROCEDURE = isngt, - LEFTARG = isbn, - RIGHTARG = ean13, - COMMUTATOR = <, - NEGATOR = <=, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel ); -CREATE OPERATOR <> ( - PROCEDURE = isnne, - LEFTARG = isbn, - RIGHTARG = ean13, - COMMUTATOR = <>, - NEGATOR = =, - RESTRICT = neqsel, - JOIN = neqjoinsel); - --- --- ISMN13 operators: --- ---------------------------------------------------- -CREATE OPERATOR < ( - PROCEDURE = isnlt, - LEFTARG = ismn13, - RIGHTARG = ismn13, - COMMUTATOR = >, - NEGATOR = >=, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); -CREATE OPERATOR <= ( - PROCEDURE = isnle, - LEFTARG = ismn13, - RIGHTARG = ismn13, - COMMUTATOR = >=, - NEGATOR = >, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); -CREATE OPERATOR = ( - PROCEDURE = isneq, - LEFTARG = ismn13, - RIGHTARG = ismn13, - COMMUTATOR = =, - NEGATOR = <>, - RESTRICT = eqsel, - JOIN = eqjoinsel, - MERGES, - HASHES); -CREATE OPERATOR >= ( - PROCEDURE = isnge, - LEFTARG = ismn13, - RIGHTARG = ismn13, - COMMUTATOR = <=, - NEGATOR = <, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel ); -CREATE OPERATOR > ( - PROCEDURE = isngt, - LEFTARG = ismn13, - RIGHTARG = ismn13, - COMMUTATOR = <, - NEGATOR = <=, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel ); -CREATE OPERATOR <> ( - PROCEDURE = isnne, - LEFTARG = ismn13, - RIGHTARG = ismn13, - COMMUTATOR = <>, - NEGATOR = =, - RESTRICT = neqsel, - JOIN = neqjoinsel); - -CREATE OPERATOR < ( - PROCEDURE = isnlt, - LEFTARG = ismn13, - RIGHTARG = ismn, - COMMUTATOR = >, - NEGATOR = >=, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); -CREATE OPERATOR <= ( - PROCEDURE = isnle, - LEFTARG = ismn13, - RIGHTARG = ismn, - COMMUTATOR = >=, - NEGATOR = >, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); -CREATE OPERATOR = ( - PROCEDURE = isneq, - LEFTARG = ismn13, - RIGHTARG = ismn, - COMMUTATOR = =, - NEGATOR = <>, - RESTRICT = eqsel, - JOIN = eqjoinsel, - MERGES, - HASHES); -CREATE OPERATOR >= ( - PROCEDURE = isnge, - LEFTARG = ismn13, - RIGHTARG = ismn, - COMMUTATOR = <=, - NEGATOR = <, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel ); -CREATE OPERATOR > ( - PROCEDURE = isngt, - LEFTARG = ismn13, - RIGHTARG = ismn, - COMMUTATOR = <, - NEGATOR = <=, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel ); -CREATE OPERATOR <> ( - PROCEDURE = isnne, - LEFTARG = ismn13, - RIGHTARG = ismn, - COMMUTATOR = <>, - NEGATOR = =, - RESTRICT = neqsel, - JOIN = neqjoinsel); - --- --- ISMN operators: --- ---------------------------------------------------- -CREATE OPERATOR < ( - PROCEDURE = isnlt, - LEFTARG = ismn, - RIGHTARG = ismn, - COMMUTATOR = >, - NEGATOR = >=, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); -CREATE OPERATOR <= ( - PROCEDURE = isnle, - LEFTARG = ismn, - RIGHTARG = ismn, - COMMUTATOR = >=, - NEGATOR = >, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); -CREATE OPERATOR = ( - PROCEDURE = isneq, - LEFTARG = ismn, - RIGHTARG = ismn, - COMMUTATOR = =, - NEGATOR = <>, - RESTRICT = eqsel, - JOIN = eqjoinsel, - MERGES, - HASHES); -CREATE OPERATOR >= ( - PROCEDURE = isnge, - LEFTARG = ismn, - RIGHTARG = ismn, - COMMUTATOR = <=, - NEGATOR = <, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel ); -CREATE OPERATOR > ( - PROCEDURE = isngt, - LEFTARG = ismn, - RIGHTARG = ismn, - COMMUTATOR = <, - NEGATOR = <=, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel ); -CREATE OPERATOR <> ( - PROCEDURE = isnne, - LEFTARG = ismn, - RIGHTARG = ismn, - COMMUTATOR = <>, - NEGATOR = =, - RESTRICT = neqsel, - JOIN = neqjoinsel); - -CREATE OPERATOR < ( - PROCEDURE = isnlt, - LEFTARG = ismn, - RIGHTARG = ismn13, - COMMUTATOR = >, - NEGATOR = >=, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); -CREATE OPERATOR <= ( - PROCEDURE = isnle, - LEFTARG = ismn, - RIGHTARG = ismn13, - COMMUTATOR = >=, - NEGATOR = >, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); -CREATE OPERATOR = ( - PROCEDURE = isneq, - LEFTARG = ismn, - RIGHTARG = ismn13, - COMMUTATOR = =, - NEGATOR = <>, - RESTRICT = eqsel, - JOIN = eqjoinsel, - MERGES, - HASHES); -CREATE OPERATOR >= ( - PROCEDURE = isnge, - LEFTARG = ismn, - RIGHTARG = ismn13, - COMMUTATOR = <=, - NEGATOR = <, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel ); -CREATE OPERATOR > ( - PROCEDURE = isngt, - LEFTARG = ismn, - RIGHTARG = ismn13, - COMMUTATOR = <, - NEGATOR = <=, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel ); -CREATE OPERATOR <> ( - PROCEDURE = isnne, - LEFTARG = ismn, - RIGHTARG = ismn13, - COMMUTATOR = <>, - NEGATOR = =, - RESTRICT = neqsel, - JOIN = neqjoinsel); - -CREATE OPERATOR < ( - PROCEDURE = isnlt, - LEFTARG = ismn, - RIGHTARG = ean13, - COMMUTATOR = >, - NEGATOR = >=, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); -CREATE OPERATOR <= ( - PROCEDURE = isnle, - LEFTARG = ismn, - RIGHTARG = ean13, - COMMUTATOR = >=, - NEGATOR = >, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); -CREATE OPERATOR = ( - PROCEDURE = isneq, - LEFTARG = ismn, - RIGHTARG = ean13, - COMMUTATOR = =, - NEGATOR = <>, - RESTRICT = eqsel, - JOIN = eqjoinsel, - MERGES, - HASHES); -CREATE OPERATOR >= ( - PROCEDURE = isnge, - LEFTARG = ismn, - RIGHTARG = ean13, - COMMUTATOR = <=, - NEGATOR = <, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel ); -CREATE OPERATOR > ( - PROCEDURE = isngt, - LEFTARG = ismn, - RIGHTARG = ean13, - COMMUTATOR = <, - NEGATOR = <=, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel ); -CREATE OPERATOR <> ( - PROCEDURE = isnne, - LEFTARG = ismn, - RIGHTARG = ean13, - COMMUTATOR = <>, - NEGATOR = =, - RESTRICT = neqsel, - JOIN = neqjoinsel); - --- --- ISSN13 operators: --- ---------------------------------------------------- -CREATE OPERATOR < ( - PROCEDURE = isnlt, - LEFTARG = issn13, - RIGHTARG = issn13, - COMMUTATOR = >, - NEGATOR = >=, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); -CREATE OPERATOR <= ( - PROCEDURE = isnle, - LEFTARG = issn13, - RIGHTARG = issn13, - COMMUTATOR = >=, - NEGATOR = >, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); -CREATE OPERATOR = ( - PROCEDURE = isneq, - LEFTARG = issn13, - RIGHTARG = issn13, - COMMUTATOR = =, - NEGATOR = <>, - RESTRICT = eqsel, - JOIN = eqjoinsel, - MERGES, - HASHES); -CREATE OPERATOR >= ( - PROCEDURE = isnge, - LEFTARG = issn13, - RIGHTARG = issn13, - COMMUTATOR = <=, - NEGATOR = <, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel ); -CREATE OPERATOR > ( - PROCEDURE = isngt, - LEFTARG = issn13, - RIGHTARG = issn13, - COMMUTATOR = <, - NEGATOR = <=, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel ); -CREATE OPERATOR <> ( - PROCEDURE = isnne, - LEFTARG = issn13, - RIGHTARG = issn13, - COMMUTATOR = <>, - NEGATOR = =, - RESTRICT = neqsel, - JOIN = neqjoinsel); - -CREATE OPERATOR < ( - PROCEDURE = isnlt, - LEFTARG = issn13, - RIGHTARG = issn, - COMMUTATOR = >, - NEGATOR = >=, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); -CREATE OPERATOR <= ( - PROCEDURE = isnle, - LEFTARG = issn13, - RIGHTARG = issn, - COMMUTATOR = >=, - NEGATOR = >, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); -CREATE OPERATOR = ( - PROCEDURE = isneq, - LEFTARG = issn13, - RIGHTARG = issn, - COMMUTATOR = =, - NEGATOR = <>, - RESTRICT = eqsel, - JOIN = eqjoinsel, - MERGES, - HASHES); -CREATE OPERATOR >= ( - PROCEDURE = isnge, - LEFTARG = issn13, - RIGHTARG = issn, - COMMUTATOR = <=, - NEGATOR = <, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel ); -CREATE OPERATOR > ( - PROCEDURE = isngt, - LEFTARG = issn13, - RIGHTARG = issn, - COMMUTATOR = <, - NEGATOR = <=, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel ); -CREATE OPERATOR <> ( - PROCEDURE = isnne, - LEFTARG = issn13, - RIGHTARG = issn, - COMMUTATOR = <>, - NEGATOR = =, - RESTRICT = neqsel, - JOIN = neqjoinsel); - -CREATE OPERATOR < ( - PROCEDURE = isnlt, - LEFTARG = issn13, - RIGHTARG = ean13, - COMMUTATOR = >, - NEGATOR = >=, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); -CREATE OPERATOR <= ( - PROCEDURE = isnle, - LEFTARG = issn13, - RIGHTARG = ean13, - COMMUTATOR = >=, - NEGATOR = >, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); -CREATE OPERATOR = ( - PROCEDURE = isneq, - LEFTARG = issn13, - RIGHTARG = ean13, - COMMUTATOR = =, - NEGATOR = <>, - RESTRICT = eqsel, - JOIN = eqjoinsel, - MERGES, - HASHES); -CREATE OPERATOR >= ( - PROCEDURE = isnge, - LEFTARG = issn13, - RIGHTARG = ean13, - COMMUTATOR = <=, - NEGATOR = <, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel ); -CREATE OPERATOR > ( - PROCEDURE = isngt, - LEFTARG = issn13, - RIGHTARG = ean13, - COMMUTATOR = <, - NEGATOR = <=, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel ); -CREATE OPERATOR <> ( - PROCEDURE = isnne, - LEFTARG = issn13, - RIGHTARG = ean13, - COMMUTATOR = <>, - NEGATOR = =, - RESTRICT = neqsel, - JOIN = neqjoinsel); - --- --- ISSN operators: --- ---------------------------------------------------- -CREATE OPERATOR < ( - PROCEDURE = isnlt, - LEFTARG = issn, - RIGHTARG = issn, - COMMUTATOR = >, - NEGATOR = >=, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); -CREATE OPERATOR <= ( - PROCEDURE = isnle, - LEFTARG = issn, - RIGHTARG = issn, - COMMUTATOR = >=, - NEGATOR = >, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); -CREATE OPERATOR = ( - PROCEDURE = isneq, - LEFTARG = issn, - RIGHTARG = issn, - COMMUTATOR = =, - NEGATOR = <>, - RESTRICT = eqsel, - JOIN = eqjoinsel, - MERGES, - HASHES); -CREATE OPERATOR >= ( - PROCEDURE = isnge, - LEFTARG = issn, - RIGHTARG = issn, - COMMUTATOR = <=, - NEGATOR = <, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel ); -CREATE OPERATOR > ( - PROCEDURE = isngt, - LEFTARG = issn, - RIGHTARG = issn, - COMMUTATOR = <, - NEGATOR = <=, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel ); -CREATE OPERATOR <> ( - PROCEDURE = isnne, - LEFTARG = issn, - RIGHTARG = issn, - COMMUTATOR = <>, - NEGATOR = =, - RESTRICT = neqsel, - JOIN = neqjoinsel); - -CREATE OPERATOR < ( - PROCEDURE = isnlt, - LEFTARG = issn, - RIGHTARG = issn13, - COMMUTATOR = >, - NEGATOR = >=, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); -CREATE OPERATOR <= ( - PROCEDURE = isnle, - LEFTARG = issn, - RIGHTARG = issn13, - COMMUTATOR = >=, - NEGATOR = >, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); -CREATE OPERATOR = ( - PROCEDURE = isneq, - LEFTARG = issn, - RIGHTARG = issn13, - COMMUTATOR = =, - NEGATOR = <>, - RESTRICT = eqsel, - JOIN = eqjoinsel, - MERGES, - HASHES); -CREATE OPERATOR >= ( - PROCEDURE = isnge, - LEFTARG = issn, - RIGHTARG = issn13, - COMMUTATOR = <=, - NEGATOR = <, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel ); -CREATE OPERATOR > ( - PROCEDURE = isngt, - LEFTARG = issn, - RIGHTARG = issn13, - COMMUTATOR = <, - NEGATOR = <=, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel ); -CREATE OPERATOR <> ( - PROCEDURE = isnne, - LEFTARG = issn, - RIGHTARG = issn13, - COMMUTATOR = <>, - NEGATOR = =, - RESTRICT = neqsel, - JOIN = neqjoinsel); - -CREATE OPERATOR < ( - PROCEDURE = isnlt, - LEFTARG = issn, - RIGHTARG = ean13, - COMMUTATOR = >, - NEGATOR = >=, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); -CREATE OPERATOR <= ( - PROCEDURE = isnle, - LEFTARG = issn, - RIGHTARG = ean13, - COMMUTATOR = >=, - NEGATOR = >, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); -CREATE OPERATOR = ( - PROCEDURE = isneq, - LEFTARG = issn, - RIGHTARG = ean13, - COMMUTATOR = =, - NEGATOR = <>, - RESTRICT = eqsel, - JOIN = eqjoinsel, - MERGES, - HASHES); -CREATE OPERATOR >= ( - PROCEDURE = isnge, - LEFTARG = issn, - RIGHTARG = ean13, - COMMUTATOR = <=, - NEGATOR = <, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel ); -CREATE OPERATOR > ( - PROCEDURE = isngt, - LEFTARG = issn, - RIGHTARG = ean13, - COMMUTATOR = <, - NEGATOR = <=, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel ); -CREATE OPERATOR <> ( - PROCEDURE = isnne, - LEFTARG = issn, - RIGHTARG = ean13, - COMMUTATOR = <>, - NEGATOR = =, - RESTRICT = neqsel, - JOIN = neqjoinsel); - --- --- UPC operators: --- ---------------------------------------------------- -CREATE OPERATOR < ( - PROCEDURE = isnlt, - LEFTARG = upc, - RIGHTARG = upc, - COMMUTATOR = >, - NEGATOR = >=, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); -CREATE OPERATOR <= ( - PROCEDURE = isnle, - LEFTARG = upc, - RIGHTARG = upc, - COMMUTATOR = >=, - NEGATOR = >, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); -CREATE OPERATOR = ( - PROCEDURE = isneq, - LEFTARG = upc, - RIGHTARG = upc, - COMMUTATOR = =, - NEGATOR = <>, - RESTRICT = eqsel, - JOIN = eqjoinsel, - MERGES, - HASHES); -CREATE OPERATOR >= ( - PROCEDURE = isnge, - LEFTARG = upc, - RIGHTARG = upc, - COMMUTATOR = <=, - NEGATOR = <, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel ); -CREATE OPERATOR > ( - PROCEDURE = isngt, - LEFTARG = upc, - RIGHTARG = upc, - COMMUTATOR = <, - NEGATOR = <=, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel ); -CREATE OPERATOR <> ( - PROCEDURE = isnne, - LEFTARG = upc, - RIGHTARG = upc, - COMMUTATOR = <>, - NEGATOR = =, - RESTRICT = neqsel, - JOIN = neqjoinsel); - -CREATE OPERATOR < ( - PROCEDURE = isnlt, - LEFTARG = upc, - RIGHTARG = ean13, - COMMUTATOR = >, - NEGATOR = >=, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); -CREATE OPERATOR <= ( - PROCEDURE = isnle, - LEFTARG = upc, - RIGHTARG = ean13, - COMMUTATOR = >=, - NEGATOR = >, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); -CREATE OPERATOR = ( - PROCEDURE = isneq, - LEFTARG = upc, - RIGHTARG = ean13, - COMMUTATOR = =, - NEGATOR = <>, - RESTRICT = eqsel, - JOIN = eqjoinsel, - MERGES, - HASHES); -CREATE OPERATOR >= ( - PROCEDURE = isnge, - LEFTARG = upc, - RIGHTARG = ean13, - COMMUTATOR = <=, - NEGATOR = <, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel ); -CREATE OPERATOR > ( - PROCEDURE = isngt, - LEFTARG = upc, - RIGHTARG = ean13, - COMMUTATOR = <, - NEGATOR = <=, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel ); -CREATE OPERATOR <> ( - PROCEDURE = isnne, - LEFTARG = upc, - RIGHTARG = ean13, - COMMUTATOR = <>, - NEGATOR = =, - RESTRICT = neqsel, - JOIN = neqjoinsel); - --- --- Operator families for the various operator classes: --- ---------------------------------------------------- - -CREATE OPERATOR FAMILY isn_ops USING btree; -CREATE OPERATOR FAMILY isn_ops USING hash; - --- --- Operator classes: --- ---------------------------------------------------- --- EAN13: -CREATE OR REPLACE FUNCTION btean13cmp(ean13, ean13) - RETURNS int4 - AS 'btint8cmp' - LANGUAGE 'internal' - IMMUTABLE STRICT; - -CREATE OPERATOR CLASS ean13_ops DEFAULT - FOR TYPE ean13 USING btree FAMILY isn_ops AS - OPERATOR 1 <, - OPERATOR 2 <=, - OPERATOR 3 =, - OPERATOR 4 >=, - OPERATOR 5 >, - FUNCTION 1 btean13cmp(ean13, ean13); - -CREATE OR REPLACE FUNCTION hashean13(ean13) - RETURNS int4 - AS 'hashint8' - LANGUAGE 'internal' IMMUTABLE STRICT; - -CREATE OPERATOR CLASS ean13_ops DEFAULT - FOR TYPE ean13 USING hash FAMILY isn_ops AS - OPERATOR 1 =, - FUNCTION 1 hashean13(ean13); - --- EAN13 vs other types: -CREATE OR REPLACE FUNCTION btean13cmp(ean13, isbn13) - RETURNS int4 - AS 'btint8cmp' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION btean13cmp(ean13, ismn13) - RETURNS int4 - AS 'btint8cmp' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION btean13cmp(ean13, issn13) - RETURNS int4 - AS 'btint8cmp' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION btean13cmp(ean13, isbn) - RETURNS int4 - AS 'btint8cmp' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION btean13cmp(ean13, ismn) - RETURNS int4 - AS 'btint8cmp' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION btean13cmp(ean13, issn) - RETURNS int4 - AS 'btint8cmp' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION btean13cmp(ean13, upc) - RETURNS int4 - AS 'btint8cmp' - LANGUAGE 'internal' - IMMUTABLE STRICT; - -ALTER OPERATOR FAMILY isn_ops USING btree ADD - OPERATOR 1 < (ean13, isbn13), - OPERATOR 1 < (ean13, ismn13), - OPERATOR 1 < (ean13, issn13), - OPERATOR 1 < (ean13, isbn), - OPERATOR 1 < (ean13, ismn), - OPERATOR 1 < (ean13, issn), - OPERATOR 1 < (ean13, upc), - OPERATOR 2 <= (ean13, isbn13), - OPERATOR 2 <= (ean13, ismn13), - OPERATOR 2 <= (ean13, issn13), - OPERATOR 2 <= (ean13, isbn), - OPERATOR 2 <= (ean13, ismn), - OPERATOR 2 <= (ean13, issn), - OPERATOR 2 <= (ean13, upc), - OPERATOR 3 = (ean13, isbn13), - OPERATOR 3 = (ean13, ismn13), - OPERATOR 3 = (ean13, issn13), - OPERATOR 3 = (ean13, isbn), - OPERATOR 3 = (ean13, ismn), - OPERATOR 3 = (ean13, issn), - OPERATOR 3 = (ean13, upc), - OPERATOR 4 >= (ean13, isbn13), - OPERATOR 4 >= (ean13, ismn13), - OPERATOR 4 >= (ean13, issn13), - OPERATOR 4 >= (ean13, isbn), - OPERATOR 4 >= (ean13, ismn), - OPERATOR 4 >= (ean13, issn), - OPERATOR 4 >= (ean13, upc), - OPERATOR 5 > (ean13, isbn13), - OPERATOR 5 > (ean13, ismn13), - OPERATOR 5 > (ean13, issn13), - OPERATOR 5 > (ean13, isbn), - OPERATOR 5 > (ean13, ismn), - OPERATOR 5 > (ean13, issn), - OPERATOR 5 > (ean13, upc), - FUNCTION 1 btean13cmp(ean13, isbn13), - FUNCTION 1 btean13cmp(ean13, ismn13), - FUNCTION 1 btean13cmp(ean13, issn13), - FUNCTION 1 btean13cmp(ean13, isbn), - FUNCTION 1 btean13cmp(ean13, ismn), - FUNCTION 1 btean13cmp(ean13, issn), - FUNCTION 1 btean13cmp(ean13, upc); - -ALTER OPERATOR FAMILY isn_ops USING hash ADD - OPERATOR 1 = (ean13, isbn13), - OPERATOR 1 = (ean13, ismn13), - OPERATOR 1 = (ean13, issn13), - OPERATOR 1 = (ean13, isbn), - OPERATOR 1 = (ean13, ismn), - OPERATOR 1 = (ean13, issn), - OPERATOR 1 = (ean13, upc); - ---------------------------------------------------- --- ISBN13: -CREATE OR REPLACE FUNCTION btisbn13cmp(isbn13, isbn13) - RETURNS int4 - AS 'btint8cmp' - LANGUAGE 'internal' - IMMUTABLE STRICT; - -CREATE OPERATOR CLASS isbn13_ops DEFAULT - FOR TYPE isbn13 USING btree FAMILY isn_ops AS - OPERATOR 1 <, - OPERATOR 2 <=, - OPERATOR 3 =, - OPERATOR 4 >=, - OPERATOR 5 >, - FUNCTION 1 btisbn13cmp(isbn13, isbn13); - -CREATE OR REPLACE FUNCTION hashisbn13(isbn13) - RETURNS int4 - AS 'hashint8' - LANGUAGE 'internal' - IMMUTABLE STRICT; - -CREATE OPERATOR CLASS isbn13_ops DEFAULT - FOR TYPE isbn13 USING hash FAMILY isn_ops AS - OPERATOR 1 =, - FUNCTION 1 hashisbn13(isbn13); - --- ISBN13 vs other types: -CREATE OR REPLACE FUNCTION btisbn13cmp(isbn13, ean13) - RETURNS int4 - AS 'btint8cmp' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION btisbn13cmp(isbn13, isbn) - RETURNS int4 - AS 'btint8cmp' - LANGUAGE 'internal' - IMMUTABLE STRICT; - -ALTER OPERATOR FAMILY isn_ops USING btree ADD - OPERATOR 1 < (isbn13, ean13), - OPERATOR 1 < (isbn13, isbn), - OPERATOR 2 <= (isbn13, ean13), - OPERATOR 2 <= (isbn13, isbn), - OPERATOR 3 = (isbn13, ean13), - OPERATOR 3 = (isbn13, isbn), - OPERATOR 4 >= (isbn13, ean13), - OPERATOR 4 >= (isbn13, isbn), - OPERATOR 5 > (isbn13, ean13), - OPERATOR 5 > (isbn13, isbn), - FUNCTION 1 btisbn13cmp(isbn13, ean13), - FUNCTION 1 btisbn13cmp(isbn13, isbn); - -ALTER OPERATOR FAMILY isn_ops USING hash ADD - OPERATOR 1 = (isbn13, ean13), - OPERATOR 1 = (isbn13, isbn); - ---------------------------------------------------- --- ISBN: -CREATE OR REPLACE FUNCTION btisbncmp(isbn, isbn) - RETURNS int4 - AS 'btint8cmp' - LANGUAGE 'internal' - IMMUTABLE STRICT; - -CREATE OPERATOR CLASS isbn_ops DEFAULT - FOR TYPE isbn USING btree FAMILY isn_ops AS - OPERATOR 1 <, - OPERATOR 2 <=, - OPERATOR 3 =, - OPERATOR 4 >=, - OPERATOR 5 >, - FUNCTION 1 btisbncmp(isbn, isbn); - -CREATE OR REPLACE FUNCTION hashisbn(isbn) - RETURNS int4 - AS 'hashint8' - LANGUAGE 'internal' - IMMUTABLE STRICT; - -CREATE OPERATOR CLASS isbn_ops DEFAULT - FOR TYPE isbn USING hash FAMILY isn_ops AS - OPERATOR 1 =, - FUNCTION 1 hashisbn(isbn); - --- ISBN vs other types: -CREATE OR REPLACE FUNCTION btisbncmp(isbn, ean13) - RETURNS int4 - AS 'btint8cmp' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION btisbncmp(isbn, isbn13) - RETURNS int4 - AS 'btint8cmp' - LANGUAGE 'internal' - IMMUTABLE STRICT; - -ALTER OPERATOR FAMILY isn_ops USING btree ADD - OPERATOR 1 < (isbn, ean13), - OPERATOR 1 < (isbn, isbn13), - OPERATOR 2 <= (isbn, ean13), - OPERATOR 2 <= (isbn, isbn13), - OPERATOR 3 = (isbn, ean13), - OPERATOR 3 = (isbn, isbn13), - OPERATOR 4 >= (isbn, ean13), - OPERATOR 4 >= (isbn, isbn13), - OPERATOR 5 > (isbn, ean13), - OPERATOR 5 > (isbn, isbn13), - FUNCTION 1 btisbncmp(isbn, ean13), - FUNCTION 1 btisbncmp(isbn, isbn13); - -ALTER OPERATOR FAMILY isn_ops USING hash ADD - OPERATOR 1 = (isbn, ean13), - OPERATOR 1 = (isbn, isbn13); - ---------------------------------------------------- --- ISMN13: -CREATE OR REPLACE FUNCTION btismn13cmp(ismn13, ismn13) - RETURNS int4 - AS 'btint8cmp' - LANGUAGE 'internal' - IMMUTABLE STRICT; - -CREATE OPERATOR CLASS ismn13_ops DEFAULT - FOR TYPE ismn13 USING btree FAMILY isn_ops AS - OPERATOR 1 <, - OPERATOR 2 <=, - OPERATOR 3 =, - OPERATOR 4 >=, - OPERATOR 5 >, - FUNCTION 1 btismn13cmp(ismn13, ismn13); - -CREATE OR REPLACE FUNCTION hashismn13(ismn13) - RETURNS int4 - AS 'hashint8' - LANGUAGE 'internal' - IMMUTABLE STRICT; - -CREATE OPERATOR CLASS ismn13_ops DEFAULT - FOR TYPE ismn13 USING hash FAMILY isn_ops AS - OPERATOR 1 =, - FUNCTION 1 hashismn13(ismn13); - --- ISMN13 vs other types: -CREATE OR REPLACE FUNCTION btismn13cmp(ismn13, ean13) - RETURNS int4 - AS 'btint8cmp' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION btismn13cmp(ismn13, ismn) - RETURNS int4 - AS 'btint8cmp' - LANGUAGE 'internal' - IMMUTABLE STRICT; - -ALTER OPERATOR FAMILY isn_ops USING btree ADD - OPERATOR 1 < (ismn13, ean13), - OPERATOR 1 < (ismn13, ismn), - OPERATOR 2 <= (ismn13, ean13), - OPERATOR 2 <= (ismn13, ismn), - OPERATOR 3 = (ismn13, ean13), - OPERATOR 3 = (ismn13, ismn), - OPERATOR 4 >= (ismn13, ean13), - OPERATOR 4 >= (ismn13, ismn), - OPERATOR 5 > (ismn13, ean13), - OPERATOR 5 > (ismn13, ismn), - FUNCTION 1 btismn13cmp(ismn13, ean13), - FUNCTION 1 btismn13cmp(ismn13, ismn); - -ALTER OPERATOR FAMILY isn_ops USING hash ADD - OPERATOR 1 = (ismn13, ean13), - OPERATOR 1 = (ismn13, ismn); - ---------------------------------------------------- --- ISMN: -CREATE OR REPLACE FUNCTION btismncmp(ismn, ismn) - RETURNS int4 - AS 'btint8cmp' - LANGUAGE 'internal' - IMMUTABLE STRICT; - -CREATE OPERATOR CLASS ismn_ops DEFAULT - FOR TYPE ismn USING btree FAMILY isn_ops AS - OPERATOR 1 <, - OPERATOR 2 <=, - OPERATOR 3 =, - OPERATOR 4 >=, - OPERATOR 5 >, - FUNCTION 1 btismncmp(ismn, ismn); - -CREATE OR REPLACE FUNCTION hashismn(ismn) - RETURNS int4 - AS 'hashint8' - LANGUAGE 'internal' - IMMUTABLE STRICT; - -CREATE OPERATOR CLASS ismn_ops DEFAULT - FOR TYPE ismn USING hash FAMILY isn_ops AS - OPERATOR 1 =, - FUNCTION 1 hashismn(ismn); - --- ISMN vs other types: -CREATE OR REPLACE FUNCTION btismncmp(ismn, ean13) - RETURNS int4 - AS 'btint8cmp' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION btismncmp(ismn, ismn13) - RETURNS int4 - AS 'btint8cmp' - LANGUAGE 'internal' - IMMUTABLE STRICT; - -ALTER OPERATOR FAMILY isn_ops USING btree ADD - OPERATOR 1 < (ismn, ean13), - OPERATOR 1 < (ismn, ismn13), - OPERATOR 2 <= (ismn, ean13), - OPERATOR 2 <= (ismn, ismn13), - OPERATOR 3 = (ismn, ean13), - OPERATOR 3 = (ismn, ismn13), - OPERATOR 4 >= (ismn, ean13), - OPERATOR 4 >= (ismn, ismn13), - OPERATOR 5 > (ismn, ean13), - OPERATOR 5 > (ismn, ismn13), - FUNCTION 1 btismncmp(ismn, ean13), - FUNCTION 1 btismncmp(ismn, ismn13); - -ALTER OPERATOR FAMILY isn_ops USING hash ADD - OPERATOR 1 = (ismn, ean13), - OPERATOR 1 = (ismn, ismn13); - ---------------------------------------------------- --- ISSN13: -CREATE OR REPLACE FUNCTION btissn13cmp(issn13, issn13) - RETURNS int4 - AS 'btint8cmp' - LANGUAGE 'internal' - IMMUTABLE STRICT; - -CREATE OPERATOR CLASS issn13_ops DEFAULT - FOR TYPE issn13 USING btree FAMILY isn_ops AS - OPERATOR 1 <, - OPERATOR 2 <=, - OPERATOR 3 =, - OPERATOR 4 >=, - OPERATOR 5 >, - FUNCTION 1 btissn13cmp(issn13, issn13); - -CREATE OR REPLACE FUNCTION hashissn13(issn13) - RETURNS int4 - AS 'hashint8' - LANGUAGE 'internal' - IMMUTABLE STRICT; - -CREATE OPERATOR CLASS issn13_ops DEFAULT - FOR TYPE issn13 USING hash FAMILY isn_ops AS - OPERATOR 1 =, - FUNCTION 1 hashissn13(issn13); - --- ISSN13 vs other types: -CREATE OR REPLACE FUNCTION btissn13cmp(issn13, ean13) - RETURNS int4 - AS 'btint8cmp' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION btissn13cmp(issn13, issn) - RETURNS int4 - AS 'btint8cmp' - LANGUAGE 'internal' - IMMUTABLE STRICT; - -ALTER OPERATOR FAMILY isn_ops USING btree ADD - OPERATOR 1 < (issn13, ean13), - OPERATOR 1 < (issn13, issn), - OPERATOR 2 <= (issn13, ean13), - OPERATOR 2 <= (issn13, issn), - OPERATOR 3 = (issn13, ean13), - OPERATOR 3 = (issn13, issn), - OPERATOR 4 >= (issn13, ean13), - OPERATOR 4 >= (issn13, issn), - OPERATOR 5 > (issn13, ean13), - OPERATOR 5 > (issn13, issn), - FUNCTION 1 btissn13cmp(issn13, ean13), - FUNCTION 1 btissn13cmp(issn13, issn); - -ALTER OPERATOR FAMILY isn_ops USING hash ADD - OPERATOR 1 = (issn13, ean13), - OPERATOR 1 = (issn13, issn); - ---------------------------------------------------- --- ISSN: -CREATE OR REPLACE FUNCTION btissncmp(issn, issn) - RETURNS int4 - AS 'btint8cmp' - LANGUAGE 'internal' - IMMUTABLE STRICT; - -CREATE OPERATOR CLASS issn_ops DEFAULT - FOR TYPE issn USING btree FAMILY isn_ops AS - OPERATOR 1 <, - OPERATOR 2 <=, - OPERATOR 3 =, - OPERATOR 4 >=, - OPERATOR 5 >, - FUNCTION 1 btissncmp(issn, issn); - -CREATE OR REPLACE FUNCTION hashissn(issn) - RETURNS int4 - AS 'hashint8' - LANGUAGE 'internal' - IMMUTABLE STRICT; - -CREATE OPERATOR CLASS issn_ops DEFAULT - FOR TYPE issn USING hash FAMILY isn_ops AS - OPERATOR 1 =, - FUNCTION 1 hashissn(issn); - --- ISSN vs other types: -CREATE OR REPLACE FUNCTION btissncmp(issn, ean13) - RETURNS int4 - AS 'btint8cmp' - LANGUAGE 'internal' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION btissncmp(issn, issn13) - RETURNS int4 - AS 'btint8cmp' - LANGUAGE 'internal' - IMMUTABLE STRICT; - -ALTER OPERATOR FAMILY isn_ops USING btree ADD - OPERATOR 1 < (issn, ean13), - OPERATOR 1 < (issn, issn13), - OPERATOR 2 <= (issn, ean13), - OPERATOR 2 <= (issn, issn13), - OPERATOR 3 = (issn, ean13), - OPERATOR 3 = (issn, issn13), - OPERATOR 4 >= (issn, ean13), - OPERATOR 4 >= (issn, issn13), - OPERATOR 5 > (issn, ean13), - OPERATOR 5 > (issn, issn13), - FUNCTION 1 btissncmp(issn, ean13), - FUNCTION 1 btissncmp(issn, issn13); - -ALTER OPERATOR FAMILY isn_ops USING hash ADD - OPERATOR 1 = (issn, ean13), - OPERATOR 1 = (issn, issn13); - ---------------------------------------------------- --- UPC: -CREATE OR REPLACE FUNCTION btupccmp(upc, upc) - RETURNS int4 - AS 'btint8cmp' - LANGUAGE 'internal' - IMMUTABLE STRICT; - -CREATE OPERATOR CLASS upc_ops DEFAULT - FOR TYPE upc USING btree FAMILY isn_ops AS - OPERATOR 1 <, - OPERATOR 2 <=, - OPERATOR 3 =, - OPERATOR 4 >=, - OPERATOR 5 >, - FUNCTION 1 btupccmp(upc, upc); - -CREATE OR REPLACE FUNCTION hashupc(upc) - RETURNS int4 - AS 'hashint8' - LANGUAGE 'internal' - IMMUTABLE STRICT; - -CREATE OPERATOR CLASS upc_ops DEFAULT - FOR TYPE upc USING hash FAMILY isn_ops AS - OPERATOR 1 =, - FUNCTION 1 hashupc(upc); - --- UPC vs other types: -CREATE OR REPLACE FUNCTION btupccmp(upc, ean13) - RETURNS int4 - AS 'btint8cmp' - LANGUAGE 'internal' - IMMUTABLE STRICT; - -ALTER OPERATOR FAMILY isn_ops USING btree ADD - OPERATOR 1 < (upc, ean13), - OPERATOR 2 <= (upc, ean13), - OPERATOR 3 = (upc, ean13), - OPERATOR 4 >= (upc, ean13), - OPERATOR 5 > (upc, ean13), - FUNCTION 1 btupccmp(upc, ean13); - -ALTER OPERATOR FAMILY isn_ops USING hash ADD - OPERATOR 1 = (upc, ean13); - --- --- Type casts: --- ---------------------------------------------------- -CREATE OR REPLACE FUNCTION isbn13(ean13) -RETURNS isbn13 -AS 'MODULE_PATHNAME', 'isbn_cast_from_ean13' -LANGUAGE 'C' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION ismn13(ean13) -RETURNS ismn13 -AS 'MODULE_PATHNAME', 'ismn_cast_from_ean13' -LANGUAGE 'C' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION issn13(ean13) -RETURNS issn13 -AS 'MODULE_PATHNAME', 'issn_cast_from_ean13' -LANGUAGE 'C' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isbn(ean13) -RETURNS isbn -AS 'MODULE_PATHNAME', 'isbn_cast_from_ean13' -LANGUAGE 'C' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION ismn(ean13) -RETURNS ismn -AS 'MODULE_PATHNAME', 'ismn_cast_from_ean13' -LANGUAGE 'C' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION issn(ean13) -RETURNS issn -AS 'MODULE_PATHNAME', 'issn_cast_from_ean13' -LANGUAGE 'C' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION upc(ean13) -RETURNS upc -AS 'MODULE_PATHNAME', 'upc_cast_from_ean13' -LANGUAGE 'C' IMMUTABLE STRICT; - - -CREATE CAST (ean13 AS isbn13) WITH FUNCTION isbn13(ean13); -CREATE CAST (ean13 AS isbn) WITH FUNCTION isbn(ean13); -CREATE CAST (ean13 AS ismn13) WITH FUNCTION ismn13(ean13); -CREATE CAST (ean13 AS ismn) WITH FUNCTION ismn(ean13); -CREATE CAST (ean13 AS issn13) WITH FUNCTION issn13(ean13); -CREATE CAST (ean13 AS issn) WITH FUNCTION issn(ean13); -CREATE CAST (ean13 AS upc) WITH FUNCTION upc(ean13); - -CREATE CAST (isbn13 AS ean13) WITHOUT FUNCTION AS ASSIGNMENT; -CREATE CAST (isbn AS ean13) WITHOUT FUNCTION AS ASSIGNMENT; -CREATE CAST (ismn13 AS ean13) WITHOUT FUNCTION AS ASSIGNMENT; -CREATE CAST (ismn AS ean13) WITHOUT FUNCTION AS ASSIGNMENT; -CREATE CAST (issn13 AS ean13) WITHOUT FUNCTION AS ASSIGNMENT; -CREATE CAST (issn AS ean13) WITHOUT FUNCTION AS ASSIGNMENT; -CREATE CAST (upc AS ean13) WITHOUT FUNCTION AS ASSIGNMENT; - -CREATE CAST (isbn AS isbn13) WITHOUT FUNCTION AS ASSIGNMENT; -CREATE CAST (isbn13 AS isbn) WITHOUT FUNCTION AS ASSIGNMENT; -CREATE CAST (ismn AS ismn13) WITHOUT FUNCTION AS ASSIGNMENT; -CREATE CAST (ismn13 AS ismn) WITHOUT FUNCTION AS ASSIGNMENT; -CREATE CAST (issn AS issn13) WITHOUT FUNCTION AS ASSIGNMENT; -CREATE CAST (issn13 AS issn) WITHOUT FUNCTION AS ASSIGNMENT; - --- --- Validation stuff for lose types: --- -CREATE OR REPLACE FUNCTION make_valid(ean13) - RETURNS ean13 - AS 'MODULE_PATHNAME' - LANGUAGE 'C' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION make_valid(isbn13) - RETURNS isbn13 - AS 'MODULE_PATHNAME' - LANGUAGE 'C' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION make_valid(ismn13) - RETURNS ismn13 - AS 'MODULE_PATHNAME' - LANGUAGE 'C' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION make_valid(issn13) - RETURNS issn13 - AS 'MODULE_PATHNAME' - LANGUAGE 'C' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION make_valid(isbn) - RETURNS isbn - AS 'MODULE_PATHNAME' - LANGUAGE 'C' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION make_valid(ismn) - RETURNS ismn - AS 'MODULE_PATHNAME' - LANGUAGE 'C' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION make_valid(issn) - RETURNS issn - AS 'MODULE_PATHNAME' - LANGUAGE 'C' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION make_valid(upc) - RETURNS upc - AS 'MODULE_PATHNAME' - LANGUAGE 'C' - IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION is_valid(ean13) - RETURNS boolean - AS 'MODULE_PATHNAME' - LANGUAGE 'C' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION is_valid(isbn13) - RETURNS boolean - AS 'MODULE_PATHNAME' - LANGUAGE 'C' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION is_valid(ismn13) - RETURNS boolean - AS 'MODULE_PATHNAME' - LANGUAGE 'C' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION is_valid(issn13) - RETURNS boolean - AS 'MODULE_PATHNAME' - LANGUAGE 'C' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION is_valid(isbn) - RETURNS boolean - AS 'MODULE_PATHNAME' - LANGUAGE 'C' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION is_valid(ismn) - RETURNS boolean - AS 'MODULE_PATHNAME' - LANGUAGE 'C' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION is_valid(issn) - RETURNS boolean - AS 'MODULE_PATHNAME' - LANGUAGE 'C' - IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION is_valid(upc) - RETURNS boolean - AS 'MODULE_PATHNAME' - LANGUAGE 'C' - IMMUTABLE STRICT; - --- --- isn_weak(boolean) - Sets the weak input mode. --- This function is intended for testing use only! --- -CREATE OR REPLACE FUNCTION isn_weak(boolean) - RETURNS boolean - AS 'MODULE_PATHNAME', 'accept_weak_input' - LANGUAGE 'C' - IMMUTABLE STRICT; - --- --- isn_weak() - Gets the weak input mode status --- -CREATE OR REPLACE FUNCTION isn_weak() - RETURNS boolean - AS 'MODULE_PATHNAME', 'weak_input_status' - LANGUAGE 'C' - IMMUTABLE STRICT; diff --git a/contrib/isn/uninstall_isn.sql b/contrib/isn/uninstall_isn.sql deleted file mode 100644 index bf866b4748..0000000000 --- a/contrib/isn/uninstall_isn.sql +++ /dev/null @@ -1,24 +0,0 @@ -/* contrib/isn/uninstall_isn.sql */ - --- Adjust this setting to control where the objects get dropped. -SET search_path = public; - --- Drop the operator families (which don't depend on the types) -DROP OPERATOR FAMILY isn_ops USING btree CASCADE; -DROP OPERATOR FAMILY isn_ops USING hash CASCADE; - --- --- Drop the actual types (in cascade): --- -DROP TYPE ean13 CASCADE; -DROP TYPE isbn13 CASCADE; -DROP TYPE ismn13 CASCADE; -DROP TYPE issn13 CASCADE; -DROP TYPE isbn CASCADE; -DROP TYPE ismn CASCADE; -DROP TYPE issn CASCADE; -DROP TYPE upc CASCADE; - --- and clean up a couple miscellaneous functions -DROP FUNCTION isn_weak(); -DROP FUNCTION isn_weak(boolean); diff --git a/contrib/lo/.gitignore b/contrib/lo/.gitignore deleted file mode 100644 index 979347bd00..0000000000 --- a/contrib/lo/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/lo.sql diff --git a/contrib/lo/Makefile b/contrib/lo/Makefile index 43c01f57c0..66b337c17a 100644 --- a/contrib/lo/Makefile +++ b/contrib/lo/Makefile @@ -1,8 +1,9 @@ # contrib/lo/Makefile MODULES = lo -DATA_built = lo.sql -DATA = uninstall_lo.sql + +EXTENSION = lo +DATA = lo--1.0.sql lo--unpackaged--1.0.sql ifdef USE_PGXS PG_CONFIG = pg_config diff --git a/contrib/lo/lo--1.0.sql b/contrib/lo/lo--1.0.sql new file mode 100644 index 0000000000..6ecb370a22 --- /dev/null +++ b/contrib/lo/lo--1.0.sql @@ -0,0 +1,22 @@ +/* contrib/lo/lo--1.0.sql */ + +-- +-- Create the data type ... now just a domain over OID +-- + +CREATE DOMAIN lo AS pg_catalog.oid; + +-- +-- For backwards compatibility, define a function named lo_oid. +-- +-- The other functions that formerly existed are not needed because +-- the implicit casts between a domain and its underlying type handle them. +-- +CREATE OR REPLACE FUNCTION lo_oid(lo) RETURNS pg_catalog.oid AS +'SELECT $1::pg_catalog.oid' LANGUAGE SQL STRICT IMMUTABLE; + +-- This is used in triggers +CREATE OR REPLACE FUNCTION lo_manage() +RETURNS pg_catalog.trigger +AS 'MODULE_PATHNAME' +LANGUAGE C; diff --git a/contrib/lo/lo--unpackaged--1.0.sql b/contrib/lo/lo--unpackaged--1.0.sql new file mode 100644 index 0000000000..54de61686e --- /dev/null +++ b/contrib/lo/lo--unpackaged--1.0.sql @@ -0,0 +1,5 @@ +/* contrib/lo/lo--unpackaged--1.0.sql */ + +ALTER EXTENSION lo ADD domain lo; +ALTER EXTENSION lo ADD function lo_oid(lo); +ALTER EXTENSION lo ADD function lo_manage(); diff --git a/contrib/lo/lo.control b/contrib/lo/lo.control new file mode 100644 index 0000000000..849dfb5803 --- /dev/null +++ b/contrib/lo/lo.control @@ -0,0 +1,5 @@ +# lo extension +comment = 'Large Object maintenance' +default_version = '1.0' +module_pathname = '$libdir/lo' +relocatable = true diff --git a/contrib/lo/lo.sql.in b/contrib/lo/lo.sql.in deleted file mode 100644 index 8c7afbe5e3..0000000000 --- a/contrib/lo/lo.sql.in +++ /dev/null @@ -1,25 +0,0 @@ -/* contrib/lo/lo.sql.in */ - --- Adjust this setting to control where the objects get created. -SET search_path = public; - --- --- Create the data type ... now just a domain over OID --- - -CREATE DOMAIN lo AS pg_catalog.oid; - --- --- For backwards compatibility, define a function named lo_oid. --- --- The other functions that formerly existed are not needed because --- the implicit casts between a domain and its underlying type handle them. --- -CREATE OR REPLACE FUNCTION lo_oid(lo) RETURNS pg_catalog.oid AS -'SELECT $1::pg_catalog.oid' LANGUAGE SQL STRICT IMMUTABLE; - --- This is used in triggers -CREATE OR REPLACE FUNCTION lo_manage() -RETURNS pg_catalog.trigger -AS 'MODULE_PATHNAME' -LANGUAGE C; diff --git a/contrib/lo/uninstall_lo.sql b/contrib/lo/uninstall_lo.sql deleted file mode 100644 index 77deb1d550..0000000000 --- a/contrib/lo/uninstall_lo.sql +++ /dev/null @@ -1,17 +0,0 @@ -/* contrib/lo/uninstall_lo.sql */ - --- Adjust this setting to control where the objects get dropped. -SET search_path = public; - --- --- This removes the LO type --- It's used just for development --- - --- drop the type and associated functions -DROP TYPE lo CASCADE; - --- the trigger function has no dependency on the type, so drop separately -DROP FUNCTION lo_manage(); - --- the lo stuff is now removed from the system diff --git a/contrib/ltree/.gitignore b/contrib/ltree/.gitignore index 49883e82a3..19b6c5ba42 100644 --- a/contrib/ltree/.gitignore +++ b/contrib/ltree/.gitignore @@ -1,3 +1,2 @@ -/ltree.sql # Generated subdirectories /results/ diff --git a/contrib/ltree/Makefile b/contrib/ltree/Makefile index bad3cbfe85..65d42f875f 100644 --- a/contrib/ltree/Makefile +++ b/contrib/ltree/Makefile @@ -1,11 +1,13 @@ # contrib/ltree/Makefile -PG_CPPFLAGS = -DLOWER_NODE MODULE_big = ltree OBJS = ltree_io.o ltree_op.o lquery_op.o _ltree_op.o crc32.o \ ltxtquery_io.o ltxtquery_op.o ltree_gist.o _ltree_gist.o -DATA_built = ltree.sql -DATA = uninstall_ltree.sql +PG_CPPFLAGS = -DLOWER_NODE + +EXTENSION = ltree +DATA = ltree--1.0.sql ltree--unpackaged--1.0.sql + REGRESS = ltree ifdef USE_PGXS diff --git a/contrib/ltree/expected/ltree.out b/contrib/ltree/expected/ltree.out index 7f61e569cf..da6e39a785 100644 --- a/contrib/ltree/expected/ltree.out +++ b/contrib/ltree/expected/ltree.out @@ -1,10 +1,4 @@ --- --- first, define the datatype. Turn off echoing so that expected file --- does not depend on contents of ltree.sql. --- -SET client_min_messages = warning; -\set ECHO none -RESET client_min_messages; +CREATE EXTENSION ltree; SELECT ''::ltree; ltree ------- diff --git a/contrib/ltree/ltree--1.0.sql b/contrib/ltree/ltree--1.0.sql new file mode 100644 index 0000000000..d9b5ead53a --- /dev/null +++ b/contrib/ltree/ltree--1.0.sql @@ -0,0 +1,869 @@ +/* contrib/ltree/ltree--1.0.sql */ + +CREATE OR REPLACE FUNCTION ltree_in(cstring) +RETURNS ltree +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION ltree_out(ltree) +RETURNS cstring +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT; + +CREATE TYPE ltree ( + INTERNALLENGTH = -1, + INPUT = ltree_in, + OUTPUT = ltree_out, + STORAGE = extended +); + + +--Compare function for ltree +CREATE OR REPLACE FUNCTION ltree_cmp(ltree,ltree) +RETURNS int4 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION ltree_lt(ltree,ltree) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION ltree_le(ltree,ltree) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION ltree_eq(ltree,ltree) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION ltree_ge(ltree,ltree) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION ltree_gt(ltree,ltree) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION ltree_ne(ltree,ltree) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + + +CREATE OPERATOR < ( + LEFTARG = ltree, + RIGHTARG = ltree, + PROCEDURE = ltree_lt, + COMMUTATOR = '>', + NEGATOR = '>=', + RESTRICT = contsel, + JOIN = contjoinsel +); + +CREATE OPERATOR <= ( + LEFTARG = ltree, + RIGHTARG = ltree, + PROCEDURE = ltree_le, + COMMUTATOR = '>=', + NEGATOR = '>', + RESTRICT = contsel, + JOIN = contjoinsel +); + +CREATE OPERATOR >= ( + LEFTARG = ltree, + RIGHTARG = ltree, + PROCEDURE = ltree_ge, + COMMUTATOR = '<=', + NEGATOR = '<', + RESTRICT = contsel, + JOIN = contjoinsel +); + +CREATE OPERATOR > ( + LEFTARG = ltree, + RIGHTARG = ltree, + PROCEDURE = ltree_gt, + COMMUTATOR = '<', + NEGATOR = '<=', + RESTRICT = contsel, + JOIN = contjoinsel +); + +CREATE OPERATOR = ( + LEFTARG = ltree, + RIGHTARG = ltree, + PROCEDURE = ltree_eq, + COMMUTATOR = '=', + NEGATOR = '<>', + RESTRICT = eqsel, + JOIN = eqjoinsel, + SORT1 = '<', + SORT2 = '<' +); + +CREATE OPERATOR <> ( + LEFTARG = ltree, + RIGHTARG = ltree, + PROCEDURE = ltree_ne, + COMMUTATOR = '<>', + NEGATOR = '=', + RESTRICT = neqsel, + JOIN = neqjoinsel +); + +--util functions + +CREATE OR REPLACE FUNCTION subltree(ltree,int4,int4) +RETURNS ltree +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION subpath(ltree,int4,int4) +RETURNS ltree +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION subpath(ltree,int4) +RETURNS ltree +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION index(ltree,ltree) +RETURNS int4 +AS 'MODULE_PATHNAME', 'ltree_index' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION index(ltree,ltree,int4) +RETURNS int4 +AS 'MODULE_PATHNAME', 'ltree_index' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION nlevel(ltree) +RETURNS int4 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION ltree2text(ltree) +RETURNS text +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION text2ltree(text) +RETURNS ltree +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION lca(_ltree) +RETURNS ltree +AS 'MODULE_PATHNAME','_lca' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION lca(ltree,ltree) +RETURNS ltree +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION lca(ltree,ltree,ltree) +RETURNS ltree +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION lca(ltree,ltree,ltree,ltree) +RETURNS ltree +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION lca(ltree,ltree,ltree,ltree,ltree) +RETURNS ltree +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION lca(ltree,ltree,ltree,ltree,ltree,ltree) +RETURNS ltree +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION lca(ltree,ltree,ltree,ltree,ltree,ltree,ltree) +RETURNS ltree +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION lca(ltree,ltree,ltree,ltree,ltree,ltree,ltree,ltree) +RETURNS ltree +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION ltree_isparent(ltree,ltree) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION ltree_risparent(ltree,ltree) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION ltree_addltree(ltree,ltree) +RETURNS ltree +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION ltree_addtext(ltree,text) +RETURNS ltree +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION ltree_textadd(text,ltree) +RETURNS ltree +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION ltreeparentsel(internal, oid, internal, integer) +RETURNS float8 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OPERATOR @> ( + LEFTARG = ltree, + RIGHTARG = ltree, + PROCEDURE = ltree_isparent, + COMMUTATOR = '<@', + RESTRICT = ltreeparentsel, + JOIN = contjoinsel +); + +CREATE OPERATOR ^@> ( + LEFTARG = ltree, + RIGHTARG = ltree, + PROCEDURE = ltree_isparent, + COMMUTATOR = '^<@', + RESTRICT = contsel, + JOIN = contjoinsel +); + +CREATE OPERATOR <@ ( + LEFTARG = ltree, + RIGHTARG = ltree, + PROCEDURE = ltree_risparent, + COMMUTATOR = '@>', + RESTRICT = ltreeparentsel, + JOIN = contjoinsel +); + +CREATE OPERATOR ^<@ ( + LEFTARG = ltree, + RIGHTARG = ltree, + PROCEDURE = ltree_risparent, + COMMUTATOR = '^@>', + RESTRICT = contsel, + JOIN = contjoinsel +); + +CREATE OPERATOR || ( + LEFTARG = ltree, + RIGHTARG = ltree, + PROCEDURE = ltree_addltree +); + +CREATE OPERATOR || ( + LEFTARG = ltree, + RIGHTARG = text, + PROCEDURE = ltree_addtext +); + +CREATE OPERATOR || ( + LEFTARG = text, + RIGHTARG = ltree, + PROCEDURE = ltree_textadd +); + + +-- B-tree support + +CREATE OPERATOR CLASS ltree_ops + DEFAULT FOR TYPE ltree USING btree AS + OPERATOR 1 < , + OPERATOR 2 <= , + OPERATOR 3 = , + OPERATOR 4 >= , + OPERATOR 5 > , + FUNCTION 1 ltree_cmp(ltree, ltree); + + +--lquery type +CREATE OR REPLACE FUNCTION lquery_in(cstring) +RETURNS lquery +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION lquery_out(lquery) +RETURNS cstring +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT; + +CREATE TYPE lquery ( + INTERNALLENGTH = -1, + INPUT = lquery_in, + OUTPUT = lquery_out, + STORAGE = extended +); + +CREATE OR REPLACE FUNCTION ltq_regex(ltree,lquery) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION ltq_rregex(lquery,ltree) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OPERATOR ~ ( + LEFTARG = ltree, + RIGHTARG = lquery, + PROCEDURE = ltq_regex, + COMMUTATOR = '~', + RESTRICT = contsel, + JOIN = contjoinsel +); + +CREATE OPERATOR ~ ( + LEFTARG = lquery, + RIGHTARG = ltree, + PROCEDURE = ltq_rregex, + COMMUTATOR = '~', + RESTRICT = contsel, + JOIN = contjoinsel +); + +--not-indexed +CREATE OPERATOR ^~ ( + LEFTARG = ltree, + RIGHTARG = lquery, + PROCEDURE = ltq_regex, + COMMUTATOR = '^~', + RESTRICT = contsel, + JOIN = contjoinsel +); + +CREATE OPERATOR ^~ ( + LEFTARG = lquery, + RIGHTARG = ltree, + PROCEDURE = ltq_rregex, + COMMUTATOR = '^~', + RESTRICT = contsel, + JOIN = contjoinsel +); + +CREATE OR REPLACE FUNCTION lt_q_regex(ltree,_lquery) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION lt_q_rregex(_lquery,ltree) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OPERATOR ? ( + LEFTARG = ltree, + RIGHTARG = _lquery, + PROCEDURE = lt_q_regex, + COMMUTATOR = '?', + RESTRICT = contsel, + JOIN = contjoinsel +); + +CREATE OPERATOR ? ( + LEFTARG = _lquery, + RIGHTARG = ltree, + PROCEDURE = lt_q_rregex, + COMMUTATOR = '?', + RESTRICT = contsel, + JOIN = contjoinsel +); + +--not-indexed +CREATE OPERATOR ^? ( + LEFTARG = ltree, + RIGHTARG = _lquery, + PROCEDURE = lt_q_regex, + COMMUTATOR = '^?', + RESTRICT = contsel, + JOIN = contjoinsel +); + +CREATE OPERATOR ^? ( + LEFTARG = _lquery, + RIGHTARG = ltree, + PROCEDURE = lt_q_rregex, + COMMUTATOR = '^?', + RESTRICT = contsel, + JOIN = contjoinsel +); + +CREATE OR REPLACE FUNCTION ltxtq_in(cstring) +RETURNS ltxtquery +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION ltxtq_out(ltxtquery) +RETURNS cstring +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT; + +CREATE TYPE ltxtquery ( + INTERNALLENGTH = -1, + INPUT = ltxtq_in, + OUTPUT = ltxtq_out, + STORAGE = extended +); + +-- operations WITH ltxtquery + +CREATE OR REPLACE FUNCTION ltxtq_exec(ltree, ltxtquery) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION ltxtq_rexec(ltxtquery, ltree) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OPERATOR @ ( + LEFTARG = ltree, + RIGHTARG = ltxtquery, + PROCEDURE = ltxtq_exec, + COMMUTATOR = '@', + RESTRICT = contsel, + JOIN = contjoinsel +); + +CREATE OPERATOR @ ( + LEFTARG = ltxtquery, + RIGHTARG = ltree, + PROCEDURE = ltxtq_rexec, + COMMUTATOR = '@', + RESTRICT = contsel, + JOIN = contjoinsel +); + +--not-indexed +CREATE OPERATOR ^@ ( + LEFTARG = ltree, + RIGHTARG = ltxtquery, + PROCEDURE = ltxtq_exec, + COMMUTATOR = '^@', + RESTRICT = contsel, + JOIN = contjoinsel +); + +CREATE OPERATOR ^@ ( + LEFTARG = ltxtquery, + RIGHTARG = ltree, + PROCEDURE = ltxtq_rexec, + COMMUTATOR = '^@', + RESTRICT = contsel, + JOIN = contjoinsel +); + +--GiST support for ltree +CREATE OR REPLACE FUNCTION ltree_gist_in(cstring) +RETURNS ltree_gist +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION ltree_gist_out(ltree_gist) +RETURNS cstring +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT; + +CREATE TYPE ltree_gist ( + internallength = -1, + input = ltree_gist_in, + output = ltree_gist_out, + storage = plain +); + + +CREATE OR REPLACE FUNCTION ltree_consistent(internal,internal,int2,oid,internal) +RETURNS bool as 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION ltree_compress(internal) +RETURNS internal as 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION ltree_decompress(internal) +RETURNS internal as 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION ltree_penalty(internal,internal,internal) +RETURNS internal as 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION ltree_picksplit(internal, internal) +RETURNS internal as 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION ltree_union(internal, internal) +RETURNS int4 as 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION ltree_same(internal, internal, internal) +RETURNS internal as 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; + +CREATE OPERATOR CLASS gist_ltree_ops + DEFAULT FOR TYPE ltree USING gist AS + OPERATOR 1 < , + OPERATOR 2 <= , + OPERATOR 3 = , + OPERATOR 4 >= , + OPERATOR 5 > , + OPERATOR 10 @> , + OPERATOR 11 <@ , + OPERATOR 12 ~ (ltree, lquery) , + OPERATOR 13 ~ (lquery, ltree) , + OPERATOR 14 @ (ltree, ltxtquery) , + OPERATOR 15 @ (ltxtquery, ltree) , + OPERATOR 16 ? (ltree, _lquery) , + OPERATOR 17 ? (_lquery, ltree) , + FUNCTION 1 ltree_consistent (internal, internal, int2, oid, internal), + FUNCTION 2 ltree_union (internal, internal), + FUNCTION 3 ltree_compress (internal), + FUNCTION 4 ltree_decompress (internal), + FUNCTION 5 ltree_penalty (internal, internal, internal), + FUNCTION 6 ltree_picksplit (internal, internal), + FUNCTION 7 ltree_same (internal, internal, internal), + STORAGE ltree_gist; + + +-- arrays of ltree + +CREATE OR REPLACE FUNCTION _ltree_isparent(_ltree,ltree) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION _ltree_r_isparent(ltree,_ltree) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION _ltree_risparent(_ltree,ltree) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION _ltree_r_risparent(ltree,_ltree) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION _ltq_regex(_ltree,lquery) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION _ltq_rregex(lquery,_ltree) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION _lt_q_regex(_ltree,_lquery) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION _lt_q_rregex(_lquery,_ltree) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION _ltxtq_exec(_ltree, ltxtquery) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION _ltxtq_rexec(ltxtquery, _ltree) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OPERATOR @> ( + LEFTARG = _ltree, + RIGHTARG = ltree, + PROCEDURE = _ltree_isparent, + COMMUTATOR = '<@', + RESTRICT = contsel, + JOIN = contjoinsel +); + +CREATE OPERATOR <@ ( + LEFTARG = ltree, + RIGHTARG = _ltree, + PROCEDURE = _ltree_r_isparent, + COMMUTATOR = '@>', + RESTRICT = contsel, + JOIN = contjoinsel +); + +CREATE OPERATOR <@ ( + LEFTARG = _ltree, + RIGHTARG = ltree, + PROCEDURE = _ltree_risparent, + COMMUTATOR = '@>', + RESTRICT = contsel, + JOIN = contjoinsel +); + +CREATE OPERATOR @> ( + LEFTARG = ltree, + RIGHTARG = _ltree, + PROCEDURE = _ltree_r_risparent, + COMMUTATOR = '<@', + RESTRICT = contsel, + JOIN = contjoinsel +); + +CREATE OPERATOR ~ ( + LEFTARG = _ltree, + RIGHTARG = lquery, + PROCEDURE = _ltq_regex, + COMMUTATOR = '~', + RESTRICT = contsel, + JOIN = contjoinsel +); + +CREATE OPERATOR ~ ( + LEFTARG = lquery, + RIGHTARG = _ltree, + PROCEDURE = _ltq_rregex, + COMMUTATOR = '~', + RESTRICT = contsel, + JOIN = contjoinsel +); + +CREATE OPERATOR ? ( + LEFTARG = _ltree, + RIGHTARG = _lquery, + PROCEDURE = _lt_q_regex, + COMMUTATOR = '?', + RESTRICT = contsel, + JOIN = contjoinsel +); + +CREATE OPERATOR ? ( + LEFTARG = _lquery, + RIGHTARG = _ltree, + PROCEDURE = _lt_q_rregex, + COMMUTATOR = '?', + RESTRICT = contsel, + JOIN = contjoinsel +); + +CREATE OPERATOR @ ( + LEFTARG = _ltree, + RIGHTARG = ltxtquery, + PROCEDURE = _ltxtq_exec, + COMMUTATOR = '@', + RESTRICT = contsel, + JOIN = contjoinsel +); + +CREATE OPERATOR @ ( + LEFTARG = ltxtquery, + RIGHTARG = _ltree, + PROCEDURE = _ltxtq_rexec, + COMMUTATOR = '@', + RESTRICT = contsel, + JOIN = contjoinsel +); + + +--not indexed +CREATE OPERATOR ^@> ( + LEFTARG = _ltree, + RIGHTARG = ltree, + PROCEDURE = _ltree_isparent, + COMMUTATOR = '^<@', + RESTRICT = contsel, + JOIN = contjoinsel +); + +CREATE OPERATOR ^<@ ( + LEFTARG = ltree, + RIGHTARG = _ltree, + PROCEDURE = _ltree_r_isparent, + COMMUTATOR = '^@>', + RESTRICT = contsel, + JOIN = contjoinsel +); + +CREATE OPERATOR ^<@ ( + LEFTARG = _ltree, + RIGHTARG = ltree, + PROCEDURE = _ltree_risparent, + COMMUTATOR = '^@>', + RESTRICT = contsel, + JOIN = contjoinsel +); + +CREATE OPERATOR ^@> ( + LEFTARG = ltree, + RIGHTARG = _ltree, + PROCEDURE = _ltree_r_risparent, + COMMUTATOR = '^<@', + RESTRICT = contsel, + JOIN = contjoinsel +); + +CREATE OPERATOR ^~ ( + LEFTARG = _ltree, + RIGHTARG = lquery, + PROCEDURE = _ltq_regex, + COMMUTATOR = '^~', + RESTRICT = contsel, + JOIN = contjoinsel +); + +CREATE OPERATOR ^~ ( + LEFTARG = lquery, + RIGHTARG = _ltree, + PROCEDURE = _ltq_rregex, + COMMUTATOR = '^~', + RESTRICT = contsel, + JOIN = contjoinsel +); + +CREATE OPERATOR ^? ( + LEFTARG = _ltree, + RIGHTARG = _lquery, + PROCEDURE = _lt_q_regex, + COMMUTATOR = '^?', + RESTRICT = contsel, + JOIN = contjoinsel +); + +CREATE OPERATOR ^? ( + LEFTARG = _lquery, + RIGHTARG = _ltree, + PROCEDURE = _lt_q_rregex, + COMMUTATOR = '^?', + RESTRICT = contsel, + JOIN = contjoinsel +); + +CREATE OPERATOR ^@ ( + LEFTARG = _ltree, + RIGHTARG = ltxtquery, + PROCEDURE = _ltxtq_exec, + COMMUTATOR = '^@', + RESTRICT = contsel, + JOIN = contjoinsel +); + +CREATE OPERATOR ^@ ( + LEFTARG = ltxtquery, + RIGHTARG = _ltree, + PROCEDURE = _ltxtq_rexec, + COMMUTATOR = '^@', + RESTRICT = contsel, + JOIN = contjoinsel +); + +--extractors +CREATE OR REPLACE FUNCTION _ltree_extract_isparent(_ltree,ltree) +RETURNS ltree +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OPERATOR ?@> ( + LEFTARG = _ltree, + RIGHTARG = ltree, + PROCEDURE = _ltree_extract_isparent +); + +CREATE OR REPLACE FUNCTION _ltree_extract_risparent(_ltree,ltree) +RETURNS ltree +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OPERATOR ?<@ ( + LEFTARG = _ltree, + RIGHTARG = ltree, + PROCEDURE = _ltree_extract_risparent +); + +CREATE OR REPLACE FUNCTION _ltq_extract_regex(_ltree,lquery) +RETURNS ltree +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OPERATOR ?~ ( + LEFTARG = _ltree, + RIGHTARG = lquery, + PROCEDURE = _ltq_extract_regex +); + +CREATE OR REPLACE FUNCTION _ltxtq_extract_exec(_ltree,ltxtquery) +RETURNS ltree +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OPERATOR ?@ ( + LEFTARG = _ltree, + RIGHTARG = ltxtquery, + PROCEDURE = _ltxtq_extract_exec +); + +--GiST support for ltree[] +CREATE OR REPLACE FUNCTION _ltree_consistent(internal,internal,int2,oid,internal) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION _ltree_compress(internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION _ltree_penalty(internal,internal,internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION _ltree_picksplit(internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION _ltree_union(internal, internal) +RETURNS int4 +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION _ltree_same(internal, internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OPERATOR CLASS gist__ltree_ops + DEFAULT FOR TYPE _ltree USING gist AS + OPERATOR 10 <@ (_ltree, ltree), + OPERATOR 11 @> (ltree, _ltree), + OPERATOR 12 ~ (_ltree, lquery), + OPERATOR 13 ~ (lquery, _ltree), + OPERATOR 14 @ (_ltree, ltxtquery), + OPERATOR 15 @ (ltxtquery, _ltree), + OPERATOR 16 ? (_ltree, _lquery), + OPERATOR 17 ? (_lquery, _ltree), + FUNCTION 1 _ltree_consistent (internal, internal, int2, oid, internal), + FUNCTION 2 _ltree_union (internal, internal), + FUNCTION 3 _ltree_compress (internal), + FUNCTION 4 ltree_decompress (internal), + FUNCTION 5 _ltree_penalty (internal, internal, internal), + FUNCTION 6 _ltree_picksplit (internal, internal), + FUNCTION 7 _ltree_same (internal, internal, internal), + STORAGE ltree_gist; diff --git a/contrib/ltree/ltree--unpackaged--1.0.sql b/contrib/ltree/ltree--unpackaged--1.0.sql new file mode 100644 index 0000000000..f483725b4a --- /dev/null +++ b/contrib/ltree/ltree--unpackaged--1.0.sql @@ -0,0 +1,131 @@ +/* contrib/ltree/ltree--unpackaged--1.0.sql */ + +ALTER EXTENSION ltree ADD type ltree; +ALTER EXTENSION ltree ADD function ltree_in(cstring); +ALTER EXTENSION ltree ADD function ltree_out(ltree); +ALTER EXTENSION ltree ADD function ltree_cmp(ltree,ltree); +ALTER EXTENSION ltree ADD function ltree_lt(ltree,ltree); +ALTER EXTENSION ltree ADD function ltree_le(ltree,ltree); +ALTER EXTENSION ltree ADD function ltree_eq(ltree,ltree); +ALTER EXTENSION ltree ADD function ltree_ge(ltree,ltree); +ALTER EXTENSION ltree ADD function ltree_gt(ltree,ltree); +ALTER EXTENSION ltree ADD function ltree_ne(ltree,ltree); +ALTER EXTENSION ltree ADD operator >(ltree,ltree); +ALTER EXTENSION ltree ADD operator >=(ltree,ltree); +ALTER EXTENSION ltree ADD operator <(ltree,ltree); +ALTER EXTENSION ltree ADD operator <=(ltree,ltree); +ALTER EXTENSION ltree ADD operator <>(ltree,ltree); +ALTER EXTENSION ltree ADD operator =(ltree,ltree); +ALTER EXTENSION ltree ADD function subltree(ltree,integer,integer); +ALTER EXTENSION ltree ADD function subpath(ltree,integer,integer); +ALTER EXTENSION ltree ADD function subpath(ltree,integer); +ALTER EXTENSION ltree ADD function index(ltree,ltree); +ALTER EXTENSION ltree ADD function index(ltree,ltree,integer); +ALTER EXTENSION ltree ADD function nlevel(ltree); +ALTER EXTENSION ltree ADD function ltree2text(ltree); +ALTER EXTENSION ltree ADD function text2ltree(text); +ALTER EXTENSION ltree ADD function lca(ltree[]); +ALTER EXTENSION ltree ADD function lca(ltree,ltree); +ALTER EXTENSION ltree ADD function lca(ltree,ltree,ltree); +ALTER EXTENSION ltree ADD function lca(ltree,ltree,ltree,ltree); +ALTER EXTENSION ltree ADD function lca(ltree,ltree,ltree,ltree,ltree); +ALTER EXTENSION ltree ADD function lca(ltree,ltree,ltree,ltree,ltree,ltree); +ALTER EXTENSION ltree ADD function lca(ltree,ltree,ltree,ltree,ltree,ltree,ltree); +ALTER EXTENSION ltree ADD function lca(ltree,ltree,ltree,ltree,ltree,ltree,ltree,ltree); +ALTER EXTENSION ltree ADD function ltree_isparent(ltree,ltree); +ALTER EXTENSION ltree ADD function ltree_risparent(ltree,ltree); +ALTER EXTENSION ltree ADD function ltree_addltree(ltree,ltree); +ALTER EXTENSION ltree ADD function ltree_addtext(ltree,text); +ALTER EXTENSION ltree ADD function ltree_textadd(text,ltree); +ALTER EXTENSION ltree ADD function ltreeparentsel(internal,oid,internal,integer); +ALTER EXTENSION ltree ADD operator <@(ltree,ltree); +ALTER EXTENSION ltree ADD operator @>(ltree,ltree); +ALTER EXTENSION ltree ADD operator ^<@(ltree,ltree); +ALTER EXTENSION ltree ADD operator ^@>(ltree,ltree); +ALTER EXTENSION ltree ADD operator ||(ltree,ltree); +ALTER EXTENSION ltree ADD operator ||(ltree,text); +ALTER EXTENSION ltree ADD operator ||(text,ltree); +ALTER EXTENSION ltree ADD operator family ltree_ops using btree; +ALTER EXTENSION ltree ADD operator class ltree_ops using btree; +ALTER EXTENSION ltree ADD type lquery; +ALTER EXTENSION ltree ADD function lquery_in(cstring); +ALTER EXTENSION ltree ADD function lquery_out(lquery); +ALTER EXTENSION ltree ADD function ltq_regex(ltree,lquery); +ALTER EXTENSION ltree ADD function ltq_rregex(lquery,ltree); +ALTER EXTENSION ltree ADD operator ~(lquery,ltree); +ALTER EXTENSION ltree ADD operator ~(ltree,lquery); +ALTER EXTENSION ltree ADD operator ^~(lquery,ltree); +ALTER EXTENSION ltree ADD operator ^~(ltree,lquery); +ALTER EXTENSION ltree ADD function lt_q_regex(ltree,lquery[]); +ALTER EXTENSION ltree ADD function lt_q_rregex(lquery[],ltree); +ALTER EXTENSION ltree ADD operator ?(lquery[],ltree); +ALTER EXTENSION ltree ADD operator ?(ltree,lquery[]); +ALTER EXTENSION ltree ADD operator ^?(lquery[],ltree); +ALTER EXTENSION ltree ADD operator ^?(ltree,lquery[]); +ALTER EXTENSION ltree ADD type ltxtquery; +ALTER EXTENSION ltree ADD function ltxtq_in(cstring); +ALTER EXTENSION ltree ADD function ltxtq_out(ltxtquery); +ALTER EXTENSION ltree ADD function ltxtq_exec(ltree,ltxtquery); +ALTER EXTENSION ltree ADD function ltxtq_rexec(ltxtquery,ltree); +ALTER EXTENSION ltree ADD operator @(ltxtquery,ltree); +ALTER EXTENSION ltree ADD operator @(ltree,ltxtquery); +ALTER EXTENSION ltree ADD operator ^@(ltxtquery,ltree); +ALTER EXTENSION ltree ADD operator ^@(ltree,ltxtquery); +ALTER EXTENSION ltree ADD type ltree_gist; +ALTER EXTENSION ltree ADD function ltree_gist_in(cstring); +ALTER EXTENSION ltree ADD function ltree_gist_out(ltree_gist); +ALTER EXTENSION ltree ADD function ltree_consistent(internal,internal,smallint,oid,internal); +ALTER EXTENSION ltree ADD function ltree_compress(internal); +ALTER EXTENSION ltree ADD function ltree_decompress(internal); +ALTER EXTENSION ltree ADD function ltree_penalty(internal,internal,internal); +ALTER EXTENSION ltree ADD function ltree_picksplit(internal,internal); +ALTER EXTENSION ltree ADD function ltree_union(internal,internal); +ALTER EXTENSION ltree ADD function ltree_same(internal,internal,internal); +ALTER EXTENSION ltree ADD operator family gist_ltree_ops using gist; +ALTER EXTENSION ltree ADD operator class gist_ltree_ops using gist; +ALTER EXTENSION ltree ADD function _ltree_isparent(ltree[],ltree); +ALTER EXTENSION ltree ADD function _ltree_r_isparent(ltree,ltree[]); +ALTER EXTENSION ltree ADD function _ltree_risparent(ltree[],ltree); +ALTER EXTENSION ltree ADD function _ltree_r_risparent(ltree,ltree[]); +ALTER EXTENSION ltree ADD function _ltq_regex(ltree[],lquery); +ALTER EXTENSION ltree ADD function _ltq_rregex(lquery,ltree[]); +ALTER EXTENSION ltree ADD function _lt_q_regex(ltree[],lquery[]); +ALTER EXTENSION ltree ADD function _lt_q_rregex(lquery[],ltree[]); +ALTER EXTENSION ltree ADD function _ltxtq_exec(ltree[],ltxtquery); +ALTER EXTENSION ltree ADD function _ltxtq_rexec(ltxtquery,ltree[]); +ALTER EXTENSION ltree ADD operator <@(ltree,ltree[]); +ALTER EXTENSION ltree ADD operator @>(ltree[],ltree); +ALTER EXTENSION ltree ADD operator @>(ltree,ltree[]); +ALTER EXTENSION ltree ADD operator <@(ltree[],ltree); +ALTER EXTENSION ltree ADD operator ~(lquery,ltree[]); +ALTER EXTENSION ltree ADD operator ~(ltree[],lquery); +ALTER EXTENSION ltree ADD operator ?(lquery[],ltree[]); +ALTER EXTENSION ltree ADD operator ?(ltree[],lquery[]); +ALTER EXTENSION ltree ADD operator @(ltxtquery,ltree[]); +ALTER EXTENSION ltree ADD operator @(ltree[],ltxtquery); +ALTER EXTENSION ltree ADD operator ^<@(ltree,ltree[]); +ALTER EXTENSION ltree ADD operator ^@>(ltree[],ltree); +ALTER EXTENSION ltree ADD operator ^@>(ltree,ltree[]); +ALTER EXTENSION ltree ADD operator ^<@(ltree[],ltree); +ALTER EXTENSION ltree ADD operator ^~(lquery,ltree[]); +ALTER EXTENSION ltree ADD operator ^~(ltree[],lquery); +ALTER EXTENSION ltree ADD operator ^?(lquery[],ltree[]); +ALTER EXTENSION ltree ADD operator ^?(ltree[],lquery[]); +ALTER EXTENSION ltree ADD operator ^@(ltxtquery,ltree[]); +ALTER EXTENSION ltree ADD operator ^@(ltree[],ltxtquery); +ALTER EXTENSION ltree ADD function _ltree_extract_isparent(ltree[],ltree); +ALTER EXTENSION ltree ADD operator ?@>(ltree[],ltree); +ALTER EXTENSION ltree ADD function _ltree_extract_risparent(ltree[],ltree); +ALTER EXTENSION ltree ADD operator ?<@(ltree[],ltree); +ALTER EXTENSION ltree ADD function _ltq_extract_regex(ltree[],lquery); +ALTER EXTENSION ltree ADD operator ?~(ltree[],lquery); +ALTER EXTENSION ltree ADD function _ltxtq_extract_exec(ltree[],ltxtquery); +ALTER EXTENSION ltree ADD operator ?@(ltree[],ltxtquery); +ALTER EXTENSION ltree ADD function _ltree_consistent(internal,internal,smallint,oid,internal); +ALTER EXTENSION ltree ADD function _ltree_compress(internal); +ALTER EXTENSION ltree ADD function _ltree_penalty(internal,internal,internal); +ALTER EXTENSION ltree ADD function _ltree_picksplit(internal,internal); +ALTER EXTENSION ltree ADD function _ltree_union(internal,internal); +ALTER EXTENSION ltree ADD function _ltree_same(internal,internal,internal); +ALTER EXTENSION ltree ADD operator family gist__ltree_ops using gist; +ALTER EXTENSION ltree ADD operator class gist__ltree_ops using gist; diff --git a/contrib/ltree/ltree.control b/contrib/ltree/ltree.control new file mode 100644 index 0000000000..d879fd618c --- /dev/null +++ b/contrib/ltree/ltree.control @@ -0,0 +1,5 @@ +# ltree extension +comment = 'data type for hierarchical tree-like structures' +default_version = '1.0' +module_pathname = '$libdir/ltree' +relocatable = true diff --git a/contrib/ltree/ltree.sql.in b/contrib/ltree/ltree.sql.in deleted file mode 100644 index 1b985a7a99..0000000000 --- a/contrib/ltree/ltree.sql.in +++ /dev/null @@ -1,872 +0,0 @@ -/* contrib/ltree/ltree.sql.in */ - --- Adjust this setting to control where the objects get created. -SET search_path = public; - -CREATE OR REPLACE FUNCTION ltree_in(cstring) -RETURNS ltree -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION ltree_out(ltree) -RETURNS cstring -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT; - -CREATE TYPE ltree ( - INTERNALLENGTH = -1, - INPUT = ltree_in, - OUTPUT = ltree_out, - STORAGE = extended -); - - ---Compare function for ltree -CREATE OR REPLACE FUNCTION ltree_cmp(ltree,ltree) -RETURNS int4 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION ltree_lt(ltree,ltree) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION ltree_le(ltree,ltree) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION ltree_eq(ltree,ltree) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION ltree_ge(ltree,ltree) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION ltree_gt(ltree,ltree) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION ltree_ne(ltree,ltree) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - - -CREATE OPERATOR < ( - LEFTARG = ltree, - RIGHTARG = ltree, - PROCEDURE = ltree_lt, - COMMUTATOR = '>', - NEGATOR = '>=', - RESTRICT = contsel, - JOIN = contjoinsel -); - -CREATE OPERATOR <= ( - LEFTARG = ltree, - RIGHTARG = ltree, - PROCEDURE = ltree_le, - COMMUTATOR = '>=', - NEGATOR = '>', - RESTRICT = contsel, - JOIN = contjoinsel -); - -CREATE OPERATOR >= ( - LEFTARG = ltree, - RIGHTARG = ltree, - PROCEDURE = ltree_ge, - COMMUTATOR = '<=', - NEGATOR = '<', - RESTRICT = contsel, - JOIN = contjoinsel -); - -CREATE OPERATOR > ( - LEFTARG = ltree, - RIGHTARG = ltree, - PROCEDURE = ltree_gt, - COMMUTATOR = '<', - NEGATOR = '<=', - RESTRICT = contsel, - JOIN = contjoinsel -); - -CREATE OPERATOR = ( - LEFTARG = ltree, - RIGHTARG = ltree, - PROCEDURE = ltree_eq, - COMMUTATOR = '=', - NEGATOR = '<>', - RESTRICT = eqsel, - JOIN = eqjoinsel, - SORT1 = '<', - SORT2 = '<' -); - -CREATE OPERATOR <> ( - LEFTARG = ltree, - RIGHTARG = ltree, - PROCEDURE = ltree_ne, - COMMUTATOR = '<>', - NEGATOR = '=', - RESTRICT = neqsel, - JOIN = neqjoinsel -); - ---util functions - -CREATE OR REPLACE FUNCTION subltree(ltree,int4,int4) -RETURNS ltree -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION subpath(ltree,int4,int4) -RETURNS ltree -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION subpath(ltree,int4) -RETURNS ltree -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION index(ltree,ltree) -RETURNS int4 -AS 'MODULE_PATHNAME', 'ltree_index' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION index(ltree,ltree,int4) -RETURNS int4 -AS 'MODULE_PATHNAME', 'ltree_index' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION nlevel(ltree) -RETURNS int4 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION ltree2text(ltree) -RETURNS text -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION text2ltree(text) -RETURNS ltree -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION lca(_ltree) -RETURNS ltree -AS 'MODULE_PATHNAME','_lca' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION lca(ltree,ltree) -RETURNS ltree -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION lca(ltree,ltree,ltree) -RETURNS ltree -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION lca(ltree,ltree,ltree,ltree) -RETURNS ltree -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION lca(ltree,ltree,ltree,ltree,ltree) -RETURNS ltree -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION lca(ltree,ltree,ltree,ltree,ltree,ltree) -RETURNS ltree -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION lca(ltree,ltree,ltree,ltree,ltree,ltree,ltree) -RETURNS ltree -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION lca(ltree,ltree,ltree,ltree,ltree,ltree,ltree,ltree) -RETURNS ltree -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION ltree_isparent(ltree,ltree) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION ltree_risparent(ltree,ltree) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION ltree_addltree(ltree,ltree) -RETURNS ltree -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION ltree_addtext(ltree,text) -RETURNS ltree -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION ltree_textadd(text,ltree) -RETURNS ltree -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION ltreeparentsel(internal, oid, internal, integer) -RETURNS float8 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OPERATOR @> ( - LEFTARG = ltree, - RIGHTARG = ltree, - PROCEDURE = ltree_isparent, - COMMUTATOR = '<@', - RESTRICT = ltreeparentsel, - JOIN = contjoinsel -); - -CREATE OPERATOR ^@> ( - LEFTARG = ltree, - RIGHTARG = ltree, - PROCEDURE = ltree_isparent, - COMMUTATOR = '^<@', - RESTRICT = contsel, - JOIN = contjoinsel -); - -CREATE OPERATOR <@ ( - LEFTARG = ltree, - RIGHTARG = ltree, - PROCEDURE = ltree_risparent, - COMMUTATOR = '@>', - RESTRICT = ltreeparentsel, - JOIN = contjoinsel -); - -CREATE OPERATOR ^<@ ( - LEFTARG = ltree, - RIGHTARG = ltree, - PROCEDURE = ltree_risparent, - COMMUTATOR = '^@>', - RESTRICT = contsel, - JOIN = contjoinsel -); - -CREATE OPERATOR || ( - LEFTARG = ltree, - RIGHTARG = ltree, - PROCEDURE = ltree_addltree -); - -CREATE OPERATOR || ( - LEFTARG = ltree, - RIGHTARG = text, - PROCEDURE = ltree_addtext -); - -CREATE OPERATOR || ( - LEFTARG = text, - RIGHTARG = ltree, - PROCEDURE = ltree_textadd -); - - --- B-tree support - -CREATE OPERATOR CLASS ltree_ops - DEFAULT FOR TYPE ltree USING btree AS - OPERATOR 1 < , - OPERATOR 2 <= , - OPERATOR 3 = , - OPERATOR 4 >= , - OPERATOR 5 > , - FUNCTION 1 ltree_cmp(ltree, ltree); - - ---lquery type -CREATE OR REPLACE FUNCTION lquery_in(cstring) -RETURNS lquery -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION lquery_out(lquery) -RETURNS cstring -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT; - -CREATE TYPE lquery ( - INTERNALLENGTH = -1, - INPUT = lquery_in, - OUTPUT = lquery_out, - STORAGE = extended -); - -CREATE OR REPLACE FUNCTION ltq_regex(ltree,lquery) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION ltq_rregex(lquery,ltree) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OPERATOR ~ ( - LEFTARG = ltree, - RIGHTARG = lquery, - PROCEDURE = ltq_regex, - COMMUTATOR = '~', - RESTRICT = contsel, - JOIN = contjoinsel -); - -CREATE OPERATOR ~ ( - LEFTARG = lquery, - RIGHTARG = ltree, - PROCEDURE = ltq_rregex, - COMMUTATOR = '~', - RESTRICT = contsel, - JOIN = contjoinsel -); - ---not-indexed -CREATE OPERATOR ^~ ( - LEFTARG = ltree, - RIGHTARG = lquery, - PROCEDURE = ltq_regex, - COMMUTATOR = '^~', - RESTRICT = contsel, - JOIN = contjoinsel -); - -CREATE OPERATOR ^~ ( - LEFTARG = lquery, - RIGHTARG = ltree, - PROCEDURE = ltq_rregex, - COMMUTATOR = '^~', - RESTRICT = contsel, - JOIN = contjoinsel -); - -CREATE OR REPLACE FUNCTION lt_q_regex(ltree,_lquery) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION lt_q_rregex(_lquery,ltree) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OPERATOR ? ( - LEFTARG = ltree, - RIGHTARG = _lquery, - PROCEDURE = lt_q_regex, - COMMUTATOR = '?', - RESTRICT = contsel, - JOIN = contjoinsel -); - -CREATE OPERATOR ? ( - LEFTARG = _lquery, - RIGHTARG = ltree, - PROCEDURE = lt_q_rregex, - COMMUTATOR = '?', - RESTRICT = contsel, - JOIN = contjoinsel -); - ---not-indexed -CREATE OPERATOR ^? ( - LEFTARG = ltree, - RIGHTARG = _lquery, - PROCEDURE = lt_q_regex, - COMMUTATOR = '^?', - RESTRICT = contsel, - JOIN = contjoinsel -); - -CREATE OPERATOR ^? ( - LEFTARG = _lquery, - RIGHTARG = ltree, - PROCEDURE = lt_q_rregex, - COMMUTATOR = '^?', - RESTRICT = contsel, - JOIN = contjoinsel -); - -CREATE OR REPLACE FUNCTION ltxtq_in(cstring) -RETURNS ltxtquery -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION ltxtq_out(ltxtquery) -RETURNS cstring -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT; - -CREATE TYPE ltxtquery ( - INTERNALLENGTH = -1, - INPUT = ltxtq_in, - OUTPUT = ltxtq_out, - STORAGE = extended -); - --- operations WITH ltxtquery - -CREATE OR REPLACE FUNCTION ltxtq_exec(ltree, ltxtquery) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION ltxtq_rexec(ltxtquery, ltree) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OPERATOR @ ( - LEFTARG = ltree, - RIGHTARG = ltxtquery, - PROCEDURE = ltxtq_exec, - COMMUTATOR = '@', - RESTRICT = contsel, - JOIN = contjoinsel -); - -CREATE OPERATOR @ ( - LEFTARG = ltxtquery, - RIGHTARG = ltree, - PROCEDURE = ltxtq_rexec, - COMMUTATOR = '@', - RESTRICT = contsel, - JOIN = contjoinsel -); - ---not-indexed -CREATE OPERATOR ^@ ( - LEFTARG = ltree, - RIGHTARG = ltxtquery, - PROCEDURE = ltxtq_exec, - COMMUTATOR = '^@', - RESTRICT = contsel, - JOIN = contjoinsel -); - -CREATE OPERATOR ^@ ( - LEFTARG = ltxtquery, - RIGHTARG = ltree, - PROCEDURE = ltxtq_rexec, - COMMUTATOR = '^@', - RESTRICT = contsel, - JOIN = contjoinsel -); - ---GiST support for ltree -CREATE OR REPLACE FUNCTION ltree_gist_in(cstring) -RETURNS ltree_gist -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION ltree_gist_out(ltree_gist) -RETURNS cstring -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT; - -CREATE TYPE ltree_gist ( - internallength = -1, - input = ltree_gist_in, - output = ltree_gist_out, - storage = plain -); - - -CREATE OR REPLACE FUNCTION ltree_consistent(internal,internal,int2,oid,internal) -RETURNS bool as 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION ltree_compress(internal) -RETURNS internal as 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION ltree_decompress(internal) -RETURNS internal as 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION ltree_penalty(internal,internal,internal) -RETURNS internal as 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION ltree_picksplit(internal, internal) -RETURNS internal as 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION ltree_union(internal, internal) -RETURNS int4 as 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION ltree_same(internal, internal, internal) -RETURNS internal as 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; - -CREATE OPERATOR CLASS gist_ltree_ops - DEFAULT FOR TYPE ltree USING gist AS - OPERATOR 1 < , - OPERATOR 2 <= , - OPERATOR 3 = , - OPERATOR 4 >= , - OPERATOR 5 > , - OPERATOR 10 @> , - OPERATOR 11 <@ , - OPERATOR 12 ~ (ltree, lquery) , - OPERATOR 13 ~ (lquery, ltree) , - OPERATOR 14 @ (ltree, ltxtquery) , - OPERATOR 15 @ (ltxtquery, ltree) , - OPERATOR 16 ? (ltree, _lquery) , - OPERATOR 17 ? (_lquery, ltree) , - FUNCTION 1 ltree_consistent (internal, internal, int2, oid, internal), - FUNCTION 2 ltree_union (internal, internal), - FUNCTION 3 ltree_compress (internal), - FUNCTION 4 ltree_decompress (internal), - FUNCTION 5 ltree_penalty (internal, internal, internal), - FUNCTION 6 ltree_picksplit (internal, internal), - FUNCTION 7 ltree_same (internal, internal, internal), - STORAGE ltree_gist; - - --- arrays of ltree - -CREATE OR REPLACE FUNCTION _ltree_isparent(_ltree,ltree) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION _ltree_r_isparent(ltree,_ltree) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION _ltree_risparent(_ltree,ltree) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION _ltree_r_risparent(ltree,_ltree) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION _ltq_regex(_ltree,lquery) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION _ltq_rregex(lquery,_ltree) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION _lt_q_regex(_ltree,_lquery) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION _lt_q_rregex(_lquery,_ltree) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION _ltxtq_exec(_ltree, ltxtquery) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION _ltxtq_rexec(ltxtquery, _ltree) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OPERATOR @> ( - LEFTARG = _ltree, - RIGHTARG = ltree, - PROCEDURE = _ltree_isparent, - COMMUTATOR = '<@', - RESTRICT = contsel, - JOIN = contjoinsel -); - -CREATE OPERATOR <@ ( - LEFTARG = ltree, - RIGHTARG = _ltree, - PROCEDURE = _ltree_r_isparent, - COMMUTATOR = '@>', - RESTRICT = contsel, - JOIN = contjoinsel -); - -CREATE OPERATOR <@ ( - LEFTARG = _ltree, - RIGHTARG = ltree, - PROCEDURE = _ltree_risparent, - COMMUTATOR = '@>', - RESTRICT = contsel, - JOIN = contjoinsel -); - -CREATE OPERATOR @> ( - LEFTARG = ltree, - RIGHTARG = _ltree, - PROCEDURE = _ltree_r_risparent, - COMMUTATOR = '<@', - RESTRICT = contsel, - JOIN = contjoinsel -); - -CREATE OPERATOR ~ ( - LEFTARG = _ltree, - RIGHTARG = lquery, - PROCEDURE = _ltq_regex, - COMMUTATOR = '~', - RESTRICT = contsel, - JOIN = contjoinsel -); - -CREATE OPERATOR ~ ( - LEFTARG = lquery, - RIGHTARG = _ltree, - PROCEDURE = _ltq_rregex, - COMMUTATOR = '~', - RESTRICT = contsel, - JOIN = contjoinsel -); - -CREATE OPERATOR ? ( - LEFTARG = _ltree, - RIGHTARG = _lquery, - PROCEDURE = _lt_q_regex, - COMMUTATOR = '?', - RESTRICT = contsel, - JOIN = contjoinsel -); - -CREATE OPERATOR ? ( - LEFTARG = _lquery, - RIGHTARG = _ltree, - PROCEDURE = _lt_q_rregex, - COMMUTATOR = '?', - RESTRICT = contsel, - JOIN = contjoinsel -); - -CREATE OPERATOR @ ( - LEFTARG = _ltree, - RIGHTARG = ltxtquery, - PROCEDURE = _ltxtq_exec, - COMMUTATOR = '@', - RESTRICT = contsel, - JOIN = contjoinsel -); - -CREATE OPERATOR @ ( - LEFTARG = ltxtquery, - RIGHTARG = _ltree, - PROCEDURE = _ltxtq_rexec, - COMMUTATOR = '@', - RESTRICT = contsel, - JOIN = contjoinsel -); - - ---not indexed -CREATE OPERATOR ^@> ( - LEFTARG = _ltree, - RIGHTARG = ltree, - PROCEDURE = _ltree_isparent, - COMMUTATOR = '^<@', - RESTRICT = contsel, - JOIN = contjoinsel -); - -CREATE OPERATOR ^<@ ( - LEFTARG = ltree, - RIGHTARG = _ltree, - PROCEDURE = _ltree_r_isparent, - COMMUTATOR = '^@>', - RESTRICT = contsel, - JOIN = contjoinsel -); - -CREATE OPERATOR ^<@ ( - LEFTARG = _ltree, - RIGHTARG = ltree, - PROCEDURE = _ltree_risparent, - COMMUTATOR = '^@>', - RESTRICT = contsel, - JOIN = contjoinsel -); - -CREATE OPERATOR ^@> ( - LEFTARG = ltree, - RIGHTARG = _ltree, - PROCEDURE = _ltree_r_risparent, - COMMUTATOR = '^<@', - RESTRICT = contsel, - JOIN = contjoinsel -); - -CREATE OPERATOR ^~ ( - LEFTARG = _ltree, - RIGHTARG = lquery, - PROCEDURE = _ltq_regex, - COMMUTATOR = '^~', - RESTRICT = contsel, - JOIN = contjoinsel -); - -CREATE OPERATOR ^~ ( - LEFTARG = lquery, - RIGHTARG = _ltree, - PROCEDURE = _ltq_rregex, - COMMUTATOR = '^~', - RESTRICT = contsel, - JOIN = contjoinsel -); - -CREATE OPERATOR ^? ( - LEFTARG = _ltree, - RIGHTARG = _lquery, - PROCEDURE = _lt_q_regex, - COMMUTATOR = '^?', - RESTRICT = contsel, - JOIN = contjoinsel -); - -CREATE OPERATOR ^? ( - LEFTARG = _lquery, - RIGHTARG = _ltree, - PROCEDURE = _lt_q_rregex, - COMMUTATOR = '^?', - RESTRICT = contsel, - JOIN = contjoinsel -); - -CREATE OPERATOR ^@ ( - LEFTARG = _ltree, - RIGHTARG = ltxtquery, - PROCEDURE = _ltxtq_exec, - COMMUTATOR = '^@', - RESTRICT = contsel, - JOIN = contjoinsel -); - -CREATE OPERATOR ^@ ( - LEFTARG = ltxtquery, - RIGHTARG = _ltree, - PROCEDURE = _ltxtq_rexec, - COMMUTATOR = '^@', - RESTRICT = contsel, - JOIN = contjoinsel -); - ---extractors -CREATE OR REPLACE FUNCTION _ltree_extract_isparent(_ltree,ltree) -RETURNS ltree -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OPERATOR ?@> ( - LEFTARG = _ltree, - RIGHTARG = ltree, - PROCEDURE = _ltree_extract_isparent -); - -CREATE OR REPLACE FUNCTION _ltree_extract_risparent(_ltree,ltree) -RETURNS ltree -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OPERATOR ?<@ ( - LEFTARG = _ltree, - RIGHTARG = ltree, - PROCEDURE = _ltree_extract_risparent -); - -CREATE OR REPLACE FUNCTION _ltq_extract_regex(_ltree,lquery) -RETURNS ltree -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OPERATOR ?~ ( - LEFTARG = _ltree, - RIGHTARG = lquery, - PROCEDURE = _ltq_extract_regex -); - -CREATE OR REPLACE FUNCTION _ltxtq_extract_exec(_ltree,ltxtquery) -RETURNS ltree -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OPERATOR ?@ ( - LEFTARG = _ltree, - RIGHTARG = ltxtquery, - PROCEDURE = _ltxtq_extract_exec -); - ---GiST support for ltree[] -CREATE OR REPLACE FUNCTION _ltree_consistent(internal,internal,int2,oid,internal) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION _ltree_compress(internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION _ltree_penalty(internal,internal,internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION _ltree_picksplit(internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION _ltree_union(internal, internal) -RETURNS int4 -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION _ltree_same(internal, internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OPERATOR CLASS gist__ltree_ops - DEFAULT FOR TYPE _ltree USING gist AS - OPERATOR 10 <@ (_ltree, ltree), - OPERATOR 11 @> (ltree, _ltree), - OPERATOR 12 ~ (_ltree, lquery), - OPERATOR 13 ~ (lquery, _ltree), - OPERATOR 14 @ (_ltree, ltxtquery), - OPERATOR 15 @ (ltxtquery, _ltree), - OPERATOR 16 ? (_ltree, _lquery), - OPERATOR 17 ? (_lquery, _ltree), - FUNCTION 1 _ltree_consistent (internal, internal, int2, oid, internal), - FUNCTION 2 _ltree_union (internal, internal), - FUNCTION 3 _ltree_compress (internal), - FUNCTION 4 ltree_decompress (internal), - FUNCTION 5 _ltree_penalty (internal, internal, internal), - FUNCTION 6 _ltree_picksplit (internal, internal), - FUNCTION 7 _ltree_same (internal, internal, internal), - STORAGE ltree_gist; diff --git a/contrib/ltree/sql/ltree.sql b/contrib/ltree/sql/ltree.sql index 50aad78d3c..46cfa41a41 100644 --- a/contrib/ltree/sql/ltree.sql +++ b/contrib/ltree/sql/ltree.sql @@ -1,12 +1,4 @@ --- --- first, define the datatype. Turn off echoing so that expected file --- does not depend on contents of ltree.sql. --- -SET client_min_messages = warning; -\set ECHO none -\i ltree.sql -\set ECHO all -RESET client_min_messages; +CREATE EXTENSION ltree; SELECT ''::ltree; SELECT '1'::ltree; diff --git a/contrib/ltree/uninstall_ltree.sql b/contrib/ltree/uninstall_ltree.sql deleted file mode 100644 index 2e10b10e97..0000000000 --- a/contrib/ltree/uninstall_ltree.sql +++ /dev/null @@ -1,240 +0,0 @@ -/* contrib/ltree/uninstall_ltree.sql */ - --- Adjust this setting to control where the objects get dropped. -SET search_path = public; - -DROP OPERATOR CLASS gist__ltree_ops USING gist; - -DROP FUNCTION _ltree_same(internal, internal, internal); - -DROP FUNCTION _ltree_union(internal, internal); - -DROP FUNCTION _ltree_picksplit(internal, internal); - -DROP FUNCTION _ltree_penalty(internal,internal,internal); - -DROP FUNCTION _ltree_compress(internal); - -DROP FUNCTION _ltree_consistent(internal,internal,int2,oid,internal); - -DROP OPERATOR ?@ (_ltree, ltxtquery); - -DROP FUNCTION _ltxtq_extract_exec(_ltree,ltxtquery); - -DROP OPERATOR ?~ (_ltree, lquery); - -DROP FUNCTION _ltq_extract_regex(_ltree,lquery); - -DROP OPERATOR ?<@ (_ltree, ltree); - -DROP FUNCTION _ltree_extract_risparent(_ltree,ltree); - -DROP OPERATOR ?@> (_ltree, ltree); - -DROP FUNCTION _ltree_extract_isparent(_ltree,ltree); - -DROP OPERATOR ^@ (ltxtquery, _ltree); - -DROP OPERATOR ^@ (_ltree, ltxtquery); - -DROP OPERATOR ^? (_lquery, _ltree); - -DROP OPERATOR ^? (_ltree, _lquery); - -DROP OPERATOR ^~ (lquery, _ltree); - -DROP OPERATOR ^~ (_ltree, lquery); - -DROP OPERATOR ^@> (ltree, _ltree); - -DROP OPERATOR ^<@ (_ltree, ltree); - -DROP OPERATOR ^<@ (ltree, _ltree); - -DROP OPERATOR ^@> (_ltree, ltree); - -DROP OPERATOR @ (ltxtquery, _ltree); - -DROP OPERATOR @ (_ltree, ltxtquery); - -DROP OPERATOR ? (_lquery, _ltree); - -DROP OPERATOR ? (_ltree, _lquery); - -DROP OPERATOR ~ (lquery, _ltree); - -DROP OPERATOR ~ (_ltree, lquery); - -DROP OPERATOR @> (ltree, _ltree); - -DROP OPERATOR <@ (_ltree, ltree); - -DROP OPERATOR <@ (ltree, _ltree); - -DROP OPERATOR @> (_ltree, ltree); - -DROP FUNCTION _ltxtq_rexec(ltxtquery, _ltree); - -DROP FUNCTION _ltxtq_exec(_ltree, ltxtquery); - -DROP FUNCTION _lt_q_rregex(_lquery,_ltree); - -DROP FUNCTION _lt_q_regex(_ltree,_lquery); - -DROP FUNCTION _ltq_rregex(lquery,_ltree); - -DROP FUNCTION _ltq_regex(_ltree,lquery); - -DROP FUNCTION _ltree_r_risparent(ltree,_ltree); - -DROP FUNCTION _ltree_risparent(_ltree,ltree); - -DROP FUNCTION _ltree_r_isparent(ltree,_ltree); - -DROP FUNCTION _ltree_isparent(_ltree,ltree); - -DROP OPERATOR CLASS gist_ltree_ops USING gist; - -DROP FUNCTION ltree_same(internal, internal, internal); - -DROP FUNCTION ltree_union(internal, internal); - -DROP FUNCTION ltree_picksplit(internal, internal); - -DROP FUNCTION ltree_penalty(internal,internal,internal); - -DROP FUNCTION ltree_decompress(internal); - -DROP FUNCTION ltree_compress(internal); - -DROP FUNCTION ltree_consistent(internal,internal,int2,oid,internal); - -DROP TYPE ltree_gist CASCADE; - -DROP OPERATOR ^@ (ltxtquery, ltree); - -DROP OPERATOR ^@ (ltree, ltxtquery); - -DROP OPERATOR @ (ltxtquery, ltree); - -DROP OPERATOR @ (ltree, ltxtquery); - -DROP FUNCTION ltxtq_rexec(ltxtquery, ltree); - -DROP FUNCTION ltxtq_exec(ltree, ltxtquery); - -DROP TYPE ltxtquery CASCADE; - -DROP OPERATOR ^? (_lquery, ltree); - -DROP OPERATOR ^? (ltree, _lquery); - -DROP OPERATOR ? (_lquery, ltree); - -DROP OPERATOR ? (ltree, _lquery); - -DROP FUNCTION lt_q_rregex(_lquery,ltree); - -DROP FUNCTION lt_q_regex(ltree,_lquery); - -DROP OPERATOR ^~ (lquery, ltree); - -DROP OPERATOR ^~ (ltree, lquery); - -DROP OPERATOR ~ (lquery, ltree); - -DROP OPERATOR ~ (ltree, lquery); - -DROP FUNCTION ltq_rregex(lquery,ltree); - -DROP FUNCTION ltq_regex(ltree,lquery); - -DROP TYPE lquery CASCADE; - -DROP OPERATOR CLASS ltree_ops USING btree; - -DROP OPERATOR || (text, ltree); - -DROP OPERATOR || (ltree, text); - -DROP OPERATOR || (ltree, ltree); - -DROP OPERATOR ^<@ (ltree, ltree); - -DROP OPERATOR <@ (ltree, ltree); - -DROP OPERATOR ^@> (ltree, ltree); - -DROP OPERATOR @> (ltree, ltree); - -DROP FUNCTION ltreeparentsel(internal, oid, internal, integer); - -DROP FUNCTION ltree_textadd(text,ltree); - -DROP FUNCTION ltree_addtext(ltree,text); - -DROP FUNCTION ltree_addltree(ltree,ltree); - -DROP FUNCTION ltree_risparent(ltree,ltree); - -DROP FUNCTION ltree_isparent(ltree,ltree); - -DROP FUNCTION lca(ltree,ltree,ltree,ltree,ltree,ltree,ltree,ltree); - -DROP FUNCTION lca(ltree,ltree,ltree,ltree,ltree,ltree,ltree); - -DROP FUNCTION lca(ltree,ltree,ltree,ltree,ltree,ltree); - -DROP FUNCTION lca(ltree,ltree,ltree,ltree,ltree); - -DROP FUNCTION lca(ltree,ltree,ltree,ltree); - -DROP FUNCTION lca(ltree,ltree,ltree); - -DROP FUNCTION lca(ltree,ltree); - -DROP FUNCTION lca(_ltree); - -DROP FUNCTION text2ltree(text); - -DROP FUNCTION ltree2text(ltree); - -DROP FUNCTION nlevel(ltree); - -DROP FUNCTION index(ltree,ltree,int4); - -DROP FUNCTION index(ltree,ltree); - -DROP FUNCTION subpath(ltree,int4); - -DROP FUNCTION subpath(ltree,int4,int4); - -DROP FUNCTION subltree(ltree,int4,int4); - -DROP OPERATOR <> (ltree, ltree); - -DROP OPERATOR = (ltree, ltree); - -DROP OPERATOR > (ltree, ltree); - -DROP OPERATOR >= (ltree, ltree); - -DROP OPERATOR <= (ltree, ltree); - -DROP OPERATOR < (ltree, ltree); - -DROP FUNCTION ltree_ne(ltree,ltree); - -DROP FUNCTION ltree_gt(ltree,ltree); - -DROP FUNCTION ltree_ge(ltree,ltree); - -DROP FUNCTION ltree_eq(ltree,ltree); - -DROP FUNCTION ltree_le(ltree,ltree); - -DROP FUNCTION ltree_lt(ltree,ltree); - -DROP FUNCTION ltree_cmp(ltree,ltree); - -DROP TYPE ltree CASCADE; diff --git a/contrib/pageinspect/.gitignore b/contrib/pageinspect/.gitignore deleted file mode 100644 index fad166aaee..0000000000 --- a/contrib/pageinspect/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/pageinspect.sql diff --git a/contrib/pageinspect/Makefile b/contrib/pageinspect/Makefile index a8ae51dfd1..13ba6d3911 100644 --- a/contrib/pageinspect/Makefile +++ b/contrib/pageinspect/Makefile @@ -1,15 +1,10 @@ -#------------------------------------------------------------------------- -# -# pageinspect Makefile -# # contrib/pageinspect/Makefile -# -#------------------------------------------------------------------------- MODULE_big = pageinspect OBJS = rawpage.o heapfuncs.o btreefuncs.o fsmfuncs.o -DATA_built = pageinspect.sql -DATA = uninstall_pageinspect.sql + +EXTENSION = pageinspect +DATA = pageinspect--1.0.sql pageinspect--unpackaged--1.0.sql ifdef USE_PGXS PG_CONFIG = pg_config diff --git a/contrib/pageinspect/pageinspect--1.0.sql b/contrib/pageinspect/pageinspect--1.0.sql new file mode 100644 index 0000000000..b6e46063ba --- /dev/null +++ b/contrib/pageinspect/pageinspect--1.0.sql @@ -0,0 +1,104 @@ +/* contrib/pageinspect/pageinspect--1.0.sql */ + +-- +-- get_raw_page() +-- +CREATE OR REPLACE FUNCTION get_raw_page(text, int4) +RETURNS bytea +AS 'MODULE_PATHNAME', 'get_raw_page' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION get_raw_page(text, text, int4) +RETURNS bytea +AS 'MODULE_PATHNAME', 'get_raw_page_fork' +LANGUAGE C STRICT; + +-- +-- page_header() +-- +CREATE OR REPLACE FUNCTION page_header(IN page bytea, + OUT lsn text, + OUT tli smallint, + OUT flags smallint, + OUT lower smallint, + OUT upper smallint, + OUT special smallint, + OUT pagesize smallint, + OUT version smallint, + OUT prune_xid xid) +AS 'MODULE_PATHNAME', 'page_header' +LANGUAGE C STRICT; + +-- +-- heap_page_items() +-- +CREATE OR REPLACE FUNCTION heap_page_items(IN page bytea, + OUT lp smallint, + OUT lp_off smallint, + OUT lp_flags smallint, + OUT lp_len smallint, + OUT t_xmin xid, + OUT t_xmax xid, + OUT t_field3 int4, + OUT t_ctid tid, + OUT t_infomask2 smallint, + OUT t_infomask smallint, + OUT t_hoff smallint, + OUT t_bits text, + OUT t_oid oid) +RETURNS SETOF record +AS 'MODULE_PATHNAME', 'heap_page_items' +LANGUAGE C STRICT; + +-- +-- bt_metap() +-- +CREATE OR REPLACE FUNCTION bt_metap(IN relname text, + OUT magic int4, + OUT version int4, + OUT root int4, + OUT level int4, + OUT fastroot int4, + OUT fastlevel int4) +AS 'MODULE_PATHNAME', 'bt_metap' +LANGUAGE C STRICT; + +-- +-- bt_page_stats() +-- +CREATE OR REPLACE FUNCTION bt_page_stats(IN relname text, IN blkno int4, + OUT blkno int4, + OUT type "char", + OUT live_items int4, + OUT dead_items int4, + OUT avg_item_size int4, + OUT page_size int4, + OUT free_size int4, + OUT btpo_prev int4, + OUT btpo_next int4, + OUT btpo int4, + OUT btpo_flags int4) +AS 'MODULE_PATHNAME', 'bt_page_stats' +LANGUAGE C STRICT; + +-- +-- bt_page_items() +-- +CREATE OR REPLACE FUNCTION bt_page_items(IN relname text, IN blkno int4, + OUT itemoffset smallint, + OUT ctid tid, + OUT itemlen smallint, + OUT nulls bool, + OUT vars bool, + OUT data text) +RETURNS SETOF record +AS 'MODULE_PATHNAME', 'bt_page_items' +LANGUAGE C STRICT; + +-- +-- fsm_page_contents() +-- +CREATE OR REPLACE FUNCTION fsm_page_contents(IN page bytea) +RETURNS text +AS 'MODULE_PATHNAME', 'fsm_page_contents' +LANGUAGE C STRICT; diff --git a/contrib/pageinspect/pageinspect--unpackaged--1.0.sql b/contrib/pageinspect/pageinspect--unpackaged--1.0.sql new file mode 100644 index 0000000000..a9d1b52a42 --- /dev/null +++ b/contrib/pageinspect/pageinspect--unpackaged--1.0.sql @@ -0,0 +1,10 @@ +/* contrib/pageinspect/pageinspect--unpackaged--1.0.sql */ + +ALTER EXTENSION pageinspect ADD function get_raw_page(text,integer); +ALTER EXTENSION pageinspect ADD function get_raw_page(text,text,integer); +ALTER EXTENSION pageinspect ADD function page_header(bytea); +ALTER EXTENSION pageinspect ADD function heap_page_items(bytea); +ALTER EXTENSION pageinspect ADD function bt_metap(text); +ALTER EXTENSION pageinspect ADD function bt_page_stats(text,integer); +ALTER EXTENSION pageinspect ADD function bt_page_items(text,integer); +ALTER EXTENSION pageinspect ADD function fsm_page_contents(bytea); diff --git a/contrib/pageinspect/pageinspect.control b/contrib/pageinspect/pageinspect.control new file mode 100644 index 0000000000..f9da0e86ed --- /dev/null +++ b/contrib/pageinspect/pageinspect.control @@ -0,0 +1,5 @@ +# pageinspect extension +comment = 'inspect the contents of database pages at a low level' +default_version = '1.0' +module_pathname = '$libdir/pageinspect' +relocatable = true diff --git a/contrib/pageinspect/pageinspect.sql.in b/contrib/pageinspect/pageinspect.sql.in deleted file mode 100644 index d6058d409f..0000000000 --- a/contrib/pageinspect/pageinspect.sql.in +++ /dev/null @@ -1,107 +0,0 @@ -/* contrib/pageinspect/pageinspect.sql.in */ - --- Adjust this setting to control where the objects get created. -SET search_path = public; - --- --- get_raw_page() --- -CREATE OR REPLACE FUNCTION get_raw_page(text, int4) -RETURNS bytea -AS 'MODULE_PATHNAME', 'get_raw_page' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION get_raw_page(text, text, int4) -RETURNS bytea -AS 'MODULE_PATHNAME', 'get_raw_page_fork' -LANGUAGE C STRICT; - --- --- page_header() --- -CREATE OR REPLACE FUNCTION page_header(IN page bytea, - OUT lsn text, - OUT tli smallint, - OUT flags smallint, - OUT lower smallint, - OUT upper smallint, - OUT special smallint, - OUT pagesize smallint, - OUT version smallint, - OUT prune_xid xid) -AS 'MODULE_PATHNAME', 'page_header' -LANGUAGE C STRICT; - --- --- heap_page_items() --- -CREATE OR REPLACE FUNCTION heap_page_items(IN page bytea, - OUT lp smallint, - OUT lp_off smallint, - OUT lp_flags smallint, - OUT lp_len smallint, - OUT t_xmin xid, - OUT t_xmax xid, - OUT t_field3 int4, - OUT t_ctid tid, - OUT t_infomask2 smallint, - OUT t_infomask smallint, - OUT t_hoff smallint, - OUT t_bits text, - OUT t_oid oid) -RETURNS SETOF record -AS 'MODULE_PATHNAME', 'heap_page_items' -LANGUAGE C STRICT; - --- --- bt_metap() --- -CREATE OR REPLACE FUNCTION bt_metap(IN relname text, - OUT magic int4, - OUT version int4, - OUT root int4, - OUT level int4, - OUT fastroot int4, - OUT fastlevel int4) -AS 'MODULE_PATHNAME', 'bt_metap' -LANGUAGE C STRICT; - --- --- bt_page_stats() --- -CREATE OR REPLACE FUNCTION bt_page_stats(IN relname text, IN blkno int4, - OUT blkno int4, - OUT type "char", - OUT live_items int4, - OUT dead_items int4, - OUT avg_item_size int4, - OUT page_size int4, - OUT free_size int4, - OUT btpo_prev int4, - OUT btpo_next int4, - OUT btpo int4, - OUT btpo_flags int4) -AS 'MODULE_PATHNAME', 'bt_page_stats' -LANGUAGE C STRICT; - --- --- bt_page_items() --- -CREATE OR REPLACE FUNCTION bt_page_items(IN relname text, IN blkno int4, - OUT itemoffset smallint, - OUT ctid tid, - OUT itemlen smallint, - OUT nulls bool, - OUT vars bool, - OUT data text) -RETURNS SETOF record -AS 'MODULE_PATHNAME', 'bt_page_items' -LANGUAGE C STRICT; - --- --- fsm_page_contents() --- -CREATE OR REPLACE FUNCTION fsm_page_contents(IN page bytea) -RETURNS text -AS 'MODULE_PATHNAME', 'fsm_page_contents' -LANGUAGE C STRICT; diff --git a/contrib/pageinspect/uninstall_pageinspect.sql b/contrib/pageinspect/uninstall_pageinspect.sql deleted file mode 100644 index a980fd7d01..0000000000 --- a/contrib/pageinspect/uninstall_pageinspect.sql +++ /dev/null @@ -1,13 +0,0 @@ -/* contrib/pageinspect/uninstall_pageinspect.sql */ - --- Adjust this setting to control where the objects get dropped. -SET search_path = public; - -DROP FUNCTION get_raw_page(text, int4); -DROP FUNCTION get_raw_page(text, text, int4); -DROP FUNCTION page_header(bytea); -DROP FUNCTION heap_page_items(bytea); -DROP FUNCTION bt_metap(text); -DROP FUNCTION bt_page_stats(text, int4); -DROP FUNCTION bt_page_items(text, int4); -DROP FUNCTION fsm_page_contents(bytea); diff --git a/contrib/pg_buffercache/.gitignore b/contrib/pg_buffercache/.gitignore deleted file mode 100644 index fea8b0b3d4..0000000000 --- a/contrib/pg_buffercache/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/pg_buffercache.sql diff --git a/contrib/pg_buffercache/Makefile b/contrib/pg_buffercache/Makefile index ffcf0c3b92..323c0ac8ed 100644 --- a/contrib/pg_buffercache/Makefile +++ b/contrib/pg_buffercache/Makefile @@ -3,8 +3,8 @@ MODULE_big = pg_buffercache OBJS = pg_buffercache_pages.o -DATA_built = pg_buffercache.sql -DATA = uninstall_pg_buffercache.sql +EXTENSION = pg_buffercache +DATA = pg_buffercache--1.0.sql pg_buffercache--unpackaged--1.0.sql ifdef USE_PGXS PG_CONFIG = pg_config diff --git a/contrib/pg_buffercache/pg_buffercache--1.0.sql b/contrib/pg_buffercache/pg_buffercache--1.0.sql new file mode 100644 index 0000000000..a49d171e04 --- /dev/null +++ b/contrib/pg_buffercache/pg_buffercache--1.0.sql @@ -0,0 +1,17 @@ +/* contrib/pg_buffercache/pg_buffercache--1.0.sql */ + +-- Register the function. +CREATE OR REPLACE FUNCTION pg_buffercache_pages() +RETURNS SETOF RECORD +AS 'MODULE_PATHNAME', 'pg_buffercache_pages' +LANGUAGE C; + +-- Create a view for convenient access. +CREATE VIEW pg_buffercache AS + SELECT P.* FROM pg_buffercache_pages() AS P + (bufferid integer, relfilenode oid, reltablespace oid, reldatabase oid, + relforknumber int2, relblocknumber int8, isdirty bool, usagecount int2); + +-- Don't want these to be available to public. +REVOKE ALL ON FUNCTION pg_buffercache_pages() FROM PUBLIC; +REVOKE ALL ON pg_buffercache FROM PUBLIC; diff --git a/contrib/pg_buffercache/pg_buffercache--unpackaged--1.0.sql b/contrib/pg_buffercache/pg_buffercache--unpackaged--1.0.sql new file mode 100644 index 0000000000..f00a954d86 --- /dev/null +++ b/contrib/pg_buffercache/pg_buffercache--unpackaged--1.0.sql @@ -0,0 +1,4 @@ +/* contrib/pg_buffercache/pg_buffercache--unpackaged--1.0.sql */ + +ALTER EXTENSION pg_buffercache ADD function pg_buffercache_pages(); +ALTER EXTENSION pg_buffercache ADD view pg_buffercache; diff --git a/contrib/pg_buffercache/pg_buffercache.control b/contrib/pg_buffercache/pg_buffercache.control new file mode 100644 index 0000000000..709513c334 --- /dev/null +++ b/contrib/pg_buffercache/pg_buffercache.control @@ -0,0 +1,5 @@ +# pg_buffercache extension +comment = 'examine the shared buffer cache' +default_version = '1.0' +module_pathname = '$libdir/pg_buffercache' +relocatable = true diff --git a/contrib/pg_buffercache/pg_buffercache.sql.in b/contrib/pg_buffercache/pg_buffercache.sql.in deleted file mode 100644 index 88b5e643ac..0000000000 --- a/contrib/pg_buffercache/pg_buffercache.sql.in +++ /dev/null @@ -1,20 +0,0 @@ -/* contrib/pg_buffercache/pg_buffercache.sql.in */ - --- Adjust this setting to control where the objects get created. -SET search_path = public; - --- Register the function. -CREATE OR REPLACE FUNCTION pg_buffercache_pages() -RETURNS SETOF RECORD -AS 'MODULE_PATHNAME', 'pg_buffercache_pages' -LANGUAGE C; - --- Create a view for convenient access. -CREATE VIEW pg_buffercache AS - SELECT P.* FROM pg_buffercache_pages() AS P - (bufferid integer, relfilenode oid, reltablespace oid, reldatabase oid, - relforknumber int2, relblocknumber int8, isdirty bool, usagecount int2); - --- Don't want these to be available at public. -REVOKE ALL ON FUNCTION pg_buffercache_pages() FROM PUBLIC; -REVOKE ALL ON pg_buffercache FROM PUBLIC; diff --git a/contrib/pg_buffercache/uninstall_pg_buffercache.sql b/contrib/pg_buffercache/uninstall_pg_buffercache.sql deleted file mode 100644 index 62617cd20d..0000000000 --- a/contrib/pg_buffercache/uninstall_pg_buffercache.sql +++ /dev/null @@ -1,8 +0,0 @@ -/* contrib/pg_buffercache/uninstall_pg_buffercache.sql */ - --- Adjust this setting to control where the objects get dropped. -SET search_path = public; - -DROP VIEW pg_buffercache; - -DROP FUNCTION pg_buffercache_pages(); diff --git a/contrib/pg_freespacemap/.gitignore b/contrib/pg_freespacemap/.gitignore deleted file mode 100644 index 645433a39f..0000000000 --- a/contrib/pg_freespacemap/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/pg_freespacemap.sql diff --git a/contrib/pg_freespacemap/Makefile b/contrib/pg_freespacemap/Makefile index 65539d5d71..b2e3ba3aa3 100644 --- a/contrib/pg_freespacemap/Makefile +++ b/contrib/pg_freespacemap/Makefile @@ -3,8 +3,8 @@ MODULE_big = pg_freespacemap OBJS = pg_freespacemap.o -DATA_built = pg_freespacemap.sql -DATA = uninstall_pg_freespacemap.sql +EXTENSION = pg_freespacemap +DATA = pg_freespacemap--1.0.sql pg_freespacemap--unpackaged--1.0.sql ifdef USE_PGXS PG_CONFIG = pg_config diff --git a/contrib/pg_freespacemap/pg_freespacemap--1.0.sql b/contrib/pg_freespacemap/pg_freespacemap--1.0.sql new file mode 100644 index 0000000000..19f099ee37 --- /dev/null +++ b/contrib/pg_freespacemap/pg_freespacemap--1.0.sql @@ -0,0 +1,22 @@ +/* contrib/pg_freespacemap/pg_freespacemap--1.0.sql */ + +-- Register the C function. +CREATE OR REPLACE FUNCTION pg_freespace(regclass, bigint) +RETURNS int2 +AS 'MODULE_PATHNAME', 'pg_freespace' +LANGUAGE C STRICT; + +-- pg_freespace shows the recorded space avail at each block in a relation +CREATE OR REPLACE FUNCTION + pg_freespace(rel regclass, blkno OUT bigint, avail OUT int2) +RETURNS SETOF RECORD +AS $$ + SELECT blkno, pg_freespace($1, blkno) AS avail + FROM generate_series(0, pg_relation_size($1) / current_setting('block_size')::bigint - 1) AS blkno; +$$ +LANGUAGE SQL; + + +-- Don't want these to be available to public. +REVOKE ALL ON FUNCTION pg_freespace(regclass, bigint) FROM PUBLIC; +REVOKE ALL ON FUNCTION pg_freespace(regclass) FROM PUBLIC; diff --git a/contrib/pg_freespacemap/pg_freespacemap--unpackaged--1.0.sql b/contrib/pg_freespacemap/pg_freespacemap--unpackaged--1.0.sql new file mode 100644 index 0000000000..4c7487fa4e --- /dev/null +++ b/contrib/pg_freespacemap/pg_freespacemap--unpackaged--1.0.sql @@ -0,0 +1,4 @@ +/* contrib/pg_freespacemap/pg_freespacemap--unpackaged--1.0.sql */ + +ALTER EXTENSION pg_freespacemap ADD function pg_freespace(regclass,bigint); +ALTER EXTENSION pg_freespacemap ADD function pg_freespace(regclass); diff --git a/contrib/pg_freespacemap/pg_freespacemap.control b/contrib/pg_freespacemap/pg_freespacemap.control new file mode 100644 index 0000000000..34b695ff75 --- /dev/null +++ b/contrib/pg_freespacemap/pg_freespacemap.control @@ -0,0 +1,5 @@ +# pg_freespacemap extension +comment = 'examine the free space map (FSM)' +default_version = '1.0' +module_pathname = '$libdir/pg_freespacemap' +relocatable = true diff --git a/contrib/pg_freespacemap/pg_freespacemap.sql.in b/contrib/pg_freespacemap/pg_freespacemap.sql.in deleted file mode 100644 index 5ef8ba46ad..0000000000 --- a/contrib/pg_freespacemap/pg_freespacemap.sql.in +++ /dev/null @@ -1,26 +0,0 @@ -/* contrib/pg_freespacemap/pg_freespacemap.sql.in */ - --- Adjust this setting to control where the objects get created. -SET search_path = public; - - --- Register the C function. -CREATE OR REPLACE FUNCTION pg_freespace(regclass, bigint) -RETURNS int2 -AS 'MODULE_PATHNAME', 'pg_freespace' -LANGUAGE C STRICT; - --- pg_freespace shows the recorded space avail at each block in a relation -CREATE OR REPLACE FUNCTION - pg_freespace(rel regclass, blkno OUT bigint, avail OUT int2) -RETURNS SETOF RECORD -AS $$ - SELECT blkno, pg_freespace($1, blkno) AS avail - FROM generate_series(0, pg_relation_size($1) / current_setting('block_size')::bigint - 1) AS blkno; -$$ -LANGUAGE SQL; - - --- Don't want these to be available to public. -REVOKE ALL ON FUNCTION pg_freespace(regclass, bigint) FROM PUBLIC; -REVOKE ALL ON FUNCTION pg_freespace(regclass) FROM PUBLIC; diff --git a/contrib/pg_freespacemap/uninstall_pg_freespacemap.sql b/contrib/pg_freespacemap/uninstall_pg_freespacemap.sql deleted file mode 100644 index 168506708a..0000000000 --- a/contrib/pg_freespacemap/uninstall_pg_freespacemap.sql +++ /dev/null @@ -1,7 +0,0 @@ -/* contrib/pg_freespacemap/uninstall_pg_freespacemap.sql */ - --- Adjust this setting to control where the objects get dropped. -SET search_path = public; - -DROP FUNCTION pg_freespace(regclass, bigint); -DROP FUNCTION pg_freespace(regclass); diff --git a/contrib/pg_stat_statements/.gitignore b/contrib/pg_stat_statements/.gitignore deleted file mode 100644 index 2ca3f068d0..0000000000 --- a/contrib/pg_stat_statements/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/pg_stat_statements.sql diff --git a/contrib/pg_stat_statements/Makefile b/contrib/pg_stat_statements/Makefile index efb26a90f6..e086fd8a82 100644 --- a/contrib/pg_stat_statements/Makefile +++ b/contrib/pg_stat_statements/Makefile @@ -1,10 +1,11 @@ # contrib/pg_stat_statements/Makefile MODULE_big = pg_stat_statements -DATA_built = pg_stat_statements.sql -DATA = uninstall_pg_stat_statements.sql OBJS = pg_stat_statements.o +EXTENSION = pg_stat_statements +DATA = pg_stat_statements--1.0.sql pg_stat_statements--unpackaged--1.0.sql + ifdef USE_PGXS PG_CONFIG = pg_config PGXS := $(shell $(PG_CONFIG) --pgxs) diff --git a/contrib/pg_stat_statements/pg_stat_statements--1.0.sql b/contrib/pg_stat_statements/pg_stat_statements--1.0.sql new file mode 100644 index 0000000000..e17b82c616 --- /dev/null +++ b/contrib/pg_stat_statements/pg_stat_statements--1.0.sql @@ -0,0 +1,36 @@ +/* contrib/pg_stat_statements/pg_stat_statements--1.0.sql */ + +-- Register functions. +CREATE FUNCTION pg_stat_statements_reset() +RETURNS void +AS 'MODULE_PATHNAME' +LANGUAGE C; + +CREATE FUNCTION pg_stat_statements( + OUT userid oid, + OUT dbid oid, + OUT query text, + OUT calls int8, + OUT total_time float8, + OUT rows int8, + OUT shared_blks_hit int8, + OUT shared_blks_read int8, + OUT shared_blks_written int8, + OUT local_blks_hit int8, + OUT local_blks_read int8, + OUT local_blks_written int8, + OUT temp_blks_read int8, + OUT temp_blks_written int8 +) +RETURNS SETOF record +AS 'MODULE_PATHNAME' +LANGUAGE C; + +-- Register a view on the function for ease of use. +CREATE VIEW pg_stat_statements AS + SELECT * FROM pg_stat_statements(); + +GRANT SELECT ON pg_stat_statements TO PUBLIC; + +-- Don't want this to be available to non-superusers. +REVOKE ALL ON FUNCTION pg_stat_statements_reset() FROM PUBLIC; diff --git a/contrib/pg_stat_statements/pg_stat_statements--unpackaged--1.0.sql b/contrib/pg_stat_statements/pg_stat_statements--unpackaged--1.0.sql new file mode 100644 index 0000000000..9dda85cbdf --- /dev/null +++ b/contrib/pg_stat_statements/pg_stat_statements--unpackaged--1.0.sql @@ -0,0 +1,5 @@ +/* contrib/pg_stat_statements/pg_stat_statements--unpackaged--1.0.sql */ + +ALTER EXTENSION pg_stat_statements ADD function pg_stat_statements_reset(); +ALTER EXTENSION pg_stat_statements ADD function pg_stat_statements(); +ALTER EXTENSION pg_stat_statements ADD view pg_stat_statements; diff --git a/contrib/pg_stat_statements/pg_stat_statements.control b/contrib/pg_stat_statements/pg_stat_statements.control new file mode 100644 index 0000000000..6f9a947122 --- /dev/null +++ b/contrib/pg_stat_statements/pg_stat_statements.control @@ -0,0 +1,5 @@ +# pg_stat_statements extension +comment = 'track execution statistics of all SQL statements executed' +default_version = '1.0' +module_pathname = '$libdir/pg_stat_statements' +relocatable = true diff --git a/contrib/pg_stat_statements/pg_stat_statements.sql.in b/contrib/pg_stat_statements/pg_stat_statements.sql.in deleted file mode 100644 index 56d5fd591a..0000000000 --- a/contrib/pg_stat_statements/pg_stat_statements.sql.in +++ /dev/null @@ -1,39 +0,0 @@ -/* contrib/pg_stat_statements/pg_stat_statements.sql.in */ - --- Adjust this setting to control where the objects get created. -SET search_path = public; - --- Register functions. -CREATE FUNCTION pg_stat_statements_reset() -RETURNS void -AS 'MODULE_PATHNAME' -LANGUAGE C; - -CREATE FUNCTION pg_stat_statements( - OUT userid oid, - OUT dbid oid, - OUT query text, - OUT calls int8, - OUT total_time float8, - OUT rows int8, - OUT shared_blks_hit int8, - OUT shared_blks_read int8, - OUT shared_blks_written int8, - OUT local_blks_hit int8, - OUT local_blks_read int8, - OUT local_blks_written int8, - OUT temp_blks_read int8, - OUT temp_blks_written int8 -) -RETURNS SETOF record -AS 'MODULE_PATHNAME' -LANGUAGE C; - --- Register a view on the function for ease of use. -CREATE VIEW pg_stat_statements AS - SELECT * FROM pg_stat_statements(); - -GRANT SELECT ON pg_stat_statements TO PUBLIC; - --- Don't want this to be available to non-superusers. -REVOKE ALL ON FUNCTION pg_stat_statements_reset() FROM PUBLIC; diff --git a/contrib/pg_stat_statements/uninstall_pg_stat_statements.sql b/contrib/pg_stat_statements/uninstall_pg_stat_statements.sql deleted file mode 100644 index d2832a2986..0000000000 --- a/contrib/pg_stat_statements/uninstall_pg_stat_statements.sql +++ /dev/null @@ -1,8 +0,0 @@ -/* contrib/pg_stat_statements/uninstall_pg_stat_statements.sql */ - --- Adjust this setting to control where the objects get dropped. -SET search_path = public; - -DROP VIEW pg_stat_statements; -DROP FUNCTION pg_stat_statements(); -DROP FUNCTION pg_stat_statements_reset(); diff --git a/contrib/pg_test_fsync/Makefile b/contrib/pg_test_fsync/Makefile index a9365667b3..b456429098 100644 --- a/contrib/pg_test_fsync/Makefile +++ b/contrib/pg_test_fsync/Makefile @@ -1,6 +1,3 @@ -# -# Makefile for pg_test_fsync -# # contrib/pg_test_fsync/Makefile PGFILEDESC = "pg_test_fsync - test various disk sync methods" diff --git a/contrib/pg_trgm/.gitignore b/contrib/pg_trgm/.gitignore index 9cda826ca4..19b6c5ba42 100644 --- a/contrib/pg_trgm/.gitignore +++ b/contrib/pg_trgm/.gitignore @@ -1,3 +1,2 @@ -/pg_trgm.sql # Generated subdirectories /results/ diff --git a/contrib/pg_trgm/Makefile b/contrib/pg_trgm/Makefile index cf2dec795c..64fd69f2cb 100644 --- a/contrib/pg_trgm/Makefile +++ b/contrib/pg_trgm/Makefile @@ -3,8 +3,9 @@ MODULE_big = pg_trgm OBJS = trgm_op.o trgm_gist.o trgm_gin.o -DATA_built = pg_trgm.sql -DATA = uninstall_pg_trgm.sql +EXTENSION = pg_trgm +DATA = pg_trgm--1.0.sql pg_trgm--unpackaged--1.0.sql + REGRESS = pg_trgm ifdef USE_PGXS diff --git a/contrib/pg_trgm/expected/pg_trgm.out b/contrib/pg_trgm/expected/pg_trgm.out index 6e73af2a32..e7af7d4890 100644 --- a/contrib/pg_trgm/expected/pg_trgm.out +++ b/contrib/pg_trgm/expected/pg_trgm.out @@ -1,10 +1,4 @@ --- --- first, define the datatype. Turn off echoing so that expected file --- does not depend on contents of pg_tgrm.sql. --- -SET client_min_messages = warning; -\set ECHO none -RESET client_min_messages; +CREATE EXTENSION pg_trgm; select show_trgm(''); show_trgm ----------- diff --git a/contrib/pg_trgm/pg_trgm--1.0.sql b/contrib/pg_trgm/pg_trgm--1.0.sql new file mode 100644 index 0000000000..fc31728dcc --- /dev/null +++ b/contrib/pg_trgm/pg_trgm--1.0.sql @@ -0,0 +1,152 @@ +/* contrib/pg_trgm/pg_trgm--1.0.sql */ + +CREATE OR REPLACE FUNCTION set_limit(float4) +RETURNS float4 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT VOLATILE; + +CREATE OR REPLACE FUNCTION show_limit() +RETURNS float4 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT STABLE; + +CREATE OR REPLACE FUNCTION show_trgm(text) +RETURNS _text +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION similarity(text,text) +RETURNS float4 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION similarity_op(text,text) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT STABLE; -- stable because depends on trgm_limit + +CREATE OPERATOR % ( + LEFTARG = text, + RIGHTARG = text, + PROCEDURE = similarity_op, + COMMUTATOR = '%', + RESTRICT = contsel, + JOIN = contjoinsel +); + +CREATE OR REPLACE FUNCTION similarity_dist(text,text) +RETURNS float4 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OPERATOR <-> ( + LEFTARG = text, + RIGHTARG = text, + PROCEDURE = similarity_dist, + COMMUTATOR = '<->' +); + +-- gist key +CREATE OR REPLACE FUNCTION gtrgm_in(cstring) +RETURNS gtrgm +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION gtrgm_out(gtrgm) +RETURNS cstring +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT; + +CREATE TYPE gtrgm ( + INTERNALLENGTH = -1, + INPUT = gtrgm_in, + OUTPUT = gtrgm_out +); + +-- support functions for gist +CREATE OR REPLACE FUNCTION gtrgm_consistent(internal,text,int,oid,internal) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gtrgm_distance(internal,text,int,oid) +RETURNS float8 +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gtrgm_compress(internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gtrgm_decompress(internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gtrgm_penalty(internal,internal,internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gtrgm_picksplit(internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gtrgm_union(bytea, internal) +RETURNS _int4 +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gtrgm_same(gtrgm, gtrgm, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +-- create the operator class for gist +CREATE OPERATOR CLASS gist_trgm_ops +FOR TYPE text USING gist +AS + OPERATOR 1 % (text, text), + OPERATOR 2 <-> (text, text) FOR ORDER BY pg_catalog.float_ops, + OPERATOR 3 pg_catalog.~~ (text, text), + OPERATOR 4 pg_catalog.~~* (text, text), + FUNCTION 1 gtrgm_consistent (internal, text, int, oid, internal), + FUNCTION 2 gtrgm_union (bytea, internal), + FUNCTION 3 gtrgm_compress (internal), + FUNCTION 4 gtrgm_decompress (internal), + FUNCTION 5 gtrgm_penalty (internal, internal, internal), + FUNCTION 6 gtrgm_picksplit (internal, internal), + FUNCTION 7 gtrgm_same (gtrgm, gtrgm, internal), + FUNCTION 8 gtrgm_distance (internal, text, int, oid), + STORAGE gtrgm; + +-- support functions for gin +CREATE OR REPLACE FUNCTION gin_extract_value_trgm(text, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gin_extract_query_trgm(text, internal, int2, internal, internal, internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gin_trgm_consistent(internal, int2, text, int4, internal, internal, internal, internal) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +-- create the operator class for gin +CREATE OPERATOR CLASS gin_trgm_ops +FOR TYPE text USING gin +AS + OPERATOR 1 % (text, text), + OPERATOR 3 pg_catalog.~~ (text, text), + OPERATOR 4 pg_catalog.~~* (text, text), + FUNCTION 1 btint4cmp (int4, int4), + FUNCTION 2 gin_extract_value_trgm (text, internal), + FUNCTION 3 gin_extract_query_trgm (text, internal, int2, internal, internal, internal, internal), + FUNCTION 4 gin_trgm_consistent (internal, int2, text, int4, internal, internal, internal, internal), + STORAGE int4; diff --git a/contrib/pg_trgm/pg_trgm--unpackaged--1.0.sql b/contrib/pg_trgm/pg_trgm--unpackaged--1.0.sql new file mode 100644 index 0000000000..ffcb8c1e09 --- /dev/null +++ b/contrib/pg_trgm/pg_trgm--unpackaged--1.0.sql @@ -0,0 +1,28 @@ +/* contrib/pg_trgm/pg_trgm--unpackaged--1.0.sql */ + +ALTER EXTENSION pg_trgm ADD function set_limit(real); +ALTER EXTENSION pg_trgm ADD function show_limit(); +ALTER EXTENSION pg_trgm ADD function show_trgm(text); +ALTER EXTENSION pg_trgm ADD function similarity(text,text); +ALTER EXTENSION pg_trgm ADD function similarity_op(text,text); +ALTER EXTENSION pg_trgm ADD operator %(text,text); +ALTER EXTENSION pg_trgm ADD function similarity_dist(text,text); +ALTER EXTENSION pg_trgm ADD operator <->(text,text); +ALTER EXTENSION pg_trgm ADD type gtrgm; +ALTER EXTENSION pg_trgm ADD function gtrgm_in(cstring); +ALTER EXTENSION pg_trgm ADD function gtrgm_out(gtrgm); +ALTER EXTENSION pg_trgm ADD function gtrgm_consistent(internal,text,integer,oid,internal); +ALTER EXTENSION pg_trgm ADD function gtrgm_distance(internal,text,integer,oid); +ALTER EXTENSION pg_trgm ADD function gtrgm_compress(internal); +ALTER EXTENSION pg_trgm ADD function gtrgm_decompress(internal); +ALTER EXTENSION pg_trgm ADD function gtrgm_penalty(internal,internal,internal); +ALTER EXTENSION pg_trgm ADD function gtrgm_picksplit(internal,internal); +ALTER EXTENSION pg_trgm ADD function gtrgm_union(bytea,internal); +ALTER EXTENSION pg_trgm ADD function gtrgm_same(gtrgm,gtrgm,internal); +ALTER EXTENSION pg_trgm ADD operator family gist_trgm_ops using gist; +ALTER EXTENSION pg_trgm ADD operator class gist_trgm_ops using gist; +ALTER EXTENSION pg_trgm ADD function gin_extract_value_trgm(text,internal); +ALTER EXTENSION pg_trgm ADD function gin_extract_query_trgm(text,internal,smallint,internal,internal,internal,internal); +ALTER EXTENSION pg_trgm ADD function gin_trgm_consistent(internal,smallint,text,integer,internal,internal,internal,internal); +ALTER EXTENSION pg_trgm ADD operator family gin_trgm_ops using gin; +ALTER EXTENSION pg_trgm ADD operator class gin_trgm_ops using gin; diff --git a/contrib/pg_trgm/pg_trgm.control b/contrib/pg_trgm/pg_trgm.control new file mode 100644 index 0000000000..70404d881d --- /dev/null +++ b/contrib/pg_trgm/pg_trgm.control @@ -0,0 +1,5 @@ +# pg_trgm extension +comment = 'text similarity measurement and index searching based on trigrams' +default_version = '1.0' +module_pathname = '$libdir/pg_trgm' +relocatable = true diff --git a/contrib/pg_trgm/pg_trgm.sql.in b/contrib/pg_trgm/pg_trgm.sql.in deleted file mode 100644 index 12a8c21071..0000000000 --- a/contrib/pg_trgm/pg_trgm.sql.in +++ /dev/null @@ -1,155 +0,0 @@ -/* contrib/pg_trgm/pg_trgm.sql.in */ - --- Adjust this setting to control where the objects get created. -SET search_path = public; - -CREATE OR REPLACE FUNCTION set_limit(float4) -RETURNS float4 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT VOLATILE; - -CREATE OR REPLACE FUNCTION show_limit() -RETURNS float4 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT STABLE; - -CREATE OR REPLACE FUNCTION show_trgm(text) -RETURNS _text -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION similarity(text,text) -RETURNS float4 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION similarity_op(text,text) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT STABLE; -- stable because depends on trgm_limit - -CREATE OPERATOR % ( - LEFTARG = text, - RIGHTARG = text, - PROCEDURE = similarity_op, - COMMUTATOR = '%', - RESTRICT = contsel, - JOIN = contjoinsel -); - -CREATE OR REPLACE FUNCTION similarity_dist(text,text) -RETURNS float4 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OPERATOR <-> ( - LEFTARG = text, - RIGHTARG = text, - PROCEDURE = similarity_dist, - COMMUTATOR = '<->' -); - --- gist key -CREATE OR REPLACE FUNCTION gtrgm_in(cstring) -RETURNS gtrgm -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION gtrgm_out(gtrgm) -RETURNS cstring -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT; - -CREATE TYPE gtrgm ( - INTERNALLENGTH = -1, - INPUT = gtrgm_in, - OUTPUT = gtrgm_out -); - --- support functions for gist -CREATE OR REPLACE FUNCTION gtrgm_consistent(internal,text,int,oid,internal) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gtrgm_distance(internal,text,int,oid) -RETURNS float8 -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gtrgm_compress(internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gtrgm_decompress(internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gtrgm_penalty(internal,internal,internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gtrgm_picksplit(internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gtrgm_union(bytea, internal) -RETURNS _int4 -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gtrgm_same(gtrgm, gtrgm, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - --- create the operator class for gist -CREATE OPERATOR CLASS gist_trgm_ops -FOR TYPE text USING gist -AS - OPERATOR 1 % (text, text), - OPERATOR 2 <-> (text, text) FOR ORDER BY pg_catalog.float_ops, - OPERATOR 3 pg_catalog.~~ (text, text), - OPERATOR 4 pg_catalog.~~* (text, text), - FUNCTION 1 gtrgm_consistent (internal, text, int, oid, internal), - FUNCTION 2 gtrgm_union (bytea, internal), - FUNCTION 3 gtrgm_compress (internal), - FUNCTION 4 gtrgm_decompress (internal), - FUNCTION 5 gtrgm_penalty (internal, internal, internal), - FUNCTION 6 gtrgm_picksplit (internal, internal), - FUNCTION 7 gtrgm_same (gtrgm, gtrgm, internal), - FUNCTION 8 gtrgm_distance (internal, text, int, oid), - STORAGE gtrgm; - --- support functions for gin -CREATE OR REPLACE FUNCTION gin_extract_value_trgm(text, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gin_extract_query_trgm(text, internal, int2, internal, internal, internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gin_trgm_consistent(internal, int2, text, int4, internal, internal, internal, internal) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - --- create the operator class for gin -CREATE OPERATOR CLASS gin_trgm_ops -FOR TYPE text USING gin -AS - OPERATOR 1 % (text, text), - OPERATOR 3 pg_catalog.~~ (text, text), - OPERATOR 4 pg_catalog.~~* (text, text), - FUNCTION 1 btint4cmp (int4, int4), - FUNCTION 2 gin_extract_value_trgm (text, internal), - FUNCTION 3 gin_extract_query_trgm (text, internal, int2, internal, internal, internal, internal), - FUNCTION 4 gin_trgm_consistent (internal, int2, text, int4, internal, internal, internal, internal), - STORAGE int4; diff --git a/contrib/pg_trgm/sql/pg_trgm.sql b/contrib/pg_trgm/sql/pg_trgm.sql index b8209344c3..ea902f602f 100644 --- a/contrib/pg_trgm/sql/pg_trgm.sql +++ b/contrib/pg_trgm/sql/pg_trgm.sql @@ -1,12 +1,4 @@ --- --- first, define the datatype. Turn off echoing so that expected file --- does not depend on contents of pg_tgrm.sql. --- -SET client_min_messages = warning; -\set ECHO none -\i pg_trgm.sql -\set ECHO all -RESET client_min_messages; +CREATE EXTENSION pg_trgm; select show_trgm(''); select show_trgm('(*&^$@%@'); diff --git a/contrib/pg_trgm/uninstall_pg_trgm.sql b/contrib/pg_trgm/uninstall_pg_trgm.sql deleted file mode 100644 index 961e40ca48..0000000000 --- a/contrib/pg_trgm/uninstall_pg_trgm.sql +++ /dev/null @@ -1,48 +0,0 @@ -/* contrib/pg_trgm/uninstall_pg_trgm.sql */ - --- Adjust this setting to control where the objects get dropped. -SET search_path = public; - -DROP OPERATOR CLASS gist_trgm_ops USING gist; - -DROP FUNCTION gtrgm_same(gtrgm, gtrgm, internal); - -DROP FUNCTION gtrgm_union(bytea, internal); - -DROP FUNCTION gtrgm_picksplit(internal, internal); - -DROP FUNCTION gtrgm_penalty(internal,internal,internal); - -DROP FUNCTION gtrgm_decompress(internal); - -DROP FUNCTION gtrgm_compress(internal); - -DROP FUNCTION gtrgm_consistent(internal,text,int,oid,internal); - -DROP FUNCTION gtrgm_distance(internal,text,int,oid); - -DROP TYPE gtrgm CASCADE; - -DROP OPERATOR CLASS gin_trgm_ops USING gin; - -DROP FUNCTION gin_extract_value_trgm(text, internal); - -DROP FUNCTION gin_extract_query_trgm(text, internal, int2, internal, internal, internal, internal); - -DROP FUNCTION gin_trgm_consistent(internal, int2, text, int4, internal, internal, internal, internal); - -DROP OPERATOR % (text, text); - -DROP FUNCTION similarity_op(text,text); - -DROP OPERATOR <-> (text, text); - -DROP FUNCTION similarity_dist(text,text); - -DROP FUNCTION similarity(text,text); - -DROP FUNCTION show_trgm(text); - -DROP FUNCTION show_limit(); - -DROP FUNCTION set_limit(float4); diff --git a/contrib/pg_upgrade/Makefile b/contrib/pg_upgrade/Makefile index 79ac234b5e..8f3fd7c9bb 100644 --- a/contrib/pg_upgrade/Makefile +++ b/contrib/pg_upgrade/Makefile @@ -1,6 +1,3 @@ -# -# Makefile for pg_upgrade -# # contrib/pg_upgrade/Makefile PGFILEDESC = "pg_upgrade - an in-place binary upgrade utility" diff --git a/contrib/pg_upgrade_support/Makefile b/contrib/pg_upgrade_support/Makefile index e23c9bebcb..f7def160c3 100644 --- a/contrib/pg_upgrade_support/Makefile +++ b/contrib/pg_upgrade_support/Makefile @@ -1,6 +1,3 @@ -# -# Makefile for pg_upgrade_support -# # contrib/pg_upgrade_support/Makefile PGFILEDESC = "pg_upgrade_support - server-side functions for pg_upgrade" diff --git a/contrib/pgcrypto/.gitignore b/contrib/pgcrypto/.gitignore index 07b24d98f0..19b6c5ba42 100644 --- a/contrib/pgcrypto/.gitignore +++ b/contrib/pgcrypto/.gitignore @@ -1,3 +1,2 @@ -/pgcrypto.sql # Generated subdirectories /results/ diff --git a/contrib/pgcrypto/Makefile b/contrib/pgcrypto/Makefile index f429fab4ed..dadec953c2 100644 --- a/contrib/pgcrypto/Makefile +++ b/contrib/pgcrypto/Makefile @@ -1,6 +1,4 @@ -# # contrib/pgcrypto/Makefile -# INT_SRCS = md5.c sha1.c sha2.c internal.c internal-sha2.c blf.c rijndael.c \ fortuna.c random.c pgp-mpi-internal.c imath.c @@ -26,9 +24,9 @@ SRCS = pgcrypto.c px.c px-hmac.c px-crypt.c \ MODULE_big = pgcrypto OBJS = $(SRCS:.c=.o) -DATA_built = pgcrypto.sql -DATA = uninstall_pgcrypto.sql -EXTRA_CLEAN = gen-rtab + +EXTENSION = pgcrypto +DATA = pgcrypto--1.0.sql pgcrypto--unpackaged--1.0.sql REGRESS = init md5 sha1 hmac-md5 hmac-sha1 blowfish rijndael \ $(CF_TESTS) \ @@ -36,6 +34,7 @@ REGRESS = init md5 sha1 hmac-md5 hmac-sha1 blowfish rijndael \ pgp-armor pgp-decrypt pgp-encrypt $(CF_PGP_TESTS) \ pgp-pubkey-decrypt pgp-pubkey-encrypt pgp-info +EXTRA_CLEAN = gen-rtab ifdef USE_PGXS PG_CONFIG = pg_config diff --git a/contrib/pgcrypto/expected/init.out b/contrib/pgcrypto/expected/init.out index 4cb1081997..bd8f8e1380 100644 --- a/contrib/pgcrypto/expected/init.out +++ b/contrib/pgcrypto/expected/init.out @@ -1,13 +1,7 @@ -- -- init pgcrypto -- --- --- first, define the functions. Turn off echoing so that expected file --- does not depend on contents of pgcrypto.sql. --- -SET client_min_messages = warning; -\set ECHO none -RESET client_min_messages; +CREATE EXTENSION pgcrypto; -- ensure consistent test output regardless of the default bytea format SET bytea_output TO escape; -- check for encoding fn's diff --git a/contrib/pgcrypto/pgcrypto--1.0.sql b/contrib/pgcrypto/pgcrypto--1.0.sql new file mode 100644 index 0000000000..29b489fbe5 --- /dev/null +++ b/contrib/pgcrypto/pgcrypto--1.0.sql @@ -0,0 +1,199 @@ +/* contrib/pgcrypto/pgcrypto--1.0.sql */ + +CREATE OR REPLACE FUNCTION digest(text, text) +RETURNS bytea +AS 'MODULE_PATHNAME', 'pg_digest' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION digest(bytea, text) +RETURNS bytea +AS 'MODULE_PATHNAME', 'pg_digest' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION hmac(text, text, text) +RETURNS bytea +AS 'MODULE_PATHNAME', 'pg_hmac' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION hmac(bytea, bytea, text) +RETURNS bytea +AS 'MODULE_PATHNAME', 'pg_hmac' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION crypt(text, text) +RETURNS text +AS 'MODULE_PATHNAME', 'pg_crypt' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gen_salt(text) +RETURNS text +AS 'MODULE_PATHNAME', 'pg_gen_salt' +LANGUAGE C VOLATILE STRICT; + +CREATE OR REPLACE FUNCTION gen_salt(text, int4) +RETURNS text +AS 'MODULE_PATHNAME', 'pg_gen_salt_rounds' +LANGUAGE C VOLATILE STRICT; + +CREATE OR REPLACE FUNCTION encrypt(bytea, bytea, text) +RETURNS bytea +AS 'MODULE_PATHNAME', 'pg_encrypt' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION decrypt(bytea, bytea, text) +RETURNS bytea +AS 'MODULE_PATHNAME', 'pg_decrypt' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION encrypt_iv(bytea, bytea, bytea, text) +RETURNS bytea +AS 'MODULE_PATHNAME', 'pg_encrypt_iv' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION decrypt_iv(bytea, bytea, bytea, text) +RETURNS bytea +AS 'MODULE_PATHNAME', 'pg_decrypt_iv' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gen_random_bytes(int4) +RETURNS bytea +AS 'MODULE_PATHNAME', 'pg_random_bytes' +LANGUAGE 'C' VOLATILE STRICT; + +-- +-- pgp_sym_encrypt(data, key) +-- +CREATE OR REPLACE FUNCTION pgp_sym_encrypt(text, text) +RETURNS bytea +AS 'MODULE_PATHNAME', 'pgp_sym_encrypt_text' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION pgp_sym_encrypt_bytea(bytea, text) +RETURNS bytea +AS 'MODULE_PATHNAME', 'pgp_sym_encrypt_bytea' +LANGUAGE C STRICT; + +-- +-- pgp_sym_encrypt(data, key, args) +-- +CREATE OR REPLACE FUNCTION pgp_sym_encrypt(text, text, text) +RETURNS bytea +AS 'MODULE_PATHNAME', 'pgp_sym_encrypt_text' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION pgp_sym_encrypt_bytea(bytea, text, text) +RETURNS bytea +AS 'MODULE_PATHNAME', 'pgp_sym_encrypt_bytea' +LANGUAGE C STRICT; + +-- +-- pgp_sym_decrypt(data, key) +-- +CREATE OR REPLACE FUNCTION pgp_sym_decrypt(bytea, text) +RETURNS text +AS 'MODULE_PATHNAME', 'pgp_sym_decrypt_text' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION pgp_sym_decrypt_bytea(bytea, text) +RETURNS bytea +AS 'MODULE_PATHNAME', 'pgp_sym_decrypt_bytea' +LANGUAGE C IMMUTABLE STRICT; + +-- +-- pgp_sym_decrypt(data, key, args) +-- +CREATE OR REPLACE FUNCTION pgp_sym_decrypt(bytea, text, text) +RETURNS text +AS 'MODULE_PATHNAME', 'pgp_sym_decrypt_text' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION pgp_sym_decrypt_bytea(bytea, text, text) +RETURNS bytea +AS 'MODULE_PATHNAME', 'pgp_sym_decrypt_bytea' +LANGUAGE C IMMUTABLE STRICT; + +-- +-- pgp_pub_encrypt(data, key) +-- +CREATE OR REPLACE FUNCTION pgp_pub_encrypt(text, bytea) +RETURNS bytea +AS 'MODULE_PATHNAME', 'pgp_pub_encrypt_text' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION pgp_pub_encrypt_bytea(bytea, bytea) +RETURNS bytea +AS 'MODULE_PATHNAME', 'pgp_pub_encrypt_bytea' +LANGUAGE C STRICT; + +-- +-- pgp_pub_encrypt(data, key, args) +-- +CREATE OR REPLACE FUNCTION pgp_pub_encrypt(text, bytea, text) +RETURNS bytea +AS 'MODULE_PATHNAME', 'pgp_pub_encrypt_text' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION pgp_pub_encrypt_bytea(bytea, bytea, text) +RETURNS bytea +AS 'MODULE_PATHNAME', 'pgp_pub_encrypt_bytea' +LANGUAGE C STRICT; + +-- +-- pgp_pub_decrypt(data, key) +-- +CREATE OR REPLACE FUNCTION pgp_pub_decrypt(bytea, bytea) +RETURNS text +AS 'MODULE_PATHNAME', 'pgp_pub_decrypt_text' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION pgp_pub_decrypt_bytea(bytea, bytea) +RETURNS bytea +AS 'MODULE_PATHNAME', 'pgp_pub_decrypt_bytea' +LANGUAGE C IMMUTABLE STRICT; + +-- +-- pgp_pub_decrypt(data, key, psw) +-- +CREATE OR REPLACE FUNCTION pgp_pub_decrypt(bytea, bytea, text) +RETURNS text +AS 'MODULE_PATHNAME', 'pgp_pub_decrypt_text' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION pgp_pub_decrypt_bytea(bytea, bytea, text) +RETURNS bytea +AS 'MODULE_PATHNAME', 'pgp_pub_decrypt_bytea' +LANGUAGE C IMMUTABLE STRICT; + +-- +-- pgp_pub_decrypt(data, key, psw, arg) +-- +CREATE OR REPLACE FUNCTION pgp_pub_decrypt(bytea, bytea, text, text) +RETURNS text +AS 'MODULE_PATHNAME', 'pgp_pub_decrypt_text' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION pgp_pub_decrypt_bytea(bytea, bytea, text, text) +RETURNS bytea +AS 'MODULE_PATHNAME', 'pgp_pub_decrypt_bytea' +LANGUAGE C IMMUTABLE STRICT; + +-- +-- PGP key ID +-- +CREATE OR REPLACE FUNCTION pgp_key_id(bytea) +RETURNS text +AS 'MODULE_PATHNAME', 'pgp_key_id_w' +LANGUAGE C IMMUTABLE STRICT; + +-- +-- pgp armor +-- +CREATE OR REPLACE FUNCTION armor(bytea) +RETURNS text +AS 'MODULE_PATHNAME', 'pg_armor' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION dearmor(text) +RETURNS bytea +AS 'MODULE_PATHNAME', 'pg_dearmor' +LANGUAGE C IMMUTABLE STRICT; diff --git a/contrib/pgcrypto/pgcrypto--unpackaged--1.0.sql b/contrib/pgcrypto/pgcrypto--unpackaged--1.0.sql new file mode 100644 index 0000000000..64f0cdf23a --- /dev/null +++ b/contrib/pgcrypto/pgcrypto--unpackaged--1.0.sql @@ -0,0 +1,35 @@ +/* contrib/pgcrypto/pgcrypto--unpackaged--1.0.sql */ + +ALTER EXTENSION pgcrypto ADD function digest(text,text); +ALTER EXTENSION pgcrypto ADD function digest(bytea,text); +ALTER EXTENSION pgcrypto ADD function hmac(text,text,text); +ALTER EXTENSION pgcrypto ADD function hmac(bytea,bytea,text); +ALTER EXTENSION pgcrypto ADD function crypt(text,text); +ALTER EXTENSION pgcrypto ADD function gen_salt(text); +ALTER EXTENSION pgcrypto ADD function gen_salt(text,integer); +ALTER EXTENSION pgcrypto ADD function encrypt(bytea,bytea,text); +ALTER EXTENSION pgcrypto ADD function decrypt(bytea,bytea,text); +ALTER EXTENSION pgcrypto ADD function encrypt_iv(bytea,bytea,bytea,text); +ALTER EXTENSION pgcrypto ADD function decrypt_iv(bytea,bytea,bytea,text); +ALTER EXTENSION pgcrypto ADD function gen_random_bytes(integer); +ALTER EXTENSION pgcrypto ADD function pgp_sym_encrypt(text,text); +ALTER EXTENSION pgcrypto ADD function pgp_sym_encrypt_bytea(bytea,text); +ALTER EXTENSION pgcrypto ADD function pgp_sym_encrypt(text,text,text); +ALTER EXTENSION pgcrypto ADD function pgp_sym_encrypt_bytea(bytea,text,text); +ALTER EXTENSION pgcrypto ADD function pgp_sym_decrypt(bytea,text); +ALTER EXTENSION pgcrypto ADD function pgp_sym_decrypt_bytea(bytea,text); +ALTER EXTENSION pgcrypto ADD function pgp_sym_decrypt(bytea,text,text); +ALTER EXTENSION pgcrypto ADD function pgp_sym_decrypt_bytea(bytea,text,text); +ALTER EXTENSION pgcrypto ADD function pgp_pub_encrypt(text,bytea); +ALTER EXTENSION pgcrypto ADD function pgp_pub_encrypt_bytea(bytea,bytea); +ALTER EXTENSION pgcrypto ADD function pgp_pub_encrypt(text,bytea,text); +ALTER EXTENSION pgcrypto ADD function pgp_pub_encrypt_bytea(bytea,bytea,text); +ALTER EXTENSION pgcrypto ADD function pgp_pub_decrypt(bytea,bytea); +ALTER EXTENSION pgcrypto ADD function pgp_pub_decrypt_bytea(bytea,bytea); +ALTER EXTENSION pgcrypto ADD function pgp_pub_decrypt(bytea,bytea,text); +ALTER EXTENSION pgcrypto ADD function pgp_pub_decrypt_bytea(bytea,bytea,text); +ALTER EXTENSION pgcrypto ADD function pgp_pub_decrypt(bytea,bytea,text,text); +ALTER EXTENSION pgcrypto ADD function pgp_pub_decrypt_bytea(bytea,bytea,text,text); +ALTER EXTENSION pgcrypto ADD function pgp_key_id(bytea); +ALTER EXTENSION pgcrypto ADD function armor(bytea); +ALTER EXTENSION pgcrypto ADD function dearmor(text); diff --git a/contrib/pgcrypto/pgcrypto.control b/contrib/pgcrypto/pgcrypto.control new file mode 100644 index 0000000000..8375cf9e7b --- /dev/null +++ b/contrib/pgcrypto/pgcrypto.control @@ -0,0 +1,5 @@ +# pgcrypto extension +comment = 'cryptographic functions' +default_version = '1.0' +module_pathname = '$libdir/pgcrypto' +relocatable = true diff --git a/contrib/pgcrypto/pgcrypto.sql.in b/contrib/pgcrypto/pgcrypto.sql.in deleted file mode 100644 index 37ae100412..0000000000 --- a/contrib/pgcrypto/pgcrypto.sql.in +++ /dev/null @@ -1,202 +0,0 @@ -/* contrib/pgcrypto/pgcrypto.sql.in */ - --- Adjust this setting to control where the objects get created. -SET search_path = public; - -CREATE OR REPLACE FUNCTION digest(text, text) -RETURNS bytea -AS 'MODULE_PATHNAME', 'pg_digest' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION digest(bytea, text) -RETURNS bytea -AS 'MODULE_PATHNAME', 'pg_digest' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION hmac(text, text, text) -RETURNS bytea -AS 'MODULE_PATHNAME', 'pg_hmac' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION hmac(bytea, bytea, text) -RETURNS bytea -AS 'MODULE_PATHNAME', 'pg_hmac' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION crypt(text, text) -RETURNS text -AS 'MODULE_PATHNAME', 'pg_crypt' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gen_salt(text) -RETURNS text -AS 'MODULE_PATHNAME', 'pg_gen_salt' -LANGUAGE C VOLATILE STRICT; - -CREATE OR REPLACE FUNCTION gen_salt(text, int4) -RETURNS text -AS 'MODULE_PATHNAME', 'pg_gen_salt_rounds' -LANGUAGE C VOLATILE STRICT; - -CREATE OR REPLACE FUNCTION encrypt(bytea, bytea, text) -RETURNS bytea -AS 'MODULE_PATHNAME', 'pg_encrypt' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION decrypt(bytea, bytea, text) -RETURNS bytea -AS 'MODULE_PATHNAME', 'pg_decrypt' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION encrypt_iv(bytea, bytea, bytea, text) -RETURNS bytea -AS 'MODULE_PATHNAME', 'pg_encrypt_iv' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION decrypt_iv(bytea, bytea, bytea, text) -RETURNS bytea -AS 'MODULE_PATHNAME', 'pg_decrypt_iv' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gen_random_bytes(int4) -RETURNS bytea -AS 'MODULE_PATHNAME', 'pg_random_bytes' -LANGUAGE 'C' VOLATILE STRICT; - --- --- pgp_sym_encrypt(data, key) --- -CREATE OR REPLACE FUNCTION pgp_sym_encrypt(text, text) -RETURNS bytea -AS 'MODULE_PATHNAME', 'pgp_sym_encrypt_text' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION pgp_sym_encrypt_bytea(bytea, text) -RETURNS bytea -AS 'MODULE_PATHNAME', 'pgp_sym_encrypt_bytea' -LANGUAGE C STRICT; - --- --- pgp_sym_encrypt(data, key, args) --- -CREATE OR REPLACE FUNCTION pgp_sym_encrypt(text, text, text) -RETURNS bytea -AS 'MODULE_PATHNAME', 'pgp_sym_encrypt_text' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION pgp_sym_encrypt_bytea(bytea, text, text) -RETURNS bytea -AS 'MODULE_PATHNAME', 'pgp_sym_encrypt_bytea' -LANGUAGE C STRICT; - --- --- pgp_sym_decrypt(data, key) --- -CREATE OR REPLACE FUNCTION pgp_sym_decrypt(bytea, text) -RETURNS text -AS 'MODULE_PATHNAME', 'pgp_sym_decrypt_text' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION pgp_sym_decrypt_bytea(bytea, text) -RETURNS bytea -AS 'MODULE_PATHNAME', 'pgp_sym_decrypt_bytea' -LANGUAGE C IMMUTABLE STRICT; - --- --- pgp_sym_decrypt(data, key, args) --- -CREATE OR REPLACE FUNCTION pgp_sym_decrypt(bytea, text, text) -RETURNS text -AS 'MODULE_PATHNAME', 'pgp_sym_decrypt_text' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION pgp_sym_decrypt_bytea(bytea, text, text) -RETURNS bytea -AS 'MODULE_PATHNAME', 'pgp_sym_decrypt_bytea' -LANGUAGE C IMMUTABLE STRICT; - --- --- pgp_pub_encrypt(data, key) --- -CREATE OR REPLACE FUNCTION pgp_pub_encrypt(text, bytea) -RETURNS bytea -AS 'MODULE_PATHNAME', 'pgp_pub_encrypt_text' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION pgp_pub_encrypt_bytea(bytea, bytea) -RETURNS bytea -AS 'MODULE_PATHNAME', 'pgp_pub_encrypt_bytea' -LANGUAGE C STRICT; - --- --- pgp_pub_encrypt(data, key, args) --- -CREATE OR REPLACE FUNCTION pgp_pub_encrypt(text, bytea, text) -RETURNS bytea -AS 'MODULE_PATHNAME', 'pgp_pub_encrypt_text' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION pgp_pub_encrypt_bytea(bytea, bytea, text) -RETURNS bytea -AS 'MODULE_PATHNAME', 'pgp_pub_encrypt_bytea' -LANGUAGE C STRICT; - --- --- pgp_pub_decrypt(data, key) --- -CREATE OR REPLACE FUNCTION pgp_pub_decrypt(bytea, bytea) -RETURNS text -AS 'MODULE_PATHNAME', 'pgp_pub_decrypt_text' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION pgp_pub_decrypt_bytea(bytea, bytea) -RETURNS bytea -AS 'MODULE_PATHNAME', 'pgp_pub_decrypt_bytea' -LANGUAGE C IMMUTABLE STRICT; - --- --- pgp_pub_decrypt(data, key, psw) --- -CREATE OR REPLACE FUNCTION pgp_pub_decrypt(bytea, bytea, text) -RETURNS text -AS 'MODULE_PATHNAME', 'pgp_pub_decrypt_text' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION pgp_pub_decrypt_bytea(bytea, bytea, text) -RETURNS bytea -AS 'MODULE_PATHNAME', 'pgp_pub_decrypt_bytea' -LANGUAGE C IMMUTABLE STRICT; - --- --- pgp_pub_decrypt(data, key, psw, arg) --- -CREATE OR REPLACE FUNCTION pgp_pub_decrypt(bytea, bytea, text, text) -RETURNS text -AS 'MODULE_PATHNAME', 'pgp_pub_decrypt_text' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION pgp_pub_decrypt_bytea(bytea, bytea, text, text) -RETURNS bytea -AS 'MODULE_PATHNAME', 'pgp_pub_decrypt_bytea' -LANGUAGE C IMMUTABLE STRICT; - --- --- PGP key ID --- -CREATE OR REPLACE FUNCTION pgp_key_id(bytea) -RETURNS text -AS 'MODULE_PATHNAME', 'pgp_key_id_w' -LANGUAGE C IMMUTABLE STRICT; - --- --- pgp armor --- -CREATE OR REPLACE FUNCTION armor(bytea) -RETURNS text -AS 'MODULE_PATHNAME', 'pg_armor' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION dearmor(text) -RETURNS bytea -AS 'MODULE_PATHNAME', 'pg_dearmor' -LANGUAGE C IMMUTABLE STRICT; diff --git a/contrib/pgcrypto/sql/init.sql b/contrib/pgcrypto/sql/init.sql index 8c1d2192a6..5c3d100576 100644 --- a/contrib/pgcrypto/sql/init.sql +++ b/contrib/pgcrypto/sql/init.sql @@ -2,15 +2,7 @@ -- init pgcrypto -- --- --- first, define the functions. Turn off echoing so that expected file --- does not depend on contents of pgcrypto.sql. --- -SET client_min_messages = warning; -\set ECHO none -\i pgcrypto.sql -\set ECHO all -RESET client_min_messages; +CREATE EXTENSION pgcrypto; -- ensure consistent test output regardless of the default bytea format SET bytea_output TO escape; diff --git a/contrib/pgcrypto/uninstall_pgcrypto.sql b/contrib/pgcrypto/uninstall_pgcrypto.sql deleted file mode 100644 index 3005c50333..0000000000 --- a/contrib/pgcrypto/uninstall_pgcrypto.sql +++ /dev/null @@ -1,45 +0,0 @@ -/* contrib/pgcrypto/uninstall_pgcrypto.sql */ - --- Adjust this setting to control where the objects get dropped. -SET search_path = public; - -DROP FUNCTION digest(text, text); -DROP FUNCTION digest(bytea, text); - -DROP FUNCTION hmac(text, text, text); -DROP FUNCTION hmac(bytea, bytea, text); - -DROP FUNCTION crypt(text, text); -DROP FUNCTION gen_salt(text); -DROP FUNCTION gen_salt(text, int4); - -DROP FUNCTION encrypt(bytea, bytea, text); -DROP FUNCTION decrypt(bytea, bytea, text); -DROP FUNCTION encrypt_iv(bytea, bytea, bytea, text); -DROP FUNCTION decrypt_iv(bytea, bytea, bytea, text); - -DROP FUNCTION gen_random_bytes(int4); - -DROP FUNCTION pgp_sym_encrypt(text, text); -DROP FUNCTION pgp_sym_encrypt_bytea(bytea, text); -DROP FUNCTION pgp_sym_encrypt(text, text, text); -DROP FUNCTION pgp_sym_encrypt_bytea(bytea, text, text); -DROP FUNCTION pgp_sym_decrypt(bytea, text); -DROP FUNCTION pgp_sym_decrypt_bytea(bytea, text); -DROP FUNCTION pgp_sym_decrypt(bytea, text, text); -DROP FUNCTION pgp_sym_decrypt_bytea(bytea, text, text); - -DROP FUNCTION pgp_pub_encrypt(text, bytea); -DROP FUNCTION pgp_pub_encrypt_bytea(bytea, bytea); -DROP FUNCTION pgp_pub_encrypt(text, bytea, text); -DROP FUNCTION pgp_pub_encrypt_bytea(bytea, bytea, text); -DROP FUNCTION pgp_pub_decrypt(bytea, bytea); -DROP FUNCTION pgp_pub_decrypt_bytea(bytea, bytea); -DROP FUNCTION pgp_pub_decrypt(bytea, bytea, text); -DROP FUNCTION pgp_pub_decrypt_bytea(bytea, bytea, text); -DROP FUNCTION pgp_pub_decrypt(bytea, bytea, text, text); -DROP FUNCTION pgp_pub_decrypt_bytea(bytea, bytea, text, text); - -DROP FUNCTION pgp_key_id(bytea); -DROP FUNCTION armor(bytea); -DROP FUNCTION dearmor(text); diff --git a/contrib/pgrowlocks/.gitignore b/contrib/pgrowlocks/.gitignore deleted file mode 100644 index b2729282bf..0000000000 --- a/contrib/pgrowlocks/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/pgrowlocks.sql diff --git a/contrib/pgrowlocks/Makefile b/contrib/pgrowlocks/Makefile index fd338d75d7..f56389b0e2 100644 --- a/contrib/pgrowlocks/Makefile +++ b/contrib/pgrowlocks/Makefile @@ -1,15 +1,10 @@ -#------------------------------------------------------------------------- -# -# pgrowlocks Makefile -# # contrib/pgrowlocks/Makefile -# -#------------------------------------------------------------------------- MODULE_big = pgrowlocks OBJS = pgrowlocks.o -DATA_built = pgrowlocks.sql -DATA = uninstall_pgrowlocks.sql + +EXTENSION = pgrowlocks +DATA = pgrowlocks--1.0.sql pgrowlocks--unpackaged--1.0.sql ifdef USE_PGXS PG_CONFIG = pg_config diff --git a/contrib/pgrowlocks/pgrowlocks--1.0.sql b/contrib/pgrowlocks/pgrowlocks--1.0.sql new file mode 100644 index 0000000000..8b5fc9a1c8 --- /dev/null +++ b/contrib/pgrowlocks/pgrowlocks--1.0.sql @@ -0,0 +1,12 @@ +/* contrib/pgrowlocks/pgrowlocks--1.0.sql */ + +CREATE OR REPLACE FUNCTION pgrowlocks(IN relname text, + OUT locked_row TID, -- row TID + OUT lock_type TEXT, -- lock type + OUT locker XID, -- locking XID + OUT multi bool, -- multi XID? + OUT xids xid[], -- multi XIDs + OUT pids INTEGER[]) -- locker's process id +RETURNS SETOF record +AS 'MODULE_PATHNAME', 'pgrowlocks' +LANGUAGE C STRICT; diff --git a/contrib/pgrowlocks/pgrowlocks--unpackaged--1.0.sql b/contrib/pgrowlocks/pgrowlocks--unpackaged--1.0.sql new file mode 100644 index 0000000000..2d9d1eed41 --- /dev/null +++ b/contrib/pgrowlocks/pgrowlocks--unpackaged--1.0.sql @@ -0,0 +1,3 @@ +/* contrib/pgrowlocks/pgrowlocks--unpackaged--1.0.sql */ + +ALTER EXTENSION pgrowlocks ADD function pgrowlocks(text); diff --git a/contrib/pgrowlocks/pgrowlocks.control b/contrib/pgrowlocks/pgrowlocks.control new file mode 100644 index 0000000000..a6ba164515 --- /dev/null +++ b/contrib/pgrowlocks/pgrowlocks.control @@ -0,0 +1,5 @@ +# pgrowlocks extension +comment = 'show row-level locking information' +default_version = '1.0' +module_pathname = '$libdir/pgrowlocks' +relocatable = true diff --git a/contrib/pgrowlocks/pgrowlocks.sql.in b/contrib/pgrowlocks/pgrowlocks.sql.in deleted file mode 100644 index 3bcb3ee7ea..0000000000 --- a/contrib/pgrowlocks/pgrowlocks.sql.in +++ /dev/null @@ -1,15 +0,0 @@ -/* contrib/pgrowlocks/pgrowlocks.sql.in */ - --- Adjust this setting to control where the objects get created. -SET search_path = public; - -CREATE OR REPLACE FUNCTION pgrowlocks(IN relname text, - OUT locked_row TID, -- row TID - OUT lock_type TEXT, -- lock type - OUT locker XID, -- locking XID - OUT multi bool, -- multi XID? - OUT xids xid[], -- multi XIDs - OUT pids INTEGER[]) -- locker's process id -RETURNS SETOF record -AS 'MODULE_PATHNAME', 'pgrowlocks' -LANGUAGE C STRICT; diff --git a/contrib/pgrowlocks/uninstall_pgrowlocks.sql b/contrib/pgrowlocks/uninstall_pgrowlocks.sql deleted file mode 100644 index 004e97c0e9..0000000000 --- a/contrib/pgrowlocks/uninstall_pgrowlocks.sql +++ /dev/null @@ -1,6 +0,0 @@ -/* contrib/pgrowlocks/uninstall_pgrowlocks.sql */ - --- Adjust this setting to control where the objects get dropped. -SET search_path = public; - -DROP FUNCTION pgrowlocks(text); diff --git a/contrib/pgstattuple/.gitignore b/contrib/pgstattuple/.gitignore deleted file mode 100644 index 69b22b64cd..0000000000 --- a/contrib/pgstattuple/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/pgstattuple.sql diff --git a/contrib/pgstattuple/Makefile b/contrib/pgstattuple/Makefile index 33386cdf17..13b87090ee 100644 --- a/contrib/pgstattuple/Makefile +++ b/contrib/pgstattuple/Makefile @@ -1,15 +1,10 @@ -#------------------------------------------------------------------------- -# -# pgstattuple Makefile -# # contrib/pgstattuple/Makefile -# -#------------------------------------------------------------------------- MODULE_big = pgstattuple OBJS = pgstattuple.o pgstatindex.o -DATA_built = pgstattuple.sql -DATA = uninstall_pgstattuple.sql + +EXTENSION = pgstattuple +DATA = pgstattuple--1.0.sql pgstattuple--unpackaged--1.0.sql ifdef USE_PGXS PG_CONFIG = pg_config diff --git a/contrib/pgstattuple/pgstattuple--1.0.sql b/contrib/pgstattuple/pgstattuple--1.0.sql new file mode 100644 index 0000000000..84b91dda0a --- /dev/null +++ b/contrib/pgstattuple/pgstattuple--1.0.sql @@ -0,0 +1,46 @@ +/* contrib/pgstattuple/pgstattuple--1.0.sql */ + +CREATE OR REPLACE FUNCTION pgstattuple(IN relname text, + OUT table_len BIGINT, -- physical table length in bytes + OUT tuple_count BIGINT, -- number of live tuples + OUT tuple_len BIGINT, -- total tuples length in bytes + OUT tuple_percent FLOAT8, -- live tuples in % + OUT dead_tuple_count BIGINT, -- number of dead tuples + OUT dead_tuple_len BIGINT, -- total dead tuples length in bytes + OUT dead_tuple_percent FLOAT8, -- dead tuples in % + OUT free_space BIGINT, -- free space in bytes + OUT free_percent FLOAT8) -- free space in % +AS 'MODULE_PATHNAME', 'pgstattuple' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION pgstattuple(IN reloid oid, + OUT table_len BIGINT, -- physical table length in bytes + OUT tuple_count BIGINT, -- number of live tuples + OUT tuple_len BIGINT, -- total tuples length in bytes + OUT tuple_percent FLOAT8, -- live tuples in % + OUT dead_tuple_count BIGINT, -- number of dead tuples + OUT dead_tuple_len BIGINT, -- total dead tuples length in bytes + OUT dead_tuple_percent FLOAT8, -- dead tuples in % + OUT free_space BIGINT, -- free space in bytes + OUT free_percent FLOAT8) -- free space in % +AS 'MODULE_PATHNAME', 'pgstattuplebyid' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION pgstatindex(IN relname text, + OUT version INT, + OUT tree_level INT, + OUT index_size BIGINT, + OUT root_block_no BIGINT, + OUT internal_pages BIGINT, + OUT leaf_pages BIGINT, + OUT empty_pages BIGINT, + OUT deleted_pages BIGINT, + OUT avg_leaf_density FLOAT8, + OUT leaf_fragmentation FLOAT8) +AS 'MODULE_PATHNAME', 'pgstatindex' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION pg_relpages(IN relname text) +RETURNS BIGINT +AS 'MODULE_PATHNAME', 'pg_relpages' +LANGUAGE C STRICT; diff --git a/contrib/pgstattuple/pgstattuple--unpackaged--1.0.sql b/contrib/pgstattuple/pgstattuple--unpackaged--1.0.sql new file mode 100644 index 0000000000..3cfb8db534 --- /dev/null +++ b/contrib/pgstattuple/pgstattuple--unpackaged--1.0.sql @@ -0,0 +1,6 @@ +/* contrib/pgstattuple/pgstattuple--unpackaged--1.0.sql */ + +ALTER EXTENSION pgstattuple ADD function pgstattuple(text); +ALTER EXTENSION pgstattuple ADD function pgstattuple(oid); +ALTER EXTENSION pgstattuple ADD function pgstatindex(text); +ALTER EXTENSION pgstattuple ADD function pg_relpages(text); diff --git a/contrib/pgstattuple/pgstattuple.control b/contrib/pgstattuple/pgstattuple.control new file mode 100644 index 0000000000..7b5129b2f2 --- /dev/null +++ b/contrib/pgstattuple/pgstattuple.control @@ -0,0 +1,5 @@ +# pgstattuple extension +comment = 'show tuple-level statistics' +default_version = '1.0' +module_pathname = '$libdir/pgstattuple' +relocatable = true diff --git a/contrib/pgstattuple/pgstattuple.sql.in b/contrib/pgstattuple/pgstattuple.sql.in deleted file mode 100644 index 6a09136596..0000000000 --- a/contrib/pgstattuple/pgstattuple.sql.in +++ /dev/null @@ -1,49 +0,0 @@ -/* contrib/pgstattuple/pgstattuple.sql.in */ - --- Adjust this setting to control where the objects get created. -SET search_path = public; - -CREATE OR REPLACE FUNCTION pgstattuple(IN relname text, - OUT table_len BIGINT, -- physical table length in bytes - OUT tuple_count BIGINT, -- number of live tuples - OUT tuple_len BIGINT, -- total tuples length in bytes - OUT tuple_percent FLOAT8, -- live tuples in % - OUT dead_tuple_count BIGINT, -- number of dead tuples - OUT dead_tuple_len BIGINT, -- total dead tuples length in bytes - OUT dead_tuple_percent FLOAT8, -- dead tuples in % - OUT free_space BIGINT, -- free space in bytes - OUT free_percent FLOAT8) -- free space in % -AS 'MODULE_PATHNAME', 'pgstattuple' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION pgstattuple(IN reloid oid, - OUT table_len BIGINT, -- physical table length in bytes - OUT tuple_count BIGINT, -- number of live tuples - OUT tuple_len BIGINT, -- total tuples length in bytes - OUT tuple_percent FLOAT8, -- live tuples in % - OUT dead_tuple_count BIGINT, -- number of dead tuples - OUT dead_tuple_len BIGINT, -- total dead tuples length in bytes - OUT dead_tuple_percent FLOAT8, -- dead tuples in % - OUT free_space BIGINT, -- free space in bytes - OUT free_percent FLOAT8) -- free space in % -AS 'MODULE_PATHNAME', 'pgstattuplebyid' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION pgstatindex(IN relname text, - OUT version INT, - OUT tree_level INT, - OUT index_size BIGINT, - OUT root_block_no BIGINT, - OUT internal_pages BIGINT, - OUT leaf_pages BIGINT, - OUT empty_pages BIGINT, - OUT deleted_pages BIGINT, - OUT avg_leaf_density FLOAT8, - OUT leaf_fragmentation FLOAT8) -AS 'MODULE_PATHNAME', 'pgstatindex' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION pg_relpages(IN relname text) -RETURNS BIGINT -AS 'MODULE_PATHNAME', 'pg_relpages' -LANGUAGE C STRICT; diff --git a/contrib/pgstattuple/uninstall_pgstattuple.sql b/contrib/pgstattuple/uninstall_pgstattuple.sql deleted file mode 100644 index 29eac40f29..0000000000 --- a/contrib/pgstattuple/uninstall_pgstattuple.sql +++ /dev/null @@ -1,9 +0,0 @@ -/* contrib/pgstattuple/uninstall_pgstattuple.sql */ - --- Adjust this setting to control where the objects get dropped. -SET search_path = public; - -DROP FUNCTION pgstattuple(text); -DROP FUNCTION pgstattuple(oid); -DROP FUNCTION pgstatindex(text); -DROP FUNCTION pg_relpages(text); diff --git a/contrib/seg/.gitignore b/contrib/seg/.gitignore index a8973ff696..102f8b3246 100644 --- a/contrib/seg/.gitignore +++ b/contrib/seg/.gitignore @@ -1,5 +1,4 @@ /segparse.c /segscan.c -/seg.sql # Generated subdirectories /results/ diff --git a/contrib/seg/Makefile b/contrib/seg/Makefile index e8c7a44845..d84934c67f 100644 --- a/contrib/seg/Makefile +++ b/contrib/seg/Makefile @@ -2,8 +2,10 @@ MODULE_big = seg OBJS = seg.o segparse.o -DATA_built = seg.sql -DATA = uninstall_seg.sql + +EXTENSION = seg +DATA = seg--1.0.sql seg--unpackaged--1.0.sql + REGRESS = seg EXTRA_CLEAN = y.tab.c y.tab.h diff --git a/contrib/seg/expected/seg.out b/contrib/seg/expected/seg.out index 17c803e50e..1f82a4abb8 100644 --- a/contrib/seg/expected/seg.out +++ b/contrib/seg/expected/seg.out @@ -1,13 +1,7 @@ -- -- Test seg datatype -- --- --- first, define the datatype. Turn off echoing so that expected file --- does not depend on contents of seg.sql. --- -SET client_min_messages = warning; -\set ECHO none -RESET client_min_messages; +CREATE EXTENSION seg; -- -- testing the input and output functions -- diff --git a/contrib/seg/expected/seg_1.out b/contrib/seg/expected/seg_1.out index a4cca8b391..563c744b2d 100644 --- a/contrib/seg/expected/seg_1.out +++ b/contrib/seg/expected/seg_1.out @@ -1,13 +1,7 @@ -- -- Test seg datatype -- --- --- first, define the datatype. Turn off echoing so that expected file --- does not depend on contents of seg.sql. --- -SET client_min_messages = warning; -\set ECHO none -RESET client_min_messages; +CREATE EXTENSION seg; -- -- testing the input and output functions -- diff --git a/contrib/seg/seg--1.0.sql b/contrib/seg/seg--1.0.sql new file mode 100644 index 0000000000..02d8ffadb0 --- /dev/null +++ b/contrib/seg/seg--1.0.sql @@ -0,0 +1,392 @@ +/* contrib/seg/seg--1.0.sql */ + +-- Create the user-defined type for 1-D floating point intervals (seg) + +CREATE OR REPLACE FUNCTION seg_in(cstring) +RETURNS seg +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION seg_out(seg) +RETURNS cstring +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE TYPE seg ( + INTERNALLENGTH = 12, + INPUT = seg_in, + OUTPUT = seg_out +); + +COMMENT ON TYPE seg IS +'floating point interval ''FLOAT .. FLOAT'', ''.. FLOAT'', ''FLOAT ..'' or ''FLOAT'''; + +-- +-- External C-functions for R-tree methods +-- + +-- Left/Right methods + +CREATE OR REPLACE FUNCTION seg_over_left(seg, seg) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +COMMENT ON FUNCTION seg_over_left(seg, seg) IS +'overlaps or is left of'; + +CREATE OR REPLACE FUNCTION seg_over_right(seg, seg) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +COMMENT ON FUNCTION seg_over_right(seg, seg) IS +'overlaps or is right of'; + +CREATE OR REPLACE FUNCTION seg_left(seg, seg) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +COMMENT ON FUNCTION seg_left(seg, seg) IS +'is left of'; + +CREATE OR REPLACE FUNCTION seg_right(seg, seg) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +COMMENT ON FUNCTION seg_right(seg, seg) IS +'is right of'; + + +-- Scalar comparison methods + +CREATE OR REPLACE FUNCTION seg_lt(seg, seg) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +COMMENT ON FUNCTION seg_lt(seg, seg) IS +'less than'; + +CREATE OR REPLACE FUNCTION seg_le(seg, seg) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +COMMENT ON FUNCTION seg_le(seg, seg) IS +'less than or equal'; + +CREATE OR REPLACE FUNCTION seg_gt(seg, seg) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +COMMENT ON FUNCTION seg_gt(seg, seg) IS +'greater than'; + +CREATE OR REPLACE FUNCTION seg_ge(seg, seg) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +COMMENT ON FUNCTION seg_ge(seg, seg) IS +'greater than or equal'; + +CREATE OR REPLACE FUNCTION seg_contains(seg, seg) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +COMMENT ON FUNCTION seg_contains(seg, seg) IS +'contains'; + +CREATE OR REPLACE FUNCTION seg_contained(seg, seg) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +COMMENT ON FUNCTION seg_contained(seg, seg) IS +'contained in'; + +CREATE OR REPLACE FUNCTION seg_overlap(seg, seg) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +COMMENT ON FUNCTION seg_overlap(seg, seg) IS +'overlaps'; + +CREATE OR REPLACE FUNCTION seg_same(seg, seg) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +COMMENT ON FUNCTION seg_same(seg, seg) IS +'same as'; + +CREATE OR REPLACE FUNCTION seg_different(seg, seg) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +COMMENT ON FUNCTION seg_different(seg, seg) IS +'different'; + +-- support routines for indexing + +CREATE OR REPLACE FUNCTION seg_cmp(seg, seg) +RETURNS int4 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +COMMENT ON FUNCTION seg_cmp(seg, seg) IS 'btree comparison function'; + +CREATE OR REPLACE FUNCTION seg_union(seg, seg) +RETURNS seg +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION seg_inter(seg, seg) +RETURNS seg +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION seg_size(seg) +RETURNS float4 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +-- miscellaneous + +CREATE OR REPLACE FUNCTION seg_center(seg) +RETURNS float4 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION seg_upper(seg) +RETURNS float4 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION seg_lower(seg) +RETURNS float4 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + + +-- +-- OPERATORS +-- + +CREATE OPERATOR < ( + LEFTARG = seg, + RIGHTARG = seg, + PROCEDURE = seg_lt, + COMMUTATOR = '>', + NEGATOR = '>=', + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel +); + +CREATE OPERATOR <= ( + LEFTARG = seg, + RIGHTARG = seg, + PROCEDURE = seg_le, + COMMUTATOR = '>=', + NEGATOR = '>', + RESTRICT = scalarltsel, + JOIN = scalarltjoinsel +); + +CREATE OPERATOR > ( + LEFTARG = seg, + RIGHTARG = seg, + PROCEDURE = seg_gt, + COMMUTATOR = '<', + NEGATOR = '<=', + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel +); + +CREATE OPERATOR >= ( + LEFTARG = seg, + RIGHTARG = seg, + PROCEDURE = seg_ge, + COMMUTATOR = '<=', + NEGATOR = '<', + RESTRICT = scalargtsel, + JOIN = scalargtjoinsel +); + +CREATE OPERATOR << ( + LEFTARG = seg, + RIGHTARG = seg, + PROCEDURE = seg_left, + COMMUTATOR = '>>', + RESTRICT = positionsel, + JOIN = positionjoinsel +); + +CREATE OPERATOR &< ( + LEFTARG = seg, + RIGHTARG = seg, + PROCEDURE = seg_over_left, + RESTRICT = positionsel, + JOIN = positionjoinsel +); + +CREATE OPERATOR && ( + LEFTARG = seg, + RIGHTARG = seg, + PROCEDURE = seg_overlap, + COMMUTATOR = '&&', + RESTRICT = areasel, + JOIN = areajoinsel +); + +CREATE OPERATOR &> ( + LEFTARG = seg, + RIGHTARG = seg, + PROCEDURE = seg_over_right, + RESTRICT = positionsel, + JOIN = positionjoinsel +); + +CREATE OPERATOR >> ( + LEFTARG = seg, + RIGHTARG = seg, + PROCEDURE = seg_right, + COMMUTATOR = '<<', + RESTRICT = positionsel, + JOIN = positionjoinsel +); + +CREATE OPERATOR = ( + LEFTARG = seg, + RIGHTARG = seg, + PROCEDURE = seg_same, + COMMUTATOR = '=', + NEGATOR = '<>', + RESTRICT = eqsel, + JOIN = eqjoinsel, + MERGES +); + +CREATE OPERATOR <> ( + LEFTARG = seg, + RIGHTARG = seg, + PROCEDURE = seg_different, + COMMUTATOR = '<>', + NEGATOR = '=', + RESTRICT = neqsel, + JOIN = neqjoinsel +); + +CREATE OPERATOR @> ( + LEFTARG = seg, + RIGHTARG = seg, + PROCEDURE = seg_contains, + COMMUTATOR = '<@', + RESTRICT = contsel, + JOIN = contjoinsel +); + +CREATE OPERATOR <@ ( + LEFTARG = seg, + RIGHTARG = seg, + PROCEDURE = seg_contained, + COMMUTATOR = '@>', + RESTRICT = contsel, + JOIN = contjoinsel +); + +-- obsolete: +CREATE OPERATOR @ ( + LEFTARG = seg, + RIGHTARG = seg, + PROCEDURE = seg_contains, + COMMUTATOR = '~', + RESTRICT = contsel, + JOIN = contjoinsel +); + +CREATE OPERATOR ~ ( + LEFTARG = seg, + RIGHTARG = seg, + PROCEDURE = seg_contained, + COMMUTATOR = '@', + RESTRICT = contsel, + JOIN = contjoinsel +); + + +-- define the GiST support methods +CREATE OR REPLACE FUNCTION gseg_consistent(internal,seg,int,oid,internal) +RETURNS bool +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gseg_compress(internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gseg_decompress(internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gseg_penalty(internal,internal,internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gseg_picksplit(internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gseg_union(internal, internal) +RETURNS seg +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + +CREATE OR REPLACE FUNCTION gseg_same(seg, seg, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C IMMUTABLE STRICT; + + +-- Create the operator classes for indexing + +CREATE OPERATOR CLASS seg_ops + DEFAULT FOR TYPE seg USING btree AS + OPERATOR 1 < , + OPERATOR 2 <= , + OPERATOR 3 = , + OPERATOR 4 >= , + OPERATOR 5 > , + FUNCTION 1 seg_cmp(seg, seg); + +CREATE OPERATOR CLASS gist_seg_ops +DEFAULT FOR TYPE seg USING gist +AS + OPERATOR 1 << , + OPERATOR 2 &< , + OPERATOR 3 && , + OPERATOR 4 &> , + OPERATOR 5 >> , + OPERATOR 6 = , + OPERATOR 7 @> , + OPERATOR 8 <@ , + OPERATOR 13 @ , + OPERATOR 14 ~ , + FUNCTION 1 gseg_consistent (internal, seg, int, oid, internal), + FUNCTION 2 gseg_union (internal, internal), + FUNCTION 3 gseg_compress (internal), + FUNCTION 4 gseg_decompress (internal), + FUNCTION 5 gseg_penalty (internal, internal, internal), + FUNCTION 6 gseg_picksplit (internal, internal), + FUNCTION 7 gseg_same (seg, seg, internal); diff --git a/contrib/seg/seg--unpackaged--1.0.sql b/contrib/seg/seg--unpackaged--1.0.sql new file mode 100644 index 0000000000..9fefbfc9aa --- /dev/null +++ b/contrib/seg/seg--unpackaged--1.0.sql @@ -0,0 +1,51 @@ +/* contrib/seg/seg--unpackaged--1.0.sql */ + +ALTER EXTENSION seg ADD type seg; +ALTER EXTENSION seg ADD function seg_in(cstring); +ALTER EXTENSION seg ADD function seg_out(seg); +ALTER EXTENSION seg ADD function seg_over_left(seg,seg); +ALTER EXTENSION seg ADD function seg_over_right(seg,seg); +ALTER EXTENSION seg ADD function seg_left(seg,seg); +ALTER EXTENSION seg ADD function seg_right(seg,seg); +ALTER EXTENSION seg ADD function seg_lt(seg,seg); +ALTER EXTENSION seg ADD function seg_le(seg,seg); +ALTER EXTENSION seg ADD function seg_gt(seg,seg); +ALTER EXTENSION seg ADD function seg_ge(seg,seg); +ALTER EXTENSION seg ADD function seg_contains(seg,seg); +ALTER EXTENSION seg ADD function seg_contained(seg,seg); +ALTER EXTENSION seg ADD function seg_overlap(seg,seg); +ALTER EXTENSION seg ADD function seg_same(seg,seg); +ALTER EXTENSION seg ADD function seg_different(seg,seg); +ALTER EXTENSION seg ADD function seg_cmp(seg,seg); +ALTER EXTENSION seg ADD function seg_union(seg,seg); +ALTER EXTENSION seg ADD function seg_inter(seg,seg); +ALTER EXTENSION seg ADD function seg_size(seg); +ALTER EXTENSION seg ADD function seg_center(seg); +ALTER EXTENSION seg ADD function seg_upper(seg); +ALTER EXTENSION seg ADD function seg_lower(seg); +ALTER EXTENSION seg ADD operator >(seg,seg); +ALTER EXTENSION seg ADD operator >=(seg,seg); +ALTER EXTENSION seg ADD operator <(seg,seg); +ALTER EXTENSION seg ADD operator <=(seg,seg); +ALTER EXTENSION seg ADD operator >>(seg,seg); +ALTER EXTENSION seg ADD operator <<(seg,seg); +ALTER EXTENSION seg ADD operator &<(seg,seg); +ALTER EXTENSION seg ADD operator &&(seg,seg); +ALTER EXTENSION seg ADD operator &>(seg,seg); +ALTER EXTENSION seg ADD operator <>(seg,seg); +ALTER EXTENSION seg ADD operator =(seg,seg); +ALTER EXTENSION seg ADD operator <@(seg,seg); +ALTER EXTENSION seg ADD operator @>(seg,seg); +ALTER EXTENSION seg ADD operator ~(seg,seg); +ALTER EXTENSION seg ADD operator @(seg,seg); +ALTER EXTENSION seg ADD function gseg_consistent(internal,seg,integer,oid,internal); +ALTER EXTENSION seg ADD function gseg_compress(internal); +ALTER EXTENSION seg ADD function gseg_decompress(internal); +ALTER EXTENSION seg ADD function gseg_penalty(internal,internal,internal); +ALTER EXTENSION seg ADD function gseg_picksplit(internal,internal); +ALTER EXTENSION seg ADD function gseg_union(internal,internal); +ALTER EXTENSION seg ADD function gseg_same(seg,seg,internal); +ALTER EXTENSION seg ADD operator family seg_ops using btree; +ALTER EXTENSION seg ADD operator class seg_ops using btree; +ALTER EXTENSION seg ADD operator family gist_seg_ops using gist; +ALTER EXTENSION seg ADD operator class gist_seg_ops using gist; diff --git a/contrib/seg/seg.control b/contrib/seg/seg.control new file mode 100644 index 0000000000..a1286962ee --- /dev/null +++ b/contrib/seg/seg.control @@ -0,0 +1,5 @@ +# seg extension +comment = 'data type for representing line segments or floating-point intervals' +default_version = '1.0' +module_pathname = '$libdir/seg' +relocatable = true diff --git a/contrib/seg/seg.sql.in b/contrib/seg/seg.sql.in deleted file mode 100644 index 9bd747656c..0000000000 --- a/contrib/seg/seg.sql.in +++ /dev/null @@ -1,396 +0,0 @@ -/* contrib/seg/seg.sql.in */ - --- Adjust this setting to control where the objects get created. -SET search_path = public; - --- Create the user-defined type for 1-D floating point intervals (seg) --- - -CREATE OR REPLACE FUNCTION seg_in(cstring) -RETURNS seg -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION seg_out(seg) -RETURNS cstring -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE TYPE seg ( - INTERNALLENGTH = 12, - INPUT = seg_in, - OUTPUT = seg_out -); - -COMMENT ON TYPE seg IS -'floating point interval ''FLOAT .. FLOAT'', ''.. FLOAT'', ''FLOAT ..'' or ''FLOAT'''; - --- --- External C-functions for R-tree methods --- - --- Left/Right methods - -CREATE OR REPLACE FUNCTION seg_over_left(seg, seg) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -COMMENT ON FUNCTION seg_over_left(seg, seg) IS -'overlaps or is left of'; - -CREATE OR REPLACE FUNCTION seg_over_right(seg, seg) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -COMMENT ON FUNCTION seg_over_right(seg, seg) IS -'overlaps or is right of'; - -CREATE OR REPLACE FUNCTION seg_left(seg, seg) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -COMMENT ON FUNCTION seg_left(seg, seg) IS -'is left of'; - -CREATE OR REPLACE FUNCTION seg_right(seg, seg) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -COMMENT ON FUNCTION seg_right(seg, seg) IS -'is right of'; - - --- Scalar comparison methods - -CREATE OR REPLACE FUNCTION seg_lt(seg, seg) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -COMMENT ON FUNCTION seg_lt(seg, seg) IS -'less than'; - -CREATE OR REPLACE FUNCTION seg_le(seg, seg) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -COMMENT ON FUNCTION seg_le(seg, seg) IS -'less than or equal'; - -CREATE OR REPLACE FUNCTION seg_gt(seg, seg) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -COMMENT ON FUNCTION seg_gt(seg, seg) IS -'greater than'; - -CREATE OR REPLACE FUNCTION seg_ge(seg, seg) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -COMMENT ON FUNCTION seg_ge(seg, seg) IS -'greater than or equal'; - -CREATE OR REPLACE FUNCTION seg_contains(seg, seg) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -COMMENT ON FUNCTION seg_contains(seg, seg) IS -'contains'; - -CREATE OR REPLACE FUNCTION seg_contained(seg, seg) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -COMMENT ON FUNCTION seg_contained(seg, seg) IS -'contained in'; - -CREATE OR REPLACE FUNCTION seg_overlap(seg, seg) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -COMMENT ON FUNCTION seg_overlap(seg, seg) IS -'overlaps'; - -CREATE OR REPLACE FUNCTION seg_same(seg, seg) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -COMMENT ON FUNCTION seg_same(seg, seg) IS -'same as'; - -CREATE OR REPLACE FUNCTION seg_different(seg, seg) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -COMMENT ON FUNCTION seg_different(seg, seg) IS -'different'; - --- support routines for indexing - -CREATE OR REPLACE FUNCTION seg_cmp(seg, seg) -RETURNS int4 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -COMMENT ON FUNCTION seg_cmp(seg, seg) IS 'btree comparison function'; - -CREATE OR REPLACE FUNCTION seg_union(seg, seg) -RETURNS seg -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION seg_inter(seg, seg) -RETURNS seg -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION seg_size(seg) -RETURNS float4 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - --- miscellaneous - -CREATE OR REPLACE FUNCTION seg_center(seg) -RETURNS float4 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION seg_upper(seg) -RETURNS float4 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION seg_lower(seg) -RETURNS float4 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - - --- --- OPERATORS --- - -CREATE OPERATOR < ( - LEFTARG = seg, - RIGHTARG = seg, - PROCEDURE = seg_lt, - COMMUTATOR = '>', - NEGATOR = '>=', - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel -); - -CREATE OPERATOR <= ( - LEFTARG = seg, - RIGHTARG = seg, - PROCEDURE = seg_le, - COMMUTATOR = '>=', - NEGATOR = '>', - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel -); - -CREATE OPERATOR > ( - LEFTARG = seg, - RIGHTARG = seg, - PROCEDURE = seg_gt, - COMMUTATOR = '<', - NEGATOR = '<=', - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel -); - -CREATE OPERATOR >= ( - LEFTARG = seg, - RIGHTARG = seg, - PROCEDURE = seg_ge, - COMMUTATOR = '<=', - NEGATOR = '<', - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel -); - -CREATE OPERATOR << ( - LEFTARG = seg, - RIGHTARG = seg, - PROCEDURE = seg_left, - COMMUTATOR = '>>', - RESTRICT = positionsel, - JOIN = positionjoinsel -); - -CREATE OPERATOR &< ( - LEFTARG = seg, - RIGHTARG = seg, - PROCEDURE = seg_over_left, - RESTRICT = positionsel, - JOIN = positionjoinsel -); - -CREATE OPERATOR && ( - LEFTARG = seg, - RIGHTARG = seg, - PROCEDURE = seg_overlap, - COMMUTATOR = '&&', - RESTRICT = areasel, - JOIN = areajoinsel -); - -CREATE OPERATOR &> ( - LEFTARG = seg, - RIGHTARG = seg, - PROCEDURE = seg_over_right, - RESTRICT = positionsel, - JOIN = positionjoinsel -); - -CREATE OPERATOR >> ( - LEFTARG = seg, - RIGHTARG = seg, - PROCEDURE = seg_right, - COMMUTATOR = '<<', - RESTRICT = positionsel, - JOIN = positionjoinsel -); - -CREATE OPERATOR = ( - LEFTARG = seg, - RIGHTARG = seg, - PROCEDURE = seg_same, - COMMUTATOR = '=', - NEGATOR = '<>', - RESTRICT = eqsel, - JOIN = eqjoinsel, - MERGES -); - -CREATE OPERATOR <> ( - LEFTARG = seg, - RIGHTARG = seg, - PROCEDURE = seg_different, - COMMUTATOR = '<>', - NEGATOR = '=', - RESTRICT = neqsel, - JOIN = neqjoinsel -); - -CREATE OPERATOR @> ( - LEFTARG = seg, - RIGHTARG = seg, - PROCEDURE = seg_contains, - COMMUTATOR = '<@', - RESTRICT = contsel, - JOIN = contjoinsel -); - -CREATE OPERATOR <@ ( - LEFTARG = seg, - RIGHTARG = seg, - PROCEDURE = seg_contained, - COMMUTATOR = '@>', - RESTRICT = contsel, - JOIN = contjoinsel -); - --- obsolete: -CREATE OPERATOR @ ( - LEFTARG = seg, - RIGHTARG = seg, - PROCEDURE = seg_contains, - COMMUTATOR = '~', - RESTRICT = contsel, - JOIN = contjoinsel -); - -CREATE OPERATOR ~ ( - LEFTARG = seg, - RIGHTARG = seg, - PROCEDURE = seg_contained, - COMMUTATOR = '@', - RESTRICT = contsel, - JOIN = contjoinsel -); - - --- define the GiST support methods -CREATE OR REPLACE FUNCTION gseg_consistent(internal,seg,int,oid,internal) -RETURNS bool -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gseg_compress(internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gseg_decompress(internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gseg_penalty(internal,internal,internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gseg_picksplit(internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gseg_union(internal, internal) -RETURNS seg -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - -CREATE OR REPLACE FUNCTION gseg_same(seg, seg, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C IMMUTABLE STRICT; - - --- Create the operator classes for indexing - -CREATE OPERATOR CLASS seg_ops - DEFAULT FOR TYPE seg USING btree AS - OPERATOR 1 < , - OPERATOR 2 <= , - OPERATOR 3 = , - OPERATOR 4 >= , - OPERATOR 5 > , - FUNCTION 1 seg_cmp(seg, seg); - -CREATE OPERATOR CLASS gist_seg_ops -DEFAULT FOR TYPE seg USING gist -AS - OPERATOR 1 << , - OPERATOR 2 &< , - OPERATOR 3 && , - OPERATOR 4 &> , - OPERATOR 5 >> , - OPERATOR 6 = , - OPERATOR 7 @> , - OPERATOR 8 <@ , - OPERATOR 13 @ , - OPERATOR 14 ~ , - FUNCTION 1 gseg_consistent (internal, seg, int, oid, internal), - FUNCTION 2 gseg_union (internal, internal), - FUNCTION 3 gseg_compress (internal), - FUNCTION 4 gseg_decompress (internal), - FUNCTION 5 gseg_penalty (internal, internal, internal), - FUNCTION 6 gseg_picksplit (internal, internal), - FUNCTION 7 gseg_same (seg, seg, internal); diff --git a/contrib/seg/sql/seg.sql b/contrib/seg/sql/seg.sql index b8a29d659a..7b7f138dbf 100644 --- a/contrib/seg/sql/seg.sql +++ b/contrib/seg/sql/seg.sql @@ -2,15 +2,7 @@ -- Test seg datatype -- --- --- first, define the datatype. Turn off echoing so that expected file --- does not depend on contents of seg.sql. --- -SET client_min_messages = warning; -\set ECHO none -\i seg.sql -\set ECHO all -RESET client_min_messages; +CREATE EXTENSION seg; -- -- testing the input and output functions diff --git a/contrib/seg/uninstall_seg.sql b/contrib/seg/uninstall_seg.sql deleted file mode 100644 index 27e8ba901a..0000000000 --- a/contrib/seg/uninstall_seg.sql +++ /dev/null @@ -1,94 +0,0 @@ -/* contrib/seg/uninstall_seg.sql */ - --- Adjust this setting to control where the objects get dropped. -SET search_path = public; - -DROP OPERATOR CLASS gist_seg_ops USING gist; - -DROP OPERATOR CLASS seg_ops USING btree; - -DROP FUNCTION gseg_same(seg, seg, internal); - -DROP FUNCTION gseg_union(internal, internal); - -DROP FUNCTION gseg_picksplit(internal, internal); - -DROP FUNCTION gseg_penalty(internal,internal,internal); - -DROP FUNCTION gseg_decompress(internal); - -DROP FUNCTION gseg_compress(internal); - -DROP FUNCTION gseg_consistent(internal,seg,int,oid,internal); - -DROP OPERATOR <@ (seg, seg); - -DROP OPERATOR @> (seg, seg); - -DROP OPERATOR ~ (seg, seg); - -DROP OPERATOR @ (seg, seg); - -DROP OPERATOR <> (seg, seg); - -DROP OPERATOR = (seg, seg); - -DROP OPERATOR >> (seg, seg); - -DROP OPERATOR &> (seg, seg); - -DROP OPERATOR && (seg, seg); - -DROP OPERATOR &< (seg, seg); - -DROP OPERATOR << (seg, seg); - -DROP OPERATOR >= (seg, seg); - -DROP OPERATOR > (seg, seg); - -DROP OPERATOR <= (seg, seg); - -DROP OPERATOR < (seg, seg); - -DROP FUNCTION seg_center(seg); - -DROP FUNCTION seg_lower(seg); - -DROP FUNCTION seg_upper(seg); - -DROP FUNCTION seg_size(seg); - -DROP FUNCTION seg_inter(seg, seg); - -DROP FUNCTION seg_union(seg, seg); - -DROP FUNCTION seg_cmp(seg, seg); - -DROP FUNCTION seg_different(seg, seg); - -DROP FUNCTION seg_same(seg, seg); - -DROP FUNCTION seg_overlap(seg, seg); - -DROP FUNCTION seg_contained(seg, seg); - -DROP FUNCTION seg_contains(seg, seg); - -DROP FUNCTION seg_ge(seg, seg); - -DROP FUNCTION seg_gt(seg, seg); - -DROP FUNCTION seg_le(seg, seg); - -DROP FUNCTION seg_lt(seg, seg); - -DROP FUNCTION seg_right(seg, seg); - -DROP FUNCTION seg_left(seg, seg); - -DROP FUNCTION seg_over_right(seg, seg); - -DROP FUNCTION seg_over_left(seg, seg); - -DROP TYPE seg CASCADE; diff --git a/contrib/spi/.gitignore b/contrib/spi/.gitignore deleted file mode 100644 index 6c07a33b11..0000000000 --- a/contrib/spi/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/autoinc.sql -/insert_username.sql -/moddatetime.sql -/refint.sql -/timetravel.sql diff --git a/contrib/spi/Makefile b/contrib/spi/Makefile index 531d406605..0c11bfcbbd 100644 --- a/contrib/spi/Makefile +++ b/contrib/spi/Makefile @@ -1,7 +1,15 @@ # contrib/spi/Makefile MODULES = autoinc insert_username moddatetime refint timetravel -DATA_built = $(addsuffix .sql, $(MODULES)) + +EXTENSION = autoinc insert_username moddatetime refint timetravel + +DATA = autoinc--1.0.sql autoinc--unpackaged--1.0.sql \ + insert_username--1.0.sql insert_username--unpackaged--1.0.sql \ + moddatetime--1.0.sql moddatetime--unpackaged--1.0.sql \ + refint--1.0.sql refint--unpackaged--1.0.sql \ + timetravel--1.0.sql timetravel--unpackaged--1.0.sql + DOCS = $(addsuffix .example, $(MODULES)) # this is needed for the regression tests; diff --git a/contrib/spi/autoinc--1.0.sql b/contrib/spi/autoinc--1.0.sql new file mode 100644 index 0000000000..bf5ecab08b --- /dev/null +++ b/contrib/spi/autoinc--1.0.sql @@ -0,0 +1,6 @@ +/* contrib/spi/autoinc--1.0.sql */ + +CREATE OR REPLACE FUNCTION autoinc() +RETURNS trigger +AS 'MODULE_PATHNAME' +LANGUAGE C; diff --git a/contrib/spi/autoinc--unpackaged--1.0.sql b/contrib/spi/autoinc--unpackaged--1.0.sql new file mode 100644 index 0000000000..232e9170fc --- /dev/null +++ b/contrib/spi/autoinc--unpackaged--1.0.sql @@ -0,0 +1,3 @@ +/* contrib/spi/autoinc--unpackaged--1.0.sql */ + +ALTER EXTENSION autoinc ADD function autoinc(); diff --git a/contrib/spi/autoinc.control b/contrib/spi/autoinc.control new file mode 100644 index 0000000000..1d7a8e53d4 --- /dev/null +++ b/contrib/spi/autoinc.control @@ -0,0 +1,5 @@ +# autoinc extension +comment = 'functions for autoincrementing fields' +default_version = '1.0' +module_pathname = '$libdir/autoinc' +relocatable = true diff --git a/contrib/spi/autoinc.sql.in b/contrib/spi/autoinc.sql.in deleted file mode 100644 index 1fa322f9c7..0000000000 --- a/contrib/spi/autoinc.sql.in +++ /dev/null @@ -1,9 +0,0 @@ -/* contrib/spi/autoinc.sql.in */ - --- Adjust this setting to control where the objects get created. -SET search_path = public; - -CREATE OR REPLACE FUNCTION autoinc() -RETURNS trigger -AS 'MODULE_PATHNAME' -LANGUAGE C; diff --git a/contrib/spi/insert_username--1.0.sql b/contrib/spi/insert_username--1.0.sql new file mode 100644 index 0000000000..3867c57a2c --- /dev/null +++ b/contrib/spi/insert_username--1.0.sql @@ -0,0 +1,6 @@ +/* contrib/spi/insert_username--1.0.sql */ + +CREATE OR REPLACE FUNCTION insert_username() +RETURNS trigger +AS 'MODULE_PATHNAME' +LANGUAGE C; diff --git a/contrib/spi/insert_username--unpackaged--1.0.sql b/contrib/spi/insert_username--unpackaged--1.0.sql new file mode 100644 index 0000000000..f53cb690f1 --- /dev/null +++ b/contrib/spi/insert_username--unpackaged--1.0.sql @@ -0,0 +1,3 @@ +/* contrib/spi/insert_username--unpackaged--1.0.sql */ + +ALTER EXTENSION insert_username ADD function insert_username(); diff --git a/contrib/spi/insert_username.control b/contrib/spi/insert_username.control new file mode 100644 index 0000000000..9d110643ee --- /dev/null +++ b/contrib/spi/insert_username.control @@ -0,0 +1,5 @@ +# insert_username extension +comment = 'functions for tracking who changed a table' +default_version = '1.0' +module_pathname = '$libdir/insert_username' +relocatable = true diff --git a/contrib/spi/insert_username.sql.in b/contrib/spi/insert_username.sql.in deleted file mode 100644 index bdc2deb340..0000000000 --- a/contrib/spi/insert_username.sql.in +++ /dev/null @@ -1,9 +0,0 @@ -/* contrib/spi/insert_username.sql.in */ - --- Adjust this setting to control where the objects get created. -SET search_path = public; - -CREATE OR REPLACE FUNCTION insert_username() -RETURNS trigger -AS 'MODULE_PATHNAME' -LANGUAGE C; diff --git a/contrib/spi/moddatetime--1.0.sql b/contrib/spi/moddatetime--1.0.sql new file mode 100644 index 0000000000..00971c9fe1 --- /dev/null +++ b/contrib/spi/moddatetime--1.0.sql @@ -0,0 +1,6 @@ +/* contrib/spi/moddatetime--1.0.sql */ + +CREATE OR REPLACE FUNCTION moddatetime() +RETURNS trigger +AS 'MODULE_PATHNAME' +LANGUAGE C; diff --git a/contrib/spi/moddatetime--unpackaged--1.0.sql b/contrib/spi/moddatetime--unpackaged--1.0.sql new file mode 100644 index 0000000000..f3a0a96837 --- /dev/null +++ b/contrib/spi/moddatetime--unpackaged--1.0.sql @@ -0,0 +1,3 @@ +/* contrib/spi/moddatetime--unpackaged--1.0.sql */ + +ALTER EXTENSION moddatetime ADD function moddatetime(); diff --git a/contrib/spi/moddatetime.control b/contrib/spi/moddatetime.control new file mode 100644 index 0000000000..93dfac589a --- /dev/null +++ b/contrib/spi/moddatetime.control @@ -0,0 +1,5 @@ +# moddatetime extension +comment = 'functions for tracking last modification time' +default_version = '1.0' +module_pathname = '$libdir/moddatetime' +relocatable = true diff --git a/contrib/spi/moddatetime.sql.in b/contrib/spi/moddatetime.sql.in deleted file mode 100644 index e4ca6a6653..0000000000 --- a/contrib/spi/moddatetime.sql.in +++ /dev/null @@ -1,9 +0,0 @@ -/* contrib/spi/moddatetime.sql.in */ - --- Adjust this setting to control where the objects get created. -SET search_path = public; - -CREATE OR REPLACE FUNCTION moddatetime() -RETURNS trigger -AS 'MODULE_PATHNAME' -LANGUAGE C; diff --git a/contrib/spi/refint--1.0.sql b/contrib/spi/refint--1.0.sql new file mode 100644 index 0000000000..5a50226c43 --- /dev/null +++ b/contrib/spi/refint--1.0.sql @@ -0,0 +1,11 @@ +/* contrib/spi/refint--1.0.sql */ + +CREATE OR REPLACE FUNCTION check_primary_key() +RETURNS trigger +AS 'MODULE_PATHNAME' +LANGUAGE C; + +CREATE OR REPLACE FUNCTION check_foreign_key() +RETURNS trigger +AS 'MODULE_PATHNAME' +LANGUAGE C; diff --git a/contrib/spi/refint--unpackaged--1.0.sql b/contrib/spi/refint--unpackaged--1.0.sql new file mode 100644 index 0000000000..54fece055a --- /dev/null +++ b/contrib/spi/refint--unpackaged--1.0.sql @@ -0,0 +1,4 @@ +/* contrib/spi/refint--unpackaged--1.0.sql */ + +ALTER EXTENSION refint ADD function check_primary_key(); +ALTER EXTENSION refint ADD function check_foreign_key(); diff --git a/contrib/spi/refint.control b/contrib/spi/refint.control new file mode 100644 index 0000000000..cbede45784 --- /dev/null +++ b/contrib/spi/refint.control @@ -0,0 +1,5 @@ +# refint extension +comment = 'functions for implementing referential integrity (obsolete)' +default_version = '1.0' +module_pathname = '$libdir/refint' +relocatable = true diff --git a/contrib/spi/refint.sql.in b/contrib/spi/refint.sql.in deleted file mode 100644 index 2525b70006..0000000000 --- a/contrib/spi/refint.sql.in +++ /dev/null @@ -1,14 +0,0 @@ -/* contrib/spi/refint.sql.in */ - --- Adjust this setting to control where the objects get created. -SET search_path = public; - -CREATE OR REPLACE FUNCTION check_primary_key() -RETURNS trigger -AS 'MODULE_PATHNAME' -LANGUAGE C; - -CREATE OR REPLACE FUNCTION check_foreign_key() -RETURNS trigger -AS 'MODULE_PATHNAME' -LANGUAGE C; diff --git a/contrib/spi/timetravel--1.0.sql b/contrib/spi/timetravel--1.0.sql new file mode 100644 index 0000000000..c9f786218f --- /dev/null +++ b/contrib/spi/timetravel--1.0.sql @@ -0,0 +1,16 @@ +/* contrib/spi/timetravel--1.0.sql */ + +CREATE OR REPLACE FUNCTION timetravel() +RETURNS trigger +AS 'MODULE_PATHNAME' +LANGUAGE C; + +CREATE OR REPLACE FUNCTION set_timetravel(name, int4) +RETURNS int4 +AS 'MODULE_PATHNAME' +LANGUAGE C RETURNS NULL ON NULL INPUT; + +CREATE OR REPLACE FUNCTION get_timetravel(name) +RETURNS int4 +AS 'MODULE_PATHNAME' +LANGUAGE C RETURNS NULL ON NULL INPUT; diff --git a/contrib/spi/timetravel--unpackaged--1.0.sql b/contrib/spi/timetravel--unpackaged--1.0.sql new file mode 100644 index 0000000000..e3716afe95 --- /dev/null +++ b/contrib/spi/timetravel--unpackaged--1.0.sql @@ -0,0 +1,5 @@ +/* contrib/spi/timetravel--unpackaged--1.0.sql */ + +ALTER EXTENSION timetravel ADD function timetravel(); +ALTER EXTENSION timetravel ADD function set_timetravel(name,integer); +ALTER EXTENSION timetravel ADD function get_timetravel(name); diff --git a/contrib/spi/timetravel.control b/contrib/spi/timetravel.control new file mode 100644 index 0000000000..9b4bb6ba04 --- /dev/null +++ b/contrib/spi/timetravel.control @@ -0,0 +1,5 @@ +# timetravel extension +comment = 'functions for implementing time travel' +default_version = '1.0' +module_pathname = '$libdir/timetravel' +relocatable = true diff --git a/contrib/spi/timetravel.sql.in b/contrib/spi/timetravel.sql.in deleted file mode 100644 index 83dc958a88..0000000000 --- a/contrib/spi/timetravel.sql.in +++ /dev/null @@ -1,19 +0,0 @@ -/* contrib/spi/timetravel.sql.in */ - --- Adjust this setting to control where the objects get created. -SET search_path = public; - -CREATE OR REPLACE FUNCTION timetravel() -RETURNS trigger -AS 'MODULE_PATHNAME' -LANGUAGE C; - -CREATE OR REPLACE FUNCTION set_timetravel(name, int4) -RETURNS int4 -AS 'MODULE_PATHNAME' -LANGUAGE C RETURNS NULL ON NULL INPUT; - -CREATE OR REPLACE FUNCTION get_timetravel(name) -RETURNS int4 -AS 'MODULE_PATHNAME' -LANGUAGE C RETURNS NULL ON NULL INPUT; diff --git a/contrib/sslinfo/.gitignore b/contrib/sslinfo/.gitignore deleted file mode 100644 index 6ed45c8ce5..0000000000 --- a/contrib/sslinfo/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/sslinfo.sql diff --git a/contrib/sslinfo/Makefile b/contrib/sslinfo/Makefile index a4c3d84297..0dee6ed2f7 100644 --- a/contrib/sslinfo/Makefile +++ b/contrib/sslinfo/Makefile @@ -2,8 +2,9 @@ MODULE_big = sslinfo OBJS = sslinfo.o -DATA_built = sslinfo.sql -DATA = uninstall_sslinfo.sql + +EXTENSION = sslinfo +DATA = sslinfo--1.0.sql sslinfo--unpackaged--1.0.sql ifdef USE_PGXS PG_CONFIG = pg_config diff --git a/contrib/sslinfo/sslinfo--1.0.sql b/contrib/sslinfo/sslinfo--1.0.sql new file mode 100644 index 0000000000..37007e59f7 --- /dev/null +++ b/contrib/sslinfo/sslinfo--1.0.sql @@ -0,0 +1,37 @@ +/* contrib/sslinfo/sslinfo--1.0.sql */ + +CREATE OR REPLACE FUNCTION ssl_client_serial() RETURNS numeric +AS 'MODULE_PATHNAME', 'ssl_client_serial' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION ssl_is_used() RETURNS boolean +AS 'MODULE_PATHNAME', 'ssl_is_used' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION ssl_version() RETURNS text +AS 'MODULE_PATHNAME', 'ssl_version' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION ssl_cipher() RETURNS text +AS 'MODULE_PATHNAME', 'ssl_cipher' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION ssl_client_cert_present() RETURNS boolean +AS 'MODULE_PATHNAME', 'ssl_client_cert_present' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION ssl_client_dn_field(text) RETURNS text +AS 'MODULE_PATHNAME', 'ssl_client_dn_field' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION ssl_issuer_field(text) RETURNS text +AS 'MODULE_PATHNAME', 'ssl_issuer_field' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION ssl_client_dn() RETURNS text +AS 'MODULE_PATHNAME', 'ssl_client_dn' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION ssl_issuer_dn() RETURNS text +AS 'MODULE_PATHNAME', 'ssl_issuer_dn' +LANGUAGE C STRICT; diff --git a/contrib/sslinfo/sslinfo--unpackaged--1.0.sql b/contrib/sslinfo/sslinfo--unpackaged--1.0.sql new file mode 100644 index 0000000000..c07793905a --- /dev/null +++ b/contrib/sslinfo/sslinfo--unpackaged--1.0.sql @@ -0,0 +1,11 @@ +/* contrib/sslinfo/sslinfo--unpackaged--1.0.sql */ + +ALTER EXTENSION sslinfo ADD function ssl_client_serial(); +ALTER EXTENSION sslinfo ADD function ssl_is_used(); +ALTER EXTENSION sslinfo ADD function ssl_version(); +ALTER EXTENSION sslinfo ADD function ssl_cipher(); +ALTER EXTENSION sslinfo ADD function ssl_client_cert_present(); +ALTER EXTENSION sslinfo ADD function ssl_client_dn_field(text); +ALTER EXTENSION sslinfo ADD function ssl_issuer_field(text); +ALTER EXTENSION sslinfo ADD function ssl_client_dn(); +ALTER EXTENSION sslinfo ADD function ssl_issuer_dn(); diff --git a/contrib/sslinfo/sslinfo.control b/contrib/sslinfo/sslinfo.control new file mode 100644 index 0000000000..1d2f058f6e --- /dev/null +++ b/contrib/sslinfo/sslinfo.control @@ -0,0 +1,5 @@ +# sslinfo extension +comment = 'information about SSL certificates' +default_version = '1.0' +module_pathname = '$libdir/sslinfo' +relocatable = true diff --git a/contrib/sslinfo/sslinfo.sql.in b/contrib/sslinfo/sslinfo.sql.in deleted file mode 100644 index 66cbe3ea66..0000000000 --- a/contrib/sslinfo/sslinfo.sql.in +++ /dev/null @@ -1,40 +0,0 @@ -/* contrib/sslinfo/sslinfo.sql.in */ - --- Adjust this setting to control where the objects get created. -SET search_path = public; - -CREATE OR REPLACE FUNCTION ssl_client_serial() RETURNS numeric -AS 'MODULE_PATHNAME', 'ssl_client_serial' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION ssl_is_used() RETURNS boolean -AS 'MODULE_PATHNAME', 'ssl_is_used' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION ssl_version() RETURNS text -AS 'MODULE_PATHNAME', 'ssl_version' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION ssl_cipher() RETURNS text -AS 'MODULE_PATHNAME', 'ssl_cipher' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION ssl_client_cert_present() RETURNS boolean -AS 'MODULE_PATHNAME', 'ssl_client_cert_present' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION ssl_client_dn_field(text) RETURNS text -AS 'MODULE_PATHNAME', 'ssl_client_dn_field' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION ssl_issuer_field(text) RETURNS text -AS 'MODULE_PATHNAME', 'ssl_issuer_field' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION ssl_client_dn() RETURNS text -AS 'MODULE_PATHNAME', 'ssl_client_dn' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION ssl_issuer_dn() RETURNS text -AS 'MODULE_PATHNAME', 'ssl_issuer_dn' -LANGUAGE C STRICT; diff --git a/contrib/sslinfo/uninstall_sslinfo.sql b/contrib/sslinfo/uninstall_sslinfo.sql deleted file mode 100644 index 9ac572c8f9..0000000000 --- a/contrib/sslinfo/uninstall_sslinfo.sql +++ /dev/null @@ -1,14 +0,0 @@ -/* contrib/sslinfo/uninstall_sslinfo.sql */ - --- Adjust this setting to control where the objects get dropped. -SET search_path = public; - -DROP FUNCTION ssl_client_serial(); -DROP FUNCTION ssl_is_used(); -DROP FUNCTION ssl_cipher(); -DROP FUNCTION ssl_version(); -DROP FUNCTION ssl_client_cert_present(); -DROP FUNCTION ssl_client_dn_field(text); -DROP FUNCTION ssl_issuer_field(text); -DROP FUNCTION ssl_client_dn(); -DROP FUNCTION ssl_issuer_dn(); diff --git a/contrib/tablefunc/.gitignore b/contrib/tablefunc/.gitignore index b28639637b..19b6c5ba42 100644 --- a/contrib/tablefunc/.gitignore +++ b/contrib/tablefunc/.gitignore @@ -1,3 +1,2 @@ -/tablefunc.sql # Generated subdirectories /results/ diff --git a/contrib/tablefunc/Makefile b/contrib/tablefunc/Makefile index a5c2882866..eb108931ec 100644 --- a/contrib/tablefunc/Makefile +++ b/contrib/tablefunc/Makefile @@ -1,8 +1,10 @@ # contrib/tablefunc/Makefile MODULES = tablefunc -DATA_built = tablefunc.sql -DATA = uninstall_tablefunc.sql + +EXTENSION = tablefunc +DATA = tablefunc--1.0.sql tablefunc--unpackaged--1.0.sql + REGRESS = tablefunc LDFLAGS_SL += $(filter -lm, $(LIBS)) diff --git a/contrib/tablefunc/expected/tablefunc.out b/contrib/tablefunc/expected/tablefunc.out index 15ef758ed7..7ad4336ada 100644 --- a/contrib/tablefunc/expected/tablefunc.out +++ b/contrib/tablefunc/expected/tablefunc.out @@ -1,10 +1,4 @@ --- --- first, define the functions. Turn off echoing so that expected file --- does not depend on contents of tablefunc.sql. --- -SET client_min_messages = warning; -\set ECHO none -RESET client_min_messages; +CREATE EXTENSION tablefunc; -- -- normal_rand() -- no easy way to do this for regression testing diff --git a/contrib/tablefunc/sql/tablefunc.sql b/contrib/tablefunc/sql/tablefunc.sql index 8846a4218e..bf874f26ad 100644 --- a/contrib/tablefunc/sql/tablefunc.sql +++ b/contrib/tablefunc/sql/tablefunc.sql @@ -1,12 +1,4 @@ --- --- first, define the functions. Turn off echoing so that expected file --- does not depend on contents of tablefunc.sql. --- -SET client_min_messages = warning; -\set ECHO none -\i tablefunc.sql -\set ECHO all -RESET client_min_messages; +CREATE EXTENSION tablefunc; -- -- normal_rand() diff --git a/contrib/tablefunc/tablefunc--1.0.sql b/contrib/tablefunc/tablefunc--1.0.sql new file mode 100644 index 0000000000..63dd8c4634 --- /dev/null +++ b/contrib/tablefunc/tablefunc--1.0.sql @@ -0,0 +1,85 @@ +/* contrib/tablefunc/tablefunc--1.0.sql */ + +CREATE OR REPLACE FUNCTION normal_rand(int4, float8, float8) +RETURNS setof float8 +AS 'MODULE_PATHNAME','normal_rand' +LANGUAGE C VOLATILE STRICT; + +-- the generic crosstab function: +CREATE OR REPLACE FUNCTION crosstab(text) +RETURNS setof record +AS 'MODULE_PATHNAME','crosstab' +LANGUAGE C STABLE STRICT; + +-- examples of building custom type-specific crosstab functions: +CREATE TYPE tablefunc_crosstab_2 AS +( + row_name TEXT, + category_1 TEXT, + category_2 TEXT +); + +CREATE TYPE tablefunc_crosstab_3 AS +( + row_name TEXT, + category_1 TEXT, + category_2 TEXT, + category_3 TEXT +); + +CREATE TYPE tablefunc_crosstab_4 AS +( + row_name TEXT, + category_1 TEXT, + category_2 TEXT, + category_3 TEXT, + category_4 TEXT +); + +CREATE OR REPLACE FUNCTION crosstab2(text) +RETURNS setof tablefunc_crosstab_2 +AS 'MODULE_PATHNAME','crosstab' +LANGUAGE C STABLE STRICT; + +CREATE OR REPLACE FUNCTION crosstab3(text) +RETURNS setof tablefunc_crosstab_3 +AS 'MODULE_PATHNAME','crosstab' +LANGUAGE C STABLE STRICT; + +CREATE OR REPLACE FUNCTION crosstab4(text) +RETURNS setof tablefunc_crosstab_4 +AS 'MODULE_PATHNAME','crosstab' +LANGUAGE C STABLE STRICT; + +-- obsolete: +CREATE OR REPLACE FUNCTION crosstab(text,int) +RETURNS setof record +AS 'MODULE_PATHNAME','crosstab' +LANGUAGE C STABLE STRICT; + +CREATE OR REPLACE FUNCTION crosstab(text,text) +RETURNS setof record +AS 'MODULE_PATHNAME','crosstab_hash' +LANGUAGE C STABLE STRICT; + +CREATE OR REPLACE FUNCTION connectby(text,text,text,text,int,text) +RETURNS setof record +AS 'MODULE_PATHNAME','connectby_text' +LANGUAGE C STABLE STRICT; + +CREATE OR REPLACE FUNCTION connectby(text,text,text,text,int) +RETURNS setof record +AS 'MODULE_PATHNAME','connectby_text' +LANGUAGE C STABLE STRICT; + +-- These 2 take the name of a field to ORDER BY as 4th arg (for sorting siblings) + +CREATE OR REPLACE FUNCTION connectby(text,text,text,text,text,int,text) +RETURNS setof record +AS 'MODULE_PATHNAME','connectby_text_serial' +LANGUAGE C STABLE STRICT; + +CREATE OR REPLACE FUNCTION connectby(text,text,text,text,text,int) +RETURNS setof record +AS 'MODULE_PATHNAME','connectby_text_serial' +LANGUAGE C STABLE STRICT; diff --git a/contrib/tablefunc/tablefunc--unpackaged--1.0.sql b/contrib/tablefunc/tablefunc--unpackaged--1.0.sql new file mode 100644 index 0000000000..20e09816e9 --- /dev/null +++ b/contrib/tablefunc/tablefunc--unpackaged--1.0.sql @@ -0,0 +1,16 @@ +/* contrib/tablefunc/tablefunc--unpackaged--1.0.sql */ + +ALTER EXTENSION tablefunc ADD function normal_rand(integer,double precision,double precision); +ALTER EXTENSION tablefunc ADD function crosstab(text); +ALTER EXTENSION tablefunc ADD type tablefunc_crosstab_2; +ALTER EXTENSION tablefunc ADD type tablefunc_crosstab_3; +ALTER EXTENSION tablefunc ADD type tablefunc_crosstab_4; +ALTER EXTENSION tablefunc ADD function crosstab2(text); +ALTER EXTENSION tablefunc ADD function crosstab3(text); +ALTER EXTENSION tablefunc ADD function crosstab4(text); +ALTER EXTENSION tablefunc ADD function crosstab(text,integer); +ALTER EXTENSION tablefunc ADD function crosstab(text,text); +ALTER EXTENSION tablefunc ADD function connectby(text,text,text,text,integer,text); +ALTER EXTENSION tablefunc ADD function connectby(text,text,text,text,integer); +ALTER EXTENSION tablefunc ADD function connectby(text,text,text,text,text,integer,text); +ALTER EXTENSION tablefunc ADD function connectby(text,text,text,text,text,integer); diff --git a/contrib/tablefunc/tablefunc.control b/contrib/tablefunc/tablefunc.control new file mode 100644 index 0000000000..248b0a77a2 --- /dev/null +++ b/contrib/tablefunc/tablefunc.control @@ -0,0 +1,5 @@ +# tablefunc extension +comment = 'functions that manipulate whole tables, including crosstab' +default_version = '1.0' +module_pathname = '$libdir/tablefunc' +relocatable = true diff --git a/contrib/tablefunc/tablefunc.sql.in b/contrib/tablefunc/tablefunc.sql.in deleted file mode 100644 index 54cba5ed3e..0000000000 --- a/contrib/tablefunc/tablefunc.sql.in +++ /dev/null @@ -1,88 +0,0 @@ -/* contrib/tablefunc/tablefunc.sql.in */ - --- Adjust this setting to control where the objects get created. -SET search_path = public; - -CREATE OR REPLACE FUNCTION normal_rand(int4, float8, float8) -RETURNS setof float8 -AS 'MODULE_PATHNAME','normal_rand' -LANGUAGE C VOLATILE STRICT; - --- the generic crosstab function: -CREATE OR REPLACE FUNCTION crosstab(text) -RETURNS setof record -AS 'MODULE_PATHNAME','crosstab' -LANGUAGE C STABLE STRICT; - --- examples of building custom type-specific crosstab functions: -CREATE TYPE tablefunc_crosstab_2 AS -( - row_name TEXT, - category_1 TEXT, - category_2 TEXT -); - -CREATE TYPE tablefunc_crosstab_3 AS -( - row_name TEXT, - category_1 TEXT, - category_2 TEXT, - category_3 TEXT -); - -CREATE TYPE tablefunc_crosstab_4 AS -( - row_name TEXT, - category_1 TEXT, - category_2 TEXT, - category_3 TEXT, - category_4 TEXT -); - -CREATE OR REPLACE FUNCTION crosstab2(text) -RETURNS setof tablefunc_crosstab_2 -AS 'MODULE_PATHNAME','crosstab' -LANGUAGE C STABLE STRICT; - -CREATE OR REPLACE FUNCTION crosstab3(text) -RETURNS setof tablefunc_crosstab_3 -AS 'MODULE_PATHNAME','crosstab' -LANGUAGE C STABLE STRICT; - -CREATE OR REPLACE FUNCTION crosstab4(text) -RETURNS setof tablefunc_crosstab_4 -AS 'MODULE_PATHNAME','crosstab' -LANGUAGE C STABLE STRICT; - --- obsolete: -CREATE OR REPLACE FUNCTION crosstab(text,int) -RETURNS setof record -AS 'MODULE_PATHNAME','crosstab' -LANGUAGE C STABLE STRICT; - -CREATE OR REPLACE FUNCTION crosstab(text,text) -RETURNS setof record -AS 'MODULE_PATHNAME','crosstab_hash' -LANGUAGE C STABLE STRICT; - -CREATE OR REPLACE FUNCTION connectby(text,text,text,text,int,text) -RETURNS setof record -AS 'MODULE_PATHNAME','connectby_text' -LANGUAGE C STABLE STRICT; - -CREATE OR REPLACE FUNCTION connectby(text,text,text,text,int) -RETURNS setof record -AS 'MODULE_PATHNAME','connectby_text' -LANGUAGE C STABLE STRICT; - --- These 2 take the name of a field to ORDER BY as 4th arg (for sorting siblings) - -CREATE OR REPLACE FUNCTION connectby(text,text,text,text,text,int,text) -RETURNS setof record -AS 'MODULE_PATHNAME','connectby_text_serial' -LANGUAGE C STABLE STRICT; - -CREATE OR REPLACE FUNCTION connectby(text,text,text,text,text,int) -RETURNS setof record -AS 'MODULE_PATHNAME','connectby_text_serial' -LANGUAGE C STABLE STRICT; diff --git a/contrib/tablefunc/uninstall_tablefunc.sql b/contrib/tablefunc/uninstall_tablefunc.sql deleted file mode 100644 index b1ec916447..0000000000 --- a/contrib/tablefunc/uninstall_tablefunc.sql +++ /dev/null @@ -1,32 +0,0 @@ -/* contrib/tablefunc/uninstall_tablefunc.sql */ - --- Adjust this setting to control where the objects get dropped. -SET search_path = public; - -DROP FUNCTION connectby(text,text,text,text,text,int); - -DROP FUNCTION connectby(text,text,text,text,text,int,text); - -DROP FUNCTION connectby(text,text,text,text,int); - -DROP FUNCTION connectby(text,text,text,text,int,text); - -DROP FUNCTION crosstab(text,text); - -DROP FUNCTION crosstab(text,int); - -DROP FUNCTION crosstab4(text); - -DROP FUNCTION crosstab3(text); - -DROP FUNCTION crosstab2(text); - -DROP TYPE tablefunc_crosstab_4; - -DROP TYPE tablefunc_crosstab_3; - -DROP TYPE tablefunc_crosstab_2; - -DROP FUNCTION crosstab(text); - -DROP FUNCTION normal_rand(int4, float8, float8); diff --git a/contrib/test_parser/.gitignore b/contrib/test_parser/.gitignore index c07f518855..19b6c5ba42 100644 --- a/contrib/test_parser/.gitignore +++ b/contrib/test_parser/.gitignore @@ -1,3 +1,2 @@ -/test_parser.sql # Generated subdirectories /results/ diff --git a/contrib/test_parser/Makefile b/contrib/test_parser/Makefile index ad4e0ec9b8..b9766cb023 100644 --- a/contrib/test_parser/Makefile +++ b/contrib/test_parser/Makefile @@ -2,8 +2,10 @@ MODULE_big = test_parser OBJS = test_parser.o -DATA_built = test_parser.sql -DATA = uninstall_test_parser.sql + +EXTENSION = test_parser +DATA = test_parser--1.0.sql test_parser--unpackaged--1.0.sql + REGRESS = test_parser ifdef USE_PGXS diff --git a/contrib/test_parser/expected/test_parser.out b/contrib/test_parser/expected/test_parser.out index 3d0fd4210f..8a49bc01e3 100644 --- a/contrib/test_parser/expected/test_parser.out +++ b/contrib/test_parser/expected/test_parser.out @@ -1,10 +1,4 @@ --- --- first, define the parser. Turn off echoing so that expected file --- does not depend on contents of this file. --- -SET client_min_messages = warning; -\set ECHO none -RESET client_min_messages; +CREATE EXTENSION test_parser; -- make test configuration using parser CREATE TEXT SEARCH CONFIGURATION testcfg (PARSER = testparser); ALTER TEXT SEARCH CONFIGURATION testcfg ADD MAPPING FOR word WITH simple; diff --git a/contrib/test_parser/sql/test_parser.sql b/contrib/test_parser/sql/test_parser.sql index 97c2cb5a5d..1f21504602 100644 --- a/contrib/test_parser/sql/test_parser.sql +++ b/contrib/test_parser/sql/test_parser.sql @@ -1,12 +1,4 @@ --- --- first, define the parser. Turn off echoing so that expected file --- does not depend on contents of this file. --- -SET client_min_messages = warning; -\set ECHO none -\i test_parser.sql -\set ECHO all -RESET client_min_messages; +CREATE EXTENSION test_parser; -- make test configuration using parser diff --git a/contrib/test_parser/test_parser--1.0.sql b/contrib/test_parser/test_parser--1.0.sql new file mode 100644 index 0000000000..fb785a1c4a --- /dev/null +++ b/contrib/test_parser/test_parser--1.0.sql @@ -0,0 +1,29 @@ +/* contrib/test_parser/test_parser--1.0.sql */ + +CREATE OR REPLACE FUNCTION testprs_start(internal, int4) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION testprs_getlexeme(internal, internal, internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION testprs_end(internal) +RETURNS void +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT; + +CREATE OR REPLACE FUNCTION testprs_lextype(internal) +RETURNS internal +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT; + +CREATE TEXT SEARCH PARSER testparser ( + START = testprs_start, + GETTOKEN = testprs_getlexeme, + END = testprs_end, + HEADLINE = pg_catalog.prsd_headline, + LEXTYPES = testprs_lextype +); diff --git a/contrib/test_parser/test_parser--unpackaged--1.0.sql b/contrib/test_parser/test_parser--unpackaged--1.0.sql new file mode 100644 index 0000000000..e240ab2b5b --- /dev/null +++ b/contrib/test_parser/test_parser--unpackaged--1.0.sql @@ -0,0 +1,7 @@ +/* contrib/test_parser/test_parser--unpackaged--1.0.sql */ + +ALTER EXTENSION test_parser ADD function testprs_start(internal,integer); +ALTER EXTENSION test_parser ADD function testprs_getlexeme(internal,internal,internal); +ALTER EXTENSION test_parser ADD function testprs_end(internal); +ALTER EXTENSION test_parser ADD function testprs_lextype(internal); +ALTER EXTENSION test_parser ADD text search parser testparser; diff --git a/contrib/test_parser/test_parser.control b/contrib/test_parser/test_parser.control new file mode 100644 index 0000000000..36b26b2087 --- /dev/null +++ b/contrib/test_parser/test_parser.control @@ -0,0 +1,5 @@ +# test_parser extension +comment = 'example of a custom parser for full-text search' +default_version = '1.0' +module_pathname = '$libdir/test_parser' +relocatable = true diff --git a/contrib/test_parser/test_parser.sql.in b/contrib/test_parser/test_parser.sql.in deleted file mode 100644 index bab97a2987..0000000000 --- a/contrib/test_parser/test_parser.sql.in +++ /dev/null @@ -1,32 +0,0 @@ -/* contrib/test_parser/test_parser.sql.in */ - --- Adjust this setting to control where the objects get created. -SET search_path = public; - -CREATE OR REPLACE FUNCTION testprs_start(internal, int4) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION testprs_getlexeme(internal, internal, internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION testprs_end(internal) -RETURNS void -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT; - -CREATE OR REPLACE FUNCTION testprs_lextype(internal) -RETURNS internal -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT; - -CREATE TEXT SEARCH PARSER testparser ( - START = testprs_start, - GETTOKEN = testprs_getlexeme, - END = testprs_end, - HEADLINE = pg_catalog.prsd_headline, - LEXTYPES = testprs_lextype -); diff --git a/contrib/test_parser/uninstall_test_parser.sql b/contrib/test_parser/uninstall_test_parser.sql deleted file mode 100644 index 042f46b251..0000000000 --- a/contrib/test_parser/uninstall_test_parser.sql +++ /dev/null @@ -1,14 +0,0 @@ -/* contrib/test_parser/uninstall_test_parser.sql */ - --- Adjust this setting to control where the objects get dropped. -SET search_path = public; - -DROP TEXT SEARCH PARSER testparser; - -DROP FUNCTION testprs_start(internal, int4); - -DROP FUNCTION testprs_getlexeme(internal, internal, internal); - -DROP FUNCTION testprs_end(internal); - -DROP FUNCTION testprs_lextype(internal); diff --git a/contrib/tsearch2/.gitignore b/contrib/tsearch2/.gitignore index 1d34309d00..19b6c5ba42 100644 --- a/contrib/tsearch2/.gitignore +++ b/contrib/tsearch2/.gitignore @@ -1,3 +1,2 @@ -/tsearch2.sql # Generated subdirectories /results/ diff --git a/contrib/tsearch2/Makefile b/contrib/tsearch2/Makefile index 8748d30b19..d260fd0030 100644 --- a/contrib/tsearch2/Makefile +++ b/contrib/tsearch2/Makefile @@ -1,8 +1,10 @@ # contrib/tsearch2/Makefile MODULES = tsearch2 -DATA_built = tsearch2.sql -DATA = uninstall_tsearch2.sql + +EXTENSION = tsearch2 +DATA = tsearch2--1.0.sql tsearch2--unpackaged--1.0.sql + REGRESS = tsearch2 ifdef USE_PGXS diff --git a/contrib/tsearch2/expected/tsearch2.out b/contrib/tsearch2/expected/tsearch2.out index 18b591e0aa..972f764c14 100644 --- a/contrib/tsearch2/expected/tsearch2.out +++ b/contrib/tsearch2/expected/tsearch2.out @@ -1,10 +1,4 @@ --- --- first, define the datatype. Turn off echoing so that expected file --- does not depend on contents of tsearch2.sql. --- -SET client_min_messages = warning; -\set ECHO none -RESET client_min_messages; +CREATE EXTENSION tsearch2; --tsvector SELECT '1'::tsvector; tsvector diff --git a/contrib/tsearch2/expected/tsearch2_1.out b/contrib/tsearch2/expected/tsearch2_1.out index f7cb0963b8..349733b6fd 100644 --- a/contrib/tsearch2/expected/tsearch2_1.out +++ b/contrib/tsearch2/expected/tsearch2_1.out @@ -1,10 +1,4 @@ --- --- first, define the datatype. Turn off echoing so that expected file --- does not depend on contents of tsearch2.sql. --- -SET client_min_messages = warning; -\set ECHO none -RESET client_min_messages; +CREATE EXTENSION tsearch2; --tsvector SELECT '1'::tsvector; tsvector diff --git a/contrib/tsearch2/sql/tsearch2.sql b/contrib/tsearch2/sql/tsearch2.sql index 99d808a1b3..665882ff88 100644 --- a/contrib/tsearch2/sql/tsearch2.sql +++ b/contrib/tsearch2/sql/tsearch2.sql @@ -1,12 +1,4 @@ --- --- first, define the datatype. Turn off echoing so that expected file --- does not depend on contents of tsearch2.sql. --- -SET client_min_messages = warning; -\set ECHO none -\i tsearch2.sql -\set ECHO all -RESET client_min_messages; +CREATE EXTENSION tsearch2; --tsvector SELECT '1'::tsvector; diff --git a/contrib/tsearch2/tsearch2--1.0.sql b/contrib/tsearch2/tsearch2--1.0.sql new file mode 100644 index 0000000000..40386a4c2a --- /dev/null +++ b/contrib/tsearch2/tsearch2--1.0.sql @@ -0,0 +1,573 @@ +/* contrib/tsearch2/tsearch2--1.0.sql */ + +-- These domains are just to catch schema-qualified references to the +-- old data types. +CREATE DOMAIN tsvector AS pg_catalog.tsvector; +CREATE DOMAIN tsquery AS pg_catalog.tsquery; +CREATE DOMAIN gtsvector AS pg_catalog.gtsvector; +CREATE DOMAIN gtsq AS pg_catalog.text; + +--dict interface +CREATE FUNCTION lexize(oid, text) + RETURNS _text + as 'ts_lexize' + LANGUAGE INTERNAL + RETURNS NULL ON NULL INPUT; + +CREATE FUNCTION lexize(text, text) + RETURNS _text + as 'MODULE_PATHNAME', 'tsa_lexize_byname' + LANGUAGE C + RETURNS NULL ON NULL INPUT; + +CREATE FUNCTION lexize(text) + RETURNS _text + as 'MODULE_PATHNAME', 'tsa_lexize_bycurrent' + LANGUAGE C + RETURNS NULL ON NULL INPUT; + +CREATE FUNCTION set_curdict(int) + RETURNS void + as 'MODULE_PATHNAME', 'tsa_set_curdict' + LANGUAGE C + RETURNS NULL ON NULL INPUT; + +CREATE FUNCTION set_curdict(text) + RETURNS void + as 'MODULE_PATHNAME', 'tsa_set_curdict_byname' + LANGUAGE C + RETURNS NULL ON NULL INPUT; + +--built-in dictionaries +CREATE FUNCTION dex_init(internal) + RETURNS internal + as 'MODULE_PATHNAME', 'tsa_dex_init' + LANGUAGE C; + +CREATE FUNCTION dex_lexize(internal,internal,int4) + RETURNS internal + as 'MODULE_PATHNAME', 'tsa_dex_lexize' + LANGUAGE C + RETURNS NULL ON NULL INPUT; + +CREATE FUNCTION snb_en_init(internal) + RETURNS internal + as 'MODULE_PATHNAME', 'tsa_snb_en_init' + LANGUAGE C; + +CREATE FUNCTION snb_lexize(internal,internal,int4) + RETURNS internal + as 'MODULE_PATHNAME', 'tsa_snb_lexize' + LANGUAGE C + RETURNS NULL ON NULL INPUT; + +CREATE FUNCTION snb_ru_init_koi8(internal) + RETURNS internal + as 'MODULE_PATHNAME', 'tsa_snb_ru_init_koi8' + LANGUAGE C; + +CREATE FUNCTION snb_ru_init_utf8(internal) + RETURNS internal + as 'MODULE_PATHNAME', 'tsa_snb_ru_init_utf8' + LANGUAGE C; + +CREATE FUNCTION snb_ru_init(internal) + RETURNS internal + as 'MODULE_PATHNAME', 'tsa_snb_ru_init' + LANGUAGE C; + +CREATE FUNCTION spell_init(internal) + RETURNS internal + as 'MODULE_PATHNAME', 'tsa_spell_init' + LANGUAGE C; + +CREATE FUNCTION spell_lexize(internal,internal,int4) + RETURNS internal + as 'MODULE_PATHNAME', 'tsa_spell_lexize' + LANGUAGE C + RETURNS NULL ON NULL INPUT; + +CREATE FUNCTION syn_init(internal) + RETURNS internal + as 'MODULE_PATHNAME', 'tsa_syn_init' + LANGUAGE C; + +CREATE FUNCTION syn_lexize(internal,internal,int4) + RETURNS internal + as 'MODULE_PATHNAME', 'tsa_syn_lexize' + LANGUAGE C + RETURNS NULL ON NULL INPUT; + +CREATE FUNCTION thesaurus_init(internal) + RETURNS internal + as 'MODULE_PATHNAME', 'tsa_thesaurus_init' + LANGUAGE C; + +CREATE FUNCTION thesaurus_lexize(internal,internal,int4,internal) + RETURNS internal + as 'MODULE_PATHNAME', 'tsa_thesaurus_lexize' + LANGUAGE C + RETURNS NULL ON NULL INPUT; + +--sql-level interface +CREATE TYPE tokentype + as (tokid int4, alias text, descr text); + +CREATE FUNCTION token_type(int4) + RETURNS setof tokentype + as 'ts_token_type_byid' + LANGUAGE INTERNAL + RETURNS NULL ON NULL INPUT + ROWS 16; + +CREATE FUNCTION token_type(text) + RETURNS setof tokentype + as 'ts_token_type_byname' + LANGUAGE INTERNAL + RETURNS NULL ON NULL INPUT + ROWS 16; + +CREATE FUNCTION token_type() + RETURNS setof tokentype + as 'MODULE_PATHNAME', 'tsa_token_type_current' + LANGUAGE C + RETURNS NULL ON NULL INPUT + ROWS 16; + +CREATE FUNCTION set_curprs(int) + RETURNS void + as 'MODULE_PATHNAME', 'tsa_set_curprs' + LANGUAGE C + RETURNS NULL ON NULL INPUT; + +CREATE FUNCTION set_curprs(text) + RETURNS void + as 'MODULE_PATHNAME', 'tsa_set_curprs_byname' + LANGUAGE C + RETURNS NULL ON NULL INPUT; + +CREATE TYPE tokenout + as (tokid int4, token text); + +CREATE FUNCTION parse(oid,text) + RETURNS setof tokenout + as 'ts_parse_byid' + LANGUAGE INTERNAL + RETURNS NULL ON NULL INPUT; + +CREATE FUNCTION parse(text,text) + RETURNS setof tokenout + as 'ts_parse_byname' + LANGUAGE INTERNAL + RETURNS NULL ON NULL INPUT; + +CREATE FUNCTION parse(text) + RETURNS setof tokenout + as 'MODULE_PATHNAME', 'tsa_parse_current' + LANGUAGE C + RETURNS NULL ON NULL INPUT; + +--default parser +CREATE FUNCTION prsd_start(internal,int4) + RETURNS internal + as 'MODULE_PATHNAME', 'tsa_prsd_start' + LANGUAGE C; + +CREATE FUNCTION prsd_getlexeme(internal,internal,internal) + RETURNS int4 + as 'MODULE_PATHNAME', 'tsa_prsd_getlexeme' + LANGUAGE C; + +CREATE FUNCTION prsd_end(internal) + RETURNS void + as 'MODULE_PATHNAME', 'tsa_prsd_end' + LANGUAGE C; + +CREATE FUNCTION prsd_lextype(internal) + RETURNS internal + as 'MODULE_PATHNAME', 'tsa_prsd_lextype' + LANGUAGE C; + +CREATE FUNCTION prsd_headline(internal,internal,internal) + RETURNS internal + as 'MODULE_PATHNAME', 'tsa_prsd_headline' + LANGUAGE C; + +--tsearch config +CREATE FUNCTION set_curcfg(int) + RETURNS void + as 'MODULE_PATHNAME', 'tsa_set_curcfg' + LANGUAGE C + RETURNS NULL ON NULL INPUT; + +CREATE FUNCTION set_curcfg(text) + RETURNS void + as 'MODULE_PATHNAME', 'tsa_set_curcfg_byname' + LANGUAGE C + RETURNS NULL ON NULL INPUT; + +CREATE FUNCTION show_curcfg() + RETURNS oid + AS 'get_current_ts_config' + LANGUAGE INTERNAL + RETURNS NULL ON NULL INPUT STABLE; + +CREATE FUNCTION length(tsvector) + RETURNS int4 + AS 'tsvector_length' + LANGUAGE INTERNAL + RETURNS NULL ON NULL INPUT IMMUTABLE; + +CREATE FUNCTION to_tsvector(oid, text) + RETURNS tsvector + AS 'to_tsvector_byid' + LANGUAGE INTERNAL + RETURNS NULL ON NULL INPUT IMMUTABLE; + +CREATE FUNCTION to_tsvector(text, text) + RETURNS tsvector + AS 'MODULE_PATHNAME', 'tsa_to_tsvector_name' + LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE; + +CREATE FUNCTION to_tsvector(text) + RETURNS tsvector + AS 'to_tsvector' + LANGUAGE INTERNAL + RETURNS NULL ON NULL INPUT IMMUTABLE; + +CREATE FUNCTION strip(tsvector) + RETURNS tsvector + AS 'tsvector_strip' + LANGUAGE INTERNAL + RETURNS NULL ON NULL INPUT IMMUTABLE; + +CREATE FUNCTION setweight(tsvector,"char") + RETURNS tsvector + AS 'tsvector_setweight' + LANGUAGE INTERNAL + RETURNS NULL ON NULL INPUT IMMUTABLE; + +CREATE FUNCTION concat(tsvector,tsvector) + RETURNS tsvector + AS 'tsvector_concat' + LANGUAGE INTERNAL + RETURNS NULL ON NULL INPUT IMMUTABLE; + +CREATE FUNCTION querytree(tsquery) + RETURNS text + AS 'tsquerytree' + LANGUAGE INTERNAL RETURNS NULL ON NULL INPUT; + +CREATE FUNCTION to_tsquery(oid, text) + RETURNS tsquery + AS 'to_tsquery_byid' + LANGUAGE INTERNAL + RETURNS NULL ON NULL INPUT IMMUTABLE; + +CREATE FUNCTION to_tsquery(text, text) + RETURNS tsquery + AS 'MODULE_PATHNAME','tsa_to_tsquery_name' + LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE; + +CREATE FUNCTION to_tsquery(text) + RETURNS tsquery + AS 'to_tsquery' + LANGUAGE INTERNAL + RETURNS NULL ON NULL INPUT IMMUTABLE; + +CREATE FUNCTION plainto_tsquery(oid, text) + RETURNS tsquery + AS 'plainto_tsquery_byid' + LANGUAGE INTERNAL + RETURNS NULL ON NULL INPUT IMMUTABLE; + +CREATE FUNCTION plainto_tsquery(text, text) + RETURNS tsquery + AS 'MODULE_PATHNAME','tsa_plainto_tsquery_name' + LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE; + +CREATE FUNCTION plainto_tsquery(text) + RETURNS tsquery + AS 'plainto_tsquery' + LANGUAGE INTERNAL + RETURNS NULL ON NULL INPUT IMMUTABLE; + +--Trigger +CREATE FUNCTION tsearch2() + RETURNS trigger + AS 'MODULE_PATHNAME', 'tsa_tsearch2' + LANGUAGE C; + +--Relevation +CREATE FUNCTION rank(float4[], tsvector, tsquery) + RETURNS float4 + AS 'ts_rank_wtt' + LANGUAGE INTERNAL + RETURNS NULL ON NULL INPUT IMMUTABLE; + +CREATE FUNCTION rank(float4[], tsvector, tsquery, int4) + RETURNS float4 + AS 'ts_rank_wttf' + LANGUAGE INTERNAL + RETURNS NULL ON NULL INPUT IMMUTABLE; + +CREATE FUNCTION rank(tsvector, tsquery) + RETURNS float4 + AS 'ts_rank_tt' + LANGUAGE INTERNAL + RETURNS NULL ON NULL INPUT IMMUTABLE; + +CREATE FUNCTION rank(tsvector, tsquery, int4) + RETURNS float4 + AS 'ts_rank_ttf' + LANGUAGE INTERNAL + RETURNS NULL ON NULL INPUT IMMUTABLE; + +CREATE FUNCTION rank_cd(float4[], tsvector, tsquery) + RETURNS float4 + AS 'ts_rankcd_wtt' + LANGUAGE INTERNAL + RETURNS NULL ON NULL INPUT IMMUTABLE; + +CREATE FUNCTION rank_cd(float4[], tsvector, tsquery, int4) + RETURNS float4 + AS 'ts_rankcd_wttf' + LANGUAGE INTERNAL + RETURNS NULL ON NULL INPUT IMMUTABLE; + +CREATE FUNCTION rank_cd(tsvector, tsquery) + RETURNS float4 + AS 'ts_rankcd_tt' + LANGUAGE INTERNAL + RETURNS NULL ON NULL INPUT IMMUTABLE; + +CREATE FUNCTION rank_cd(tsvector, tsquery, int4) + RETURNS float4 + AS 'ts_rankcd_ttf' + LANGUAGE INTERNAL + RETURNS NULL ON NULL INPUT IMMUTABLE; + +CREATE FUNCTION headline(oid, text, tsquery, text) + RETURNS text + AS 'ts_headline_byid_opt' + LANGUAGE INTERNAL + RETURNS NULL ON NULL INPUT IMMUTABLE; + +CREATE FUNCTION headline(oid, text, tsquery) + RETURNS text + AS 'ts_headline_byid' + LANGUAGE INTERNAL + RETURNS NULL ON NULL INPUT IMMUTABLE; + +CREATE FUNCTION headline(text, text, tsquery, text) + RETURNS text + AS 'MODULE_PATHNAME', 'tsa_headline_byname' + LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE; + +CREATE FUNCTION headline(text, text, tsquery) + RETURNS text + AS 'MODULE_PATHNAME', 'tsa_headline_byname' + LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE; + +CREATE FUNCTION headline(text, tsquery, text) + RETURNS text + AS 'ts_headline_opt' + LANGUAGE INTERNAL + RETURNS NULL ON NULL INPUT IMMUTABLE; + +CREATE FUNCTION headline(text, tsquery) + RETURNS text + AS 'ts_headline' + LANGUAGE INTERNAL + RETURNS NULL ON NULL INPUT IMMUTABLE; + +-- CREATE the OPERATOR class +CREATE OPERATOR CLASS gist_tsvector_ops +FOR TYPE tsvector USING gist +AS + OPERATOR 1 @@ (tsvector, tsquery), + FUNCTION 1 gtsvector_consistent (internal, gtsvector, int, oid, internal), + FUNCTION 2 gtsvector_union (internal, internal), + FUNCTION 3 gtsvector_compress (internal), + FUNCTION 4 gtsvector_decompress (internal), + FUNCTION 5 gtsvector_penalty (internal, internal, internal), + FUNCTION 6 gtsvector_picksplit (internal, internal), + FUNCTION 7 gtsvector_same (gtsvector, gtsvector, internal), + STORAGE gtsvector; + +--stat info +CREATE TYPE statinfo + as (word text, ndoc int4, nentry int4); + +CREATE FUNCTION stat(text) + RETURNS setof statinfo + as 'ts_stat1' + LANGUAGE INTERNAL + RETURNS NULL ON NULL INPUT; + +CREATE FUNCTION stat(text,text) + RETURNS setof statinfo + as 'ts_stat2' + LANGUAGE INTERNAL + RETURNS NULL ON NULL INPUT; + +--reset - just for debuging +CREATE FUNCTION reset_tsearch() + RETURNS void + as 'MODULE_PATHNAME', 'tsa_reset_tsearch' + LANGUAGE C + RETURNS NULL ON NULL INPUT; + +--get cover (debug for rank_cd) +CREATE FUNCTION get_covers(tsvector,tsquery) + RETURNS text + as 'MODULE_PATHNAME', 'tsa_get_covers' + LANGUAGE C + RETURNS NULL ON NULL INPUT; + +--debug function +create type tsdebug as ( + ts_name text, + tok_type text, + description text, + token text, + dict_name text[], + "tsvector" tsvector +); + +CREATE or replace FUNCTION _get_parser_from_curcfg() +RETURNS text as +$$select prsname::text from pg_catalog.pg_ts_parser p join pg_ts_config c on cfgparser = p.oid where c.oid = show_curcfg();$$ +LANGUAGE SQL RETURNS NULL ON NULL INPUT IMMUTABLE; + +CREATE FUNCTION ts_debug(text) +RETURNS setof tsdebug as $$ +select + (select c.cfgname::text from pg_catalog.pg_ts_config as c + where c.oid = show_curcfg()), + t.alias as tok_type, + t.descr as description, + p.token, + ARRAY ( SELECT m.mapdict::pg_catalog.regdictionary::pg_catalog.text + FROM pg_catalog.pg_ts_config_map AS m + WHERE m.mapcfg = show_curcfg() AND m.maptokentype = p.tokid + ORDER BY m.mapseqno ) + AS dict_name, + strip(to_tsvector(p.token)) as tsvector +from + parse( _get_parser_from_curcfg(), $1 ) as p, + token_type() as t +where + t.tokid = p.tokid +$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT; + +CREATE OR REPLACE FUNCTION numnode(tsquery) + RETURNS int4 + as 'tsquery_numnode' + LANGUAGE INTERNAL + RETURNS NULL ON NULL INPUT IMMUTABLE; + +CREATE OR REPLACE FUNCTION tsquery_and(tsquery,tsquery) + RETURNS tsquery + as 'tsquery_and' + LANGUAGE INTERNAL + RETURNS NULL ON NULL INPUT IMMUTABLE; + +CREATE OR REPLACE FUNCTION tsquery_or(tsquery,tsquery) + RETURNS tsquery + as 'tsquery_or' + LANGUAGE INTERNAL + RETURNS NULL ON NULL INPUT IMMUTABLE; + +CREATE OR REPLACE FUNCTION tsquery_not(tsquery) + RETURNS tsquery + as 'tsquery_not' + LANGUAGE INTERNAL + RETURNS NULL ON NULL INPUT IMMUTABLE; + +--------------rewrite subsystem + +CREATE OR REPLACE FUNCTION rewrite(tsquery, text) + RETURNS tsquery + as 'tsquery_rewrite_query' + LANGUAGE INTERNAL + RETURNS NULL ON NULL INPUT IMMUTABLE; + +CREATE OR REPLACE FUNCTION rewrite(tsquery, tsquery, tsquery) + RETURNS tsquery + as 'tsquery_rewrite' + LANGUAGE INTERNAL + RETURNS NULL ON NULL INPUT IMMUTABLE; + +CREATE OR REPLACE FUNCTION rewrite_accum(tsquery,tsquery[]) + RETURNS tsquery + AS 'MODULE_PATHNAME', 'tsa_rewrite_accum' + LANGUAGE C; + +CREATE OR REPLACE FUNCTION rewrite_finish(tsquery) + RETURNS tsquery + as 'MODULE_PATHNAME', 'tsa_rewrite_finish' + LANGUAGE C; + +CREATE AGGREGATE rewrite ( + BASETYPE = tsquery[], + SFUNC = rewrite_accum, + STYPE = tsquery, + FINALFUNC = rewrite_finish +); + +CREATE OR REPLACE FUNCTION tsq_mcontains(tsquery, tsquery) + RETURNS bool + as 'tsq_mcontains' + LANGUAGE INTERNAL + RETURNS NULL ON NULL INPUT IMMUTABLE; + +CREATE OR REPLACE FUNCTION tsq_mcontained(tsquery, tsquery) + RETURNS bool + as 'tsq_mcontained' + LANGUAGE INTERNAL + RETURNS NULL ON NULL INPUT IMMUTABLE; + +CREATE OPERATOR CLASS gist_tp_tsquery_ops +FOR TYPE tsquery USING gist +AS + OPERATOR 7 @> (tsquery, tsquery), + OPERATOR 8 <@ (tsquery, tsquery), + FUNCTION 1 gtsquery_consistent (internal, internal, int, oid, internal), + FUNCTION 2 gtsquery_union (internal, internal), + FUNCTION 3 gtsquery_compress (internal), + FUNCTION 4 gtsquery_decompress (internal), + FUNCTION 5 gtsquery_penalty (internal, internal, internal), + FUNCTION 6 gtsquery_picksplit (internal, internal), + FUNCTION 7 gtsquery_same (bigint, bigint, internal), + STORAGE bigint; + +CREATE OPERATOR CLASS gin_tsvector_ops +FOR TYPE tsvector USING gin +AS + OPERATOR 1 @@ (tsvector, tsquery), + OPERATOR 2 @@@ (tsvector, tsquery), + FUNCTION 1 bttextcmp(text, text), + FUNCTION 2 gin_extract_tsvector(tsvector,internal,internal), + FUNCTION 3 gin_extract_tsquery(tsquery,internal,smallint,internal,internal,internal,internal), + FUNCTION 4 gin_tsquery_consistent(internal,smallint,tsquery,int,internal,internal,internal,internal), + FUNCTION 5 gin_cmp_prefix(text,text,smallint,internal), + STORAGE text; + +CREATE OPERATOR CLASS tsvector_ops +FOR TYPE tsvector USING btree AS + OPERATOR 1 < , + OPERATOR 2 <= , + OPERATOR 3 = , + OPERATOR 4 >= , + OPERATOR 5 > , + FUNCTION 1 tsvector_cmp(tsvector, tsvector); + +CREATE OPERATOR CLASS tsquery_ops +FOR TYPE tsquery USING btree AS + OPERATOR 1 < , + OPERATOR 2 <= , + OPERATOR 3 = , + OPERATOR 4 >= , + OPERATOR 5 > , + FUNCTION 1 tsquery_cmp(tsquery, tsquery); diff --git a/contrib/tsearch2/tsearch2--unpackaged--1.0.sql b/contrib/tsearch2/tsearch2--unpackaged--1.0.sql new file mode 100644 index 0000000000..a3fcc8572a --- /dev/null +++ b/contrib/tsearch2/tsearch2--unpackaged--1.0.sql @@ -0,0 +1,100 @@ +/* contrib/tsearch2/tsearch2--unpackaged--1.0.sql */ + +ALTER EXTENSION tsearch2 ADD type @extschema@.tsvector; +ALTER EXTENSION tsearch2 ADD type @extschema@.tsquery; +ALTER EXTENSION tsearch2 ADD type @extschema@.gtsvector; +ALTER EXTENSION tsearch2 ADD type gtsq; +ALTER EXTENSION tsearch2 ADD function lexize(oid,text); +ALTER EXTENSION tsearch2 ADD function lexize(text,text); +ALTER EXTENSION tsearch2 ADD function lexize(text); +ALTER EXTENSION tsearch2 ADD function set_curdict(integer); +ALTER EXTENSION tsearch2 ADD function set_curdict(text); +ALTER EXTENSION tsearch2 ADD function dex_init(internal); +ALTER EXTENSION tsearch2 ADD function dex_lexize(internal,internal,integer); +ALTER EXTENSION tsearch2 ADD function snb_en_init(internal); +ALTER EXTENSION tsearch2 ADD function snb_lexize(internal,internal,integer); +ALTER EXTENSION tsearch2 ADD function snb_ru_init_koi8(internal); +ALTER EXTENSION tsearch2 ADD function snb_ru_init_utf8(internal); +ALTER EXTENSION tsearch2 ADD function snb_ru_init(internal); +ALTER EXTENSION tsearch2 ADD function spell_init(internal); +ALTER EXTENSION tsearch2 ADD function spell_lexize(internal,internal,integer); +ALTER EXTENSION tsearch2 ADD function syn_init(internal); +ALTER EXTENSION tsearch2 ADD function syn_lexize(internal,internal,integer); +ALTER EXTENSION tsearch2 ADD function @extschema@.thesaurus_init(internal); +ALTER EXTENSION tsearch2 ADD function thesaurus_lexize(internal,internal,integer,internal); +ALTER EXTENSION tsearch2 ADD type tokentype; +ALTER EXTENSION tsearch2 ADD function token_type(integer); +ALTER EXTENSION tsearch2 ADD function token_type(text); +ALTER EXTENSION tsearch2 ADD function token_type(); +ALTER EXTENSION tsearch2 ADD function set_curprs(integer); +ALTER EXTENSION tsearch2 ADD function set_curprs(text); +ALTER EXTENSION tsearch2 ADD type tokenout; +ALTER EXTENSION tsearch2 ADD function parse(oid,text); +ALTER EXTENSION tsearch2 ADD function parse(text,text); +ALTER EXTENSION tsearch2 ADD function parse(text); +ALTER EXTENSION tsearch2 ADD function @extschema@.prsd_start(internal,integer); +ALTER EXTENSION tsearch2 ADD function prsd_getlexeme(internal,internal,internal); +ALTER EXTENSION tsearch2 ADD function @extschema@.prsd_end(internal); +ALTER EXTENSION tsearch2 ADD function @extschema@.prsd_lextype(internal); +ALTER EXTENSION tsearch2 ADD function prsd_headline(internal,internal,internal); +ALTER EXTENSION tsearch2 ADD function set_curcfg(integer); +ALTER EXTENSION tsearch2 ADD function set_curcfg(text); +ALTER EXTENSION tsearch2 ADD function show_curcfg(); +ALTER EXTENSION tsearch2 ADD function @extschema@.length(tsvector); +ALTER EXTENSION tsearch2 ADD function to_tsvector(oid,text); +ALTER EXTENSION tsearch2 ADD function to_tsvector(text,text); +ALTER EXTENSION tsearch2 ADD function @extschema@.to_tsvector(text); +ALTER EXTENSION tsearch2 ADD function @extschema@.strip(tsvector); +ALTER EXTENSION tsearch2 ADD function @extschema@.setweight(tsvector,"char"); +ALTER EXTENSION tsearch2 ADD function concat(tsvector,tsvector); +ALTER EXTENSION tsearch2 ADD function @extschema@.querytree(tsquery); +ALTER EXTENSION tsearch2 ADD function to_tsquery(oid,text); +ALTER EXTENSION tsearch2 ADD function to_tsquery(text,text); +ALTER EXTENSION tsearch2 ADD function @extschema@.to_tsquery(text); +ALTER EXTENSION tsearch2 ADD function plainto_tsquery(oid,text); +ALTER EXTENSION tsearch2 ADD function plainto_tsquery(text,text); +ALTER EXTENSION tsearch2 ADD function @extschema@.plainto_tsquery(text); +ALTER EXTENSION tsearch2 ADD function tsearch2(); +ALTER EXTENSION tsearch2 ADD function rank(real[],tsvector,tsquery); +ALTER EXTENSION tsearch2 ADD function rank(real[],tsvector,tsquery,integer); +ALTER EXTENSION tsearch2 ADD function rank(tsvector,tsquery); +ALTER EXTENSION tsearch2 ADD function rank(tsvector,tsquery,integer); +ALTER EXTENSION tsearch2 ADD function rank_cd(real[],tsvector,tsquery); +ALTER EXTENSION tsearch2 ADD function rank_cd(real[],tsvector,tsquery,integer); +ALTER EXTENSION tsearch2 ADD function rank_cd(tsvector,tsquery); +ALTER EXTENSION tsearch2 ADD function rank_cd(tsvector,tsquery,integer); +ALTER EXTENSION tsearch2 ADD function headline(oid,text,tsquery,text); +ALTER EXTENSION tsearch2 ADD function headline(oid,text,tsquery); +ALTER EXTENSION tsearch2 ADD function headline(text,text,tsquery,text); +ALTER EXTENSION tsearch2 ADD function headline(text,text,tsquery); +ALTER EXTENSION tsearch2 ADD function headline(text,tsquery,text); +ALTER EXTENSION tsearch2 ADD function headline(text,tsquery); +ALTER EXTENSION tsearch2 ADD operator family gist_tsvector_ops using gist; +ALTER EXTENSION tsearch2 ADD operator class gist_tsvector_ops using gist; +ALTER EXTENSION tsearch2 ADD type statinfo; +ALTER EXTENSION tsearch2 ADD function stat(text); +ALTER EXTENSION tsearch2 ADD function stat(text,text); +ALTER EXTENSION tsearch2 ADD function reset_tsearch(); +ALTER EXTENSION tsearch2 ADD function get_covers(tsvector,tsquery); +ALTER EXTENSION tsearch2 ADD type tsdebug; +ALTER EXTENSION tsearch2 ADD function _get_parser_from_curcfg(); +ALTER EXTENSION tsearch2 ADD function @extschema@.ts_debug(text); +ALTER EXTENSION tsearch2 ADD function @extschema@.numnode(tsquery); +ALTER EXTENSION tsearch2 ADD function @extschema@.tsquery_and(tsquery,tsquery); +ALTER EXTENSION tsearch2 ADD function @extschema@.tsquery_or(tsquery,tsquery); +ALTER EXTENSION tsearch2 ADD function @extschema@.tsquery_not(tsquery); +ALTER EXTENSION tsearch2 ADD function rewrite(tsquery,text); +ALTER EXTENSION tsearch2 ADD function rewrite(tsquery,tsquery,tsquery); +ALTER EXTENSION tsearch2 ADD function rewrite_accum(tsquery,tsquery[]); +ALTER EXTENSION tsearch2 ADD function rewrite_finish(tsquery); +ALTER EXTENSION tsearch2 ADD function rewrite(tsquery[]); +ALTER EXTENSION tsearch2 ADD function @extschema@.tsq_mcontains(tsquery,tsquery); +ALTER EXTENSION tsearch2 ADD function @extschema@.tsq_mcontained(tsquery,tsquery); +ALTER EXTENSION tsearch2 ADD operator family gist_tp_tsquery_ops using gist; +ALTER EXTENSION tsearch2 ADD operator class gist_tp_tsquery_ops using gist; +ALTER EXTENSION tsearch2 ADD operator family gin_tsvector_ops using gin; +ALTER EXTENSION tsearch2 ADD operator class gin_tsvector_ops using gin; +ALTER EXTENSION tsearch2 ADD operator family @extschema@.tsvector_ops using btree; +ALTER EXTENSION tsearch2 ADD operator class @extschema@.tsvector_ops using btree; +ALTER EXTENSION tsearch2 ADD operator family @extschema@.tsquery_ops using btree; +ALTER EXTENSION tsearch2 ADD operator class @extschema@.tsquery_ops using btree; diff --git a/contrib/tsearch2/tsearch2.control b/contrib/tsearch2/tsearch2.control new file mode 100644 index 0000000000..474fedeada --- /dev/null +++ b/contrib/tsearch2/tsearch2.control @@ -0,0 +1,5 @@ +# tsearch2 extension +comment = 'compatibility package for pre-8.3 text search functions' +default_version = '1.0' +module_pathname = '$libdir/tsearch2' +relocatable = true diff --git a/contrib/tsearch2/tsearch2.sql.in b/contrib/tsearch2/tsearch2.sql.in deleted file mode 100644 index f7f7dfdec8..0000000000 --- a/contrib/tsearch2/tsearch2.sql.in +++ /dev/null @@ -1,576 +0,0 @@ -/* contrib/tsearch2/tsearch2.sql.in */ - --- Adjust this setting to control where the objects get created. -SET search_path = public; - --- These domains are just to catch schema-qualified references to the --- old data types. -CREATE DOMAIN tsvector AS pg_catalog.tsvector; -CREATE DOMAIN tsquery AS pg_catalog.tsquery; -CREATE DOMAIN gtsvector AS pg_catalog.gtsvector; -CREATE DOMAIN gtsq AS pg_catalog.text; - ---dict interface -CREATE FUNCTION lexize(oid, text) - RETURNS _text - as 'ts_lexize' - LANGUAGE INTERNAL - RETURNS NULL ON NULL INPUT; - -CREATE FUNCTION lexize(text, text) - RETURNS _text - as 'MODULE_PATHNAME', 'tsa_lexize_byname' - LANGUAGE C - RETURNS NULL ON NULL INPUT; - -CREATE FUNCTION lexize(text) - RETURNS _text - as 'MODULE_PATHNAME', 'tsa_lexize_bycurrent' - LANGUAGE C - RETURNS NULL ON NULL INPUT; - -CREATE FUNCTION set_curdict(int) - RETURNS void - as 'MODULE_PATHNAME', 'tsa_set_curdict' - LANGUAGE C - RETURNS NULL ON NULL INPUT; - -CREATE FUNCTION set_curdict(text) - RETURNS void - as 'MODULE_PATHNAME', 'tsa_set_curdict_byname' - LANGUAGE C - RETURNS NULL ON NULL INPUT; - ---built-in dictionaries -CREATE FUNCTION dex_init(internal) - RETURNS internal - as 'MODULE_PATHNAME', 'tsa_dex_init' - LANGUAGE C; - -CREATE FUNCTION dex_lexize(internal,internal,int4) - RETURNS internal - as 'MODULE_PATHNAME', 'tsa_dex_lexize' - LANGUAGE C - RETURNS NULL ON NULL INPUT; - -CREATE FUNCTION snb_en_init(internal) - RETURNS internal - as 'MODULE_PATHNAME', 'tsa_snb_en_init' - LANGUAGE C; - -CREATE FUNCTION snb_lexize(internal,internal,int4) - RETURNS internal - as 'MODULE_PATHNAME', 'tsa_snb_lexize' - LANGUAGE C - RETURNS NULL ON NULL INPUT; - -CREATE FUNCTION snb_ru_init_koi8(internal) - RETURNS internal - as 'MODULE_PATHNAME', 'tsa_snb_ru_init_koi8' - LANGUAGE C; - -CREATE FUNCTION snb_ru_init_utf8(internal) - RETURNS internal - as 'MODULE_PATHNAME', 'tsa_snb_ru_init_utf8' - LANGUAGE C; - -CREATE FUNCTION snb_ru_init(internal) - RETURNS internal - as 'MODULE_PATHNAME', 'tsa_snb_ru_init' - LANGUAGE C; - -CREATE FUNCTION spell_init(internal) - RETURNS internal - as 'MODULE_PATHNAME', 'tsa_spell_init' - LANGUAGE C; - -CREATE FUNCTION spell_lexize(internal,internal,int4) - RETURNS internal - as 'MODULE_PATHNAME', 'tsa_spell_lexize' - LANGUAGE C - RETURNS NULL ON NULL INPUT; - -CREATE FUNCTION syn_init(internal) - RETURNS internal - as 'MODULE_PATHNAME', 'tsa_syn_init' - LANGUAGE C; - -CREATE FUNCTION syn_lexize(internal,internal,int4) - RETURNS internal - as 'MODULE_PATHNAME', 'tsa_syn_lexize' - LANGUAGE C - RETURNS NULL ON NULL INPUT; - -CREATE FUNCTION thesaurus_init(internal) - RETURNS internal - as 'MODULE_PATHNAME', 'tsa_thesaurus_init' - LANGUAGE C; - -CREATE FUNCTION thesaurus_lexize(internal,internal,int4,internal) - RETURNS internal - as 'MODULE_PATHNAME', 'tsa_thesaurus_lexize' - LANGUAGE C - RETURNS NULL ON NULL INPUT; - ---sql-level interface -CREATE TYPE tokentype - as (tokid int4, alias text, descr text); - -CREATE FUNCTION token_type(int4) - RETURNS setof tokentype - as 'ts_token_type_byid' - LANGUAGE INTERNAL - RETURNS NULL ON NULL INPUT - ROWS 16; - -CREATE FUNCTION token_type(text) - RETURNS setof tokentype - as 'ts_token_type_byname' - LANGUAGE INTERNAL - RETURNS NULL ON NULL INPUT - ROWS 16; - -CREATE FUNCTION token_type() - RETURNS setof tokentype - as 'MODULE_PATHNAME', 'tsa_token_type_current' - LANGUAGE C - RETURNS NULL ON NULL INPUT - ROWS 16; - -CREATE FUNCTION set_curprs(int) - RETURNS void - as 'MODULE_PATHNAME', 'tsa_set_curprs' - LANGUAGE C - RETURNS NULL ON NULL INPUT; - -CREATE FUNCTION set_curprs(text) - RETURNS void - as 'MODULE_PATHNAME', 'tsa_set_curprs_byname' - LANGUAGE C - RETURNS NULL ON NULL INPUT; - -CREATE TYPE tokenout - as (tokid int4, token text); - -CREATE FUNCTION parse(oid,text) - RETURNS setof tokenout - as 'ts_parse_byid' - LANGUAGE INTERNAL - RETURNS NULL ON NULL INPUT; - -CREATE FUNCTION parse(text,text) - RETURNS setof tokenout - as 'ts_parse_byname' - LANGUAGE INTERNAL - RETURNS NULL ON NULL INPUT; - -CREATE FUNCTION parse(text) - RETURNS setof tokenout - as 'MODULE_PATHNAME', 'tsa_parse_current' - LANGUAGE C - RETURNS NULL ON NULL INPUT; - ---default parser -CREATE FUNCTION prsd_start(internal,int4) - RETURNS internal - as 'MODULE_PATHNAME', 'tsa_prsd_start' - LANGUAGE C; - -CREATE FUNCTION prsd_getlexeme(internal,internal,internal) - RETURNS int4 - as 'MODULE_PATHNAME', 'tsa_prsd_getlexeme' - LANGUAGE C; - -CREATE FUNCTION prsd_end(internal) - RETURNS void - as 'MODULE_PATHNAME', 'tsa_prsd_end' - LANGUAGE C; - -CREATE FUNCTION prsd_lextype(internal) - RETURNS internal - as 'MODULE_PATHNAME', 'tsa_prsd_lextype' - LANGUAGE C; - -CREATE FUNCTION prsd_headline(internal,internal,internal) - RETURNS internal - as 'MODULE_PATHNAME', 'tsa_prsd_headline' - LANGUAGE C; - ---tsearch config -CREATE FUNCTION set_curcfg(int) - RETURNS void - as 'MODULE_PATHNAME', 'tsa_set_curcfg' - LANGUAGE C - RETURNS NULL ON NULL INPUT; - -CREATE FUNCTION set_curcfg(text) - RETURNS void - as 'MODULE_PATHNAME', 'tsa_set_curcfg_byname' - LANGUAGE C - RETURNS NULL ON NULL INPUT; - -CREATE FUNCTION show_curcfg() - RETURNS oid - AS 'get_current_ts_config' - LANGUAGE INTERNAL - RETURNS NULL ON NULL INPUT STABLE; - -CREATE FUNCTION length(tsvector) - RETURNS int4 - AS 'tsvector_length' - LANGUAGE INTERNAL - RETURNS NULL ON NULL INPUT IMMUTABLE; - -CREATE FUNCTION to_tsvector(oid, text) - RETURNS tsvector - AS 'to_tsvector_byid' - LANGUAGE INTERNAL - RETURNS NULL ON NULL INPUT IMMUTABLE; - -CREATE FUNCTION to_tsvector(text, text) - RETURNS tsvector - AS 'MODULE_PATHNAME', 'tsa_to_tsvector_name' - LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE; - -CREATE FUNCTION to_tsvector(text) - RETURNS tsvector - AS 'to_tsvector' - LANGUAGE INTERNAL - RETURNS NULL ON NULL INPUT IMMUTABLE; - -CREATE FUNCTION strip(tsvector) - RETURNS tsvector - AS 'tsvector_strip' - LANGUAGE INTERNAL - RETURNS NULL ON NULL INPUT IMMUTABLE; - -CREATE FUNCTION setweight(tsvector,"char") - RETURNS tsvector - AS 'tsvector_setweight' - LANGUAGE INTERNAL - RETURNS NULL ON NULL INPUT IMMUTABLE; - -CREATE FUNCTION concat(tsvector,tsvector) - RETURNS tsvector - AS 'tsvector_concat' - LANGUAGE INTERNAL - RETURNS NULL ON NULL INPUT IMMUTABLE; - -CREATE FUNCTION querytree(tsquery) - RETURNS text - AS 'tsquerytree' - LANGUAGE INTERNAL RETURNS NULL ON NULL INPUT; - -CREATE FUNCTION to_tsquery(oid, text) - RETURNS tsquery - AS 'to_tsquery_byid' - LANGUAGE INTERNAL - RETURNS NULL ON NULL INPUT IMMUTABLE; - -CREATE FUNCTION to_tsquery(text, text) - RETURNS tsquery - AS 'MODULE_PATHNAME','tsa_to_tsquery_name' - LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE; - -CREATE FUNCTION to_tsquery(text) - RETURNS tsquery - AS 'to_tsquery' - LANGUAGE INTERNAL - RETURNS NULL ON NULL INPUT IMMUTABLE; - -CREATE FUNCTION plainto_tsquery(oid, text) - RETURNS tsquery - AS 'plainto_tsquery_byid' - LANGUAGE INTERNAL - RETURNS NULL ON NULL INPUT IMMUTABLE; - -CREATE FUNCTION plainto_tsquery(text, text) - RETURNS tsquery - AS 'MODULE_PATHNAME','tsa_plainto_tsquery_name' - LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE; - -CREATE FUNCTION plainto_tsquery(text) - RETURNS tsquery - AS 'plainto_tsquery' - LANGUAGE INTERNAL - RETURNS NULL ON NULL INPUT IMMUTABLE; - ---Trigger -CREATE FUNCTION tsearch2() - RETURNS trigger - AS 'MODULE_PATHNAME', 'tsa_tsearch2' - LANGUAGE C; - ---Relevation -CREATE FUNCTION rank(float4[], tsvector, tsquery) - RETURNS float4 - AS 'ts_rank_wtt' - LANGUAGE INTERNAL - RETURNS NULL ON NULL INPUT IMMUTABLE; - -CREATE FUNCTION rank(float4[], tsvector, tsquery, int4) - RETURNS float4 - AS 'ts_rank_wttf' - LANGUAGE INTERNAL - RETURNS NULL ON NULL INPUT IMMUTABLE; - -CREATE FUNCTION rank(tsvector, tsquery) - RETURNS float4 - AS 'ts_rank_tt' - LANGUAGE INTERNAL - RETURNS NULL ON NULL INPUT IMMUTABLE; - -CREATE FUNCTION rank(tsvector, tsquery, int4) - RETURNS float4 - AS 'ts_rank_ttf' - LANGUAGE INTERNAL - RETURNS NULL ON NULL INPUT IMMUTABLE; - -CREATE FUNCTION rank_cd(float4[], tsvector, tsquery) - RETURNS float4 - AS 'ts_rankcd_wtt' - LANGUAGE INTERNAL - RETURNS NULL ON NULL INPUT IMMUTABLE; - -CREATE FUNCTION rank_cd(float4[], tsvector, tsquery, int4) - RETURNS float4 - AS 'ts_rankcd_wttf' - LANGUAGE INTERNAL - RETURNS NULL ON NULL INPUT IMMUTABLE; - -CREATE FUNCTION rank_cd(tsvector, tsquery) - RETURNS float4 - AS 'ts_rankcd_tt' - LANGUAGE INTERNAL - RETURNS NULL ON NULL INPUT IMMUTABLE; - -CREATE FUNCTION rank_cd(tsvector, tsquery, int4) - RETURNS float4 - AS 'ts_rankcd_ttf' - LANGUAGE INTERNAL - RETURNS NULL ON NULL INPUT IMMUTABLE; - -CREATE FUNCTION headline(oid, text, tsquery, text) - RETURNS text - AS 'ts_headline_byid_opt' - LANGUAGE INTERNAL - RETURNS NULL ON NULL INPUT IMMUTABLE; - -CREATE FUNCTION headline(oid, text, tsquery) - RETURNS text - AS 'ts_headline_byid' - LANGUAGE INTERNAL - RETURNS NULL ON NULL INPUT IMMUTABLE; - -CREATE FUNCTION headline(text, text, tsquery, text) - RETURNS text - AS 'MODULE_PATHNAME', 'tsa_headline_byname' - LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE; - -CREATE FUNCTION headline(text, text, tsquery) - RETURNS text - AS 'MODULE_PATHNAME', 'tsa_headline_byname' - LANGUAGE C RETURNS NULL ON NULL INPUT IMMUTABLE; - -CREATE FUNCTION headline(text, tsquery, text) - RETURNS text - AS 'ts_headline_opt' - LANGUAGE INTERNAL - RETURNS NULL ON NULL INPUT IMMUTABLE; - -CREATE FUNCTION headline(text, tsquery) - RETURNS text - AS 'ts_headline' - LANGUAGE INTERNAL - RETURNS NULL ON NULL INPUT IMMUTABLE; - --- CREATE the OPERATOR class -CREATE OPERATOR CLASS gist_tsvector_ops -FOR TYPE tsvector USING gist -AS - OPERATOR 1 @@ (tsvector, tsquery), - FUNCTION 1 gtsvector_consistent (internal, gtsvector, int, oid, internal), - FUNCTION 2 gtsvector_union (internal, internal), - FUNCTION 3 gtsvector_compress (internal), - FUNCTION 4 gtsvector_decompress (internal), - FUNCTION 5 gtsvector_penalty (internal, internal, internal), - FUNCTION 6 gtsvector_picksplit (internal, internal), - FUNCTION 7 gtsvector_same (gtsvector, gtsvector, internal), - STORAGE gtsvector; - ---stat info -CREATE TYPE statinfo - as (word text, ndoc int4, nentry int4); - -CREATE FUNCTION stat(text) - RETURNS setof statinfo - as 'ts_stat1' - LANGUAGE INTERNAL - RETURNS NULL ON NULL INPUT; - -CREATE FUNCTION stat(text,text) - RETURNS setof statinfo - as 'ts_stat2' - LANGUAGE INTERNAL - RETURNS NULL ON NULL INPUT; - ---reset - just for debuging -CREATE FUNCTION reset_tsearch() - RETURNS void - as 'MODULE_PATHNAME', 'tsa_reset_tsearch' - LANGUAGE C - RETURNS NULL ON NULL INPUT; - ---get cover (debug for rank_cd) -CREATE FUNCTION get_covers(tsvector,tsquery) - RETURNS text - as 'MODULE_PATHNAME', 'tsa_get_covers' - LANGUAGE C - RETURNS NULL ON NULL INPUT; - ---debug function -create type tsdebug as ( - ts_name text, - tok_type text, - description text, - token text, - dict_name text[], - "tsvector" tsvector -); - -CREATE or replace FUNCTION _get_parser_from_curcfg() -RETURNS text as -$$select prsname::text from pg_catalog.pg_ts_parser p join pg_ts_config c on cfgparser = p.oid where c.oid = show_curcfg();$$ -LANGUAGE SQL RETURNS NULL ON NULL INPUT IMMUTABLE; - -CREATE FUNCTION ts_debug(text) -RETURNS setof tsdebug as $$ -select - (select c.cfgname::text from pg_catalog.pg_ts_config as c - where c.oid = show_curcfg()), - t.alias as tok_type, - t.descr as description, - p.token, - ARRAY ( SELECT m.mapdict::pg_catalog.regdictionary::pg_catalog.text - FROM pg_catalog.pg_ts_config_map AS m - WHERE m.mapcfg = show_curcfg() AND m.maptokentype = p.tokid - ORDER BY m.mapseqno ) - AS dict_name, - strip(to_tsvector(p.token)) as tsvector -from - parse( _get_parser_from_curcfg(), $1 ) as p, - token_type() as t -where - t.tokid = p.tokid -$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT; - -CREATE OR REPLACE FUNCTION numnode(tsquery) - RETURNS int4 - as 'tsquery_numnode' - LANGUAGE INTERNAL - RETURNS NULL ON NULL INPUT IMMUTABLE; - -CREATE OR REPLACE FUNCTION tsquery_and(tsquery,tsquery) - RETURNS tsquery - as 'tsquery_and' - LANGUAGE INTERNAL - RETURNS NULL ON NULL INPUT IMMUTABLE; - -CREATE OR REPLACE FUNCTION tsquery_or(tsquery,tsquery) - RETURNS tsquery - as 'tsquery_or' - LANGUAGE INTERNAL - RETURNS NULL ON NULL INPUT IMMUTABLE; - -CREATE OR REPLACE FUNCTION tsquery_not(tsquery) - RETURNS tsquery - as 'tsquery_not' - LANGUAGE INTERNAL - RETURNS NULL ON NULL INPUT IMMUTABLE; - ---------------rewrite subsystem - -CREATE OR REPLACE FUNCTION rewrite(tsquery, text) - RETURNS tsquery - as 'tsquery_rewrite_query' - LANGUAGE INTERNAL - RETURNS NULL ON NULL INPUT IMMUTABLE; - -CREATE OR REPLACE FUNCTION rewrite(tsquery, tsquery, tsquery) - RETURNS tsquery - as 'tsquery_rewrite' - LANGUAGE INTERNAL - RETURNS NULL ON NULL INPUT IMMUTABLE; - -CREATE OR REPLACE FUNCTION rewrite_accum(tsquery,tsquery[]) - RETURNS tsquery - AS 'MODULE_PATHNAME', 'tsa_rewrite_accum' - LANGUAGE C; - -CREATE OR REPLACE FUNCTION rewrite_finish(tsquery) - RETURNS tsquery - as 'MODULE_PATHNAME', 'tsa_rewrite_finish' - LANGUAGE C; - -CREATE AGGREGATE rewrite ( - BASETYPE = tsquery[], - SFUNC = rewrite_accum, - STYPE = tsquery, - FINALFUNC = rewrite_finish -); - -CREATE OR REPLACE FUNCTION tsq_mcontains(tsquery, tsquery) - RETURNS bool - as 'tsq_mcontains' - LANGUAGE INTERNAL - RETURNS NULL ON NULL INPUT IMMUTABLE; - -CREATE OR REPLACE FUNCTION tsq_mcontained(tsquery, tsquery) - RETURNS bool - as 'tsq_mcontained' - LANGUAGE INTERNAL - RETURNS NULL ON NULL INPUT IMMUTABLE; - -CREATE OPERATOR CLASS gist_tp_tsquery_ops -FOR TYPE tsquery USING gist -AS - OPERATOR 7 @> (tsquery, tsquery), - OPERATOR 8 <@ (tsquery, tsquery), - FUNCTION 1 gtsquery_consistent (internal, internal, int, oid, internal), - FUNCTION 2 gtsquery_union (internal, internal), - FUNCTION 3 gtsquery_compress (internal), - FUNCTION 4 gtsquery_decompress (internal), - FUNCTION 5 gtsquery_penalty (internal, internal, internal), - FUNCTION 6 gtsquery_picksplit (internal, internal), - FUNCTION 7 gtsquery_same (bigint, bigint, internal), - STORAGE bigint; - -CREATE OPERATOR CLASS gin_tsvector_ops -FOR TYPE tsvector USING gin -AS - OPERATOR 1 @@ (tsvector, tsquery), - OPERATOR 2 @@@ (tsvector, tsquery), - FUNCTION 1 bttextcmp(text, text), - FUNCTION 2 gin_extract_tsvector(tsvector,internal,internal), - FUNCTION 3 gin_extract_tsquery(tsquery,internal,smallint,internal,internal,internal,internal), - FUNCTION 4 gin_tsquery_consistent(internal,smallint,tsquery,int,internal,internal,internal,internal), - FUNCTION 5 gin_cmp_prefix(text,text,smallint,internal), - STORAGE text; - -CREATE OPERATOR CLASS tsvector_ops -FOR TYPE tsvector USING btree AS - OPERATOR 1 < , - OPERATOR 2 <= , - OPERATOR 3 = , - OPERATOR 4 >= , - OPERATOR 5 > , - FUNCTION 1 tsvector_cmp(tsvector, tsvector); - -CREATE OPERATOR CLASS tsquery_ops -FOR TYPE tsquery USING btree AS - OPERATOR 1 < , - OPERATOR 2 <= , - OPERATOR 3 = , - OPERATOR 4 >= , - OPERATOR 5 > , - FUNCTION 1 tsquery_cmp(tsquery, tsquery); diff --git a/contrib/tsearch2/uninstall_tsearch2.sql b/contrib/tsearch2/uninstall_tsearch2.sql deleted file mode 100644 index f444a218e6..0000000000 --- a/contrib/tsearch2/uninstall_tsearch2.sql +++ /dev/null @@ -1,96 +0,0 @@ -/* contrib/tsearch2/uninstall_tsearch2.sql */ - --- Adjust this setting to control where the objects get dropped. -SET search_path = public, pg_catalog; - -DROP DOMAIN tsvector CASCADE; -DROP DOMAIN tsquery CASCADE; -DROP DOMAIN gtsvector CASCADE; -DROP DOMAIN gtsq CASCADE; - -DROP TYPE tokentype CASCADE; -DROP TYPE tokenout CASCADE; -DROP TYPE statinfo CASCADE; -DROP TYPE tsdebug CASCADE; - -DROP OPERATOR CLASS tsquery_ops USING btree CASCADE; - -DROP OPERATOR CLASS tsvector_ops USING btree CASCADE; - -DROP OPERATOR CLASS gin_tsvector_ops USING gin CASCADE; - -DROP OPERATOR CLASS gist_tp_tsquery_ops USING gist CASCADE; - -DROP OPERATOR CLASS gist_tsvector_ops USING gist CASCADE; - -DROP FUNCTION lexize(oid, text) ; -DROP FUNCTION lexize(text, text); -DROP FUNCTION lexize(text); -DROP FUNCTION set_curdict(int); -DROP FUNCTION set_curdict(text); -DROP FUNCTION dex_init(internal); -DROP FUNCTION dex_lexize(internal,internal,int4); -DROP FUNCTION snb_en_init(internal); -DROP FUNCTION snb_lexize(internal,internal,int4); -DROP FUNCTION snb_ru_init_koi8(internal); -DROP FUNCTION snb_ru_init_utf8(internal); -DROP FUNCTION snb_ru_init(internal); -DROP FUNCTION spell_init(internal); -DROP FUNCTION spell_lexize(internal,internal,int4); -DROP FUNCTION syn_init(internal); -DROP FUNCTION syn_lexize(internal,internal,int4); -DROP FUNCTION thesaurus_init(internal); -DROP FUNCTION thesaurus_lexize(internal,internal,int4,internal); -DROP FUNCTION set_curprs(int); -DROP FUNCTION set_curprs(text); -DROP FUNCTION prsd_start(internal,int4); -DROP FUNCTION prsd_getlexeme(internal,internal,internal); -DROP FUNCTION prsd_end(internal); -DROP FUNCTION prsd_lextype(internal); -DROP FUNCTION prsd_headline(internal,internal,internal); -DROP FUNCTION set_curcfg(int); -DROP FUNCTION set_curcfg(text); -DROP FUNCTION show_curcfg(); -DROP FUNCTION length(tsvector); -DROP FUNCTION to_tsvector(oid, text); -DROP FUNCTION to_tsvector(text, text); -DROP FUNCTION to_tsvector(text); -DROP FUNCTION strip(tsvector); -DROP FUNCTION setweight(tsvector,"char"); -DROP FUNCTION concat(tsvector,tsvector); -DROP FUNCTION querytree(tsquery); -DROP FUNCTION to_tsquery(oid, text); -DROP FUNCTION to_tsquery(text, text); -DROP FUNCTION to_tsquery(text); -DROP FUNCTION plainto_tsquery(oid, text); -DROP FUNCTION plainto_tsquery(text, text); -DROP FUNCTION plainto_tsquery(text); -DROP FUNCTION tsearch2() CASCADE; -DROP FUNCTION rank(float4[], tsvector, tsquery); -DROP FUNCTION rank(float4[], tsvector, tsquery, int4); -DROP FUNCTION rank(tsvector, tsquery); -DROP FUNCTION rank(tsvector, tsquery, int4); -DROP FUNCTION rank_cd(float4[], tsvector, tsquery); -DROP FUNCTION rank_cd(float4[], tsvector, tsquery, int4); -DROP FUNCTION rank_cd(tsvector, tsquery); -DROP FUNCTION rank_cd(tsvector, tsquery, int4); -DROP FUNCTION headline(oid, text, tsquery, text); -DROP FUNCTION headline(oid, text, tsquery); -DROP FUNCTION headline(text, text, tsquery, text); -DROP FUNCTION headline(text, text, tsquery); -DROP FUNCTION headline(text, tsquery, text); -DROP FUNCTION headline(text, tsquery); -DROP FUNCTION get_covers(tsvector,tsquery); -DROP FUNCTION _get_parser_from_curcfg(); -DROP FUNCTION numnode(tsquery); -DROP FUNCTION tsquery_and(tsquery,tsquery); -DROP FUNCTION tsquery_or(tsquery,tsquery); -DROP FUNCTION tsquery_not(tsquery); -DROP FUNCTION rewrite(tsquery, text); -DROP FUNCTION rewrite(tsquery, tsquery, tsquery); -DROP AGGREGATE rewrite (tsquery[]); -DROP FUNCTION rewrite_accum(tsquery,tsquery[]); -DROP FUNCTION rewrite_finish(tsquery); -DROP FUNCTION tsq_mcontains(tsquery, tsquery); -DROP FUNCTION tsq_mcontained(tsquery, tsquery); -DROP FUNCTION reset_tsearch(); diff --git a/contrib/unaccent/.gitignore b/contrib/unaccent/.gitignore index 6d74a7617f..19b6c5ba42 100644 --- a/contrib/unaccent/.gitignore +++ b/contrib/unaccent/.gitignore @@ -1,3 +1,2 @@ -/unaccent.sql # Generated subdirectories /results/ diff --git a/contrib/unaccent/Makefile b/contrib/unaccent/Makefile index 254155dcca..13cd8538d3 100644 --- a/contrib/unaccent/Makefile +++ b/contrib/unaccent/Makefile @@ -3,9 +3,10 @@ MODULE_big = unaccent OBJS = unaccent.o -DATA_built = unaccent.sql -DATA = uninstall_unaccent.sql +EXTENSION = unaccent +DATA = unaccent--1.0.sql unaccent--unpackaged--1.0.sql DATA_TSEARCH = unaccent.rules + REGRESS = unaccent # Adjust REGRESS_OPTS because we need a UTF8 database diff --git a/contrib/unaccent/expected/unaccent.out b/contrib/unaccent/expected/unaccent.out index a09e00fe5b..b93105e9c7 100644 --- a/contrib/unaccent/expected/unaccent.out +++ b/contrib/unaccent/expected/unaccent.out @@ -1,6 +1,4 @@ -SET client_min_messages = warning; -\set ECHO none -RESET client_min_messages; +CREATE EXTENSION unaccent; -- must have a UTF8 database SELECT getdatabaseencoding(); getdatabaseencoding diff --git a/contrib/unaccent/sql/unaccent.sql b/contrib/unaccent/sql/unaccent.sql index ede938d479..310213994f 100644 --- a/contrib/unaccent/sql/unaccent.sql +++ b/contrib/unaccent/sql/unaccent.sql @@ -1,8 +1,4 @@ -SET client_min_messages = warning; -\set ECHO none -\i unaccent.sql -\set ECHO all -RESET client_min_messages; +CREATE EXTENSION unaccent; -- must have a UTF8 database SELECT getdatabaseencoding(); diff --git a/contrib/unaccent/unaccent--1.0.sql b/contrib/unaccent/unaccent--1.0.sql new file mode 100644 index 0000000000..4dc9c3d9c6 --- /dev/null +++ b/contrib/unaccent/unaccent--1.0.sql @@ -0,0 +1,31 @@ +/* contrib/unaccent/unaccent--1.0.sql */ + +CREATE OR REPLACE FUNCTION unaccent(regdictionary, text) + RETURNS text + AS 'MODULE_PATHNAME', 'unaccent_dict' + LANGUAGE C STABLE STRICT; + +CREATE OR REPLACE FUNCTION unaccent(text) + RETURNS text + AS 'MODULE_PATHNAME', 'unaccent_dict' + LANGUAGE C STABLE STRICT; + +CREATE OR REPLACE FUNCTION unaccent_init(internal) + RETURNS internal + AS 'MODULE_PATHNAME', 'unaccent_init' + LANGUAGE C; + +CREATE OR REPLACE FUNCTION unaccent_lexize(internal,internal,internal,internal) + RETURNS internal + AS 'MODULE_PATHNAME', 'unaccent_lexize' + LANGUAGE C; + +CREATE TEXT SEARCH TEMPLATE unaccent ( + INIT = unaccent_init, + LEXIZE = unaccent_lexize +); + +CREATE TEXT SEARCH DICTIONARY unaccent ( + TEMPLATE = unaccent, + RULES = 'unaccent' +); diff --git a/contrib/unaccent/unaccent--unpackaged--1.0.sql b/contrib/unaccent/unaccent--unpackaged--1.0.sql new file mode 100644 index 0000000000..7b36d29512 --- /dev/null +++ b/contrib/unaccent/unaccent--unpackaged--1.0.sql @@ -0,0 +1,8 @@ +/* contrib/unaccent/unaccent--unpackaged--1.0.sql */ + +ALTER EXTENSION unaccent ADD function unaccent(regdictionary,text); +ALTER EXTENSION unaccent ADD function unaccent(text); +ALTER EXTENSION unaccent ADD function unaccent_init(internal); +ALTER EXTENSION unaccent ADD function unaccent_lexize(internal,internal,internal,internal); +ALTER EXTENSION unaccent ADD text search template unaccent; +ALTER EXTENSION unaccent ADD text search dictionary unaccent; diff --git a/contrib/unaccent/unaccent.control b/contrib/unaccent/unaccent.control new file mode 100644 index 0000000000..200d2ae7bb --- /dev/null +++ b/contrib/unaccent/unaccent.control @@ -0,0 +1,5 @@ +# unaccent extension +comment = 'text search dictionary that removes accents' +default_version = '1.0' +module_pathname = '$libdir/unaccent' +relocatable = true diff --git a/contrib/unaccent/unaccent.sql.in b/contrib/unaccent/unaccent.sql.in deleted file mode 100644 index 6d712e7bb8..0000000000 --- a/contrib/unaccent/unaccent.sql.in +++ /dev/null @@ -1,34 +0,0 @@ -/* contrib/unaccent/unaccent.sql.in */ - --- Adjust this setting to control where the objects get created. -SET search_path = public; - -CREATE OR REPLACE FUNCTION unaccent(regdictionary, text) - RETURNS text - AS 'MODULE_PATHNAME', 'unaccent_dict' - LANGUAGE C STABLE STRICT; - -CREATE OR REPLACE FUNCTION unaccent(text) - RETURNS text - AS 'MODULE_PATHNAME', 'unaccent_dict' - LANGUAGE C STABLE STRICT; - -CREATE OR REPLACE FUNCTION unaccent_init(internal) - RETURNS internal - AS 'MODULE_PATHNAME', 'unaccent_init' - LANGUAGE C; - -CREATE OR REPLACE FUNCTION unaccent_lexize(internal,internal,internal,internal) - RETURNS internal - AS 'MODULE_PATHNAME', 'unaccent_lexize' - LANGUAGE C; - -CREATE TEXT SEARCH TEMPLATE unaccent ( - INIT = unaccent_init, - LEXIZE = unaccent_lexize -); - -CREATE TEXT SEARCH DICTIONARY unaccent ( - TEMPLATE = unaccent, - RULES = 'unaccent' -); diff --git a/contrib/unaccent/uninstall_unaccent.sql b/contrib/unaccent/uninstall_unaccent.sql deleted file mode 100644 index 6879d4f74c..0000000000 --- a/contrib/unaccent/uninstall_unaccent.sql +++ /dev/null @@ -1,11 +0,0 @@ -/* contrib/unaccent/uninstall_unaccent.sql */ - --- Adjust this setting to control where the objects get dropped. -SET search_path = public; - -DROP FUNCTION unaccent(regdictionary, text); -DROP FUNCTION unaccent(text); -DROP TEXT SEARCH DICTIONARY unaccent; -DROP TEXT SEARCH TEMPLATE unaccent; -DROP FUNCTION unaccent_init(internal); -DROP FUNCTION unaccent_lexize(internal,internal,internal,internal); diff --git a/contrib/uuid-ossp/.gitignore b/contrib/uuid-ossp/.gitignore deleted file mode 100644 index ece095ad7b..0000000000 --- a/contrib/uuid-ossp/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/uuid-ossp.sql diff --git a/contrib/uuid-ossp/Makefile b/contrib/uuid-ossp/Makefile index 77ea87409f..9b2d2e3ff9 100644 --- a/contrib/uuid-ossp/Makefile +++ b/contrib/uuid-ossp/Makefile @@ -2,8 +2,9 @@ MODULE_big = uuid-ossp OBJS = uuid-ossp.o -DATA_built = uuid-ossp.sql -DATA = uninstall_uuid-ossp.sql + +EXTENSION = uuid-ossp +DATA = uuid-ossp--1.0.sql uuid-ossp--unpackaged--1.0.sql SHLIB_LINK += $(OSSP_UUID_LIBS) diff --git a/contrib/uuid-ossp/uninstall_uuid-ossp.sql b/contrib/uuid-ossp/uninstall_uuid-ossp.sql deleted file mode 100644 index 0fafb2721f..0000000000 --- a/contrib/uuid-ossp/uninstall_uuid-ossp.sql +++ /dev/null @@ -1,16 +0,0 @@ -/* contrib/uuid-ossp/uninstall_uuid-ossp.sql */ - --- Adjust this setting to control where the objects get dropped. -SET search_path = public; - -DROP FUNCTION uuid_nil(); -DROP FUNCTION uuid_ns_dns(); -DROP FUNCTION uuid_ns_url(); -DROP FUNCTION uuid_ns_oid(); -DROP FUNCTION uuid_ns_x500(); - -DROP FUNCTION uuid_generate_v1(); -DROP FUNCTION uuid_generate_v1mc(); -DROP FUNCTION uuid_generate_v3(namespace uuid, name text); -DROP FUNCTION uuid_generate_v4(); -DROP FUNCTION uuid_generate_v5(namespace uuid, name text); diff --git a/contrib/uuid-ossp/uuid-ossp--1.0.sql b/contrib/uuid-ossp/uuid-ossp--1.0.sql new file mode 100644 index 0000000000..34b32de77e --- /dev/null +++ b/contrib/uuid-ossp/uuid-ossp--1.0.sql @@ -0,0 +1,51 @@ +/* contrib/uuid-ossp/uuid-ossp--1.0.sql */ + +CREATE OR REPLACE FUNCTION uuid_nil() +RETURNS uuid +AS 'MODULE_PATHNAME', 'uuid_nil' +IMMUTABLE STRICT LANGUAGE C; + +CREATE OR REPLACE FUNCTION uuid_ns_dns() +RETURNS uuid +AS 'MODULE_PATHNAME', 'uuid_ns_dns' +IMMUTABLE STRICT LANGUAGE C; + +CREATE OR REPLACE FUNCTION uuid_ns_url() +RETURNS uuid +AS 'MODULE_PATHNAME', 'uuid_ns_url' +IMMUTABLE STRICT LANGUAGE C; + +CREATE OR REPLACE FUNCTION uuid_ns_oid() +RETURNS uuid +AS 'MODULE_PATHNAME', 'uuid_ns_oid' +IMMUTABLE STRICT LANGUAGE C; + +CREATE OR REPLACE FUNCTION uuid_ns_x500() +RETURNS uuid +AS 'MODULE_PATHNAME', 'uuid_ns_x500' +IMMUTABLE STRICT LANGUAGE C; + +CREATE OR REPLACE FUNCTION uuid_generate_v1() +RETURNS uuid +AS 'MODULE_PATHNAME', 'uuid_generate_v1' +VOLATILE STRICT LANGUAGE C; + +CREATE OR REPLACE FUNCTION uuid_generate_v1mc() +RETURNS uuid +AS 'MODULE_PATHNAME', 'uuid_generate_v1mc' +VOLATILE STRICT LANGUAGE C; + +CREATE OR REPLACE FUNCTION uuid_generate_v3(namespace uuid, name text) +RETURNS uuid +AS 'MODULE_PATHNAME', 'uuid_generate_v3' +IMMUTABLE STRICT LANGUAGE C; + +CREATE OR REPLACE FUNCTION uuid_generate_v4() +RETURNS uuid +AS 'MODULE_PATHNAME', 'uuid_generate_v4' +VOLATILE STRICT LANGUAGE C; + +CREATE OR REPLACE FUNCTION uuid_generate_v5(namespace uuid, name text) +RETURNS uuid +AS 'MODULE_PATHNAME', 'uuid_generate_v5' +IMMUTABLE STRICT LANGUAGE C; diff --git a/contrib/uuid-ossp/uuid-ossp--unpackaged--1.0.sql b/contrib/uuid-ossp/uuid-ossp--unpackaged--1.0.sql new file mode 100644 index 0000000000..bc984dd8c0 --- /dev/null +++ b/contrib/uuid-ossp/uuid-ossp--unpackaged--1.0.sql @@ -0,0 +1,12 @@ +/* contrib/uuid-ossp/uuid-ossp--unpackaged--1.0.sql */ + +ALTER EXTENSION "uuid-ossp" ADD function uuid_nil(); +ALTER EXTENSION "uuid-ossp" ADD function uuid_ns_dns(); +ALTER EXTENSION "uuid-ossp" ADD function uuid_ns_url(); +ALTER EXTENSION "uuid-ossp" ADD function uuid_ns_oid(); +ALTER EXTENSION "uuid-ossp" ADD function uuid_ns_x500(); +ALTER EXTENSION "uuid-ossp" ADD function uuid_generate_v1(); +ALTER EXTENSION "uuid-ossp" ADD function uuid_generate_v1mc(); +ALTER EXTENSION "uuid-ossp" ADD function uuid_generate_v3(namespace uuid, name text); +ALTER EXTENSION "uuid-ossp" ADD function uuid_generate_v4(); +ALTER EXTENSION "uuid-ossp" ADD function uuid_generate_v5(namespace uuid, name text); diff --git a/contrib/uuid-ossp/uuid-ossp.control b/contrib/uuid-ossp/uuid-ossp.control new file mode 100644 index 0000000000..f52ae99d41 --- /dev/null +++ b/contrib/uuid-ossp/uuid-ossp.control @@ -0,0 +1,5 @@ +# uuid-ossp extension +comment = 'generate universally unique identifiers (UUIDs)' +default_version = '1.0' +module_pathname = '$libdir/uuid-ossp' +relocatable = true diff --git a/contrib/uuid-ossp/uuid-ossp.sql.in b/contrib/uuid-ossp/uuid-ossp.sql.in deleted file mode 100644 index 71212cde48..0000000000 --- a/contrib/uuid-ossp/uuid-ossp.sql.in +++ /dev/null @@ -1,54 +0,0 @@ -/* contrib/uuid-ossp/uuid-ossp.sql.in */ - --- Adjust this setting to control where the objects get created. -SET search_path = public; - -CREATE OR REPLACE FUNCTION uuid_nil() -RETURNS uuid -AS 'MODULE_PATHNAME', 'uuid_nil' -IMMUTABLE STRICT LANGUAGE C; - -CREATE OR REPLACE FUNCTION uuid_ns_dns() -RETURNS uuid -AS 'MODULE_PATHNAME', 'uuid_ns_dns' -IMMUTABLE STRICT LANGUAGE C; - -CREATE OR REPLACE FUNCTION uuid_ns_url() -RETURNS uuid -AS 'MODULE_PATHNAME', 'uuid_ns_url' -IMMUTABLE STRICT LANGUAGE C; - -CREATE OR REPLACE FUNCTION uuid_ns_oid() -RETURNS uuid -AS 'MODULE_PATHNAME', 'uuid_ns_oid' -IMMUTABLE STRICT LANGUAGE C; - -CREATE OR REPLACE FUNCTION uuid_ns_x500() -RETURNS uuid -AS 'MODULE_PATHNAME', 'uuid_ns_x500' -IMMUTABLE STRICT LANGUAGE C; - -CREATE OR REPLACE FUNCTION uuid_generate_v1() -RETURNS uuid -AS 'MODULE_PATHNAME', 'uuid_generate_v1' -VOLATILE STRICT LANGUAGE C; - -CREATE OR REPLACE FUNCTION uuid_generate_v1mc() -RETURNS uuid -AS 'MODULE_PATHNAME', 'uuid_generate_v1mc' -VOLATILE STRICT LANGUAGE C; - -CREATE OR REPLACE FUNCTION uuid_generate_v3(namespace uuid, name text) -RETURNS uuid -AS 'MODULE_PATHNAME', 'uuid_generate_v3' -IMMUTABLE STRICT LANGUAGE C; - -CREATE OR REPLACE FUNCTION uuid_generate_v4() -RETURNS uuid -AS 'MODULE_PATHNAME', 'uuid_generate_v4' -VOLATILE STRICT LANGUAGE C; - -CREATE OR REPLACE FUNCTION uuid_generate_v5(namespace uuid, name text) -RETURNS uuid -AS 'MODULE_PATHNAME', 'uuid_generate_v5' -IMMUTABLE STRICT LANGUAGE C; diff --git a/contrib/xml2/.gitignore b/contrib/xml2/.gitignore index 5ef9dbf4d4..19b6c5ba42 100644 --- a/contrib/xml2/.gitignore +++ b/contrib/xml2/.gitignore @@ -1,3 +1,2 @@ -/pgxml.sql # Generated subdirectories /results/ diff --git a/contrib/xml2/Makefile b/contrib/xml2/Makefile index 57b4cbfac5..ad325723c9 100644 --- a/contrib/xml2/Makefile +++ b/contrib/xml2/Makefile @@ -1,15 +1,15 @@ # contrib/xml2/Makefile MODULE_big = pgxml - OBJS = xpath.o xslt_proc.o -SHLIB_LINK += $(filter -lxslt, $(LIBS)) $(filter -lxml2, $(LIBS)) +EXTENSION = xml2 +DATA = xml2--1.0.sql xml2--unpackaged--1.0.sql -DATA_built = pgxml.sql -DATA = uninstall_pgxml.sql REGRESS = xml2 +SHLIB_LINK += $(filter -lxslt, $(LIBS)) $(filter -lxml2, $(LIBS)) + ifdef USE_PGXS PG_CONFIG = pg_config PGXS := $(shell $(PG_CONFIG) --pgxs) diff --git a/contrib/xml2/expected/xml2.out b/contrib/xml2/expected/xml2.out index 8ce04d0b84..3bf676fb40 100644 --- a/contrib/xml2/expected/xml2.out +++ b/contrib/xml2/expected/xml2.out @@ -1,10 +1,4 @@ --- --- first, define the functions. Turn off echoing so that expected file --- does not depend on contents of pgxml.sql. --- -SET client_min_messages = warning; -\set ECHO none -RESET client_min_messages; +CREATE EXTENSION xml2; select query_to_xml('select 1 as x',true,false,''); query_to_xml --------------------------------------------------------------- diff --git a/contrib/xml2/expected/xml2_1.out b/contrib/xml2/expected/xml2_1.out index d2d243ada7..fda626e08c 100644 --- a/contrib/xml2/expected/xml2_1.out +++ b/contrib/xml2/expected/xml2_1.out @@ -1,10 +1,4 @@ --- --- first, define the functions. Turn off echoing so that expected file --- does not depend on contents of pgxml.sql. --- -SET client_min_messages = warning; -\set ECHO none -RESET client_min_messages; +CREATE EXTENSION xml2; select query_to_xml('select 1 as x',true,false,''); query_to_xml --------------------------------------------------------------- diff --git a/contrib/xml2/pgxml.sql.in b/contrib/xml2/pgxml.sql.in deleted file mode 100644 index 8c3d420afd..0000000000 --- a/contrib/xml2/pgxml.sql.in +++ /dev/null @@ -1,73 +0,0 @@ -/* contrib/xml2/pgxml.sql.in */ - --- Adjust this setting to control where the objects get created. -SET search_path = public; - ---SQL for XML parser - --- deprecated old name for xml_is_well_formed -CREATE OR REPLACE FUNCTION xml_valid(text) RETURNS bool -AS 'xml_is_well_formed' -LANGUAGE INTERNAL STRICT STABLE; - -CREATE OR REPLACE FUNCTION xml_encode_special_chars(text) RETURNS text -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION xpath_string(text,text) RETURNS text -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION xpath_nodeset(text,text,text,text) RETURNS text -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION xpath_number(text,text) RETURNS float4 -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION xpath_bool(text,text) RETURNS boolean -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - --- List function - -CREATE OR REPLACE FUNCTION xpath_list(text,text,text) RETURNS text -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION xpath_list(text,text) RETURNS text -AS 'SELECT xpath_list($1,$2,'','')' -LANGUAGE SQL STRICT IMMUTABLE; - --- Wrapper functions for nodeset where no tags needed - -CREATE OR REPLACE FUNCTION xpath_nodeset(text,text) -RETURNS text -AS 'SELECT xpath_nodeset($1,$2,'''','''')' -LANGUAGE SQL STRICT IMMUTABLE; - -CREATE OR REPLACE FUNCTION xpath_nodeset(text,text,text) -RETURNS text -AS 'SELECT xpath_nodeset($1,$2,'''',$3)' -LANGUAGE SQL STRICT IMMUTABLE; - --- Table function - -CREATE OR REPLACE FUNCTION xpath_table(text,text,text,text,text) -RETURNS setof record -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT STABLE; - --- XSLT functions - -CREATE OR REPLACE FUNCTION xslt_process(text,text,text) -RETURNS text -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT VOLATILE; - --- the function checks for the correct argument count -CREATE OR REPLACE FUNCTION xslt_process(text,text) -RETURNS text -AS 'MODULE_PATHNAME' -LANGUAGE C STRICT IMMUTABLE; diff --git a/contrib/xml2/sql/xml2.sql b/contrib/xml2/sql/xml2.sql index 5b3cc997f5..4a996af716 100644 --- a/contrib/xml2/sql/xml2.sql +++ b/contrib/xml2/sql/xml2.sql @@ -1,12 +1,4 @@ --- --- first, define the functions. Turn off echoing so that expected file --- does not depend on contents of pgxml.sql. --- -SET client_min_messages = warning; -\set ECHO none -\i pgxml.sql -\set ECHO all -RESET client_min_messages; +CREATE EXTENSION xml2; select query_to_xml('select 1 as x',true,false,''); diff --git a/contrib/xml2/uninstall_pgxml.sql b/contrib/xml2/uninstall_pgxml.sql deleted file mode 100644 index 1696390f80..0000000000 --- a/contrib/xml2/uninstall_pgxml.sql +++ /dev/null @@ -1,31 +0,0 @@ -/* contrib/xml2/uninstall_pgxml.sql */ - --- Adjust this setting to control where the objects get dropped. -SET search_path = public; - -DROP FUNCTION xslt_process(text,text); - -DROP FUNCTION xslt_process(text,text,text); - -DROP FUNCTION xpath_table(text,text,text,text,text); - -DROP FUNCTION xpath_nodeset(text,text,text); - -DROP FUNCTION xpath_nodeset(text,text); - -DROP FUNCTION xpath_list(text,text); - -DROP FUNCTION xpath_list(text,text,text); - -DROP FUNCTION xpath_bool(text,text); - -DROP FUNCTION xpath_number(text,text); - -DROP FUNCTION xpath_nodeset(text,text,text,text); - -DROP FUNCTION xpath_string(text,text); - -DROP FUNCTION xml_encode_special_chars(text); - --- deprecated old name for xml_is_well_formed -DROP FUNCTION xml_valid(text); diff --git a/contrib/xml2/xml2--1.0.sql b/contrib/xml2/xml2--1.0.sql new file mode 100644 index 0000000000..100f57291f --- /dev/null +++ b/contrib/xml2/xml2--1.0.sql @@ -0,0 +1,70 @@ +/* contrib/xml2/xml2--1.0.sql */ + +--SQL for XML parser + +-- deprecated old name for xml_is_well_formed +CREATE OR REPLACE FUNCTION xml_valid(text) RETURNS bool +AS 'xml_is_well_formed' +LANGUAGE INTERNAL STRICT STABLE; + +CREATE OR REPLACE FUNCTION xml_encode_special_chars(text) RETURNS text +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION xpath_string(text,text) RETURNS text +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION xpath_nodeset(text,text,text,text) RETURNS text +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION xpath_number(text,text) RETURNS float4 +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION xpath_bool(text,text) RETURNS boolean +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +-- List function + +CREATE OR REPLACE FUNCTION xpath_list(text,text,text) RETURNS text +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION xpath_list(text,text) RETURNS text +AS 'SELECT xpath_list($1,$2,'','')' +LANGUAGE SQL STRICT IMMUTABLE; + +-- Wrapper functions for nodeset where no tags needed + +CREATE OR REPLACE FUNCTION xpath_nodeset(text,text) +RETURNS text +AS 'SELECT xpath_nodeset($1,$2,'''','''')' +LANGUAGE SQL STRICT IMMUTABLE; + +CREATE OR REPLACE FUNCTION xpath_nodeset(text,text,text) +RETURNS text +AS 'SELECT xpath_nodeset($1,$2,'''',$3)' +LANGUAGE SQL STRICT IMMUTABLE; + +-- Table function + +CREATE OR REPLACE FUNCTION xpath_table(text,text,text,text,text) +RETURNS setof record +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT STABLE; + +-- XSLT functions + +CREATE OR REPLACE FUNCTION xslt_process(text,text,text) +RETURNS text +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT VOLATILE; + +-- the function checks for the correct argument count +CREATE OR REPLACE FUNCTION xslt_process(text,text) +RETURNS text +AS 'MODULE_PATHNAME' +LANGUAGE C STRICT IMMUTABLE; diff --git a/contrib/xml2/xml2--unpackaged--1.0.sql b/contrib/xml2/xml2--unpackaged--1.0.sql new file mode 100644 index 0000000000..a4716cf916 --- /dev/null +++ b/contrib/xml2/xml2--unpackaged--1.0.sql @@ -0,0 +1,16 @@ +/* contrib/xml2/xml2--unpackaged--1.0.sql */ + +ALTER EXTENSION xml2 ADD function xslt_process(text,text); +ALTER EXTENSION xml2 ADD function xslt_process(text,text,text); +ALTER EXTENSION xml2 ADD function xpath_table(text,text,text,text,text); +ALTER EXTENSION xml2 ADD function xpath_nodeset(text,text,text); +ALTER EXTENSION xml2 ADD function xpath_nodeset(text,text); +ALTER EXTENSION xml2 ADD function xpath_list(text,text); +ALTER EXTENSION xml2 ADD function xpath_list(text,text,text); +ALTER EXTENSION xml2 ADD function xpath_bool(text,text); +ALTER EXTENSION xml2 ADD function xpath_number(text,text); +ALTER EXTENSION xml2 ADD function xpath_nodeset(text,text,text,text); +ALTER EXTENSION xml2 ADD function xpath_string(text,text); +ALTER EXTENSION xml2 ADD function xml_encode_special_chars(text); +ALTER EXTENSION xml2 ADD function xml_valid(text); +ALTER EXTENSION xml2 ADD function xml_is_well_formed(text); diff --git a/contrib/xml2/xml2.control b/contrib/xml2/xml2.control new file mode 100644 index 0000000000..004649d652 --- /dev/null +++ b/contrib/xml2/xml2.control @@ -0,0 +1,5 @@ +# xml2 extension +comment = 'XPath querying and XSLT' +default_version = '1.0' +module_pathname = '$libdir/pgxml' +relocatable = true -- cgit v1.2.3 From 029fac2264101919b65fb6319bb994f941969471 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Sun, 13 Feb 2011 21:24:14 -0500 Subject: Avoid use of CREATE OR REPLACE FUNCTION in extension installation files. It was never terribly consistent to use OR REPLACE (because of the lack of comparable functionality for data types, operators, etc), and experimentation shows that it's now positively pernicious in the extension world. We really want a failure to occur if there are any conflicts, else it's unclear what the extension-ownership state of the conflicted object ought to be. Most of the time, CREATE EXTENSION will fail anyway because of conflicts on other object types, but an extension defining only functions can succeed, with bad results. --- contrib/adminpack/adminpack--1.0.sql | 16 +- contrib/btree_gin/btree_gin--1.0.sql | 136 +++---- contrib/btree_gist/btree_gist--1.0.sql | 242 +++++------ contrib/chkpass/chkpass--1.0.sql | 10 +- contrib/citext/citext--1.0.sql | 74 ++-- contrib/cube/cube--1.0.sql | 70 ++-- contrib/dblink/dblink--1.0.sql | 80 ++-- contrib/dict_int/dict_int--1.0.sql | 4 +- contrib/dict_xsyn/dict_xsyn--1.0.sql | 4 +- contrib/earthdistance/earthdistance--1.0.sql | 20 +- contrib/fuzzystrmatch/fuzzystrmatch--1.0.sql | 20 +- contrib/hstore/hstore--1.0.sql | 104 ++--- contrib/intagg/int_aggregate--1.0.sql | 6 +- contrib/intarray/intarray--1.0.sql | 90 ++--- contrib/isn/isn--1.0.sql | 490 +++++++++++------------ contrib/lo/lo--1.0.sql | 4 +- contrib/ltree/ltree--1.0.sql | 140 +++---- contrib/pageinspect/pageinspect--1.0.sql | 16 +- contrib/pg_buffercache/pg_buffercache--1.0.sql | 2 +- contrib/pg_freespacemap/pg_freespacemap--1.0.sql | 4 +- contrib/pg_trgm/pg_trgm--1.0.sql | 38 +- contrib/pgcrypto/pgcrypto--1.0.sql | 66 +-- contrib/pgrowlocks/pgrowlocks--1.0.sql | 2 +- contrib/pgstattuple/pgstattuple--1.0.sql | 8 +- contrib/seg/seg--1.0.sql | 58 +-- contrib/spi/autoinc--1.0.sql | 2 +- contrib/spi/insert_username--1.0.sql | 2 +- contrib/spi/moddatetime--1.0.sql | 2 +- contrib/spi/refint--1.0.sql | 4 +- contrib/spi/timetravel--1.0.sql | 6 +- contrib/sslinfo/sslinfo--1.0.sql | 18 +- contrib/tablefunc/tablefunc--1.0.sql | 22 +- contrib/test_parser/test_parser--1.0.sql | 8 +- contrib/tsearch2/tsearch2--1.0.sql | 22 +- contrib/unaccent/unaccent--1.0.sql | 8 +- contrib/uuid-ossp/uuid-ossp--1.0.sql | 20 +- contrib/xml2/xml2--1.0.sql | 26 +- 37 files changed, 922 insertions(+), 922 deletions(-) (limited to 'contrib/xml2') diff --git a/contrib/adminpack/adminpack--1.0.sql b/contrib/adminpack/adminpack--1.0.sql index 0502a4c01f..090702231c 100644 --- a/contrib/adminpack/adminpack--1.0.sql +++ b/contrib/adminpack/adminpack--1.0.sql @@ -6,27 +6,27 @@ /* generic file access functions */ -CREATE OR REPLACE FUNCTION pg_catalog.pg_file_write(text, text, bool) +CREATE FUNCTION pg_catalog.pg_file_write(text, text, bool) RETURNS bigint AS 'MODULE_PATHNAME', 'pg_file_write' LANGUAGE C VOLATILE STRICT; -CREATE OR REPLACE FUNCTION pg_catalog.pg_file_rename(text, text, text) +CREATE FUNCTION pg_catalog.pg_file_rename(text, text, text) RETURNS bool AS 'MODULE_PATHNAME', 'pg_file_rename' LANGUAGE C VOLATILE; -CREATE OR REPLACE FUNCTION pg_catalog.pg_file_rename(text, text) +CREATE FUNCTION pg_catalog.pg_file_rename(text, text) RETURNS bool AS 'SELECT pg_catalog.pg_file_rename($1, $2, NULL::pg_catalog.text);' LANGUAGE SQL VOLATILE STRICT; -CREATE OR REPLACE FUNCTION pg_catalog.pg_file_unlink(text) +CREATE FUNCTION pg_catalog.pg_file_unlink(text) RETURNS bool AS 'MODULE_PATHNAME', 'pg_file_unlink' LANGUAGE C VOLATILE STRICT; -CREATE OR REPLACE FUNCTION pg_catalog.pg_logdir_ls() +CREATE FUNCTION pg_catalog.pg_logdir_ls() RETURNS setof record AS 'MODULE_PATHNAME', 'pg_logdir_ls' LANGUAGE C VOLATILE STRICT; @@ -34,17 +34,17 @@ LANGUAGE C VOLATILE STRICT; /* Renaming of existing backend functions for pgAdmin compatibility */ -CREATE OR REPLACE FUNCTION pg_catalog.pg_file_read(text, bigint, bigint) +CREATE FUNCTION pg_catalog.pg_file_read(text, bigint, bigint) RETURNS text AS 'pg_read_file' LANGUAGE INTERNAL VOLATILE STRICT; -CREATE OR REPLACE FUNCTION pg_catalog.pg_file_length(text) +CREATE FUNCTION pg_catalog.pg_file_length(text) RETURNS bigint AS 'SELECT size FROM pg_catalog.pg_stat_file($1)' LANGUAGE SQL VOLATILE STRICT; -CREATE OR REPLACE FUNCTION pg_catalog.pg_logfile_rotate() +CREATE FUNCTION pg_catalog.pg_logfile_rotate() RETURNS int4 AS 'pg_rotate_logfile' LANGUAGE INTERNAL VOLATILE STRICT; diff --git a/contrib/btree_gin/btree_gin--1.0.sql b/contrib/btree_gin/btree_gin--1.0.sql index 08bbff721f..07f93640f3 100644 --- a/contrib/btree_gin/btree_gin--1.0.sql +++ b/contrib/btree_gin/btree_gin--1.0.sql @@ -1,21 +1,21 @@ /* contrib/btree_gin/btree_gin--1.0.sql */ -CREATE OR REPLACE FUNCTION gin_btree_consistent(internal, int2, anyelement, int4, internal, internal) +CREATE FUNCTION gin_btree_consistent(internal, int2, anyelement, int4, internal, internal) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION gin_extract_value_int2(int2, internal) +CREATE FUNCTION gin_extract_value_int2(int2, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION gin_compare_prefix_int2(int2, int2, int2, internal) +CREATE FUNCTION gin_compare_prefix_int2(int2, int2, int2, internal) RETURNS int4 AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION gin_extract_query_int2(int2, internal, int2, internal, internal) +CREATE FUNCTION gin_extract_query_int2(int2, internal, int2, internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -35,17 +35,17 @@ AS FUNCTION 5 gin_compare_prefix_int2(int2,int2,int2, internal), STORAGE int2; -CREATE OR REPLACE FUNCTION gin_extract_value_int4(int4, internal) +CREATE FUNCTION gin_extract_value_int4(int4, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION gin_compare_prefix_int4(int4, int4, int2, internal) +CREATE FUNCTION gin_compare_prefix_int4(int4, int4, int2, internal) RETURNS int4 AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION gin_extract_query_int4(int4, internal, int2, internal, internal) +CREATE FUNCTION gin_extract_query_int4(int4, internal, int2, internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -65,17 +65,17 @@ AS FUNCTION 5 gin_compare_prefix_int4(int4,int4,int2, internal), STORAGE int4; -CREATE OR REPLACE FUNCTION gin_extract_value_int8(int8, internal) +CREATE FUNCTION gin_extract_value_int8(int8, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION gin_compare_prefix_int8(int8, int8, int2, internal) +CREATE FUNCTION gin_compare_prefix_int8(int8, int8, int2, internal) RETURNS int4 AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION gin_extract_query_int8(int8, internal, int2, internal, internal) +CREATE FUNCTION gin_extract_query_int8(int8, internal, int2, internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -95,17 +95,17 @@ AS FUNCTION 5 gin_compare_prefix_int8(int8,int8,int2, internal), STORAGE int8; -CREATE OR REPLACE FUNCTION gin_extract_value_float4(float4, internal) +CREATE FUNCTION gin_extract_value_float4(float4, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION gin_compare_prefix_float4(float4, float4, int2, internal) +CREATE FUNCTION gin_compare_prefix_float4(float4, float4, int2, internal) RETURNS int4 AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION gin_extract_query_float4(float4, internal, int2, internal, internal) +CREATE FUNCTION gin_extract_query_float4(float4, internal, int2, internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -125,17 +125,17 @@ AS FUNCTION 5 gin_compare_prefix_float4(float4,float4,int2, internal), STORAGE float4; -CREATE OR REPLACE FUNCTION gin_extract_value_float8(float8, internal) +CREATE FUNCTION gin_extract_value_float8(float8, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION gin_compare_prefix_float8(float8, float8, int2, internal) +CREATE FUNCTION gin_compare_prefix_float8(float8, float8, int2, internal) RETURNS int4 AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION gin_extract_query_float8(float8, internal, int2, internal, internal) +CREATE FUNCTION gin_extract_query_float8(float8, internal, int2, internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -155,17 +155,17 @@ AS FUNCTION 5 gin_compare_prefix_float8(float8,float8,int2, internal), STORAGE float8; -CREATE OR REPLACE FUNCTION gin_extract_value_money(money, internal) +CREATE FUNCTION gin_extract_value_money(money, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION gin_compare_prefix_money(money, money, int2, internal) +CREATE FUNCTION gin_compare_prefix_money(money, money, int2, internal) RETURNS int4 AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION gin_extract_query_money(money, internal, int2, internal, internal) +CREATE FUNCTION gin_extract_query_money(money, internal, int2, internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -185,17 +185,17 @@ AS FUNCTION 5 gin_compare_prefix_money(money,money,int2, internal), STORAGE money; -CREATE OR REPLACE FUNCTION gin_extract_value_oid(oid, internal) +CREATE FUNCTION gin_extract_value_oid(oid, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION gin_compare_prefix_oid(oid, oid, int2, internal) +CREATE FUNCTION gin_compare_prefix_oid(oid, oid, int2, internal) RETURNS int4 AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION gin_extract_query_oid(oid, internal, int2, internal, internal) +CREATE FUNCTION gin_extract_query_oid(oid, internal, int2, internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -215,17 +215,17 @@ AS FUNCTION 5 gin_compare_prefix_oid(oid,oid,int2, internal), STORAGE oid; -CREATE OR REPLACE FUNCTION gin_extract_value_timestamp(timestamp, internal) +CREATE FUNCTION gin_extract_value_timestamp(timestamp, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION gin_compare_prefix_timestamp(timestamp, timestamp, int2, internal) +CREATE FUNCTION gin_compare_prefix_timestamp(timestamp, timestamp, int2, internal) RETURNS int4 AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION gin_extract_query_timestamp(timestamp, internal, int2, internal, internal) +CREATE FUNCTION gin_extract_query_timestamp(timestamp, internal, int2, internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -245,17 +245,17 @@ AS FUNCTION 5 gin_compare_prefix_timestamp(timestamp,timestamp,int2, internal), STORAGE timestamp; -CREATE OR REPLACE FUNCTION gin_extract_value_timestamptz(timestamptz, internal) +CREATE FUNCTION gin_extract_value_timestamptz(timestamptz, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION gin_compare_prefix_timestamptz(timestamptz, timestamptz, int2, internal) +CREATE FUNCTION gin_compare_prefix_timestamptz(timestamptz, timestamptz, int2, internal) RETURNS int4 AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION gin_extract_query_timestamptz(timestamptz, internal, int2, internal, internal) +CREATE FUNCTION gin_extract_query_timestamptz(timestamptz, internal, int2, internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -275,17 +275,17 @@ AS FUNCTION 5 gin_compare_prefix_timestamptz(timestamptz,timestamptz,int2, internal), STORAGE timestamptz; -CREATE OR REPLACE FUNCTION gin_extract_value_time(time, internal) +CREATE FUNCTION gin_extract_value_time(time, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION gin_compare_prefix_time(time, time, int2, internal) +CREATE FUNCTION gin_compare_prefix_time(time, time, int2, internal) RETURNS int4 AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION gin_extract_query_time(time, internal, int2, internal, internal) +CREATE FUNCTION gin_extract_query_time(time, internal, int2, internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -305,17 +305,17 @@ AS FUNCTION 5 gin_compare_prefix_time(time,time,int2, internal), STORAGE time; -CREATE OR REPLACE FUNCTION gin_extract_value_timetz(timetz, internal) +CREATE FUNCTION gin_extract_value_timetz(timetz, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION gin_compare_prefix_timetz(timetz, timetz, int2, internal) +CREATE FUNCTION gin_compare_prefix_timetz(timetz, timetz, int2, internal) RETURNS int4 AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION gin_extract_query_timetz(timetz, internal, int2, internal, internal) +CREATE FUNCTION gin_extract_query_timetz(timetz, internal, int2, internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -335,17 +335,17 @@ AS FUNCTION 5 gin_compare_prefix_timetz(timetz,timetz,int2, internal), STORAGE timetz; -CREATE OR REPLACE FUNCTION gin_extract_value_date(date, internal) +CREATE FUNCTION gin_extract_value_date(date, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION gin_compare_prefix_date(date, date, int2, internal) +CREATE FUNCTION gin_compare_prefix_date(date, date, int2, internal) RETURNS int4 AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION gin_extract_query_date(date, internal, int2, internal, internal) +CREATE FUNCTION gin_extract_query_date(date, internal, int2, internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -365,17 +365,17 @@ AS FUNCTION 5 gin_compare_prefix_date(date,date,int2, internal), STORAGE date; -CREATE OR REPLACE FUNCTION gin_extract_value_interval(interval, internal) +CREATE FUNCTION gin_extract_value_interval(interval, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION gin_compare_prefix_interval(interval, interval, int2, internal) +CREATE FUNCTION gin_compare_prefix_interval(interval, interval, int2, internal) RETURNS int4 AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION gin_extract_query_interval(interval, internal, int2, internal, internal) +CREATE FUNCTION gin_extract_query_interval(interval, internal, int2, internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -395,17 +395,17 @@ AS FUNCTION 5 gin_compare_prefix_interval(interval,interval,int2, internal), STORAGE interval; -CREATE OR REPLACE FUNCTION gin_extract_value_macaddr(macaddr, internal) +CREATE FUNCTION gin_extract_value_macaddr(macaddr, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION gin_compare_prefix_macaddr(macaddr, macaddr, int2, internal) +CREATE FUNCTION gin_compare_prefix_macaddr(macaddr, macaddr, int2, internal) RETURNS int4 AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION gin_extract_query_macaddr(macaddr, internal, int2, internal, internal) +CREATE FUNCTION gin_extract_query_macaddr(macaddr, internal, int2, internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -425,17 +425,17 @@ AS FUNCTION 5 gin_compare_prefix_macaddr(macaddr,macaddr,int2, internal), STORAGE macaddr; -CREATE OR REPLACE FUNCTION gin_extract_value_inet(inet, internal) +CREATE FUNCTION gin_extract_value_inet(inet, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION gin_compare_prefix_inet(inet, inet, int2, internal) +CREATE FUNCTION gin_compare_prefix_inet(inet, inet, int2, internal) RETURNS int4 AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION gin_extract_query_inet(inet, internal, int2, internal, internal) +CREATE FUNCTION gin_extract_query_inet(inet, internal, int2, internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -455,17 +455,17 @@ AS FUNCTION 5 gin_compare_prefix_inet(inet,inet,int2, internal), STORAGE inet; -CREATE OR REPLACE FUNCTION gin_extract_value_cidr(cidr, internal) +CREATE FUNCTION gin_extract_value_cidr(cidr, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION gin_compare_prefix_cidr(cidr, cidr, int2, internal) +CREATE FUNCTION gin_compare_prefix_cidr(cidr, cidr, int2, internal) RETURNS int4 AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION gin_extract_query_cidr(cidr, internal, int2, internal, internal) +CREATE FUNCTION gin_extract_query_cidr(cidr, internal, int2, internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -485,17 +485,17 @@ AS FUNCTION 5 gin_compare_prefix_cidr(cidr,cidr,int2, internal), STORAGE cidr; -CREATE OR REPLACE FUNCTION gin_extract_value_text(text, internal) +CREATE FUNCTION gin_extract_value_text(text, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION gin_compare_prefix_text(text, text, int2, internal) +CREATE FUNCTION gin_compare_prefix_text(text, text, int2, internal) RETURNS int4 AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION gin_extract_query_text(text, internal, int2, internal, internal) +CREATE FUNCTION gin_extract_query_text(text, internal, int2, internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -530,17 +530,17 @@ AS FUNCTION 5 gin_compare_prefix_text(text,text,int2, internal), STORAGE varchar; -CREATE OR REPLACE FUNCTION gin_extract_value_char("char", internal) +CREATE FUNCTION gin_extract_value_char("char", internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION gin_compare_prefix_char("char", "char", int2, internal) +CREATE FUNCTION gin_compare_prefix_char("char", "char", int2, internal) RETURNS int4 AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION gin_extract_query_char("char", internal, int2, internal, internal) +CREATE FUNCTION gin_extract_query_char("char", internal, int2, internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -560,17 +560,17 @@ AS FUNCTION 5 gin_compare_prefix_char("char","char",int2, internal), STORAGE "char"; -CREATE OR REPLACE FUNCTION gin_extract_value_bytea(bytea, internal) +CREATE FUNCTION gin_extract_value_bytea(bytea, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION gin_compare_prefix_bytea(bytea, bytea, int2, internal) +CREATE FUNCTION gin_compare_prefix_bytea(bytea, bytea, int2, internal) RETURNS int4 AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION gin_extract_query_bytea(bytea, internal, int2, internal, internal) +CREATE FUNCTION gin_extract_query_bytea(bytea, internal, int2, internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -590,17 +590,17 @@ AS FUNCTION 5 gin_compare_prefix_bytea(bytea,bytea,int2, internal), STORAGE bytea; -CREATE OR REPLACE FUNCTION gin_extract_value_bit(bit, internal) +CREATE FUNCTION gin_extract_value_bit(bit, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION gin_compare_prefix_bit(bit, bit, int2, internal) +CREATE FUNCTION gin_compare_prefix_bit(bit, bit, int2, internal) RETURNS int4 AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION gin_extract_query_bit(bit, internal, int2, internal, internal) +CREATE FUNCTION gin_extract_query_bit(bit, internal, int2, internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -620,17 +620,17 @@ AS FUNCTION 5 gin_compare_prefix_bit(bit,bit,int2, internal), STORAGE bit; -CREATE OR REPLACE FUNCTION gin_extract_value_varbit(varbit, internal) +CREATE FUNCTION gin_extract_value_varbit(varbit, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION gin_compare_prefix_varbit(varbit, varbit, int2, internal) +CREATE FUNCTION gin_compare_prefix_varbit(varbit, varbit, int2, internal) RETURNS int4 AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION gin_extract_query_varbit(varbit, internal, int2, internal, internal) +CREATE FUNCTION gin_extract_query_varbit(varbit, internal, int2, internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -650,22 +650,22 @@ AS FUNCTION 5 gin_compare_prefix_varbit(varbit,varbit,int2, internal), STORAGE varbit; -CREATE OR REPLACE FUNCTION gin_extract_value_numeric(numeric, internal) +CREATE FUNCTION gin_extract_value_numeric(numeric, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION gin_compare_prefix_numeric(numeric, numeric, int2, internal) +CREATE FUNCTION gin_compare_prefix_numeric(numeric, numeric, int2, internal) RETURNS int4 AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION gin_extract_query_numeric(numeric, internal, int2, internal, internal) +CREATE FUNCTION gin_extract_query_numeric(numeric, internal, int2, internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION gin_numeric_cmp(numeric, numeric) +CREATE FUNCTION gin_numeric_cmp(numeric, numeric) RETURNS int4 AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; diff --git a/contrib/btree_gist/btree_gist--1.0.sql b/contrib/btree_gist/btree_gist--1.0.sql index ab6c8c3936..f1866f25ed 100644 --- a/contrib/btree_gist/btree_gist--1.0.sql +++ b/contrib/btree_gist/btree_gist--1.0.sql @@ -1,11 +1,11 @@ /* contrib/btree_gist/btree_gist--1.0.sql */ -CREATE OR REPLACE FUNCTION gbtreekey4_in(cstring) +CREATE FUNCTION gbtreekey4_in(cstring) RETURNS gbtreekey4 AS 'MODULE_PATHNAME', 'gbtreekey_in' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbtreekey4_out(gbtreekey4) +CREATE FUNCTION gbtreekey4_out(gbtreekey4) RETURNS cstring AS 'MODULE_PATHNAME', 'gbtreekey_out' LANGUAGE C IMMUTABLE STRICT; @@ -16,12 +16,12 @@ CREATE TYPE gbtreekey4 ( OUTPUT = gbtreekey4_out ); -CREATE OR REPLACE FUNCTION gbtreekey8_in(cstring) +CREATE FUNCTION gbtreekey8_in(cstring) RETURNS gbtreekey8 AS 'MODULE_PATHNAME', 'gbtreekey_in' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbtreekey8_out(gbtreekey8) +CREATE FUNCTION gbtreekey8_out(gbtreekey8) RETURNS cstring AS 'MODULE_PATHNAME', 'gbtreekey_out' LANGUAGE C IMMUTABLE STRICT; @@ -32,12 +32,12 @@ CREATE TYPE gbtreekey8 ( OUTPUT = gbtreekey8_out ); -CREATE OR REPLACE FUNCTION gbtreekey16_in(cstring) +CREATE FUNCTION gbtreekey16_in(cstring) RETURNS gbtreekey16 AS 'MODULE_PATHNAME', 'gbtreekey_in' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbtreekey16_out(gbtreekey16) +CREATE FUNCTION gbtreekey16_out(gbtreekey16) RETURNS cstring AS 'MODULE_PATHNAME', 'gbtreekey_out' LANGUAGE C IMMUTABLE STRICT; @@ -48,12 +48,12 @@ CREATE TYPE gbtreekey16 ( OUTPUT = gbtreekey16_out ); -CREATE OR REPLACE FUNCTION gbtreekey32_in(cstring) +CREATE FUNCTION gbtreekey32_in(cstring) RETURNS gbtreekey32 AS 'MODULE_PATHNAME', 'gbtreekey_in' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbtreekey32_out(gbtreekey32) +CREATE FUNCTION gbtreekey32_out(gbtreekey32) RETURNS cstring AS 'MODULE_PATHNAME', 'gbtreekey_out' LANGUAGE C IMMUTABLE STRICT; @@ -64,12 +64,12 @@ CREATE TYPE gbtreekey32 ( OUTPUT = gbtreekey32_out ); -CREATE OR REPLACE FUNCTION gbtreekey_var_in(cstring) +CREATE FUNCTION gbtreekey_var_in(cstring) RETURNS gbtreekey_var AS 'MODULE_PATHNAME', 'gbtreekey_in' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbtreekey_var_out(gbtreekey_var) +CREATE FUNCTION gbtreekey_var_out(gbtreekey_var) RETURNS cstring AS 'MODULE_PATHNAME', 'gbtreekey_out' LANGUAGE C IMMUTABLE STRICT; @@ -91,42 +91,42 @@ CREATE TYPE gbtreekey_var ( -- -- -- define the GiST support methods -CREATE OR REPLACE FUNCTION gbt_oid_consistent(internal,oid,int2,oid,internal) +CREATE FUNCTION gbt_oid_consistent(internal,oid,int2,oid,internal) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_oid_compress(internal) +CREATE FUNCTION gbt_oid_compress(internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_decompress(internal) +CREATE FUNCTION gbt_decompress(internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_var_decompress(internal) +CREATE FUNCTION gbt_var_decompress(internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_oid_penalty(internal,internal,internal) +CREATE FUNCTION gbt_oid_penalty(internal,internal,internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_oid_picksplit(internal, internal) +CREATE FUNCTION gbt_oid_picksplit(internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_oid_union(bytea, internal) +CREATE FUNCTION gbt_oid_union(bytea, internal) RETURNS gbtreekey8 AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_oid_same(internal, internal, internal) +CREATE FUNCTION gbt_oid_same(internal, internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; @@ -159,32 +159,32 @@ AS -- -- -- define the GiST support methods -CREATE OR REPLACE FUNCTION gbt_int2_consistent(internal,int2,int2,oid,internal) +CREATE FUNCTION gbt_int2_consistent(internal,int2,int2,oid,internal) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_int2_compress(internal) +CREATE FUNCTION gbt_int2_compress(internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_int2_penalty(internal,internal,internal) +CREATE FUNCTION gbt_int2_penalty(internal,internal,internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_int2_picksplit(internal, internal) +CREATE FUNCTION gbt_int2_picksplit(internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_int2_union(bytea, internal) +CREATE FUNCTION gbt_int2_union(bytea, internal) RETURNS gbtreekey4 AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_int2_same(internal, internal, internal) +CREATE FUNCTION gbt_int2_same(internal, internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; @@ -216,32 +216,32 @@ AS -- -- -- define the GiST support methods -CREATE OR REPLACE FUNCTION gbt_int4_consistent(internal,int4,int2,oid,internal) +CREATE FUNCTION gbt_int4_consistent(internal,int4,int2,oid,internal) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_int4_compress(internal) +CREATE FUNCTION gbt_int4_compress(internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_int4_penalty(internal,internal,internal) +CREATE FUNCTION gbt_int4_penalty(internal,internal,internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_int4_picksplit(internal, internal) +CREATE FUNCTION gbt_int4_picksplit(internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_int4_union(bytea, internal) +CREATE FUNCTION gbt_int4_union(bytea, internal) RETURNS gbtreekey8 AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_int4_same(internal, internal, internal) +CREATE FUNCTION gbt_int4_same(internal, internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; @@ -273,32 +273,32 @@ AS -- -- -- define the GiST support methods -CREATE OR REPLACE FUNCTION gbt_int8_consistent(internal,int8,int2,oid,internal) +CREATE FUNCTION gbt_int8_consistent(internal,int8,int2,oid,internal) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_int8_compress(internal) +CREATE FUNCTION gbt_int8_compress(internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_int8_penalty(internal,internal,internal) +CREATE FUNCTION gbt_int8_penalty(internal,internal,internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_int8_picksplit(internal, internal) +CREATE FUNCTION gbt_int8_picksplit(internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_int8_union(bytea, internal) +CREATE FUNCTION gbt_int8_union(bytea, internal) RETURNS gbtreekey16 AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_int8_same(internal, internal, internal) +CREATE FUNCTION gbt_int8_same(internal, internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; @@ -331,32 +331,32 @@ AS -- -- -- define the GiST support methods -CREATE OR REPLACE FUNCTION gbt_float4_consistent(internal,float4,int2,oid,internal) +CREATE FUNCTION gbt_float4_consistent(internal,float4,int2,oid,internal) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_float4_compress(internal) +CREATE FUNCTION gbt_float4_compress(internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_float4_penalty(internal,internal,internal) +CREATE FUNCTION gbt_float4_penalty(internal,internal,internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_float4_picksplit(internal, internal) +CREATE FUNCTION gbt_float4_picksplit(internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_float4_union(bytea, internal) +CREATE FUNCTION gbt_float4_union(bytea, internal) RETURNS gbtreekey8 AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_float4_same(internal, internal, internal) +CREATE FUNCTION gbt_float4_same(internal, internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; @@ -391,32 +391,32 @@ AS -- -- -- define the GiST support methods -CREATE OR REPLACE FUNCTION gbt_float8_consistent(internal,float8,int2,oid,internal) +CREATE FUNCTION gbt_float8_consistent(internal,float8,int2,oid,internal) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_float8_compress(internal) +CREATE FUNCTION gbt_float8_compress(internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_float8_penalty(internal,internal,internal) +CREATE FUNCTION gbt_float8_penalty(internal,internal,internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_float8_picksplit(internal, internal) +CREATE FUNCTION gbt_float8_picksplit(internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_float8_union(bytea, internal) +CREATE FUNCTION gbt_float8_union(bytea, internal) RETURNS gbtreekey16 AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_float8_same(internal, internal, internal) +CREATE FUNCTION gbt_float8_same(internal, internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; @@ -449,42 +449,42 @@ AS -- -- -CREATE OR REPLACE FUNCTION gbt_ts_consistent(internal,timestamp,int2,oid,internal) +CREATE FUNCTION gbt_ts_consistent(internal,timestamp,int2,oid,internal) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_tstz_consistent(internal,timestamptz,int2,oid,internal) +CREATE FUNCTION gbt_tstz_consistent(internal,timestamptz,int2,oid,internal) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_ts_compress(internal) +CREATE FUNCTION gbt_ts_compress(internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_tstz_compress(internal) +CREATE FUNCTION gbt_tstz_compress(internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_ts_penalty(internal,internal,internal) +CREATE FUNCTION gbt_ts_penalty(internal,internal,internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_ts_picksplit(internal, internal) +CREATE FUNCTION gbt_ts_picksplit(internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_ts_union(bytea, internal) +CREATE FUNCTION gbt_ts_union(bytea, internal) RETURNS gbtreekey16 AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_ts_same(internal, internal, internal) +CREATE FUNCTION gbt_ts_same(internal, internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; @@ -537,42 +537,42 @@ AS -- -- -CREATE OR REPLACE FUNCTION gbt_time_consistent(internal,time,int2,oid,internal) +CREATE FUNCTION gbt_time_consistent(internal,time,int2,oid,internal) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_timetz_consistent(internal,timetz,int2,oid,internal) +CREATE FUNCTION gbt_timetz_consistent(internal,timetz,int2,oid,internal) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_time_compress(internal) +CREATE FUNCTION gbt_time_compress(internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_timetz_compress(internal) +CREATE FUNCTION gbt_timetz_compress(internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_time_penalty(internal,internal,internal) +CREATE FUNCTION gbt_time_penalty(internal,internal,internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_time_picksplit(internal, internal) +CREATE FUNCTION gbt_time_picksplit(internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_time_union(bytea, internal) +CREATE FUNCTION gbt_time_union(bytea, internal) RETURNS gbtreekey16 AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_time_same(internal, internal, internal) +CREATE FUNCTION gbt_time_same(internal, internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; @@ -623,32 +623,32 @@ AS -- -- -CREATE OR REPLACE FUNCTION gbt_date_consistent(internal,date,int2,oid,internal) +CREATE FUNCTION gbt_date_consistent(internal,date,int2,oid,internal) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_date_compress(internal) +CREATE FUNCTION gbt_date_compress(internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_date_penalty(internal,internal,internal) +CREATE FUNCTION gbt_date_penalty(internal,internal,internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_date_picksplit(internal, internal) +CREATE FUNCTION gbt_date_picksplit(internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_date_union(bytea, internal) +CREATE FUNCTION gbt_date_union(bytea, internal) RETURNS gbtreekey8 AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_date_same(internal, internal, internal) +CREATE FUNCTION gbt_date_same(internal, internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; @@ -681,37 +681,37 @@ AS -- -- -CREATE OR REPLACE FUNCTION gbt_intv_consistent(internal,interval,int2,oid,internal) +CREATE FUNCTION gbt_intv_consistent(internal,interval,int2,oid,internal) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_intv_compress(internal) +CREATE FUNCTION gbt_intv_compress(internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_intv_decompress(internal) +CREATE FUNCTION gbt_intv_decompress(internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_intv_penalty(internal,internal,internal) +CREATE FUNCTION gbt_intv_penalty(internal,internal,internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_intv_picksplit(internal, internal) +CREATE FUNCTION gbt_intv_picksplit(internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_intv_union(bytea, internal) +CREATE FUNCTION gbt_intv_union(bytea, internal) RETURNS gbtreekey32 AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_intv_same(internal, internal, internal) +CREATE FUNCTION gbt_intv_same(internal, internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; @@ -743,32 +743,32 @@ AS -- -- -- define the GiST support methods -CREATE OR REPLACE FUNCTION gbt_cash_consistent(internal,money,int2,oid,internal) +CREATE FUNCTION gbt_cash_consistent(internal,money,int2,oid,internal) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_cash_compress(internal) +CREATE FUNCTION gbt_cash_compress(internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_cash_penalty(internal,internal,internal) +CREATE FUNCTION gbt_cash_penalty(internal,internal,internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_cash_picksplit(internal, internal) +CREATE FUNCTION gbt_cash_picksplit(internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_cash_union(bytea, internal) +CREATE FUNCTION gbt_cash_union(bytea, internal) RETURNS gbtreekey8 AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_cash_same(internal, internal, internal) +CREATE FUNCTION gbt_cash_same(internal, internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; @@ -800,32 +800,32 @@ AS -- -- -- define the GiST support methods -CREATE OR REPLACE FUNCTION gbt_macad_consistent(internal,macaddr,int2,oid,internal) +CREATE FUNCTION gbt_macad_consistent(internal,macaddr,int2,oid,internal) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_macad_compress(internal) +CREATE FUNCTION gbt_macad_compress(internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_macad_penalty(internal,internal,internal) +CREATE FUNCTION gbt_macad_penalty(internal,internal,internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_macad_picksplit(internal, internal) +CREATE FUNCTION gbt_macad_picksplit(internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_macad_union(bytea, internal) +CREATE FUNCTION gbt_macad_union(bytea, internal) RETURNS gbtreekey16 AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_macad_same(internal, internal, internal) +CREATE FUNCTION gbt_macad_same(internal, internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; @@ -859,42 +859,42 @@ AS -- -- -- define the GiST support methods -CREATE OR REPLACE FUNCTION gbt_text_consistent(internal,text,int2,oid,internal) +CREATE FUNCTION gbt_text_consistent(internal,text,int2,oid,internal) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_bpchar_consistent(internal,bpchar,int2,oid,internal) +CREATE FUNCTION gbt_bpchar_consistent(internal,bpchar,int2,oid,internal) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_text_compress(internal) +CREATE FUNCTION gbt_text_compress(internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_bpchar_compress(internal) +CREATE FUNCTION gbt_bpchar_compress(internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_text_penalty(internal,internal,internal) +CREATE FUNCTION gbt_text_penalty(internal,internal,internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_text_picksplit(internal, internal) +CREATE FUNCTION gbt_text_picksplit(internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_text_union(bytea, internal) +CREATE FUNCTION gbt_text_union(bytea, internal) RETURNS gbtreekey_var AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_text_same(internal, internal, internal) +CREATE FUNCTION gbt_text_same(internal, internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; @@ -947,32 +947,32 @@ AS -- -- -- define the GiST support methods -CREATE OR REPLACE FUNCTION gbt_bytea_consistent(internal,bytea,int2,oid,internal) +CREATE FUNCTION gbt_bytea_consistent(internal,bytea,int2,oid,internal) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_bytea_compress(internal) +CREATE FUNCTION gbt_bytea_compress(internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_bytea_penalty(internal,internal,internal) +CREATE FUNCTION gbt_bytea_penalty(internal,internal,internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_bytea_picksplit(internal, internal) +CREATE FUNCTION gbt_bytea_picksplit(internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_bytea_union(bytea, internal) +CREATE FUNCTION gbt_bytea_union(bytea, internal) RETURNS gbtreekey_var AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_bytea_same(internal, internal, internal) +CREATE FUNCTION gbt_bytea_same(internal, internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; @@ -1005,32 +1005,32 @@ AS -- -- -- define the GiST support methods -CREATE OR REPLACE FUNCTION gbt_numeric_consistent(internal,numeric,int2,oid,internal) +CREATE FUNCTION gbt_numeric_consistent(internal,numeric,int2,oid,internal) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_numeric_compress(internal) +CREATE FUNCTION gbt_numeric_compress(internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_numeric_penalty(internal,internal,internal) +CREATE FUNCTION gbt_numeric_penalty(internal,internal,internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_numeric_picksplit(internal, internal) +CREATE FUNCTION gbt_numeric_picksplit(internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_numeric_union(bytea, internal) +CREATE FUNCTION gbt_numeric_union(bytea, internal) RETURNS gbtreekey_var AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_numeric_same(internal, internal, internal) +CREATE FUNCTION gbt_numeric_same(internal, internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; @@ -1061,32 +1061,32 @@ AS -- -- -- define the GiST support methods -CREATE OR REPLACE FUNCTION gbt_bit_consistent(internal,bit,int2,oid,internal) +CREATE FUNCTION gbt_bit_consistent(internal,bit,int2,oid,internal) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_bit_compress(internal) +CREATE FUNCTION gbt_bit_compress(internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_bit_penalty(internal,internal,internal) +CREATE FUNCTION gbt_bit_penalty(internal,internal,internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_bit_picksplit(internal, internal) +CREATE FUNCTION gbt_bit_picksplit(internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_bit_union(bytea, internal) +CREATE FUNCTION gbt_bit_union(bytea, internal) RETURNS gbtreekey_var AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_bit_same(internal, internal, internal) +CREATE FUNCTION gbt_bit_same(internal, internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; @@ -1140,32 +1140,32 @@ AS -- -- -- define the GiST support methods -CREATE OR REPLACE FUNCTION gbt_inet_consistent(internal,inet,int2,oid,internal) +CREATE FUNCTION gbt_inet_consistent(internal,inet,int2,oid,internal) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_inet_compress(internal) +CREATE FUNCTION gbt_inet_compress(internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_inet_penalty(internal,internal,internal) +CREATE FUNCTION gbt_inet_penalty(internal,internal,internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_inet_picksplit(internal, internal) +CREATE FUNCTION gbt_inet_picksplit(internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_inet_union(bytea, internal) +CREATE FUNCTION gbt_inet_union(bytea, internal) RETURNS gbtreekey16 AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gbt_inet_same(internal, internal, internal) +CREATE FUNCTION gbt_inet_same(internal, internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; diff --git a/contrib/chkpass/chkpass--1.0.sql b/contrib/chkpass/chkpass--1.0.sql index aad74683f7..755fee3bc3 100644 --- a/contrib/chkpass/chkpass--1.0.sql +++ b/contrib/chkpass/chkpass--1.0.sql @@ -4,12 +4,12 @@ -- Input and output functions and the type itself: -- -CREATE OR REPLACE FUNCTION chkpass_in(cstring) +CREATE FUNCTION chkpass_in(cstring) RETURNS chkpass AS 'MODULE_PATHNAME' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION chkpass_out(chkpass) +CREATE FUNCTION chkpass_out(chkpass) RETURNS cstring AS 'MODULE_PATHNAME' LANGUAGE C STRICT; @@ -20,7 +20,7 @@ CREATE TYPE chkpass ( output = chkpass_out ); -CREATE OR REPLACE FUNCTION raw(chkpass) +CREATE FUNCTION raw(chkpass) RETURNS text AS 'MODULE_PATHNAME', 'chkpass_rout' LANGUAGE C STRICT; @@ -29,12 +29,12 @@ CREATE OR REPLACE FUNCTION raw(chkpass) -- The various boolean tests: -- -CREATE OR REPLACE FUNCTION eq(chkpass, text) +CREATE FUNCTION eq(chkpass, text) RETURNS bool AS 'MODULE_PATHNAME', 'chkpass_eq' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION ne(chkpass, text) +CREATE FUNCTION ne(chkpass, text) RETURNS bool AS 'MODULE_PATHNAME', 'chkpass_ne' LANGUAGE C STRICT; diff --git a/contrib/citext/citext--1.0.sql b/contrib/citext/citext--1.0.sql index 13cff8134a..2760f7e08d 100644 --- a/contrib/citext/citext--1.0.sql +++ b/contrib/citext/citext--1.0.sql @@ -16,22 +16,22 @@ CREATE TYPE citext; -- -- Input and output functions. -- -CREATE OR REPLACE FUNCTION citextin(cstring) +CREATE FUNCTION citextin(cstring) RETURNS citext AS 'textin' LANGUAGE internal IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION citextout(citext) +CREATE FUNCTION citextout(citext) RETURNS cstring AS 'textout' LANGUAGE internal IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION citextrecv(internal) +CREATE FUNCTION citextrecv(internal) RETURNS citext AS 'textrecv' LANGUAGE internal STABLE STRICT; -CREATE OR REPLACE FUNCTION citextsend(citext) +CREATE FUNCTION citextsend(citext) RETURNS bytea AS 'textsend' LANGUAGE internal STABLE STRICT; @@ -58,17 +58,17 @@ CREATE TYPE citext ( -- automatically kick in. -- -CREATE OR REPLACE FUNCTION citext(bpchar) +CREATE FUNCTION citext(bpchar) RETURNS citext AS 'rtrim1' LANGUAGE internal IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION citext(boolean) +CREATE FUNCTION citext(boolean) RETURNS citext AS 'booltext' LANGUAGE internal IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION citext(inet) +CREATE FUNCTION citext(inet) RETURNS citext AS 'network_show' LANGUAGE internal IMMUTABLE STRICT; @@ -90,32 +90,32 @@ CREATE CAST (inet AS citext) WITH FUNCTION citext(inet) AS ASSIGNMENT; -- Operator Functions. -- -CREATE OR REPLACE FUNCTION citext_eq( citext, citext ) +CREATE FUNCTION citext_eq( citext, citext ) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION citext_ne( citext, citext ) +CREATE FUNCTION citext_ne( citext, citext ) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION citext_lt( citext, citext ) +CREATE FUNCTION citext_lt( citext, citext ) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION citext_le( citext, citext ) +CREATE FUNCTION citext_le( citext, citext ) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION citext_gt( citext, citext ) +CREATE FUNCTION citext_gt( citext, citext ) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION citext_ge( citext, citext ) +CREATE FUNCTION citext_ge( citext, citext ) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; @@ -190,12 +190,12 @@ CREATE OPERATOR > ( -- Support functions for indexing. -- -CREATE OR REPLACE FUNCTION citext_cmp(citext, citext) +CREATE FUNCTION citext_cmp(citext, citext) RETURNS int4 AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION citext_hash(citext) +CREATE FUNCTION citext_hash(citext) RETURNS int4 AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -226,12 +226,12 @@ DEFAULT FOR TYPE citext USING hash AS -- Aggregates. -- -CREATE OR REPLACE FUNCTION citext_smaller(citext, citext) +CREATE FUNCTION citext_smaller(citext, citext) RETURNS citext AS 'MODULE_PATHNAME' LANGUAGE 'C' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION citext_larger(citext, citext) +CREATE FUNCTION citext_larger(citext, citext) RETURNS citext AS 'MODULE_PATHNAME' LANGUAGE 'C' IMMUTABLE STRICT; @@ -252,19 +252,19 @@ CREATE AGGREGATE max(citext) ( -- CITEXT pattern matching. -- -CREATE OR REPLACE FUNCTION texticlike(citext, citext) +CREATE FUNCTION texticlike(citext, citext) RETURNS bool AS 'texticlike' LANGUAGE internal IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION texticnlike(citext, citext) +CREATE FUNCTION texticnlike(citext, citext) RETURNS bool AS 'texticnlike' LANGUAGE internal IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION texticregexeq(citext, citext) +CREATE FUNCTION texticregexeq(citext, citext) RETURNS bool AS 'texticregexeq' LANGUAGE internal IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION texticregexne(citext, citext) +CREATE FUNCTION texticregexne(citext, citext) RETURNS bool AS 'texticregexne' LANGUAGE internal IMMUTABLE STRICT; @@ -344,19 +344,19 @@ CREATE OPERATOR !~~* ( -- Matching citext to text. -- -CREATE OR REPLACE FUNCTION texticlike(citext, text) +CREATE FUNCTION texticlike(citext, text) RETURNS bool AS 'texticlike' LANGUAGE internal IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION texticnlike(citext, text) +CREATE FUNCTION texticnlike(citext, text) RETURNS bool AS 'texticnlike' LANGUAGE internal IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION texticregexeq(citext, text) +CREATE FUNCTION texticregexeq(citext, text) RETURNS bool AS 'texticregexeq' LANGUAGE internal IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION texticregexne(citext, text) +CREATE FUNCTION texticregexne(citext, text) RETURNS bool AS 'texticregexne' LANGUAGE internal IMMUTABLE STRICT; @@ -437,50 +437,50 @@ CREATE OPERATOR !~~* ( -- XXX TODO Ideally these would be implemented in C. -- -CREATE OR REPLACE FUNCTION regexp_matches( citext, citext ) RETURNS TEXT[] AS $$ +CREATE FUNCTION regexp_matches( citext, citext ) RETURNS TEXT[] AS $$ SELECT pg_catalog.regexp_matches( $1::pg_catalog.text, $2::pg_catalog.text, 'i' ); $$ LANGUAGE SQL IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION regexp_matches( citext, citext, text ) RETURNS TEXT[] AS $$ +CREATE FUNCTION regexp_matches( citext, citext, text ) RETURNS TEXT[] AS $$ SELECT pg_catalog.regexp_matches( $1::pg_catalog.text, $2::pg_catalog.text, CASE WHEN pg_catalog.strpos($3, 'c') = 0 THEN $3 || 'i' ELSE $3 END ); $$ LANGUAGE SQL IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION regexp_replace( citext, citext, text ) returns TEXT AS $$ +CREATE FUNCTION regexp_replace( citext, citext, text ) returns TEXT AS $$ SELECT pg_catalog.regexp_replace( $1::pg_catalog.text, $2::pg_catalog.text, $3, 'i'); $$ LANGUAGE SQL IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION regexp_replace( citext, citext, text, text ) returns TEXT AS $$ +CREATE FUNCTION regexp_replace( citext, citext, text, text ) returns TEXT AS $$ SELECT pg_catalog.regexp_replace( $1::pg_catalog.text, $2::pg_catalog.text, $3, CASE WHEN pg_catalog.strpos($4, 'c') = 0 THEN $4 || 'i' ELSE $4 END); $$ LANGUAGE SQL IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION regexp_split_to_array( citext, citext ) RETURNS TEXT[] AS $$ +CREATE FUNCTION regexp_split_to_array( citext, citext ) RETURNS TEXT[] AS $$ SELECT pg_catalog.regexp_split_to_array( $1::pg_catalog.text, $2::pg_catalog.text, 'i' ); $$ LANGUAGE SQL IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION regexp_split_to_array( citext, citext, text ) RETURNS TEXT[] AS $$ +CREATE FUNCTION regexp_split_to_array( citext, citext, text ) RETURNS TEXT[] AS $$ SELECT pg_catalog.regexp_split_to_array( $1::pg_catalog.text, $2::pg_catalog.text, CASE WHEN pg_catalog.strpos($3, 'c') = 0 THEN $3 || 'i' ELSE $3 END ); $$ LANGUAGE SQL IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION regexp_split_to_table( citext, citext ) RETURNS SETOF TEXT AS $$ +CREATE FUNCTION regexp_split_to_table( citext, citext ) RETURNS SETOF TEXT AS $$ SELECT pg_catalog.regexp_split_to_table( $1::pg_catalog.text, $2::pg_catalog.text, 'i' ); $$ LANGUAGE SQL IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION regexp_split_to_table( citext, citext, text ) RETURNS SETOF TEXT AS $$ +CREATE FUNCTION regexp_split_to_table( citext, citext, text ) RETURNS SETOF TEXT AS $$ SELECT pg_catalog.regexp_split_to_table( $1::pg_catalog.text, $2::pg_catalog.text, CASE WHEN pg_catalog.strpos($3, 'c') = 0 THEN $3 || 'i' ELSE $3 END ); $$ LANGUAGE SQL IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION strpos( citext, citext ) RETURNS INT AS $$ +CREATE FUNCTION strpos( citext, citext ) RETURNS INT AS $$ SELECT pg_catalog.strpos( pg_catalog.lower( $1::pg_catalog.text ), pg_catalog.lower( $2::pg_catalog.text ) ); $$ LANGUAGE SQL IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION replace( citext, citext, citext ) RETURNS TEXT AS $$ +CREATE FUNCTION replace( citext, citext, citext ) RETURNS TEXT AS $$ SELECT pg_catalog.regexp_replace( $1::pg_catalog.text, pg_catalog.regexp_replace($2::pg_catalog.text, '([^a-zA-Z_0-9])', E'\\\\\\1', 'g'), $3::pg_catalog.text, 'gi' ); $$ LANGUAGE SQL IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION split_part( citext, citext, int ) RETURNS TEXT AS $$ +CREATE FUNCTION split_part( citext, citext, int ) RETURNS TEXT AS $$ SELECT (pg_catalog.regexp_split_to_array( $1::pg_catalog.text, pg_catalog.regexp_replace($2::pg_catalog.text, '([^a-zA-Z_0-9])', E'\\\\\\1', 'g'), 'i'))[$3]; $$ LANGUAGE SQL IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION translate( citext, citext, text ) RETURNS TEXT AS $$ +CREATE FUNCTION translate( citext, citext, text ) RETURNS TEXT AS $$ SELECT pg_catalog.translate( pg_catalog.translate( $1::pg_catalog.text, pg_catalog.lower($2::pg_catalog.text), $3), pg_catalog.upper($2::pg_catalog.text), $3); $$ LANGUAGE SQL IMMUTABLE STRICT; diff --git a/contrib/cube/cube--1.0.sql b/contrib/cube/cube--1.0.sql index 18d69a5488..ee9febe005 100644 --- a/contrib/cube/cube--1.0.sql +++ b/contrib/cube/cube--1.0.sql @@ -2,20 +2,20 @@ -- Create the user-defined type for N-dimensional boxes -CREATE OR REPLACE FUNCTION cube_in(cstring) +CREATE FUNCTION cube_in(cstring) RETURNS cube AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION cube(float8[], float8[]) RETURNS cube +CREATE FUNCTION cube(float8[], float8[]) RETURNS cube AS 'MODULE_PATHNAME', 'cube_a_f8_f8' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION cube(float8[]) RETURNS cube +CREATE FUNCTION cube(float8[]) RETURNS cube AS 'MODULE_PATHNAME', 'cube_a_f8' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION cube_out(cube) +CREATE FUNCTION cube_out(cube) RETURNS cstring AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; @@ -35,70 +35,70 @@ COMMENT ON TYPE cube IS 'multi-dimensional cube ''(FLOAT-1, FLOAT-2, ..., FLOAT- -- Comparison methods -CREATE OR REPLACE FUNCTION cube_eq(cube, cube) +CREATE FUNCTION cube_eq(cube, cube) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; COMMENT ON FUNCTION cube_eq(cube, cube) IS 'same as'; -CREATE OR REPLACE FUNCTION cube_ne(cube, cube) +CREATE FUNCTION cube_ne(cube, cube) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; COMMENT ON FUNCTION cube_ne(cube, cube) IS 'different'; -CREATE OR REPLACE FUNCTION cube_lt(cube, cube) +CREATE FUNCTION cube_lt(cube, cube) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; COMMENT ON FUNCTION cube_lt(cube, cube) IS 'lower than'; -CREATE OR REPLACE FUNCTION cube_gt(cube, cube) +CREATE FUNCTION cube_gt(cube, cube) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; COMMENT ON FUNCTION cube_gt(cube, cube) IS 'greater than'; -CREATE OR REPLACE FUNCTION cube_le(cube, cube) +CREATE FUNCTION cube_le(cube, cube) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; COMMENT ON FUNCTION cube_le(cube, cube) IS 'lower than or equal to'; -CREATE OR REPLACE FUNCTION cube_ge(cube, cube) +CREATE FUNCTION cube_ge(cube, cube) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; COMMENT ON FUNCTION cube_ge(cube, cube) IS 'greater than or equal to'; -CREATE OR REPLACE FUNCTION cube_cmp(cube, cube) +CREATE FUNCTION cube_cmp(cube, cube) RETURNS int4 AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; COMMENT ON FUNCTION cube_cmp(cube, cube) IS 'btree comparison function'; -CREATE OR REPLACE FUNCTION cube_contains(cube, cube) +CREATE FUNCTION cube_contains(cube, cube) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; COMMENT ON FUNCTION cube_contains(cube, cube) IS 'contains'; -CREATE OR REPLACE FUNCTION cube_contained(cube, cube) +CREATE FUNCTION cube_contained(cube, cube) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; COMMENT ON FUNCTION cube_contained(cube, cube) IS 'contained in'; -CREATE OR REPLACE FUNCTION cube_overlap(cube, cube) +CREATE FUNCTION cube_overlap(cube, cube) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; @@ -107,17 +107,17 @@ COMMENT ON FUNCTION cube_overlap(cube, cube) IS 'overlaps'; -- support routines for indexing -CREATE OR REPLACE FUNCTION cube_union(cube, cube) +CREATE FUNCTION cube_union(cube, cube) RETURNS cube AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION cube_inter(cube, cube) +CREATE FUNCTION cube_inter(cube, cube) RETURNS cube AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION cube_size(cube) +CREATE FUNCTION cube_size(cube) RETURNS float8 AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; @@ -125,61 +125,61 @@ LANGUAGE C IMMUTABLE STRICT; -- Misc N-dimensional functions -CREATE OR REPLACE FUNCTION cube_subset(cube, int4[]) +CREATE FUNCTION cube_subset(cube, int4[]) RETURNS cube AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -- proximity routines -CREATE OR REPLACE FUNCTION cube_distance(cube, cube) +CREATE FUNCTION cube_distance(cube, cube) RETURNS float8 AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -- Extracting elements functions -CREATE OR REPLACE FUNCTION cube_dim(cube) +CREATE FUNCTION cube_dim(cube) RETURNS int4 AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION cube_ll_coord(cube, int4) +CREATE FUNCTION cube_ll_coord(cube, int4) RETURNS float8 AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION cube_ur_coord(cube, int4) +CREATE FUNCTION cube_ur_coord(cube, int4) RETURNS float8 AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION cube(float8) RETURNS cube +CREATE FUNCTION cube(float8) RETURNS cube AS 'MODULE_PATHNAME', 'cube_f8' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION cube(float8, float8) RETURNS cube +CREATE FUNCTION cube(float8, float8) RETURNS cube AS 'MODULE_PATHNAME', 'cube_f8_f8' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION cube(cube, float8) RETURNS cube +CREATE FUNCTION cube(cube, float8) RETURNS cube AS 'MODULE_PATHNAME', 'cube_c_f8' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION cube(cube, float8, float8) RETURNS cube +CREATE FUNCTION cube(cube, float8, float8) RETURNS cube AS 'MODULE_PATHNAME', 'cube_c_f8_f8' LANGUAGE C IMMUTABLE STRICT; -- Test if cube is also a point -CREATE OR REPLACE FUNCTION cube_is_point(cube) +CREATE FUNCTION cube_is_point(cube) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -- Increasing the size of a cube by a radius in at least n dimensions -CREATE OR REPLACE FUNCTION cube_enlarge(cube, float8, int4) +CREATE FUNCTION cube_enlarge(cube, float8, int4) RETURNS cube AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; @@ -258,37 +258,37 @@ CREATE OPERATOR ~ ( -- define the GiST support methods -CREATE OR REPLACE FUNCTION g_cube_consistent(internal,cube,int,oid,internal) +CREATE FUNCTION g_cube_consistent(internal,cube,int,oid,internal) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION g_cube_compress(internal) +CREATE FUNCTION g_cube_compress(internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION g_cube_decompress(internal) +CREATE FUNCTION g_cube_decompress(internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION g_cube_penalty(internal,internal,internal) +CREATE FUNCTION g_cube_penalty(internal,internal,internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION g_cube_picksplit(internal, internal) +CREATE FUNCTION g_cube_picksplit(internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION g_cube_union(internal, internal) +CREATE FUNCTION g_cube_union(internal, internal) RETURNS cube AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION g_cube_same(cube, cube, internal) +CREATE FUNCTION g_cube_same(cube, cube, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; diff --git a/contrib/dblink/dblink--1.0.sql b/contrib/dblink/dblink--1.0.sql index e9137828f1..4ac5514461 100644 --- a/contrib/dblink/dblink--1.0.sql +++ b/contrib/dblink/dblink--1.0.sql @@ -2,12 +2,12 @@ -- dblink_connect now restricts non-superusers to password -- authenticated connections -CREATE OR REPLACE FUNCTION dblink_connect (text) +CREATE FUNCTION dblink_connect (text) RETURNS text AS 'MODULE_PATHNAME','dblink_connect' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION dblink_connect (text, text) +CREATE FUNCTION dblink_connect (text, text) RETURNS text AS 'MODULE_PATHNAME','dblink_connect' LANGUAGE C STRICT; @@ -15,12 +15,12 @@ LANGUAGE C STRICT; -- dblink_connect_u allows non-superusers to use -- non-password authenticated connections, but initially -- privileges are revoked from public -CREATE OR REPLACE FUNCTION dblink_connect_u (text) +CREATE FUNCTION dblink_connect_u (text) RETURNS text AS 'MODULE_PATHNAME','dblink_connect' LANGUAGE C STRICT SECURITY DEFINER; -CREATE OR REPLACE FUNCTION dblink_connect_u (text, text) +CREATE FUNCTION dblink_connect_u (text, text) RETURNS text AS 'MODULE_PATHNAME','dblink_connect' LANGUAGE C STRICT SECURITY DEFINER; @@ -28,179 +28,179 @@ LANGUAGE C STRICT SECURITY DEFINER; REVOKE ALL ON FUNCTION dblink_connect_u (text) FROM public; REVOKE ALL ON FUNCTION dblink_connect_u (text, text) FROM public; -CREATE OR REPLACE FUNCTION dblink_disconnect () +CREATE FUNCTION dblink_disconnect () RETURNS text AS 'MODULE_PATHNAME','dblink_disconnect' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION dblink_disconnect (text) +CREATE FUNCTION dblink_disconnect (text) RETURNS text AS 'MODULE_PATHNAME','dblink_disconnect' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION dblink_open (text, text) +CREATE FUNCTION dblink_open (text, text) RETURNS text AS 'MODULE_PATHNAME','dblink_open' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION dblink_open (text, text, boolean) +CREATE FUNCTION dblink_open (text, text, boolean) RETURNS text AS 'MODULE_PATHNAME','dblink_open' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION dblink_open (text, text, text) +CREATE FUNCTION dblink_open (text, text, text) RETURNS text AS 'MODULE_PATHNAME','dblink_open' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION dblink_open (text, text, text, boolean) +CREATE FUNCTION dblink_open (text, text, text, boolean) RETURNS text AS 'MODULE_PATHNAME','dblink_open' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION dblink_fetch (text, int) +CREATE FUNCTION dblink_fetch (text, int) RETURNS setof record AS 'MODULE_PATHNAME','dblink_fetch' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION dblink_fetch (text, int, boolean) +CREATE FUNCTION dblink_fetch (text, int, boolean) RETURNS setof record AS 'MODULE_PATHNAME','dblink_fetch' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION dblink_fetch (text, text, int) +CREATE FUNCTION dblink_fetch (text, text, int) RETURNS setof record AS 'MODULE_PATHNAME','dblink_fetch' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION dblink_fetch (text, text, int, boolean) +CREATE FUNCTION dblink_fetch (text, text, int, boolean) RETURNS setof record AS 'MODULE_PATHNAME','dblink_fetch' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION dblink_close (text) +CREATE FUNCTION dblink_close (text) RETURNS text AS 'MODULE_PATHNAME','dblink_close' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION dblink_close (text, boolean) +CREATE FUNCTION dblink_close (text, boolean) RETURNS text AS 'MODULE_PATHNAME','dblink_close' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION dblink_close (text, text) +CREATE FUNCTION dblink_close (text, text) RETURNS text AS 'MODULE_PATHNAME','dblink_close' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION dblink_close (text, text, boolean) +CREATE FUNCTION dblink_close (text, text, boolean) RETURNS text AS 'MODULE_PATHNAME','dblink_close' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION dblink (text, text) +CREATE FUNCTION dblink (text, text) RETURNS setof record AS 'MODULE_PATHNAME','dblink_record' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION dblink (text, text, boolean) +CREATE FUNCTION dblink (text, text, boolean) RETURNS setof record AS 'MODULE_PATHNAME','dblink_record' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION dblink (text) +CREATE FUNCTION dblink (text) RETURNS setof record AS 'MODULE_PATHNAME','dblink_record' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION dblink (text, boolean) +CREATE FUNCTION dblink (text, boolean) RETURNS setof record AS 'MODULE_PATHNAME','dblink_record' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION dblink_exec (text, text) +CREATE FUNCTION dblink_exec (text, text) RETURNS text AS 'MODULE_PATHNAME','dblink_exec' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION dblink_exec (text, text, boolean) +CREATE FUNCTION dblink_exec (text, text, boolean) RETURNS text AS 'MODULE_PATHNAME','dblink_exec' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION dblink_exec (text) +CREATE FUNCTION dblink_exec (text) RETURNS text AS 'MODULE_PATHNAME','dblink_exec' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION dblink_exec (text,boolean) +CREATE FUNCTION dblink_exec (text,boolean) RETURNS text AS 'MODULE_PATHNAME','dblink_exec' LANGUAGE C STRICT; CREATE TYPE dblink_pkey_results AS (position int, colname text); -CREATE OR REPLACE FUNCTION dblink_get_pkey (text) +CREATE FUNCTION dblink_get_pkey (text) RETURNS setof dblink_pkey_results AS 'MODULE_PATHNAME','dblink_get_pkey' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION dblink_build_sql_insert (text, int2vector, int, _text, _text) +CREATE FUNCTION dblink_build_sql_insert (text, int2vector, int, _text, _text) RETURNS text AS 'MODULE_PATHNAME','dblink_build_sql_insert' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION dblink_build_sql_delete (text, int2vector, int, _text) +CREATE FUNCTION dblink_build_sql_delete (text, int2vector, int, _text) RETURNS text AS 'MODULE_PATHNAME','dblink_build_sql_delete' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION dblink_build_sql_update (text, int2vector, int, _text, _text) +CREATE FUNCTION dblink_build_sql_update (text, int2vector, int, _text, _text) RETURNS text AS 'MODULE_PATHNAME','dblink_build_sql_update' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION dblink_current_query () +CREATE FUNCTION dblink_current_query () RETURNS text AS 'MODULE_PATHNAME','dblink_current_query' LANGUAGE C; -CREATE OR REPLACE FUNCTION dblink_send_query(text, text) +CREATE FUNCTION dblink_send_query(text, text) RETURNS int4 AS 'MODULE_PATHNAME', 'dblink_send_query' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION dblink_is_busy(text) +CREATE FUNCTION dblink_is_busy(text) RETURNS int4 AS 'MODULE_PATHNAME', 'dblink_is_busy' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION dblink_get_result(text) +CREATE FUNCTION dblink_get_result(text) RETURNS SETOF record AS 'MODULE_PATHNAME', 'dblink_get_result' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION dblink_get_result(text, bool) +CREATE FUNCTION dblink_get_result(text, bool) RETURNS SETOF record AS 'MODULE_PATHNAME', 'dblink_get_result' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION dblink_get_connections() +CREATE FUNCTION dblink_get_connections() RETURNS text[] AS 'MODULE_PATHNAME', 'dblink_get_connections' LANGUAGE C; -CREATE OR REPLACE FUNCTION dblink_cancel_query(text) +CREATE FUNCTION dblink_cancel_query(text) RETURNS text AS 'MODULE_PATHNAME', 'dblink_cancel_query' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION dblink_error_message(text) +CREATE FUNCTION dblink_error_message(text) RETURNS text AS 'MODULE_PATHNAME', 'dblink_error_message' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION dblink_get_notify( +CREATE FUNCTION dblink_get_notify( OUT notify_name TEXT, OUT be_pid INT4, OUT extra TEXT @@ -209,7 +209,7 @@ RETURNS setof record AS 'MODULE_PATHNAME', 'dblink_get_notify' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION dblink_get_notify( +CREATE FUNCTION dblink_get_notify( conname TEXT, OUT notify_name TEXT, OUT be_pid INT4, diff --git a/contrib/dict_int/dict_int--1.0.sql b/contrib/dict_int/dict_int--1.0.sql index a0e2b9af64..585a56552d 100644 --- a/contrib/dict_int/dict_int--1.0.sql +++ b/contrib/dict_int/dict_int--1.0.sql @@ -1,11 +1,11 @@ /* contrib/dict_int/dict_int--1.0.sql */ -CREATE OR REPLACE FUNCTION dintdict_init(internal) +CREATE FUNCTION dintdict_init(internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION dintdict_lexize(internal, internal, internal, internal) +CREATE FUNCTION dintdict_lexize(internal, internal, internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C STRICT; diff --git a/contrib/dict_xsyn/dict_xsyn--1.0.sql b/contrib/dict_xsyn/dict_xsyn--1.0.sql index 0b6a21730f..30eaff4db5 100644 --- a/contrib/dict_xsyn/dict_xsyn--1.0.sql +++ b/contrib/dict_xsyn/dict_xsyn--1.0.sql @@ -1,11 +1,11 @@ /* contrib/dict_xsyn/dict_xsyn--1.0.sql */ -CREATE OR REPLACE FUNCTION dxsyn_init(internal) +CREATE FUNCTION dxsyn_init(internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION dxsyn_lexize(internal, internal, internal, internal) +CREATE FUNCTION dxsyn_lexize(internal, internal, internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C STRICT; diff --git a/contrib/earthdistance/earthdistance--1.0.sql b/contrib/earthdistance/earthdistance--1.0.sql index 0a2af648de..71e4025f6f 100644 --- a/contrib/earthdistance/earthdistance--1.0.sql +++ b/contrib/earthdistance/earthdistance--1.0.sql @@ -4,7 +4,7 @@ -- place you need to change things for the cube base distance functions -- in order to use different units (or a better value for the Earth's radius). -CREATE OR REPLACE FUNCTION earth() RETURNS float8 +CREATE FUNCTION earth() RETURNS float8 LANGUAGE SQL IMMUTABLE AS 'SELECT ''6378168''::float8'; @@ -13,7 +13,7 @@ AS 'SELECT ''6378168''::float8'; -- uncomment the one below. Note that doing this will break the regression -- tests. -- --- CREATE OR REPLACE FUNCTION earth() RETURNS float8 +-- CREATE FUNCTION earth() RETURNS float8 -- LANGUAGE SQL IMMUTABLE -- AS 'SELECT 180/pi()'; @@ -30,43 +30,43 @@ CREATE DOMAIN earth AS cube CONSTRAINT on_surface check(abs(cube_distance(value, '(0)'::cube) / earth() - 1) < '10e-7'::float8); -CREATE OR REPLACE FUNCTION sec_to_gc(float8) +CREATE FUNCTION sec_to_gc(float8) RETURNS float8 LANGUAGE SQL IMMUTABLE STRICT AS 'SELECT CASE WHEN $1 < 0 THEN 0::float8 WHEN $1/(2*earth()) > 1 THEN pi()*earth() ELSE 2*earth()*asin($1/(2*earth())) END'; -CREATE OR REPLACE FUNCTION gc_to_sec(float8) +CREATE FUNCTION gc_to_sec(float8) RETURNS float8 LANGUAGE SQL IMMUTABLE STRICT AS 'SELECT CASE WHEN $1 < 0 THEN 0::float8 WHEN $1/earth() > pi() THEN 2*earth() ELSE 2*earth()*sin($1/(2*earth())) END'; -CREATE OR REPLACE FUNCTION ll_to_earth(float8, float8) +CREATE FUNCTION ll_to_earth(float8, float8) RETURNS earth LANGUAGE SQL IMMUTABLE STRICT AS 'SELECT cube(cube(cube(earth()*cos(radians($1))*cos(radians($2))),earth()*cos(radians($1))*sin(radians($2))),earth()*sin(radians($1)))::earth'; -CREATE OR REPLACE FUNCTION latitude(earth) +CREATE FUNCTION latitude(earth) RETURNS float8 LANGUAGE SQL IMMUTABLE STRICT AS 'SELECT CASE WHEN cube_ll_coord($1, 3)/earth() < -1 THEN -90::float8 WHEN cube_ll_coord($1, 3)/earth() > 1 THEN 90::float8 ELSE degrees(asin(cube_ll_coord($1, 3)/earth())) END'; -CREATE OR REPLACE FUNCTION longitude(earth) +CREATE FUNCTION longitude(earth) RETURNS float8 LANGUAGE SQL IMMUTABLE STRICT AS 'SELECT degrees(atan2(cube_ll_coord($1, 2), cube_ll_coord($1, 1)))'; -CREATE OR REPLACE FUNCTION earth_distance(earth, earth) +CREATE FUNCTION earth_distance(earth, earth) RETURNS float8 LANGUAGE SQL IMMUTABLE STRICT AS 'SELECT sec_to_gc(cube_distance($1, $2))'; -CREATE OR REPLACE FUNCTION earth_box(earth, float8) +CREATE FUNCTION earth_box(earth, float8) RETURNS cube LANGUAGE SQL IMMUTABLE STRICT @@ -74,7 +74,7 @@ AS 'SELECT cube_enlarge($1, gc_to_sec($2), 3)'; --------------- geo_distance -CREATE OR REPLACE FUNCTION geo_distance (point, point) +CREATE FUNCTION geo_distance (point, point) RETURNS float8 LANGUAGE C IMMUTABLE STRICT AS 'MODULE_PATHNAME'; diff --git a/contrib/fuzzystrmatch/fuzzystrmatch--1.0.sql b/contrib/fuzzystrmatch/fuzzystrmatch--1.0.sql index 1d27f5c3dd..d9b8987adf 100644 --- a/contrib/fuzzystrmatch/fuzzystrmatch--1.0.sql +++ b/contrib/fuzzystrmatch/fuzzystrmatch--1.0.sql @@ -1,41 +1,41 @@ /* contrib/fuzzystrmatch/fuzzystrmatch--1.0.sql */ -CREATE OR REPLACE FUNCTION levenshtein (text,text) RETURNS int +CREATE FUNCTION levenshtein (text,text) RETURNS int AS 'MODULE_PATHNAME','levenshtein' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION levenshtein (text,text,int,int,int) RETURNS int +CREATE FUNCTION levenshtein (text,text,int,int,int) RETURNS int AS 'MODULE_PATHNAME','levenshtein_with_costs' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION levenshtein_less_equal (text,text,int) RETURNS int +CREATE FUNCTION levenshtein_less_equal (text,text,int) RETURNS int AS 'MODULE_PATHNAME','levenshtein_less_equal' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION levenshtein_less_equal (text,text,int,int,int,int) RETURNS int +CREATE FUNCTION levenshtein_less_equal (text,text,int,int,int,int) RETURNS int AS 'MODULE_PATHNAME','levenshtein_less_equal_with_costs' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION metaphone (text,int) RETURNS text +CREATE FUNCTION metaphone (text,int) RETURNS text AS 'MODULE_PATHNAME','metaphone' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION soundex(text) RETURNS text +CREATE FUNCTION soundex(text) RETURNS text AS 'MODULE_PATHNAME', 'soundex' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION text_soundex(text) RETURNS text +CREATE FUNCTION text_soundex(text) RETURNS text AS 'MODULE_PATHNAME', 'soundex' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION difference(text,text) RETURNS int +CREATE FUNCTION difference(text,text) RETURNS int AS 'MODULE_PATHNAME', 'difference' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION dmetaphone (text) RETURNS text +CREATE FUNCTION dmetaphone (text) RETURNS text AS 'MODULE_PATHNAME', 'dmetaphone' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION dmetaphone_alt (text) RETURNS text +CREATE FUNCTION dmetaphone_alt (text) RETURNS text AS 'MODULE_PATHNAME', 'dmetaphone_alt' LANGUAGE C IMMUTABLE STRICT; diff --git a/contrib/hstore/hstore--1.0.sql b/contrib/hstore/hstore--1.0.sql index d77b14286b..247a2773f5 100644 --- a/contrib/hstore/hstore--1.0.sql +++ b/contrib/hstore/hstore--1.0.sql @@ -2,22 +2,22 @@ CREATE TYPE hstore; -CREATE OR REPLACE FUNCTION hstore_in(cstring) +CREATE FUNCTION hstore_in(cstring) RETURNS hstore AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION hstore_out(hstore) +CREATE FUNCTION hstore_out(hstore) RETURNS cstring AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION hstore_recv(internal) +CREATE FUNCTION hstore_recv(internal) RETURNS hstore AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION hstore_send(hstore) +CREATE FUNCTION hstore_send(hstore) RETURNS bytea AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -31,12 +31,12 @@ CREATE TYPE hstore ( STORAGE = extended ); -CREATE OR REPLACE FUNCTION hstore_version_diag(hstore) +CREATE FUNCTION hstore_version_diag(hstore) RETURNS integer AS 'MODULE_PATHNAME','hstore_version_diag' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION fetchval(hstore,text) +CREATE FUNCTION fetchval(hstore,text) RETURNS text AS 'MODULE_PATHNAME','hstore_fetchval' LANGUAGE C STRICT IMMUTABLE; @@ -47,7 +47,7 @@ CREATE OPERATOR -> ( PROCEDURE = fetchval ); -CREATE OR REPLACE FUNCTION slice_array(hstore,text[]) +CREATE FUNCTION slice_array(hstore,text[]) RETURNS text[] AS 'MODULE_PATHNAME','hstore_slice_to_array' LANGUAGE C STRICT IMMUTABLE; @@ -58,17 +58,17 @@ CREATE OPERATOR -> ( PROCEDURE = slice_array ); -CREATE OR REPLACE FUNCTION slice(hstore,text[]) +CREATE FUNCTION slice(hstore,text[]) RETURNS hstore AS 'MODULE_PATHNAME','hstore_slice_to_hstore' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION isexists(hstore,text) +CREATE FUNCTION isexists(hstore,text) RETURNS bool AS 'MODULE_PATHNAME','hstore_exists' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION exist(hstore,text) +CREATE FUNCTION exist(hstore,text) RETURNS bool AS 'MODULE_PATHNAME','hstore_exists' LANGUAGE C STRICT IMMUTABLE; @@ -81,7 +81,7 @@ CREATE OPERATOR ? ( JOIN = contjoinsel ); -CREATE OR REPLACE FUNCTION exists_any(hstore,text[]) +CREATE FUNCTION exists_any(hstore,text[]) RETURNS bool AS 'MODULE_PATHNAME','hstore_exists_any' LANGUAGE C STRICT IMMUTABLE; @@ -94,7 +94,7 @@ CREATE OPERATOR ?| ( JOIN = contjoinsel ); -CREATE OR REPLACE FUNCTION exists_all(hstore,text[]) +CREATE FUNCTION exists_all(hstore,text[]) RETURNS bool AS 'MODULE_PATHNAME','hstore_exists_all' LANGUAGE C STRICT IMMUTABLE; @@ -107,27 +107,27 @@ CREATE OPERATOR ?& ( JOIN = contjoinsel ); -CREATE OR REPLACE FUNCTION isdefined(hstore,text) +CREATE FUNCTION isdefined(hstore,text) RETURNS bool AS 'MODULE_PATHNAME','hstore_defined' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION defined(hstore,text) +CREATE FUNCTION defined(hstore,text) RETURNS bool AS 'MODULE_PATHNAME','hstore_defined' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION delete(hstore,text) +CREATE FUNCTION delete(hstore,text) RETURNS hstore AS 'MODULE_PATHNAME','hstore_delete' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION delete(hstore,text[]) +CREATE FUNCTION delete(hstore,text[]) RETURNS hstore AS 'MODULE_PATHNAME','hstore_delete_array' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION delete(hstore,hstore) +CREATE FUNCTION delete(hstore,hstore) RETURNS hstore AS 'MODULE_PATHNAME','hstore_delete_hstore' LANGUAGE C STRICT IMMUTABLE; @@ -150,7 +150,7 @@ CREATE OPERATOR - ( PROCEDURE = delete ); -CREATE OR REPLACE FUNCTION hs_concat(hstore,hstore) +CREATE FUNCTION hs_concat(hstore,hstore) RETURNS hstore AS 'MODULE_PATHNAME','hstore_concat' LANGUAGE C STRICT IMMUTABLE; @@ -161,12 +161,12 @@ CREATE OPERATOR || ( PROCEDURE = hs_concat ); -CREATE OR REPLACE FUNCTION hs_contains(hstore,hstore) +CREATE FUNCTION hs_contains(hstore,hstore) RETURNS bool AS 'MODULE_PATHNAME','hstore_contains' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION hs_contained(hstore,hstore) +CREATE FUNCTION hs_contained(hstore,hstore) RETURNS bool AS 'MODULE_PATHNAME','hstore_contained' LANGUAGE C STRICT IMMUTABLE; @@ -208,12 +208,12 @@ CREATE OPERATOR ~ ( JOIN = contjoinsel ); -CREATE OR REPLACE FUNCTION tconvert(text,text) +CREATE FUNCTION tconvert(text,text) RETURNS hstore AS 'MODULE_PATHNAME','hstore_from_text' LANGUAGE C IMMUTABLE; -- not STRICT; needs to allow (key,NULL) -CREATE OR REPLACE FUNCTION hstore(text,text) +CREATE FUNCTION hstore(text,text) RETURNS hstore AS 'MODULE_PATHNAME','hstore_from_text' LANGUAGE C IMMUTABLE; -- not STRICT; needs to allow (key,NULL) @@ -224,7 +224,7 @@ CREATE OPERATOR => ( PROCEDURE = hstore ); -CREATE OR REPLACE FUNCTION hstore(text[],text[]) +CREATE FUNCTION hstore(text[],text[]) RETURNS hstore AS 'MODULE_PATHNAME', 'hstore_from_arrays' LANGUAGE C IMMUTABLE; -- not STRICT; allows (keys,null) @@ -237,12 +237,12 @@ LANGUAGE C IMMUTABLE STRICT; CREATE CAST (text[] AS hstore) WITH FUNCTION hstore(text[]); -CREATE OR REPLACE FUNCTION hstore(record) +CREATE FUNCTION hstore(record) RETURNS hstore AS 'MODULE_PATHNAME', 'hstore_from_record' LANGUAGE C IMMUTABLE; -- not STRICT; allows (null::recordtype) -CREATE OR REPLACE FUNCTION hstore_to_array(hstore) +CREATE FUNCTION hstore_to_array(hstore) RETURNS text[] AS 'MODULE_PATHNAME','hstore_to_array' LANGUAGE C STRICT IMMUTABLE; @@ -252,7 +252,7 @@ CREATE OPERATOR %% ( PROCEDURE = hstore_to_array ); -CREATE OR REPLACE FUNCTION hstore_to_matrix(hstore) +CREATE FUNCTION hstore_to_matrix(hstore) RETURNS text[] AS 'MODULE_PATHNAME','hstore_to_matrix' LANGUAGE C STRICT IMMUTABLE; @@ -262,34 +262,34 @@ CREATE OPERATOR %# ( PROCEDURE = hstore_to_matrix ); -CREATE OR REPLACE FUNCTION akeys(hstore) +CREATE FUNCTION akeys(hstore) RETURNS text[] AS 'MODULE_PATHNAME','hstore_akeys' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION avals(hstore) +CREATE FUNCTION avals(hstore) RETURNS text[] AS 'MODULE_PATHNAME','hstore_avals' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION skeys(hstore) +CREATE FUNCTION skeys(hstore) RETURNS setof text AS 'MODULE_PATHNAME','hstore_skeys' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION svals(hstore) +CREATE FUNCTION svals(hstore) RETURNS setof text AS 'MODULE_PATHNAME','hstore_svals' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION each(IN hs hstore, +CREATE FUNCTION each(IN hs hstore, OUT key text, OUT value text) RETURNS SETOF record AS 'MODULE_PATHNAME','hstore_each' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION populate_record(anyelement,hstore) +CREATE FUNCTION populate_record(anyelement,hstore) RETURNS anyelement AS 'MODULE_PATHNAME', 'hstore_populate_record' LANGUAGE C IMMUTABLE; -- not STRICT; allows (null::rectype,hstore) @@ -302,37 +302,37 @@ CREATE OPERATOR #= ( -- btree support -CREATE OR REPLACE FUNCTION hstore_eq(hstore,hstore) +CREATE FUNCTION hstore_eq(hstore,hstore) RETURNS boolean AS 'MODULE_PATHNAME','hstore_eq' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION hstore_ne(hstore,hstore) +CREATE FUNCTION hstore_ne(hstore,hstore) RETURNS boolean AS 'MODULE_PATHNAME','hstore_ne' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION hstore_gt(hstore,hstore) +CREATE FUNCTION hstore_gt(hstore,hstore) RETURNS boolean AS 'MODULE_PATHNAME','hstore_gt' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION hstore_ge(hstore,hstore) +CREATE FUNCTION hstore_ge(hstore,hstore) RETURNS boolean AS 'MODULE_PATHNAME','hstore_ge' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION hstore_lt(hstore,hstore) +CREATE FUNCTION hstore_lt(hstore,hstore) RETURNS boolean AS 'MODULE_PATHNAME','hstore_lt' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION hstore_le(hstore,hstore) +CREATE FUNCTION hstore_le(hstore,hstore) RETURNS boolean AS 'MODULE_PATHNAME','hstore_le' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION hstore_cmp(hstore,hstore) +CREATE FUNCTION hstore_cmp(hstore,hstore) RETURNS integer AS 'MODULE_PATHNAME','hstore_cmp' LANGUAGE C STRICT IMMUTABLE; @@ -411,7 +411,7 @@ AS -- hash support -CREATE OR REPLACE FUNCTION hstore_hash(hstore) +CREATE FUNCTION hstore_hash(hstore) RETURNS integer AS 'MODULE_PATHNAME','hstore_hash' LANGUAGE C STRICT IMMUTABLE; @@ -426,12 +426,12 @@ AS CREATE TYPE ghstore; -CREATE OR REPLACE FUNCTION ghstore_in(cstring) +CREATE FUNCTION ghstore_in(cstring) RETURNS ghstore AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION ghstore_out(ghstore) +CREATE FUNCTION ghstore_out(ghstore) RETURNS cstring AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -442,37 +442,37 @@ CREATE TYPE ghstore ( OUTPUT = ghstore_out ); -CREATE OR REPLACE FUNCTION ghstore_compress(internal) +CREATE FUNCTION ghstore_compress(internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION ghstore_decompress(internal) +CREATE FUNCTION ghstore_decompress(internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION ghstore_penalty(internal,internal,internal) +CREATE FUNCTION ghstore_penalty(internal,internal,internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION ghstore_picksplit(internal, internal) +CREATE FUNCTION ghstore_picksplit(internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION ghstore_union(internal, internal) +CREATE FUNCTION ghstore_union(internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION ghstore_same(internal, internal, internal) +CREATE FUNCTION ghstore_same(internal, internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION ghstore_consistent(internal,internal,int,oid,internal) +CREATE FUNCTION ghstore_consistent(internal,internal,int,oid,internal) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; @@ -498,17 +498,17 @@ AS -- GIN support -CREATE OR REPLACE FUNCTION gin_extract_hstore(internal, internal) +CREATE FUNCTION gin_extract_hstore(internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gin_extract_hstore_query(internal, internal, int2, internal, internal) +CREATE FUNCTION gin_extract_hstore_query(internal, internal, int2, internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gin_consistent_hstore(internal, int2, internal, int4, internal, internal) +CREATE FUNCTION gin_consistent_hstore(internal, int2, internal, int4, internal, internal) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; diff --git a/contrib/intagg/int_aggregate--1.0.sql b/contrib/intagg/int_aggregate--1.0.sql index 3df72c18cf..ce78d17b77 100644 --- a/contrib/intagg/int_aggregate--1.0.sql +++ b/contrib/intagg/int_aggregate--1.0.sql @@ -2,14 +2,14 @@ -- Internal function for the aggregate -- Is called for each item in an aggregation -CREATE OR REPLACE FUNCTION int_agg_state (internal, int4) +CREATE FUNCTION int_agg_state (internal, int4) RETURNS internal AS 'array_agg_transfn' LANGUAGE INTERNAL; -- Internal function for the aggregate -- Is called at the end of the aggregation, and returns an array. -CREATE OR REPLACE FUNCTION int_agg_final_array (internal) +CREATE FUNCTION int_agg_final_array (internal) RETURNS int4[] AS 'array_agg_finalfn' LANGUAGE INTERNAL; @@ -26,7 +26,7 @@ CREATE AGGREGATE int_array_aggregate ( -- The enumeration function -- returns each element in a one dimensional integer array -- as a row. -CREATE OR REPLACE FUNCTION int_array_enum(int4[]) +CREATE FUNCTION int_array_enum(int4[]) RETURNS setof integer AS 'array_unnest' LANGUAGE INTERNAL IMMUTABLE STRICT; diff --git a/contrib/intarray/intarray--1.0.sql b/contrib/intarray/intarray--1.0.sql index 5f86ee607f..3b77c516cb 100644 --- a/contrib/intarray/intarray--1.0.sql +++ b/contrib/intarray/intarray--1.0.sql @@ -5,12 +5,12 @@ -- -- Query type -CREATE OR REPLACE FUNCTION bqarr_in(cstring) +CREATE FUNCTION bqarr_in(cstring) RETURNS query_int AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION bqarr_out(query_int) +CREATE FUNCTION bqarr_out(query_int) RETURNS cstring AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -22,20 +22,20 @@ CREATE TYPE query_int ( ); --only for debug -CREATE OR REPLACE FUNCTION querytree(query_int) +CREATE FUNCTION querytree(query_int) RETURNS text AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION boolop(_int4, query_int) +CREATE FUNCTION boolop(_int4, query_int) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; COMMENT ON FUNCTION boolop(_int4, query_int) IS 'boolean operation with array'; -CREATE OR REPLACE FUNCTION rboolop(query_int, _int4) +CREATE FUNCTION rboolop(query_int, _int4) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -67,35 +67,35 @@ CREATE OPERATOR ~~ ( -- Comparison methods -CREATE OR REPLACE FUNCTION _int_contains(_int4, _int4) +CREATE FUNCTION _int_contains(_int4, _int4) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; COMMENT ON FUNCTION _int_contains(_int4, _int4) IS 'contains'; -CREATE OR REPLACE FUNCTION _int_contained(_int4, _int4) +CREATE FUNCTION _int_contained(_int4, _int4) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; COMMENT ON FUNCTION _int_contained(_int4, _int4) IS 'contained in'; -CREATE OR REPLACE FUNCTION _int_overlap(_int4, _int4) +CREATE FUNCTION _int_overlap(_int4, _int4) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; COMMENT ON FUNCTION _int_overlap(_int4, _int4) IS 'overlaps'; -CREATE OR REPLACE FUNCTION _int_same(_int4, _int4) +CREATE FUNCTION _int_same(_int4, _int4) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; COMMENT ON FUNCTION _int_same(_int4, _int4) IS 'same as'; -CREATE OR REPLACE FUNCTION _int_different(_int4, _int4) +CREATE FUNCTION _int_different(_int4, _int4) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -104,12 +104,12 @@ COMMENT ON FUNCTION _int_different(_int4, _int4) IS 'different'; -- support routines for indexing -CREATE OR REPLACE FUNCTION _int_union(_int4, _int4) +CREATE FUNCTION _int_union(_int4, _int4) RETURNS _int4 AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION _int_inter(_int4, _int4) +CREATE FUNCTION _int_inter(_int4, _int4) RETURNS _int4 AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -187,12 +187,12 @@ CREATE OPERATOR ~ ( ); -------------- -CREATE OR REPLACE FUNCTION intset(int4) +CREATE FUNCTION intset(int4) RETURNS _int4 AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION icount(_int4) +CREATE FUNCTION icount(_int4) RETURNS int4 AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -202,32 +202,32 @@ CREATE OPERATOR # ( PROCEDURE = icount ); -CREATE OR REPLACE FUNCTION sort(_int4, text) +CREATE FUNCTION sort(_int4, text) RETURNS _int4 AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION sort(_int4) +CREATE FUNCTION sort(_int4) RETURNS _int4 AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION sort_asc(_int4) +CREATE FUNCTION sort_asc(_int4) RETURNS _int4 AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION sort_desc(_int4) +CREATE FUNCTION sort_desc(_int4) RETURNS _int4 AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION uniq(_int4) +CREATE FUNCTION uniq(_int4) RETURNS _int4 AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION idx(_int4, int4) +CREATE FUNCTION idx(_int4, int4) RETURNS int4 AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -238,17 +238,17 @@ CREATE OPERATOR # ( PROCEDURE = idx ); -CREATE OR REPLACE FUNCTION subarray(_int4, int4, int4) +CREATE FUNCTION subarray(_int4, int4, int4) RETURNS _int4 AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION subarray(_int4, int4) +CREATE FUNCTION subarray(_int4, int4) RETURNS _int4 AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION intarray_push_elem(_int4, int4) +CREATE FUNCTION intarray_push_elem(_int4, int4) RETURNS _int4 AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -259,7 +259,7 @@ CREATE OPERATOR + ( PROCEDURE = intarray_push_elem ); -CREATE OR REPLACE FUNCTION intarray_push_array(_int4, _int4) +CREATE FUNCTION intarray_push_array(_int4, _int4) RETURNS _int4 AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -271,7 +271,7 @@ CREATE OPERATOR + ( PROCEDURE = intarray_push_array ); -CREATE OR REPLACE FUNCTION intarray_del_elem(_int4, int4) +CREATE FUNCTION intarray_del_elem(_int4, int4) RETURNS _int4 AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -282,7 +282,7 @@ CREATE OPERATOR - ( PROCEDURE = intarray_del_elem ); -CREATE OR REPLACE FUNCTION intset_union_elem(_int4, int4) +CREATE FUNCTION intset_union_elem(_int4, int4) RETURNS _int4 AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -300,7 +300,7 @@ CREATE OPERATOR | ( PROCEDURE = _int_union ); -CREATE OR REPLACE FUNCTION intset_subtract(_int4, _int4) +CREATE FUNCTION intset_subtract(_int4, _int4) RETURNS _int4 AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -320,37 +320,37 @@ CREATE OPERATOR & ( -------------- -- define the GiST support methods -CREATE OR REPLACE FUNCTION g_int_consistent(internal,_int4,int,oid,internal) +CREATE FUNCTION g_int_consistent(internal,_int4,int,oid,internal) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION g_int_compress(internal) +CREATE FUNCTION g_int_compress(internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION g_int_decompress(internal) +CREATE FUNCTION g_int_decompress(internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION g_int_penalty(internal,internal,internal) +CREATE FUNCTION g_int_penalty(internal,internal,internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION g_int_picksplit(internal, internal) +CREATE FUNCTION g_int_picksplit(internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION g_int_union(internal, internal) +CREATE FUNCTION g_int_union(internal, internal) RETURNS _int4 AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION g_int_same(_int4, _int4, internal) +CREATE FUNCTION g_int_same(_int4, _int4, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; @@ -381,12 +381,12 @@ DEFAULT FOR TYPE _int4 USING gist AS --------------------------------------------- -- define the GiST support methods -CREATE OR REPLACE FUNCTION _intbig_in(cstring) +CREATE FUNCTION _intbig_in(cstring) RETURNS intbig_gkey AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION _intbig_out(intbig_gkey) +CREATE FUNCTION _intbig_out(intbig_gkey) RETURNS cstring AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -397,37 +397,37 @@ CREATE TYPE intbig_gkey ( OUTPUT = _intbig_out ); -CREATE OR REPLACE FUNCTION g_intbig_consistent(internal,internal,int,oid,internal) +CREATE FUNCTION g_intbig_consistent(internal,internal,int,oid,internal) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION g_intbig_compress(internal) +CREATE FUNCTION g_intbig_compress(internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION g_intbig_decompress(internal) +CREATE FUNCTION g_intbig_decompress(internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION g_intbig_penalty(internal,internal,internal) +CREATE FUNCTION g_intbig_penalty(internal,internal,internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION g_intbig_picksplit(internal, internal) +CREATE FUNCTION g_intbig_picksplit(internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION g_intbig_union(internal, internal) +CREATE FUNCTION g_intbig_union(internal, internal) RETURNS _int4 AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION g_intbig_same(internal, internal, internal) +CREATE FUNCTION g_intbig_same(internal, internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; @@ -455,12 +455,12 @@ AS --GIN -CREATE OR REPLACE FUNCTION ginint4_queryextract(internal, internal, int2, internal, internal, internal, internal) +CREATE FUNCTION ginint4_queryextract(internal, internal, int2, internal, internal, internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION ginint4_consistent(internal, int2, internal, int4, internal, internal, internal, internal) +CREATE FUNCTION ginint4_consistent(internal, int2, internal, int4, internal, internal, internal, internal) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; diff --git a/contrib/isn/isn--1.0.sql b/contrib/isn/isn--1.0.sql index a6499f267a..336ad1db3c 100644 --- a/contrib/isn/isn--1.0.sql +++ b/contrib/isn/isn--1.0.sql @@ -12,12 +12,12 @@ -- Input and output functions and data types: -- --------------------------------------------------- -CREATE OR REPLACE FUNCTION ean13_in(cstring) +CREATE FUNCTION ean13_in(cstring) RETURNS ean13 AS 'MODULE_PATHNAME' LANGUAGE 'C' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION ean13_out(ean13) +CREATE FUNCTION ean13_out(ean13) RETURNS cstring AS 'MODULE_PATHNAME' LANGUAGE 'C' @@ -30,12 +30,12 @@ CREATE TYPE ean13 ( COMMENT ON TYPE ean13 IS 'International European Article Number (EAN13)'; -CREATE OR REPLACE FUNCTION isbn13_in(cstring) +CREATE FUNCTION isbn13_in(cstring) RETURNS isbn13 AS 'MODULE_PATHNAME', 'isbn_in' LANGUAGE 'C' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION ean13_out(isbn13) +CREATE FUNCTION ean13_out(isbn13) RETURNS cstring AS 'MODULE_PATHNAME' LANGUAGE 'C' @@ -48,12 +48,12 @@ CREATE TYPE isbn13 ( COMMENT ON TYPE isbn13 IS 'International Standard Book Number 13 (ISBN13)'; -CREATE OR REPLACE FUNCTION ismn13_in(cstring) +CREATE FUNCTION ismn13_in(cstring) RETURNS ismn13 AS 'MODULE_PATHNAME', 'ismn_in' LANGUAGE 'C' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION ean13_out(ismn13) +CREATE FUNCTION ean13_out(ismn13) RETURNS cstring AS 'MODULE_PATHNAME' LANGUAGE 'C' @@ -66,12 +66,12 @@ CREATE TYPE ismn13 ( COMMENT ON TYPE ismn13 IS 'International Standard Music Number 13 (ISMN13)'; -CREATE OR REPLACE FUNCTION issn13_in(cstring) +CREATE FUNCTION issn13_in(cstring) RETURNS issn13 AS 'MODULE_PATHNAME', 'issn_in' LANGUAGE 'C' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION ean13_out(issn13) +CREATE FUNCTION ean13_out(issn13) RETURNS cstring AS 'MODULE_PATHNAME' LANGUAGE 'C' @@ -86,12 +86,12 @@ COMMENT ON TYPE issn13 -- Short format: -CREATE OR REPLACE FUNCTION isbn_in(cstring) +CREATE FUNCTION isbn_in(cstring) RETURNS isbn AS 'MODULE_PATHNAME' LANGUAGE 'C' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isn_out(isbn) +CREATE FUNCTION isn_out(isbn) RETURNS cstring AS 'MODULE_PATHNAME' LANGUAGE 'C' @@ -104,12 +104,12 @@ CREATE TYPE isbn ( COMMENT ON TYPE isbn IS 'International Standard Book Number (ISBN)'; -CREATE OR REPLACE FUNCTION ismn_in(cstring) +CREATE FUNCTION ismn_in(cstring) RETURNS ismn AS 'MODULE_PATHNAME' LANGUAGE 'C' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isn_out(ismn) +CREATE FUNCTION isn_out(ismn) RETURNS cstring AS 'MODULE_PATHNAME' LANGUAGE 'C' @@ -122,12 +122,12 @@ CREATE TYPE ismn ( COMMENT ON TYPE ismn IS 'International Standard Music Number (ISMN)'; -CREATE OR REPLACE FUNCTION issn_in(cstring) +CREATE FUNCTION issn_in(cstring) RETURNS issn AS 'MODULE_PATHNAME' LANGUAGE 'C' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isn_out(issn) +CREATE FUNCTION isn_out(issn) RETURNS cstring AS 'MODULE_PATHNAME' LANGUAGE 'C' @@ -140,12 +140,12 @@ CREATE TYPE issn ( COMMENT ON TYPE issn IS 'International Standard Serial Number (ISSN)'; -CREATE OR REPLACE FUNCTION upc_in(cstring) +CREATE FUNCTION upc_in(cstring) RETURNS upc AS 'MODULE_PATHNAME' LANGUAGE 'C' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isn_out(upc) +CREATE FUNCTION isn_out(upc) RETURNS cstring AS 'MODULE_PATHNAME' LANGUAGE 'C' @@ -163,249 +163,249 @@ COMMENT ON TYPE upc -- --------------------------------------------------- -- EAN13: -CREATE OR REPLACE FUNCTION isnlt(ean13, ean13) +CREATE FUNCTION isnlt(ean13, ean13) RETURNS boolean AS 'int8lt' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnle(ean13, ean13) +CREATE FUNCTION isnle(ean13, ean13) RETURNS boolean AS 'int8le' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isneq(ean13, ean13) +CREATE FUNCTION isneq(ean13, ean13) RETURNS boolean AS 'int8eq' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnge(ean13, ean13) +CREATE FUNCTION isnge(ean13, ean13) RETURNS boolean AS 'int8ge' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isngt(ean13, ean13) +CREATE FUNCTION isngt(ean13, ean13) RETURNS boolean AS 'int8gt' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnne(ean13, ean13) +CREATE FUNCTION isnne(ean13, ean13) RETURNS boolean AS 'int8ne' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnlt(ean13, isbn13) +CREATE FUNCTION isnlt(ean13, isbn13) RETURNS boolean AS 'int8lt' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnle(ean13, isbn13) +CREATE FUNCTION isnle(ean13, isbn13) RETURNS boolean AS 'int8le' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isneq(ean13, isbn13) +CREATE FUNCTION isneq(ean13, isbn13) RETURNS boolean AS 'int8eq' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnge(ean13, isbn13) +CREATE FUNCTION isnge(ean13, isbn13) RETURNS boolean AS 'int8ge' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isngt(ean13, isbn13) +CREATE FUNCTION isngt(ean13, isbn13) RETURNS boolean AS 'int8gt' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnne(ean13, isbn13) +CREATE FUNCTION isnne(ean13, isbn13) RETURNS boolean AS 'int8ne' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnlt(ean13, ismn13) +CREATE FUNCTION isnlt(ean13, ismn13) RETURNS boolean AS 'int8lt' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnle(ean13, ismn13) +CREATE FUNCTION isnle(ean13, ismn13) RETURNS boolean AS 'int8le' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isneq(ean13, ismn13) +CREATE FUNCTION isneq(ean13, ismn13) RETURNS boolean AS 'int8eq' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnge(ean13, ismn13) +CREATE FUNCTION isnge(ean13, ismn13) RETURNS boolean AS 'int8ge' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isngt(ean13, ismn13) +CREATE FUNCTION isngt(ean13, ismn13) RETURNS boolean AS 'int8gt' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnne(ean13, ismn13) +CREATE FUNCTION isnne(ean13, ismn13) RETURNS boolean AS 'int8ne' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnlt(ean13, issn13) +CREATE FUNCTION isnlt(ean13, issn13) RETURNS boolean AS 'int8lt' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnle(ean13, issn13) +CREATE FUNCTION isnle(ean13, issn13) RETURNS boolean AS 'int8le' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isneq(ean13, issn13) +CREATE FUNCTION isneq(ean13, issn13) RETURNS boolean AS 'int8eq' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnge(ean13, issn13) +CREATE FUNCTION isnge(ean13, issn13) RETURNS boolean AS 'int8ge' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isngt(ean13, issn13) +CREATE FUNCTION isngt(ean13, issn13) RETURNS boolean AS 'int8gt' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnne(ean13, issn13) +CREATE FUNCTION isnne(ean13, issn13) RETURNS boolean AS 'int8ne' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnlt(ean13, isbn) +CREATE FUNCTION isnlt(ean13, isbn) RETURNS boolean AS 'int8lt' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnle(ean13, isbn) +CREATE FUNCTION isnle(ean13, isbn) RETURNS boolean AS 'int8le' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isneq(ean13, isbn) +CREATE FUNCTION isneq(ean13, isbn) RETURNS boolean AS 'int8eq' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnge(ean13, isbn) +CREATE FUNCTION isnge(ean13, isbn) RETURNS boolean AS 'int8ge' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isngt(ean13, isbn) +CREATE FUNCTION isngt(ean13, isbn) RETURNS boolean AS 'int8gt' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnne(ean13, isbn) +CREATE FUNCTION isnne(ean13, isbn) RETURNS boolean AS 'int8ne' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnlt(ean13, ismn) +CREATE FUNCTION isnlt(ean13, ismn) RETURNS boolean AS 'int8lt' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnle(ean13, ismn) +CREATE FUNCTION isnle(ean13, ismn) RETURNS boolean AS 'int8le' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isneq(ean13, ismn) +CREATE FUNCTION isneq(ean13, ismn) RETURNS boolean AS 'int8eq' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnge(ean13, ismn) +CREATE FUNCTION isnge(ean13, ismn) RETURNS boolean AS 'int8ge' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isngt(ean13, ismn) +CREATE FUNCTION isngt(ean13, ismn) RETURNS boolean AS 'int8gt' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnne(ean13, ismn) +CREATE FUNCTION isnne(ean13, ismn) RETURNS boolean AS 'int8ne' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnlt(ean13, issn) +CREATE FUNCTION isnlt(ean13, issn) RETURNS boolean AS 'int8lt' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnle(ean13, issn) +CREATE FUNCTION isnle(ean13, issn) RETURNS boolean AS 'int8le' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isneq(ean13, issn) +CREATE FUNCTION isneq(ean13, issn) RETURNS boolean AS 'int8eq' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnge(ean13, issn) +CREATE FUNCTION isnge(ean13, issn) RETURNS boolean AS 'int8ge' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isngt(ean13, issn) +CREATE FUNCTION isngt(ean13, issn) RETURNS boolean AS 'int8gt' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnne(ean13, issn) +CREATE FUNCTION isnne(ean13, issn) RETURNS boolean AS 'int8ne' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnlt(ean13, upc) +CREATE FUNCTION isnlt(ean13, upc) RETURNS boolean AS 'int8lt' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnle(ean13, upc) +CREATE FUNCTION isnle(ean13, upc) RETURNS boolean AS 'int8le' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isneq(ean13, upc) +CREATE FUNCTION isneq(ean13, upc) RETURNS boolean AS 'int8eq' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnge(ean13, upc) +CREATE FUNCTION isnge(ean13, upc) RETURNS boolean AS 'int8ge' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isngt(ean13, upc) +CREATE FUNCTION isngt(ean13, upc) RETURNS boolean AS 'int8gt' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnne(ean13, upc) +CREATE FUNCTION isnne(ean13, upc) RETURNS boolean AS 'int8ne' LANGUAGE 'internal' @@ -413,94 +413,94 @@ CREATE OR REPLACE FUNCTION isnne(ean13, upc) --------------------------------------------------- -- ISBN13: -CREATE OR REPLACE FUNCTION isnlt(isbn13, isbn13) +CREATE FUNCTION isnlt(isbn13, isbn13) RETURNS boolean AS 'int8lt' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnle(isbn13, isbn13) +CREATE FUNCTION isnle(isbn13, isbn13) RETURNS boolean AS 'int8le' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isneq(isbn13, isbn13) +CREATE FUNCTION isneq(isbn13, isbn13) RETURNS boolean AS 'int8eq' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnge(isbn13, isbn13) +CREATE FUNCTION isnge(isbn13, isbn13) RETURNS boolean AS 'int8ge' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isngt(isbn13, isbn13) +CREATE FUNCTION isngt(isbn13, isbn13) RETURNS boolean AS 'int8gt' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnne(isbn13, isbn13) +CREATE FUNCTION isnne(isbn13, isbn13) RETURNS boolean AS 'int8ne' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnlt(isbn13, isbn) +CREATE FUNCTION isnlt(isbn13, isbn) RETURNS boolean AS 'int8lt' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnle(isbn13, isbn) +CREATE FUNCTION isnle(isbn13, isbn) RETURNS boolean AS 'int8le' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isneq(isbn13, isbn) +CREATE FUNCTION isneq(isbn13, isbn) RETURNS boolean AS 'int8eq' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnge(isbn13, isbn) +CREATE FUNCTION isnge(isbn13, isbn) RETURNS boolean AS 'int8ge' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isngt(isbn13, isbn) +CREATE FUNCTION isngt(isbn13, isbn) RETURNS boolean AS 'int8gt' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnne(isbn13, isbn) +CREATE FUNCTION isnne(isbn13, isbn) RETURNS boolean AS 'int8ne' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnlt(isbn13, ean13) +CREATE FUNCTION isnlt(isbn13, ean13) RETURNS boolean AS 'int8lt' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnle(isbn13, ean13) +CREATE FUNCTION isnle(isbn13, ean13) RETURNS boolean AS 'int8le' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isneq(isbn13, ean13) +CREATE FUNCTION isneq(isbn13, ean13) RETURNS boolean AS 'int8eq' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnge(isbn13, ean13) +CREATE FUNCTION isnge(isbn13, ean13) RETURNS boolean AS 'int8ge' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isngt(isbn13, ean13) +CREATE FUNCTION isngt(isbn13, ean13) RETURNS boolean AS 'int8gt' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnne(isbn13, ean13) +CREATE FUNCTION isnne(isbn13, ean13) RETURNS boolean AS 'int8ne' LANGUAGE 'internal' @@ -508,94 +508,94 @@ CREATE OR REPLACE FUNCTION isnne(isbn13, ean13) --------------------------------------------------- -- ISBN: -CREATE OR REPLACE FUNCTION isnlt(isbn, isbn) +CREATE FUNCTION isnlt(isbn, isbn) RETURNS boolean AS 'int8lt' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnle(isbn, isbn) +CREATE FUNCTION isnle(isbn, isbn) RETURNS boolean AS 'int8le' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isneq(isbn, isbn) +CREATE FUNCTION isneq(isbn, isbn) RETURNS boolean AS 'int8eq' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnge(isbn, isbn) +CREATE FUNCTION isnge(isbn, isbn) RETURNS boolean AS 'int8ge' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isngt(isbn, isbn) +CREATE FUNCTION isngt(isbn, isbn) RETURNS boolean AS 'int8gt' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnne(isbn, isbn) +CREATE FUNCTION isnne(isbn, isbn) RETURNS boolean AS 'int8ne' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnlt(isbn, isbn13) +CREATE FUNCTION isnlt(isbn, isbn13) RETURNS boolean AS 'int8lt' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnle(isbn, isbn13) +CREATE FUNCTION isnle(isbn, isbn13) RETURNS boolean AS 'int8le' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isneq(isbn, isbn13) +CREATE FUNCTION isneq(isbn, isbn13) RETURNS boolean AS 'int8eq' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnge(isbn, isbn13) +CREATE FUNCTION isnge(isbn, isbn13) RETURNS boolean AS 'int8ge' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isngt(isbn, isbn13) +CREATE FUNCTION isngt(isbn, isbn13) RETURNS boolean AS 'int8gt' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnne(isbn, isbn13) +CREATE FUNCTION isnne(isbn, isbn13) RETURNS boolean AS 'int8ne' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnlt(isbn, ean13) +CREATE FUNCTION isnlt(isbn, ean13) RETURNS boolean AS 'int8lt' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnle(isbn, ean13) +CREATE FUNCTION isnle(isbn, ean13) RETURNS boolean AS 'int8le' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isneq(isbn, ean13) +CREATE FUNCTION isneq(isbn, ean13) RETURNS boolean AS 'int8eq' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnge(isbn, ean13) +CREATE FUNCTION isnge(isbn, ean13) RETURNS boolean AS 'int8ge' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isngt(isbn, ean13) +CREATE FUNCTION isngt(isbn, ean13) RETURNS boolean AS 'int8gt' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnne(isbn, ean13) +CREATE FUNCTION isnne(isbn, ean13) RETURNS boolean AS 'int8ne' LANGUAGE 'internal' @@ -603,94 +603,94 @@ CREATE OR REPLACE FUNCTION isnne(isbn, ean13) --------------------------------------------------- -- ISMN13: -CREATE OR REPLACE FUNCTION isnlt(ismn13, ismn13) +CREATE FUNCTION isnlt(ismn13, ismn13) RETURNS boolean AS 'int8lt' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnle(ismn13, ismn13) +CREATE FUNCTION isnle(ismn13, ismn13) RETURNS boolean AS 'int8le' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isneq(ismn13, ismn13) +CREATE FUNCTION isneq(ismn13, ismn13) RETURNS boolean AS 'int8eq' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnge(ismn13, ismn13) +CREATE FUNCTION isnge(ismn13, ismn13) RETURNS boolean AS 'int8ge' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isngt(ismn13, ismn13) +CREATE FUNCTION isngt(ismn13, ismn13) RETURNS boolean AS 'int8gt' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnne(ismn13, ismn13) +CREATE FUNCTION isnne(ismn13, ismn13) RETURNS boolean AS 'int8ne' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnlt(ismn13, ismn) +CREATE FUNCTION isnlt(ismn13, ismn) RETURNS boolean AS 'int8lt' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnle(ismn13, ismn) +CREATE FUNCTION isnle(ismn13, ismn) RETURNS boolean AS 'int8le' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isneq(ismn13, ismn) +CREATE FUNCTION isneq(ismn13, ismn) RETURNS boolean AS 'int8eq' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnge(ismn13, ismn) +CREATE FUNCTION isnge(ismn13, ismn) RETURNS boolean AS 'int8ge' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isngt(ismn13, ismn) +CREATE FUNCTION isngt(ismn13, ismn) RETURNS boolean AS 'int8gt' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnne(ismn13, ismn) +CREATE FUNCTION isnne(ismn13, ismn) RETURNS boolean AS 'int8ne' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnlt(ismn13, ean13) +CREATE FUNCTION isnlt(ismn13, ean13) RETURNS boolean AS 'int8lt' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnle(ismn13, ean13) +CREATE FUNCTION isnle(ismn13, ean13) RETURNS boolean AS 'int8le' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isneq(ismn13, ean13) +CREATE FUNCTION isneq(ismn13, ean13) RETURNS boolean AS 'int8eq' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnge(ismn13, ean13) +CREATE FUNCTION isnge(ismn13, ean13) RETURNS boolean AS 'int8ge' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isngt(ismn13, ean13) +CREATE FUNCTION isngt(ismn13, ean13) RETURNS boolean AS 'int8gt' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnne(ismn13, ean13) +CREATE FUNCTION isnne(ismn13, ean13) RETURNS boolean AS 'int8ne' LANGUAGE 'internal' @@ -698,94 +698,94 @@ CREATE OR REPLACE FUNCTION isnne(ismn13, ean13) --------------------------------------------------- -- ISMN: -CREATE OR REPLACE FUNCTION isnlt(ismn, ismn) +CREATE FUNCTION isnlt(ismn, ismn) RETURNS boolean AS 'int8lt' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnle(ismn, ismn) +CREATE FUNCTION isnle(ismn, ismn) RETURNS boolean AS 'int8le' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isneq(ismn, ismn) +CREATE FUNCTION isneq(ismn, ismn) RETURNS boolean AS 'int8eq' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnge(ismn, ismn) +CREATE FUNCTION isnge(ismn, ismn) RETURNS boolean AS 'int8ge' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isngt(ismn, ismn) +CREATE FUNCTION isngt(ismn, ismn) RETURNS boolean AS 'int8gt' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnne(ismn, ismn) +CREATE FUNCTION isnne(ismn, ismn) RETURNS boolean AS 'int8ne' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnlt(ismn, ismn13) +CREATE FUNCTION isnlt(ismn, ismn13) RETURNS boolean AS 'int8lt' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnle(ismn, ismn13) +CREATE FUNCTION isnle(ismn, ismn13) RETURNS boolean AS 'int8le' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isneq(ismn, ismn13) +CREATE FUNCTION isneq(ismn, ismn13) RETURNS boolean AS 'int8eq' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnge(ismn, ismn13) +CREATE FUNCTION isnge(ismn, ismn13) RETURNS boolean AS 'int8ge' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isngt(ismn, ismn13) +CREATE FUNCTION isngt(ismn, ismn13) RETURNS boolean AS 'int8gt' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnne(ismn, ismn13) +CREATE FUNCTION isnne(ismn, ismn13) RETURNS boolean AS 'int8ne' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnlt(ismn, ean13) +CREATE FUNCTION isnlt(ismn, ean13) RETURNS boolean AS 'int8lt' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnle(ismn, ean13) +CREATE FUNCTION isnle(ismn, ean13) RETURNS boolean AS 'int8le' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isneq(ismn, ean13) +CREATE FUNCTION isneq(ismn, ean13) RETURNS boolean AS 'int8eq' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnge(ismn, ean13) +CREATE FUNCTION isnge(ismn, ean13) RETURNS boolean AS 'int8ge' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isngt(ismn, ean13) +CREATE FUNCTION isngt(ismn, ean13) RETURNS boolean AS 'int8gt' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnne(ismn, ean13) +CREATE FUNCTION isnne(ismn, ean13) RETURNS boolean AS 'int8ne' LANGUAGE 'internal' @@ -793,94 +793,94 @@ CREATE OR REPLACE FUNCTION isnne(ismn, ean13) --------------------------------------------------- -- ISSN13: -CREATE OR REPLACE FUNCTION isnlt(issn13, issn13) +CREATE FUNCTION isnlt(issn13, issn13) RETURNS boolean AS 'int8lt' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnle(issn13, issn13) +CREATE FUNCTION isnle(issn13, issn13) RETURNS boolean AS 'int8le' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isneq(issn13, issn13) +CREATE FUNCTION isneq(issn13, issn13) RETURNS boolean AS 'int8eq' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnge(issn13, issn13) +CREATE FUNCTION isnge(issn13, issn13) RETURNS boolean AS 'int8ge' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isngt(issn13, issn13) +CREATE FUNCTION isngt(issn13, issn13) RETURNS boolean AS 'int8gt' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnne(issn13, issn13) +CREATE FUNCTION isnne(issn13, issn13) RETURNS boolean AS 'int8ne' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnlt(issn13, issn) +CREATE FUNCTION isnlt(issn13, issn) RETURNS boolean AS 'int8lt' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnle(issn13, issn) +CREATE FUNCTION isnle(issn13, issn) RETURNS boolean AS 'int8le' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isneq(issn13, issn) +CREATE FUNCTION isneq(issn13, issn) RETURNS boolean AS 'int8eq' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnge(issn13, issn) +CREATE FUNCTION isnge(issn13, issn) RETURNS boolean AS 'int8ge' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isngt(issn13, issn) +CREATE FUNCTION isngt(issn13, issn) RETURNS boolean AS 'int8gt' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnne(issn13, issn) +CREATE FUNCTION isnne(issn13, issn) RETURNS boolean AS 'int8ne' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnlt(issn13, ean13) +CREATE FUNCTION isnlt(issn13, ean13) RETURNS boolean AS 'int8lt' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnle(issn13, ean13) +CREATE FUNCTION isnle(issn13, ean13) RETURNS boolean AS 'int8le' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isneq(issn13, ean13) +CREATE FUNCTION isneq(issn13, ean13) RETURNS boolean AS 'int8eq' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnge(issn13, ean13) +CREATE FUNCTION isnge(issn13, ean13) RETURNS boolean AS 'int8ge' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isngt(issn13, ean13) +CREATE FUNCTION isngt(issn13, ean13) RETURNS boolean AS 'int8gt' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnne(issn13, ean13) +CREATE FUNCTION isnne(issn13, ean13) RETURNS boolean AS 'int8ne' LANGUAGE 'internal' @@ -888,94 +888,94 @@ CREATE OR REPLACE FUNCTION isnne(issn13, ean13) --------------------------------------------------- -- ISSN: -CREATE OR REPLACE FUNCTION isnlt(issn, issn) +CREATE FUNCTION isnlt(issn, issn) RETURNS boolean AS 'int8lt' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnle(issn, issn) +CREATE FUNCTION isnle(issn, issn) RETURNS boolean AS 'int8le' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isneq(issn, issn) +CREATE FUNCTION isneq(issn, issn) RETURNS boolean AS 'int8eq' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnge(issn, issn) +CREATE FUNCTION isnge(issn, issn) RETURNS boolean AS 'int8ge' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isngt(issn, issn) +CREATE FUNCTION isngt(issn, issn) RETURNS boolean AS 'int8gt' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnne(issn, issn) +CREATE FUNCTION isnne(issn, issn) RETURNS boolean AS 'int8ne' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnlt(issn, issn13) +CREATE FUNCTION isnlt(issn, issn13) RETURNS boolean AS 'int8lt' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnle(issn, issn13) +CREATE FUNCTION isnle(issn, issn13) RETURNS boolean AS 'int8le' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isneq(issn, issn13) +CREATE FUNCTION isneq(issn, issn13) RETURNS boolean AS 'int8eq' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnge(issn, issn13) +CREATE FUNCTION isnge(issn, issn13) RETURNS boolean AS 'int8ge' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isngt(issn, issn13) +CREATE FUNCTION isngt(issn, issn13) RETURNS boolean AS 'int8gt' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnne(issn, issn13) +CREATE FUNCTION isnne(issn, issn13) RETURNS boolean AS 'int8ne' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnlt(issn, ean13) +CREATE FUNCTION isnlt(issn, ean13) RETURNS boolean AS 'int8lt' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnle(issn, ean13) +CREATE FUNCTION isnle(issn, ean13) RETURNS boolean AS 'int8le' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isneq(issn, ean13) +CREATE FUNCTION isneq(issn, ean13) RETURNS boolean AS 'int8eq' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnge(issn, ean13) +CREATE FUNCTION isnge(issn, ean13) RETURNS boolean AS 'int8ge' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isngt(issn, ean13) +CREATE FUNCTION isngt(issn, ean13) RETURNS boolean AS 'int8gt' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnne(issn, ean13) +CREATE FUNCTION isnne(issn, ean13) RETURNS boolean AS 'int8ne' LANGUAGE 'internal' @@ -983,63 +983,63 @@ CREATE OR REPLACE FUNCTION isnne(issn, ean13) --------------------------------------------------- -- UPC: -CREATE OR REPLACE FUNCTION isnlt(upc, upc) +CREATE FUNCTION isnlt(upc, upc) RETURNS boolean AS 'int8lt' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnle(upc, upc) +CREATE FUNCTION isnle(upc, upc) RETURNS boolean AS 'int8le' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isneq(upc, upc) +CREATE FUNCTION isneq(upc, upc) RETURNS boolean AS 'int8eq' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnge(upc, upc) +CREATE FUNCTION isnge(upc, upc) RETURNS boolean AS 'int8ge' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isngt(upc, upc) +CREATE FUNCTION isngt(upc, upc) RETURNS boolean AS 'int8gt' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnne(upc, upc) +CREATE FUNCTION isnne(upc, upc) RETURNS boolean AS 'int8ne' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnlt(upc, ean13) +CREATE FUNCTION isnlt(upc, ean13) RETURNS boolean AS 'int8lt' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnle(upc, ean13) +CREATE FUNCTION isnle(upc, ean13) RETURNS boolean AS 'int8le' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isneq(upc, ean13) +CREATE FUNCTION isneq(upc, ean13) RETURNS boolean AS 'int8eq' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnge(upc, ean13) +CREATE FUNCTION isnge(upc, ean13) RETURNS boolean AS 'int8ge' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isngt(upc, ean13) +CREATE FUNCTION isngt(upc, ean13) RETURNS boolean AS 'int8gt' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isnne(upc, ean13) +CREATE FUNCTION isnne(upc, ean13) RETURNS boolean AS 'int8ne' LANGUAGE 'internal' @@ -2522,7 +2522,7 @@ CREATE OPERATOR FAMILY isn_ops USING hash; -- --------------------------------------------------- -- EAN13: -CREATE OR REPLACE FUNCTION btean13cmp(ean13, ean13) +CREATE FUNCTION btean13cmp(ean13, ean13) RETURNS int4 AS 'btint8cmp' LANGUAGE 'internal' @@ -2537,7 +2537,7 @@ CREATE OPERATOR CLASS ean13_ops DEFAULT OPERATOR 5 >, FUNCTION 1 btean13cmp(ean13, ean13); -CREATE OR REPLACE FUNCTION hashean13(ean13) +CREATE FUNCTION hashean13(ean13) RETURNS int4 AS 'hashint8' LANGUAGE 'internal' IMMUTABLE STRICT; @@ -2548,37 +2548,37 @@ CREATE OPERATOR CLASS ean13_ops DEFAULT FUNCTION 1 hashean13(ean13); -- EAN13 vs other types: -CREATE OR REPLACE FUNCTION btean13cmp(ean13, isbn13) +CREATE FUNCTION btean13cmp(ean13, isbn13) RETURNS int4 AS 'btint8cmp' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION btean13cmp(ean13, ismn13) +CREATE FUNCTION btean13cmp(ean13, ismn13) RETURNS int4 AS 'btint8cmp' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION btean13cmp(ean13, issn13) +CREATE FUNCTION btean13cmp(ean13, issn13) RETURNS int4 AS 'btint8cmp' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION btean13cmp(ean13, isbn) +CREATE FUNCTION btean13cmp(ean13, isbn) RETURNS int4 AS 'btint8cmp' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION btean13cmp(ean13, ismn) +CREATE FUNCTION btean13cmp(ean13, ismn) RETURNS int4 AS 'btint8cmp' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION btean13cmp(ean13, issn) +CREATE FUNCTION btean13cmp(ean13, issn) RETURNS int4 AS 'btint8cmp' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION btean13cmp(ean13, upc) +CREATE FUNCTION btean13cmp(ean13, upc) RETURNS int4 AS 'btint8cmp' LANGUAGE 'internal' @@ -2639,7 +2639,7 @@ ALTER OPERATOR FAMILY isn_ops USING hash ADD --------------------------------------------------- -- ISBN13: -CREATE OR REPLACE FUNCTION btisbn13cmp(isbn13, isbn13) +CREATE FUNCTION btisbn13cmp(isbn13, isbn13) RETURNS int4 AS 'btint8cmp' LANGUAGE 'internal' @@ -2654,7 +2654,7 @@ CREATE OPERATOR CLASS isbn13_ops DEFAULT OPERATOR 5 >, FUNCTION 1 btisbn13cmp(isbn13, isbn13); -CREATE OR REPLACE FUNCTION hashisbn13(isbn13) +CREATE FUNCTION hashisbn13(isbn13) RETURNS int4 AS 'hashint8' LANGUAGE 'internal' @@ -2666,12 +2666,12 @@ CREATE OPERATOR CLASS isbn13_ops DEFAULT FUNCTION 1 hashisbn13(isbn13); -- ISBN13 vs other types: -CREATE OR REPLACE FUNCTION btisbn13cmp(isbn13, ean13) +CREATE FUNCTION btisbn13cmp(isbn13, ean13) RETURNS int4 AS 'btint8cmp' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION btisbn13cmp(isbn13, isbn) +CREATE FUNCTION btisbn13cmp(isbn13, isbn) RETURNS int4 AS 'btint8cmp' LANGUAGE 'internal' @@ -2697,7 +2697,7 @@ ALTER OPERATOR FAMILY isn_ops USING hash ADD --------------------------------------------------- -- ISBN: -CREATE OR REPLACE FUNCTION btisbncmp(isbn, isbn) +CREATE FUNCTION btisbncmp(isbn, isbn) RETURNS int4 AS 'btint8cmp' LANGUAGE 'internal' @@ -2712,7 +2712,7 @@ CREATE OPERATOR CLASS isbn_ops DEFAULT OPERATOR 5 >, FUNCTION 1 btisbncmp(isbn, isbn); -CREATE OR REPLACE FUNCTION hashisbn(isbn) +CREATE FUNCTION hashisbn(isbn) RETURNS int4 AS 'hashint8' LANGUAGE 'internal' @@ -2724,12 +2724,12 @@ CREATE OPERATOR CLASS isbn_ops DEFAULT FUNCTION 1 hashisbn(isbn); -- ISBN vs other types: -CREATE OR REPLACE FUNCTION btisbncmp(isbn, ean13) +CREATE FUNCTION btisbncmp(isbn, ean13) RETURNS int4 AS 'btint8cmp' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION btisbncmp(isbn, isbn13) +CREATE FUNCTION btisbncmp(isbn, isbn13) RETURNS int4 AS 'btint8cmp' LANGUAGE 'internal' @@ -2755,7 +2755,7 @@ ALTER OPERATOR FAMILY isn_ops USING hash ADD --------------------------------------------------- -- ISMN13: -CREATE OR REPLACE FUNCTION btismn13cmp(ismn13, ismn13) +CREATE FUNCTION btismn13cmp(ismn13, ismn13) RETURNS int4 AS 'btint8cmp' LANGUAGE 'internal' @@ -2770,7 +2770,7 @@ CREATE OPERATOR CLASS ismn13_ops DEFAULT OPERATOR 5 >, FUNCTION 1 btismn13cmp(ismn13, ismn13); -CREATE OR REPLACE FUNCTION hashismn13(ismn13) +CREATE FUNCTION hashismn13(ismn13) RETURNS int4 AS 'hashint8' LANGUAGE 'internal' @@ -2782,12 +2782,12 @@ CREATE OPERATOR CLASS ismn13_ops DEFAULT FUNCTION 1 hashismn13(ismn13); -- ISMN13 vs other types: -CREATE OR REPLACE FUNCTION btismn13cmp(ismn13, ean13) +CREATE FUNCTION btismn13cmp(ismn13, ean13) RETURNS int4 AS 'btint8cmp' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION btismn13cmp(ismn13, ismn) +CREATE FUNCTION btismn13cmp(ismn13, ismn) RETURNS int4 AS 'btint8cmp' LANGUAGE 'internal' @@ -2813,7 +2813,7 @@ ALTER OPERATOR FAMILY isn_ops USING hash ADD --------------------------------------------------- -- ISMN: -CREATE OR REPLACE FUNCTION btismncmp(ismn, ismn) +CREATE FUNCTION btismncmp(ismn, ismn) RETURNS int4 AS 'btint8cmp' LANGUAGE 'internal' @@ -2828,7 +2828,7 @@ CREATE OPERATOR CLASS ismn_ops DEFAULT OPERATOR 5 >, FUNCTION 1 btismncmp(ismn, ismn); -CREATE OR REPLACE FUNCTION hashismn(ismn) +CREATE FUNCTION hashismn(ismn) RETURNS int4 AS 'hashint8' LANGUAGE 'internal' @@ -2840,12 +2840,12 @@ CREATE OPERATOR CLASS ismn_ops DEFAULT FUNCTION 1 hashismn(ismn); -- ISMN vs other types: -CREATE OR REPLACE FUNCTION btismncmp(ismn, ean13) +CREATE FUNCTION btismncmp(ismn, ean13) RETURNS int4 AS 'btint8cmp' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION btismncmp(ismn, ismn13) +CREATE FUNCTION btismncmp(ismn, ismn13) RETURNS int4 AS 'btint8cmp' LANGUAGE 'internal' @@ -2871,7 +2871,7 @@ ALTER OPERATOR FAMILY isn_ops USING hash ADD --------------------------------------------------- -- ISSN13: -CREATE OR REPLACE FUNCTION btissn13cmp(issn13, issn13) +CREATE FUNCTION btissn13cmp(issn13, issn13) RETURNS int4 AS 'btint8cmp' LANGUAGE 'internal' @@ -2886,7 +2886,7 @@ CREATE OPERATOR CLASS issn13_ops DEFAULT OPERATOR 5 >, FUNCTION 1 btissn13cmp(issn13, issn13); -CREATE OR REPLACE FUNCTION hashissn13(issn13) +CREATE FUNCTION hashissn13(issn13) RETURNS int4 AS 'hashint8' LANGUAGE 'internal' @@ -2898,12 +2898,12 @@ CREATE OPERATOR CLASS issn13_ops DEFAULT FUNCTION 1 hashissn13(issn13); -- ISSN13 vs other types: -CREATE OR REPLACE FUNCTION btissn13cmp(issn13, ean13) +CREATE FUNCTION btissn13cmp(issn13, ean13) RETURNS int4 AS 'btint8cmp' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION btissn13cmp(issn13, issn) +CREATE FUNCTION btissn13cmp(issn13, issn) RETURNS int4 AS 'btint8cmp' LANGUAGE 'internal' @@ -2929,7 +2929,7 @@ ALTER OPERATOR FAMILY isn_ops USING hash ADD --------------------------------------------------- -- ISSN: -CREATE OR REPLACE FUNCTION btissncmp(issn, issn) +CREATE FUNCTION btissncmp(issn, issn) RETURNS int4 AS 'btint8cmp' LANGUAGE 'internal' @@ -2944,7 +2944,7 @@ CREATE OPERATOR CLASS issn_ops DEFAULT OPERATOR 5 >, FUNCTION 1 btissncmp(issn, issn); -CREATE OR REPLACE FUNCTION hashissn(issn) +CREATE FUNCTION hashissn(issn) RETURNS int4 AS 'hashint8' LANGUAGE 'internal' @@ -2956,12 +2956,12 @@ CREATE OPERATOR CLASS issn_ops DEFAULT FUNCTION 1 hashissn(issn); -- ISSN vs other types: -CREATE OR REPLACE FUNCTION btissncmp(issn, ean13) +CREATE FUNCTION btissncmp(issn, ean13) RETURNS int4 AS 'btint8cmp' LANGUAGE 'internal' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION btissncmp(issn, issn13) +CREATE FUNCTION btissncmp(issn, issn13) RETURNS int4 AS 'btint8cmp' LANGUAGE 'internal' @@ -2987,7 +2987,7 @@ ALTER OPERATOR FAMILY isn_ops USING hash ADD --------------------------------------------------- -- UPC: -CREATE OR REPLACE FUNCTION btupccmp(upc, upc) +CREATE FUNCTION btupccmp(upc, upc) RETURNS int4 AS 'btint8cmp' LANGUAGE 'internal' @@ -3002,7 +3002,7 @@ CREATE OPERATOR CLASS upc_ops DEFAULT OPERATOR 5 >, FUNCTION 1 btupccmp(upc, upc); -CREATE OR REPLACE FUNCTION hashupc(upc) +CREATE FUNCTION hashupc(upc) RETURNS int4 AS 'hashint8' LANGUAGE 'internal' @@ -3014,7 +3014,7 @@ CREATE OPERATOR CLASS upc_ops DEFAULT FUNCTION 1 hashupc(upc); -- UPC vs other types: -CREATE OR REPLACE FUNCTION btupccmp(upc, ean13) +CREATE FUNCTION btupccmp(upc, ean13) RETURNS int4 AS 'btint8cmp' LANGUAGE 'internal' @@ -3035,31 +3035,31 @@ ALTER OPERATOR FAMILY isn_ops USING hash ADD -- Type casts: -- --------------------------------------------------- -CREATE OR REPLACE FUNCTION isbn13(ean13) +CREATE FUNCTION isbn13(ean13) RETURNS isbn13 AS 'MODULE_PATHNAME', 'isbn_cast_from_ean13' LANGUAGE 'C' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION ismn13(ean13) +CREATE FUNCTION ismn13(ean13) RETURNS ismn13 AS 'MODULE_PATHNAME', 'ismn_cast_from_ean13' LANGUAGE 'C' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION issn13(ean13) +CREATE FUNCTION issn13(ean13) RETURNS issn13 AS 'MODULE_PATHNAME', 'issn_cast_from_ean13' LANGUAGE 'C' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION isbn(ean13) +CREATE FUNCTION isbn(ean13) RETURNS isbn AS 'MODULE_PATHNAME', 'isbn_cast_from_ean13' LANGUAGE 'C' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION ismn(ean13) +CREATE FUNCTION ismn(ean13) RETURNS ismn AS 'MODULE_PATHNAME', 'ismn_cast_from_ean13' LANGUAGE 'C' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION issn(ean13) +CREATE FUNCTION issn(ean13) RETURNS issn AS 'MODULE_PATHNAME', 'issn_cast_from_ean13' LANGUAGE 'C' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION upc(ean13) +CREATE FUNCTION upc(ean13) RETURNS upc AS 'MODULE_PATHNAME', 'upc_cast_from_ean13' LANGUAGE 'C' IMMUTABLE STRICT; @@ -3091,83 +3091,83 @@ CREATE CAST (issn13 AS issn) WITHOUT FUNCTION AS ASSIGNMENT; -- -- Validation stuff for lose types: -- -CREATE OR REPLACE FUNCTION make_valid(ean13) +CREATE FUNCTION make_valid(ean13) RETURNS ean13 AS 'MODULE_PATHNAME' LANGUAGE 'C' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION make_valid(isbn13) +CREATE FUNCTION make_valid(isbn13) RETURNS isbn13 AS 'MODULE_PATHNAME' LANGUAGE 'C' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION make_valid(ismn13) +CREATE FUNCTION make_valid(ismn13) RETURNS ismn13 AS 'MODULE_PATHNAME' LANGUAGE 'C' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION make_valid(issn13) +CREATE FUNCTION make_valid(issn13) RETURNS issn13 AS 'MODULE_PATHNAME' LANGUAGE 'C' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION make_valid(isbn) +CREATE FUNCTION make_valid(isbn) RETURNS isbn AS 'MODULE_PATHNAME' LANGUAGE 'C' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION make_valid(ismn) +CREATE FUNCTION make_valid(ismn) RETURNS ismn AS 'MODULE_PATHNAME' LANGUAGE 'C' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION make_valid(issn) +CREATE FUNCTION make_valid(issn) RETURNS issn AS 'MODULE_PATHNAME' LANGUAGE 'C' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION make_valid(upc) +CREATE FUNCTION make_valid(upc) RETURNS upc AS 'MODULE_PATHNAME' LANGUAGE 'C' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION is_valid(ean13) +CREATE FUNCTION is_valid(ean13) RETURNS boolean AS 'MODULE_PATHNAME' LANGUAGE 'C' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION is_valid(isbn13) +CREATE FUNCTION is_valid(isbn13) RETURNS boolean AS 'MODULE_PATHNAME' LANGUAGE 'C' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION is_valid(ismn13) +CREATE FUNCTION is_valid(ismn13) RETURNS boolean AS 'MODULE_PATHNAME' LANGUAGE 'C' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION is_valid(issn13) +CREATE FUNCTION is_valid(issn13) RETURNS boolean AS 'MODULE_PATHNAME' LANGUAGE 'C' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION is_valid(isbn) +CREATE FUNCTION is_valid(isbn) RETURNS boolean AS 'MODULE_PATHNAME' LANGUAGE 'C' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION is_valid(ismn) +CREATE FUNCTION is_valid(ismn) RETURNS boolean AS 'MODULE_PATHNAME' LANGUAGE 'C' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION is_valid(issn) +CREATE FUNCTION is_valid(issn) RETURNS boolean AS 'MODULE_PATHNAME' LANGUAGE 'C' IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION is_valid(upc) +CREATE FUNCTION is_valid(upc) RETURNS boolean AS 'MODULE_PATHNAME' LANGUAGE 'C' @@ -3177,7 +3177,7 @@ CREATE OR REPLACE FUNCTION is_valid(upc) -- isn_weak(boolean) - Sets the weak input mode. -- This function is intended for testing use only! -- -CREATE OR REPLACE FUNCTION isn_weak(boolean) +CREATE FUNCTION isn_weak(boolean) RETURNS boolean AS 'MODULE_PATHNAME', 'accept_weak_input' LANGUAGE 'C' @@ -3186,7 +3186,7 @@ CREATE OR REPLACE FUNCTION isn_weak(boolean) -- -- isn_weak() - Gets the weak input mode status -- -CREATE OR REPLACE FUNCTION isn_weak() +CREATE FUNCTION isn_weak() RETURNS boolean AS 'MODULE_PATHNAME', 'weak_input_status' LANGUAGE 'C' diff --git a/contrib/lo/lo--1.0.sql b/contrib/lo/lo--1.0.sql index 6ecb370a22..4b9a7dee32 100644 --- a/contrib/lo/lo--1.0.sql +++ b/contrib/lo/lo--1.0.sql @@ -12,11 +12,11 @@ CREATE DOMAIN lo AS pg_catalog.oid; -- The other functions that formerly existed are not needed because -- the implicit casts between a domain and its underlying type handle them. -- -CREATE OR REPLACE FUNCTION lo_oid(lo) RETURNS pg_catalog.oid AS +CREATE FUNCTION lo_oid(lo) RETURNS pg_catalog.oid AS 'SELECT $1::pg_catalog.oid' LANGUAGE SQL STRICT IMMUTABLE; -- This is used in triggers -CREATE OR REPLACE FUNCTION lo_manage() +CREATE FUNCTION lo_manage() RETURNS pg_catalog.trigger AS 'MODULE_PATHNAME' LANGUAGE C; diff --git a/contrib/ltree/ltree--1.0.sql b/contrib/ltree/ltree--1.0.sql index d9b5ead53a..32969538a0 100644 --- a/contrib/ltree/ltree--1.0.sql +++ b/contrib/ltree/ltree--1.0.sql @@ -1,11 +1,11 @@ /* contrib/ltree/ltree--1.0.sql */ -CREATE OR REPLACE FUNCTION ltree_in(cstring) +CREATE FUNCTION ltree_in(cstring) RETURNS ltree AS 'MODULE_PATHNAME' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION ltree_out(ltree) +CREATE FUNCTION ltree_out(ltree) RETURNS cstring AS 'MODULE_PATHNAME' LANGUAGE C STRICT; @@ -19,37 +19,37 @@ CREATE TYPE ltree ( --Compare function for ltree -CREATE OR REPLACE FUNCTION ltree_cmp(ltree,ltree) +CREATE FUNCTION ltree_cmp(ltree,ltree) RETURNS int4 AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION ltree_lt(ltree,ltree) +CREATE FUNCTION ltree_lt(ltree,ltree) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION ltree_le(ltree,ltree) +CREATE FUNCTION ltree_le(ltree,ltree) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION ltree_eq(ltree,ltree) +CREATE FUNCTION ltree_eq(ltree,ltree) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION ltree_ge(ltree,ltree) +CREATE FUNCTION ltree_ge(ltree,ltree) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION ltree_gt(ltree,ltree) +CREATE FUNCTION ltree_gt(ltree,ltree) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION ltree_ne(ltree,ltree) +CREATE FUNCTION ltree_ne(ltree,ltree) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -119,112 +119,112 @@ CREATE OPERATOR <> ( --util functions -CREATE OR REPLACE FUNCTION subltree(ltree,int4,int4) +CREATE FUNCTION subltree(ltree,int4,int4) RETURNS ltree AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION subpath(ltree,int4,int4) +CREATE FUNCTION subpath(ltree,int4,int4) RETURNS ltree AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION subpath(ltree,int4) +CREATE FUNCTION subpath(ltree,int4) RETURNS ltree AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION index(ltree,ltree) +CREATE FUNCTION index(ltree,ltree) RETURNS int4 AS 'MODULE_PATHNAME', 'ltree_index' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION index(ltree,ltree,int4) +CREATE FUNCTION index(ltree,ltree,int4) RETURNS int4 AS 'MODULE_PATHNAME', 'ltree_index' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION nlevel(ltree) +CREATE FUNCTION nlevel(ltree) RETURNS int4 AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION ltree2text(ltree) +CREATE FUNCTION ltree2text(ltree) RETURNS text AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION text2ltree(text) +CREATE FUNCTION text2ltree(text) RETURNS ltree AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION lca(_ltree) +CREATE FUNCTION lca(_ltree) RETURNS ltree AS 'MODULE_PATHNAME','_lca' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION lca(ltree,ltree) +CREATE FUNCTION lca(ltree,ltree) RETURNS ltree AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION lca(ltree,ltree,ltree) +CREATE FUNCTION lca(ltree,ltree,ltree) RETURNS ltree AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION lca(ltree,ltree,ltree,ltree) +CREATE FUNCTION lca(ltree,ltree,ltree,ltree) RETURNS ltree AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION lca(ltree,ltree,ltree,ltree,ltree) +CREATE FUNCTION lca(ltree,ltree,ltree,ltree,ltree) RETURNS ltree AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION lca(ltree,ltree,ltree,ltree,ltree,ltree) +CREATE FUNCTION lca(ltree,ltree,ltree,ltree,ltree,ltree) RETURNS ltree AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION lca(ltree,ltree,ltree,ltree,ltree,ltree,ltree) +CREATE FUNCTION lca(ltree,ltree,ltree,ltree,ltree,ltree,ltree) RETURNS ltree AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION lca(ltree,ltree,ltree,ltree,ltree,ltree,ltree,ltree) +CREATE FUNCTION lca(ltree,ltree,ltree,ltree,ltree,ltree,ltree,ltree) RETURNS ltree AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION ltree_isparent(ltree,ltree) +CREATE FUNCTION ltree_isparent(ltree,ltree) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION ltree_risparent(ltree,ltree) +CREATE FUNCTION ltree_risparent(ltree,ltree) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION ltree_addltree(ltree,ltree) +CREATE FUNCTION ltree_addltree(ltree,ltree) RETURNS ltree AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION ltree_addtext(ltree,text) +CREATE FUNCTION ltree_addtext(ltree,text) RETURNS ltree AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION ltree_textadd(text,ltree) +CREATE FUNCTION ltree_textadd(text,ltree) RETURNS ltree AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION ltreeparentsel(internal, oid, internal, integer) +CREATE FUNCTION ltreeparentsel(internal, oid, internal, integer) RETURNS float8 AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -297,12 +297,12 @@ CREATE OPERATOR CLASS ltree_ops --lquery type -CREATE OR REPLACE FUNCTION lquery_in(cstring) +CREATE FUNCTION lquery_in(cstring) RETURNS lquery AS 'MODULE_PATHNAME' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION lquery_out(lquery) +CREATE FUNCTION lquery_out(lquery) RETURNS cstring AS 'MODULE_PATHNAME' LANGUAGE C STRICT; @@ -314,12 +314,12 @@ CREATE TYPE lquery ( STORAGE = extended ); -CREATE OR REPLACE FUNCTION ltq_regex(ltree,lquery) +CREATE FUNCTION ltq_regex(ltree,lquery) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION ltq_rregex(lquery,ltree) +CREATE FUNCTION ltq_rregex(lquery,ltree) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -361,12 +361,12 @@ CREATE OPERATOR ^~ ( JOIN = contjoinsel ); -CREATE OR REPLACE FUNCTION lt_q_regex(ltree,_lquery) +CREATE FUNCTION lt_q_regex(ltree,_lquery) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION lt_q_rregex(_lquery,ltree) +CREATE FUNCTION lt_q_rregex(_lquery,ltree) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -408,12 +408,12 @@ CREATE OPERATOR ^? ( JOIN = contjoinsel ); -CREATE OR REPLACE FUNCTION ltxtq_in(cstring) +CREATE FUNCTION ltxtq_in(cstring) RETURNS ltxtquery AS 'MODULE_PATHNAME' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION ltxtq_out(ltxtquery) +CREATE FUNCTION ltxtq_out(ltxtquery) RETURNS cstring AS 'MODULE_PATHNAME' LANGUAGE C STRICT; @@ -427,12 +427,12 @@ CREATE TYPE ltxtquery ( -- operations WITH ltxtquery -CREATE OR REPLACE FUNCTION ltxtq_exec(ltree, ltxtquery) +CREATE FUNCTION ltxtq_exec(ltree, ltxtquery) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION ltxtq_rexec(ltxtquery, ltree) +CREATE FUNCTION ltxtq_rexec(ltxtquery, ltree) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -475,12 +475,12 @@ CREATE OPERATOR ^@ ( ); --GiST support for ltree -CREATE OR REPLACE FUNCTION ltree_gist_in(cstring) +CREATE FUNCTION ltree_gist_in(cstring) RETURNS ltree_gist AS 'MODULE_PATHNAME' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION ltree_gist_out(ltree_gist) +CREATE FUNCTION ltree_gist_out(ltree_gist) RETURNS cstring AS 'MODULE_PATHNAME' LANGUAGE C STRICT; @@ -493,25 +493,25 @@ CREATE TYPE ltree_gist ( ); -CREATE OR REPLACE FUNCTION ltree_consistent(internal,internal,int2,oid,internal) +CREATE FUNCTION ltree_consistent(internal,internal,int2,oid,internal) RETURNS bool as 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION ltree_compress(internal) +CREATE FUNCTION ltree_compress(internal) RETURNS internal as 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION ltree_decompress(internal) +CREATE FUNCTION ltree_decompress(internal) RETURNS internal as 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION ltree_penalty(internal,internal,internal) +CREATE FUNCTION ltree_penalty(internal,internal,internal) RETURNS internal as 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION ltree_picksplit(internal, internal) +CREATE FUNCTION ltree_picksplit(internal, internal) RETURNS internal as 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION ltree_union(internal, internal) +CREATE FUNCTION ltree_union(internal, internal) RETURNS int4 as 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION ltree_same(internal, internal, internal) +CREATE FUNCTION ltree_same(internal, internal, internal) RETURNS internal as 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; CREATE OPERATOR CLASS gist_ltree_ops @@ -541,52 +541,52 @@ CREATE OPERATOR CLASS gist_ltree_ops -- arrays of ltree -CREATE OR REPLACE FUNCTION _ltree_isparent(_ltree,ltree) +CREATE FUNCTION _ltree_isparent(_ltree,ltree) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION _ltree_r_isparent(ltree,_ltree) +CREATE FUNCTION _ltree_r_isparent(ltree,_ltree) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION _ltree_risparent(_ltree,ltree) +CREATE FUNCTION _ltree_risparent(_ltree,ltree) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION _ltree_r_risparent(ltree,_ltree) +CREATE FUNCTION _ltree_r_risparent(ltree,_ltree) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION _ltq_regex(_ltree,lquery) +CREATE FUNCTION _ltq_regex(_ltree,lquery) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION _ltq_rregex(lquery,_ltree) +CREATE FUNCTION _ltq_rregex(lquery,_ltree) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION _lt_q_regex(_ltree,_lquery) +CREATE FUNCTION _lt_q_regex(_ltree,_lquery) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION _lt_q_rregex(_lquery,_ltree) +CREATE FUNCTION _lt_q_rregex(_lquery,_ltree) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION _ltxtq_exec(_ltree, ltxtquery) +CREATE FUNCTION _ltxtq_exec(_ltree, ltxtquery) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION _ltxtq_rexec(ltxtquery, _ltree) +CREATE FUNCTION _ltxtq_rexec(ltxtquery, _ltree) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -774,7 +774,7 @@ CREATE OPERATOR ^@ ( ); --extractors -CREATE OR REPLACE FUNCTION _ltree_extract_isparent(_ltree,ltree) +CREATE FUNCTION _ltree_extract_isparent(_ltree,ltree) RETURNS ltree AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -785,7 +785,7 @@ CREATE OPERATOR ?@> ( PROCEDURE = _ltree_extract_isparent ); -CREATE OR REPLACE FUNCTION _ltree_extract_risparent(_ltree,ltree) +CREATE FUNCTION _ltree_extract_risparent(_ltree,ltree) RETURNS ltree AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -796,7 +796,7 @@ CREATE OPERATOR ?<@ ( PROCEDURE = _ltree_extract_risparent ); -CREATE OR REPLACE FUNCTION _ltq_extract_regex(_ltree,lquery) +CREATE FUNCTION _ltq_extract_regex(_ltree,lquery) RETURNS ltree AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -807,7 +807,7 @@ CREATE OPERATOR ?~ ( PROCEDURE = _ltq_extract_regex ); -CREATE OR REPLACE FUNCTION _ltxtq_extract_exec(_ltree,ltxtquery) +CREATE FUNCTION _ltxtq_extract_exec(_ltree,ltxtquery) RETURNS ltree AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -819,32 +819,32 @@ CREATE OPERATOR ?@ ( ); --GiST support for ltree[] -CREATE OR REPLACE FUNCTION _ltree_consistent(internal,internal,int2,oid,internal) +CREATE FUNCTION _ltree_consistent(internal,internal,int2,oid,internal) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION _ltree_compress(internal) +CREATE FUNCTION _ltree_compress(internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION _ltree_penalty(internal,internal,internal) +CREATE FUNCTION _ltree_penalty(internal,internal,internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION _ltree_picksplit(internal, internal) +CREATE FUNCTION _ltree_picksplit(internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION _ltree_union(internal, internal) +CREATE FUNCTION _ltree_union(internal, internal) RETURNS int4 AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION _ltree_same(internal, internal, internal) +CREATE FUNCTION _ltree_same(internal, internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; diff --git a/contrib/pageinspect/pageinspect--1.0.sql b/contrib/pageinspect/pageinspect--1.0.sql index b6e46063ba..b64eb61774 100644 --- a/contrib/pageinspect/pageinspect--1.0.sql +++ b/contrib/pageinspect/pageinspect--1.0.sql @@ -3,12 +3,12 @@ -- -- get_raw_page() -- -CREATE OR REPLACE FUNCTION get_raw_page(text, int4) +CREATE FUNCTION get_raw_page(text, int4) RETURNS bytea AS 'MODULE_PATHNAME', 'get_raw_page' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION get_raw_page(text, text, int4) +CREATE FUNCTION get_raw_page(text, text, int4) RETURNS bytea AS 'MODULE_PATHNAME', 'get_raw_page_fork' LANGUAGE C STRICT; @@ -16,7 +16,7 @@ LANGUAGE C STRICT; -- -- page_header() -- -CREATE OR REPLACE FUNCTION page_header(IN page bytea, +CREATE FUNCTION page_header(IN page bytea, OUT lsn text, OUT tli smallint, OUT flags smallint, @@ -32,7 +32,7 @@ LANGUAGE C STRICT; -- -- heap_page_items() -- -CREATE OR REPLACE FUNCTION heap_page_items(IN page bytea, +CREATE FUNCTION heap_page_items(IN page bytea, OUT lp smallint, OUT lp_off smallint, OUT lp_flags smallint, @@ -53,7 +53,7 @@ LANGUAGE C STRICT; -- -- bt_metap() -- -CREATE OR REPLACE FUNCTION bt_metap(IN relname text, +CREATE FUNCTION bt_metap(IN relname text, OUT magic int4, OUT version int4, OUT root int4, @@ -66,7 +66,7 @@ LANGUAGE C STRICT; -- -- bt_page_stats() -- -CREATE OR REPLACE FUNCTION bt_page_stats(IN relname text, IN blkno int4, +CREATE FUNCTION bt_page_stats(IN relname text, IN blkno int4, OUT blkno int4, OUT type "char", OUT live_items int4, @@ -84,7 +84,7 @@ LANGUAGE C STRICT; -- -- bt_page_items() -- -CREATE OR REPLACE FUNCTION bt_page_items(IN relname text, IN blkno int4, +CREATE FUNCTION bt_page_items(IN relname text, IN blkno int4, OUT itemoffset smallint, OUT ctid tid, OUT itemlen smallint, @@ -98,7 +98,7 @@ LANGUAGE C STRICT; -- -- fsm_page_contents() -- -CREATE OR REPLACE FUNCTION fsm_page_contents(IN page bytea) +CREATE FUNCTION fsm_page_contents(IN page bytea) RETURNS text AS 'MODULE_PATHNAME', 'fsm_page_contents' LANGUAGE C STRICT; diff --git a/contrib/pg_buffercache/pg_buffercache--1.0.sql b/contrib/pg_buffercache/pg_buffercache--1.0.sql index a49d171e04..9407d21410 100644 --- a/contrib/pg_buffercache/pg_buffercache--1.0.sql +++ b/contrib/pg_buffercache/pg_buffercache--1.0.sql @@ -1,7 +1,7 @@ /* contrib/pg_buffercache/pg_buffercache--1.0.sql */ -- Register the function. -CREATE OR REPLACE FUNCTION pg_buffercache_pages() +CREATE FUNCTION pg_buffercache_pages() RETURNS SETOF RECORD AS 'MODULE_PATHNAME', 'pg_buffercache_pages' LANGUAGE C; diff --git a/contrib/pg_freespacemap/pg_freespacemap--1.0.sql b/contrib/pg_freespacemap/pg_freespacemap--1.0.sql index 19f099ee37..d63420e33a 100644 --- a/contrib/pg_freespacemap/pg_freespacemap--1.0.sql +++ b/contrib/pg_freespacemap/pg_freespacemap--1.0.sql @@ -1,13 +1,13 @@ /* contrib/pg_freespacemap/pg_freespacemap--1.0.sql */ -- Register the C function. -CREATE OR REPLACE FUNCTION pg_freespace(regclass, bigint) +CREATE FUNCTION pg_freespace(regclass, bigint) RETURNS int2 AS 'MODULE_PATHNAME', 'pg_freespace' LANGUAGE C STRICT; -- pg_freespace shows the recorded space avail at each block in a relation -CREATE OR REPLACE FUNCTION +CREATE FUNCTION pg_freespace(rel regclass, blkno OUT bigint, avail OUT int2) RETURNS SETOF RECORD AS $$ diff --git a/contrib/pg_trgm/pg_trgm--1.0.sql b/contrib/pg_trgm/pg_trgm--1.0.sql index fc31728dcc..79ea509042 100644 --- a/contrib/pg_trgm/pg_trgm--1.0.sql +++ b/contrib/pg_trgm/pg_trgm--1.0.sql @@ -1,26 +1,26 @@ /* contrib/pg_trgm/pg_trgm--1.0.sql */ -CREATE OR REPLACE FUNCTION set_limit(float4) +CREATE FUNCTION set_limit(float4) RETURNS float4 AS 'MODULE_PATHNAME' LANGUAGE C STRICT VOLATILE; -CREATE OR REPLACE FUNCTION show_limit() +CREATE FUNCTION show_limit() RETURNS float4 AS 'MODULE_PATHNAME' LANGUAGE C STRICT STABLE; -CREATE OR REPLACE FUNCTION show_trgm(text) +CREATE FUNCTION show_trgm(text) RETURNS _text AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION similarity(text,text) +CREATE FUNCTION similarity(text,text) RETURNS float4 AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION similarity_op(text,text) +CREATE FUNCTION similarity_op(text,text) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C STRICT STABLE; -- stable because depends on trgm_limit @@ -34,7 +34,7 @@ CREATE OPERATOR % ( JOIN = contjoinsel ); -CREATE OR REPLACE FUNCTION similarity_dist(text,text) +CREATE FUNCTION similarity_dist(text,text) RETURNS float4 AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -47,12 +47,12 @@ CREATE OPERATOR <-> ( ); -- gist key -CREATE OR REPLACE FUNCTION gtrgm_in(cstring) +CREATE FUNCTION gtrgm_in(cstring) RETURNS gtrgm AS 'MODULE_PATHNAME' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION gtrgm_out(gtrgm) +CREATE FUNCTION gtrgm_out(gtrgm) RETURNS cstring AS 'MODULE_PATHNAME' LANGUAGE C STRICT; @@ -64,42 +64,42 @@ CREATE TYPE gtrgm ( ); -- support functions for gist -CREATE OR REPLACE FUNCTION gtrgm_consistent(internal,text,int,oid,internal) +CREATE FUNCTION gtrgm_consistent(internal,text,int,oid,internal) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gtrgm_distance(internal,text,int,oid) +CREATE FUNCTION gtrgm_distance(internal,text,int,oid) RETURNS float8 AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gtrgm_compress(internal) +CREATE FUNCTION gtrgm_compress(internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gtrgm_decompress(internal) +CREATE FUNCTION gtrgm_decompress(internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gtrgm_penalty(internal,internal,internal) +CREATE FUNCTION gtrgm_penalty(internal,internal,internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gtrgm_picksplit(internal, internal) +CREATE FUNCTION gtrgm_picksplit(internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gtrgm_union(bytea, internal) +CREATE FUNCTION gtrgm_union(bytea, internal) RETURNS _int4 AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gtrgm_same(gtrgm, gtrgm, internal) +CREATE FUNCTION gtrgm_same(gtrgm, gtrgm, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; @@ -123,17 +123,17 @@ AS STORAGE gtrgm; -- support functions for gin -CREATE OR REPLACE FUNCTION gin_extract_value_trgm(text, internal) +CREATE FUNCTION gin_extract_value_trgm(text, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gin_extract_query_trgm(text, internal, int2, internal, internal, internal, internal) +CREATE FUNCTION gin_extract_query_trgm(text, internal, int2, internal, internal, internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gin_trgm_consistent(internal, int2, text, int4, internal, internal, internal, internal) +CREATE FUNCTION gin_trgm_consistent(internal, int2, text, int4, internal, internal, internal, internal) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; diff --git a/contrib/pgcrypto/pgcrypto--1.0.sql b/contrib/pgcrypto/pgcrypto--1.0.sql index 29b489fbe5..52be0950ce 100644 --- a/contrib/pgcrypto/pgcrypto--1.0.sql +++ b/contrib/pgcrypto/pgcrypto--1.0.sql @@ -1,61 +1,61 @@ /* contrib/pgcrypto/pgcrypto--1.0.sql */ -CREATE OR REPLACE FUNCTION digest(text, text) +CREATE FUNCTION digest(text, text) RETURNS bytea AS 'MODULE_PATHNAME', 'pg_digest' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION digest(bytea, text) +CREATE FUNCTION digest(bytea, text) RETURNS bytea AS 'MODULE_PATHNAME', 'pg_digest' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION hmac(text, text, text) +CREATE FUNCTION hmac(text, text, text) RETURNS bytea AS 'MODULE_PATHNAME', 'pg_hmac' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION hmac(bytea, bytea, text) +CREATE FUNCTION hmac(bytea, bytea, text) RETURNS bytea AS 'MODULE_PATHNAME', 'pg_hmac' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION crypt(text, text) +CREATE FUNCTION crypt(text, text) RETURNS text AS 'MODULE_PATHNAME', 'pg_crypt' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gen_salt(text) +CREATE FUNCTION gen_salt(text) RETURNS text AS 'MODULE_PATHNAME', 'pg_gen_salt' LANGUAGE C VOLATILE STRICT; -CREATE OR REPLACE FUNCTION gen_salt(text, int4) +CREATE FUNCTION gen_salt(text, int4) RETURNS text AS 'MODULE_PATHNAME', 'pg_gen_salt_rounds' LANGUAGE C VOLATILE STRICT; -CREATE OR REPLACE FUNCTION encrypt(bytea, bytea, text) +CREATE FUNCTION encrypt(bytea, bytea, text) RETURNS bytea AS 'MODULE_PATHNAME', 'pg_encrypt' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION decrypt(bytea, bytea, text) +CREATE FUNCTION decrypt(bytea, bytea, text) RETURNS bytea AS 'MODULE_PATHNAME', 'pg_decrypt' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION encrypt_iv(bytea, bytea, bytea, text) +CREATE FUNCTION encrypt_iv(bytea, bytea, bytea, text) RETURNS bytea AS 'MODULE_PATHNAME', 'pg_encrypt_iv' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION decrypt_iv(bytea, bytea, bytea, text) +CREATE FUNCTION decrypt_iv(bytea, bytea, bytea, text) RETURNS bytea AS 'MODULE_PATHNAME', 'pg_decrypt_iv' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gen_random_bytes(int4) +CREATE FUNCTION gen_random_bytes(int4) RETURNS bytea AS 'MODULE_PATHNAME', 'pg_random_bytes' LANGUAGE 'C' VOLATILE STRICT; @@ -63,12 +63,12 @@ LANGUAGE 'C' VOLATILE STRICT; -- -- pgp_sym_encrypt(data, key) -- -CREATE OR REPLACE FUNCTION pgp_sym_encrypt(text, text) +CREATE FUNCTION pgp_sym_encrypt(text, text) RETURNS bytea AS 'MODULE_PATHNAME', 'pgp_sym_encrypt_text' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION pgp_sym_encrypt_bytea(bytea, text) +CREATE FUNCTION pgp_sym_encrypt_bytea(bytea, text) RETURNS bytea AS 'MODULE_PATHNAME', 'pgp_sym_encrypt_bytea' LANGUAGE C STRICT; @@ -76,12 +76,12 @@ LANGUAGE C STRICT; -- -- pgp_sym_encrypt(data, key, args) -- -CREATE OR REPLACE FUNCTION pgp_sym_encrypt(text, text, text) +CREATE FUNCTION pgp_sym_encrypt(text, text, text) RETURNS bytea AS 'MODULE_PATHNAME', 'pgp_sym_encrypt_text' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION pgp_sym_encrypt_bytea(bytea, text, text) +CREATE FUNCTION pgp_sym_encrypt_bytea(bytea, text, text) RETURNS bytea AS 'MODULE_PATHNAME', 'pgp_sym_encrypt_bytea' LANGUAGE C STRICT; @@ -89,12 +89,12 @@ LANGUAGE C STRICT; -- -- pgp_sym_decrypt(data, key) -- -CREATE OR REPLACE FUNCTION pgp_sym_decrypt(bytea, text) +CREATE FUNCTION pgp_sym_decrypt(bytea, text) RETURNS text AS 'MODULE_PATHNAME', 'pgp_sym_decrypt_text' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION pgp_sym_decrypt_bytea(bytea, text) +CREATE FUNCTION pgp_sym_decrypt_bytea(bytea, text) RETURNS bytea AS 'MODULE_PATHNAME', 'pgp_sym_decrypt_bytea' LANGUAGE C IMMUTABLE STRICT; @@ -102,12 +102,12 @@ LANGUAGE C IMMUTABLE STRICT; -- -- pgp_sym_decrypt(data, key, args) -- -CREATE OR REPLACE FUNCTION pgp_sym_decrypt(bytea, text, text) +CREATE FUNCTION pgp_sym_decrypt(bytea, text, text) RETURNS text AS 'MODULE_PATHNAME', 'pgp_sym_decrypt_text' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION pgp_sym_decrypt_bytea(bytea, text, text) +CREATE FUNCTION pgp_sym_decrypt_bytea(bytea, text, text) RETURNS bytea AS 'MODULE_PATHNAME', 'pgp_sym_decrypt_bytea' LANGUAGE C IMMUTABLE STRICT; @@ -115,12 +115,12 @@ LANGUAGE C IMMUTABLE STRICT; -- -- pgp_pub_encrypt(data, key) -- -CREATE OR REPLACE FUNCTION pgp_pub_encrypt(text, bytea) +CREATE FUNCTION pgp_pub_encrypt(text, bytea) RETURNS bytea AS 'MODULE_PATHNAME', 'pgp_pub_encrypt_text' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION pgp_pub_encrypt_bytea(bytea, bytea) +CREATE FUNCTION pgp_pub_encrypt_bytea(bytea, bytea) RETURNS bytea AS 'MODULE_PATHNAME', 'pgp_pub_encrypt_bytea' LANGUAGE C STRICT; @@ -128,12 +128,12 @@ LANGUAGE C STRICT; -- -- pgp_pub_encrypt(data, key, args) -- -CREATE OR REPLACE FUNCTION pgp_pub_encrypt(text, bytea, text) +CREATE FUNCTION pgp_pub_encrypt(text, bytea, text) RETURNS bytea AS 'MODULE_PATHNAME', 'pgp_pub_encrypt_text' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION pgp_pub_encrypt_bytea(bytea, bytea, text) +CREATE FUNCTION pgp_pub_encrypt_bytea(bytea, bytea, text) RETURNS bytea AS 'MODULE_PATHNAME', 'pgp_pub_encrypt_bytea' LANGUAGE C STRICT; @@ -141,12 +141,12 @@ LANGUAGE C STRICT; -- -- pgp_pub_decrypt(data, key) -- -CREATE OR REPLACE FUNCTION pgp_pub_decrypt(bytea, bytea) +CREATE FUNCTION pgp_pub_decrypt(bytea, bytea) RETURNS text AS 'MODULE_PATHNAME', 'pgp_pub_decrypt_text' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION pgp_pub_decrypt_bytea(bytea, bytea) +CREATE FUNCTION pgp_pub_decrypt_bytea(bytea, bytea) RETURNS bytea AS 'MODULE_PATHNAME', 'pgp_pub_decrypt_bytea' LANGUAGE C IMMUTABLE STRICT; @@ -154,12 +154,12 @@ LANGUAGE C IMMUTABLE STRICT; -- -- pgp_pub_decrypt(data, key, psw) -- -CREATE OR REPLACE FUNCTION pgp_pub_decrypt(bytea, bytea, text) +CREATE FUNCTION pgp_pub_decrypt(bytea, bytea, text) RETURNS text AS 'MODULE_PATHNAME', 'pgp_pub_decrypt_text' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION pgp_pub_decrypt_bytea(bytea, bytea, text) +CREATE FUNCTION pgp_pub_decrypt_bytea(bytea, bytea, text) RETURNS bytea AS 'MODULE_PATHNAME', 'pgp_pub_decrypt_bytea' LANGUAGE C IMMUTABLE STRICT; @@ -167,12 +167,12 @@ LANGUAGE C IMMUTABLE STRICT; -- -- pgp_pub_decrypt(data, key, psw, arg) -- -CREATE OR REPLACE FUNCTION pgp_pub_decrypt(bytea, bytea, text, text) +CREATE FUNCTION pgp_pub_decrypt(bytea, bytea, text, text) RETURNS text AS 'MODULE_PATHNAME', 'pgp_pub_decrypt_text' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION pgp_pub_decrypt_bytea(bytea, bytea, text, text) +CREATE FUNCTION pgp_pub_decrypt_bytea(bytea, bytea, text, text) RETURNS bytea AS 'MODULE_PATHNAME', 'pgp_pub_decrypt_bytea' LANGUAGE C IMMUTABLE STRICT; @@ -180,7 +180,7 @@ LANGUAGE C IMMUTABLE STRICT; -- -- PGP key ID -- -CREATE OR REPLACE FUNCTION pgp_key_id(bytea) +CREATE FUNCTION pgp_key_id(bytea) RETURNS text AS 'MODULE_PATHNAME', 'pgp_key_id_w' LANGUAGE C IMMUTABLE STRICT; @@ -188,12 +188,12 @@ LANGUAGE C IMMUTABLE STRICT; -- -- pgp armor -- -CREATE OR REPLACE FUNCTION armor(bytea) +CREATE FUNCTION armor(bytea) RETURNS text AS 'MODULE_PATHNAME', 'pg_armor' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION dearmor(text) +CREATE FUNCTION dearmor(text) RETURNS bytea AS 'MODULE_PATHNAME', 'pg_dearmor' LANGUAGE C IMMUTABLE STRICT; diff --git a/contrib/pgrowlocks/pgrowlocks--1.0.sql b/contrib/pgrowlocks/pgrowlocks--1.0.sql index 8b5fc9a1c8..0b60fdcd07 100644 --- a/contrib/pgrowlocks/pgrowlocks--1.0.sql +++ b/contrib/pgrowlocks/pgrowlocks--1.0.sql @@ -1,6 +1,6 @@ /* contrib/pgrowlocks/pgrowlocks--1.0.sql */ -CREATE OR REPLACE FUNCTION pgrowlocks(IN relname text, +CREATE FUNCTION pgrowlocks(IN relname text, OUT locked_row TID, -- row TID OUT lock_type TEXT, -- lock type OUT locker XID, -- locking XID diff --git a/contrib/pgstattuple/pgstattuple--1.0.sql b/contrib/pgstattuple/pgstattuple--1.0.sql index 84b91dda0a..83445ec4ae 100644 --- a/contrib/pgstattuple/pgstattuple--1.0.sql +++ b/contrib/pgstattuple/pgstattuple--1.0.sql @@ -1,6 +1,6 @@ /* contrib/pgstattuple/pgstattuple--1.0.sql */ -CREATE OR REPLACE FUNCTION pgstattuple(IN relname text, +CREATE FUNCTION pgstattuple(IN relname text, OUT table_len BIGINT, -- physical table length in bytes OUT tuple_count BIGINT, -- number of live tuples OUT tuple_len BIGINT, -- total tuples length in bytes @@ -13,7 +13,7 @@ CREATE OR REPLACE FUNCTION pgstattuple(IN relname text, AS 'MODULE_PATHNAME', 'pgstattuple' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION pgstattuple(IN reloid oid, +CREATE FUNCTION pgstattuple(IN reloid oid, OUT table_len BIGINT, -- physical table length in bytes OUT tuple_count BIGINT, -- number of live tuples OUT tuple_len BIGINT, -- total tuples length in bytes @@ -26,7 +26,7 @@ CREATE OR REPLACE FUNCTION pgstattuple(IN reloid oid, AS 'MODULE_PATHNAME', 'pgstattuplebyid' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION pgstatindex(IN relname text, +CREATE FUNCTION pgstatindex(IN relname text, OUT version INT, OUT tree_level INT, OUT index_size BIGINT, @@ -40,7 +40,7 @@ CREATE OR REPLACE FUNCTION pgstatindex(IN relname text, AS 'MODULE_PATHNAME', 'pgstatindex' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION pg_relpages(IN relname text) +CREATE FUNCTION pg_relpages(IN relname text) RETURNS BIGINT AS 'MODULE_PATHNAME', 'pg_relpages' LANGUAGE C STRICT; diff --git a/contrib/seg/seg--1.0.sql b/contrib/seg/seg--1.0.sql index 02d8ffadb0..563411da6a 100644 --- a/contrib/seg/seg--1.0.sql +++ b/contrib/seg/seg--1.0.sql @@ -2,12 +2,12 @@ -- Create the user-defined type for 1-D floating point intervals (seg) -CREATE OR REPLACE FUNCTION seg_in(cstring) +CREATE FUNCTION seg_in(cstring) RETURNS seg AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION seg_out(seg) +CREATE FUNCTION seg_out(seg) RETURNS cstring AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -27,7 +27,7 @@ COMMENT ON TYPE seg IS -- Left/Right methods -CREATE OR REPLACE FUNCTION seg_over_left(seg, seg) +CREATE FUNCTION seg_over_left(seg, seg) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -35,7 +35,7 @@ LANGUAGE C STRICT IMMUTABLE; COMMENT ON FUNCTION seg_over_left(seg, seg) IS 'overlaps or is left of'; -CREATE OR REPLACE FUNCTION seg_over_right(seg, seg) +CREATE FUNCTION seg_over_right(seg, seg) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -43,7 +43,7 @@ LANGUAGE C STRICT IMMUTABLE; COMMENT ON FUNCTION seg_over_right(seg, seg) IS 'overlaps or is right of'; -CREATE OR REPLACE FUNCTION seg_left(seg, seg) +CREATE FUNCTION seg_left(seg, seg) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -51,7 +51,7 @@ LANGUAGE C STRICT IMMUTABLE; COMMENT ON FUNCTION seg_left(seg, seg) IS 'is left of'; -CREATE OR REPLACE FUNCTION seg_right(seg, seg) +CREATE FUNCTION seg_right(seg, seg) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -62,7 +62,7 @@ COMMENT ON FUNCTION seg_right(seg, seg) IS -- Scalar comparison methods -CREATE OR REPLACE FUNCTION seg_lt(seg, seg) +CREATE FUNCTION seg_lt(seg, seg) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -70,7 +70,7 @@ LANGUAGE C STRICT IMMUTABLE; COMMENT ON FUNCTION seg_lt(seg, seg) IS 'less than'; -CREATE OR REPLACE FUNCTION seg_le(seg, seg) +CREATE FUNCTION seg_le(seg, seg) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -78,7 +78,7 @@ LANGUAGE C STRICT IMMUTABLE; COMMENT ON FUNCTION seg_le(seg, seg) IS 'less than or equal'; -CREATE OR REPLACE FUNCTION seg_gt(seg, seg) +CREATE FUNCTION seg_gt(seg, seg) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -86,7 +86,7 @@ LANGUAGE C STRICT IMMUTABLE; COMMENT ON FUNCTION seg_gt(seg, seg) IS 'greater than'; -CREATE OR REPLACE FUNCTION seg_ge(seg, seg) +CREATE FUNCTION seg_ge(seg, seg) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -94,7 +94,7 @@ LANGUAGE C STRICT IMMUTABLE; COMMENT ON FUNCTION seg_ge(seg, seg) IS 'greater than or equal'; -CREATE OR REPLACE FUNCTION seg_contains(seg, seg) +CREATE FUNCTION seg_contains(seg, seg) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -102,7 +102,7 @@ LANGUAGE C STRICT IMMUTABLE; COMMENT ON FUNCTION seg_contains(seg, seg) IS 'contains'; -CREATE OR REPLACE FUNCTION seg_contained(seg, seg) +CREATE FUNCTION seg_contained(seg, seg) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -110,7 +110,7 @@ LANGUAGE C STRICT IMMUTABLE; COMMENT ON FUNCTION seg_contained(seg, seg) IS 'contained in'; -CREATE OR REPLACE FUNCTION seg_overlap(seg, seg) +CREATE FUNCTION seg_overlap(seg, seg) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -118,7 +118,7 @@ LANGUAGE C STRICT IMMUTABLE; COMMENT ON FUNCTION seg_overlap(seg, seg) IS 'overlaps'; -CREATE OR REPLACE FUNCTION seg_same(seg, seg) +CREATE FUNCTION seg_same(seg, seg) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -126,7 +126,7 @@ LANGUAGE C STRICT IMMUTABLE; COMMENT ON FUNCTION seg_same(seg, seg) IS 'same as'; -CREATE OR REPLACE FUNCTION seg_different(seg, seg) +CREATE FUNCTION seg_different(seg, seg) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -136,41 +136,41 @@ COMMENT ON FUNCTION seg_different(seg, seg) IS -- support routines for indexing -CREATE OR REPLACE FUNCTION seg_cmp(seg, seg) +CREATE FUNCTION seg_cmp(seg, seg) RETURNS int4 AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; COMMENT ON FUNCTION seg_cmp(seg, seg) IS 'btree comparison function'; -CREATE OR REPLACE FUNCTION seg_union(seg, seg) +CREATE FUNCTION seg_union(seg, seg) RETURNS seg AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION seg_inter(seg, seg) +CREATE FUNCTION seg_inter(seg, seg) RETURNS seg AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION seg_size(seg) +CREATE FUNCTION seg_size(seg) RETURNS float4 AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -- miscellaneous -CREATE OR REPLACE FUNCTION seg_center(seg) +CREATE FUNCTION seg_center(seg) RETURNS float4 AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION seg_upper(seg) +CREATE FUNCTION seg_upper(seg) RETURNS float4 AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION seg_lower(seg) +CREATE FUNCTION seg_lower(seg) RETURNS float4 AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; @@ -323,37 +323,37 @@ CREATE OPERATOR ~ ( -- define the GiST support methods -CREATE OR REPLACE FUNCTION gseg_consistent(internal,seg,int,oid,internal) +CREATE FUNCTION gseg_consistent(internal,seg,int,oid,internal) RETURNS bool AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gseg_compress(internal) +CREATE FUNCTION gseg_compress(internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gseg_decompress(internal) +CREATE FUNCTION gseg_decompress(internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gseg_penalty(internal,internal,internal) +CREATE FUNCTION gseg_penalty(internal,internal,internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gseg_picksplit(internal, internal) +CREATE FUNCTION gseg_picksplit(internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gseg_union(internal, internal) +CREATE FUNCTION gseg_union(internal, internal) RETURNS seg AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; -CREATE OR REPLACE FUNCTION gseg_same(seg, seg, internal) +CREATE FUNCTION gseg_same(seg, seg, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT; diff --git a/contrib/spi/autoinc--1.0.sql b/contrib/spi/autoinc--1.0.sql index bf5ecab08b..9c9df9ce0b 100644 --- a/contrib/spi/autoinc--1.0.sql +++ b/contrib/spi/autoinc--1.0.sql @@ -1,6 +1,6 @@ /* contrib/spi/autoinc--1.0.sql */ -CREATE OR REPLACE FUNCTION autoinc() +CREATE FUNCTION autoinc() RETURNS trigger AS 'MODULE_PATHNAME' LANGUAGE C; diff --git a/contrib/spi/insert_username--1.0.sql b/contrib/spi/insert_username--1.0.sql index 3867c57a2c..bd854587e0 100644 --- a/contrib/spi/insert_username--1.0.sql +++ b/contrib/spi/insert_username--1.0.sql @@ -1,6 +1,6 @@ /* contrib/spi/insert_username--1.0.sql */ -CREATE OR REPLACE FUNCTION insert_username() +CREATE FUNCTION insert_username() RETURNS trigger AS 'MODULE_PATHNAME' LANGUAGE C; diff --git a/contrib/spi/moddatetime--1.0.sql b/contrib/spi/moddatetime--1.0.sql index 00971c9fe1..97cc63289f 100644 --- a/contrib/spi/moddatetime--1.0.sql +++ b/contrib/spi/moddatetime--1.0.sql @@ -1,6 +1,6 @@ /* contrib/spi/moddatetime--1.0.sql */ -CREATE OR REPLACE FUNCTION moddatetime() +CREATE FUNCTION moddatetime() RETURNS trigger AS 'MODULE_PATHNAME' LANGUAGE C; diff --git a/contrib/spi/refint--1.0.sql b/contrib/spi/refint--1.0.sql index 5a50226c43..9e5d931df5 100644 --- a/contrib/spi/refint--1.0.sql +++ b/contrib/spi/refint--1.0.sql @@ -1,11 +1,11 @@ /* contrib/spi/refint--1.0.sql */ -CREATE OR REPLACE FUNCTION check_primary_key() +CREATE FUNCTION check_primary_key() RETURNS trigger AS 'MODULE_PATHNAME' LANGUAGE C; -CREATE OR REPLACE FUNCTION check_foreign_key() +CREATE FUNCTION check_foreign_key() RETURNS trigger AS 'MODULE_PATHNAME' LANGUAGE C; diff --git a/contrib/spi/timetravel--1.0.sql b/contrib/spi/timetravel--1.0.sql index c9f786218f..b68cf2f247 100644 --- a/contrib/spi/timetravel--1.0.sql +++ b/contrib/spi/timetravel--1.0.sql @@ -1,16 +1,16 @@ /* contrib/spi/timetravel--1.0.sql */ -CREATE OR REPLACE FUNCTION timetravel() +CREATE FUNCTION timetravel() RETURNS trigger AS 'MODULE_PATHNAME' LANGUAGE C; -CREATE OR REPLACE FUNCTION set_timetravel(name, int4) +CREATE FUNCTION set_timetravel(name, int4) RETURNS int4 AS 'MODULE_PATHNAME' LANGUAGE C RETURNS NULL ON NULL INPUT; -CREATE OR REPLACE FUNCTION get_timetravel(name) +CREATE FUNCTION get_timetravel(name) RETURNS int4 AS 'MODULE_PATHNAME' LANGUAGE C RETURNS NULL ON NULL INPUT; diff --git a/contrib/sslinfo/sslinfo--1.0.sql b/contrib/sslinfo/sslinfo--1.0.sql index 37007e59f7..ef745a0a2e 100644 --- a/contrib/sslinfo/sslinfo--1.0.sql +++ b/contrib/sslinfo/sslinfo--1.0.sql @@ -1,37 +1,37 @@ /* contrib/sslinfo/sslinfo--1.0.sql */ -CREATE OR REPLACE FUNCTION ssl_client_serial() RETURNS numeric +CREATE FUNCTION ssl_client_serial() RETURNS numeric AS 'MODULE_PATHNAME', 'ssl_client_serial' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION ssl_is_used() RETURNS boolean +CREATE FUNCTION ssl_is_used() RETURNS boolean AS 'MODULE_PATHNAME', 'ssl_is_used' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION ssl_version() RETURNS text +CREATE FUNCTION ssl_version() RETURNS text AS 'MODULE_PATHNAME', 'ssl_version' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION ssl_cipher() RETURNS text +CREATE FUNCTION ssl_cipher() RETURNS text AS 'MODULE_PATHNAME', 'ssl_cipher' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION ssl_client_cert_present() RETURNS boolean +CREATE FUNCTION ssl_client_cert_present() RETURNS boolean AS 'MODULE_PATHNAME', 'ssl_client_cert_present' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION ssl_client_dn_field(text) RETURNS text +CREATE FUNCTION ssl_client_dn_field(text) RETURNS text AS 'MODULE_PATHNAME', 'ssl_client_dn_field' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION ssl_issuer_field(text) RETURNS text +CREATE FUNCTION ssl_issuer_field(text) RETURNS text AS 'MODULE_PATHNAME', 'ssl_issuer_field' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION ssl_client_dn() RETURNS text +CREATE FUNCTION ssl_client_dn() RETURNS text AS 'MODULE_PATHNAME', 'ssl_client_dn' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION ssl_issuer_dn() RETURNS text +CREATE FUNCTION ssl_issuer_dn() RETURNS text AS 'MODULE_PATHNAME', 'ssl_issuer_dn' LANGUAGE C STRICT; diff --git a/contrib/tablefunc/tablefunc--1.0.sql b/contrib/tablefunc/tablefunc--1.0.sql index 63dd8c4634..7bf117cb5c 100644 --- a/contrib/tablefunc/tablefunc--1.0.sql +++ b/contrib/tablefunc/tablefunc--1.0.sql @@ -1,12 +1,12 @@ /* contrib/tablefunc/tablefunc--1.0.sql */ -CREATE OR REPLACE FUNCTION normal_rand(int4, float8, float8) +CREATE FUNCTION normal_rand(int4, float8, float8) RETURNS setof float8 AS 'MODULE_PATHNAME','normal_rand' LANGUAGE C VOLATILE STRICT; -- the generic crosstab function: -CREATE OR REPLACE FUNCTION crosstab(text) +CREATE FUNCTION crosstab(text) RETURNS setof record AS 'MODULE_PATHNAME','crosstab' LANGUAGE C STABLE STRICT; @@ -36,50 +36,50 @@ CREATE TYPE tablefunc_crosstab_4 AS category_4 TEXT ); -CREATE OR REPLACE FUNCTION crosstab2(text) +CREATE FUNCTION crosstab2(text) RETURNS setof tablefunc_crosstab_2 AS 'MODULE_PATHNAME','crosstab' LANGUAGE C STABLE STRICT; -CREATE OR REPLACE FUNCTION crosstab3(text) +CREATE FUNCTION crosstab3(text) RETURNS setof tablefunc_crosstab_3 AS 'MODULE_PATHNAME','crosstab' LANGUAGE C STABLE STRICT; -CREATE OR REPLACE FUNCTION crosstab4(text) +CREATE FUNCTION crosstab4(text) RETURNS setof tablefunc_crosstab_4 AS 'MODULE_PATHNAME','crosstab' LANGUAGE C STABLE STRICT; -- obsolete: -CREATE OR REPLACE FUNCTION crosstab(text,int) +CREATE FUNCTION crosstab(text,int) RETURNS setof record AS 'MODULE_PATHNAME','crosstab' LANGUAGE C STABLE STRICT; -CREATE OR REPLACE FUNCTION crosstab(text,text) +CREATE FUNCTION crosstab(text,text) RETURNS setof record AS 'MODULE_PATHNAME','crosstab_hash' LANGUAGE C STABLE STRICT; -CREATE OR REPLACE FUNCTION connectby(text,text,text,text,int,text) +CREATE FUNCTION connectby(text,text,text,text,int,text) RETURNS setof record AS 'MODULE_PATHNAME','connectby_text' LANGUAGE C STABLE STRICT; -CREATE OR REPLACE FUNCTION connectby(text,text,text,text,int) +CREATE FUNCTION connectby(text,text,text,text,int) RETURNS setof record AS 'MODULE_PATHNAME','connectby_text' LANGUAGE C STABLE STRICT; -- These 2 take the name of a field to ORDER BY as 4th arg (for sorting siblings) -CREATE OR REPLACE FUNCTION connectby(text,text,text,text,text,int,text) +CREATE FUNCTION connectby(text,text,text,text,text,int,text) RETURNS setof record AS 'MODULE_PATHNAME','connectby_text_serial' LANGUAGE C STABLE STRICT; -CREATE OR REPLACE FUNCTION connectby(text,text,text,text,text,int) +CREATE FUNCTION connectby(text,text,text,text,text,int) RETURNS setof record AS 'MODULE_PATHNAME','connectby_text_serial' LANGUAGE C STABLE STRICT; diff --git a/contrib/test_parser/test_parser--1.0.sql b/contrib/test_parser/test_parser--1.0.sql index fb785a1c4a..5b8b04bb05 100644 --- a/contrib/test_parser/test_parser--1.0.sql +++ b/contrib/test_parser/test_parser--1.0.sql @@ -1,21 +1,21 @@ /* contrib/test_parser/test_parser--1.0.sql */ -CREATE OR REPLACE FUNCTION testprs_start(internal, int4) +CREATE FUNCTION testprs_start(internal, int4) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION testprs_getlexeme(internal, internal, internal) +CREATE FUNCTION testprs_getlexeme(internal, internal, internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION testprs_end(internal) +CREATE FUNCTION testprs_end(internal) RETURNS void AS 'MODULE_PATHNAME' LANGUAGE C STRICT; -CREATE OR REPLACE FUNCTION testprs_lextype(internal) +CREATE FUNCTION testprs_lextype(internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C STRICT; diff --git a/contrib/tsearch2/tsearch2--1.0.sql b/contrib/tsearch2/tsearch2--1.0.sql index 40386a4c2a..369507e8f5 100644 --- a/contrib/tsearch2/tsearch2--1.0.sql +++ b/contrib/tsearch2/tsearch2--1.0.sql @@ -435,7 +435,7 @@ create type tsdebug as ( "tsvector" tsvector ); -CREATE or replace FUNCTION _get_parser_from_curcfg() +CREATE FUNCTION _get_parser_from_curcfg() RETURNS text as $$select prsname::text from pg_catalog.pg_ts_parser p join pg_ts_config c on cfgparser = p.oid where c.oid = show_curcfg();$$ LANGUAGE SQL RETURNS NULL ON NULL INPUT IMMUTABLE; @@ -461,25 +461,25 @@ where t.tokid = p.tokid $$ LANGUAGE SQL RETURNS NULL ON NULL INPUT; -CREATE OR REPLACE FUNCTION numnode(tsquery) +CREATE FUNCTION numnode(tsquery) RETURNS int4 as 'tsquery_numnode' LANGUAGE INTERNAL RETURNS NULL ON NULL INPUT IMMUTABLE; -CREATE OR REPLACE FUNCTION tsquery_and(tsquery,tsquery) +CREATE FUNCTION tsquery_and(tsquery,tsquery) RETURNS tsquery as 'tsquery_and' LANGUAGE INTERNAL RETURNS NULL ON NULL INPUT IMMUTABLE; -CREATE OR REPLACE FUNCTION tsquery_or(tsquery,tsquery) +CREATE FUNCTION tsquery_or(tsquery,tsquery) RETURNS tsquery as 'tsquery_or' LANGUAGE INTERNAL RETURNS NULL ON NULL INPUT IMMUTABLE; -CREATE OR REPLACE FUNCTION tsquery_not(tsquery) +CREATE FUNCTION tsquery_not(tsquery) RETURNS tsquery as 'tsquery_not' LANGUAGE INTERNAL @@ -487,24 +487,24 @@ CREATE OR REPLACE FUNCTION tsquery_not(tsquery) --------------rewrite subsystem -CREATE OR REPLACE FUNCTION rewrite(tsquery, text) +CREATE FUNCTION rewrite(tsquery, text) RETURNS tsquery as 'tsquery_rewrite_query' LANGUAGE INTERNAL RETURNS NULL ON NULL INPUT IMMUTABLE; -CREATE OR REPLACE FUNCTION rewrite(tsquery, tsquery, tsquery) +CREATE FUNCTION rewrite(tsquery, tsquery, tsquery) RETURNS tsquery as 'tsquery_rewrite' LANGUAGE INTERNAL RETURNS NULL ON NULL INPUT IMMUTABLE; -CREATE OR REPLACE FUNCTION rewrite_accum(tsquery,tsquery[]) +CREATE FUNCTION rewrite_accum(tsquery,tsquery[]) RETURNS tsquery AS 'MODULE_PATHNAME', 'tsa_rewrite_accum' LANGUAGE C; -CREATE OR REPLACE FUNCTION rewrite_finish(tsquery) +CREATE FUNCTION rewrite_finish(tsquery) RETURNS tsquery as 'MODULE_PATHNAME', 'tsa_rewrite_finish' LANGUAGE C; @@ -516,13 +516,13 @@ CREATE AGGREGATE rewrite ( FINALFUNC = rewrite_finish ); -CREATE OR REPLACE FUNCTION tsq_mcontains(tsquery, tsquery) +CREATE FUNCTION tsq_mcontains(tsquery, tsquery) RETURNS bool as 'tsq_mcontains' LANGUAGE INTERNAL RETURNS NULL ON NULL INPUT IMMUTABLE; -CREATE OR REPLACE FUNCTION tsq_mcontained(tsquery, tsquery) +CREATE FUNCTION tsq_mcontained(tsquery, tsquery) RETURNS bool as 'tsq_mcontained' LANGUAGE INTERNAL diff --git a/contrib/unaccent/unaccent--1.0.sql b/contrib/unaccent/unaccent--1.0.sql index 4dc9c3d9c6..b5909e0b55 100644 --- a/contrib/unaccent/unaccent--1.0.sql +++ b/contrib/unaccent/unaccent--1.0.sql @@ -1,21 +1,21 @@ /* contrib/unaccent/unaccent--1.0.sql */ -CREATE OR REPLACE FUNCTION unaccent(regdictionary, text) +CREATE FUNCTION unaccent(regdictionary, text) RETURNS text AS 'MODULE_PATHNAME', 'unaccent_dict' LANGUAGE C STABLE STRICT; -CREATE OR REPLACE FUNCTION unaccent(text) +CREATE FUNCTION unaccent(text) RETURNS text AS 'MODULE_PATHNAME', 'unaccent_dict' LANGUAGE C STABLE STRICT; -CREATE OR REPLACE FUNCTION unaccent_init(internal) +CREATE FUNCTION unaccent_init(internal) RETURNS internal AS 'MODULE_PATHNAME', 'unaccent_init' LANGUAGE C; -CREATE OR REPLACE FUNCTION unaccent_lexize(internal,internal,internal,internal) +CREATE FUNCTION unaccent_lexize(internal,internal,internal,internal) RETURNS internal AS 'MODULE_PATHNAME', 'unaccent_lexize' LANGUAGE C; diff --git a/contrib/uuid-ossp/uuid-ossp--1.0.sql b/contrib/uuid-ossp/uuid-ossp--1.0.sql index 34b32de77e..43ae0b38a0 100644 --- a/contrib/uuid-ossp/uuid-ossp--1.0.sql +++ b/contrib/uuid-ossp/uuid-ossp--1.0.sql @@ -1,51 +1,51 @@ /* contrib/uuid-ossp/uuid-ossp--1.0.sql */ -CREATE OR REPLACE FUNCTION uuid_nil() +CREATE FUNCTION uuid_nil() RETURNS uuid AS 'MODULE_PATHNAME', 'uuid_nil' IMMUTABLE STRICT LANGUAGE C; -CREATE OR REPLACE FUNCTION uuid_ns_dns() +CREATE FUNCTION uuid_ns_dns() RETURNS uuid AS 'MODULE_PATHNAME', 'uuid_ns_dns' IMMUTABLE STRICT LANGUAGE C; -CREATE OR REPLACE FUNCTION uuid_ns_url() +CREATE FUNCTION uuid_ns_url() RETURNS uuid AS 'MODULE_PATHNAME', 'uuid_ns_url' IMMUTABLE STRICT LANGUAGE C; -CREATE OR REPLACE FUNCTION uuid_ns_oid() +CREATE FUNCTION uuid_ns_oid() RETURNS uuid AS 'MODULE_PATHNAME', 'uuid_ns_oid' IMMUTABLE STRICT LANGUAGE C; -CREATE OR REPLACE FUNCTION uuid_ns_x500() +CREATE FUNCTION uuid_ns_x500() RETURNS uuid AS 'MODULE_PATHNAME', 'uuid_ns_x500' IMMUTABLE STRICT LANGUAGE C; -CREATE OR REPLACE FUNCTION uuid_generate_v1() +CREATE FUNCTION uuid_generate_v1() RETURNS uuid AS 'MODULE_PATHNAME', 'uuid_generate_v1' VOLATILE STRICT LANGUAGE C; -CREATE OR REPLACE FUNCTION uuid_generate_v1mc() +CREATE FUNCTION uuid_generate_v1mc() RETURNS uuid AS 'MODULE_PATHNAME', 'uuid_generate_v1mc' VOLATILE STRICT LANGUAGE C; -CREATE OR REPLACE FUNCTION uuid_generate_v3(namespace uuid, name text) +CREATE FUNCTION uuid_generate_v3(namespace uuid, name text) RETURNS uuid AS 'MODULE_PATHNAME', 'uuid_generate_v3' IMMUTABLE STRICT LANGUAGE C; -CREATE OR REPLACE FUNCTION uuid_generate_v4() +CREATE FUNCTION uuid_generate_v4() RETURNS uuid AS 'MODULE_PATHNAME', 'uuid_generate_v4' VOLATILE STRICT LANGUAGE C; -CREATE OR REPLACE FUNCTION uuid_generate_v5(namespace uuid, name text) +CREATE FUNCTION uuid_generate_v5(namespace uuid, name text) RETURNS uuid AS 'MODULE_PATHNAME', 'uuid_generate_v5' IMMUTABLE STRICT LANGUAGE C; diff --git a/contrib/xml2/xml2--1.0.sql b/contrib/xml2/xml2--1.0.sql index 100f57291f..bc27dc89ca 100644 --- a/contrib/xml2/xml2--1.0.sql +++ b/contrib/xml2/xml2--1.0.sql @@ -3,68 +3,68 @@ --SQL for XML parser -- deprecated old name for xml_is_well_formed -CREATE OR REPLACE FUNCTION xml_valid(text) RETURNS bool +CREATE FUNCTION xml_valid(text) RETURNS bool AS 'xml_is_well_formed' LANGUAGE INTERNAL STRICT STABLE; -CREATE OR REPLACE FUNCTION xml_encode_special_chars(text) RETURNS text +CREATE FUNCTION xml_encode_special_chars(text) RETURNS text AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION xpath_string(text,text) RETURNS text +CREATE FUNCTION xpath_string(text,text) RETURNS text AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION xpath_nodeset(text,text,text,text) RETURNS text +CREATE FUNCTION xpath_nodeset(text,text,text,text) RETURNS text AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION xpath_number(text,text) RETURNS float4 +CREATE FUNCTION xpath_number(text,text) RETURNS float4 AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION xpath_bool(text,text) RETURNS boolean +CREATE FUNCTION xpath_bool(text,text) RETURNS boolean AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -- List function -CREATE OR REPLACE FUNCTION xpath_list(text,text,text) RETURNS text +CREATE FUNCTION xpath_list(text,text,text) RETURNS text AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION xpath_list(text,text) RETURNS text +CREATE FUNCTION xpath_list(text,text) RETURNS text AS 'SELECT xpath_list($1,$2,'','')' LANGUAGE SQL STRICT IMMUTABLE; -- Wrapper functions for nodeset where no tags needed -CREATE OR REPLACE FUNCTION xpath_nodeset(text,text) +CREATE FUNCTION xpath_nodeset(text,text) RETURNS text AS 'SELECT xpath_nodeset($1,$2,'''','''')' LANGUAGE SQL STRICT IMMUTABLE; -CREATE OR REPLACE FUNCTION xpath_nodeset(text,text,text) +CREATE FUNCTION xpath_nodeset(text,text,text) RETURNS text AS 'SELECT xpath_nodeset($1,$2,'''',$3)' LANGUAGE SQL STRICT IMMUTABLE; -- Table function -CREATE OR REPLACE FUNCTION xpath_table(text,text,text,text,text) +CREATE FUNCTION xpath_table(text,text,text,text,text) RETURNS setof record AS 'MODULE_PATHNAME' LANGUAGE C STRICT STABLE; -- XSLT functions -CREATE OR REPLACE FUNCTION xslt_process(text,text,text) +CREATE FUNCTION xslt_process(text,text,text) RETURNS text AS 'MODULE_PATHNAME' LANGUAGE C STRICT VOLATILE; -- the function checks for the correct argument count -CREATE OR REPLACE FUNCTION xslt_process(text,text) +CREATE FUNCTION xslt_process(text,text) RETURNS text AS 'MODULE_PATHNAME' LANGUAGE C STRICT IMMUTABLE; -- cgit v1.2.3 From de06cfe834dfff283deddfe1eb2945ba8a4fde2a Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Sun, 13 Feb 2011 23:33:18 -0500 Subject: More fixups for "unpackaged" conversion scripts. --- contrib/sslinfo/sslinfo--unpackaged--1.0.sql | 12 ++++++++++-- contrib/xml2/xml2--unpackaged--1.0.sql | 1 - 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'contrib/xml2') diff --git a/contrib/sslinfo/sslinfo--unpackaged--1.0.sql b/contrib/sslinfo/sslinfo--unpackaged--1.0.sql index c07793905a..befa96e908 100644 --- a/contrib/sslinfo/sslinfo--unpackaged--1.0.sql +++ b/contrib/sslinfo/sslinfo--unpackaged--1.0.sql @@ -2,10 +2,18 @@ ALTER EXTENSION sslinfo ADD function ssl_client_serial(); ALTER EXTENSION sslinfo ADD function ssl_is_used(); -ALTER EXTENSION sslinfo ADD function ssl_version(); -ALTER EXTENSION sslinfo ADD function ssl_cipher(); ALTER EXTENSION sslinfo ADD function ssl_client_cert_present(); ALTER EXTENSION sslinfo ADD function ssl_client_dn_field(text); ALTER EXTENSION sslinfo ADD function ssl_issuer_field(text); ALTER EXTENSION sslinfo ADD function ssl_client_dn(); ALTER EXTENSION sslinfo ADD function ssl_issuer_dn(); + +-- These functions were not in 9.0: + +CREATE FUNCTION ssl_version() RETURNS text +AS 'MODULE_PATHNAME', 'ssl_version' +LANGUAGE C STRICT; + +CREATE FUNCTION ssl_cipher() RETURNS text +AS 'MODULE_PATHNAME', 'ssl_cipher' +LANGUAGE C STRICT; diff --git a/contrib/xml2/xml2--unpackaged--1.0.sql b/contrib/xml2/xml2--unpackaged--1.0.sql index a4716cf916..2cd40d7960 100644 --- a/contrib/xml2/xml2--unpackaged--1.0.sql +++ b/contrib/xml2/xml2--unpackaged--1.0.sql @@ -13,4 +13,3 @@ ALTER EXTENSION xml2 ADD function xpath_nodeset(text,text,text,text); ALTER EXTENSION xml2 ADD function xpath_string(text,text); ALTER EXTENSION xml2 ADD function xml_encode_special_chars(text); ALTER EXTENSION xml2 ADD function xml_valid(text); -ALTER EXTENSION xml2 ADD function xml_is_well_formed(text); -- cgit v1.2.3 From de623f33353c96657651f9c3a6c8756616c610e4 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Thu, 17 Feb 2011 18:11:28 -0500 Subject: Fix upgrade of contrib/xml2 from 9.0. Update script was being sloppy about two functions that have been changed since 9.0. --- contrib/xml2/xml2--unpackaged--1.0.sql | 11 +++++++++++ contrib/xml2/xml2.control | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) (limited to 'contrib/xml2') diff --git a/contrib/xml2/xml2--unpackaged--1.0.sql b/contrib/xml2/xml2--unpackaged--1.0.sql index 2cd40d7960..1aa894a619 100644 --- a/contrib/xml2/xml2--unpackaged--1.0.sql +++ b/contrib/xml2/xml2--unpackaged--1.0.sql @@ -13,3 +13,14 @@ ALTER EXTENSION xml2 ADD function xpath_nodeset(text,text,text,text); ALTER EXTENSION xml2 ADD function xpath_string(text,text); ALTER EXTENSION xml2 ADD function xml_encode_special_chars(text); ALTER EXTENSION xml2 ADD function xml_valid(text); + +-- xml_valid is now an alias for core xml_is_well_formed() + +CREATE OR REPLACE FUNCTION xml_valid(text) RETURNS bool +AS 'xml_is_well_formed' +LANGUAGE INTERNAL STRICT STABLE; + +-- xml_is_well_formed is now in core, not needed in extension. +-- be careful to drop extension's copy not core's. + +DROP FUNCTION @extschema@.xml_is_well_formed(text); diff --git a/contrib/xml2/xml2.control b/contrib/xml2/xml2.control index 004649d652..51de678d5f 100644 --- a/contrib/xml2/xml2.control +++ b/contrib/xml2/xml2.control @@ -2,4 +2,5 @@ comment = 'XPath querying and XSLT' default_version = '1.0' module_pathname = '$libdir/pgxml' -relocatable = true +# non-relocatable because xml2--unpackaged--1.0.sql needs to use @extschema@ +relocatable = false -- cgit v1.2.3 From bf50caf105a901c4f83ac1df3cdaf910c26694a4 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Sun, 10 Apr 2011 11:42:00 -0400 Subject: pgindent run before PG 9.1 beta 1. --- contrib/adminpack/adminpack.c | 13 +- contrib/auth_delay/auth_delay.c | 6 +- contrib/btree_gist/btree_cash.c | 2 +- contrib/btree_gist/btree_date.c | 14 +- contrib/btree_gist/btree_float4.c | 8 +- contrib/btree_gist/btree_float8.c | 10 +- contrib/btree_gist/btree_int2.c | 8 +- contrib/btree_gist/btree_int4.c | 14 +- contrib/btree_gist/btree_int8.c | 14 +- contrib/btree_gist/btree_interval.c | 6 +- contrib/btree_gist/btree_oid.c | 10 +- contrib/btree_gist/btree_time.c | 6 +- contrib/btree_gist/btree_ts.c | 33 +- contrib/btree_gist/btree_utils_num.c | 8 +- contrib/btree_gist/btree_utils_num.h | 6 +- contrib/btree_gist/btree_utils_var.c | 2 +- contrib/dummy_seclabel/dummy_seclabel.c | 2 +- contrib/file_fdw/file_fdw.c | 91 ++- contrib/fuzzystrmatch/levenshtein.c | 91 +-- contrib/hstore/hstore_gin.c | 4 +- contrib/hstore/hstore_op.c | 4 +- contrib/intarray/_int_bool.c | 6 +- contrib/intarray/_int_gin.c | 7 +- contrib/intarray/_int_tool.c | 4 +- contrib/isn/ISBN.h | 1 - contrib/pg_archivecleanup/pg_archivecleanup.c | 4 +- contrib/pg_stat_statements/pg_stat_statements.c | 2 +- contrib/pg_test_fsync/pg_test_fsync.c | 75 +-- contrib/pg_trgm/trgm.h | 7 +- contrib/pg_trgm/trgm_gin.c | 20 +- contrib/pg_trgm/trgm_gist.c | 46 +- contrib/pg_trgm/trgm_op.c | 11 +- contrib/pg_upgrade/check.c | 7 +- contrib/pg_upgrade/controldata.c | 3 +- contrib/pg_upgrade/exec.c | 2 +- contrib/pg_upgrade/file.c | 1 + contrib/pg_upgrade/function.c | 16 +- contrib/pg_upgrade/info.c | 54 +- contrib/pg_upgrade/pg_upgrade.c | 21 +- contrib/pg_upgrade/pg_upgrade.h | 38 +- contrib/pg_upgrade/relfilenode.c | 20 +- contrib/pg_upgrade/server.c | 14 +- contrib/pg_upgrade/tablespace.c | 4 +- contrib/pg_upgrade/util.c | 2 +- contrib/pg_upgrade/version_old_8_3.c | 2 +- contrib/pg_upgrade_support/pg_upgrade_support.c | 8 +- contrib/pgbench/pgbench.c | 36 +- contrib/seg/seg.c | 2 +- contrib/sepgsql/dml.c | 37 +- contrib/sepgsql/hooks.c | 142 ++--- contrib/sepgsql/label.c | 121 ++-- contrib/sepgsql/proc.c | 28 +- contrib/sepgsql/relation.c | 55 +- contrib/sepgsql/schema.c | 18 +- contrib/sepgsql/selinux.c | 740 +++++++++++++++++------- contrib/sepgsql/sepgsql.h | 41 +- contrib/spi/moddatetime.c | 2 +- contrib/xml2/xpath.c | 12 +- contrib/xml2/xslt_proc.c | 3 +- src/backend/access/common/heaptuple.c | 2 +- src/backend/access/common/indextuple.c | 2 +- src/backend/access/gin/ginarrayproc.c | 13 +- src/backend/access/gin/ginbulk.c | 10 +- src/backend/access/gin/gindatapage.c | 10 +- src/backend/access/gin/ginentrypage.c | 16 +- src/backend/access/gin/ginfast.c | 18 +- src/backend/access/gin/ginget.c | 143 +++-- src/backend/access/gin/gininsert.c | 12 +- src/backend/access/gin/ginscan.c | 23 +- src/backend/access/gin/ginutil.c | 38 +- src/backend/access/gin/ginvacuum.c | 2 +- src/backend/access/gin/ginxlog.c | 8 +- src/backend/access/gist/gist.c | 152 ++--- src/backend/access/gist/gistget.c | 22 +- src/backend/access/gist/gistproc.c | 6 +- src/backend/access/gist/gistscan.c | 11 +- src/backend/access/gist/gistutil.c | 3 +- src/backend/access/gist/gistxlog.c | 17 +- src/backend/access/hash/hash.c | 1 + src/backend/access/heap/heapam.c | 36 +- src/backend/access/heap/hio.c | 2 +- src/backend/access/heap/rewriteheap.c | 4 +- src/backend/access/index/indexam.c | 2 +- src/backend/access/nbtree/nbtinsert.c | 20 +- src/backend/access/nbtree/nbtpage.c | 6 +- src/backend/access/nbtree/nbtree.c | 3 +- src/backend/access/nbtree/nbtsearch.c | 6 +- src/backend/access/nbtree/nbtsort.c | 2 +- src/backend/access/nbtree/nbtutils.c | 8 +- src/backend/access/transam/twophase.c | 14 +- src/backend/access/transam/varsup.c | 6 +- src/backend/access/transam/xact.c | 61 +- src/backend/access/transam/xlog.c | 208 +++---- src/backend/catalog/aclchk.c | 16 +- src/backend/catalog/catalog.c | 23 +- src/backend/catalog/dependency.c | 22 +- src/backend/catalog/heap.c | 60 +- src/backend/catalog/index.c | 64 +- src/backend/catalog/namespace.c | 24 +- src/backend/catalog/objectaddress.c | 52 +- src/backend/catalog/pg_collation.c | 16 +- src/backend/catalog/pg_constraint.c | 6 +- src/backend/catalog/pg_depend.c | 8 +- src/backend/catalog/pg_enum.c | 88 +-- src/backend/catalog/pg_proc.c | 6 +- src/backend/catalog/pg_type.c | 4 +- src/backend/catalog/storage.c | 4 +- src/backend/catalog/toasting.c | 2 +- src/backend/commands/alter.c | 40 +- src/backend/commands/analyze.c | 10 +- src/backend/commands/cluster.c | 22 +- src/backend/commands/collationcmds.c | 18 +- src/backend/commands/comment.c | 20 +- src/backend/commands/conversioncmds.c | 5 +- src/backend/commands/copy.c | 108 ++-- src/backend/commands/dbcommands.c | 12 +- src/backend/commands/explain.c | 26 +- src/backend/commands/extension.c | 318 +++++----- src/backend/commands/foreigncmds.c | 8 +- src/backend/commands/functioncmds.c | 4 +- src/backend/commands/indexcmds.c | 14 +- src/backend/commands/opclasscmds.c | 32 +- src/backend/commands/operatorcmds.c | 5 +- src/backend/commands/portalcmds.c | 8 +- src/backend/commands/prepare.c | 2 +- src/backend/commands/seclabel.c | 43 +- src/backend/commands/sequence.c | 4 +- src/backend/commands/tablecmds.c | 295 +++++----- src/backend/commands/tablespace.c | 14 +- src/backend/commands/trigger.c | 36 +- src/backend/commands/tsearchcmds.c | 20 +- src/backend/commands/typecmds.c | 8 +- src/backend/commands/user.c | 19 +- src/backend/commands/vacuum.c | 10 +- src/backend/commands/vacuumlazy.c | 7 +- src/backend/commands/variable.c | 24 +- src/backend/commands/view.c | 13 +- src/backend/executor/execMain.c | 59 +- src/backend/executor/execQual.c | 6 +- src/backend/executor/execUtils.c | 6 +- src/backend/executor/functions.c | 46 +- src/backend/executor/nodeAgg.c | 8 +- src/backend/executor/nodeBitmapIndexscan.c | 4 +- src/backend/executor/nodeForeignscan.c | 2 +- src/backend/executor/nodeHash.c | 16 +- src/backend/executor/nodeHashjoin.c | 53 +- src/backend/executor/nodeIndexscan.c | 20 +- src/backend/executor/nodeLimit.c | 14 +- src/backend/executor/nodeLockRows.c | 2 +- src/backend/executor/nodeMergeAppend.c | 36 +- src/backend/executor/nodeMergejoin.c | 2 +- src/backend/executor/nodeModifyTable.c | 40 +- src/backend/executor/nodeNestloop.c | 11 +- src/backend/executor/nodeRecursiveunion.c | 2 +- src/backend/executor/nodeSetOp.c | 2 +- src/backend/executor/nodeWindowAgg.c | 2 +- src/backend/executor/spi.c | 10 +- src/backend/libpq/auth.c | 63 +- src/backend/libpq/hba.c | 24 +- src/backend/libpq/pqcomm.c | 57 +- src/backend/main/main.c | 9 +- src/backend/nodes/copyfuncs.c | 6 +- src/backend/nodes/nodeFuncs.c | 43 +- src/backend/nodes/params.c | 2 +- src/backend/optimizer/path/allpaths.c | 38 +- src/backend/optimizer/path/costsize.c | 28 +- src/backend/optimizer/path/equivclass.c | 14 +- src/backend/optimizer/path/indxpath.c | 42 +- src/backend/optimizer/path/joinpath.c | 8 +- src/backend/optimizer/path/joinrels.c | 10 +- src/backend/optimizer/path/pathkeys.c | 14 +- src/backend/optimizer/plan/analyzejoins.c | 15 +- src/backend/optimizer/plan/createplan.c | 56 +- src/backend/optimizer/plan/initsplan.c | 13 +- src/backend/optimizer/plan/planagg.c | 40 +- src/backend/optimizer/plan/planmain.c | 14 +- src/backend/optimizer/plan/planner.c | 18 +- src/backend/optimizer/prep/prepjointree.c | 22 +- src/backend/optimizer/prep/prepqual.c | 39 +- src/backend/optimizer/prep/preptlist.c | 4 +- src/backend/optimizer/prep/prepunion.c | 2 +- src/backend/optimizer/util/clauses.c | 64 +- src/backend/optimizer/util/pathnode.c | 6 +- src/backend/optimizer/util/placeholder.c | 4 +- src/backend/optimizer/util/predtest.c | 2 +- src/backend/optimizer/util/var.c | 2 +- src/backend/parser/analyze.c | 28 +- src/backend/parser/parse_agg.c | 10 +- src/backend/parser/parse_clause.c | 8 +- src/backend/parser/parse_coerce.c | 8 +- src/backend/parser/parse_collate.c | 93 +-- src/backend/parser/parse_cte.c | 8 +- src/backend/parser/parse_expr.c | 16 +- src/backend/parser/parse_func.c | 8 +- src/backend/parser/parse_node.c | 8 +- src/backend/parser/parse_oper.c | 6 +- src/backend/parser/parse_param.c | 4 +- src/backend/parser/parse_relation.c | 10 +- src/backend/parser/parse_target.c | 6 +- src/backend/parser/parse_utilcmd.c | 71 +-- src/backend/port/dynloader/freebsd.c | 2 +- src/backend/port/dynloader/netbsd.c | 2 +- src/backend/port/dynloader/openbsd.c | 2 +- src/backend/port/pipe.c | 8 +- src/backend/port/sysv_shmem.c | 8 +- src/backend/port/unix_latch.c | 80 +-- src/backend/port/win32/crashdump.c | 60 +- src/backend/port/win32/timer.c | 2 +- src/backend/port/win32_latch.c | 28 +- src/backend/postmaster/autovacuum.c | 34 +- src/backend/postmaster/bgwriter.c | 25 +- src/backend/postmaster/pgstat.c | 13 +- src/backend/postmaster/postmaster.c | 75 ++- src/backend/postmaster/syslogger.c | 8 +- src/backend/regex/regcomp.c | 2 +- src/backend/replication/basebackup.c | 37 +- src/backend/replication/syncrep.c | 136 ++--- src/backend/replication/walreceiver.c | 47 +- src/backend/replication/walreceiverfuncs.c | 4 +- src/backend/replication/walsender.c | 130 ++--- src/backend/rewrite/rewriteDefine.c | 6 +- src/backend/rewrite/rewriteHandler.c | 36 +- src/backend/rewrite/rewriteSupport.c | 2 +- src/backend/storage/buffer/bufmgr.c | 16 +- src/backend/storage/buffer/freelist.c | 2 +- src/backend/storage/buffer/localbuf.c | 8 +- src/backend/storage/file/fd.c | 20 +- src/backend/storage/file/reinit.c | 60 +- src/backend/storage/ipc/pmsignal.c | 10 +- src/backend/storage/ipc/procarray.c | 42 +- src/backend/storage/ipc/standby.c | 16 +- src/backend/storage/large_object/inv_api.c | 4 +- src/backend/storage/lmgr/lock.c | 3 +- src/backend/storage/lmgr/predicate.c | 119 ++-- src/backend/storage/smgr/md.c | 10 +- src/backend/storage/smgr/smgr.c | 6 +- src/backend/tcop/postgres.c | 23 +- src/backend/tcop/pquery.c | 6 +- src/backend/tcop/utility.c | 7 +- src/backend/tsearch/spell.c | 2 +- src/backend/tsearch/ts_locale.c | 11 +- src/backend/tsearch/ts_selfuncs.c | 8 +- src/backend/tsearch/wparser_def.c | 709 ++++++++++++----------- src/backend/utils/adt/acl.c | 4 +- src/backend/utils/adt/arrayfuncs.c | 5 +- src/backend/utils/adt/cash.c | 24 +- src/backend/utils/adt/date.c | 2 +- src/backend/utils/adt/datetime.c | 2 +- src/backend/utils/adt/dbsize.c | 2 +- src/backend/utils/adt/enum.c | 4 +- src/backend/utils/adt/formatting.c | 24 +- src/backend/utils/adt/genfile.c | 13 +- src/backend/utils/adt/like.c | 24 +- src/backend/utils/adt/nabstime.c | 6 +- src/backend/utils/adt/network.c | 60 +- src/backend/utils/adt/numeric.c | 53 +- src/backend/utils/adt/numutils.c | 16 +- src/backend/utils/adt/pg_locale.c | 41 +- src/backend/utils/adt/pgstatfuncs.c | 18 +- src/backend/utils/adt/ri_triggers.c | 20 +- src/backend/utils/adt/ruleutils.c | 46 +- src/backend/utils/adt/selfuncs.c | 157 +++-- src/backend/utils/adt/tsginidx.c | 10 +- src/backend/utils/adt/tsvector_op.c | 1 + src/backend/utils/adt/varbit.c | 1 + src/backend/utils/adt/varlena.c | 108 ++-- src/backend/utils/adt/xml.c | 20 +- src/backend/utils/cache/inval.c | 3 +- src/backend/utils/cache/lsyscache.c | 10 +- src/backend/utils/cache/plancache.c | 4 +- src/backend/utils/cache/relcache.c | 8 +- src/backend/utils/cache/syscache.c | 2 +- src/backend/utils/cache/ts_cache.c | 2 +- src/backend/utils/cache/typcache.c | 67 +-- src/backend/utils/error/elog.c | 11 +- src/backend/utils/fmgr/fmgr.c | 12 +- src/backend/utils/fmgr/funcapi.c | 6 +- src/backend/utils/init/miscinit.c | 12 +- src/backend/utils/init/postinit.c | 10 +- src/backend/utils/mb/mbutils.c | 12 +- src/backend/utils/misc/guc.c | 87 +-- src/backend/utils/misc/rbtree.c | 14 +- src/backend/utils/misc/tzparser.c | 2 +- src/backend/utils/mmgr/aset.c | 4 +- src/backend/utils/mmgr/portalmem.c | 14 +- src/backend/utils/resowner/resowner.c | 2 +- src/backend/utils/sort/tuplesort.c | 18 +- src/backend/utils/time/snapmgr.c | 6 +- src/bin/initdb/initdb.c | 67 ++- src/bin/pg_basebackup/pg_basebackup.c | 11 +- src/bin/pg_ctl/pg_ctl.c | 47 +- src/bin/pg_dump/compress_io.c | 134 +++-- src/bin/pg_dump/compress_io.h | 22 +- src/bin/pg_dump/dumputils.c | 2 +- src/bin/pg_dump/dumputils.h | 2 +- src/bin/pg_dump/pg_backup_archiver.c | 30 +- src/bin/pg_dump/pg_backup_archiver.h | 9 +- src/bin/pg_dump/pg_backup_custom.c | 5 +- src/bin/pg_dump/pg_backup_directory.c | 73 +-- src/bin/pg_dump/pg_backup_tar.c | 2 +- src/bin/pg_dump/pg_dump.c | 266 ++++----- src/bin/pg_dump/pg_dump.h | 10 +- src/bin/pg_dump/pg_dumpall.c | 2 +- src/bin/psql/command.c | 18 +- src/bin/psql/describe.c | 239 ++++---- src/bin/psql/tab-complete.c | 53 +- src/bin/scripts/droplang.c | 4 +- src/include/access/gin.h | 6 +- src/include/access/gin_private.h | 48 +- src/include/access/gist.h | 2 +- src/include/access/gist_private.h | 20 +- src/include/access/hio.h | 4 +- src/include/access/htup.h | 2 +- src/include/access/itup.h | 2 +- src/include/access/relscan.h | 12 +- src/include/access/tupdesc.h | 4 +- src/include/access/xact.h | 10 +- src/include/access/xlog.h | 12 +- src/include/access/xlogdefs.h | 2 +- src/include/catalog/catalog.h | 6 +- src/include/catalog/dependency.h | 4 +- src/include/catalog/namespace.h | 2 +- src/include/catalog/objectaccess.h | 12 +- src/include/catalog/pg_am.h | 2 +- src/include/catalog/pg_amop.h | 62 +- src/include/catalog/pg_authid.h | 2 +- src/include/catalog/pg_class.h | 4 +- src/include/catalog/pg_collation.h | 2 +- src/include/catalog/pg_collation_fn.h | 6 +- src/include/catalog/pg_constraint.h | 6 +- src/include/catalog/pg_control.h | 6 +- src/include/catalog/pg_enum.h | 2 +- src/include/catalog/pg_extension.h | 8 +- src/include/catalog/pg_index.h | 2 +- src/include/catalog/pg_operator.h | 2 +- src/include/catalog/pg_proc.h | 30 +- src/include/catalog/pg_seclabel.h | 14 +- src/include/catalog/pg_type.h | 9 +- src/include/catalog/storage.h | 2 +- src/include/commands/alter.h | 2 +- src/include/commands/collationcmds.h | 2 +- src/include/commands/copy.h | 6 +- src/include/commands/dbcommands.h | 4 +- src/include/commands/defrem.h | 14 +- src/include/commands/explain.h | 10 +- src/include/commands/extension.h | 4 +- src/include/commands/proclang.h | 2 +- src/include/commands/seclabel.h | 10 +- src/include/commands/trigger.h | 2 +- src/include/commands/typecmds.h | 2 +- src/include/commands/vacuum.h | 2 +- src/include/executor/executor.h | 6 +- src/include/executor/functions.h | 2 +- src/include/executor/hashjoin.h | 4 +- src/include/executor/nodeHash.h | 4 +- src/include/fmgr.h | 16 +- src/include/foreign/fdwapi.h | 30 +- src/include/foreign/foreign.h | 4 +- src/include/libpq/auth.h | 2 +- src/include/libpq/libpq-be.h | 12 +- src/include/libpq/libpq.h | 2 +- src/include/nodes/execnodes.h | 12 +- src/include/nodes/makefuncs.h | 4 +- src/include/nodes/params.h | 2 +- src/include/nodes/parsenodes.h | 24 +- src/include/nodes/pg_list.h | 2 +- src/include/nodes/plannodes.h | 10 +- src/include/nodes/primnodes.h | 9 +- src/include/nodes/relation.h | 10 +- src/include/optimizer/cost.h | 2 +- src/include/optimizer/pathnode.h | 6 +- src/include/optimizer/paths.h | 6 +- src/include/optimizer/placeholder.h | 2 +- src/include/optimizer/subselect.h | 2 +- src/include/parser/parse_collate.h | 2 +- src/include/parser/parse_func.h | 2 +- src/include/parser/parse_type.h | 8 +- src/include/parser/parser.h | 2 +- src/include/pgstat.h | 4 +- src/include/port/win32.h | 14 +- src/include/replication/replnodes.h | 6 +- src/include/replication/syncrep.h | 2 +- src/include/replication/walprotocol.h | 14 +- src/include/replication/walreceiver.h | 14 +- src/include/replication/walsender.h | 26 +- src/include/rewrite/rewriteSupport.h | 4 +- src/include/storage/backendid.h | 2 +- src/include/storage/buf_internals.h | 3 +- src/include/storage/latch.h | 11 +- src/include/storage/pmsignal.h | 2 +- src/include/storage/predicate_internals.h | 14 +- src/include/storage/proc.h | 8 +- src/include/storage/procarray.h | 2 +- src/include/storage/relfilenode.h | 4 +- src/include/tsearch/dicts/spell.h | 6 +- src/include/utils/acl.h | 2 +- src/include/utils/builtins.h | 2 +- src/include/utils/bytea.h | 2 +- src/include/utils/datetime.h | 2 +- src/include/utils/elog.h | 5 +- src/include/utils/guc.h | 6 +- src/include/utils/lsyscache.h | 4 +- src/include/utils/numeric.h | 2 +- src/include/utils/portal.h | 4 +- src/include/utils/rbtree.h | 6 +- src/include/utils/rel.h | 8 +- src/include/utils/tuplesort.h | 14 +- src/include/utils/typcache.h | 6 +- src/include/utils/varbit.h | 1 + src/include/utils/xml.h | 4 +- src/interfaces/ecpg/compatlib/informix.c | 20 +- src/interfaces/ecpg/ecpglib/connect.c | 2 +- src/interfaces/ecpg/ecpglib/memory.c | 2 +- src/interfaces/ecpg/ecpglib/prepare.c | 4 +- src/interfaces/ecpg/preproc/ecpg.c | 4 +- src/interfaces/ecpg/preproc/extern.h | 4 +- src/interfaces/libpq/fe-auth.c | 15 +- src/interfaces/libpq/fe-connect.c | 93 ++- src/interfaces/libpq/fe-exec.c | 14 +- src/interfaces/libpq/fe-protocol2.c | 15 +- src/interfaces/libpq/fe-protocol3.c | 4 +- src/interfaces/libpq/fe-secure.c | 10 +- src/interfaces/libpq/libpq-fe.h | 2 +- src/interfaces/libpq/libpq-int.h | 7 +- src/pl/plperl/plperl.c | 2 +- src/pl/plperl/plperl.h | 8 +- src/pl/plperl/plperl_helpers.h | 14 +- src/pl/plpgsql/src/pl_comp.c | 26 +- src/pl/plpgsql/src/pl_exec.c | 64 +- src/pl/plpgsql/src/plpgsql.h | 4 +- src/pl/plpython/plpython.c | 202 +++---- src/pl/tcl/pltcl.c | 17 +- src/port/chklocale.c | 2 +- src/port/crypt.c | 2 +- src/port/dirmod.c | 2 +- src/port/exec.c | 2 +- src/port/getaddrinfo.c | 8 +- src/port/inet_net_ntop.c | 10 +- src/port/path.c | 19 +- src/port/pgmkdirp.c | 12 +- src/port/snprintf.c | 50 +- src/port/unsetenv.c | 4 +- src/test/isolation/isolation_main.c | 6 +- src/test/isolation/isolationtester.c | 116 ++-- src/test/isolation/isolationtester.h | 10 +- src/test/regress/pg_regress.c | 4 +- 446 files changed, 5742 insertions(+), 5263 deletions(-) (limited to 'contrib/xml2') diff --git a/contrib/adminpack/adminpack.c b/contrib/adminpack/adminpack.c index c149dd6c63..99fa02e813 100644 --- a/contrib/adminpack/adminpack.c +++ b/contrib/adminpack/adminpack.c @@ -78,18 +78,19 @@ convert_and_check_filename(text *arg, bool logAllowed) /* Disallow '/a/b/data/..' */ if (path_contains_parent_reference(filename)) ereport(ERROR, - (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE), - (errmsg("reference to parent directory (\"..\") not allowed")))); + (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE), + (errmsg("reference to parent directory (\"..\") not allowed")))); + /* - * Allow absolute paths if within DataDir or Log_directory, even - * though Log_directory might be outside DataDir. + * Allow absolute paths if within DataDir or Log_directory, even + * though Log_directory might be outside DataDir. */ if (!path_is_prefix_of_path(DataDir, filename) && (!logAllowed || !is_absolute_path(Log_directory) || !path_is_prefix_of_path(Log_directory, filename))) ereport(ERROR, - (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE), - (errmsg("absolute path not allowed")))); + (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE), + (errmsg("absolute path not allowed")))); } else if (!path_is_relative_and_below_cwd(filename)) ereport(ERROR, diff --git a/contrib/auth_delay/auth_delay.c b/contrib/auth_delay/auth_delay.c index ca388c4498..4e0d5959d1 100644 --- a/contrib/auth_delay/auth_delay.c +++ b/contrib/auth_delay/auth_delay.c @@ -18,13 +18,13 @@ PG_MODULE_MAGIC; -void _PG_init(void); +void _PG_init(void); /* GUC Variables */ static int auth_delay_milliseconds; /* Original Hook */ -static ClientAuthentication_hook_type original_client_auth_hook = NULL; +static ClientAuthentication_hook_type original_client_auth_hook = NULL; /* * Check authentication @@ -55,7 +55,7 @@ _PG_init(void) { /* Define custom GUC variables */ DefineCustomIntVariable("auth_delay.milliseconds", - "Milliseconds to delay before reporting authentication failure", + "Milliseconds to delay before reporting authentication failure", NULL, &auth_delay_milliseconds, 0, diff --git a/contrib/btree_gist/btree_cash.c b/contrib/btree_gist/btree_cash.c index 7938a70f17..2664a26870 100644 --- a/contrib/btree_gist/btree_cash.c +++ b/contrib/btree_gist/btree_cash.c @@ -169,7 +169,7 @@ gbt_cash_distance(PG_FUNCTION_ARGS) key.upper = (GBT_NUMKEY *) &kkk->upper; PG_RETURN_FLOAT8( - gbt_num_distance(&key, (void *) &query, GIST_LEAF(entry), &tinfo) + gbt_num_distance(&key, (void *) &query, GIST_LEAF(entry), &tinfo) ); } diff --git a/contrib/btree_gist/btree_date.c b/contrib/btree_gist/btree_date.c index ccd7e2ad3f..8a675e2f1d 100644 --- a/contrib/btree_gist/btree_date.c +++ b/contrib/btree_gist/btree_date.c @@ -90,9 +90,9 @@ static float8 gdb_date_dist(const void *a, const void *b) { /* we assume the difference can't overflow */ - Datum diff = DirectFunctionCall2(date_mi, + Datum diff = DirectFunctionCall2(date_mi, DateADTGetDatum(*((const DateADT *) a)), - DateADTGetDatum(*((const DateADT *) b))); + DateADTGetDatum(*((const DateADT *) b))); return (float8) Abs(DatumGetInt32(diff)); } @@ -113,14 +113,14 @@ static const gbtree_ninfo tinfo = PG_FUNCTION_INFO_V1(date_dist); -Datum date_dist(PG_FUNCTION_ARGS); +Datum date_dist(PG_FUNCTION_ARGS); Datum date_dist(PG_FUNCTION_ARGS) { /* we assume the difference can't overflow */ - Datum diff = DirectFunctionCall2(date_mi, - PG_GETARG_DATUM(0), - PG_GETARG_DATUM(1)); + Datum diff = DirectFunctionCall2(date_mi, + PG_GETARG_DATUM(0), + PG_GETARG_DATUM(1)); PG_RETURN_INT32(Abs(DatumGetInt32(diff))); } @@ -181,7 +181,7 @@ gbt_date_distance(PG_FUNCTION_ARGS) key.upper = (GBT_NUMKEY *) &kkk->upper; PG_RETURN_FLOAT8( - gbt_num_distance(&key, (void *) &query, GIST_LEAF(entry), &tinfo) + gbt_num_distance(&key, (void *) &query, GIST_LEAF(entry), &tinfo) ); } diff --git a/contrib/btree_gist/btree_float4.c b/contrib/btree_gist/btree_float4.c index 932a941f88..266256b23c 100644 --- a/contrib/btree_gist/btree_float4.c +++ b/contrib/btree_gist/btree_float4.c @@ -94,18 +94,18 @@ static const gbtree_ninfo tinfo = PG_FUNCTION_INFO_V1(float4_dist); -Datum float4_dist(PG_FUNCTION_ARGS); +Datum float4_dist(PG_FUNCTION_ARGS); Datum float4_dist(PG_FUNCTION_ARGS) { - float4 a = PG_GETARG_FLOAT4(0); + float4 a = PG_GETARG_FLOAT4(0); float4 b = PG_GETARG_FLOAT4(1); float4 r; r = a - b; CHECKFLOATVAL(r, isinf(a) || isinf(b), true); - PG_RETURN_FLOAT4( Abs(r) ); + PG_RETURN_FLOAT4(Abs(r)); } @@ -162,7 +162,7 @@ gbt_float4_distance(PG_FUNCTION_ARGS) key.upper = (GBT_NUMKEY *) &kkk->upper; PG_RETURN_FLOAT8( - gbt_num_distance(&key, (void *) &query, GIST_LEAF(entry), &tinfo) + gbt_num_distance(&key, (void *) &query, GIST_LEAF(entry), &tinfo) ); } diff --git a/contrib/btree_gist/btree_float8.c b/contrib/btree_gist/btree_float8.c index 0c39980ba1..efbee0f3e4 100644 --- a/contrib/btree_gist/btree_float8.c +++ b/contrib/btree_gist/btree_float8.c @@ -76,8 +76,8 @@ gbt_float8key_cmp(const void *a, const void *b) static float8 gbt_float8_dist(const void *a, const void *b) { - float8 arg1 = *(const float8 *)a; - float8 arg2 = *(const float8 *)b; + float8 arg1 = *(const float8 *) a; + float8 arg2 = *(const float8 *) b; float8 r; r = arg1 - arg2; @@ -102,7 +102,7 @@ static const gbtree_ninfo tinfo = PG_FUNCTION_INFO_V1(float8_dist); -Datum float8_dist(PG_FUNCTION_ARGS); +Datum float8_dist(PG_FUNCTION_ARGS); Datum float8_dist(PG_FUNCTION_ARGS) { @@ -113,7 +113,7 @@ float8_dist(PG_FUNCTION_ARGS) r = a - b; CHECKFLOATVAL(r, isinf(a) || isinf(b), true); - PG_RETURN_FLOAT8( Abs(r) ); + PG_RETURN_FLOAT8(Abs(r)); } /************************************************** @@ -169,7 +169,7 @@ gbt_float8_distance(PG_FUNCTION_ARGS) key.upper = (GBT_NUMKEY *) &kkk->upper; PG_RETURN_FLOAT8( - gbt_num_distance(&key, (void *) &query, GIST_LEAF(entry), &tinfo) + gbt_num_distance(&key, (void *) &query, GIST_LEAF(entry), &tinfo) ); } diff --git a/contrib/btree_gist/btree_int2.c b/contrib/btree_gist/btree_int2.c index c06d170a5e..7841145b53 100644 --- a/contrib/btree_gist/btree_int2.c +++ b/contrib/btree_gist/btree_int2.c @@ -94,12 +94,12 @@ static const gbtree_ninfo tinfo = PG_FUNCTION_INFO_V1(int2_dist); -Datum int2_dist(PG_FUNCTION_ARGS); +Datum int2_dist(PG_FUNCTION_ARGS); Datum int2_dist(PG_FUNCTION_ARGS) { - int2 a = PG_GETARG_INT16(0); - int2 b = PG_GETARG_INT16(1); + int2 a = PG_GETARG_INT16(0); + int2 b = PG_GETARG_INT16(1); int2 r; int2 ra; @@ -169,7 +169,7 @@ gbt_int2_distance(PG_FUNCTION_ARGS) key.upper = (GBT_NUMKEY *) &kkk->upper; PG_RETURN_FLOAT8( - gbt_num_distance(&key, (void *) &query, GIST_LEAF(entry), &tinfo) + gbt_num_distance(&key, (void *) &query, GIST_LEAF(entry), &tinfo) ); } diff --git a/contrib/btree_gist/btree_int4.c b/contrib/btree_gist/btree_int4.c index ef7af524e7..0e4b4f85b0 100644 --- a/contrib/btree_gist/btree_int4.c +++ b/contrib/btree_gist/btree_int4.c @@ -95,14 +95,14 @@ static const gbtree_ninfo tinfo = PG_FUNCTION_INFO_V1(int4_dist); -Datum int4_dist(PG_FUNCTION_ARGS); +Datum int4_dist(PG_FUNCTION_ARGS); Datum int4_dist(PG_FUNCTION_ARGS) { - int4 a = PG_GETARG_INT32(0); - int4 b = PG_GETARG_INT32(1); - int4 r; - int4 ra; + int4 a = PG_GETARG_INT32(0); + int4 b = PG_GETARG_INT32(1); + int4 r; + int4 ra; r = a - b; ra = Abs(r); @@ -111,7 +111,7 @@ int4_dist(PG_FUNCTION_ARGS) if (ra < 0 || (!SAMESIGN(a, b) && !SAMESIGN(r, a))) ereport(ERROR, (errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE), - errmsg("integer out of range"))); + errmsg("integer out of range"))); PG_RETURN_INT32(ra); } @@ -170,7 +170,7 @@ gbt_int4_distance(PG_FUNCTION_ARGS) key.upper = (GBT_NUMKEY *) &kkk->upper; PG_RETURN_FLOAT8( - gbt_num_distance(&key, (void *) &query, GIST_LEAF(entry), &tinfo) + gbt_num_distance(&key, (void *) &query, GIST_LEAF(entry), &tinfo) ); } diff --git a/contrib/btree_gist/btree_int8.c b/contrib/btree_gist/btree_int8.c index 1f14d82891..d54113d393 100644 --- a/contrib/btree_gist/btree_int8.c +++ b/contrib/btree_gist/btree_int8.c @@ -95,14 +95,14 @@ static const gbtree_ninfo tinfo = PG_FUNCTION_INFO_V1(int8_dist); -Datum int8_dist(PG_FUNCTION_ARGS); +Datum int8_dist(PG_FUNCTION_ARGS); Datum int8_dist(PG_FUNCTION_ARGS) { - int64 a = PG_GETARG_INT64(0); - int64 b = PG_GETARG_INT64(1); - int64 r; - int64 ra; + int64 a = PG_GETARG_INT64(0); + int64 b = PG_GETARG_INT64(1); + int64 r; + int64 ra; r = a - b; ra = Abs(r); @@ -111,7 +111,7 @@ int8_dist(PG_FUNCTION_ARGS) if (ra < 0 || (!SAMESIGN(a, b) && !SAMESIGN(r, a))) ereport(ERROR, (errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE), - errmsg("bigint out of range"))); + errmsg("bigint out of range"))); PG_RETURN_INT64(ra); } @@ -170,7 +170,7 @@ gbt_int8_distance(PG_FUNCTION_ARGS) key.upper = (GBT_NUMKEY *) &kkk->upper; PG_RETURN_FLOAT8( - gbt_num_distance(&key, (void *) &query, GIST_LEAF(entry), &tinfo) + gbt_num_distance(&key, (void *) &query, GIST_LEAF(entry), &tinfo) ); } diff --git a/contrib/btree_gist/btree_interval.c b/contrib/btree_gist/btree_interval.c index 5195284afa..137a5fcd7f 100644 --- a/contrib/btree_gist/btree_interval.c +++ b/contrib/btree_gist/btree_interval.c @@ -88,7 +88,7 @@ intr2num(const Interval *i) static float8 gbt_intv_dist(const void *a, const void *b) { - return (float8)Abs(intr2num((Interval*)a) - intr2num((Interval*)b)); + return (float8) Abs(intr2num((Interval *) a) - intr2num((Interval *) b)); } /* @@ -127,7 +127,7 @@ abs_interval(Interval *a) } PG_FUNCTION_INFO_V1(interval_dist); -Datum interval_dist(PG_FUNCTION_ARGS); +Datum interval_dist(PG_FUNCTION_ARGS); Datum interval_dist(PG_FUNCTION_ARGS) { @@ -240,7 +240,7 @@ gbt_intv_distance(PG_FUNCTION_ARGS) key.upper = (GBT_NUMKEY *) &kkk->upper; PG_RETURN_FLOAT8( - gbt_num_distance(&key, (void *) query, GIST_LEAF(entry), &tinfo) + gbt_num_distance(&key, (void *) query, GIST_LEAF(entry), &tinfo) ); } diff --git a/contrib/btree_gist/btree_oid.c b/contrib/btree_gist/btree_oid.c index c81dd31799..3b0929b42b 100644 --- a/contrib/btree_gist/btree_oid.c +++ b/contrib/btree_gist/btree_oid.c @@ -101,13 +101,13 @@ static const gbtree_ninfo tinfo = PG_FUNCTION_INFO_V1(oid_dist); -Datum oid_dist(PG_FUNCTION_ARGS); +Datum oid_dist(PG_FUNCTION_ARGS); Datum oid_dist(PG_FUNCTION_ARGS) { - Oid a = PG_GETARG_OID(0); - Oid b = PG_GETARG_OID(1); - Oid res; + Oid a = PG_GETARG_OID(0); + Oid b = PG_GETARG_OID(1); + Oid res; if (a < b) res = b - a; @@ -170,7 +170,7 @@ gbt_oid_distance(PG_FUNCTION_ARGS) key.upper = (GBT_NUMKEY *) &kkk->upper; PG_RETURN_FLOAT8( - gbt_num_distance(&key, (void *) &query, GIST_LEAF(entry), &tinfo) + gbt_num_distance(&key, (void *) &query, GIST_LEAF(entry), &tinfo) ); } diff --git a/contrib/btree_gist/btree_time.c b/contrib/btree_gist/btree_time.c index 44f6923409..e9cfe33f45 100644 --- a/contrib/btree_gist/btree_time.c +++ b/contrib/btree_gist/btree_time.c @@ -119,7 +119,7 @@ gbt_time_dist(const void *a, const void *b) { const TimeADT *aa = (const TimeADT *) a; const TimeADT *bb = (const TimeADT *) b; - Interval *i; + Interval *i; i = DatumGetIntervalP(DirectFunctionCall2(time_mi_time, TimeADTGetDatumFast(*aa), @@ -143,7 +143,7 @@ static const gbtree_ninfo tinfo = PG_FUNCTION_INFO_V1(time_dist); -Datum time_dist(PG_FUNCTION_ARGS); +Datum time_dist(PG_FUNCTION_ARGS); Datum time_dist(PG_FUNCTION_ARGS) { @@ -239,7 +239,7 @@ gbt_time_distance(PG_FUNCTION_ARGS) key.upper = (GBT_NUMKEY *) &kkk->upper; PG_RETURN_FLOAT8( - gbt_num_distance(&key, (void *) &query, GIST_LEAF(entry), &tinfo) + gbt_num_distance(&key, (void *) &query, GIST_LEAF(entry), &tinfo) ); } diff --git a/contrib/btree_gist/btree_ts.c b/contrib/btree_gist/btree_ts.c index 9a0ec07a1e..9d3a5919a0 100644 --- a/contrib/btree_gist/btree_ts.c +++ b/contrib/btree_gist/btree_ts.c @@ -120,7 +120,7 @@ gbt_ts_dist(const void *a, const void *b) { const Timestamp *aa = (const Timestamp *) a; const Timestamp *bb = (const Timestamp *) b; - Interval *i; + Interval *i; if (TIMESTAMP_NOT_FINITE(*aa) || TIMESTAMP_NOT_FINITE(*bb)) return get_float8_infinity(); @@ -147,17 +147,17 @@ static const gbtree_ninfo tinfo = PG_FUNCTION_INFO_V1(ts_dist); -Datum ts_dist(PG_FUNCTION_ARGS); +Datum ts_dist(PG_FUNCTION_ARGS); Datum ts_dist(PG_FUNCTION_ARGS) { Timestamp a = PG_GETARG_TIMESTAMP(0); Timestamp b = PG_GETARG_TIMESTAMP(1); - Interval *r; + Interval *r; if (TIMESTAMP_NOT_FINITE(a) || TIMESTAMP_NOT_FINITE(b)) { - Interval *p = palloc(sizeof(Interval)); + Interval *p = palloc(sizeof(Interval)); p->day = INT_MAX; p->month = INT_MAX; @@ -169,25 +169,24 @@ ts_dist(PG_FUNCTION_ARGS) PG_RETURN_INTERVAL_P(p); } else - - r = DatumGetIntervalP(DirectFunctionCall2(timestamp_mi, - PG_GETARG_DATUM(0), - PG_GETARG_DATUM(1))); - PG_RETURN_INTERVAL_P( abs_interval(r) ); + r = DatumGetIntervalP(DirectFunctionCall2(timestamp_mi, + PG_GETARG_DATUM(0), + PG_GETARG_DATUM(1))); + PG_RETURN_INTERVAL_P(abs_interval(r)); } PG_FUNCTION_INFO_V1(tstz_dist); -Datum tstz_dist(PG_FUNCTION_ARGS); +Datum tstz_dist(PG_FUNCTION_ARGS); Datum tstz_dist(PG_FUNCTION_ARGS) { - TimestampTz a = PG_GETARG_TIMESTAMPTZ(0); - TimestampTz b = PG_GETARG_TIMESTAMPTZ(1); - Interval *r; + TimestampTz a = PG_GETARG_TIMESTAMPTZ(0); + TimestampTz b = PG_GETARG_TIMESTAMPTZ(1); + Interval *r; if (TIMESTAMP_NOT_FINITE(a) || TIMESTAMP_NOT_FINITE(b)) { - Interval *p = palloc(sizeof(Interval)); + Interval *p = palloc(sizeof(Interval)); p->day = INT_MAX; p->month = INT_MAX; @@ -202,7 +201,7 @@ tstz_dist(PG_FUNCTION_ARGS) r = DatumGetIntervalP(DirectFunctionCall2(timestamp_mi, PG_GETARG_DATUM(0), PG_GETARG_DATUM(1))); - PG_RETURN_INTERVAL_P( abs_interval(r) ); + PG_RETURN_INTERVAL_P(abs_interval(r)); } @@ -309,7 +308,7 @@ gbt_ts_distance(PG_FUNCTION_ARGS) key.upper = (GBT_NUMKEY *) &kkk->upper; PG_RETURN_FLOAT8( - gbt_num_distance(&key, (void *) &query, GIST_LEAF(entry), &tinfo) + gbt_num_distance(&key, (void *) &query, GIST_LEAF(entry), &tinfo) ); } @@ -354,7 +353,7 @@ gbt_tstz_distance(PG_FUNCTION_ARGS) qqq = tstz_to_ts_gmt(query); PG_RETURN_FLOAT8( - gbt_num_distance(&key, (void *) &qqq, GIST_LEAF(entry), &tinfo) + gbt_num_distance(&key, (void *) &qqq, GIST_LEAF(entry), &tinfo) ); } diff --git a/contrib/btree_gist/btree_utils_num.c b/contrib/btree_gist/btree_utils_num.c index 17440a191b..64c95854df 100644 --- a/contrib/btree_gist/btree_utils_num.c +++ b/contrib/btree_gist/btree_utils_num.c @@ -223,8 +223,8 @@ gbt_num_consistent(const GBT_NUMKEY_R *key, retval = (*tinfo->f_le) (query, key->upper); break; case BtreeGistNotEqualStrategyNumber: - retval = (! ((*tinfo->f_eq) (query, key->lower) && - (*tinfo->f_eq) (query, key->upper))) ? true : false; + retval = (!((*tinfo->f_eq) (query, key->lower) && + (*tinfo->f_eq) (query, key->upper))) ? true : false; break; default: retval = false; @@ -249,9 +249,9 @@ gbt_num_distance(const GBT_NUMKEY_R *key, if (tinfo->f_dist == NULL) elog(ERROR, "KNN search is not supported for btree_gist type %d", (int) tinfo->t); - if ( tinfo->f_le(query, key->lower) ) + if (tinfo->f_le(query, key->lower)) retval = tinfo->f_dist(query, key->lower); - else if ( tinfo->f_ge(query, key->upper) ) + else if (tinfo->f_ge(query, key->upper)) retval = tinfo->f_dist(query, key->upper); else retval = 0.0; diff --git a/contrib/btree_gist/btree_utils_num.h b/contrib/btree_gist/btree_utils_num.h index 243d3b5cb9..8935ed6630 100644 --- a/contrib/btree_gist/btree_utils_num.h +++ b/contrib/btree_gist/btree_utils_num.h @@ -46,7 +46,7 @@ typedef struct bool (*f_le) (const void *, const void *); /* less or equal */ bool (*f_lt) (const void *, const void *); /* less than */ int (*f_cmp) (const void *, const void *); /* key compare function */ - float8 (*f_dist) (const void *, const void *); /* key distance function */ + float8 (*f_dist) (const void *, const void *); /* key distance function */ } gbtree_ninfo; @@ -94,7 +94,7 @@ typedef struct #define GET_FLOAT_DISTANCE(t, arg1, arg2) Abs( ((float8) *((const t *) (arg1))) - ((float8) *((const t *) (arg2))) ) -#define SAMESIGN(a,b) (((a) < 0) == ((b) < 0)) +#define SAMESIGN(a,b) (((a) < 0) == ((b) < 0)) /* * check to see if a float4/8 val has underflowed or overflowed @@ -121,7 +121,7 @@ extern bool gbt_num_consistent(const GBT_NUMKEY_R *key, const void *query, const gbtree_ninfo *tinfo); extern float8 gbt_num_distance(const GBT_NUMKEY_R *key, const void *query, - bool is_leaf, const gbtree_ninfo *tinfo); + bool is_leaf, const gbtree_ninfo *tinfo); extern GIST_SPLITVEC *gbt_num_picksplit(const GistEntryVector *entryvec, GIST_SPLITVEC *v, const gbtree_ninfo *tinfo); diff --git a/contrib/btree_gist/btree_utils_var.c b/contrib/btree_gist/btree_utils_var.c index 8f3173e499..d74013af88 100644 --- a/contrib/btree_gist/btree_utils_var.c +++ b/contrib/btree_gist/btree_utils_var.c @@ -598,7 +598,7 @@ gbt_var_consistent( || gbt_var_node_pf_match(key, query, tinfo); break; case BtreeGistNotEqualStrategyNumber: - retval = ! ((*tinfo->f_eq) (query, key->lower) && (*tinfo->f_eq) (query, key->upper)); + retval = !((*tinfo->f_eq) (query, key->lower) && (*tinfo->f_eq) (query, key->upper)); break; default: retval = FALSE; diff --git a/contrib/dummy_seclabel/dummy_seclabel.c b/contrib/dummy_seclabel/dummy_seclabel.c index 974806f1b6..5deb43fa9b 100644 --- a/contrib/dummy_seclabel/dummy_seclabel.c +++ b/contrib/dummy_seclabel/dummy_seclabel.c @@ -18,7 +18,7 @@ PG_MODULE_MAGIC; /* Entrypoint of the module */ -void _PG_init(void); +void _PG_init(void); static void dummy_object_relabel(const ObjectAddress *object, const char *seclabel) diff --git a/contrib/file_fdw/file_fdw.c b/contrib/file_fdw/file_fdw.c index 6a84a00e8d..466c015107 100644 --- a/contrib/file_fdw/file_fdw.c +++ b/contrib/file_fdw/file_fdw.c @@ -45,17 +45,17 @@ struct FileFdwOption */ static struct FileFdwOption valid_options[] = { /* File options */ - { "filename", ForeignTableRelationId }, + {"filename", ForeignTableRelationId}, /* Format options */ /* oids option is not supported */ - { "format", ForeignTableRelationId }, - { "header", ForeignTableRelationId }, - { "delimiter", ForeignTableRelationId }, - { "quote", ForeignTableRelationId }, - { "escape", ForeignTableRelationId }, - { "null", ForeignTableRelationId }, - { "encoding", ForeignTableRelationId }, + {"format", ForeignTableRelationId}, + {"header", ForeignTableRelationId}, + {"delimiter", ForeignTableRelationId}, + {"quote", ForeignTableRelationId}, + {"escape", ForeignTableRelationId}, + {"null", ForeignTableRelationId}, + {"encoding", ForeignTableRelationId}, /* * force_quote is not supported by file_fdw because it's for COPY TO. @@ -68,7 +68,7 @@ static struct FileFdwOption valid_options[] = { */ /* Sentinel */ - { NULL, InvalidOid } + {NULL, InvalidOid} }; /* @@ -76,9 +76,9 @@ static struct FileFdwOption valid_options[] = { */ typedef struct FileFdwExecutionState { - char *filename; /* file to read */ - List *options; /* merged COPY options, excluding filename */ - CopyState cstate; /* state of reading file */ + char *filename; /* file to read */ + List *options; /* merged COPY options, excluding filename */ + CopyState cstate; /* state of reading file */ } FileFdwExecutionState; /* @@ -94,8 +94,8 @@ PG_FUNCTION_INFO_V1(file_fdw_validator); * FDW callback routines */ static FdwPlan *filePlanForeignScan(Oid foreigntableid, - PlannerInfo *root, - RelOptInfo *baserel); + PlannerInfo *root, + RelOptInfo *baserel); static void fileExplainForeignScan(ForeignScanState *node, ExplainState *es); static void fileBeginForeignScan(ForeignScanState *node, int eflags); static TupleTableSlot *fileIterateForeignScan(ForeignScanState *node); @@ -109,8 +109,8 @@ static bool is_valid_option(const char *option, Oid context); static void fileGetOptions(Oid foreigntableid, char **filename, List **other_options); static void estimate_costs(PlannerInfo *root, RelOptInfo *baserel, - const char *filename, - Cost *startup_cost, Cost *total_cost); + const char *filename, + Cost *startup_cost, Cost *total_cost); /* @@ -149,16 +149,16 @@ file_fdw_validator(PG_FUNCTION_ARGS) /* * Only superusers are allowed to set options of a file_fdw foreign table. - * This is because the filename is one of those options, and we don't - * want non-superusers to be able to determine which file gets read. + * This is because the filename is one of those options, and we don't want + * non-superusers to be able to determine which file gets read. * * Putting this sort of permissions check in a validator is a bit of a * crock, but there doesn't seem to be any other place that can enforce * the check more cleanly. * - * Note that the valid_options[] array disallows setting filename at - * any options level other than foreign table --- otherwise there'd - * still be a security hole. + * Note that the valid_options[] array disallows setting filename at any + * options level other than foreign table --- otherwise there'd still be a + * security hole. */ if (catalog == ForeignTableRelationId && !superuser()) ereport(ERROR, @@ -171,7 +171,7 @@ file_fdw_validator(PG_FUNCTION_ARGS) */ foreach(cell, options_list) { - DefElem *def = (DefElem *) lfirst(cell); + DefElem *def = (DefElem *) lfirst(cell); if (!is_valid_option(def->defname, catalog)) { @@ -276,7 +276,7 @@ fileGetOptions(Oid foreigntableid, prev = NULL; foreach(lc, options) { - DefElem *def = (DefElem *) lfirst(lc); + DefElem *def = (DefElem *) lfirst(lc); if (strcmp(def->defname, "filename") == 0) { @@ -302,7 +302,7 @@ filePlanForeignScan(Oid foreigntableid, PlannerInfo *root, RelOptInfo *baserel) { - FdwPlan *fdwplan; + FdwPlan *fdwplan; char *filename; List *options; @@ -313,7 +313,7 @@ filePlanForeignScan(Oid foreigntableid, fdwplan = makeNode(FdwPlan); estimate_costs(root, baserel, filename, &fdwplan->startup_cost, &fdwplan->total_cost); - fdwplan->fdw_private = NIL; /* not used */ + fdwplan->fdw_private = NIL; /* not used */ return fdwplan; } @@ -337,7 +337,7 @@ fileExplainForeignScan(ForeignScanState *node, ExplainState *es) /* Suppress file size if we're not showing cost details */ if (es->costs) { - struct stat stat_buf; + struct stat stat_buf; if (stat(filename, &stat_buf) == 0) ExplainPropertyLong("Foreign File Size", (long) stat_buf.st_size, @@ -368,8 +368,8 @@ fileBeginForeignScan(ForeignScanState *node, int eflags) &filename, &options); /* - * Create CopyState from FDW options. We always acquire all columns, - * so as to match the expected ScanTupleSlot signature. + * Create CopyState from FDW options. We always acquire all columns, so + * as to match the expected ScanTupleSlot signature. */ cstate = BeginCopyFrom(node->ss.ss_currentRelation, filename, @@ -398,7 +398,7 @@ fileIterateForeignScan(ForeignScanState *node) { FileFdwExecutionState *festate = (FileFdwExecutionState *) node->fdw_state; TupleTableSlot *slot = node->ss.ss_ScanTupleSlot; - bool found; + bool found; ErrorContextCallback errcontext; /* Set up callback to identify error line number. */ @@ -410,8 +410,8 @@ fileIterateForeignScan(ForeignScanState *node) /* * The protocol for loading a virtual tuple into a slot is first * ExecClearTuple, then fill the values/isnull arrays, then - * ExecStoreVirtualTuple. If we don't find another row in the file, - * we just skip the last step, leaving the slot empty as required. + * ExecStoreVirtualTuple. If we don't find another row in the file, we + * just skip the last step, leaving the slot empty as required. * * We can pass ExprContext = NULL because we read all columns from the * file, so no need to evaluate default expressions. @@ -471,17 +471,17 @@ estimate_costs(PlannerInfo *root, RelOptInfo *baserel, const char *filename, Cost *startup_cost, Cost *total_cost) { - struct stat stat_buf; - BlockNumber pages; - int tuple_width; - double ntuples; - double nrows; - Cost run_cost = 0; - Cost cpu_per_tuple; + struct stat stat_buf; + BlockNumber pages; + int tuple_width; + double ntuples; + double nrows; + Cost run_cost = 0; + Cost cpu_per_tuple; /* - * Get size of the file. It might not be there at plan time, though, - * in which case we have to use a default estimate. + * Get size of the file. It might not be there at plan time, though, in + * which case we have to use a default estimate. */ if (stat(filename, &stat_buf) < 0) stat_buf.st_size = 10 * BLCKSZ; @@ -489,7 +489,7 @@ estimate_costs(PlannerInfo *root, RelOptInfo *baserel, /* * Convert size to pages for use in I/O cost estimate below. */ - pages = (stat_buf.st_size + (BLCKSZ-1)) / BLCKSZ; + pages = (stat_buf.st_size + (BLCKSZ - 1)) / BLCKSZ; if (pages < 1) pages = 1; @@ -505,10 +505,9 @@ estimate_costs(PlannerInfo *root, RelOptInfo *baserel, ntuples = clamp_row_est((double) stat_buf.st_size / (double) tuple_width); /* - * Now estimate the number of rows returned by the scan after applying - * the baserestrictinfo quals. This is pretty bogus too, since the - * planner will have no stats about the relation, but it's better than - * nothing. + * Now estimate the number of rows returned by the scan after applying the + * baserestrictinfo quals. This is pretty bogus too, since the planner + * will have no stats about the relation, but it's better than nothing. */ nrows = ntuples * clauselist_selectivity(root, @@ -523,7 +522,7 @@ estimate_costs(PlannerInfo *root, RelOptInfo *baserel, baserel->rows = nrows; /* - * Now estimate costs. We estimate costs almost the same way as + * Now estimate costs. We estimate costs almost the same way as * cost_seqscan(), thus assuming that I/O costs are equivalent to a * regular table file of the same size. However, we take per-tuple CPU * costs as 10x of a seqscan, to account for the cost of parsing records. diff --git a/contrib/fuzzystrmatch/levenshtein.c b/contrib/fuzzystrmatch/levenshtein.c index 3d85d4175f..a84c46a4a4 100644 --- a/contrib/fuzzystrmatch/levenshtein.c +++ b/contrib/fuzzystrmatch/levenshtein.c @@ -23,7 +23,7 @@ */ #ifdef LEVENSHTEIN_LESS_EQUAL static int levenshtein_less_equal_internal(text *s, text *t, - int ins_c, int del_c, int sub_c, int max_d); + int ins_c, int del_c, int sub_c, int max_d); #else static int levenshtein_internal(text *s, text *t, int ins_c, int del_c, int sub_c); @@ -50,7 +50,7 @@ static int levenshtein_internal(text *s, text *t, * array. * * If max_d >= 0, we only need to provide an accurate answer when that answer - * is less than or equal to the bound. From any cell in the matrix, there is + * is less than or equal to the bound. From any cell in the matrix, there is * theoretical "minimum residual distance" from that cell to the last column * of the final row. This minimum residual distance is zero when the * untransformed portions of the strings are of equal length (because we might @@ -87,11 +87,13 @@ levenshtein_internal(text *s, text *t, /* * For levenshtein_less_equal_internal, we have real variables called - * start_column and stop_column; otherwise it's just short-hand for 0 - * and m. + * start_column and stop_column; otherwise it's just short-hand for 0 and + * m. */ #ifdef LEVENSHTEIN_LESS_EQUAL - int start_column, stop_column; + int start_column, + stop_column; + #undef START_COLUMN #undef STOP_COLUMN #define START_COLUMN start_column @@ -139,16 +141,16 @@ levenshtein_internal(text *s, text *t, stop_column = m + 1; /* - * If max_d >= 0, determine whether the bound is impossibly tight. If so, + * If max_d >= 0, determine whether the bound is impossibly tight. If so, * return max_d + 1 immediately. Otherwise, determine whether it's tight * enough to limit the computation we must perform. If so, figure out * initial stop column. */ if (max_d >= 0) { - int min_theo_d; /* Theoretical minimum distance. */ - int max_theo_d; /* Theoretical maximum distance. */ - int net_inserts = n - m; + int min_theo_d; /* Theoretical minimum distance. */ + int max_theo_d; /* Theoretical maximum distance. */ + int net_inserts = n - m; min_theo_d = net_inserts < 0 ? -net_inserts * del_c : net_inserts * ins_c; @@ -162,20 +164,20 @@ levenshtein_internal(text *s, text *t, else if (ins_c + del_c > 0) { /* - * Figure out how much of the first row of the notional matrix - * we need to fill in. If the string is growing, the theoretical + * Figure out how much of the first row of the notional matrix we + * need to fill in. If the string is growing, the theoretical * minimum distance already incorporates the cost of deleting the - * number of characters necessary to make the two strings equal - * in length. Each additional deletion forces another insertion, - * so the best-case total cost increases by ins_c + del_c. - * If the string is shrinking, the minimum theoretical cost - * assumes no excess deletions; that is, we're starting no futher - * right than column n - m. If we do start further right, the - * best-case total cost increases by ins_c + del_c for each move - * right. + * number of characters necessary to make the two strings equal in + * length. Each additional deletion forces another insertion, so + * the best-case total cost increases by ins_c + del_c. If the + * string is shrinking, the minimum theoretical cost assumes no + * excess deletions; that is, we're starting no futher right than + * column n - m. If we do start further right, the best-case + * total cost increases by ins_c + del_c for each move right. */ - int slack_d = max_d - min_theo_d; - int best_column = net_inserts < 0 ? -net_inserts : 0; + int slack_d = max_d - min_theo_d; + int best_column = net_inserts < 0 ? -net_inserts : 0; + stop_column = best_column + (slack_d / (ins_c + del_c)) + 1; if (stop_column > m) stop_column = m + 1; @@ -185,15 +187,15 @@ levenshtein_internal(text *s, text *t, /* * In order to avoid calling pg_mblen() repeatedly on each character in s, - * we cache all the lengths before starting the main loop -- but if all the - * characters in both strings are single byte, then we skip this and use - * a fast-path in the main loop. If only one string contains multi-byte - * characters, we still build the array, so that the fast-path needn't - * deal with the case where the array hasn't been initialized. + * we cache all the lengths before starting the main loop -- but if all + * the characters in both strings are single byte, then we skip this and + * use a fast-path in the main loop. If only one string contains + * multi-byte characters, we still build the array, so that the fast-path + * needn't deal with the case where the array hasn't been initialized. */ if (m != s_bytes || n != t_bytes) { - int i; + int i; const char *cp = s_data; s_char_len = (int *) palloc((m + 1) * sizeof(int)); @@ -214,8 +216,8 @@ levenshtein_internal(text *s, text *t, curr = prev + m; /* - * To transform the first i characters of s into the first 0 characters - * of t, we must perform i deletions. + * To transform the first i characters of s into the first 0 characters of + * t, we must perform i deletions. */ for (i = START_COLUMN; i < STOP_COLUMN; i++) prev[i] = i * del_c; @@ -228,6 +230,7 @@ levenshtein_internal(text *s, text *t, int y_char_len = n != t_bytes + 1 ? pg_mblen(y) : 1; #ifdef LEVENSHTEIN_LESS_EQUAL + /* * In the best case, values percolate down the diagonal unchanged, so * we must increment stop_column unless it's already on the right end @@ -241,10 +244,10 @@ levenshtein_internal(text *s, text *t, } /* - * The main loop fills in curr, but curr[0] needs a special case: - * to transform the first 0 characters of s into the first j - * characters of t, we must perform j insertions. However, if - * start_column > 0, this special case does not apply. + * The main loop fills in curr, but curr[0] needs a special case: to + * transform the first 0 characters of s into the first j characters + * of t, we must perform j insertions. However, if start_column > 0, + * this special case does not apply. */ if (start_column == 0) { @@ -285,7 +288,7 @@ levenshtein_internal(text *s, text *t, */ ins = prev[i] + ins_c; del = curr[i - 1] + del_c; - if (x[x_char_len-1] == y[y_char_len-1] + if (x[x_char_len - 1] == y[y_char_len - 1] && x_char_len == y_char_len && (x_char_len == 1 || rest_of_char_same(x, y, x_char_len))) sub = prev[i - 1]; @@ -331,6 +334,7 @@ levenshtein_internal(text *s, text *t, y += y_char_len; #ifdef LEVENSHTEIN_LESS_EQUAL + /* * This chunk of code represents a significant performance hit if used * in the case where there is no max_d bound. This is probably not @@ -348,15 +352,16 @@ levenshtein_internal(text *s, text *t, * string, so we want to find the value for zp where where (n - 1) * - j = (m - 1) - zp. */ - int zp = j - (n - m); + int zp = j - (n - m); /* Check whether the stop column can slide left. */ while (stop_column > 0) { - int ii = stop_column - 1; - int net_inserts = ii - zp; + int ii = stop_column - 1; + int net_inserts = ii - zp; + if (prev[ii] + (net_inserts > 0 ? net_inserts * ins_c : - -net_inserts * del_c) <= max_d) + -net_inserts * del_c) <= max_d) break; stop_column--; } @@ -364,14 +369,16 @@ levenshtein_internal(text *s, text *t, /* Check whether the start column can slide right. */ while (start_column < stop_column) { - int net_inserts = start_column - zp; + int net_inserts = start_column - zp; + if (prev[start_column] + (net_inserts > 0 ? net_inserts * ins_c : - -net_inserts * del_c) <= max_d) + -net_inserts * del_c) <= max_d) break; + /* - * We'll never again update these values, so we must make - * sure there's nothing here that could confuse any future + * We'll never again update these values, so we must make sure + * there's nothing here that could confuse any future * iteration of the outer loop. */ prev[start_column] = max_d + 1; diff --git a/contrib/hstore/hstore_gin.c b/contrib/hstore/hstore_gin.c index d55674c79f..2007801cf0 100644 --- a/contrib/hstore/hstore_gin.c +++ b/contrib/hstore/hstore_gin.c @@ -13,7 +13,7 @@ /* * When using a GIN index for hstore, we choose to index both keys and values. * The storage format is "text" values, with K, V, or N prepended to the string - * to indicate key, value, or null values. (As of 9.1 it might be better to + * to indicate key, value, or null values. (As of 9.1 it might be better to * store null values as nulls, but we'll keep it this way for on-disk * compatibility.) */ @@ -168,7 +168,7 @@ gin_consistent_hstore(PG_FUNCTION_ARGS) { /* * Index doesn't have information about correspondence of keys and - * values, so we need recheck. However, if not all the keys are + * values, so we need recheck. However, if not all the keys are * present, we can fail at once. */ *recheck = true; diff --git a/contrib/hstore/hstore_op.c b/contrib/hstore/hstore_op.c index cb6200ab1d..5b278c14ff 100644 --- a/contrib/hstore/hstore_op.c +++ b/contrib/hstore/hstore_op.c @@ -437,7 +437,7 @@ hstore_delete_hstore(PG_FUNCTION_ARGS) if (snullval != HS_VALISNULL(es2, j) || (!snullval && (svallen != HS_VALLEN(es2, j) - || memcmp(HS_VAL(es, ps, i), HS_VAL(es2, ps2, j), svallen) != 0))) + || memcmp(HS_VAL(es, ps, i), HS_VAL(es2, ps2, j), svallen) != 0))) { HS_COPYITEM(ed, bufd, pd, HS_KEY(es, ps, i), HS_KEYLEN(es, i), @@ -1000,7 +1000,7 @@ hstore_contains(PG_FUNCTION_ARGS) if (nullval != HS_VALISNULL(ve, idx) || (!nullval && (vallen != HS_VALLEN(ve, idx) - || memcmp(HS_VAL(te, tstr, i), HS_VAL(ve, vstr, idx), vallen)))) + || memcmp(HS_VAL(te, tstr, i), HS_VAL(ve, vstr, idx), vallen)))) res = false; } else diff --git a/contrib/intarray/_int_bool.c b/contrib/intarray/_int_bool.c index 072e8cc897..4e63f6d66c 100644 --- a/contrib/intarray/_int_bool.c +++ b/contrib/intarray/_int_bool.c @@ -98,7 +98,7 @@ gettoken(WORKSTATE *state, int4 *val) } else { - long lval; + long lval; nnn[innn] = '\0'; errno = 0; @@ -355,8 +355,8 @@ gin_bool_consistent(QUERYTYPE *query, bool *check) return FALSE; /* - * Set up data for checkcondition_gin. This must agree with the - * query extraction code in ginint4_queryextract. + * Set up data for checkcondition_gin. This must agree with the query + * extraction code in ginint4_queryextract. */ gcv.first = items; gcv.mapped_check = (bool *) palloc(sizeof(bool) * query->size); diff --git a/contrib/intarray/_int_gin.c b/contrib/intarray/_int_gin.c index 3ef5c4635a..9abe54e55f 100644 --- a/contrib/intarray/_int_gin.c +++ b/contrib/intarray/_int_gin.c @@ -34,8 +34,8 @@ ginint4_queryextract(PG_FUNCTION_ARGS) /* * If the query doesn't have any required primitive values (for - * instance, it's something like '! 42'), we have to do a full - * index scan. + * instance, it's something like '! 42'), we have to do a full index + * scan. */ if (query_has_required_values(query)) *searchMode = GIN_SEARCH_MODE_DEFAULT; @@ -95,7 +95,7 @@ ginint4_queryextract(PG_FUNCTION_ARGS) case RTOldContainsStrategyNumber: if (*nentries > 0) *searchMode = GIN_SEARCH_MODE_DEFAULT; - else /* everything contains the empty set */ + else /* everything contains the empty set */ *searchMode = GIN_SEARCH_MODE_ALL; break; default: @@ -116,6 +116,7 @@ ginint4_consistent(PG_FUNCTION_ARGS) bool *check = (bool *) PG_GETARG_POINTER(0); StrategyNumber strategy = PG_GETARG_UINT16(1); int32 nkeys = PG_GETARG_INT32(3); + /* Pointer *extra_data = (Pointer *) PG_GETARG_POINTER(4); */ bool *recheck = (bool *) PG_GETARG_POINTER(5); bool res = FALSE; diff --git a/contrib/intarray/_int_tool.c b/contrib/intarray/_int_tool.c index ddf07f042b..bfc55501db 100644 --- a/contrib/intarray/_int_tool.c +++ b/contrib/intarray/_int_tool.c @@ -183,7 +183,7 @@ rt__int_size(ArrayType *a, float *size) *size = (float) ARRNELEMS(a); } -/* Sort the given data (len >= 2). Return true if any duplicates found */ +/* Sort the given data (len >= 2). Return true if any duplicates found */ bool isort(int4 *a, int len) { @@ -195,7 +195,7 @@ isort(int4 *a, int len) bool r = FALSE; /* - * We use a simple insertion sort. While this is O(N^2) in the worst + * We use a simple insertion sort. While this is O(N^2) in the worst * case, it's quite fast if the input is already sorted or nearly so. * Also, for not-too-large inputs it's faster than more complex methods * anyhow. diff --git a/contrib/isn/ISBN.h b/contrib/isn/ISBN.h index c0301ced1e..dbda6fb724 100644 --- a/contrib/isn/ISBN.h +++ b/contrib/isn/ISBN.h @@ -988,4 +988,3 @@ const char *ISBN_range_new[][2] = { {"10-976000", "10-999999"}, {NULL, NULL}, }; - diff --git a/contrib/pg_archivecleanup/pg_archivecleanup.c b/contrib/pg_archivecleanup/pg_archivecleanup.c index 79892077c8..d96eef2c5a 100644 --- a/contrib/pg_archivecleanup/pg_archivecleanup.c +++ b/contrib/pg_archivecleanup/pg_archivecleanup.c @@ -25,9 +25,9 @@ #ifdef HAVE_GETOPT_H #include #endif -#else /* WIN32 */ +#else /* WIN32 */ extern int getopt(int argc, char *const argv[], const char *optstring); -#endif /* ! WIN32 */ +#endif /* ! WIN32 */ extern char *optarg; extern int optind; diff --git a/contrib/pg_stat_statements/pg_stat_statements.c b/contrib/pg_stat_statements/pg_stat_statements.c index 87cf8c55cf..0236b87498 100644 --- a/contrib/pg_stat_statements/pg_stat_statements.c +++ b/contrib/pg_stat_statements/pg_stat_statements.c @@ -137,7 +137,7 @@ typedef enum PGSS_TRACK_NONE, /* track no statements */ PGSS_TRACK_TOP, /* only top level statements */ PGSS_TRACK_ALL /* all statements, including nested ones */ -} PGSSTrackLevel; +} PGSSTrackLevel; static const struct config_enum_entry track_options[] = { diff --git a/contrib/pg_test_fsync/pg_test_fsync.c b/contrib/pg_test_fsync/pg_test_fsync.c index 49a7b3c2c0..305b3d0723 100644 --- a/contrib/pg_test_fsync/pg_test_fsync.c +++ b/contrib/pg_test_fsync/pg_test_fsync.c @@ -28,24 +28,28 @@ static const char *progname; -static int ops_per_test = 2000; -static char full_buf[XLOG_SEG_SIZE], *buf, *filename = FSYNC_FILENAME; -static struct timeval start_t, stop_t; - - -static void handle_args(int argc, char *argv[]); -static void prepare_buf(void); -static void test_open(void); -static void test_non_sync(void); -static void test_sync(int writes_per_op); -static void test_open_syncs(void); -static void test_open_sync(const char *msg, int writes_size); -static void test_file_descriptor_sync(void); +static int ops_per_test = 2000; +static char full_buf[XLOG_SEG_SIZE], + *buf, + *filename = FSYNC_FILENAME; +static struct timeval start_t, + stop_t; + + +static void handle_args(int argc, char *argv[]); +static void prepare_buf(void); +static void test_open(void); +static void test_non_sync(void); +static void test_sync(int writes_per_op); +static void test_open_syncs(void); +static void test_open_sync(const char *msg, int writes_size); +static void test_file_descriptor_sync(void); + #ifdef HAVE_FSYNC_WRITETHROUGH static int pg_fsync_writethrough(int fd); #endif -static void print_elapse(struct timeval start_t, struct timeval stop_t); -static void die(const char *str); +static void print_elapse(struct timeval start_t, struct timeval stop_t); +static void die(const char *str); int @@ -103,7 +107,7 @@ handle_args(int argc, char *argv[]) } while ((option = getopt_long(argc, argv, "f:o:", - long_options, &optindex)) != -1) + long_options, &optindex)) != -1) { switch (option) { @@ -176,7 +180,9 @@ test_open(void) static void test_sync(int writes_per_op) { - int tmpfile, ops, writes; + int tmpfile, + ops, + writes; bool fs_warning = false; if (writes_per_op == 1) @@ -353,7 +359,9 @@ test_open_syncs(void) static void test_open_sync(const char *msg, int writes_size) { - int tmpfile, ops, writes; + int tmpfile, + ops, + writes; printf(LABEL_FORMAT, msg); fflush(stdout); @@ -377,7 +385,6 @@ test_open_sync(const char *msg, int writes_size) close(tmpfile); print_elapse(start_t, stop_t); } - #else printf(NA_FORMAT, "n/a\n"); #endif @@ -386,22 +393,22 @@ test_open_sync(const char *msg, int writes_size) static void test_file_descriptor_sync(void) { - int tmpfile, ops; + int tmpfile, + ops; /* - * Test whether fsync can sync data written on a different - * descriptor for the same file. This checks the efficiency - * of multi-process fsyncs against the same file. - * Possibly this should be done with writethrough on platforms - * which support it. + * Test whether fsync can sync data written on a different descriptor for + * the same file. This checks the efficiency of multi-process fsyncs + * against the same file. Possibly this should be done with writethrough + * on platforms which support it. */ printf("\nTest if fsync on non-write file descriptor is honored:\n"); printf("(If the times are similar, fsync() can sync data written\n"); printf("on a different descriptor.)\n"); /* - * first write, fsync and close, which is the - * normal behavior without multiple descriptors + * first write, fsync and close, which is the normal behavior without + * multiple descriptors */ printf(LABEL_FORMAT, "write, fsync, close"); fflush(stdout); @@ -416,9 +423,10 @@ test_file_descriptor_sync(void) if (fsync(tmpfile) != 0) die("fsync failed"); close(tmpfile); + /* - * open and close the file again to be consistent - * with the following test + * open and close the file again to be consistent with the following + * test */ if ((tmpfile = open(filename, O_RDWR, 0)) == -1) die("could not open output file"); @@ -428,9 +436,8 @@ test_file_descriptor_sync(void) print_elapse(start_t, stop_t); /* - * Now open, write, close, open again and fsync - * This simulates processes fsyncing each other's - * writes. + * Now open, write, close, open again and fsync This simulates processes + * fsyncing each other's writes. */ printf(LABEL_FORMAT, "write, close, fsync"); fflush(stdout); @@ -458,7 +465,8 @@ test_file_descriptor_sync(void) static void test_non_sync(void) { - int tmpfile, ops; + int tmpfile, + ops; /* * Test a simple write without fsync @@ -494,7 +502,6 @@ pg_fsync_writethrough(int fd) return -1; #endif } - #endif /* diff --git a/contrib/pg_trgm/trgm.h b/contrib/pg_trgm/trgm.h index f3644fcce7..61de5d89d1 100644 --- a/contrib/pg_trgm/trgm.h +++ b/contrib/pg_trgm/trgm.h @@ -51,8 +51,9 @@ uint32 trgm2int(trgm *ptr); #endif #define ISPRINTABLETRGM(t) ( ISPRINTABLECHAR( ((char*)(t)) ) && ISPRINTABLECHAR( ((char*)(t))+1 ) && ISPRINTABLECHAR( ((char*)(t))+2 ) ) -#define ISESCAPECHAR(x) (*(x) == '\\') /* Wildcard escape character */ -#define ISWILDCARDCHAR(x) (*(x) == '_' || *(x) == '%') /* Wildcard meta-character */ +#define ISESCAPECHAR(x) (*(x) == '\\') /* Wildcard escape character */ +#define ISWILDCARDCHAR(x) (*(x) == '_' || *(x) == '%') /* Wildcard + * meta-character */ typedef struct { @@ -105,4 +106,4 @@ TRGM *generate_wildcard_trgm(const char *str, int slen); float4 cnt_sml(TRGM *trg1, TRGM *trg2); bool trgm_contained_by(TRGM *trg1, TRGM *trg2); -#endif /* __TRGM_H__ */ +#endif /* __TRGM_H__ */ diff --git a/contrib/pg_trgm/trgm_gin.c b/contrib/pg_trgm/trgm_gin.c index aaca1f9737..43ac0b0c65 100644 --- a/contrib/pg_trgm/trgm_gin.c +++ b/contrib/pg_trgm/trgm_gin.c @@ -67,7 +67,7 @@ gin_extract_value_trgm(PG_FUNCTION_ARGS) ptr = GETARR(trg); for (i = 0; i < trglen; i++) { - int32 item = trgm2int(ptr); + int32 item = trgm2int(ptr); entries[i] = Int32GetDatum(item); ptr++; @@ -83,10 +83,11 @@ gin_extract_query_trgm(PG_FUNCTION_ARGS) text *val = (text *) PG_GETARG_TEXT_P(0); int32 *nentries = (int32 *) PG_GETARG_POINTER(1); StrategyNumber strategy = PG_GETARG_UINT16(2); - /* bool **pmatch = (bool **) PG_GETARG_POINTER(3); */ - /* Pointer *extra_data = (Pointer *) PG_GETARG_POINTER(4); */ - /* bool **nullFlags = (bool **) PG_GETARG_POINTER(5); */ - int32 *searchMode = (int32 *) PG_GETARG_POINTER(6); + + /* bool **pmatch = (bool **) PG_GETARG_POINTER(3); */ + /* Pointer *extra_data = (Pointer *) PG_GETARG_POINTER(4); */ + /* bool **nullFlags = (bool **) PG_GETARG_POINTER(5); */ + int32 *searchMode = (int32 *) PG_GETARG_POINTER(6); Datum *entries = NULL; TRGM *trg; int32 trglen; @@ -104,6 +105,7 @@ gin_extract_query_trgm(PG_FUNCTION_ARGS) #endif /* FALL THRU */ case LikeStrategyNumber: + /* * For wildcard search we extract all the trigrams that every * potentially-matching string must include. @@ -112,7 +114,7 @@ gin_extract_query_trgm(PG_FUNCTION_ARGS) break; default: elog(ERROR, "unrecognized strategy number: %d", strategy); - trg = NULL; /* keep compiler quiet */ + trg = NULL; /* keep compiler quiet */ break; } @@ -125,7 +127,7 @@ gin_extract_query_trgm(PG_FUNCTION_ARGS) ptr = GETARR(trg); for (i = 0; i < trglen; i++) { - int32 item = trgm2int(ptr); + int32 item = trgm2int(ptr); entries[i] = Int32GetDatum(item); ptr++; @@ -146,9 +148,11 @@ gin_trgm_consistent(PG_FUNCTION_ARGS) { bool *check = (bool *) PG_GETARG_POINTER(0); StrategyNumber strategy = PG_GETARG_UINT16(1); + /* text *query = PG_GETARG_TEXT_P(2); */ int32 nkeys = PG_GETARG_INT32(3); - /* Pointer *extra_data = (Pointer *) PG_GETARG_POINTER(4); */ + + /* Pointer *extra_data = (Pointer *) PG_GETARG_POINTER(4); */ bool *recheck = (bool *) PG_GETARG_POINTER(5); bool res; int32 i, diff --git a/contrib/pg_trgm/trgm_gist.c b/contrib/pg_trgm/trgm_gist.c index d83265c11c..b328a09f41 100644 --- a/contrib/pg_trgm/trgm_gist.c +++ b/contrib/pg_trgm/trgm_gist.c @@ -190,17 +190,18 @@ gtrgm_consistent(PG_FUNCTION_ARGS) GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0); text *query = PG_GETARG_TEXT_P(1); StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2); + /* Oid subtype = PG_GETARG_OID(3); */ bool *recheck = (bool *) PG_GETARG_POINTER(4); TRGM *key = (TRGM *) DatumGetPointer(entry->key); TRGM *qtrg; bool res; char *cache = (char *) fcinfo->flinfo->fn_extra, - *cacheContents = cache + MAXALIGN(sizeof(StrategyNumber)); + *cacheContents = cache + MAXALIGN(sizeof(StrategyNumber)); /* * Store both the strategy number and extracted trigrams in cache, because - * trigram extraction is relatively CPU-expensive. We must include + * trigram extraction is relatively CPU-expensive. We must include * strategy number because trigram extraction depends on strategy. */ if (cache == NULL || strategy != *((StrategyNumber *) cache) || @@ -222,7 +223,7 @@ gtrgm_consistent(PG_FUNCTION_ARGS) break; default: elog(ERROR, "unrecognized strategy number: %d", strategy); - qtrg = NULL; /* keep compiler quiet */ + qtrg = NULL; /* keep compiler quiet */ break; } @@ -251,20 +252,20 @@ gtrgm_consistent(PG_FUNCTION_ARGS) *recheck = false; if (GIST_LEAF(entry)) - { /* all leafs contains orig trgm */ - float4 tmpsml = cnt_sml(key, qtrg); + { /* all leafs contains orig trgm */ + float4 tmpsml = cnt_sml(key, qtrg); /* strange bug at freebsd 5.2.1 and gcc 3.3.3 */ res = (*(int *) &tmpsml == *(int *) &trgm_limit || tmpsml > trgm_limit) ? true : false; } else if (ISALLTRUE(key)) - { /* non-leaf contains signature */ + { /* non-leaf contains signature */ res = true; } else - { /* non-leaf contains signature */ - int4 count = cnt_sml_sign_common(qtrg, GETSIGN(key)); - int4 len = ARRNELEM(qtrg); + { /* non-leaf contains signature */ + int4 count = cnt_sml_sign_common(qtrg, GETSIGN(key)); + int4 len = ARRNELEM(qtrg); if (len == 0) res = false; @@ -286,20 +287,20 @@ gtrgm_consistent(PG_FUNCTION_ARGS) * nodes. */ if (GIST_LEAF(entry)) - { /* all leafs contains orig trgm */ + { /* all leafs contains orig trgm */ res = trgm_contained_by(qtrg, key); } else if (ISALLTRUE(key)) - { /* non-leaf contains signature */ + { /* non-leaf contains signature */ res = true; } else - { /* non-leaf contains signature */ - int32 k, - tmp = 0, - len = ARRNELEM(qtrg); - trgm *ptr = GETARR(qtrg); - BITVECP sign = GETSIGN(key); + { /* non-leaf contains signature */ + int32 k, + tmp = 0, + len = ARRNELEM(qtrg); + trgm *ptr = GETARR(qtrg); + BITVECP sign = GETSIGN(key); res = true; for (k = 0; k < len; k++) @@ -328,6 +329,7 @@ gtrgm_distance(PG_FUNCTION_ARGS) GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0); text *query = PG_GETARG_TEXT_P(1); StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2); + /* Oid subtype = PG_GETARG_OID(3); */ TRGM *key = (TRGM *) DatumGetPointer(entry->key); TRGM *qtrg; @@ -355,17 +357,17 @@ gtrgm_distance(PG_FUNCTION_ARGS) { case DistanceStrategyNumber: if (GIST_LEAF(entry)) - { /* all leafs contains orig trgm */ + { /* all leafs contains orig trgm */ res = 1.0 - cnt_sml(key, qtrg); } else if (ISALLTRUE(key)) - { /* all leafs contains orig trgm */ + { /* all leafs contains orig trgm */ res = 0.0; } else - { /* non-leaf contains signature */ - int4 count = cnt_sml_sign_common(qtrg, GETSIGN(key)); - int4 len = ARRNELEM(qtrg); + { /* non-leaf contains signature */ + int4 count = cnt_sml_sign_common(qtrg, GETSIGN(key)); + int4 len = ARRNELEM(qtrg); res = (len == 0) ? -1.0 : 1.0 - ((float8) count) / ((float8) len); } diff --git a/contrib/pg_trgm/trgm_op.c b/contrib/pg_trgm/trgm_op.c index 52f9172f6d..dfb2df5048 100644 --- a/contrib/pg_trgm/trgm_op.c +++ b/contrib/pg_trgm/trgm_op.c @@ -273,9 +273,9 @@ get_wildcard_part(const char *str, int lenstr, const char *beginword = str; const char *endword; char *s = buf; - bool in_wildcard_meta = false; - bool in_escape = false; - int clen; + bool in_wildcard_meta = false; + bool in_escape = false; + int clen; /* * Find the first word character remembering whether last character was @@ -410,14 +410,14 @@ generate_wildcard_trgm(const char *str, int slen) { TRGM *trg; char *buf, - *buf2; + *buf2; trgm *tptr; int len, charlen, bytelen; const char *eword; - trg = (TRGM *) palloc(TRGMHDRSIZE + sizeof(trgm) * (slen / 2 + 1) * 3); + trg = (TRGM *) palloc(TRGMHDRSIZE + sizeof(trgm) * (slen / 2 + 1) *3); trg->flag = ARRKEY; SET_VARSIZE(trg, TRGMHDRSIZE); @@ -638,6 +638,7 @@ similarity_dist(PG_FUNCTION_ARGS) float4 res = DatumGetFloat4(DirectFunctionCall2(similarity, PG_GETARG_DATUM(0), PG_GETARG_DATUM(1))); + PG_RETURN_FLOAT4(1.0 - res); } diff --git a/contrib/pg_upgrade/check.c b/contrib/pg_upgrade/check.c index 05aac8fde9..747244072d 100644 --- a/contrib/pg_upgrade/check.c +++ b/contrib/pg_upgrade/check.c @@ -212,7 +212,10 @@ check_cluster_versions(void) old_cluster.major_version = get_major_server_version(&old_cluster); new_cluster.major_version = get_major_server_version(&new_cluster); - /* We allow upgrades from/to the same major version for alpha/beta upgrades */ + /* + * We allow upgrades from/to the same major version for alpha/beta + * upgrades + */ if (GET_MAJOR_VERSION(old_cluster.major_version) < 803) pg_log(PG_FATAL, "This utility can only upgrade from PostgreSQL version 8.3 and later.\n"); @@ -516,7 +519,7 @@ check_for_isn_and_int8_passing_mismatch(ClusterInfo *cluster) } if (script) - fclose(script); + fclose(script); if (found) { diff --git a/contrib/pg_upgrade/controldata.c b/contrib/pg_upgrade/controldata.c index 78c75e8a84..3ac2180d49 100644 --- a/contrib/pg_upgrade/controldata.c +++ b/contrib/pg_upgrade/controldata.c @@ -505,8 +505,7 @@ check_control_data(ControlData *oldctrl, "\nOld and new pg_controldata date/time storage types do not match.\n"); /* - * This is a common 8.3 -> 8.4 upgrade problem, so we are more - * verbose + * This is a common 8.3 -> 8.4 upgrade problem, so we are more verbose */ pg_log(PG_FATAL, "You will need to rebuild the new server with configure\n" diff --git a/contrib/pg_upgrade/exec.c b/contrib/pg_upgrade/exec.c index 7095ba62a8..59a76bc8ae 100644 --- a/contrib/pg_upgrade/exec.c +++ b/contrib/pg_upgrade/exec.c @@ -15,7 +15,7 @@ static void check_data_dir(const char *pg_data); static void check_bin_dir(ClusterInfo *cluster); -static void validate_exec(const char *dir, const char *cmdName); +static void validate_exec(const char *dir, const char *cmdName); /* diff --git a/contrib/pg_upgrade/file.c b/contrib/pg_upgrade/file.c index 0024b6ee00..f8f7233593 100644 --- a/contrib/pg_upgrade/file.c +++ b/contrib/pg_upgrade/file.c @@ -377,4 +377,5 @@ win32_pghardlink(const char *src, const char *dst) else return 0; } + #endif diff --git a/contrib/pg_upgrade/function.c b/contrib/pg_upgrade/function.c index c01ff046bb..322014cd23 100644 --- a/contrib/pg_upgrade/function.c +++ b/contrib/pg_upgrade/function.c @@ -21,13 +21,13 @@ void install_support_functions_in_new_db(const char *db_name) { - PGconn *conn = connectToServer(&new_cluster, db_name); - + PGconn *conn = connectToServer(&new_cluster, db_name); + /* suppress NOTICE of dropped objects */ PQclear(executeQueryOrDie(conn, "SET client_min_messages = warning;")); PQclear(executeQueryOrDie(conn, - "DROP SCHEMA IF EXISTS binary_upgrade CASCADE;")); + "DROP SCHEMA IF EXISTS binary_upgrade CASCADE;")); PQclear(executeQueryOrDie(conn, "RESET client_min_messages;")); @@ -42,31 +42,31 @@ install_support_functions_in_new_db(const char *db_name) "LANGUAGE C STRICT;")); PQclear(executeQueryOrDie(conn, "CREATE OR REPLACE FUNCTION " - "binary_upgrade.set_next_array_pg_type_oid(OID) " + "binary_upgrade.set_next_array_pg_type_oid(OID) " "RETURNS VOID " "AS '$libdir/pg_upgrade_support' " "LANGUAGE C STRICT;")); PQclear(executeQueryOrDie(conn, "CREATE OR REPLACE FUNCTION " - "binary_upgrade.set_next_toast_pg_type_oid(OID) " + "binary_upgrade.set_next_toast_pg_type_oid(OID) " "RETURNS VOID " "AS '$libdir/pg_upgrade_support' " "LANGUAGE C STRICT;")); PQclear(executeQueryOrDie(conn, "CREATE OR REPLACE FUNCTION " - "binary_upgrade.set_next_heap_pg_class_oid(OID) " + "binary_upgrade.set_next_heap_pg_class_oid(OID) " "RETURNS VOID " "AS '$libdir/pg_upgrade_support' " "LANGUAGE C STRICT;")); PQclear(executeQueryOrDie(conn, "CREATE OR REPLACE FUNCTION " - "binary_upgrade.set_next_index_pg_class_oid(OID) " + "binary_upgrade.set_next_index_pg_class_oid(OID) " "RETURNS VOID " "AS '$libdir/pg_upgrade_support' " "LANGUAGE C STRICT;")); PQclear(executeQueryOrDie(conn, "CREATE OR REPLACE FUNCTION " - "binary_upgrade.set_next_toast_pg_class_oid(OID) " + "binary_upgrade.set_next_toast_pg_class_oid(OID) " "RETURNS VOID " "AS '$libdir/pg_upgrade_support' " "LANGUAGE C STRICT;")); diff --git a/contrib/pg_upgrade/info.c b/contrib/pg_upgrade/info.c index ceb1601cc6..f0cd8e5ede 100644 --- a/contrib/pg_upgrade/info.c +++ b/contrib/pg_upgrade/info.c @@ -13,9 +13,9 @@ static void create_rel_filename_map(const char *old_data, const char *new_data, - const DbInfo *old_db, const DbInfo *new_db, - const RelInfo *old_rel, const RelInfo *new_rel, - FileNameMap *map); + const DbInfo *old_db, const DbInfo *new_db, + const RelInfo *old_rel, const RelInfo *new_rel, + FileNameMap *map); static void get_db_infos(ClusterInfo *cluster); static void get_rel_infos(ClusterInfo *cluster, DbInfo *dbinfo); static void free_rel_infos(RelInfoArr *rel_arr); @@ -40,7 +40,7 @@ gen_db_file_maps(DbInfo *old_db, DbInfo *new_db, if (old_db->rel_arr.nrels != new_db->rel_arr.nrels) pg_log(PG_FATAL, "old and new databases \"%s\" have a different number of relations\n", - old_db->db_name); + old_db->db_name); maps = (FileNameMap *) pg_malloc(sizeof(FileNameMap) * old_db->rel_arr.nrels); @@ -52,24 +52,24 @@ gen_db_file_maps(DbInfo *old_db, DbInfo *new_db, if (old_rel->reloid != new_rel->reloid) pg_log(PG_FATAL, "Mismatch of relation id: database \"%s\", old relid %d, new relid %d\n", - old_db->db_name, old_rel->reloid, new_rel->reloid); + old_db->db_name, old_rel->reloid, new_rel->reloid); /* - * In pre-8.4, TOAST table names change during CLUSTER; in >= 8.4 - * TOAST relation names always use heap table oids, hence we - * cannot check relation names when upgrading from pre-8.4. + * In pre-8.4, TOAST table names change during CLUSTER; in >= 8.4 + * TOAST relation names always use heap table oids, hence we cannot + * check relation names when upgrading from pre-8.4. */ if (strcmp(old_rel->nspname, new_rel->nspname) != 0 || ((GET_MAJOR_VERSION(old_cluster.major_version) >= 804 || strcmp(old_rel->nspname, "pg_toast") != 0) && strcmp(old_rel->relname, new_rel->relname) != 0)) pg_log(PG_FATAL, "Mismatch of relation names: database \"%s\", " - "old rel %s.%s, new rel %s.%s\n", - old_db->db_name, old_rel->nspname, old_rel->relname, - new_rel->nspname, new_rel->relname); + "old rel %s.%s, new rel %s.%s\n", + old_db->db_name, old_rel->nspname, old_rel->relname, + new_rel->nspname, new_rel->relname); create_rel_filename_map(old_pgdata, new_pgdata, old_db, new_db, - old_rel, new_rel, maps + num_maps); + old_rel, new_rel, maps + num_maps); num_maps++; } @@ -85,9 +85,9 @@ gen_db_file_maps(DbInfo *old_db, DbInfo *new_db, */ static void create_rel_filename_map(const char *old_data, const char *new_data, - const DbInfo *old_db, const DbInfo *new_db, - const RelInfo *old_rel, const RelInfo *new_rel, - FileNameMap *map) + const DbInfo *old_db, const DbInfo *new_db, + const RelInfo *old_rel, const RelInfo *new_rel, + FileNameMap *map) { if (strlen(old_rel->tablespace) == 0) { @@ -110,8 +110,8 @@ create_rel_filename_map(const char *old_data, const char *new_data, } /* - * old_relfilenode might differ from pg_class.oid (and hence - * new_relfilenode) because of CLUSTER, REINDEX, or VACUUM FULL. + * old_relfilenode might differ from pg_class.oid (and hence + * new_relfilenode) because of CLUSTER, REINDEX, or VACUUM FULL. */ map->old_relfilenode = old_rel->relfilenode; @@ -185,7 +185,9 @@ get_db_infos(ClusterInfo *cluster) int ntups; int tupnum; DbInfo *dbinfos; - int i_datname, i_oid, i_spclocation; + int i_datname, + i_oid, + i_spclocation; res = executeQueryOrDie(conn, "SELECT d.oid, d.datname, t.spclocation " @@ -241,15 +243,19 @@ get_rel_infos(ClusterInfo *cluster, DbInfo *dbinfo) int num_rels = 0; char *nspname = NULL; char *relname = NULL; - int i_spclocation, i_nspname, i_relname, i_oid, i_relfilenode; + int i_spclocation, + i_nspname, + i_relname, + i_oid, + i_relfilenode; char query[QUERY_ALLOC]; /* * pg_largeobject contains user data that does not appear in pg_dumpall * --schema-only output, so we have to copy that system table heap and - * index. We could grab the pg_largeobject oids from template1, but - * it is easy to treat it as a normal table. - * Order by oid so we can join old/new structures efficiently. + * index. We could grab the pg_largeobject oids from template1, but it is + * easy to treat it as a normal table. Order by oid so we can join old/new + * structures efficiently. */ snprintf(query, sizeof(query), @@ -263,7 +269,7 @@ get_rel_infos(ClusterInfo *cluster, DbInfo *dbinfo) " ((n.nspname NOT IN ('pg_catalog', 'information_schema', 'binary_upgrade') AND " " c.oid >= %u) " " OR (n.nspname = 'pg_catalog' AND " - " relname IN ('pg_largeobject', 'pg_largeobject_loid_pn_index'%s) )) " + " relname IN ('pg_largeobject', 'pg_largeobject_loid_pn_index'%s) )) " /* we preserve pg_class.oid so we sort by it to match old/new */ "ORDER BY 1;", /* see the comment at the top of old_8_3_create_sequence_script() */ @@ -273,7 +279,7 @@ get_rel_infos(ClusterInfo *cluster, DbInfo *dbinfo) FirstNormalObjectId, /* does pg_largeobject_metadata need to be migrated? */ (GET_MAJOR_VERSION(old_cluster.major_version) <= 804) ? - "" : ", 'pg_largeobject_metadata', 'pg_largeobject_metadata_oid_index'"); + "" : ", 'pg_largeobject_metadata', 'pg_largeobject_metadata_oid_index'"); res = executeQueryOrDie(conn, query); diff --git a/contrib/pg_upgrade/pg_upgrade.c b/contrib/pg_upgrade/pg_upgrade.c index 061544cac8..e435aaef08 100644 --- a/contrib/pg_upgrade/pg_upgrade.c +++ b/contrib/pg_upgrade/pg_upgrade.c @@ -18,7 +18,7 @@ * FYI, while pg_class.oid and pg_class.relfilenode are intially the same * in a cluster, but they can diverge due to CLUSTER, REINDEX, or VACUUM * FULL. The new cluster will have matching pg_class.oid and - * pg_class.relfilenode values and be based on the old oid value. This can + * pg_class.relfilenode values and be based on the old oid value. This can * cause the old and new pg_class.relfilenode values to differ. In summary, * old and new pg_class.oid and new pg_class.relfilenode will have the * same value, and old pg_class.relfilenode might differ. @@ -34,7 +34,7 @@ */ - + #include "pg_upgrade.h" #ifdef HAVE_LANGINFO_H @@ -53,7 +53,8 @@ static void cleanup(void); /* This is the database used by pg_dumpall to restore global tables */ #define GLOBAL_DUMP_DB "postgres" -ClusterInfo old_cluster, new_cluster; +ClusterInfo old_cluster, + new_cluster; OSInfo os_info; int @@ -192,7 +193,7 @@ prepare_new_cluster(void) exec_prog(true, SYSTEMQUOTE "\"%s/vacuumdb\" --port %d --username \"%s\" " "--all --analyze >> %s 2>&1" SYSTEMQUOTE, - new_cluster.bindir, new_cluster.port, os_info.user, log_opts.filename); + new_cluster.bindir, new_cluster.port, os_info.user, log_opts.filename); check_ok(); /* @@ -205,7 +206,7 @@ prepare_new_cluster(void) exec_prog(true, SYSTEMQUOTE "\"%s/vacuumdb\" --port %d --username \"%s\" " "--all --freeze >> %s 2>&1" SYSTEMQUOTE, - new_cluster.bindir, new_cluster.port, os_info.user, log_opts.filename); + new_cluster.bindir, new_cluster.port, os_info.user, log_opts.filename); check_ok(); get_pg_database_relfilenode(&new_cluster); @@ -229,16 +230,16 @@ prepare_new_databases(void) prep_status("Creating databases in the new cluster"); /* - * Install support functions in the global-restore database - * to preserve pg_authid.oid. + * Install support functions in the global-restore database to preserve + * pg_authid.oid. */ install_support_functions_in_new_db(GLOBAL_DUMP_DB); /* * We have to create the databases first so we can install support - * functions in all the other databases. Ideally we could create - * the support functions in template1 but pg_dumpall creates database - * using the template0 template. + * functions in all the other databases. Ideally we could create the + * support functions in template1 but pg_dumpall creates database using + * the template0 template. */ exec_prog(true, SYSTEMQUOTE "\"%s/psql\" --set ON_ERROR_STOP=on " diff --git a/contrib/pg_upgrade/pg_upgrade.h b/contrib/pg_upgrade/pg_upgrade.h index 8f72ea80d7..5ca570eb15 100644 --- a/contrib/pg_upgrade/pg_upgrade.h +++ b/contrib/pg_upgrade/pg_upgrade.h @@ -85,6 +85,7 @@ typedef struct { char old_dir[MAXPGPATH]; char new_dir[MAXPGPATH]; + /* * old/new relfilenodes might differ for pg_largeobject(_metadata) indexes * due to VACUUM FULL or REINDEX. Other relfilenodes are preserved. @@ -92,7 +93,7 @@ typedef struct Oid old_relfilenode; Oid new_relfilenode; /* the rest are used only for logging and error reporting */ - char nspname[NAMEDATALEN]; /* namespaces */ + char nspname[NAMEDATALEN]; /* namespaces */ char relname[NAMEDATALEN]; } FileNameMap; @@ -180,7 +181,7 @@ typedef struct char *bindir; /* pathname for cluster's executable directory */ unsigned short port; /* port number where postmaster is waiting */ uint32 major_version; /* PG_VERSION of cluster */ - char major_version_str[64]; /* string PG_VERSION of cluster */ + char major_version_str[64]; /* string PG_VERSION of cluster */ Oid pg_database_oid; /* OID of pg_database relation */ char *libpath; /* pathname for cluster's pkglibdir */ char *tablespace_suffix; /* directory specification */ @@ -232,9 +233,10 @@ typedef struct /* * Global variables */ -extern LogOpts log_opts; +extern LogOpts log_opts; extern UserOpts user_opts; -extern ClusterInfo old_cluster, new_cluster; +extern ClusterInfo old_cluster, + new_cluster; extern OSInfo os_info; extern char scandir_file_pattern[]; @@ -246,8 +248,8 @@ void check_old_cluster(bool live_check, char **sequence_script_file_name); void check_new_cluster(void); void report_clusters_compatible(void); -void issue_warnings(char *sequence_script_file_name); -void output_completion_banner(char *deletion_script_file_name); +void issue_warnings(char *sequence_script_file_name); +void output_completion_banner(char *deletion_script_file_name); void check_cluster_versions(void); void check_cluster_compatibility(bool live_check); void create_script_for_old_cluster_deletion(char **deletion_script_file_name); @@ -309,11 +311,11 @@ typedef void *pageCnvCtx; int dir_matching_filenames(const struct dirent * scan_ent); int pg_scandir(const char *dirname, struct dirent *** namelist, - int (*selector) (const struct dirent *)); + int (*selector) (const struct dirent *)); const char *copyAndUpdateFile(pageCnvCtx *pageConverter, const char *src, const char *dst, bool force); const char *linkAndUpdateFile(pageCnvCtx *pageConverter, const char *src, - const char *dst); + const char *dst); void check_hard_link(void); @@ -329,10 +331,10 @@ void check_loadable_libraries(void); FileNameMap *gen_db_file_maps(DbInfo *old_db, DbInfo *new_db, int *nmaps, const char *old_pgdata, const char *new_pgdata); -void get_db_and_rel_infos(ClusterInfo *cluster); +void get_db_and_rel_infos(ClusterInfo *cluster); void free_db_and_rel_infos(DbInfoArr *db_arr); -void print_maps(FileNameMap *maps, int n, - const char *db_name); +void print_maps(FileNameMap *maps, int n, + const char *db_name); /* option.c */ @@ -352,12 +354,12 @@ void init_tablespaces(void); /* server.c */ -PGconn *connectToServer(ClusterInfo *cluster, const char *db_name); -PGresult *executeQueryOrDie(PGconn *conn, const char *fmt,...); +PGconn *connectToServer(ClusterInfo *cluster, const char *db_name); +PGresult *executeQueryOrDie(PGconn *conn, const char *fmt,...); void start_postmaster(ClusterInfo *cluster, bool quiet); void stop_postmaster(bool fast, bool quiet); -uint32 get_major_server_version(ClusterInfo *cluster); +uint32 get_major_server_version(ClusterInfo *cluster); void check_for_libpq_envvars(void); @@ -380,14 +382,14 @@ unsigned int str2uint(const char *str); /* version.c */ void new_9_0_populate_pg_largeobject_metadata(ClusterInfo *cluster, - bool check_mode); + bool check_mode); /* version_old_8_3.c */ void old_8_3_check_for_name_data_type_usage(ClusterInfo *cluster); void old_8_3_check_for_tsquery_usage(ClusterInfo *cluster); -void old_8_3_rebuild_tsvector_tables(ClusterInfo *cluster, bool check_mode); -void old_8_3_invalidate_hash_gin_indexes(ClusterInfo *cluster, bool check_mode); +void old_8_3_rebuild_tsvector_tables(ClusterInfo *cluster, bool check_mode); +void old_8_3_invalidate_hash_gin_indexes(ClusterInfo *cluster, bool check_mode); void old_8_3_invalidate_bpchar_pattern_ops_indexes(ClusterInfo *cluster, - bool check_mode); + bool check_mode); char *old_8_3_create_sequence_script(ClusterInfo *cluster); diff --git a/contrib/pg_upgrade/relfilenode.c b/contrib/pg_upgrade/relfilenode.c index d111b13de9..9a0a3ac18d 100644 --- a/contrib/pg_upgrade/relfilenode.c +++ b/contrib/pg_upgrade/relfilenode.c @@ -30,7 +30,7 @@ char scandir_file_pattern[MAXPGPATH]; */ const char * transfer_all_new_dbs(DbInfoArr *old_db_arr, - DbInfoArr *new_db_arr, char *old_pgdata, char *new_pgdata) + DbInfoArr *new_db_arr, char *old_pgdata, char *new_pgdata) { int dbnum; const char *msg = NULL; @@ -39,7 +39,7 @@ transfer_all_new_dbs(DbInfoArr *old_db_arr, if (old_db_arr->ndbs != new_db_arr->ndbs) pg_log(PG_FATAL, "old and new clusters have a different number of databases\n"); - + for (dbnum = 0; dbnum < old_db_arr->ndbs; dbnum++) { DbInfo *old_db = &old_db_arr->dbs[dbnum]; @@ -50,8 +50,8 @@ transfer_all_new_dbs(DbInfoArr *old_db_arr, if (strcmp(old_db->db_name, new_db->db_name) != 0) pg_log(PG_FATAL, "old and new databases have different names: old \"%s\", new \"%s\"\n", - old_db->db_name, new_db->db_name); - + old_db->db_name, new_db->db_name); + n_maps = 0; mappings = gen_db_file_maps(old_db, new_db, &n_maps, old_pgdata, new_pgdata); @@ -169,7 +169,7 @@ transfer_single_new_db(pageCnvCtx *pageConverter, for (fileno = 0; fileno < numFiles; fileno++) { if (strncmp(namelist[fileno]->d_name, scandir_file_pattern, - strlen(scandir_file_pattern)) == 0) + strlen(scandir_file_pattern)) == 0) { snprintf(old_file, sizeof(old_file), "%s/%s", maps[mapnum].old_dir, namelist[fileno]->d_name); @@ -178,7 +178,7 @@ transfer_single_new_db(pageCnvCtx *pageConverter, unlink(new_file); transfer_relfile(pageConverter, old_file, new_file, - maps[mapnum].nspname, maps[mapnum].relname); + maps[mapnum].nspname, maps[mapnum].relname); } } } @@ -196,7 +196,7 @@ transfer_single_new_db(pageCnvCtx *pageConverter, for (fileno = 0; fileno < numFiles; fileno++) { if (strncmp(namelist[fileno]->d_name, scandir_file_pattern, - strlen(scandir_file_pattern)) == 0) + strlen(scandir_file_pattern)) == 0) { snprintf(old_file, sizeof(old_file), "%s/%s", maps[mapnum].old_dir, namelist[fileno]->d_name); @@ -205,7 +205,7 @@ transfer_single_new_db(pageCnvCtx *pageConverter, unlink(new_file); transfer_relfile(pageConverter, old_file, new_file, - maps[mapnum].nspname, maps[mapnum].relname); + maps[mapnum].nspname, maps[mapnum].relname); } } } @@ -227,7 +227,7 @@ transfer_single_new_db(pageCnvCtx *pageConverter, */ static void transfer_relfile(pageCnvCtx *pageConverter, const char *old_file, - const char *new_file, const char *nspname, const char *relname) + const char *new_file, const char *nspname, const char *relname) { const char *msg; @@ -249,7 +249,7 @@ transfer_relfile(pageCnvCtx *pageConverter, const char *old_file, if ((msg = linkAndUpdateFile(pageConverter, old_file, new_file)) != NULL) pg_log(PG_FATAL, - "error while creating link from %s.%s (%s to %s): %s\n", + "error while creating link from %s.%s (%s to %s): %s\n", nspname, relname, old_file, new_file, msg); } return; diff --git a/contrib/pg_upgrade/server.c b/contrib/pg_upgrade/server.c index a7d5787234..2a0f50eb2a 100644 --- a/contrib/pg_upgrade/server.c +++ b/contrib/pg_upgrade/server.c @@ -194,12 +194,12 @@ start_postmaster(ClusterInfo *cluster, bool quiet) * because it is being used by another process." so we have to send all * other output to 'nul'. * - * Using autovacuum=off disables cleanup vacuum and analyze, but - * freeze vacuums can still happen, so we set - * autovacuum_freeze_max_age to its maximum. We assume all datfrozenxid - * and relfrozen values are less than a gap of 2000000000 from the current - * xid counter, so autovacuum will not touch them. - */ + * Using autovacuum=off disables cleanup vacuum and analyze, but freeze + * vacuums can still happen, so we set autovacuum_freeze_max_age to its + * maximum. We assume all datfrozenxid and relfrozen values are less than + * a gap of 2000000000 from the current xid counter, so autovacuum will + * not touch them. + */ snprintf(cmd, sizeof(cmd), SYSTEMQUOTE "\"%s/pg_ctl\" -l \"%s\" -D \"%s\" " "-o \"-p %d -c autovacuum=off " @@ -251,7 +251,7 @@ stop_postmaster(bool fast, bool quiet) "\"%s\" 2>&1" SYSTEMQUOTE, bindir, #ifndef WIN32 - log_opts.filename, datadir, fast ? "-m fast" : "", log_opts.filename); + log_opts.filename, datadir, fast ? "-m fast" : "", log_opts.filename); #else DEVNULL, datadir, fast ? "-m fast" : "", DEVNULL); #endif diff --git a/contrib/pg_upgrade/tablespace.c b/contrib/pg_upgrade/tablespace.c index a575487621..6cdae51cf1 100644 --- a/contrib/pg_upgrade/tablespace.c +++ b/contrib/pg_upgrade/tablespace.c @@ -78,8 +78,8 @@ set_tablespace_directory_suffix(ClusterInfo *cluster) { /* This cluster has a version-specific subdirectory */ cluster->tablespace_suffix = pg_malloc(4 + - strlen(cluster->major_version_str) + - 10 /* OIDCHARS */ + 1); + strlen(cluster->major_version_str) + + 10 /* OIDCHARS */ + 1); /* The leading slash is needed to start a new directory. */ sprintf(cluster->tablespace_suffix, "/PG_%s_%d", cluster->major_version_str, diff --git a/contrib/pg_upgrade/util.c b/contrib/pg_upgrade/util.c index 804aa0d1e5..9a6691ce75 100644 --- a/contrib/pg_upgrade/util.c +++ b/contrib/pg_upgrade/util.c @@ -12,7 +12,7 @@ #include -LogOpts log_opts; +LogOpts log_opts; /* * report_status() diff --git a/contrib/pg_upgrade/version_old_8_3.c b/contrib/pg_upgrade/version_old_8_3.c index 3ec4b59a05..0a60eec926 100644 --- a/contrib/pg_upgrade/version_old_8_3.c +++ b/contrib/pg_upgrade/version_old_8_3.c @@ -288,7 +288,7 @@ old_8_3_rebuild_tsvector_tables(ClusterInfo *cluster, bool check_mode) /* Rebuild all tsvector collumns with one ALTER TABLE command */ if (strcmp(PQgetvalue(res, rowno, i_nspname), nspname) != 0 || - strcmp(PQgetvalue(res, rowno, i_relname), relname) != 0) + strcmp(PQgetvalue(res, rowno, i_relname), relname) != 0) { if (strlen(nspname) != 0 || strlen(relname) != 0) fprintf(script, ";\n\n"); diff --git a/contrib/pg_upgrade_support/pg_upgrade_support.c b/contrib/pg_upgrade_support/pg_upgrade_support.c index 02d1512719..2c23cbab9d 100644 --- a/contrib/pg_upgrade_support/pg_upgrade_support.c +++ b/contrib/pg_upgrade_support/pg_upgrade_support.c @@ -178,9 +178,9 @@ create_empty_extension(PG_FUNCTION_ARGS) &textDatums, NULL, &ndatums); for (i = 0; i < ndatums; i++) { - text *txtname = DatumGetTextPP(textDatums[i]); - char *extName = text_to_cstring(txtname); - Oid extOid = get_extension_oid(extName, false); + text *txtname = DatumGetTextPP(textDatums[i]); + char *extName = text_to_cstring(txtname); + Oid extOid = get_extension_oid(extName, false); requiredExtensions = lappend_oid(requiredExtensions, extOid); } @@ -188,7 +188,7 @@ create_empty_extension(PG_FUNCTION_ARGS) InsertExtensionTuple(text_to_cstring(extName), GetUserId(), - get_namespace_oid(text_to_cstring(schemaName), false), + get_namespace_oid(text_to_cstring(schemaName), false), relocatable, text_to_cstring(extVersion), extConfig, diff --git a/contrib/pgbench/pgbench.c b/contrib/pgbench/pgbench.c index 7c2ca6e84d..0a3e5fd928 100644 --- a/contrib/pgbench/pgbench.c +++ b/contrib/pgbench/pgbench.c @@ -69,7 +69,7 @@ typedef struct win32_pthread *pthread_t; typedef int pthread_attr_t; -static int pthread_create(pthread_t *thread, pthread_attr_t *attr, void *(*start_routine) (void *), void *arg); +static int pthread_create(pthread_t *thread, pthread_attr_t * attr, void *(*start_routine) (void *), void *arg); static int pthread_join(pthread_t th, void **thread_return); #elif defined(ENABLE_THREAD_SAFETY) /* Use platform-dependent pthread capability */ @@ -87,7 +87,7 @@ static int pthread_join(pthread_t th, void **thread_return); typedef struct fork_pthread *pthread_t; typedef int pthread_attr_t; -static int pthread_create(pthread_t *thread, pthread_attr_t *attr, void *(*start_routine) (void *), void *arg); +static int pthread_create(pthread_t *thread, pthread_attr_t * attr, void *(*start_routine) (void *), void *arg); static int pthread_join(pthread_t th, void **thread_return); #endif @@ -817,7 +817,7 @@ top: INSTR_TIME_SET_CURRENT(now); INSTR_TIME_ACCUM_DIFF(thread->exec_elapsed[cnum], - now, st->stmt_begin); + now, st->stmt_begin); thread->exec_count[cnum]++; } @@ -850,8 +850,8 @@ top: if (commands[st->state]->type == SQL_COMMAND) { /* - * Read and discard the query result; note this is not included - * in the statement latency numbers. + * Read and discard the query result; note this is not included in + * the statement latency numbers. */ res = PQgetResult(st->con); switch (PQresultStatus(res)) @@ -1716,16 +1716,16 @@ printResults(int ttype, int normal_xacts, int nclients, for (i = 0; i < num_files; i++) { - Command **commands; + Command **commands; if (num_files > 1) - printf("statement latencies in milliseconds, file %d:\n", i+1); + printf("statement latencies in milliseconds, file %d:\n", i + 1); else printf("statement latencies in milliseconds:\n"); for (commands = sql_files[i]; *commands != NULL; commands++) { - Command *command = *commands; + Command *command = *commands; int cnum = command->command_num; double total_time; instr_time total_exec_elapsed; @@ -1737,7 +1737,7 @@ printResults(int ttype, int normal_xacts, int nclients, total_exec_count = 0; for (t = 0; t < nthreads; t++) { - TState *thread = &threads[t]; + TState *thread = &threads[t]; INSTR_TIME_ADD(total_exec_elapsed, thread->exec_elapsed[cnum]); @@ -2014,9 +2014,9 @@ main(int argc, char **argv) * is_latencies only works with multiple threads in thread-based * implementations, not fork-based ones, because it supposes that the * parent can see changes made to the per-thread execution stats by child - * threads. It seems useful enough to accept despite this limitation, - * but perhaps we should FIXME someday (by passing the stats data back - * up through the parent-to-child pipes). + * threads. It seems useful enough to accept despite this limitation, but + * perhaps we should FIXME someday (by passing the stats data back up + * through the parent-to-child pipes). */ #ifndef ENABLE_THREAD_SAFETY if (is_latencies && nthreads > 1) @@ -2161,7 +2161,7 @@ main(int argc, char **argv) threads = (TState *) xmalloc(sizeof(TState) * nthreads); for (i = 0; i < nthreads; i++) { - TState *thread = &threads[i]; + TState *thread = &threads[i]; thread->tid = i; thread->state = &state[nclients / nthreads * i]; @@ -2170,7 +2170,7 @@ main(int argc, char **argv) if (is_latencies) { /* Reserve memory for the thread to store per-command latencies */ - int t; + int t; thread->exec_elapsed = (instr_time *) xmalloc(sizeof(instr_time) * num_commands); @@ -2200,7 +2200,7 @@ main(int argc, char **argv) /* start threads */ for (i = 0; i < nthreads; i++) { - TState *thread = &threads[i]; + TState *thread = &threads[i]; INSTR_TIME_SET_CURRENT(thread->start_time); @@ -2472,7 +2472,7 @@ typedef struct fork_pthread static int pthread_create(pthread_t *thread, - pthread_attr_t *attr, + pthread_attr_t * attr, void *(*start_routine) (void *), void *arg) { @@ -2586,7 +2586,7 @@ typedef struct win32_pthread void *(*routine) (void *); void *arg; void *result; -} win32_pthread; +} win32_pthread; static unsigned __stdcall win32_pthread_run(void *arg) @@ -2600,7 +2600,7 @@ win32_pthread_run(void *arg) static int pthread_create(pthread_t *thread, - pthread_attr_t *attr, + pthread_attr_t * attr, void *(*start_routine) (void *), void *arg) { diff --git a/contrib/seg/seg.c b/contrib/seg/seg.c index afada2a0aa..fd284e0c07 100644 --- a/contrib/seg/seg.c +++ b/contrib/seg/seg.c @@ -356,7 +356,7 @@ gseg_picksplit(GistEntryVector *entryvec, { seg = (SEG *) DatumGetPointer(entryvec->vector[i].key); /* center calculation is done this way to avoid possible overflow */ - sort_items[i - 1].center = seg->lower*0.5f + seg->upper*0.5f; + sort_items[i - 1].center = seg->lower * 0.5f + seg->upper * 0.5f; sort_items[i - 1].index = i; sort_items[i - 1].data = seg; } diff --git a/contrib/sepgsql/dml.c b/contrib/sepgsql/dml.c index 358a2643ca..22666b708e 100644 --- a/contrib/sepgsql/dml.c +++ b/contrib/sepgsql/dml.c @@ -59,7 +59,7 @@ fixup_whole_row_references(Oid relOid, Bitmapset *columns) result = bms_copy(columns); result = bms_del_member(result, index); - for (attno=1; attno <= natts; attno++) + for (attno = 1; attno <= natts; attno++) { tuple = SearchSysCache2(ATTNUM, ObjectIdGetDatum(relOid), @@ -108,6 +108,7 @@ fixup_inherited_columns(Oid parentId, Oid childId, Bitmapset *columns) while ((index = bms_first_member(tmpset)) > 0) { attno = index + FirstLowInvalidHeapAttributeNumber; + /* * whole-row-reference shall be fixed-up later */ @@ -158,14 +159,13 @@ check_relation_privileges(Oid relOid, bool result = true; /* - * Hardwired Policies: - * SE-PostgreSQL enforces - * - clients cannot modify system catalogs using DMLs - * - clients cannot reference/modify toast relations using DMLs + * Hardwired Policies: SE-PostgreSQL enforces - clients cannot modify + * system catalogs using DMLs - clients cannot reference/modify toast + * relations using DMLs */ if (sepgsql_getenforce() > 0) { - Oid relnamespace = get_rel_namespace(relOid); + Oid relnamespace = get_rel_namespace(relOid); if (IsSystemNamespace(relnamespace) && (required & (SEPG_DB_TABLE__UPDATE | @@ -242,7 +242,7 @@ check_relation_privileges(Oid relOid, { AttrNumber attnum; uint32 column_perms = 0; - ObjectAddress object; + ObjectAddress object; if (bms_is_member(index, selected)) column_perms |= SEPG_DB_COLUMN__SELECT; @@ -290,12 +290,12 @@ sepgsql_dml_privileges(List *rangeTabls, bool abort) { ListCell *lr; - foreach (lr, rangeTabls) + foreach(lr, rangeTabls) { - RangeTblEntry *rte = lfirst(lr); - uint32 required = 0; - List *tableIds; - ListCell *li; + RangeTblEntry *rte = lfirst(lr); + uint32 required = 0; + List *tableIds; + ListCell *li; /* * Only regular relations shall be checked @@ -328,25 +328,24 @@ sepgsql_dml_privileges(List *rangeTabls, bool abort) /* * If this RangeTblEntry is also supposed to reference inherited - * tables, we need to check security label of the child tables. - * So, we expand rte->relid into list of OIDs of inheritance - * hierarchy, then checker routine will be invoked for each - * relations. + * tables, we need to check security label of the child tables. So, we + * expand rte->relid into list of OIDs of inheritance hierarchy, then + * checker routine will be invoked for each relations. */ if (!rte->inh) tableIds = list_make1_oid(rte->relid); else tableIds = find_all_inheritors(rte->relid, NoLock, NULL); - foreach (li, tableIds) + foreach(li, tableIds) { Oid tableOid = lfirst_oid(li); Bitmapset *selectedCols; Bitmapset *modifiedCols; /* - * child table has different attribute numbers, so we need - * to fix up them. + * child table has different attribute numbers, so we need to fix + * up them. */ selectedCols = fixup_inherited_columns(rte->relid, tableOid, rte->selectedCols); diff --git a/contrib/sepgsql/hooks.c b/contrib/sepgsql/hooks.c index 5dc8a3ecaa..7797ccb199 100644 --- a/contrib/sepgsql/hooks.c +++ b/contrib/sepgsql/hooks.c @@ -29,17 +29,17 @@ PG_MODULE_MAGIC; /* * Declarations */ -void _PG_init(void); +void _PG_init(void); /* * Saved hook entries (if stacked) */ -static object_access_hook_type next_object_access_hook = NULL; -static ClientAuthentication_hook_type next_client_auth_hook = NULL; -static ExecutorCheckPerms_hook_type next_exec_check_perms_hook = NULL; -static needs_fmgr_hook_type next_needs_fmgr_hook = NULL; -static fmgr_hook_type next_fmgr_hook = NULL; -static ProcessUtility_hook_type next_ProcessUtility_hook = NULL; +static object_access_hook_type next_object_access_hook = NULL; +static ClientAuthentication_hook_type next_client_auth_hook = NULL; +static ExecutorCheckPerms_hook_type next_exec_check_perms_hook = NULL; +static needs_fmgr_hook_type next_needs_fmgr_hook = NULL; +static fmgr_hook_type next_fmgr_hook = NULL; +static ProcessUtility_hook_type next_ProcessUtility_hook = NULL; /* * GUC: sepgsql.permissive = (on|off) @@ -73,14 +73,14 @@ sepgsql_get_debug_audit(void) static void sepgsql_client_auth(Port *port, int status) { - char *context; + char *context; if (next_client_auth_hook) - (*next_client_auth_hook)(port, status); + (*next_client_auth_hook) (port, status); /* - * In the case when authentication failed, the supplied socket - * shall be closed soon, so we don't need to do anything here. + * In the case when authentication failed, the supplied socket shall be + * closed soon, so we don't need to do anything here. */ if (status != STATUS_OK) return; @@ -96,8 +96,8 @@ sepgsql_client_auth(Port *port, int status) sepgsql_set_client_label(context); /* - * Switch the current performing mode from INTERNAL to either - * DEFAULT or PERMISSIVE. + * Switch the current performing mode from INTERNAL to either DEFAULT or + * PERMISSIVE. */ if (sepgsql_permissive) sepgsql_set_mode(SEPGSQL_MODE_PERMISSIVE); @@ -113,12 +113,12 @@ sepgsql_client_auth(Port *port, int status) */ static void sepgsql_object_access(ObjectAccessType access, - Oid classId, - Oid objectId, - int subId) + Oid classId, + Oid objectId, + int subId) { if (next_object_access_hook) - (*next_object_access_hook)(access, classId, objectId, subId); + (*next_object_access_hook) (access, classId, objectId, subId); switch (access) { @@ -147,7 +147,7 @@ sepgsql_object_access(ObjectAccessType access, break; default: - elog(ERROR, "unexpected object access type: %d", (int)access); + elog(ERROR, "unexpected object access type: %d", (int) access); break; } } @@ -161,11 +161,11 @@ static bool sepgsql_exec_check_perms(List *rangeTabls, bool abort) { /* - * If security provider is stacking and one of them replied 'false' - * at least, we don't need to check any more. + * If security provider is stacking and one of them replied 'false' at + * least, we don't need to check any more. */ if (next_exec_check_perms_hook && - !(*next_exec_check_perms_hook)(rangeTabls, abort)) + !(*next_exec_check_perms_hook) (rangeTabls, abort)) return false; if (!sepgsql_dml_privileges(rangeTabls, abort)) @@ -184,20 +184,19 @@ sepgsql_exec_check_perms(List *rangeTabls, bool abort) static bool sepgsql_needs_fmgr_hook(Oid functionId) { - char *old_label; - char *new_label; - char *function_label; + char *old_label; + char *new_label; + char *function_label; if (next_needs_fmgr_hook && - (*next_needs_fmgr_hook)(functionId)) + (*next_needs_fmgr_hook) (functionId)) return true; /* - * SELinux needs the function to be called via security_definer - * wrapper, if this invocation will take a domain-transition. - * We call these functions as trusted-procedure, if the security - * policy has a rule that switches security label of the client - * on execution. + * SELinux needs the function to be called via security_definer wrapper, + * if this invocation will take a domain-transition. We call these + * functions as trusted-procedure, if the security policy has a rule that + * switches security label of the client on execution. */ old_label = sepgsql_get_client_label(); new_label = sepgsql_proc_get_domtrans(functionId); @@ -210,9 +209,9 @@ sepgsql_needs_fmgr_hook(Oid functionId) /* * Even if not a trusted-procedure, this function should not be inlined - * unless the client has db_procedure:{execute} permission. - * Please note that it shall be actually failed later because of same - * reason with ACL_EXECUTE. + * unless the client has db_procedure:{execute} permission. Please note + * that it shall be actually failed later because of same reason with + * ACL_EXECUTE. */ function_label = sepgsql_get_label(ProcedureRelationId, functionId, 0); if (sepgsql_check_perms(sepgsql_get_client_label(), @@ -238,20 +237,21 @@ static void sepgsql_fmgr_hook(FmgrHookEventType event, FmgrInfo *flinfo, Datum *private) { - struct { - char *old_label; - char *new_label; - Datum next_private; - } *stack; + struct + { + char *old_label; + char *new_label; + Datum next_private; + } *stack; switch (event) { case FHET_START: - stack = (void *)DatumGetPointer(*private); + stack = (void *) DatumGetPointer(*private); if (!stack) { - MemoryContext oldcxt; - const char *cur_label = sepgsql_get_client_label(); + MemoryContext oldcxt; + const char *cur_label = sepgsql_get_client_label(); oldcxt = MemoryContextSwitchTo(flinfo->fn_mcxt); stack = palloc(sizeof(*stack)); @@ -265,8 +265,8 @@ sepgsql_fmgr_hook(FmgrHookEventType event, { /* * process:transition permission between old and new - * label, when user tries to switch security label of - * the client on execution of trusted procedure. + * label, when user tries to switch security label of the + * client on execution of trusted procedure. */ sepgsql_check_perms(cur_label, stack->new_label, SEPG_CLASS_PROCESS, @@ -280,22 +280,22 @@ sepgsql_fmgr_hook(FmgrHookEventType event, stack->old_label = sepgsql_set_client_label(stack->new_label); if (next_fmgr_hook) - (*next_fmgr_hook)(event, flinfo, &stack->next_private); + (*next_fmgr_hook) (event, flinfo, &stack->next_private); break; case FHET_END: case FHET_ABORT: - stack = (void *)DatumGetPointer(*private); + stack = (void *) DatumGetPointer(*private); if (next_fmgr_hook) - (*next_fmgr_hook)(event, flinfo, &stack->next_private); + (*next_fmgr_hook) (event, flinfo, &stack->next_private); sepgsql_set_client_label(stack->old_label); stack->old_label = NULL; break; default: - elog(ERROR, "unexpected event type: %d", (int)event); + elog(ERROR, "unexpected event type: %d", (int) event); break; } } @@ -315,8 +315,8 @@ sepgsql_utility_command(Node *parsetree, char *completionTag) { if (next_ProcessUtility_hook) - (*next_ProcessUtility_hook)(parsetree, queryString, params, - isTopLevel, dest, completionTag); + (*next_ProcessUtility_hook) (parsetree, queryString, params, + isTopLevel, dest, completionTag); /* * Check command tag to avoid nefarious operations @@ -324,6 +324,7 @@ sepgsql_utility_command(Node *parsetree, switch (nodeTag(parsetree)) { case T_LoadStmt: + /* * We reject LOAD command across the board on enforcing mode, * because a binary module can arbitrarily override hooks. @@ -336,11 +337,12 @@ sepgsql_utility_command(Node *parsetree, } break; default: + /* - * Right now we don't check any other utility commands, - * because it needs more detailed information to make - * access control decision here, but we don't want to - * have two parse and analyze routines individually. + * Right now we don't check any other utility commands, because it + * needs more detailed information to make access control decision + * here, but we don't want to have two parse and analyze routines + * individually. */ break; } @@ -358,7 +360,7 @@ sepgsql_utility_command(Node *parsetree, void _PG_init(void) { - char *context; + char *context; /* * We allow to load the SE-PostgreSQL module on single-user-mode or @@ -367,12 +369,12 @@ _PG_init(void) if (IsUnderPostmaster) ereport(ERROR, (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE), - errmsg("sepgsql must be loaded via shared_preload_libraries"))); + errmsg("sepgsql must be loaded via shared_preload_libraries"))); /* - * Check availability of SELinux on the platform. - * If disabled, we cannot activate any SE-PostgreSQL features, - * and we have to skip rest of initialization. + * Check availability of SELinux on the platform. If disabled, we cannot + * activate any SE-PostgreSQL features, and we have to skip rest of + * initialization. */ if (is_selinux_enabled() < 1) { @@ -383,8 +385,8 @@ _PG_init(void) /* * sepgsql.permissive = (on|off) * - * This variable controls performing mode of SE-PostgreSQL - * on user's session. + * This variable controls performing mode of SE-PostgreSQL on user's + * session. */ DefineCustomBoolVariable("sepgsql.permissive", "Turn on/off permissive mode in SE-PostgreSQL", @@ -400,10 +402,9 @@ _PG_init(void) /* * sepgsql.debug_audit = (on|off) * - * This variable allows users to turn on/off audit logs on access - * control decisions, independent from auditallow/auditdeny setting - * in the security policy. - * We intend to use this option for debugging purpose. + * This variable allows users to turn on/off audit logs on access control + * decisions, independent from auditallow/auditdeny setting in the + * security policy. We intend to use this option for debugging purpose. */ DefineCustomBoolVariable("sepgsql.debug_audit", "Turn on/off debug audit messages", @@ -419,13 +420,12 @@ _PG_init(void) /* * Set up dummy client label. * - * XXX - note that PostgreSQL launches background worker process - * like autovacuum without authentication steps. So, we initialize - * sepgsql_mode with SEPGSQL_MODE_INTERNAL, and client_label with - * the security context of server process. - * Later, it also launches background of user session. In this case, - * the process is always hooked on post-authentication, and we can - * initialize the sepgsql_mode and client_label correctly. + * XXX - note that PostgreSQL launches background worker process like + * autovacuum without authentication steps. So, we initialize sepgsql_mode + * with SEPGSQL_MODE_INTERNAL, and client_label with the security context + * of server process. Later, it also launches background of user session. + * In this case, the process is always hooked on post-authentication, and + * we can initialize the sepgsql_mode and client_label correctly. */ if (getcon_raw(&context) < 0) ereport(ERROR, diff --git a/contrib/sepgsql/label.c b/contrib/sepgsql/label.c index 828512a961..669ee35ac3 100644 --- a/contrib/sepgsql/label.c +++ b/contrib/sepgsql/label.c @@ -38,7 +38,7 @@ * * security label of the client process */ -static char *client_label = NULL; +static char *client_label = NULL; char * sepgsql_get_client_label(void) @@ -49,7 +49,7 @@ sepgsql_get_client_label(void) char * sepgsql_set_client_label(char *new_label) { - char *old_label = client_label; + char *old_label = client_label; client_label = new_label; @@ -66,22 +66,22 @@ sepgsql_set_client_label(char *new_label) char * sepgsql_get_label(Oid classId, Oid objectId, int32 subId) { - ObjectAddress object; - char *label; + ObjectAddress object; + char *label; - object.classId = classId; - object.objectId = objectId; - object.objectSubId = subId; + object.classId = classId; + object.objectId = objectId; + object.objectSubId = subId; label = GetSecurityLabel(&object, SEPGSQL_LABEL_TAG); - if (!label || security_check_context_raw((security_context_t)label)) + if (!label || security_check_context_raw((security_context_t) label)) { - security_context_t unlabeled; + security_context_t unlabeled; if (security_get_initial_context_raw("unlabeled", &unlabeled) < 0) ereport(ERROR, (errcode(ERRCODE_INTERNAL_ERROR), - errmsg("SELinux: failed to get initial security label: %m"))); + errmsg("SELinux: failed to get initial security label: %m"))); PG_TRY(); { label = pstrdup(unlabeled); @@ -107,21 +107,22 @@ void sepgsql_object_relabel(const ObjectAddress *object, const char *seclabel) { /* - * validate format of the supplied security label, - * if it is security context of selinux. + * validate format of the supplied security label, if it is security + * context of selinux. */ if (seclabel && security_check_context_raw((security_context_t) seclabel) < 0) ereport(ERROR, (errcode(ERRCODE_INVALID_NAME), - errmsg("SELinux: invalid security label: \"%s\"", seclabel))); + errmsg("SELinux: invalid security label: \"%s\"", seclabel))); + /* * Do actual permission checks for each object classes */ switch (object->classId) { case NamespaceRelationId: - sepgsql_schema_relabel(object->objectId, seclabel); + sepgsql_schema_relabel(object->objectId, seclabel); break; case RelationRelationId: if (object->objectSubId == 0) @@ -151,7 +152,7 @@ PG_FUNCTION_INFO_V1(sepgsql_getcon); Datum sepgsql_getcon(PG_FUNCTION_ARGS) { - char *client_label; + char *client_label; if (!sepgsql_is_enabled()) PG_RETURN_NULL(); @@ -171,9 +172,9 @@ PG_FUNCTION_INFO_V1(sepgsql_mcstrans_in); Datum sepgsql_mcstrans_in(PG_FUNCTION_ARGS) { - text *label = PG_GETARG_TEXT_P(0); - char *raw_label; - char *result; + text *label = PG_GETARG_TEXT_P(0); + char *raw_label; + char *result; if (!sepgsql_is_enabled()) ereport(ERROR, @@ -211,9 +212,9 @@ PG_FUNCTION_INFO_V1(sepgsql_mcstrans_out); Datum sepgsql_mcstrans_out(PG_FUNCTION_ARGS) { - text *label = PG_GETARG_TEXT_P(0); - char *qual_label; - char *result; + text *label = PG_GETARG_TEXT_P(0); + char *qual_label; + char *result; if (!sepgsql_is_enabled()) ereport(ERROR, @@ -250,8 +251,8 @@ static char * quote_object_name(const char *src1, const char *src2, const char *src3, const char *src4) { - StringInfoData result; - const char *temp; + StringInfoData result; + const char *temp; initStringInfo(&result); @@ -260,28 +261,28 @@ quote_object_name(const char *src1, const char *src2, temp = quote_identifier(src1); appendStringInfo(&result, "%s", temp); if (src1 != temp) - pfree((void *)temp); + pfree((void *) temp); } if (src2) { temp = quote_identifier(src2); appendStringInfo(&result, ".%s", temp); if (src2 != temp) - pfree((void *)temp); + pfree((void *) temp); } if (src3) { temp = quote_identifier(src3); appendStringInfo(&result, ".%s", temp); if (src3 != temp) - pfree((void *)temp); + pfree((void *) temp); } if (src4) { temp = quote_identifier(src4); appendStringInfo(&result, ".%s", temp); if (src4 != temp) - pfree((void *)temp); + pfree((void *) temp); } return result.data; } @@ -294,19 +295,19 @@ quote_object_name(const char *src1, const char *src2, * catalog OID. */ static void -exec_object_restorecon(struct selabel_handle *sehnd, Oid catalogId) +exec_object_restorecon(struct selabel_handle * sehnd, Oid catalogId) { - Relation rel; - SysScanDesc sscan; - HeapTuple tuple; - char *database_name = get_database_name(MyDatabaseId); - char *namespace_name; - Oid namespace_id; - char *relation_name; + Relation rel; + SysScanDesc sscan; + HeapTuple tuple; + char *database_name = get_database_name(MyDatabaseId); + char *namespace_name; + Oid namespace_id; + char *relation_name; /* - * Open the target catalog. We don't want to allow writable - * accesses by other session during initial labeling. + * Open the target catalog. We don't want to allow writable accesses by + * other session during initial labeling. */ rel = heap_open(catalogId, AccessShareLock); @@ -314,18 +315,18 @@ exec_object_restorecon(struct selabel_handle *sehnd, Oid catalogId) SnapshotNow, 0, NULL); while (HeapTupleIsValid(tuple = systable_getnext(sscan))) { - Form_pg_namespace nspForm; - Form_pg_class relForm; - Form_pg_attribute attForm; - Form_pg_proc proForm; - char *objname; - int objtype = 1234; - ObjectAddress object; - security_context_t context; + Form_pg_namespace nspForm; + Form_pg_class relForm; + Form_pg_attribute attForm; + Form_pg_proc proForm; + char *objname; + int objtype = 1234; + ObjectAddress object; + security_context_t context; /* - * The way to determine object name depends on object classes. - * So, any branches set up `objtype', `objname' and `object' here. + * The way to determine object name depends on object classes. So, any + * branches set up `objtype', `objname' and `object' here. */ switch (catalogId) { @@ -409,7 +410,7 @@ exec_object_restorecon(struct selabel_handle *sehnd, Oid catalogId) default: elog(ERROR, "unexpected catalog id: %u", catalogId); - objname = NULL; /* for compiler quiet */ + objname = NULL; /* for compiler quiet */ break; } @@ -464,8 +465,8 @@ PG_FUNCTION_INFO_V1(sepgsql_restorecon); Datum sepgsql_restorecon(PG_FUNCTION_ARGS) { - struct selabel_handle *sehnd; - struct selinux_opt seopts; + struct selabel_handle *sehnd; + struct selinux_opt seopts; /* * SELinux has to be enabled on the running platform. @@ -474,19 +475,19 @@ sepgsql_restorecon(PG_FUNCTION_ARGS) ereport(ERROR, (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE), errmsg("sepgsql is not currently enabled"))); + /* - * Check DAC permission. Only superuser can set up initial - * security labels, like root-user in filesystems + * Check DAC permission. Only superuser can set up initial security + * labels, like root-user in filesystems */ if (!superuser()) ereport(ERROR, (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE), - errmsg("SELinux: must be superuser to restore initial contexts"))); + errmsg("SELinux: must be superuser to restore initial contexts"))); /* - * Open selabel_lookup(3) stuff. It provides a set of mapping - * between an initial security label and object class/name due - * to the system setting. + * Open selabel_lookup(3) stuff. It provides a set of mapping between an + * initial security label and object class/name due to the system setting. */ if (PG_ARGISNULL(0)) { @@ -502,12 +503,12 @@ sepgsql_restorecon(PG_FUNCTION_ARGS) if (!sehnd) ereport(ERROR, (errcode(ERRCODE_INTERNAL_ERROR), - errmsg("SELinux: failed to initialize labeling handle: %m"))); + errmsg("SELinux: failed to initialize labeling handle: %m"))); PG_TRY(); { /* - * Right now, we have no support labeling on the shared - * database objects, such as database, role, or tablespace. + * Right now, we have no support labeling on the shared database + * objects, such as database, role, or tablespace. */ exec_object_restorecon(sehnd, NamespaceRelationId); exec_object_restorecon(sehnd, RelationRelationId); @@ -519,7 +520,7 @@ sepgsql_restorecon(PG_FUNCTION_ARGS) selabel_close(sehnd); PG_RE_THROW(); } - PG_END_TRY(); + PG_END_TRY(); selabel_close(sehnd); diff --git a/contrib/sepgsql/proc.c b/contrib/sepgsql/proc.c index 5a0c4947f7..3b8bf23ba3 100644 --- a/contrib/sepgsql/proc.c +++ b/contrib/sepgsql/proc.c @@ -33,15 +33,15 @@ void sepgsql_proc_post_create(Oid functionId) { - Relation rel; - ScanKeyData skey; - SysScanDesc sscan; - HeapTuple tuple; - Oid namespaceId; - ObjectAddress object; - char *scontext; - char *tcontext; - char *ncontext; + Relation rel; + ScanKeyData skey; + SysScanDesc sscan; + HeapTuple tuple; + Oid namespaceId; + ObjectAddress object; + char *scontext; + char *tcontext; + char *ncontext; /* * Fetch namespace of the new procedure. Because pg_proc entry is not @@ -67,8 +67,8 @@ sepgsql_proc_post_create(Oid functionId) heap_close(rel, AccessShareLock); /* - * Compute a default security label when we create a new procedure - * object under the specified namespace. + * Compute a default security label when we create a new procedure object + * under the specified namespace. */ scontext = sepgsql_get_client_label(); tcontext = sepgsql_get_label(NamespaceRelationId, namespaceId, 0); @@ -144,9 +144,9 @@ sepgsql_proc_relabel(Oid functionId, const char *seclabel) char * sepgsql_proc_get_domtrans(Oid functionId) { - char *scontext = sepgsql_get_client_label(); - char *tcontext; - char *ncontext; + char *scontext = sepgsql_get_client_label(); + char *tcontext; + char *ncontext; tcontext = sepgsql_get_label(ProcedureRelationId, functionId, 0); diff --git a/contrib/sepgsql/relation.c b/contrib/sepgsql/relation.c index ed5e3adc0e..963cfdf9f1 100644 --- a/contrib/sepgsql/relation.c +++ b/contrib/sepgsql/relation.c @@ -36,26 +36,27 @@ void sepgsql_attribute_post_create(Oid relOid, AttrNumber attnum) { - char *scontext = sepgsql_get_client_label(); - char *tcontext; - char *ncontext; - ObjectAddress object; + char *scontext = sepgsql_get_client_label(); + char *tcontext; + char *ncontext; + ObjectAddress object; /* - * Only attributes within regular relation have individual - * security labels. + * Only attributes within regular relation have individual security + * labels. */ if (get_rel_relkind(relOid) != RELKIND_RELATION) return; /* - * Compute a default security label when we create a new procedure - * object under the specified namespace. + * Compute a default security label when we create a new procedure object + * under the specified namespace. */ scontext = sepgsql_get_client_label(); tcontext = sepgsql_get_label(RelationRelationId, relOid, 0); ncontext = sepgsql_compute_create(scontext, tcontext, SEPG_CLASS_DB_COLUMN); + /* * Assign the default security label on a new procedure */ @@ -81,7 +82,7 @@ sepgsql_attribute_relabel(Oid relOid, AttrNumber attnum, char *scontext = sepgsql_get_client_label(); char *tcontext; char *audit_name; - ObjectAddress object; + ObjectAddress object; if (get_rel_relkind(relOid) != RELKIND_RELATION) ereport(ERROR, @@ -127,21 +128,21 @@ sepgsql_attribute_relabel(Oid relOid, AttrNumber attnum, void sepgsql_relation_post_create(Oid relOid) { - Relation rel; - ScanKeyData skey; - SysScanDesc sscan; - HeapTuple tuple; - Form_pg_class classForm; - ObjectAddress object; - uint16 tclass; - char *scontext; /* subject */ - char *tcontext; /* schema */ - char *rcontext; /* relation */ - char *ccontext; /* column */ + Relation rel; + ScanKeyData skey; + SysScanDesc sscan; + HeapTuple tuple; + Form_pg_class classForm; + ObjectAddress object; + uint16 tclass; + char *scontext; /* subject */ + char *tcontext; /* schema */ + char *rcontext; /* relation */ + char *ccontext; /* column */ /* - * Fetch catalog record of the new relation. Because pg_class entry is - * not visible right now, we need to scan the catalog using SnapshotSelf. + * Fetch catalog record of the new relation. Because pg_class entry is not + * visible right now, we need to scan the catalog using SnapshotSelf. */ rel = heap_open(RelationRelationId, AccessShareLock); @@ -166,11 +167,11 @@ sepgsql_relation_post_create(Oid relOid) else if (classForm->relkind == RELKIND_VIEW) tclass = SEPG_CLASS_DB_VIEW; else - goto out; /* No need to assign individual labels */ + goto out; /* No need to assign individual labels */ /* - * Compute a default security label when we create a new relation - * object under the specified namespace. + * Compute a default security label when we create a new relation object + * under the specified namespace. */ scontext = sepgsql_get_client_label(); tcontext = sepgsql_get_label(NamespaceRelationId, @@ -186,8 +187,8 @@ sepgsql_relation_post_create(Oid relOid) SetSecurityLabel(&object, SEPGSQL_LABEL_TAG, rcontext); /* - * We also assigns a default security label on columns of the new - * regular tables. + * We also assigns a default security label on columns of the new regular + * tables. */ if (classForm->relkind == RELKIND_RELATION) { diff --git a/contrib/sepgsql/schema.c b/contrib/sepgsql/schema.c index 8538d18ac9..0de89971fb 100644 --- a/contrib/sepgsql/schema.c +++ b/contrib/sepgsql/schema.c @@ -26,21 +26,21 @@ void sepgsql_schema_post_create(Oid namespaceId) { - char *scontext = sepgsql_get_client_label(); - char *tcontext; - char *ncontext; - ObjectAddress object; + char *scontext = sepgsql_get_client_label(); + char *tcontext; + char *ncontext; + ObjectAddress object; /* - * FIXME: Right now, we assume pg_database object has a fixed - * security label, because pg_seclabel does not support to store - * label of shared database objects. + * FIXME: Right now, we assume pg_database object has a fixed security + * label, because pg_seclabel does not support to store label of shared + * database objects. */ tcontext = "system_u:object_r:sepgsql_db_t:s0"; /* - * Compute a default security label when we create a new schema - * object under the working database. + * Compute a default security label when we create a new schema object + * under the working database. */ ncontext = sepgsql_compute_create(scontext, tcontext, SEPG_CLASS_DB_SCHEMA); diff --git a/contrib/sepgsql/selinux.c b/contrib/sepgsql/selinux.c index 03ba25cef0..1f5a97e878 100644 --- a/contrib/sepgsql/selinux.c +++ b/contrib/sepgsql/selinux.c @@ -29,255 +29,563 @@ */ static struct { - const char *class_name; - uint16 class_code; + const char *class_name; + uint16 class_code; struct { - const char *av_name; - uint32 av_code; - } av[32]; -} selinux_catalog[] = { + const char *av_name; + uint32 av_code; + } av[32]; +} selinux_catalog[] = + +{ { - "process", SEPG_CLASS_PROCESS, + "process", SEPG_CLASS_PROCESS, { - { "transition", SEPG_PROCESS__TRANSITION }, - { NULL, 0UL } + { + "transition", SEPG_PROCESS__TRANSITION + }, + { + NULL, 0UL + } } }, { - "file", SEPG_CLASS_FILE, + "file", SEPG_CLASS_FILE, { - { "read", SEPG_FILE__READ }, - { "write", SEPG_FILE__WRITE }, - { "create", SEPG_FILE__CREATE }, - { "getattr", SEPG_FILE__GETATTR }, - { "unlink", SEPG_FILE__UNLINK }, - { "rename", SEPG_FILE__RENAME }, - { "append", SEPG_FILE__APPEND }, - { NULL, 0UL } + { + "read", SEPG_FILE__READ + }, + { + "write", SEPG_FILE__WRITE + }, + { + "create", SEPG_FILE__CREATE + }, + { + "getattr", SEPG_FILE__GETATTR + }, + { + "unlink", SEPG_FILE__UNLINK + }, + { + "rename", SEPG_FILE__RENAME + }, + { + "append", SEPG_FILE__APPEND + }, + { + NULL, 0UL + } } }, { - "dir", SEPG_CLASS_DIR, + "dir", SEPG_CLASS_DIR, { - { "read", SEPG_DIR__READ }, - { "write", SEPG_DIR__WRITE }, - { "create", SEPG_DIR__CREATE }, - { "getattr", SEPG_DIR__GETATTR }, - { "unlink", SEPG_DIR__UNLINK }, - { "rename", SEPG_DIR__RENAME }, - { "search", SEPG_DIR__SEARCH }, - { "add_name", SEPG_DIR__ADD_NAME }, - { "remove_name", SEPG_DIR__REMOVE_NAME }, - { "rmdir", SEPG_DIR__RMDIR }, - { "reparent", SEPG_DIR__REPARENT }, - { NULL, 0UL } + { + "read", SEPG_DIR__READ + }, + { + "write", SEPG_DIR__WRITE + }, + { + "create", SEPG_DIR__CREATE + }, + { + "getattr", SEPG_DIR__GETATTR + }, + { + "unlink", SEPG_DIR__UNLINK + }, + { + "rename", SEPG_DIR__RENAME + }, + { + "search", SEPG_DIR__SEARCH + }, + { + "add_name", SEPG_DIR__ADD_NAME + }, + { + "remove_name", SEPG_DIR__REMOVE_NAME + }, + { + "rmdir", SEPG_DIR__RMDIR + }, + { + "reparent", SEPG_DIR__REPARENT + }, + { + NULL, 0UL + } } }, { - "lnk_file", SEPG_CLASS_LNK_FILE, + "lnk_file", SEPG_CLASS_LNK_FILE, { - { "read", SEPG_LNK_FILE__READ }, - { "write", SEPG_LNK_FILE__WRITE }, - { "create", SEPG_LNK_FILE__CREATE }, - { "getattr", SEPG_LNK_FILE__GETATTR }, - { "unlink", SEPG_LNK_FILE__UNLINK }, - { "rename", SEPG_LNK_FILE__RENAME }, - { NULL, 0UL } + { + "read", SEPG_LNK_FILE__READ + }, + { + "write", SEPG_LNK_FILE__WRITE + }, + { + "create", SEPG_LNK_FILE__CREATE + }, + { + "getattr", SEPG_LNK_FILE__GETATTR + }, + { + "unlink", SEPG_LNK_FILE__UNLINK + }, + { + "rename", SEPG_LNK_FILE__RENAME + }, + { + NULL, 0UL + } } }, { - "chr_file", SEPG_CLASS_CHR_FILE, + "chr_file", SEPG_CLASS_CHR_FILE, { - { "read", SEPG_CHR_FILE__READ }, - { "write", SEPG_CHR_FILE__WRITE }, - { "create", SEPG_CHR_FILE__CREATE }, - { "getattr", SEPG_CHR_FILE__GETATTR }, - { "unlink", SEPG_CHR_FILE__UNLINK }, - { "rename", SEPG_CHR_FILE__RENAME }, - { NULL, 0UL } + { + "read", SEPG_CHR_FILE__READ + }, + { + "write", SEPG_CHR_FILE__WRITE + }, + { + "create", SEPG_CHR_FILE__CREATE + }, + { + "getattr", SEPG_CHR_FILE__GETATTR + }, + { + "unlink", SEPG_CHR_FILE__UNLINK + }, + { + "rename", SEPG_CHR_FILE__RENAME + }, + { + NULL, 0UL + } } }, { - "blk_file", SEPG_CLASS_BLK_FILE, + "blk_file", SEPG_CLASS_BLK_FILE, { - { "read", SEPG_BLK_FILE__READ }, - { "write", SEPG_BLK_FILE__WRITE }, - { "create", SEPG_BLK_FILE__CREATE }, - { "getattr", SEPG_BLK_FILE__GETATTR }, - { "unlink", SEPG_BLK_FILE__UNLINK }, - { "rename", SEPG_BLK_FILE__RENAME }, - { NULL, 0UL } + { + "read", SEPG_BLK_FILE__READ + }, + { + "write", SEPG_BLK_FILE__WRITE + }, + { + "create", SEPG_BLK_FILE__CREATE + }, + { + "getattr", SEPG_BLK_FILE__GETATTR + }, + { + "unlink", SEPG_BLK_FILE__UNLINK + }, + { + "rename", SEPG_BLK_FILE__RENAME + }, + { + NULL, 0UL + } } }, { - "sock_file", SEPG_CLASS_SOCK_FILE, + "sock_file", SEPG_CLASS_SOCK_FILE, { - { "read", SEPG_SOCK_FILE__READ }, - { "write", SEPG_SOCK_FILE__WRITE }, - { "create", SEPG_SOCK_FILE__CREATE }, - { "getattr", SEPG_SOCK_FILE__GETATTR }, - { "unlink", SEPG_SOCK_FILE__UNLINK }, - { "rename", SEPG_SOCK_FILE__RENAME }, - { NULL, 0UL } + { + "read", SEPG_SOCK_FILE__READ + }, + { + "write", SEPG_SOCK_FILE__WRITE + }, + { + "create", SEPG_SOCK_FILE__CREATE + }, + { + "getattr", SEPG_SOCK_FILE__GETATTR + }, + { + "unlink", SEPG_SOCK_FILE__UNLINK + }, + { + "rename", SEPG_SOCK_FILE__RENAME + }, + { + NULL, 0UL + } } }, { - "fifo_file", SEPG_CLASS_FIFO_FILE, + "fifo_file", SEPG_CLASS_FIFO_FILE, { - { "read", SEPG_FIFO_FILE__READ }, - { "write", SEPG_FIFO_FILE__WRITE }, - { "create", SEPG_FIFO_FILE__CREATE }, - { "getattr", SEPG_FIFO_FILE__GETATTR }, - { "unlink", SEPG_FIFO_FILE__UNLINK }, - { "rename", SEPG_FIFO_FILE__RENAME }, - { NULL, 0UL } + { + "read", SEPG_FIFO_FILE__READ + }, + { + "write", SEPG_FIFO_FILE__WRITE + }, + { + "create", SEPG_FIFO_FILE__CREATE + }, + { + "getattr", SEPG_FIFO_FILE__GETATTR + }, + { + "unlink", SEPG_FIFO_FILE__UNLINK + }, + { + "rename", SEPG_FIFO_FILE__RENAME + }, + { + NULL, 0UL + } } }, { - "db_database", SEPG_CLASS_DB_DATABASE, + "db_database", SEPG_CLASS_DB_DATABASE, { - { "create", SEPG_DB_DATABASE__CREATE }, - { "drop", SEPG_DB_DATABASE__DROP }, - { "getattr", SEPG_DB_DATABASE__GETATTR }, - { "setattr", SEPG_DB_DATABASE__SETATTR }, - { "relabelfrom", SEPG_DB_DATABASE__RELABELFROM }, - { "relabelto", SEPG_DB_DATABASE__RELABELTO }, - { "access", SEPG_DB_DATABASE__ACCESS }, - { "load_module", SEPG_DB_DATABASE__LOAD_MODULE }, - { NULL, 0UL }, + { + "create", SEPG_DB_DATABASE__CREATE + }, + { + "drop", SEPG_DB_DATABASE__DROP + }, + { + "getattr", SEPG_DB_DATABASE__GETATTR + }, + { + "setattr", SEPG_DB_DATABASE__SETATTR + }, + { + "relabelfrom", SEPG_DB_DATABASE__RELABELFROM + }, + { + "relabelto", SEPG_DB_DATABASE__RELABELTO + }, + { + "access", SEPG_DB_DATABASE__ACCESS + }, + { + "load_module", SEPG_DB_DATABASE__LOAD_MODULE + }, + { + NULL, 0UL + }, } }, { - "db_schema", SEPG_CLASS_DB_SCHEMA, + "db_schema", SEPG_CLASS_DB_SCHEMA, { - { "create", SEPG_DB_SCHEMA__CREATE }, - { "drop", SEPG_DB_SCHEMA__DROP }, - { "getattr", SEPG_DB_SCHEMA__GETATTR }, - { "setattr", SEPG_DB_SCHEMA__SETATTR }, - { "relabelfrom", SEPG_DB_SCHEMA__RELABELFROM }, - { "relabelto", SEPG_DB_SCHEMA__RELABELTO }, - { "search", SEPG_DB_SCHEMA__SEARCH }, - { "add_name", SEPG_DB_SCHEMA__ADD_NAME }, - { "remove_name", SEPG_DB_SCHEMA__REMOVE_NAME }, - { NULL, 0UL }, + { + "create", SEPG_DB_SCHEMA__CREATE + }, + { + "drop", SEPG_DB_SCHEMA__DROP + }, + { + "getattr", SEPG_DB_SCHEMA__GETATTR + }, + { + "setattr", SEPG_DB_SCHEMA__SETATTR + }, + { + "relabelfrom", SEPG_DB_SCHEMA__RELABELFROM + }, + { + "relabelto", SEPG_DB_SCHEMA__RELABELTO + }, + { + "search", SEPG_DB_SCHEMA__SEARCH + }, + { + "add_name", SEPG_DB_SCHEMA__ADD_NAME + }, + { + "remove_name", SEPG_DB_SCHEMA__REMOVE_NAME + }, + { + NULL, 0UL + }, } }, { - "db_table", SEPG_CLASS_DB_TABLE, + "db_table", SEPG_CLASS_DB_TABLE, { - { "create", SEPG_DB_TABLE__CREATE }, - { "drop", SEPG_DB_TABLE__DROP }, - { "getattr", SEPG_DB_TABLE__GETATTR }, - { "setattr", SEPG_DB_TABLE__SETATTR }, - { "relabelfrom", SEPG_DB_TABLE__RELABELFROM }, - { "relabelto", SEPG_DB_TABLE__RELABELTO }, - { "select", SEPG_DB_TABLE__SELECT }, - { "update", SEPG_DB_TABLE__UPDATE }, - { "insert", SEPG_DB_TABLE__INSERT }, - { "delete", SEPG_DB_TABLE__DELETE }, - { "lock", SEPG_DB_TABLE__LOCK }, - { NULL, 0UL }, + { + "create", SEPG_DB_TABLE__CREATE + }, + { + "drop", SEPG_DB_TABLE__DROP + }, + { + "getattr", SEPG_DB_TABLE__GETATTR + }, + { + "setattr", SEPG_DB_TABLE__SETATTR + }, + { + "relabelfrom", SEPG_DB_TABLE__RELABELFROM + }, + { + "relabelto", SEPG_DB_TABLE__RELABELTO + }, + { + "select", SEPG_DB_TABLE__SELECT + }, + { + "update", SEPG_DB_TABLE__UPDATE + }, + { + "insert", SEPG_DB_TABLE__INSERT + }, + { + "delete", SEPG_DB_TABLE__DELETE + }, + { + "lock", SEPG_DB_TABLE__LOCK + }, + { + NULL, 0UL + }, } }, { - "db_sequence", SEPG_CLASS_DB_SEQUENCE, + "db_sequence", SEPG_CLASS_DB_SEQUENCE, { - { "create", SEPG_DB_SEQUENCE__CREATE }, - { "drop", SEPG_DB_SEQUENCE__DROP }, - { "getattr", SEPG_DB_SEQUENCE__GETATTR }, - { "setattr", SEPG_DB_SEQUENCE__SETATTR }, - { "relabelfrom", SEPG_DB_SEQUENCE__RELABELFROM }, - { "relabelto", SEPG_DB_SEQUENCE__RELABELTO }, - { "get_value", SEPG_DB_SEQUENCE__GET_VALUE }, - { "next_value", SEPG_DB_SEQUENCE__NEXT_VALUE }, - { "set_value", SEPG_DB_SEQUENCE__SET_VALUE }, - { NULL, 0UL }, + { + "create", SEPG_DB_SEQUENCE__CREATE + }, + { + "drop", SEPG_DB_SEQUENCE__DROP + }, + { + "getattr", SEPG_DB_SEQUENCE__GETATTR + }, + { + "setattr", SEPG_DB_SEQUENCE__SETATTR + }, + { + "relabelfrom", SEPG_DB_SEQUENCE__RELABELFROM + }, + { + "relabelto", SEPG_DB_SEQUENCE__RELABELTO + }, + { + "get_value", SEPG_DB_SEQUENCE__GET_VALUE + }, + { + "next_value", SEPG_DB_SEQUENCE__NEXT_VALUE + }, + { + "set_value", SEPG_DB_SEQUENCE__SET_VALUE + }, + { + NULL, 0UL + }, } }, { - "db_procedure", SEPG_CLASS_DB_PROCEDURE, + "db_procedure", SEPG_CLASS_DB_PROCEDURE, { - { "create", SEPG_DB_PROCEDURE__CREATE }, - { "drop", SEPG_DB_PROCEDURE__DROP }, - { "getattr", SEPG_DB_PROCEDURE__GETATTR }, - { "setattr", SEPG_DB_PROCEDURE__SETATTR }, - { "relabelfrom", SEPG_DB_PROCEDURE__RELABELFROM }, - { "relabelto", SEPG_DB_PROCEDURE__RELABELTO }, - { "execute", SEPG_DB_PROCEDURE__EXECUTE }, - { "entrypoint", SEPG_DB_PROCEDURE__ENTRYPOINT }, - { "install", SEPG_DB_PROCEDURE__INSTALL }, - { NULL, 0UL }, + { + "create", SEPG_DB_PROCEDURE__CREATE + }, + { + "drop", SEPG_DB_PROCEDURE__DROP + }, + { + "getattr", SEPG_DB_PROCEDURE__GETATTR + }, + { + "setattr", SEPG_DB_PROCEDURE__SETATTR + }, + { + "relabelfrom", SEPG_DB_PROCEDURE__RELABELFROM + }, + { + "relabelto", SEPG_DB_PROCEDURE__RELABELTO + }, + { + "execute", SEPG_DB_PROCEDURE__EXECUTE + }, + { + "entrypoint", SEPG_DB_PROCEDURE__ENTRYPOINT + }, + { + "install", SEPG_DB_PROCEDURE__INSTALL + }, + { + NULL, 0UL + }, } }, { - "db_column", SEPG_CLASS_DB_COLUMN, + "db_column", SEPG_CLASS_DB_COLUMN, { - { "create", SEPG_DB_COLUMN__CREATE }, - { "drop", SEPG_DB_COLUMN__DROP }, - { "getattr", SEPG_DB_COLUMN__GETATTR }, - { "setattr", SEPG_DB_COLUMN__SETATTR }, - { "relabelfrom", SEPG_DB_COLUMN__RELABELFROM }, - { "relabelto", SEPG_DB_COLUMN__RELABELTO }, - { "select", SEPG_DB_COLUMN__SELECT }, - { "update", SEPG_DB_COLUMN__UPDATE }, - { "insert", SEPG_DB_COLUMN__INSERT }, - { NULL, 0UL }, + { + "create", SEPG_DB_COLUMN__CREATE + }, + { + "drop", SEPG_DB_COLUMN__DROP + }, + { + "getattr", SEPG_DB_COLUMN__GETATTR + }, + { + "setattr", SEPG_DB_COLUMN__SETATTR + }, + { + "relabelfrom", SEPG_DB_COLUMN__RELABELFROM + }, + { + "relabelto", SEPG_DB_COLUMN__RELABELTO + }, + { + "select", SEPG_DB_COLUMN__SELECT + }, + { + "update", SEPG_DB_COLUMN__UPDATE + }, + { + "insert", SEPG_DB_COLUMN__INSERT + }, + { + NULL, 0UL + }, } }, { - "db_tuple", SEPG_CLASS_DB_TUPLE, + "db_tuple", SEPG_CLASS_DB_TUPLE, { - { "relabelfrom", SEPG_DB_TUPLE__RELABELFROM }, - { "relabelto", SEPG_DB_TUPLE__RELABELTO }, - { "select", SEPG_DB_TUPLE__SELECT }, - { "update", SEPG_DB_TUPLE__UPDATE }, - { "insert", SEPG_DB_TUPLE__INSERT }, - { "delete", SEPG_DB_TUPLE__DELETE }, - { NULL, 0UL }, + { + "relabelfrom", SEPG_DB_TUPLE__RELABELFROM + }, + { + "relabelto", SEPG_DB_TUPLE__RELABELTO + }, + { + "select", SEPG_DB_TUPLE__SELECT + }, + { + "update", SEPG_DB_TUPLE__UPDATE + }, + { + "insert", SEPG_DB_TUPLE__INSERT + }, + { + "delete", SEPG_DB_TUPLE__DELETE + }, + { + NULL, 0UL + }, } }, { - "db_blob", SEPG_CLASS_DB_BLOB, + "db_blob", SEPG_CLASS_DB_BLOB, { - { "create", SEPG_DB_BLOB__CREATE }, - { "drop", SEPG_DB_BLOB__DROP }, - { "getattr", SEPG_DB_BLOB__GETATTR }, - { "setattr", SEPG_DB_BLOB__SETATTR }, - { "relabelfrom", SEPG_DB_BLOB__RELABELFROM }, - { "relabelto", SEPG_DB_BLOB__RELABELTO }, - { "read", SEPG_DB_BLOB__READ }, - { "write", SEPG_DB_BLOB__WRITE }, - { "import", SEPG_DB_BLOB__IMPORT }, - { "export", SEPG_DB_BLOB__EXPORT }, - { NULL, 0UL }, + { + "create", SEPG_DB_BLOB__CREATE + }, + { + "drop", SEPG_DB_BLOB__DROP + }, + { + "getattr", SEPG_DB_BLOB__GETATTR + }, + { + "setattr", SEPG_DB_BLOB__SETATTR + }, + { + "relabelfrom", SEPG_DB_BLOB__RELABELFROM + }, + { + "relabelto", SEPG_DB_BLOB__RELABELTO + }, + { + "read", SEPG_DB_BLOB__READ + }, + { + "write", SEPG_DB_BLOB__WRITE + }, + { + "import", SEPG_DB_BLOB__IMPORT + }, + { + "export", SEPG_DB_BLOB__EXPORT + }, + { + NULL, 0UL + }, } }, { - "db_language", SEPG_CLASS_DB_LANGUAGE, + "db_language", SEPG_CLASS_DB_LANGUAGE, { - { "create", SEPG_DB_LANGUAGE__CREATE }, - { "drop", SEPG_DB_LANGUAGE__DROP }, - { "getattr", SEPG_DB_LANGUAGE__GETATTR }, - { "setattr", SEPG_DB_LANGUAGE__SETATTR }, - { "relabelfrom", SEPG_DB_LANGUAGE__RELABELFROM }, - { "relabelto", SEPG_DB_LANGUAGE__RELABELTO }, - { "implement", SEPG_DB_LANGUAGE__IMPLEMENT }, - { "execute", SEPG_DB_LANGUAGE__EXECUTE }, - { NULL, 0UL }, + { + "create", SEPG_DB_LANGUAGE__CREATE + }, + { + "drop", SEPG_DB_LANGUAGE__DROP + }, + { + "getattr", SEPG_DB_LANGUAGE__GETATTR + }, + { + "setattr", SEPG_DB_LANGUAGE__SETATTR + }, + { + "relabelfrom", SEPG_DB_LANGUAGE__RELABELFROM + }, + { + "relabelto", SEPG_DB_LANGUAGE__RELABELTO + }, + { + "implement", SEPG_DB_LANGUAGE__IMPLEMENT + }, + { + "execute", SEPG_DB_LANGUAGE__EXECUTE + }, + { + NULL, 0UL + }, } }, { - "db_view", SEPG_CLASS_DB_VIEW, + "db_view", SEPG_CLASS_DB_VIEW, { - { "create", SEPG_DB_VIEW__CREATE }, - { "drop", SEPG_DB_VIEW__DROP }, - { "getattr", SEPG_DB_VIEW__GETATTR }, - { "setattr", SEPG_DB_VIEW__SETATTR }, - { "relabelfrom", SEPG_DB_VIEW__RELABELFROM }, - { "relabelto", SEPG_DB_VIEW__RELABELTO }, - { "expand", SEPG_DB_VIEW__EXPAND }, - { NULL, 0UL }, + { + "create", SEPG_DB_VIEW__CREATE + }, + { + "drop", SEPG_DB_VIEW__DROP + }, + { + "getattr", SEPG_DB_VIEW__GETATTR + }, + { + "setattr", SEPG_DB_VIEW__SETATTR + }, + { + "relabelfrom", SEPG_DB_VIEW__RELABELFROM + }, + { + "relabelto", SEPG_DB_VIEW__RELABELTO + }, + { + "expand", SEPG_DB_VIEW__EXPAND + }, + { + NULL, 0UL + }, } }, }; @@ -316,7 +624,7 @@ sepgsql_get_mode(void) int sepgsql_set_mode(int new_mode) { - int old_mode = sepgsql_mode; + int old_mode = sepgsql_mode; sepgsql_mode = new_mode; @@ -367,10 +675,10 @@ sepgsql_audit_log(bool denied, uint32 audited, const char *audit_name) { - StringInfoData buf; - const char *class_name; - const char *av_name; - int i; + StringInfoData buf; + const char *class_name; + const char *av_name; + int i; /* lookup name of the object class */ Assert(tclass < SEPG_CLASS_MAX); @@ -380,7 +688,7 @@ sepgsql_audit_log(bool denied, initStringInfo(&buf); appendStringInfo(&buf, "%s {", (denied ? "denied" : "allowed")); - for (i=0; selinux_catalog[tclass].av[i].av_name; i++) + for (i = 0; selinux_catalog[tclass].av[i].av_name; i++) { if (audited & (1UL << i)) { @@ -418,14 +726,15 @@ void sepgsql_compute_avd(const char *scontext, const char *tcontext, uint16 tclass, - struct av_decision *avd) + struct av_decision * avd) { - const char *tclass_name; - security_class_t tclass_ex; - struct av_decision avd_ex; - int i, deny_unknown = security_deny_unknown(); + const char *tclass_name; + security_class_t tclass_ex; + struct av_decision avd_ex; + int i, + deny_unknown = security_deny_unknown(); - /* Get external code of the object class*/ + /* Get external code of the object class */ Assert(tclass < SEPG_CLASS_MAX); Assert(tclass == selinux_catalog[tclass].class_code); @@ -436,14 +745,13 @@ sepgsql_compute_avd(const char *scontext, { /* * If the current security policy does not support permissions - * corresponding to database objects, we fill up them with dummy - * data. + * corresponding to database objects, we fill up them with dummy data. * If security_deny_unknown() returns positive value, undefined * permissions should be denied. Otherwise, allowed */ avd->allowed = (security_deny_unknown() > 0 ? 0 : ~0); avd->auditallow = 0U; - avd->auditdeny = ~0U; + avd->auditdeny = ~0U; avd->flags = 0; return; @@ -453,8 +761,8 @@ sepgsql_compute_avd(const char *scontext, * Ask SELinux what is allowed set of permissions on a pair of the * security contexts and the given object class. */ - if (security_compute_av_flags_raw((security_context_t)scontext, - (security_context_t)tcontext, + if (security_compute_av_flags_raw((security_context_t) scontext, + (security_context_t) tcontext, tclass_ex, 0, &avd_ex) < 0) ereport(ERROR, (errcode(ERRCODE_INTERNAL_ERROR), @@ -464,17 +772,17 @@ sepgsql_compute_avd(const char *scontext, /* * SELinux returns its access control decision as a set of permissions - * represented in external code which depends on run-time environment. - * So, we need to translate it to the internal representation before - * returning results for the caller. + * represented in external code which depends on run-time environment. So, + * we need to translate it to the internal representation before returning + * results for the caller. */ memset(avd, 0, sizeof(struct av_decision)); - for (i=0; selinux_catalog[tclass].av[i].av_name; i++) + for (i = 0; selinux_catalog[tclass].av[i].av_name; i++) { - access_vector_t av_code_ex; - const char *av_name = selinux_catalog[tclass].av[i].av_name; - uint32 av_code = selinux_catalog[tclass].av[i].av_code; + access_vector_t av_code_ex; + const char *av_name = selinux_catalog[tclass].av[i].av_name; + uint32 av_code = selinux_catalog[tclass].av[i].av_code; av_code_ex = string_to_av_perm(tclass_ex, av_name); if (av_code_ex == 0) @@ -524,23 +832,23 @@ sepgsql_compute_create(const char *scontext, const char *tcontext, uint16 tclass) { - security_context_t ncontext; - security_class_t tclass_ex; - const char *tclass_name; - char *result; + security_context_t ncontext; + security_class_t tclass_ex; + const char *tclass_name; + char *result; - /* Get external code of the object class*/ + /* Get external code of the object class */ Assert(tclass < SEPG_CLASS_MAX); tclass_name = selinux_catalog[tclass].class_name; tclass_ex = string_to_security_class(tclass_name); /* - * Ask SELinux what is the default context for the given object class - * on a pair of security contexts + * Ask SELinux what is the default context for the given object class on a + * pair of security contexts */ - if (security_compute_create_raw((security_context_t)scontext, - (security_context_t)tcontext, + if (security_compute_create_raw((security_context_t) scontext, + (security_context_t) tcontext, tclass_ex, &ncontext) < 0) ereport(ERROR, (errcode(ERRCODE_INTERNAL_ERROR), @@ -549,8 +857,8 @@ sepgsql_compute_create(const char *scontext, scontext, tcontext, tclass_name))); /* - * libselinux returns malloc()'ed string, so we need to copy it - * on the palloc()'ed region. + * libselinux returns malloc()'ed string, so we need to copy it on the + * palloc()'ed region. */ PG_TRY(); { @@ -589,7 +897,7 @@ sepgsql_check_perms(const char *scontext, const char *audit_name, bool abort) { - struct av_decision avd; + struct av_decision avd; uint32 denied; uint32 audited; bool result = true; @@ -602,7 +910,7 @@ sepgsql_check_perms(const char *scontext, audited = (denied ? denied : required); else audited = (denied ? (denied & avd.auditdeny) - : (required & avd.auditallow)); + : (required & avd.auditallow)); if (denied && sepgsql_getenforce() > 0 && @@ -610,8 +918,8 @@ sepgsql_check_perms(const char *scontext, result = false; /* - * It records a security audit for the request, if needed. - * But, when SE-PgSQL performs 'internal' mode, it needs to keep silent. + * It records a security audit for the request, if needed. But, when + * SE-PgSQL performs 'internal' mode, it needs to keep silent. */ if (audited && sepgsql_mode != SEPGSQL_MODE_INTERNAL) { diff --git a/contrib/sepgsql/sepgsql.h b/contrib/sepgsql/sepgsql.h index ba7b2d1597..71688ab784 100644 --- a/contrib/sepgsql/sepgsql.h +++ b/contrib/sepgsql/sepgsql.h @@ -218,33 +218,34 @@ extern bool sepgsql_get_debug_audit(void); /* * selinux.c */ -extern bool sepgsql_is_enabled(void); +extern bool sepgsql_is_enabled(void); extern int sepgsql_get_mode(void); extern int sepgsql_set_mode(int new_mode); extern bool sepgsql_getenforce(void); extern void sepgsql_audit_log(bool denied, - const char *scontext, - const char *tcontext, - uint16 tclass, - uint32 audited, - const char *audit_name); + const char *scontext, + const char *tcontext, + uint16 tclass, + uint32 audited, + const char *audit_name); extern void sepgsql_compute_avd(const char *scontext, - const char *tcontext, - uint16 tclass, - struct av_decision *avd); + const char *tcontext, + uint16 tclass, + struct av_decision * avd); extern char *sepgsql_compute_create(const char *scontext, - const char *tcontext, - uint16 tclass); + const char *tcontext, + uint16 tclass); extern bool sepgsql_check_perms(const char *scontext, - const char *tcontext, - uint16 tclass, - uint32 required, - const char *audit_name, - bool abort); + const char *tcontext, + uint16 tclass, + uint32 required, + const char *audit_name, + bool abort); + /* * label.c */ @@ -252,8 +253,8 @@ extern char *sepgsql_get_client_label(void); extern char *sepgsql_set_client_label(char *new_label); extern char *sepgsql_get_label(Oid relOid, Oid objOid, int32 subId); -extern void sepgsql_object_relabel(const ObjectAddress *object, - const char *seclabel); +extern void sepgsql_object_relabel(const ObjectAddress *object, + const char *seclabel); extern Datum sepgsql_getcon(PG_FUNCTION_ARGS); extern Datum sepgsql_mcstrans_in(PG_FUNCTION_ARGS); @@ -276,7 +277,7 @@ extern void sepgsql_schema_relabel(Oid namespaceId, const char *seclabel); */ extern void sepgsql_attribute_post_create(Oid relOid, AttrNumber attnum); extern void sepgsql_attribute_relabel(Oid relOid, AttrNumber attnum, - const char *seclabel); + const char *seclabel); extern void sepgsql_relation_post_create(Oid relOid); extern void sepgsql_relation_relabel(Oid relOid, const char *seclabel); @@ -287,4 +288,4 @@ extern void sepgsql_proc_post_create(Oid functionId); extern void sepgsql_proc_relabel(Oid functionId, const char *seclabel); extern char *sepgsql_proc_get_domtrans(Oid functionId); -#endif /* SEPGSQL_H */ +#endif /* SEPGSQL_H */ diff --git a/contrib/spi/moddatetime.c b/contrib/spi/moddatetime.c index f5a0d93ef5..d02560c298 100644 --- a/contrib/spi/moddatetime.c +++ b/contrib/spi/moddatetime.c @@ -84,7 +84,7 @@ moddatetime(PG_FUNCTION_ARGS) /* * This is where we check to see if the field we are supposed to update - * even exists. The above function must return -1 if name not found? + * even exists. The above function must return -1 if name not found? */ if (attnum < 0) ereport(ERROR, diff --git a/contrib/xml2/xpath.c b/contrib/xml2/xpath.c index e92ab66491..44c600e134 100644 --- a/contrib/xml2/xpath.c +++ b/contrib/xml2/xpath.c @@ -61,7 +61,7 @@ static text *pgxml_result_to_text(xmlXPathObjectPtr res, xmlChar *toptag, static xmlChar *pgxml_texttoxmlchar(text *textstring); static xmlXPathObjectPtr pgxml_xpath(text *document, xmlChar *xpath, - xpath_workspace *workspace); + xpath_workspace *workspace); static void cleanup_workspace(xpath_workspace *workspace); @@ -234,7 +234,7 @@ Datum xpath_nodeset(PG_FUNCTION_ARGS) { text *document = PG_GETARG_TEXT_P(0); - text *xpathsupp = PG_GETARG_TEXT_P(1); /* XPath expression */ + text *xpathsupp = PG_GETARG_TEXT_P(1); /* XPath expression */ xmlChar *toptag = pgxml_texttoxmlchar(PG_GETARG_TEXT_P(2)); xmlChar *septag = pgxml_texttoxmlchar(PG_GETARG_TEXT_P(3)); xmlChar *xpath; @@ -267,7 +267,7 @@ Datum xpath_list(PG_FUNCTION_ARGS) { text *document = PG_GETARG_TEXT_P(0); - text *xpathsupp = PG_GETARG_TEXT_P(1); /* XPath expression */ + text *xpathsupp = PG_GETARG_TEXT_P(1); /* XPath expression */ xmlChar *plainsep = pgxml_texttoxmlchar(PG_GETARG_TEXT_P(2)); xmlChar *xpath; text *xpres; @@ -296,7 +296,7 @@ Datum xpath_string(PG_FUNCTION_ARGS) { text *document = PG_GETARG_TEXT_P(0); - text *xpathsupp = PG_GETARG_TEXT_P(1); /* XPath expression */ + text *xpathsupp = PG_GETARG_TEXT_P(1); /* XPath expression */ xmlChar *xpath; int32 pathsize; text *xpres; @@ -337,7 +337,7 @@ Datum xpath_number(PG_FUNCTION_ARGS) { text *document = PG_GETARG_TEXT_P(0); - text *xpathsupp = PG_GETARG_TEXT_P(1); /* XPath expression */ + text *xpathsupp = PG_GETARG_TEXT_P(1); /* XPath expression */ xmlChar *xpath; float4 fRes; xmlXPathObjectPtr res; @@ -369,7 +369,7 @@ Datum xpath_bool(PG_FUNCTION_ARGS) { text *document = PG_GETARG_TEXT_P(0); - text *xpathsupp = PG_GETARG_TEXT_P(1); /* XPath expression */ + text *xpathsupp = PG_GETARG_TEXT_P(1); /* XPath expression */ xmlChar *xpath; int bRes; xmlXPathObjectPtr res; diff --git a/contrib/xml2/xslt_proc.c b/contrib/xml2/xslt_proc.c index a90104d17a..f8f7d7263f 100644 --- a/contrib/xml2/xslt_proc.c +++ b/contrib/xml2/xslt_proc.c @@ -42,7 +42,6 @@ extern void pgxml_parser_init(void); /* local defs */ static const char **parse_params(text *paramstr); - #endif /* USE_LIBXSLT */ @@ -166,7 +165,7 @@ parse_params(text *paramstr) { max_params *= 2; params = (const char **) repalloc(params, - (max_params + 1) * sizeof(char *)); + (max_params + 1) * sizeof(char *)); } params[nparams++] = pos; pos = strstr(pos, nvsep); diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c index 6d608fed89..175e6ea2f2 100644 --- a/src/backend/access/common/heaptuple.c +++ b/src/backend/access/common/heaptuple.c @@ -350,7 +350,7 @@ nocachegetattr(HeapTuple tuple, * * check to see if any preceding bits are null... */ - int byte = attnum >> 3; + int byte = attnum >> 3; int finalbit = attnum & 0x07; /* check for nulls "before" final bit of last byte */ diff --git a/src/backend/access/common/indextuple.c b/src/backend/access/common/indextuple.c index 9ea87360f9..85c43199aa 100644 --- a/src/backend/access/common/indextuple.c +++ b/src/backend/access/common/indextuple.c @@ -237,7 +237,7 @@ nocache_index_getattr(IndexTuple tup, * Now check to see if any preceding bits are null... */ { - int byte = attnum >> 3; + int byte = attnum >> 3; int finalbit = attnum & 0x07; /* check for nulls "before" final bit of last byte */ diff --git a/src/backend/access/gin/ginarrayproc.c b/src/backend/access/gin/ginarrayproc.c index ce9abae6aa..2de58604ee 100644 --- a/src/backend/access/gin/ginarrayproc.c +++ b/src/backend/access/gin/ginarrayproc.c @@ -82,7 +82,8 @@ ginqueryarrayextract(PG_FUNCTION_ARGS) ArrayType *array = PG_GETARG_ARRAYTYPE_P_COPY(0); int32 *nkeys = (int32 *) PG_GETARG_POINTER(1); StrategyNumber strategy = PG_GETARG_UINT16(2); - /* bool **pmatch = (bool **) PG_GETARG_POINTER(3); */ + + /* bool **pmatch = (bool **) PG_GETARG_POINTER(3); */ /* Pointer *extra_data = (Pointer *) PG_GETARG_POINTER(4); */ bool **nullFlags = (bool **) PG_GETARG_POINTER(5); int32 *searchMode = (int32 *) PG_GETARG_POINTER(6); @@ -112,7 +113,7 @@ ginqueryarrayextract(PG_FUNCTION_ARGS) case GinContainsStrategy: if (nelems > 0) *searchMode = GIN_SEARCH_MODE_DEFAULT; - else /* everything contains the empty set */ + else /* everything contains the empty set */ *searchMode = GIN_SEARCH_MODE_ALL; break; case GinContainedStrategy: @@ -142,10 +143,13 @@ ginarrayconsistent(PG_FUNCTION_ARGS) { bool *check = (bool *) PG_GETARG_POINTER(0); StrategyNumber strategy = PG_GETARG_UINT16(1); + /* ArrayType *query = PG_GETARG_ARRAYTYPE_P(2); */ int32 nkeys = PG_GETARG_INT32(3); + /* Pointer *extra_data = (Pointer *) PG_GETARG_POINTER(4); */ bool *recheck = (bool *) PG_GETARG_POINTER(5); + /* Datum *queryKeys = (Datum *) PG_GETARG_POINTER(6); */ bool *nullFlags = (bool *) PG_GETARG_POINTER(7); bool res; @@ -190,10 +194,11 @@ ginarrayconsistent(PG_FUNCTION_ARGS) case GinEqualStrategy: /* we will need recheck */ *recheck = true; + /* * Must have all elements in check[] true; no discrimination - * against nulls here. This is because array_contain_compare - * and array_eq handle nulls differently ... + * against nulls here. This is because array_contain_compare and + * array_eq handle nulls differently ... */ res = true; for (i = 0; i < nkeys; i++) diff --git a/src/backend/access/gin/ginbulk.c b/src/backend/access/gin/ginbulk.c index f0c8c8e37f..9e5bab194d 100644 --- a/src/backend/access/gin/ginbulk.c +++ b/src/backend/access/gin/ginbulk.c @@ -80,8 +80,8 @@ ginAllocEntryAccumulator(void *arg) GinEntryAccumulator *ea; /* - * Allocate memory by rather big chunks to decrease overhead. We have - * no need to reclaim RBNodes individually, so this costs nothing. + * Allocate memory by rather big chunks to decrease overhead. We have no + * need to reclaim RBNodes individually, so this costs nothing. */ if (accum->entryallocator == NULL || accum->eas_used >= DEF_NENTRY) { @@ -108,7 +108,7 @@ ginInitBA(BuildAccumulator *accum) cmpEntryAccumulator, ginCombineData, ginAllocEntryAccumulator, - NULL, /* no freefunc needed */ + NULL, /* no freefunc needed */ (void *) accum); } @@ -145,8 +145,8 @@ ginInsertBAEntry(BuildAccumulator *accum, bool isNew; /* - * For the moment, fill only the fields of eatmp that will be looked at - * by cmpEntryAccumulator or ginCombineData. + * For the moment, fill only the fields of eatmp that will be looked at by + * cmpEntryAccumulator or ginCombineData. */ eatmp.attnum = attnum; eatmp.key = key; diff --git a/src/backend/access/gin/gindatapage.c b/src/backend/access/gin/gindatapage.c index 4a1e754800..41dbe9fd11 100644 --- a/src/backend/access/gin/gindatapage.c +++ b/src/backend/access/gin/gindatapage.c @@ -21,13 +21,13 @@ int ginCompareItemPointers(ItemPointer a, ItemPointer b) { - BlockNumber ba = GinItemPointerGetBlockNumber(a); - BlockNumber bb = GinItemPointerGetBlockNumber(b); + BlockNumber ba = GinItemPointerGetBlockNumber(a); + BlockNumber bb = GinItemPointerGetBlockNumber(b); if (ba == bb) { - OffsetNumber oa = GinItemPointerGetOffsetNumber(a); - OffsetNumber ob = GinItemPointerGetOffsetNumber(b); + OffsetNumber oa = GinItemPointerGetOffsetNumber(a); + OffsetNumber ob = GinItemPointerGetOffsetNumber(b); if (oa == ob) return 0; @@ -383,6 +383,7 @@ dataPlaceToPage(GinBtree btree, Buffer buf, OffsetNumber off, XLogRecData **prda Page page = BufferGetPage(buf); int sizeofitem = GinSizeOfDataPageItem(page); int cnt = 0; + /* these must be static so they can be returned to caller */ static XLogRecData rdata[3]; static ginxlogInsert data; @@ -474,6 +475,7 @@ dataSplitPage(GinBtree btree, Buffer lbuf, Buffer rbuf, OffsetNumber off, XLogRe Size pageSize = PageGetPageSize(lpage); Size freeSpace; uint32 nCopied = 1; + /* these must be static so they can be returned to caller */ static ginxlogSplit data; static XLogRecData rdata[4]; diff --git a/src/backend/access/gin/ginentrypage.c b/src/backend/access/gin/ginentrypage.c index 9749a1be78..fa134f9fc3 100644 --- a/src/backend/access/gin/ginentrypage.c +++ b/src/backend/access/gin/ginentrypage.c @@ -98,11 +98,11 @@ GinFormTuple(GinState *ginstate, if (errorTooBig) ereport(ERROR, (errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED), - errmsg("index row size %lu exceeds maximum %lu for index \"%s\"", - (unsigned long) newsize, - (unsigned long) Min(INDEX_SIZE_MASK, - GinMaxItemSize), - RelationGetRelationName(ginstate->index)))); + errmsg("index row size %lu exceeds maximum %lu for index \"%s\"", + (unsigned long) newsize, + (unsigned long) Min(INDEX_SIZE_MASK, + GinMaxItemSize), + RelationGetRelationName(ginstate->index)))); pfree(itup); return NULL; } @@ -164,7 +164,7 @@ GinShortenTuple(IndexTuple itup, uint32 nipd) * Form a non-leaf entry tuple by copying the key data from the given tuple, * which can be either a leaf or non-leaf entry tuple. * - * Any posting list in the source tuple is not copied. The specified child + * Any posting list in the source tuple is not copied. The specified child * block number is inserted into t_tid. */ static IndexTuple @@ -225,7 +225,7 @@ entryIsMoveRight(GinBtree btree, Page page) key = gintuple_get_key(btree->ginstate, itup, &category); if (ginCompareAttEntries(btree->ginstate, - btree->entryAttnum, btree->entryKey, btree->entryCategory, + btree->entryAttnum, btree->entryKey, btree->entryCategory, attnum, key, category) > 0) return TRUE; @@ -488,6 +488,7 @@ entryPlaceToPage(GinBtree btree, Buffer buf, OffsetNumber off, XLogRecData **prd Page page = BufferGetPage(buf); OffsetNumber placed; int cnt = 0; + /* these must be static so they can be returned to caller */ static XLogRecData rdata[3]; static ginxlogInsert data; @@ -561,6 +562,7 @@ entrySplitPage(GinBtree btree, Buffer lbuf, Buffer rbuf, OffsetNumber off, XLogR Page lpage = PageGetTempPageCopy(BufferGetPage(lbuf)); Page rpage = BufferGetPage(rbuf); Size pageSize = PageGetPageSize(lpage); + /* these must be static so they can be returned to caller */ static XLogRecData rdata[2]; static ginxlogSplit data; diff --git a/src/backend/access/gin/ginfast.c b/src/backend/access/gin/ginfast.c index 9960c786c9..82419e37ac 100644 --- a/src/backend/access/gin/ginfast.c +++ b/src/backend/access/gin/ginfast.c @@ -88,9 +88,9 @@ writeListPage(Relation index, Buffer buffer, GinPageGetOpaque(page)->rightlink = rightlink; /* - * tail page may contain only whole row(s) or final part of row placed - * on previous pages (a "row" here meaning all the index tuples generated - * for one heap tuple) + * tail page may contain only whole row(s) or final part of row placed on + * previous pages (a "row" here meaning all the index tuples generated for + * one heap tuple) */ if (rightlink == InvalidBlockNumber) { @@ -437,7 +437,7 @@ ginHeapTupleFastInsert(GinState *ginstate, GinTupleCollector *collector) * Create temporary index tuples for a single indexable item (one index column * for the heap tuple specified by ht_ctid), and append them to the array * in *collector. They will subsequently be written out using - * ginHeapTupleFastInsert. Note that to guarantee consistent state, all + * ginHeapTupleFastInsert. Note that to guarantee consistent state, all * temp tuples for a given heap tuple must be written in one call to * ginHeapTupleFastInsert. */ @@ -475,8 +475,8 @@ ginHeapTupleFastCollect(GinState *ginstate, } /* - * Build an index tuple for each key value, and add to array. In - * pending tuples we just stick the heap TID into t_tid. + * Build an index tuple for each key value, and add to array. In pending + * tuples we just stick the heap TID into t_tid. */ for (i = 0; i < nentries; i++) { @@ -665,7 +665,7 @@ processPendingPage(BuildAccumulator *accum, KeyArray *ka, { IndexTuple itup = (IndexTuple) PageGetItem(page, PageGetItemId(page, i)); OffsetNumber curattnum; - Datum curkey; + Datum curkey; GinNullCategory curcategory; /* Check for change of heap TID or attnum */ @@ -830,7 +830,7 @@ ginInsertCleanup(GinState *ginstate, */ ginBeginBAScan(&accum); while ((list = ginGetBAEntry(&accum, - &attnum, &key, &category, &nlist)) != NULL) + &attnum, &key, &category, &nlist)) != NULL) { ginEntryInsert(ginstate, attnum, key, category, list, nlist, NULL); @@ -867,7 +867,7 @@ ginInsertCleanup(GinState *ginstate, ginBeginBAScan(&accum); while ((list = ginGetBAEntry(&accum, - &attnum, &key, &category, &nlist)) != NULL) + &attnum, &key, &category, &nlist)) != NULL) ginEntryInsert(ginstate, attnum, key, category, list, nlist, NULL); } diff --git a/src/backend/access/gin/ginget.c b/src/backend/access/gin/ginget.c index e07dc0a6ce..a4771654a6 100644 --- a/src/backend/access/gin/ginget.c +++ b/src/backend/access/gin/ginget.c @@ -40,8 +40,8 @@ static bool callConsistentFn(GinState *ginstate, GinScanKey key) { /* - * If we're dealing with a dummy EVERYTHING key, we don't want to call - * the consistentFn; just claim it matches. + * If we're dealing with a dummy EVERYTHING key, we don't want to call the + * consistentFn; just claim it matches. */ if (key->searchMode == GIN_SEARCH_MODE_EVERYTHING) { @@ -174,14 +174,14 @@ scanPostingTree(Relation index, GinScanEntry scanEntry, /* * Collects TIDs into scanEntry->matchBitmap for all heap tuples that - * match the search entry. This supports three different match modes: + * match the search entry. This supports three different match modes: * * 1. Partial-match support: scan from current point until the - * comparePartialFn says we're done. + * comparePartialFn says we're done. * 2. SEARCH_MODE_ALL: scan from current point (which should be first - * key for the current attnum) until we hit null items or end of attnum + * key for the current attnum) until we hit null items or end of attnum * 3. SEARCH_MODE_EVERYTHING: scan from current point (which should be first - * key for the current attnum) until we hit end of attnum + * key for the current attnum) until we hit end of attnum * * Returns true if done, false if it's necessary to restart scan from scratch */ @@ -189,7 +189,7 @@ static bool collectMatchBitmap(GinBtreeData *btree, GinBtreeStack *stack, GinScanEntry scanEntry) { - OffsetNumber attnum; + OffsetNumber attnum; Form_pg_attribute attr; /* Initialize empty bitmap result */ @@ -253,8 +253,8 @@ collectMatchBitmap(GinBtreeData *btree, GinBtreeStack *stack, cmp = DatumGetInt32(FunctionCall4(&btree->ginstate->comparePartialFn[attnum - 1], scanEntry->queryKey, idatum, - UInt16GetDatum(scanEntry->strategy), - PointerGetDatum(scanEntry->extra_data))); + UInt16GetDatum(scanEntry->strategy), + PointerGetDatum(scanEntry->extra_data))); if (cmp > 0) return true; @@ -269,7 +269,7 @@ collectMatchBitmap(GinBtreeData *btree, GinBtreeStack *stack, /* * In ALL mode, we are not interested in null items, so we can * stop if we get to a null-item placeholder (which will be the - * last entry for a given attnum). We do want to include NULL_KEY + * last entry for a given attnum). We do want to include NULL_KEY * and EMPTY_ITEM entries, though. */ if (icategory == GIN_CAT_NULL_ITEM) @@ -287,8 +287,8 @@ collectMatchBitmap(GinBtreeData *btree, GinBtreeStack *stack, * We should unlock current page (but not unpin) during tree scan * to prevent deadlock with vacuum processes. * - * We save current entry value (idatum) to be able to re-find - * our tuple after re-locking + * We save current entry value (idatum) to be able to re-find our + * tuple after re-locking */ if (icategory == GIN_CAT_NORM_KEY) idatum = datumCopy(idatum, attr->attbyval, attr->attlen); @@ -442,11 +442,11 @@ restartScanEntry: Page page; /* - * We should unlock entry page before touching posting tree - * to prevent deadlocks with vacuum processes. Because entry is - * never deleted from page and posting tree is never reduced to - * the posting list, we can unlock page after getting BlockNumber - * of root of posting tree. + * We should unlock entry page before touching posting tree to + * prevent deadlocks with vacuum processes. Because entry is never + * deleted from page and posting tree is never reduced to the + * posting list, we can unlock page after getting BlockNumber of + * root of posting tree. */ LockBuffer(stackEntry->buffer, GIN_UNLOCK); needUnlock = FALSE; @@ -596,7 +596,7 @@ entryGetNextItem(GinState *ginstate, GinScanEntry entry) if (!ItemPointerIsValid(&entry->curItem) || ginCompareItemPointers(&entry->curItem, - entry->list + entry->offset - 1) == 0) + entry->list + entry->offset - 1) == 0) { /* * First pages are deleted or empty, or we found exact @@ -656,10 +656,10 @@ entryGetItem(GinState *ginstate, GinScanEntry entry) } /* - * Reset counter to the beginning of entry->matchResult. - * Note: entry->offset is still greater than - * matchResult->ntuples if matchResult is lossy. So, on next - * call we will get next result from TIDBitmap. + * Reset counter to the beginning of entry->matchResult. Note: + * entry->offset is still greater than matchResult->ntuples if + * matchResult is lossy. So, on next call we will get next + * result from TIDBitmap. */ entry->offset = 0; } @@ -745,10 +745,10 @@ keyGetItem(GinState *ginstate, MemoryContext tempCtx, GinScanKey key) /* * Find the minimum of the active entry curItems. * - * Note: a lossy-page entry is encoded by a ItemPointer with max value - * for offset (0xffff), so that it will sort after any exact entries - * for the same page. So we'll prefer to return exact pointers not - * lossy pointers, which is good. + * Note: a lossy-page entry is encoded by a ItemPointer with max value for + * offset (0xffff), so that it will sort after any exact entries for the + * same page. So we'll prefer to return exact pointers not lossy + * pointers, which is good. */ ItemPointerSetMax(&minItem); @@ -782,28 +782,27 @@ keyGetItem(GinState *ginstate, MemoryContext tempCtx, GinScanKey key) /* * Lossy-page entries pose a problem, since we don't know the correct - * entryRes state to pass to the consistentFn, and we also don't know - * what its combining logic will be (could be AND, OR, or even NOT). - * If the logic is OR then the consistentFn might succeed for all - * items in the lossy page even when none of the other entries match. + * entryRes state to pass to the consistentFn, and we also don't know what + * its combining logic will be (could be AND, OR, or even NOT). If the + * logic is OR then the consistentFn might succeed for all items in the + * lossy page even when none of the other entries match. * * If we have a single lossy-page entry then we check to see if the - * consistentFn will succeed with only that entry TRUE. If so, - * we return a lossy-page pointer to indicate that the whole heap - * page must be checked. (On subsequent calls, we'll do nothing until - * minItem is past the page altogether, thus ensuring that we never return - * both regular and lossy pointers for the same page.) + * consistentFn will succeed with only that entry TRUE. If so, we return + * a lossy-page pointer to indicate that the whole heap page must be + * checked. (On subsequent calls, we'll do nothing until minItem is past + * the page altogether, thus ensuring that we never return both regular + * and lossy pointers for the same page.) * - * This idea could be generalized to more than one lossy-page entry, - * but ideally lossy-page entries should be infrequent so it would - * seldom be the case that we have more than one at once. So it - * doesn't seem worth the extra complexity to optimize that case. - * If we do find more than one, we just punt and return a lossy-page - * pointer always. + * This idea could be generalized to more than one lossy-page entry, but + * ideally lossy-page entries should be infrequent so it would seldom be + * the case that we have more than one at once. So it doesn't seem worth + * the extra complexity to optimize that case. If we do find more than + * one, we just punt and return a lossy-page pointer always. * - * Note that only lossy-page entries pointing to the current item's - * page should trigger this processing; we might have future lossy - * pages in the entry array, but they aren't relevant yet. + * Note that only lossy-page entries pointing to the current item's page + * should trigger this processing; we might have future lossy pages in the + * entry array, but they aren't relevant yet. */ ItemPointerSetLossyPage(&curPageLossy, GinItemPointerGetBlockNumber(&key->curItem)); @@ -853,15 +852,14 @@ keyGetItem(GinState *ginstate, MemoryContext tempCtx, GinScanKey key) } /* - * At this point we know that we don't need to return a lossy - * whole-page pointer, but we might have matches for individual exact - * item pointers, possibly in combination with a lossy pointer. Our - * strategy if there's a lossy pointer is to try the consistentFn both - * ways and return a hit if it accepts either one (forcing the hit to - * be marked lossy so it will be rechecked). An exception is that - * we don't need to try it both ways if the lossy pointer is in a - * "hidden" entry, because the consistentFn's result can't depend on - * that. + * At this point we know that we don't need to return a lossy whole-page + * pointer, but we might have matches for individual exact item pointers, + * possibly in combination with a lossy pointer. Our strategy if there's + * a lossy pointer is to try the consistentFn both ways and return a hit + * if it accepts either one (forcing the hit to be marked lossy so it will + * be rechecked). An exception is that we don't need to try it both ways + * if the lossy pointer is in a "hidden" entry, because the consistentFn's + * result can't depend on that. * * Prepare entryRes array to be passed to consistentFn. */ @@ -960,7 +958,7 @@ scanGetItem(IndexScanDesc scan, ItemPointer advancePast, keyGetItem(&so->ginstate, so->tempCtx, key); if (key->isFinished) - return false; /* finished one of keys */ + return false; /* finished one of keys */ if (ginCompareItemPointers(&key->curItem, item) < 0) *item = key->curItem; @@ -975,7 +973,7 @@ scanGetItem(IndexScanDesc scan, ItemPointer advancePast, * that exact TID, or a lossy reference to the same page. * * This logic works only if a keyGetItem stream can never contain both - * exact and lossy pointers for the same page. Else we could have a + * exact and lossy pointers for the same page. Else we could have a * case like * * stream 1 stream 2 @@ -1011,8 +1009,8 @@ scanGetItem(IndexScanDesc scan, ItemPointer advancePast, break; /* - * No hit. Update myAdvancePast to this TID, so that on the next - * pass we'll move to the next possible entry. + * No hit. Update myAdvancePast to this TID, so that on the next pass + * we'll move to the next possible entry. */ myAdvancePast = *item; } @@ -1118,8 +1116,8 @@ scanGetCandidate(IndexScanDesc scan, pendingPosition *pos) /* * Now pos->firstOffset points to the first tuple of current heap - * row, pos->lastOffset points to the first tuple of next heap - * row (or to the end of page) + * row, pos->lastOffset points to the first tuple of next heap row + * (or to the end of page) */ break; } @@ -1181,7 +1179,7 @@ matchPartialInPendingList(GinState *ginstate, Page page, entry->queryKey, datum[off - 1], UInt16GetDatum(entry->strategy), - PointerGetDatum(entry->extra_data))); + PointerGetDatum(entry->extra_data))); if (cmp == 0) return true; else if (cmp > 0) @@ -1227,8 +1225,8 @@ collectMatchesForHeapRow(IndexScanDesc scan, pendingPosition *pos) memset(pos->hasMatchKey, FALSE, so->nkeys); /* - * Outer loop iterates over multiple pending-list pages when a single - * heap row has entries spanning those pages. + * Outer loop iterates over multiple pending-list pages when a single heap + * row has entries spanning those pages. */ for (;;) { @@ -1322,11 +1320,11 @@ collectMatchesForHeapRow(IndexScanDesc scan, pendingPosition *pos) if (res == 0) { /* - * Found exact match (there can be only one, except - * in EMPTY_QUERY mode). + * Found exact match (there can be only one, except in + * EMPTY_QUERY mode). * - * If doing partial match, scan forward from - * here to end of page to check for matches. + * If doing partial match, scan forward from here to + * end of page to check for matches. * * See comment above about tuple's ordering. */ @@ -1355,13 +1353,12 @@ collectMatchesForHeapRow(IndexScanDesc scan, pendingPosition *pos) if (StopLow >= StopHigh && entry->isPartialMatch) { /* - * No exact match on this page. If doing partial - * match, scan from the first tuple greater than - * target value to end of page. Note that since we - * don't remember whether the comparePartialFn told us - * to stop early on a previous page, we will uselessly - * apply comparePartialFn to the first tuple on each - * subsequent page. + * No exact match on this page. If doing partial match, + * scan from the first tuple greater than target value to + * end of page. Note that since we don't remember whether + * the comparePartialFn told us to stop early on a + * previous page, we will uselessly apply comparePartialFn + * to the first tuple on each subsequent page. */ key->entryRes[j] = matchPartialInPendingList(&so->ginstate, diff --git a/src/backend/access/gin/gininsert.c b/src/backend/access/gin/gininsert.c index af5068906f..3e32af94a9 100644 --- a/src/backend/access/gin/gininsert.c +++ b/src/backend/access/gin/gininsert.c @@ -97,7 +97,7 @@ createPostingTree(Relation index, ItemPointerData *items, uint32 nitems) * Adds array of item pointers to tuple's posting list, or * creates posting tree and tuple pointing to tree in case * of not enough space. Max size of tuple is defined in - * GinFormTuple(). Returns a new, modified index tuple. + * GinFormTuple(). Returns a new, modified index tuple. * items[] must be in sorted order with no duplicates. */ static IndexTuple @@ -195,14 +195,14 @@ buildFreshLeafTuple(GinState *ginstate, BlockNumber postingRoot; /* - * Build posting-tree-only result tuple. We do this first so as - * to fail quickly if the key is too big. + * Build posting-tree-only result tuple. We do this first so as to + * fail quickly if the key is too big. */ res = GinFormTuple(ginstate, attnum, key, category, NULL, 0, true); /* - * Initialize posting tree with as many TIDs as will fit on the - * first page. + * Initialize posting tree with as many TIDs as will fit on the first + * page. */ postingRoot = createPostingTree(ginstate->index, items, @@ -361,7 +361,7 @@ ginBuildCallback(Relation index, HeapTuple htup, Datum *values, ginBeginBAScan(&buildstate->accum); while ((list = ginGetBAEntry(&buildstate->accum, - &attnum, &key, &category, &nlist)) != NULL) + &attnum, &key, &category, &nlist)) != NULL) { /* there could be many entries, so be willing to abort here */ CHECK_FOR_INTERRUPTS(); diff --git a/src/backend/access/gin/ginscan.c b/src/backend/access/gin/ginscan.c index 25f60e15a0..37b08c0df6 100644 --- a/src/backend/access/gin/ginscan.c +++ b/src/backend/access/gin/ginscan.c @@ -199,7 +199,7 @@ ginFillScanKey(GinScanOpaque so, OffsetNumber attnum, break; default: elog(ERROR, "unexpected searchMode: %d", searchMode); - queryCategory = 0; /* keep compiler quiet */ + queryCategory = 0; /* keep compiler quiet */ break; } isPartialMatch = false; @@ -294,8 +294,8 @@ ginNewScanKey(IndexScanDesc scan) int32 searchMode = GIN_SEARCH_MODE_DEFAULT; /* - * We assume that GIN-indexable operators are strict, so a null - * query argument means an unsatisfiable query. + * We assume that GIN-indexable operators are strict, so a null query + * argument means an unsatisfiable query. */ if (skey->sk_flags & SK_ISNULL) { @@ -315,8 +315,8 @@ ginNewScanKey(IndexScanDesc scan) PointerGetDatum(&searchMode))); /* - * If bogus searchMode is returned, treat as GIN_SEARCH_MODE_ALL; - * note in particular we don't allow extractQueryFn to select + * If bogus searchMode is returned, treat as GIN_SEARCH_MODE_ALL; note + * in particular we don't allow extractQueryFn to select * GIN_SEARCH_MODE_EVERYTHING. */ if (searchMode < GIN_SEARCH_MODE_DEFAULT || @@ -344,20 +344,20 @@ ginNewScanKey(IndexScanDesc scan) * If the extractQueryFn didn't create a nullFlags array, create one, * assuming that everything's non-null. Otherwise, run through the * array and make sure each value is exactly 0 or 1; this ensures - * binary compatibility with the GinNullCategory representation. - * While at it, detect whether any null keys are present. + * binary compatibility with the GinNullCategory representation. While + * at it, detect whether any null keys are present. */ if (nullFlags == NULL) nullFlags = (bool *) palloc0(nQueryValues * sizeof(bool)); else { - int32 j; + int32 j; for (j = 0; j < nQueryValues; j++) { if (nullFlags[j]) { - nullFlags[j] = true; /* not any other nonzero value */ + nullFlags[j] = true; /* not any other nonzero value */ hasNullQuery = true; } } @@ -387,11 +387,11 @@ ginNewScanKey(IndexScanDesc scan) /* * If the index is version 0, it may be missing null and placeholder * entries, which would render searches for nulls and full-index scans - * unreliable. Throw an error if so. + * unreliable. Throw an error if so. */ if (hasNullQuery && !so->isVoidRes) { - GinStatsData ginStats; + GinStatsData ginStats; ginGetStats(scan->indexRelation, &ginStats); if (ginStats.ginVersion < 1) @@ -410,6 +410,7 @@ ginrescan(PG_FUNCTION_ARGS) { IndexScanDesc scan = (IndexScanDesc) PG_GETARG_POINTER(0); ScanKey scankey = (ScanKey) PG_GETARG_POINTER(1); + /* remaining arguments are ignored */ GinScanOpaque so = (GinScanOpaque) scan->opaque; diff --git a/src/backend/access/gin/ginutil.c b/src/backend/access/gin/ginutil.c index 392c12d47a..716cf3a734 100644 --- a/src/backend/access/gin/ginutil.c +++ b/src/backend/access/gin/ginutil.c @@ -70,7 +70,7 @@ initGinState(GinState *state, Relation index) * However, we may have a collatable storage type for a noncollatable * indexed data type (for instance, hstore uses text index entries). * If there's no index collation then specify default collation in - * case the comparison function needs one. This is harmless if the + * case the comparison function needs one. This is harmless if the * comparison function doesn't care about collation, so we just do it * unconditionally. (We could alternatively call get_typcollation, * but that seems like expensive overkill --- there aren't going to be @@ -359,9 +359,9 @@ cmpEntries(const void *a, const void *b, void *arg) aa->datum, bb->datum)); /* - * Detect if we have any duplicates. If there are equal keys, qsort - * must compare them at some point, else it wouldn't know whether one - * should go before or after the other. + * Detect if we have any duplicates. If there are equal keys, qsort must + * compare them at some point, else it wouldn't know whether one should go + * before or after the other. */ if (res == 0) data->haveDups = true; @@ -422,9 +422,9 @@ ginExtractEntries(GinState *ginstate, OffsetNumber attnum, /* * If the extractValueFn didn't create a nullFlags array, create one, - * assuming that everything's non-null. Otherwise, run through the - * array and make sure each value is exactly 0 or 1; this ensures - * binary compatibility with the GinNullCategory representation. + * assuming that everything's non-null. Otherwise, run through the array + * and make sure each value is exactly 0 or 1; this ensures binary + * compatibility with the GinNullCategory representation. */ if (nullFlags == NULL) nullFlags = (bool *) palloc0(*nentries * sizeof(bool)); @@ -440,8 +440,8 @@ ginExtractEntries(GinState *ginstate, OffsetNumber attnum, * If there's more than one key, sort and unique-ify. * * XXX Using qsort here is notationally painful, and the overhead is - * pretty bad too. For small numbers of keys it'd likely be better to - * use a simple insertion sort. + * pretty bad too. For small numbers of keys it'd likely be better to use + * a simple insertion sort. */ if (*nentries > 1) { @@ -470,7 +470,7 @@ ginExtractEntries(GinState *ginstate, OffsetNumber attnum, j = 1; for (i = 1; i < *nentries; i++) { - if (cmpEntries(&keydata[i-1], &keydata[i], &arg) != 0) + if (cmpEntries(&keydata[i - 1], &keydata[i], &arg) != 0) { entries[j] = keydata[i].datum; nullFlags[j] = keydata[i].isnull; @@ -533,9 +533,9 @@ ginoptions(PG_FUNCTION_ARGS) void ginGetStats(Relation index, GinStatsData *stats) { - Buffer metabuffer; - Page metapage; - GinMetaPageData *metadata; + Buffer metabuffer; + Page metapage; + GinMetaPageData *metadata; metabuffer = ReadBuffer(index, GIN_METAPAGE_BLKNO); LockBuffer(metabuffer, GIN_SHARE); @@ -560,9 +560,9 @@ ginGetStats(Relation index, GinStatsData *stats) void ginUpdateStats(Relation index, const GinStatsData *stats) { - Buffer metabuffer; - Page metapage; - GinMetaPageData *metadata; + Buffer metabuffer; + Page metapage; + GinMetaPageData *metadata; metabuffer = ReadBuffer(index, GIN_METAPAGE_BLKNO); LockBuffer(metabuffer, GIN_EXCLUSIVE); @@ -580,9 +580,9 @@ ginUpdateStats(Relation index, const GinStatsData *stats) if (RelationNeedsWAL(index)) { - XLogRecPtr recptr; - ginxlogUpdateMeta data; - XLogRecData rdata; + XLogRecPtr recptr; + ginxlogUpdateMeta data; + XLogRecData rdata; data.node = index->rd_node; data.ntuples = 0; diff --git a/src/backend/access/gin/ginvacuum.c b/src/backend/access/gin/ginvacuum.c index 41ad382df0..79c54f16b8 100644 --- a/src/backend/access/gin/ginvacuum.c +++ b/src/backend/access/gin/ginvacuum.c @@ -783,7 +783,7 @@ ginvacuumcleanup(PG_FUNCTION_ARGS) { idxStat.nEntryPages++; - if ( GinPageIsLeaf(page) ) + if (GinPageIsLeaf(page)) idxStat.nEntries += PageGetMaxOffsetNumber(page); } diff --git a/src/backend/access/gin/ginxlog.c b/src/backend/access/gin/ginxlog.c index e410959b85..c954bcb12f 100644 --- a/src/backend/access/gin/ginxlog.c +++ b/src/backend/access/gin/ginxlog.c @@ -388,7 +388,7 @@ ginRedoVacuumPage(XLogRecPtr lsn, XLogRecord *record) else { OffsetNumber i, - *tod; + *tod; IndexTuple itup = (IndexTuple) (XLogRecGetData(record) + sizeof(ginxlogVacuumPage)); tod = (OffsetNumber *) palloc(sizeof(OffsetNumber) * PageGetMaxOffsetNumber(page)); @@ -513,10 +513,10 @@ ginRedoUpdateMetapage(XLogRecPtr lsn, XLogRecord *record) if (!XLByteLE(lsn, PageGetLSN(page))) { OffsetNumber l, - off = (PageIsEmpty(page)) ? FirstOffsetNumber : - OffsetNumberNext(PageGetMaxOffsetNumber(page)); + off = (PageIsEmpty(page)) ? FirstOffsetNumber : + OffsetNumberNext(PageGetMaxOffsetNumber(page)); int i, - tupsize; + tupsize; IndexTuple tuples = (IndexTuple) (XLogRecGetData(record) + sizeof(ginxlogUpdateMeta)); for (i = 0; i < data->ntuples; i++) diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c index 9529413e80..fae3464600 100644 --- a/src/backend/access/gist/gist.c +++ b/src/backend/access/gist/gist.c @@ -34,8 +34,8 @@ typedef struct /* A List of these is used represent a split-in-progress. */ typedef struct { - Buffer buf; /* the split page "half" */ - IndexTuple downlink; /* downlink for this half. */ + Buffer buf; /* the split page "half" */ + IndexTuple downlink; /* downlink for this half. */ } GISTPageSplitInfo; /* non-export function prototypes */ @@ -306,13 +306,13 @@ gistplacetopage(GISTInsertState *state, GISTSTATE *giststate, bool is_split; /* - * Refuse to modify a page that's incompletely split. This should - * not happen because we finish any incomplete splits while we walk - * down the tree. However, it's remotely possible that another - * concurrent inserter splits a parent page, and errors out before - * completing the split. We will just throw an error in that case, - * and leave any split we had in progress unfinished too. The next - * insert that comes along will clean up the mess. + * Refuse to modify a page that's incompletely split. This should not + * happen because we finish any incomplete splits while we walk down the + * tree. However, it's remotely possible that another concurrent inserter + * splits a parent page, and errors out before completing the split. We + * will just throw an error in that case, and leave any split we had in + * progress unfinished too. The next insert that comes along will clean up + * the mess. */ if (GistFollowRight(page)) elog(ERROR, "concurrent GiST page split was incomplete"); @@ -338,7 +338,7 @@ gistplacetopage(GISTInsertState *state, GISTSTATE *giststate, SplitedPageLayout *dist = NULL, *ptr; BlockNumber oldrlink = InvalidBlockNumber; - GistNSN oldnsn = { 0, 0 }; + GistNSN oldnsn = {0, 0}; SplitedPageLayout rootpg; BlockNumber blkno = BufferGetBlockNumber(buffer); bool is_rootsplit; @@ -364,8 +364,8 @@ gistplacetopage(GISTInsertState *state, GISTSTATE *giststate, /* * Set up pages to work with. Allocate new buffers for all but the - * leftmost page. The original page becomes the new leftmost page, - * and is just replaced with the new contents. + * leftmost page. The original page becomes the new leftmost page, and + * is just replaced with the new contents. * * For a root-split, allocate new buffers for all child pages, the * original page is overwritten with new root page containing @@ -414,8 +414,8 @@ gistplacetopage(GISTInsertState *state, GISTSTATE *giststate, if (is_rootsplit) { IndexTuple *downlinks; - int ndownlinks = 0; - int i; + int ndownlinks = 0; + int i; rootpg.buffer = buffer; rootpg.page = PageGetTempPageCopySpecial(BufferGetPage(rootpg.buffer)); @@ -443,6 +443,7 @@ gistplacetopage(GISTInsertState *state, GISTSTATE *giststate, for (ptr = dist; ptr; ptr = ptr->next) { GISTPageSplitInfo *si = palloc(sizeof(GISTPageSplitInfo)); + si->buf = ptr->buffer; si->downlink = ptr->itup; *splitinfo = lappend(*splitinfo, si); @@ -455,7 +456,8 @@ gistplacetopage(GISTInsertState *state, GISTSTATE *giststate, */ for (ptr = dist; ptr; ptr = ptr->next) { - char *data = (char *) (ptr->list); + char *data = (char *) (ptr->list); + for (i = 0; i < ptr->block.num; i++) { if (PageAddItem(ptr->page, (Item) data, IndexTupleSize((IndexTuple) data), i + FirstOffsetNumber, false, false) == InvalidOffsetNumber) @@ -495,8 +497,8 @@ gistplacetopage(GISTInsertState *state, GISTSTATE *giststate, MarkBufferDirty(leftchildbuf); /* - * The first page in the chain was a temporary working copy meant - * to replace the old page. Copy it over the old page. + * The first page in the chain was a temporary working copy meant to + * replace the old page. Copy it over the old page. */ PageRestoreTempPage(dist->page, BufferGetPage(dist->buffer)); dist->page = BufferGetPage(dist->buffer); @@ -518,8 +520,8 @@ gistplacetopage(GISTInsertState *state, GISTSTATE *giststate, * Return the new child buffers to the caller. * * If this was a root split, we've already inserted the downlink - * pointers, in the form of a new root page. Therefore we can - * release all the new buffers, and keep just the root page locked. + * pointers, in the form of a new root page. Therefore we can release + * all the new buffers, and keep just the root page locked. */ if (is_rootsplit) { @@ -572,20 +574,20 @@ gistplacetopage(GISTInsertState *state, GISTSTATE *giststate, /* * If we inserted the downlink for a child page, set NSN and clear - * F_FOLLOW_RIGHT flag on the left child, so that concurrent scans know - * to follow the rightlink if and only if they looked at the parent page + * F_FOLLOW_RIGHT flag on the left child, so that concurrent scans know to + * follow the rightlink if and only if they looked at the parent page * before we inserted the downlink. * * Note that we do this *after* writing the WAL record. That means that - * the possible full page image in the WAL record does not include - * these changes, and they must be replayed even if the page is restored - * from the full page image. There's a chicken-and-egg problem: if we - * updated the child pages first, we wouldn't know the recptr of the WAL - * record we're about to write. + * the possible full page image in the WAL record does not include these + * changes, and they must be replayed even if the page is restored from + * the full page image. There's a chicken-and-egg problem: if we updated + * the child pages first, we wouldn't know the recptr of the WAL record + * we're about to write. */ if (BufferIsValid(leftchildbuf)) { - Page leftpg = BufferGetPage(leftchildbuf); + Page leftpg = BufferGetPage(leftchildbuf); GistPageGetOpaque(leftpg)->nsn = recptr; GistClearFollowRight(leftpg); @@ -636,8 +638,8 @@ gistdoinsert(Relation r, IndexTuple itup, Size freespace, GISTSTATE *giststate) stack->buffer = ReadBuffer(state.r, stack->blkno); /* - * Be optimistic and grab shared lock first. Swap it for an - * exclusive lock later if we need to update the page. + * Be optimistic and grab shared lock first. Swap it for an exclusive + * lock later if we need to update the page. */ if (!xlocked) { @@ -650,9 +652,9 @@ gistdoinsert(Relation r, IndexTuple itup, Size freespace, GISTSTATE *giststate) Assert(!RelationNeedsWAL(state.r) || !XLogRecPtrIsInvalid(stack->lsn)); /* - * If this page was split but the downlink was never inserted to - * the parent because the inserting backend crashed before doing - * that, fix that now. + * If this page was split but the downlink was never inserted to the + * parent because the inserting backend crashed before doing that, fix + * that now. */ if (GistFollowRight(stack->page)) { @@ -680,8 +682,8 @@ gistdoinsert(Relation r, IndexTuple itup, Size freespace, GISTSTATE *giststate) /* * Concurrent split detected. There's no guarantee that the * downlink for this page is consistent with the tuple we're - * inserting anymore, so go back to parent and rechoose the - * best child. + * inserting anymore, so go back to parent and rechoose the best + * child. */ UnlockReleaseBuffer(stack->buffer); xlocked = false; @@ -696,7 +698,7 @@ gistdoinsert(Relation r, IndexTuple itup, Size freespace, GISTSTATE *giststate) * Find the child node that has the minimum insertion penalty. */ BlockNumber childblkno; - IndexTuple newtup; + IndexTuple newtup; GISTInsertStack *item; stack->childoffnum = gistchoose(state.r, stack->page, itup, giststate); @@ -722,8 +724,8 @@ gistdoinsert(Relation r, IndexTuple itup, Size freespace, GISTSTATE *giststate) if (newtup) { /* - * Swap shared lock for an exclusive one. Beware, the page - * may change while we unlock/lock the page... + * Swap shared lock for an exclusive one. Beware, the page may + * change while we unlock/lock the page... */ if (!xlocked) { @@ -738,6 +740,7 @@ gistdoinsert(Relation r, IndexTuple itup, Size freespace, GISTSTATE *giststate) continue; } } + /* * Update the tuple. * @@ -752,8 +755,8 @@ gistdoinsert(Relation r, IndexTuple itup, Size freespace, GISTSTATE *giststate) stack->childoffnum, InvalidBuffer)) { /* - * If this was a root split, the root page continues to - * be the parent and the updated tuple went to one of the + * If this was a root split, the root page continues to be + * the parent and the updated tuple went to one of the * child pages, so we just need to retry from the root * page. */ @@ -779,13 +782,13 @@ gistdoinsert(Relation r, IndexTuple itup, Size freespace, GISTSTATE *giststate) { /* * Leaf page. Insert the new key. We've already updated all the - * parents on the way down, but we might have to split the page - * if it doesn't fit. gistinserthere() will take care of that. + * parents on the way down, but we might have to split the page if + * it doesn't fit. gistinserthere() will take care of that. */ /* - * Swap shared lock for an exclusive one. Be careful, the page - * may change while we unlock/lock the page... + * Swap shared lock for an exclusive one. Be careful, the page may + * change while we unlock/lock the page... */ if (!xlocked) { @@ -798,8 +801,8 @@ gistdoinsert(Relation r, IndexTuple itup, Size freespace, GISTSTATE *giststate) if (stack->blkno == GIST_ROOT_BLKNO) { /* - * the only page that can become inner instead of leaf - * is the root page, so for root we should recheck it + * the only page that can become inner instead of leaf is + * the root page, so for root we should recheck it */ if (!GistPageIsLeaf(stack->page)) { @@ -1059,21 +1062,23 @@ static IndexTuple gistformdownlink(Relation rel, Buffer buf, GISTSTATE *giststate, GISTInsertStack *stack) { - Page page = BufferGetPage(buf); + Page page = BufferGetPage(buf); OffsetNumber maxoff; OffsetNumber offset; - IndexTuple downlink = NULL; + IndexTuple downlink = NULL; maxoff = PageGetMaxOffsetNumber(page); for (offset = FirstOffsetNumber; offset <= maxoff; offset = OffsetNumberNext(offset)) { IndexTuple ituple = (IndexTuple) - PageGetItem(page, PageGetItemId(page, offset)); + PageGetItem(page, PageGetItemId(page, offset)); + if (downlink == NULL) downlink = CopyIndexTuple(ituple); else { - IndexTuple newdownlink; + IndexTuple newdownlink; + newdownlink = gistgetadjusted(rel, downlink, ituple, giststate); if (newdownlink) @@ -1082,19 +1087,18 @@ gistformdownlink(Relation rel, Buffer buf, GISTSTATE *giststate, } /* - * If the page is completely empty, we can't form a meaningful - * downlink for it. But we have to insert a downlink for the page. - * Any key will do, as long as its consistent with the downlink of - * parent page, so that we can legally insert it to the parent. - * A minimal one that matches as few scans as possible would be best, - * to keep scans from doing useless work, but we don't know how to - * construct that. So we just use the downlink of the original page - * that was split - that's as far from optimal as it can get but will - * do.. + * If the page is completely empty, we can't form a meaningful downlink + * for it. But we have to insert a downlink for the page. Any key will do, + * as long as its consistent with the downlink of parent page, so that we + * can legally insert it to the parent. A minimal one that matches as few + * scans as possible would be best, to keep scans from doing useless work, + * but we don't know how to construct that. So we just use the downlink of + * the original page that was split - that's as far from optimal as it can + * get but will do.. */ if (!downlink) { - ItemId iid; + ItemId iid; LockBuffer(stack->parent->buffer, GIST_EXCLUSIVE); gistFindCorrectParent(rel, stack); @@ -1131,13 +1135,13 @@ gistfixsplit(GISTInsertState *state, GISTSTATE *giststate) buf = stack->buffer; /* - * Read the chain of split pages, following the rightlinks. Construct - * a downlink tuple for each page. + * Read the chain of split pages, following the rightlinks. Construct a + * downlink tuple for each page. */ for (;;) { GISTPageSplitInfo *si = palloc(sizeof(GISTPageSplitInfo)); - IndexTuple downlink; + IndexTuple downlink; page = BufferGetPage(buf); @@ -1182,8 +1186,8 @@ gistinserttuples(GISTInsertState *state, GISTInsertStack *stack, IndexTuple *tuples, int ntup, OffsetNumber oldoffnum, Buffer leftchild) { - List *splitinfo; - bool is_split; + List *splitinfo; + bool is_split; is_split = gistplacetopage(state, giststate, stack->buffer, tuples, ntup, oldoffnum, @@ -1204,21 +1208,21 @@ static void gistfinishsplit(GISTInsertState *state, GISTInsertStack *stack, GISTSTATE *giststate, List *splitinfo) { - ListCell *lc; - List *reversed; + ListCell *lc; + List *reversed; GISTPageSplitInfo *right; GISTPageSplitInfo *left; - IndexTuple tuples[2]; + IndexTuple tuples[2]; /* A split always contains at least two halves */ Assert(list_length(splitinfo) >= 2); /* - * We need to insert downlinks for each new page, and update the - * downlink for the original (leftmost) page in the split. Begin at - * the rightmost page, inserting one downlink at a time until there's - * only two pages left. Finally insert the downlink for the last new - * page and update the downlink for the original page as one operation. + * We need to insert downlinks for each new page, and update the downlink + * for the original (leftmost) page in the split. Begin at the rightmost + * page, inserting one downlink at a time until there's only two pages + * left. Finally insert the downlink for the last new page and update the + * downlink for the original page as one operation. */ /* for convenience, create a copy of the list in reverse order */ @@ -1231,7 +1235,7 @@ gistfinishsplit(GISTInsertState *state, GISTInsertStack *stack, LockBuffer(stack->parent->buffer, GIST_EXCLUSIVE); gistFindCorrectParent(state->r, stack); - while(list_length(reversed) > 2) + while (list_length(reversed) > 2) { right = (GISTPageSplitInfo *) linitial(reversed); left = (GISTPageSplitInfo *) lsecond(reversed); @@ -1386,7 +1390,7 @@ initGISTstate(GISTSTATE *giststate, Relation index) /* opclasses are not required to provide a Distance method */ if (OidIsValid(index_getprocid(index, i + 1, GIST_DISTANCE_PROC))) fmgr_info_copy(&(giststate->distanceFn[i]), - index_getprocinfo(index, i + 1, GIST_DISTANCE_PROC), + index_getprocinfo(index, i + 1, GIST_DISTANCE_PROC), CurrentMemoryContext); else giststate->distanceFn[i].fn_oid = InvalidOid; diff --git a/src/backend/access/gist/gistget.c b/src/backend/access/gist/gistget.c index 8355081553..e4488a925d 100644 --- a/src/backend/access/gist/gistget.c +++ b/src/backend/access/gist/gistget.c @@ -32,7 +32,7 @@ * * On success return for a heap tuple, *recheck_p is set to indicate * whether recheck is needed. We recheck if any of the consistent() functions - * request it. recheck is not interesting when examining a non-leaf entry, + * request it. recheck is not interesting when examining a non-leaf entry, * since we must visit the lower index page if there's any doubt. * * If we are doing an ordered scan, so->distances[] is filled with distance @@ -62,15 +62,15 @@ gistindex_keytest(IndexScanDesc scan, *recheck_p = false; /* - * If it's a leftover invalid tuple from pre-9.1, treat it as a match - * with minimum possible distances. This means we'll always follow it - * to the referenced page. + * If it's a leftover invalid tuple from pre-9.1, treat it as a match with + * minimum possible distances. This means we'll always follow it to the + * referenced page. */ if (GistTupleIsInvalid(tuple)) { - int i; + int i; - if (GistPageIsLeaf(page)) /* shouldn't happen */ + if (GistPageIsLeaf(page)) /* shouldn't happen */ elog(ERROR, "invalid GIST tuple found on leaf page"); for (i = 0; i < scan->numberOfOrderBys; i++) so->distances[i] = -get_float8_infinity(); @@ -191,8 +191,8 @@ gistindex_keytest(IndexScanDesc scan, * always be zero, but might as well pass it for possible future * use.) * - * Note that Distance functions don't get a recheck argument. - * We can't tolerate lossy distance calculations on leaf tuples; + * Note that Distance functions don't get a recheck argument. We + * can't tolerate lossy distance calculations on leaf tuples; * there is no opportunity to re-sort the tuples afterwards. */ dist = FunctionCall4(&key->sk_func, @@ -223,7 +223,7 @@ gistindex_keytest(IndexScanDesc scan, * ntids: if not NULL, gistgetbitmap's output tuple counter * * If tbm/ntids aren't NULL, we are doing an amgetbitmap scan, and heap - * tuples should be reported directly into the bitmap. If they are NULL, + * tuples should be reported directly into the bitmap. If they are NULL, * we're doing a plain or ordered indexscan. For a plain indexscan, heap * tuple TIDs are returned into so->pageData[]. For an ordered indexscan, * heap tuple TIDs are pushed into individual search queue items. @@ -525,8 +525,8 @@ gistgettuple(PG_FUNCTION_ARGS) /* * While scanning a leaf page, ItemPointers of matching heap * tuples are stored in so->pageData. If there are any on - * this page, we fall out of the inner "do" and loop around - * to return them. + * this page, we fall out of the inner "do" and loop around to + * return them. */ gistScanPage(scan, item, so->curTreeItem->distances, NULL, NULL); diff --git a/src/backend/access/gist/gistproc.c b/src/backend/access/gist/gistproc.c index 86a5d90f95..43c4b1251b 100644 --- a/src/backend/access/gist/gistproc.c +++ b/src/backend/access/gist/gistproc.c @@ -904,7 +904,7 @@ gist_point_compress(PG_FUNCTION_ARGS) PG_RETURN_POINTER(entry); } -#define point_point_distance(p1,p2) \ +#define point_point_distance(p1,p2) \ DatumGetFloat8(DirectFunctionCall2(point_distance, \ PointPGetDatum(p1), PointPGetDatum(p2))) @@ -949,8 +949,8 @@ computeDistance(bool isLeaf, BOX *box, Point *point) else { /* closest point will be a vertex */ - Point p; - double subresult; + Point p; + double subresult; result = point_point_distance(point, &box->low); diff --git a/src/backend/access/gist/gistscan.c b/src/backend/access/gist/gistscan.c index 0a125e772d..67308ed37e 100644 --- a/src/backend/access/gist/gistscan.c +++ b/src/backend/access/gist/gistscan.c @@ -57,9 +57,9 @@ GISTSearchTreeItemCombiner(RBNode *existing, const RBNode *newrb, void *arg) /* * If new item is heap tuple, it goes to front of chain; otherwise insert - * it before the first index-page item, so that index pages are visited - * in LIFO order, ensuring depth-first search of index pages. See - * comments in gist_private.h. + * it before the first index-page item, so that index pages are visited in + * LIFO order, ensuring depth-first search of index pages. See comments + * in gist_private.h. */ if (GISTSearchItemIsHeap(*newitem)) { @@ -136,6 +136,7 @@ gistrescan(PG_FUNCTION_ARGS) IndexScanDesc scan = (IndexScanDesc) PG_GETARG_POINTER(0); ScanKey key = (ScanKey) PG_GETARG_POINTER(1); ScanKey orderbys = (ScanKey) PG_GETARG_POINTER(3); + /* nkeys and norderbys arguments are ignored */ GISTScanOpaque so = (GISTScanOpaque) scan->opaque; int i; @@ -164,8 +165,8 @@ gistrescan(PG_FUNCTION_ARGS) scan->numberOfKeys * sizeof(ScanKeyData)); /* - * Modify the scan key so that the Consistent method is called for - * all comparisons. The original operator is passed to the Consistent + * Modify the scan key so that the Consistent method is called for all + * comparisons. The original operator is passed to the Consistent * function in the form of its strategy number, which is available * from the sk_strategy field, and its subtype from the sk_subtype * field. Also, preserve sk_func.fn_collation which is the input diff --git a/src/backend/access/gist/gistutil.c b/src/backend/access/gist/gistutil.c index 6736fd166c..e8bbd564c7 100644 --- a/src/backend/access/gist/gistutil.c +++ b/src/backend/access/gist/gistutil.c @@ -503,11 +503,12 @@ gistFormTuple(GISTSTATE *giststate, Relation r, } res = index_form_tuple(giststate->tupdesc, compatt, isnull); + /* * The offset number on tuples on internal pages is unused. For historical * reasons, it is set 0xffff. */ - ItemPointerSetOffsetNumber( &(res->t_tid), 0xffff); + ItemPointerSetOffsetNumber(&(res->t_tid), 0xffff); return res; } diff --git a/src/backend/access/gist/gistxlog.c b/src/backend/access/gist/gistxlog.c index 0f406e16c4..51354c1c18 100644 --- a/src/backend/access/gist/gistxlog.c +++ b/src/backend/access/gist/gistxlog.c @@ -41,12 +41,12 @@ static void gistRedoClearFollowRight(RelFileNode node, XLogRecPtr lsn, BlockNumber leftblkno) { - Buffer buffer; + Buffer buffer; buffer = XLogReadBuffer(node, leftblkno, false); if (BufferIsValid(buffer)) { - Page page = (Page) BufferGetPage(buffer); + Page page = (Page) BufferGetPage(buffer); /* * Note that we still update the page even if page LSN is equal to the @@ -103,6 +103,7 @@ gistRedoPageUpdateRecord(XLogRecPtr lsn, XLogRecord *record) { int i; OffsetNumber *todelete = (OffsetNumber *) data; + data += sizeof(OffsetNumber) * xldata->ntodelete; for (i = 0; i < xldata->ntodelete; i++) @@ -115,12 +116,14 @@ gistRedoPageUpdateRecord(XLogRecPtr lsn, XLogRecord *record) if (data - begin < record->xl_len) { OffsetNumber off = (PageIsEmpty(page)) ? FirstOffsetNumber : - OffsetNumberNext(PageGetMaxOffsetNumber(page)); + OffsetNumberNext(PageGetMaxOffsetNumber(page)); + while (data - begin < record->xl_len) { - IndexTuple itup = (IndexTuple) data; + IndexTuple itup = (IndexTuple) data; Size sz = IndexTupleSize(itup); OffsetNumber l; + data += sz; l = PageAddItem(page, (Item) itup, sz, off, false, false); @@ -418,7 +421,7 @@ gistXLogSplit(RelFileNode node, BlockNumber blkno, bool page_is_leaf, SplitedPageLayout *ptr; int npage = 0, cur; - XLogRecPtr recptr; + XLogRecPtr recptr; for (ptr = dist; ptr; ptr = ptr->next) npage++; @@ -540,8 +543,8 @@ gistXLogUpdate(RelFileNode node, Buffer buffer, } /* - * Include a full page image of the child buf. (only necessary if - * a checkpoint happened since the child page was split) + * Include a full page image of the child buf. (only necessary if a + * checkpoint happened since the child page was split) */ if (BufferIsValid(leftchildbuf)) { diff --git a/src/backend/access/hash/hash.c b/src/backend/access/hash/hash.c index f19e5627f8..4cb29b2bb4 100644 --- a/src/backend/access/hash/hash.c +++ b/src/backend/access/hash/hash.c @@ -413,6 +413,7 @@ hashrescan(PG_FUNCTION_ARGS) { IndexScanDesc scan = (IndexScanDesc) PG_GETARG_POINTER(0); ScanKey scankey = (ScanKey) PG_GETARG_POINTER(1); + /* remaining arguments are ignored */ HashScanOpaque so = (HashScanOpaque) scan->opaque; Relation rel = scan->indexRelation; diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c index 89697f6ff5..1fbd8b39b4 100644 --- a/src/backend/access/heap/heapam.c +++ b/src/backend/access/heap/heapam.c @@ -1070,7 +1070,7 @@ relation_close(Relation relation, LOCKMODE lockmode) * This is essentially relation_open plus check that the relation * is not an index nor a composite type. (The caller should also * check that it's not a view or foreign table before assuming it has - * storage.) + * storage.) * ---------------- */ Relation @@ -1922,8 +1922,8 @@ heap_insert(Relation relation, HeapTuple tup, CommandId cid, /* * We're about to do the actual insert -- check for conflict at the - * relation or buffer level first, to avoid possibly having to roll - * back work we've just done. + * relation or buffer level first, to avoid possibly having to roll back + * work we've just done. */ CheckForSerializableConflictIn(relation, NULL, buffer); @@ -2228,8 +2228,8 @@ l1: } /* - * We're about to do the actual delete -- check for conflict first, - * to avoid possibly having to roll back work we've just done. + * We're about to do the actual delete -- check for conflict first, to + * avoid possibly having to roll back work we've just done. */ CheckForSerializableConflictIn(relation, &tp, buffer); @@ -2587,8 +2587,8 @@ l2: } /* - * We're about to do the actual update -- check for conflict first, - * to avoid possibly having to roll back work we've just done. + * We're about to do the actual update -- check for conflict first, to + * avoid possibly having to roll back work we've just done. */ CheckForSerializableConflictIn(relation, &oldtup, buffer); @@ -2737,8 +2737,8 @@ l2: } /* - * We're about to create the new tuple -- check for conflict first, - * to avoid possibly having to roll back work we've just done. + * We're about to create the new tuple -- check for conflict first, to + * avoid possibly having to roll back work we've just done. * * NOTE: For a tuple insert, we only need to check for table locks, since * predicate locking at the index level will cover ranges for anything @@ -3860,12 +3860,12 @@ HeapTupleHeaderAdvanceLatestRemovedXid(HeapTupleHeader tuple, } /* - * Ignore tuples inserted by an aborted transaction or - * if the tuple was updated/deleted by the inserting transaction. + * Ignore tuples inserted by an aborted transaction or if the tuple was + * updated/deleted by the inserting transaction. * * Look for a committed hint bit, or if no xmin bit is set, check clog. - * This needs to work on both master and standby, where it is used - * to assess btree delete records. + * This needs to work on both master and standby, where it is used to + * assess btree delete records. */ if ((tuple->t_infomask & HEAP_XMIN_COMMITTED) || (!(tuple->t_infomask & HEAP_XMIN_COMMITTED) && @@ -3874,7 +3874,7 @@ HeapTupleHeaderAdvanceLatestRemovedXid(HeapTupleHeader tuple, { if (xmax != xmin && TransactionIdFollows(xmax, *latestRemovedXid)) - *latestRemovedXid = xmax; + *latestRemovedXid = xmax; } /* *latestRemovedXid may still be invalid at end */ @@ -4158,8 +4158,8 @@ log_newpage(RelFileNode *rnode, ForkNumber forkNum, BlockNumber blkno, recptr = XLogInsert(RM_HEAP_ID, XLOG_HEAP_NEWPAGE, rdata); /* - * The page may be uninitialized. If so, we can't set the LSN - * and TLI because that would corrupt the page. + * The page may be uninitialized. If so, we can't set the LSN and TLI + * because that would corrupt the page. */ if (!PageIsNew(page)) { @@ -4352,8 +4352,8 @@ heap_xlog_newpage(XLogRecPtr lsn, XLogRecord *record) memcpy(page, (char *) xlrec + SizeOfHeapNewpage, BLCKSZ); /* - * The page may be uninitialized. If so, we can't set the LSN - * and TLI because that would corrupt the page. + * The page may be uninitialized. If so, we can't set the LSN and TLI + * because that would corrupt the page. */ if (!PageIsNew(page)) { diff --git a/src/backend/access/heap/hio.c b/src/backend/access/heap/hio.c index 2849992528..72a69e52b0 100644 --- a/src/backend/access/heap/hio.c +++ b/src/backend/access/heap/hio.c @@ -150,7 +150,7 @@ ReadBufferBI(Relation relation, BlockNumber targetBlock, Buffer RelationGetBufferForTuple(Relation relation, Size len, Buffer otherBuffer, int options, - struct BulkInsertStateData *bistate) + struct BulkInsertStateData * bistate) { bool use_fsm = !(options & HEAP_INSERT_SKIP_FSM); Buffer buffer = InvalidBuffer; diff --git a/src/backend/access/heap/rewriteheap.c b/src/backend/access/heap/rewriteheap.c index c710f1d316..e56140950a 100644 --- a/src/backend/access/heap/rewriteheap.c +++ b/src/backend/access/heap/rewriteheap.c @@ -131,7 +131,7 @@ typedef struct RewriteStateData * them */ HTAB *rs_unresolved_tups; /* unmatched A tuples */ HTAB *rs_old_new_tid_map; /* unmatched B tuples */ -} RewriteStateData; +} RewriteStateData; /* * The lookup keys for the hash tables are tuple TID and xmin (we must check @@ -277,7 +277,7 @@ end_heap_rewrite(RewriteState state) } /* - * If the rel is WAL-logged, must fsync before commit. We use heap_sync + * If the rel is WAL-logged, must fsync before commit. We use heap_sync * to ensure that the toast table gets fsync'd too. * * It's obvious that we must do this when not WAL-logging. It's less diff --git a/src/backend/access/index/indexam.c b/src/backend/access/index/indexam.c index 88f73e8241..66af2c37c5 100644 --- a/src/backend/access/index/indexam.c +++ b/src/backend/access/index/indexam.c @@ -872,7 +872,7 @@ index_getprocinfo(Relation irel, procnum, attnum, RelationGetRelationName(irel)); fmgr_info_cxt(procId, locinfo, irel->rd_indexcxt); - fmgr_info_set_collation(irel->rd_indcollation[attnum-1], locinfo); + fmgr_info_set_collation(irel->rd_indcollation[attnum - 1], locinfo); } return locinfo; diff --git a/src/backend/access/nbtree/nbtinsert.c b/src/backend/access/nbtree/nbtinsert.c index 0dd745f19a..219f94fd0d 100644 --- a/src/backend/access/nbtree/nbtinsert.c +++ b/src/backend/access/nbtree/nbtinsert.c @@ -179,8 +179,8 @@ top: * The only conflict predicate locking cares about for indexes is when * an index tuple insert conflicts with an existing lock. Since the * actual location of the insert is hard to predict because of the - * random search used to prevent O(N^2) performance when there are many - * duplicate entries, we can just use the "first valid" page. + * random search used to prevent O(N^2) performance when there are + * many duplicate entries, we can just use the "first valid" page. */ CheckForSerializableConflictIn(rel, NULL, buf); /* do the insertion */ @@ -915,13 +915,13 @@ _bt_split(Relation rel, Buffer buf, OffsetNumber firstright, /* * origpage is the original page to be split. leftpage is a temporary * buffer that receives the left-sibling data, which will be copied back - * into origpage on success. rightpage is the new page that receives - * the right-sibling data. If we fail before reaching the critical - * section, origpage hasn't been modified and leftpage is only workspace. - * In principle we shouldn't need to worry about rightpage either, - * because it hasn't been linked into the btree page structure; but to - * avoid leaving possibly-confusing junk behind, we are careful to rewrite - * rightpage as zeroes before throwing any error. + * into origpage on success. rightpage is the new page that receives the + * right-sibling data. If we fail before reaching the critical section, + * origpage hasn't been modified and leftpage is only workspace. In + * principle we shouldn't need to worry about rightpage either, because it + * hasn't been linked into the btree page structure; but to avoid leaving + * possibly-confusing junk behind, we are careful to rewrite rightpage as + * zeroes before throwing any error. */ origpage = BufferGetPage(buf); leftpage = PageGetTempPage(origpage); @@ -1118,7 +1118,7 @@ _bt_split(Relation rel, Buffer buf, OffsetNumber firstright, { memset(rightpage, 0, BufferGetPageSize(rbuf)); elog(ERROR, "right sibling's left-link doesn't match: " - "block %u links to %u instead of expected %u in index \"%s\"", + "block %u links to %u instead of expected %u in index \"%s\"", oopaque->btpo_next, sopaque->btpo_prev, origpagenumber, RelationGetRelationName(rel)); } diff --git a/src/backend/access/nbtree/nbtpage.c b/src/backend/access/nbtree/nbtpage.c index 27964455f7..2477736281 100644 --- a/src/backend/access/nbtree/nbtpage.c +++ b/src/backend/access/nbtree/nbtpage.c @@ -1268,9 +1268,9 @@ _bt_pagedel(Relation rel, Buffer buf, BTStack stack) /* * Check that the parent-page index items we're about to delete/overwrite - * contain what we expect. This can fail if the index has become - * corrupt for some reason. We want to throw any error before entering - * the critical section --- otherwise it'd be a PANIC. + * contain what we expect. This can fail if the index has become corrupt + * for some reason. We want to throw any error before entering the + * critical section --- otherwise it'd be a PANIC. * * The test on the target item is just an Assert because _bt_getstackbuf * should have guaranteed it has the expected contents. The test on the diff --git a/src/backend/access/nbtree/nbtree.c b/src/backend/access/nbtree/nbtree.c index 7a0e1a9c25..6a7ddd7db4 100644 --- a/src/backend/access/nbtree/nbtree.c +++ b/src/backend/access/nbtree/nbtree.c @@ -220,7 +220,7 @@ btbuildempty(PG_FUNCTION_ARGS) metapage = (Page) palloc(BLCKSZ); _bt_initmetapage(metapage, P_NONE, 0); - /* Write the page. If archiving/streaming, XLOG it. */ + /* Write the page. If archiving/streaming, XLOG it. */ smgrwrite(index->rd_smgr, INIT_FORKNUM, BTREE_METAPAGE, (char *) metapage, true); if (XLogIsNeeded()) @@ -403,6 +403,7 @@ btrescan(PG_FUNCTION_ARGS) { IndexScanDesc scan = (IndexScanDesc) PG_GETARG_POINTER(0); ScanKey scankey = (ScanKey) PG_GETARG_POINTER(1); + /* remaining arguments are ignored */ BTScanOpaque so = (BTScanOpaque) scan->opaque; diff --git a/src/backend/access/nbtree/nbtsearch.c b/src/backend/access/nbtree/nbtsearch.c index cb78a1bae1..91f8cadea5 100644 --- a/src/backend/access/nbtree/nbtsearch.c +++ b/src/backend/access/nbtree/nbtsearch.c @@ -65,7 +65,7 @@ _bt_search(Relation rel, int keysz, ScanKey scankey, bool nextkey, /* If index is empty and access = BT_READ, no root page is created. */ if (!BufferIsValid(*bufP)) { - PredicateLockRelation(rel); /* Nothing finer to lock exists. */ + PredicateLockRelation(rel); /* Nothing finer to lock exists. */ return (BTStack) NULL; } @@ -1364,7 +1364,7 @@ _bt_get_endpoint(Relation rel, uint32 level, bool rightmost) if (!BufferIsValid(buf)) { /* empty index... */ - PredicateLockRelation(rel); /* Nothing finer to lock exists. */ + PredicateLockRelation(rel); /* Nothing finer to lock exists. */ return InvalidBuffer; } @@ -1444,7 +1444,7 @@ _bt_endpoint(IndexScanDesc scan, ScanDirection dir) if (!BufferIsValid(buf)) { /* empty index... */ - PredicateLockRelation(rel); /* Nothing finer to lock exists. */ + PredicateLockRelation(rel); /* Nothing finer to lock exists. */ so->currPos.buf = InvalidBuffer; return false; } diff --git a/src/backend/access/nbtree/nbtsort.c b/src/backend/access/nbtree/nbtsort.c index fd0e86a6aa..256a7f9f98 100644 --- a/src/backend/access/nbtree/nbtsort.c +++ b/src/backend/access/nbtree/nbtsort.c @@ -799,7 +799,7 @@ _bt_load(BTWriteState *wstate, BTSpool *btspool, BTSpool *btspool2) /* * If the index is WAL-logged, we must fsync it down to disk before it's - * safe to commit the transaction. (For a non-WAL-logged index we don't + * safe to commit the transaction. (For a non-WAL-logged index we don't * care since the index will be uninteresting after a crash anyway.) * * It's obvious that we must do this when not WAL-logging the build. It's diff --git a/src/backend/access/nbtree/nbtutils.c b/src/backend/access/nbtree/nbtutils.c index add932d942..d448ba6a50 100644 --- a/src/backend/access/nbtree/nbtutils.c +++ b/src/backend/access/nbtree/nbtutils.c @@ -70,8 +70,8 @@ _bt_mkscankey(Relation rel, IndexTuple itup) /* * We can use the cached (default) support procs since no cross-type - * comparison can be needed. The cached support proc entries have - * the right collation for the index, too. + * comparison can be needed. The cached support proc entries have the + * right collation for the index, too. */ procinfo = index_getprocinfo(rel, i + 1, BTORDER_PROC); arg = index_getattr(itup, i + 1, itupdesc, &null); @@ -120,8 +120,8 @@ _bt_mkscankey_nodata(Relation rel) /* * We can use the cached (default) support procs since no cross-type - * comparison can be needed. The cached support proc entries have - * the right collation for the index, too. + * comparison can be needed. The cached support proc entries have the + * right collation for the index, too. */ procinfo = index_getprocinfo(rel, i + 1, BTORDER_PROC); flags = SK_ISNULL | (indoption[i] << SK_BT_INDOPTION_SHIFT); diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c index 729c7b72e0..281268120e 100644 --- a/src/backend/access/transam/twophase.c +++ b/src/backend/access/transam/twophase.c @@ -120,7 +120,7 @@ typedef struct GlobalTransactionData TransactionId locking_xid; /* top-level XID of backend working on xact */ bool valid; /* TRUE if fully prepared */ char gid[GIDSIZE]; /* The GID assigned to the prepared xact */ -} GlobalTransactionData; +} GlobalTransactionData; /* * Two Phase Commit shared state. Access to this struct is protected @@ -1029,8 +1029,8 @@ EndPrepare(GlobalTransaction gxact) /* If we crash now, we have prepared: WAL replay will fix things */ /* - * Wake up all walsenders to send WAL up to the PREPARE record - * immediately if replication is enabled + * Wake up all walsenders to send WAL up to the PREPARE record immediately + * if replication is enabled */ if (max_wal_senders > 0) WalSndWakeup(); @@ -2043,8 +2043,8 @@ RecordTransactionCommitPrepared(TransactionId xid, /* * Wait for synchronous replication, if required. * - * Note that at this stage we have marked clog, but still show as - * running in the procarray and continue to hold locks. + * Note that at this stage we have marked clog, but still show as running + * in the procarray and continue to hold locks. */ SyncRepWaitForLSN(recptr); } @@ -2130,8 +2130,8 @@ RecordTransactionAbortPrepared(TransactionId xid, /* * Wait for synchronous replication, if required. * - * Note that at this stage we have marked clog, but still show as - * running in the procarray and continue to hold locks. + * Note that at this stage we have marked clog, but still show as running + * in the procarray and continue to hold locks. */ SyncRepWaitForLSN(recptr); } diff --git a/src/backend/access/transam/varsup.c b/src/backend/access/transam/varsup.c index a828b3de48..500335bd6f 100644 --- a/src/backend/access/transam/varsup.c +++ b/src/backend/access/transam/varsup.c @@ -355,9 +355,9 @@ SetTransactionIdLimit(TransactionId oldest_datfrozenxid, Oid oldest_datoid) char *oldest_datname; /* - * We can be called when not inside a transaction, for example - * during StartupXLOG(). In such a case we cannot do database - * access, so we must just report the oldest DB's OID. + * We can be called when not inside a transaction, for example during + * StartupXLOG(). In such a case we cannot do database access, so we + * must just report the oldest DB's OID. * * Note: it's also possible that get_database_name fails and returns * NULL, for example because the database just got dropped. We'll diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c index 55aee87910..8a4c4eccd7 100644 --- a/src/backend/access/transam/xact.c +++ b/src/backend/access/transam/xact.c @@ -420,11 +420,11 @@ AssignTransactionId(TransactionState s) */ if (isSubXact && !TransactionIdIsValid(s->parent->transactionId)) { - TransactionState p = s->parent; - TransactionState *parents; - size_t parentOffset = 0; + TransactionState p = s->parent; + TransactionState *parents; + size_t parentOffset = 0; - parents = palloc(sizeof(TransactionState) * s->nestingLevel); + parents = palloc(sizeof(TransactionState) * s->nestingLevel); while (p != NULL && !TransactionIdIsValid(p->transactionId)) { parents[parentOffset++] = p; @@ -432,8 +432,8 @@ AssignTransactionId(TransactionState s) } /* - * This is technically a recursive call, but the recursion will - * never be more than one layer deep. + * This is technically a recursive call, but the recursion will never + * be more than one layer deep. */ while (parentOffset != 0) AssignTransactionId(parents[--parentOffset]); @@ -1037,16 +1037,17 @@ RecordTransactionCommit(void) /* * Check if we want to commit asynchronously. We can allow the XLOG flush * to happen asynchronously if synchronous_commit=off, or if the current - * transaction has not performed any WAL-logged operation. The latter case - * can arise if the current transaction wrote only to temporary and/or - * unlogged tables. In case of a crash, the loss of such a transaction - * will be irrelevant since temp tables will be lost anyway, and unlogged - * tables will be truncated. (Given the foregoing, you might think that it - * would be unnecessary to emit the XLOG record at all in this case, but we - * don't currently try to do that. It would certainly cause problems at - * least in Hot Standby mode, where the KnownAssignedXids machinery - * requires tracking every XID assignment. It might be OK to skip it only - * when wal_level < hot_standby, but for now we don't.) + * transaction has not performed any WAL-logged operation. The latter + * case can arise if the current transaction wrote only to temporary + * and/or unlogged tables. In case of a crash, the loss of such a + * transaction will be irrelevant since temp tables will be lost anyway, + * and unlogged tables will be truncated. (Given the foregoing, you might + * think that it would be unnecessary to emit the XLOG record at all in + * this case, but we don't currently try to do that. It would certainly + * cause problems at least in Hot Standby mode, where the + * KnownAssignedXids machinery requires tracking every XID assignment. It + * might be OK to skip it only when wal_level < hot_standby, but for now + * we don't.) * * However, if we're doing cleanup of any non-temp rels or committing any * command that wanted to force sync commit, then we must flush XLOG @@ -1130,8 +1131,8 @@ RecordTransactionCommit(void) /* * Wait for synchronous replication, if required. * - * Note that at this stage we have marked clog, but still show as - * running in the procarray and continue to hold locks. + * Note that at this stage we have marked clog, but still show as running + * in the procarray and continue to hold locks. */ SyncRepWaitForLSN(XactLastRecEnd); @@ -1785,10 +1786,10 @@ CommitTransaction(void) } /* - * The remaining actions cannot call any user-defined code, so it's - * safe to start shutting down within-transaction services. But note - * that most of this stuff could still throw an error, which would - * switch us into the transaction-abort path. + * The remaining actions cannot call any user-defined code, so it's safe + * to start shutting down within-transaction services. But note that most + * of this stuff could still throw an error, which would switch us into + * the transaction-abort path. */ /* Shut down the deferred-trigger manager */ @@ -1805,8 +1806,8 @@ CommitTransaction(void) /* * Mark serializable transaction as complete for predicate locking - * purposes. This should be done as late as we can put it and still - * allow errors to be raised for failure patterns found at commit. + * purposes. This should be done as late as we can put it and still allow + * errors to be raised for failure patterns found at commit. */ PreCommit_CheckForSerializationFailure(); @@ -1988,10 +1989,10 @@ PrepareTransaction(void) } /* - * The remaining actions cannot call any user-defined code, so it's - * safe to start shutting down within-transaction services. But note - * that most of this stuff could still throw an error, which would - * switch us into the transaction-abort path. + * The remaining actions cannot call any user-defined code, so it's safe + * to start shutting down within-transaction services. But note that most + * of this stuff could still throw an error, which would switch us into + * the transaction-abort path. */ /* Shut down the deferred-trigger manager */ @@ -2008,8 +2009,8 @@ PrepareTransaction(void) /* * Mark serializable transaction as complete for predicate locking - * purposes. This should be done as late as we can put it and still - * allow errors to be raised for failure patterns found at commit. + * purposes. This should be done as late as we can put it and still allow + * errors to be raised for failure patterns found at commit. */ PreCommit_CheckForSerializationFailure(); diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index b31c79ebbd..9c45759661 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -64,7 +64,7 @@ /* File path names (all relative to $PGDATA) */ #define RECOVERY_COMMAND_FILE "recovery.conf" #define RECOVERY_COMMAND_DONE "recovery.done" -#define PROMOTE_SIGNAL_FILE "promote" +#define PROMOTE_SIGNAL_FILE "promote" /* User-settable parameters */ @@ -160,6 +160,7 @@ static XLogRecPtr LastRec; * known, need to check the shared state". */ static bool LocalRecoveryInProgress = true; + /* * Local copy of SharedHotStandbyActive variable. False actually means "not * known, need to check the shared state". @@ -355,10 +356,9 @@ typedef struct XLogCtlInsert /* * exclusiveBackup is true if a backup started with pg_start_backup() is * in progress, and nonExclusiveBackups is a counter indicating the number - * of streaming base backups currently in progress. forcePageWrites is - * set to true when either of these is non-zero. lastBackupStart is the - * latest checkpoint redo location used as a starting point for an online - * backup. + * of streaming base backups currently in progress. forcePageWrites is set + * to true when either of these is non-zero. lastBackupStart is the latest + * checkpoint redo location used as a starting point for an online backup. */ bool exclusiveBackup; int nonExclusiveBackups; @@ -388,7 +388,7 @@ typedef struct XLogCtlData XLogwrtResult LogwrtResult; uint32 ckptXidEpoch; /* nextXID & epoch of latest checkpoint */ TransactionId ckptXid; - XLogRecPtr asyncXactLSN; /* LSN of newest async commit/abort */ + XLogRecPtr asyncXactLSN; /* LSN of newest async commit/abort */ uint32 lastRemovedLog; /* latest removed/recycled XLOG segment */ uint32 lastRemovedSeg; @@ -425,9 +425,9 @@ typedef struct XLogCtlData bool SharedHotStandbyActive; /* - * recoveryWakeupLatch is used to wake up the startup process to - * continue WAL replay, if it is waiting for WAL to arrive or failover - * trigger file to appear. + * recoveryWakeupLatch is used to wake up the startup process to continue + * WAL replay, if it is waiting for WAL to arrive or failover trigger file + * to appear. */ Latch recoveryWakeupLatch; @@ -576,7 +576,7 @@ typedef struct xl_parameter_change /* logs restore point */ typedef struct xl_restore_point { - TimestampTz rp_time; + TimestampTz rp_time; char rp_name[MAXFNAMELEN]; } xl_restore_point; @@ -4272,27 +4272,29 @@ existsTimeLineHistory(TimeLineID probeTLI) static bool rescanLatestTimeLine(void) { - TimeLineID newtarget; + TimeLineID newtarget; + newtarget = findNewestTimeLine(recoveryTargetTLI); if (newtarget != recoveryTargetTLI) { /* * Determine the list of expected TLIs for the new TLI */ - List *newExpectedTLIs; + List *newExpectedTLIs; + newExpectedTLIs = readTimeLineHistory(newtarget); /* - * If the current timeline is not part of the history of the - * new timeline, we cannot proceed to it. + * If the current timeline is not part of the history of the new + * timeline, we cannot proceed to it. * * XXX This isn't foolproof: The new timeline might have forked from * the current one, but before the current recovery location. In that * case we will still switch to the new timeline and proceed replaying * from it even though the history doesn't match what we already * replayed. That's not good. We will likely notice at the next online - * checkpoint, as the TLI won't match what we expected, but it's - * not guaranteed. The admin needs to make sure that doesn't happen. + * checkpoint, as the TLI won't match what we expected, but it's not + * guaranteed. The admin needs to make sure that doesn't happen. */ if (!list_member_int(newExpectedTLIs, (int) recoveryTargetTLI)) @@ -4480,7 +4482,7 @@ writeTimeLineHistory(TimeLineID newTLI, TimeLineID parentTLI, timestamptz_to_str(recoveryStopTime)); else if (recoveryTarget == RECOVERY_TARGET_NAME) snprintf(buffer, sizeof(buffer), - "%s%u\t%s\tat restore point \"%s\"\n", + "%s%u\t%s\tat restore point \"%s\"\n", (srcfd < 0) ? "" : "\n", parentTLI, xlogfname, @@ -4921,7 +4923,7 @@ check_wal_buffers(int *newval, void **extra, GucSource source) { /* * If we haven't yet changed the boot_val default of -1, just let it - * be. We'll fix it when XLOGShmemSize is called. + * be. We'll fix it when XLOGShmemSize is called. */ if (XLOGbuffers == -1) return true; @@ -4954,8 +4956,8 @@ XLOGShmemSize(void) /* * If the value of wal_buffers is -1, use the preferred auto-tune value. * This isn't an amazingly clean place to do this, but we must wait till - * NBuffers has received its final value, and must do it before using - * the value of XLOGbuffers to do anything important. + * NBuffers has received its final value, and must do it before using the + * value of XLOGbuffers to do anything important. */ if (XLOGbuffers == -1) { @@ -5086,9 +5088,9 @@ BootStrapXLOG(void) /* * Set up information for the initial checkpoint record * - * The initial checkpoint record is written to the beginning of the - * WAL segment with logid=0 logseg=1. The very first WAL segment, 0/0, is - * not used, so that we can use 0/0 to mean "before any valid WAL segment". + * The initial checkpoint record is written to the beginning of the WAL + * segment with logid=0 logseg=1. The very first WAL segment, 0/0, is not + * used, so that we can use 0/0 to mean "before any valid WAL segment". */ checkPoint.redo.xlogid = 0; checkPoint.redo.xrecoff = XLogSegSize + SizeOfXLogLongPHD; @@ -5219,8 +5221,8 @@ readRecoveryCommandFile(void) TimeLineID rtli = 0; bool rtliGiven = false; ConfigVariable *item, - *head = NULL, - *tail = NULL; + *head = NULL, + *tail = NULL; fd = AllocateFile(RECOVERY_COMMAND_FILE, "r"); if (fd == NULL) @@ -5236,7 +5238,7 @@ readRecoveryCommandFile(void) /* * Since we're asking ParseConfigFp() to error out at FATAL, there's no * need to check the return value. - */ + */ ParseConfigFp(fd, RECOVERY_COMMAND_FILE, 0, FATAL, &head, &tail); for (item = head; item; item = item->next) @@ -5312,7 +5314,7 @@ readRecoveryCommandFile(void) * this overrides recovery_target_time */ if (recoveryTarget == RECOVERY_TARGET_XID || - recoveryTarget == RECOVERY_TARGET_NAME) + recoveryTarget == RECOVERY_TARGET_NAME) continue; recoveryTarget = RECOVERY_TARGET_TIME; @@ -5321,7 +5323,7 @@ readRecoveryCommandFile(void) */ recoveryTargetTime = DatumGetTimestampTz(DirectFunctionCall3(timestamptz_in, - CStringGetDatum(item->value), + CStringGetDatum(item->value), ObjectIdGetDatum(InvalidOid), Int32GetDatum(-1))); ereport(DEBUG2, @@ -5610,8 +5612,8 @@ recoveryStopsHere(XLogRecord *record, bool *includeThis) if (recoveryTarget == RECOVERY_TARGET_UNSET) { /* - * Save timestamp of latest transaction commit/abort if this is - * a transaction record + * Save timestamp of latest transaction commit/abort if this is a + * transaction record */ if (record->xl_rmid == RM_XACT_ID) SetLatestXTime(recordXtime); @@ -5636,8 +5638,8 @@ recoveryStopsHere(XLogRecord *record, bool *includeThis) else if (recoveryTarget == RECOVERY_TARGET_NAME) { /* - * There can be many restore points that share the same name, so we stop - * at the first one + * There can be many restore points that share the same name, so we + * stop at the first one */ stopsHere = (strcmp(recordRPName, recoveryTargetName) == 0); @@ -5699,14 +5701,14 @@ recoveryStopsHere(XLogRecord *record, bool *includeThis) strncpy(recoveryStopName, recordRPName, MAXFNAMELEN); ereport(LOG, - (errmsg("recovery stopping at restore point \"%s\", time %s", - recoveryStopName, - timestamptz_to_str(recoveryStopTime)))); + (errmsg("recovery stopping at restore point \"%s\", time %s", + recoveryStopName, + timestamptz_to_str(recoveryStopTime)))); } /* - * Note that if we use a RECOVERY_TARGET_TIME then we can stop - * at a restore point since they are timestamped, though the latest + * Note that if we use a RECOVERY_TARGET_TIME then we can stop at a + * restore point since they are timestamped, though the latest * transaction time is not updated. */ if (record->xl_rmid == RM_XACT_ID && recoveryStopAfter) @@ -5732,7 +5734,7 @@ recoveryPausesHere(void) while (RecoveryIsPaused()) { - pg_usleep(1000000L); /* 1000 ms */ + pg_usleep(1000000L); /* 1000 ms */ HandleStartupProcInterrupts(); } } @@ -5742,7 +5744,7 @@ RecoveryIsPaused(void) { /* use volatile pointer to prevent code rearrangement */ volatile XLogCtlData *xlogctl = XLogCtl; - bool recoveryPause; + bool recoveryPause; SpinLockAcquire(&xlogctl->info_lck); recoveryPause = xlogctl->recoveryPause; @@ -5771,7 +5773,7 @@ pg_xlog_replay_pause(PG_FUNCTION_ARGS) if (!superuser()) ereport(ERROR, (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE), - (errmsg("must be superuser to control recovery")))); + (errmsg("must be superuser to control recovery")))); if (!RecoveryInProgress()) ereport(ERROR, @@ -5793,7 +5795,7 @@ pg_xlog_replay_resume(PG_FUNCTION_ARGS) if (!superuser()) ereport(ERROR, (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE), - (errmsg("must be superuser to control recovery")))); + (errmsg("must be superuser to control recovery")))); if (!RecoveryInProgress()) ereport(ERROR, @@ -5815,7 +5817,7 @@ pg_is_xlog_replay_paused(PG_FUNCTION_ARGS) if (!superuser()) ereport(ERROR, (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE), - (errmsg("must be superuser to control recovery")))); + (errmsg("must be superuser to control recovery")))); if (!RecoveryInProgress()) ereport(ERROR, @@ -5870,7 +5872,7 @@ GetLatestXTime(void) Datum pg_last_xact_replay_timestamp(PG_FUNCTION_ARGS) { - TimestampTz xtime; + TimestampTz xtime; xtime = GetLatestXTime(); if (xtime == 0) @@ -6132,10 +6134,10 @@ StartupXLOG(void) InRecovery = true; /* force recovery even if SHUTDOWNED */ /* - * Make sure that REDO location exists. This may not be - * the case if there was a crash during an online backup, - * which left a backup_label around that references a WAL - * segment that's already been archived. + * Make sure that REDO location exists. This may not be the case + * if there was a crash during an online backup, which left a + * backup_label around that references a WAL segment that's + * already been archived. */ if (XLByteLT(checkPoint.redo, checkPointLoc)) { @@ -6150,7 +6152,7 @@ StartupXLOG(void) ereport(FATAL, (errmsg("could not locate required checkpoint record"), errhint("If you are not restoring from a backup, try removing the file \"%s/backup_label\".", DataDir))); - wasShutdown = false; /* keep compiler quiet */ + wasShutdown = false; /* keep compiler quiet */ } /* set flag to delete it later */ haveBackupLabel = true; @@ -6330,9 +6332,9 @@ StartupXLOG(void) /* * We're in recovery, so unlogged relations relations may be trashed - * and must be reset. This should be done BEFORE allowing Hot - * Standby connections, so that read-only backends don't try to - * read whatever garbage is left over from before. + * and must be reset. This should be done BEFORE allowing Hot Standby + * connections, so that read-only backends don't try to read whatever + * garbage is left over from before. */ ResetUnloggedRelations(UNLOGGED_RELATION_CLEANUP); @@ -6517,7 +6519,8 @@ StartupXLOG(void) if (recoveryStopsHere(record, &recoveryApply)) { /* - * Pause only if users can connect to send a resume message + * Pause only if users can connect to send a resume + * message */ if (recoveryPauseAtTarget && standbyState == STANDBY_SNAPSHOT_READY) { @@ -7003,8 +7006,8 @@ HotStandbyActive(void) { /* * We check shared state each time only until Hot Standby is active. We - * can't de-activate Hot Standby, so there's no need to keep checking after - * the shared variable has once been seen true. + * can't de-activate Hot Standby, so there's no need to keep checking + * after the shared variable has once been seen true. */ if (LocalHotStandbyActive) return true; @@ -7429,14 +7432,14 @@ LogCheckpointEnd(bool restartpoint) */ longest_secs = (long) (CheckpointStats.ckpt_longest_sync / 1000000); longest_usecs = CheckpointStats.ckpt_longest_sync - - (uint64) longest_secs * 1000000; + (uint64) longest_secs *1000000; average_sync_time = 0; - if (CheckpointStats.ckpt_sync_rels > 0) + if (CheckpointStats.ckpt_sync_rels > 0) average_sync_time = CheckpointStats.ckpt_agg_sync_time / CheckpointStats.ckpt_sync_rels; average_secs = (long) (average_sync_time / 1000000); - average_usecs = average_sync_time - (uint64) average_secs * 1000000; + average_usecs = average_sync_time - (uint64) average_secs *1000000; if (restartpoint) elog(LOG, "restartpoint complete: wrote %d buffers (%.1f%%); " @@ -8241,9 +8244,9 @@ RequestXLogSwitch(void) XLogRecPtr XLogRestorePoint(const char *rpName) { - XLogRecPtr RecPtr; - XLogRecData rdata; - xl_restore_point xlrec; + XLogRecPtr RecPtr; + XLogRecData rdata; + xl_restore_point xlrec; xlrec.rp_time = GetCurrentTimestamp(); strncpy(xlrec.rp_name, rpName, MAXFNAMELEN); @@ -8257,7 +8260,7 @@ XLogRestorePoint(const char *rpName) ereport(LOG, (errmsg("restore point \"%s\" created at %X/%X", - rpName, RecPtr.xlogid, RecPtr.xrecoff))); + rpName, RecPtr.xlogid, RecPtr.xrecoff))); return RecPtr; } @@ -8643,7 +8646,7 @@ get_sync_bit(int method) /* * Optimize writes by bypassing kernel cache with O_DIRECT when using - * O_SYNC/O_FSYNC and O_DSYNC. But only if archiving and streaming are + * O_SYNC/O_FSYNC and O_DSYNC. But only if archiving and streaming are * disabled, otherwise the archive command or walsender process will read * the WAL soon after writing it, which is guaranteed to cause a physical * read if we bypassed the kernel cache. We also skip the @@ -8775,7 +8778,7 @@ pg_start_backup(PG_FUNCTION_ARGS) text *backupid = PG_GETARG_TEXT_P(0); bool fast = PG_GETARG_BOOL(1); char *backupidstr; - XLogRecPtr startpoint; + XLogRecPtr startpoint; char startxlogstr[MAXFNAMELEN]; backupidstr = text_to_cstring(backupid); @@ -8791,7 +8794,7 @@ pg_start_backup(PG_FUNCTION_ARGS) * do_pg_start_backup is the workhorse of the user-visible pg_start_backup() * function. It creates the necessary starting checkpoint and constructs the * backup label file. - * + * * There are two kind of backups: exclusive and non-exclusive. An exclusive * backup is started with pg_start_backup(), and there can be only one active * at a time. The backup label file of an exclusive backup is written to @@ -8826,7 +8829,7 @@ do_pg_start_backup(const char *backupidstr, bool fast, char **labelfile) if (!superuser() && !is_authenticated_user_replication_role()) ereport(ERROR, (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE), - errmsg("must be superuser or replication role to run a backup"))); + errmsg("must be superuser or replication role to run a backup"))); if (RecoveryInProgress()) ereport(ERROR, @@ -8897,25 +8900,27 @@ do_pg_start_backup(const char *backupidstr, bool fast, char **labelfile) /* Ensure we release forcePageWrites if fail below */ PG_ENSURE_ERROR_CLEANUP(pg_start_backup_callback, (Datum) BoolGetDatum(exclusive)); { - bool gotUniqueStartpoint = false; + bool gotUniqueStartpoint = false; + do { /* * Force a CHECKPOINT. Aside from being necessary to prevent torn - * page problems, this guarantees that two successive backup runs will - * have different checkpoint positions and hence different history - * file names, even if nothing happened in between. + * page problems, this guarantees that two successive backup runs + * will have different checkpoint positions and hence different + * history file names, even if nothing happened in between. * - * We use CHECKPOINT_IMMEDIATE only if requested by user (via passing - * fast = true). Otherwise this can take awhile. + * We use CHECKPOINT_IMMEDIATE only if requested by user (via + * passing fast = true). Otherwise this can take awhile. */ RequestCheckpoint(CHECKPOINT_FORCE | CHECKPOINT_WAIT | (fast ? CHECKPOINT_IMMEDIATE : 0)); /* - * Now we need to fetch the checkpoint record location, and also its - * REDO pointer. The oldest point in WAL that would be needed to - * restore starting from the checkpoint is precisely the REDO pointer. + * Now we need to fetch the checkpoint record location, and also + * its REDO pointer. The oldest point in WAL that would be needed + * to restore starting from the checkpoint is precisely the REDO + * pointer. */ LWLockAcquire(ControlFileLock, LW_SHARED); checkpointloc = ControlFile->checkPoint; @@ -8923,16 +8928,15 @@ do_pg_start_backup(const char *backupidstr, bool fast, char **labelfile) LWLockRelease(ControlFileLock); /* - * If two base backups are started at the same time (in WAL - * sender processes), we need to make sure that they use - * different checkpoints as starting locations, because we use - * the starting WAL location as a unique identifier for the base - * backup in the end-of-backup WAL record and when we write the - * backup history file. Perhaps it would be better generate a - * separate unique ID for each backup instead of forcing another - * checkpoint, but taking a checkpoint right after another is - * not that expensive either because only few buffers have been - * dirtied yet. + * If two base backups are started at the same time (in WAL sender + * processes), we need to make sure that they use different + * checkpoints as starting locations, because we use the starting + * WAL location as a unique identifier for the base backup in the + * end-of-backup WAL record and when we write the backup history + * file. Perhaps it would be better generate a separate unique ID + * for each backup instead of forcing another checkpoint, but + * taking a checkpoint right after another is not that expensive + * either because only few buffers have been dirtied yet. */ LWLockAcquire(WALInsertLock, LW_SHARED); if (XLByteLT(XLogCtl->Insert.lastBackupStart, startpoint)) @@ -8941,13 +8945,13 @@ do_pg_start_backup(const char *backupidstr, bool fast, char **labelfile) gotUniqueStartpoint = true; } LWLockRelease(WALInsertLock); - } while(!gotUniqueStartpoint); + } while (!gotUniqueStartpoint); XLByteToSeg(startpoint, _logId, _logSeg); XLogFileName(xlogfilename, ThisTimeLineID, _logId, _logSeg); /* - * Construct backup label file + * Construct backup label file */ initStringInfo(&labelfbuf); @@ -8970,8 +8974,8 @@ do_pg_start_backup(const char *backupidstr, bool fast, char **labelfile) { /* * Check for existing backup label --- implies a backup is already - * running. (XXX given that we checked exclusiveBackup above, maybe - * it would be OK to just unlink any such label file?) + * running. (XXX given that we checked exclusiveBackup above, + * maybe it would be OK to just unlink any such label file?) */ if (stat(BACKUP_LABEL_FILE, &stat_buf) != 0) { @@ -9018,7 +9022,7 @@ do_pg_start_backup(const char *backupidstr, bool fast, char **labelfile) static void pg_start_backup_callback(int code, Datum arg) { - bool exclusive = DatumGetBool(arg); + bool exclusive = DatumGetBool(arg); /* Update backup counters and forcePageWrites on failure */ LWLockAcquire(WALInsertLock, LW_EXCLUSIVE); @@ -9101,7 +9105,7 @@ do_pg_stop_backup(char *labelfile, bool waitforarchive) if (!superuser() && !is_authenticated_user_replication_role()) ereport(ERROR, (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE), - (errmsg("must be superuser or replication role to run a backup")))); + (errmsg("must be superuser or replication role to run a backup")))); if (RecoveryInProgress()) ereport(ERROR, @@ -9145,8 +9149,8 @@ do_pg_stop_backup(char *labelfile, bool waitforarchive) /* * Read the existing label file into memory. */ - struct stat statbuf; - int r; + struct stat statbuf; + int r; if (stat(BACKUP_LABEL_FILE, &statbuf)) { @@ -9197,7 +9201,7 @@ do_pg_stop_backup(char *labelfile, bool waitforarchive) ereport(ERROR, (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE), errmsg("invalid data in file \"%s\"", BACKUP_LABEL_FILE))); - remaining = strchr(labelfile, '\n') + 1; /* %n is not portable enough */ + remaining = strchr(labelfile, '\n') + 1; /* %n is not portable enough */ /* * Write the backup-end xlog record @@ -9388,8 +9392,8 @@ pg_switch_xlog(PG_FUNCTION_ARGS) Datum pg_create_restore_point(PG_FUNCTION_ARGS) { - text *restore_name = PG_GETARG_TEXT_P(0); - char *restore_name_str; + text *restore_name = PG_GETARG_TEXT_P(0); + char *restore_name_str; XLogRecPtr restorepoint; char location[MAXFNAMELEN]; @@ -9407,7 +9411,7 @@ pg_create_restore_point(PG_FUNCTION_ARGS) if (!XLogIsNeeded()) ereport(ERROR, (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE), - errmsg("WAL level not sufficient for creating a restore point"), + errmsg("WAL level not sufficient for creating a restore point"), errhint("wal_level must be set to \"archive\" or \"hot_standby\" at server start."))); restore_name_str = text_to_cstring(restore_name); @@ -9423,7 +9427,7 @@ pg_create_restore_point(PG_FUNCTION_ARGS) * As a convenience, return the WAL location of the restore point record */ snprintf(location, sizeof(location), "%X/%X", - restorepoint.xlogid, restorepoint.xrecoff); + restorepoint.xlogid, restorepoint.xrecoff); PG_RETURN_TEXT_P(cstring_to_text(location)); } @@ -10177,8 +10181,8 @@ retry: } /* - * If it hasn't been long since last attempt, sleep - * to avoid busy-waiting. + * If it hasn't been long since last attempt, sleep to + * avoid busy-waiting. */ now = (pg_time_t) time(NULL); if ((now - last_fail_time) < 5) @@ -10404,7 +10408,7 @@ static bool CheckForStandbyTrigger(void) { struct stat stat_buf; - static bool triggered = false; + static bool triggered = false; if (triggered) return true; @@ -10446,8 +10450,8 @@ CheckPromoteSignal(void) if (stat(PROMOTE_SIGNAL_FILE, &stat_buf) == 0) { /* - * Since we are in a signal handler, it's not safe - * to elog. We silently ignore any error from unlink. + * Since we are in a signal handler, it's not safe to elog. We + * silently ignore any error from unlink. */ unlink(PROMOTE_SIGNAL_FILE); return true; diff --git a/src/backend/catalog/aclchk.c b/src/backend/catalog/aclchk.c index aa3d59d4c9..693b634398 100644 --- a/src/backend/catalog/aclchk.c +++ b/src/backend/catalog/aclchk.c @@ -1011,8 +1011,8 @@ SetDefaultACLsInSchemas(InternalDefaultACL *iacls, List *nspnames) /* * Note that we must do the permissions check against the target - * role not the calling user. We require CREATE privileges, - * since without CREATE you won't be able to do anything using the + * role not the calling user. We require CREATE privileges, since + * without CREATE you won't be able to do anything using the * default privs anyway. */ iacls->nspid = get_namespace_oid(nspname, false); @@ -1707,7 +1707,7 @@ ExecGrant_Relation(InternalGrant *istmt) pg_class_tuple->relkind != RELKIND_FOREIGN_TABLE) ereport(ERROR, (errcode(ERRCODE_WRONG_OBJECT_TYPE), - errmsg("\"%s\" is not a foreign table", + errmsg("\"%s\" is not a foreign table", NameStr(pg_class_tuple->relname)))); /* Adjust the default permissions based on object type */ @@ -1964,13 +1964,13 @@ ExecGrant_Relation(InternalGrant *istmt) this_privileges &= (AclMode) ACL_SELECT; } else if (pg_class_tuple->relkind == RELKIND_FOREIGN_TABLE && - this_privileges & ~((AclMode) ACL_SELECT)) + this_privileges & ~((AclMode) ACL_SELECT)) { /* Foreign tables have the same restriction as sequences. */ ereport(WARNING, - (errcode(ERRCODE_INVALID_GRANT_OPERATION), - errmsg("foreign table \"%s\" only supports SELECT column privileges", - NameStr(pg_class_tuple->relname)))); + (errcode(ERRCODE_INVALID_GRANT_OPERATION), + errmsg("foreign table \"%s\" only supports SELECT column privileges", + NameStr(pg_class_tuple->relname)))); this_privileges &= (AclMode) ACL_SELECT; } @@ -4768,7 +4768,7 @@ pg_extension_ownercheck(Oid ext_oid, Oid roleid) * Note: roles do not have owners per se; instead we use this test in * places where an ownership-like permissions test is needed for a role. * Be sure to apply it to the role trying to do the operation, not the - * role being operated on! Also note that this generally should not be + * role being operated on! Also note that this generally should not be * considered enough privilege if the target role is a superuser. * (We don't handle that consideration here because we want to give a * separate error message for such cases, so the caller has to deal with it.) diff --git a/src/backend/catalog/catalog.c b/src/backend/catalog/catalog.c index 12935754bc..cbce0072de 100644 --- a/src/backend/catalog/catalog.c +++ b/src/backend/catalog/catalog.c @@ -80,11 +80,11 @@ forkname_to_number(char *forkName) /* * forkname_chars - * We use this to figure out whether a filename could be a relation - * fork (as opposed to an oddly named stray file that somehow ended - * up in the database directory). If the passed string begins with - * a fork name (other than the main fork name), we return its length, - * and set *fork (if not NULL) to the fork number. If not, we return 0. + * We use this to figure out whether a filename could be a relation + * fork (as opposed to an oddly named stray file that somehow ended + * up in the database directory). If the passed string begins with + * a fork name (other than the main fork name), we return its length, + * and set *fork (if not NULL) to the fork number. If not, we return 0. * * Note that the present coding assumes that there are no fork names which * are prefixes of other fork names. @@ -96,7 +96,8 @@ forkname_chars(const char *str, ForkNumber *fork) for (forkNum = 1; forkNum <= MAX_FORKNUM; forkNum++) { - int len = strlen(forkNames[forkNum]); + int len = strlen(forkNames[forkNum]); + if (strncmp(forkNames[forkNum], str, len) == 0) { if (fork) @@ -150,7 +151,7 @@ relpathbackend(RelFileNode rnode, BackendId backend, ForkNumber forknum) { /* OIDCHARS will suffice for an integer, too */ pathlen = 5 + OIDCHARS + 2 + OIDCHARS + 1 + OIDCHARS + 1 - + FORKNAMECHARS + 1; + + FORKNAMECHARS + 1; path = (char *) palloc(pathlen); if (forknum != MAIN_FORKNUM) snprintf(path, pathlen, "base/%u/t%d_%u_%s", @@ -167,8 +168,8 @@ relpathbackend(RelFileNode rnode, BackendId backend, ForkNumber forknum) if (backend == InvalidBackendId) { pathlen = 9 + 1 + OIDCHARS + 1 - + strlen(TABLESPACE_VERSION_DIRECTORY) + 1 + OIDCHARS + 1 - + OIDCHARS + 1 + FORKNAMECHARS + 1; + + strlen(TABLESPACE_VERSION_DIRECTORY) + 1 + OIDCHARS + 1 + + OIDCHARS + 1 + FORKNAMECHARS + 1; path = (char *) palloc(pathlen); if (forknum != MAIN_FORKNUM) snprintf(path, pathlen, "pg_tblspc/%u/%s/%u/%u_%s", @@ -184,8 +185,8 @@ relpathbackend(RelFileNode rnode, BackendId backend, ForkNumber forknum) { /* OIDCHARS will suffice for an integer, too */ pathlen = 9 + 1 + OIDCHARS + 1 - + strlen(TABLESPACE_VERSION_DIRECTORY) + 1 + OIDCHARS + 2 - + OIDCHARS + 1 + OIDCHARS + 1 + FORKNAMECHARS + 1; + + strlen(TABLESPACE_VERSION_DIRECTORY) + 1 + OIDCHARS + 2 + + OIDCHARS + 1 + OIDCHARS + 1 + FORKNAMECHARS + 1; path = (char *) palloc(pathlen); if (forknum != MAIN_FORKNUM) snprintf(path, pathlen, "pg_tblspc/%u/%s/%u/t%d_%u_%s", diff --git a/src/backend/catalog/dependency.c b/src/backend/catalog/dependency.c index de24ef7a09..ec9bb48c63 100644 --- a/src/backend/catalog/dependency.c +++ b/src/backend/catalog/dependency.c @@ -160,7 +160,7 @@ static const Oid object_classes[MAX_OCLASS] = { ForeignServerRelationId, /* OCLASS_FOREIGN_SERVER */ UserMappingRelationId, /* OCLASS_USER_MAPPING */ DefaultAclRelationId, /* OCLASS_DEFACL */ - ExtensionRelationId /* OCLASS_EXTENSION */ + ExtensionRelationId /* OCLASS_EXTENSION */ }; @@ -1021,8 +1021,8 @@ deleteOneObject(const ObjectAddress *object, Relation depRel) /* * Delete any comments or security labels associated with this object. - * (This is a convenient place to do these things, rather than having every - * object type know to do it.) + * (This is a convenient place to do these things, rather than having + * every object type know to do it.) */ DeleteComments(object->objectId, object->classId, object->objectSubId); DeleteSecurityLabel(object); @@ -1263,7 +1263,7 @@ recordDependencyOnExpr(const ObjectAddress *depender, * whereas 'behavior' is used for everything else. * * NOTE: the caller should ensure that a whole-table dependency on the - * specified relation is created separately, if one is needed. In particular, + * specified relation is created separately, if one is needed. In particular, * a whole-row Var "relation.*" will not cause this routine to emit any * dependency item. This is appropriate behavior for subexpressions of an * ordinary query, so other cases need to cope as necessary. @@ -1383,7 +1383,7 @@ find_expr_references_walker(Node *node, /* * A whole-row Var references no specific columns, so adds no new - * dependency. (We assume that there is a whole-table dependency + * dependency. (We assume that there is a whole-table dependency * arising from each underlying rangetable entry. While we could * record such a dependency when finding a whole-row Var that * references a relation directly, it's quite unclear how to extend @@ -1431,8 +1431,8 @@ find_expr_references_walker(Node *node, /* * We must also depend on the constant's collation: it could be - * different from the datatype's, if a CollateExpr was const-folded - * to a simple constant. However we can save work in the most common + * different from the datatype's, if a CollateExpr was const-folded to + * a simple constant. However we can save work in the most common * case where the collation is "default", since we know that's pinned. */ if (OidIsValid(con->constcollid) && @@ -1695,7 +1695,7 @@ find_expr_references_walker(Node *node, } foreach(ct, rte->funccolcollations) { - Oid collid = lfirst_oid(ct); + Oid collid = lfirst_oid(ct); if (OidIsValid(collid) && collid != DEFAULT_COLLATION_OID) @@ -2224,12 +2224,12 @@ getObjectDescription(const ObjectAddress *object) HeapTuple collTup; collTup = SearchSysCache1(COLLOID, - ObjectIdGetDatum(object->objectId)); + ObjectIdGetDatum(object->objectId)); if (!HeapTupleIsValid(collTup)) elog(ERROR, "cache lookup failed for collation %u", object->objectId); appendStringInfo(&buffer, _("collation %s"), - NameStr(((Form_pg_collation) GETSTRUCT(collTup))->collname)); + NameStr(((Form_pg_collation) GETSTRUCT(collTup))->collname)); ReleaseSysCache(collTup); break; } @@ -2796,7 +2796,7 @@ getObjectDescription(const ObjectAddress *object) char * getObjectDescriptionOids(Oid classid, Oid objid) { - ObjectAddress address; + ObjectAddress address; address.classId = classid; address.objectId = objid; diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c index 5d25ce9ec8..09b26a5c72 100644 --- a/src/backend/catalog/heap.c +++ b/src/backend/catalog/heap.c @@ -431,7 +431,7 @@ CheckAttributeNamesTypes(TupleDesc tupdesc, char relkind, CheckAttributeType(NameStr(tupdesc->attrs[i]->attname), tupdesc->attrs[i]->atttypid, tupdesc->attrs[i]->attcollation, - NIL, /* assume we're creating a new rowtype */ + NIL, /* assume we're creating a new rowtype */ allow_system_table_mods); } } @@ -497,7 +497,7 @@ CheckAttributeType(const char *attname, int i; /* - * Check for self-containment. Eventually we might be able to allow + * Check for self-containment. Eventually we might be able to allow * this (just return without complaint, if so) but it's not clear how * many other places would require anti-recursion defenses before it * would be safe to allow tables to contain their own rowtype. @@ -505,8 +505,8 @@ CheckAttributeType(const char *attname, if (list_member_oid(containing_rowtypes, atttypid)) ereport(ERROR, (errcode(ERRCODE_INVALID_TABLE_DEFINITION), - errmsg("composite type %s cannot be made a member of itself", - format_type_be(atttypid)))); + errmsg("composite type %s cannot be made a member of itself", + format_type_be(atttypid)))); containing_rowtypes = lcons_oid(atttypid, containing_rowtypes); @@ -541,15 +541,15 @@ CheckAttributeType(const char *attname, } /* - * This might not be strictly invalid per SQL standard, but it is - * pretty useless, and it cannot be dumped, so we must disallow it. + * This might not be strictly invalid per SQL standard, but it is pretty + * useless, and it cannot be dumped, so we must disallow it. */ if (!OidIsValid(attcollation) && type_is_collatable(atttypid)) - ereport(ERROR, - (errcode(ERRCODE_INVALID_TABLE_DEFINITION), - errmsg("no collation was derived for column \"%s\" with collatable type %s", - attname, format_type_be(atttypid)), - errhint("Use the COLLATE clause to set the collation explicitly."))); + ereport(ERROR, + (errcode(ERRCODE_INVALID_TABLE_DEFINITION), + errmsg("no collation was derived for column \"%s\" with collatable type %s", + attname, format_type_be(atttypid)), + errhint("Use the COLLATE clause to set the collation explicitly."))); } /* @@ -921,7 +921,7 @@ AddNewRelationType(const char *typeName, -1, /* typmod */ 0, /* array dimensions for typBaseType */ false, /* Type NOT NULL */ - InvalidOid); /* typcollation */ + InvalidOid); /* typcollation */ } /* -------------------------------- @@ -992,9 +992,9 @@ heap_create_with_catalog(const char *relname, CheckAttributeNamesTypes(tupdesc, relkind, allow_system_table_mods); /* - * If the relation already exists, it's an error, unless the user specifies - * "IF NOT EXISTS". In that case, we just print a notice and do nothing - * further. + * If the relation already exists, it's an error, unless the user + * specifies "IF NOT EXISTS". In that case, we just print a notice and do + * nothing further. */ existing_relid = get_relname_relid(relname, relnamespace); if (existing_relid != InvalidOid) @@ -1004,7 +1004,7 @@ heap_create_with_catalog(const char *relname, ereport(NOTICE, (errcode(ERRCODE_DUPLICATE_TABLE), errmsg("relation \"%s\" already exists, skipping", - relname))); + relname))); heap_close(pg_class_desc, RowExclusiveLock); return InvalidOid; } @@ -1048,8 +1048,8 @@ heap_create_with_catalog(const char *relname, if (!OidIsValid(relid)) { /* - * Use binary-upgrade override for pg_class.oid/relfilenode, - * if supplied. + * Use binary-upgrade override for pg_class.oid/relfilenode, if + * supplied. */ if (OidIsValid(binary_upgrade_next_heap_pg_class_oid) && (relkind == RELKIND_RELATION || relkind == RELKIND_SEQUENCE || @@ -1183,7 +1183,7 @@ heap_create_with_catalog(const char *relname, -1, /* typmod */ 0, /* array dimensions for typBaseType */ false, /* Type NOT NULL */ - InvalidOid); /* typcollation */ + InvalidOid); /* typcollation */ pfree(relarrayname); } @@ -1285,12 +1285,12 @@ heap_create_with_catalog(const char *relname, register_on_commit_action(relid, oncommit); /* - * If this is an unlogged relation, it needs an init fork so that it - * can be correctly reinitialized on restart. Since we're going to - * do an immediate sync, we ony need to xlog this if archiving or - * streaming is enabled. And the immediate sync is required, because - * otherwise there's no guarantee that this will hit the disk before - * the next checkpoint moves the redo pointer. + * If this is an unlogged relation, it needs an init fork so that it can + * be correctly reinitialized on restart. Since we're going to do an + * immediate sync, we ony need to xlog this if archiving or streaming is + * enabled. And the immediate sync is required, because otherwise there's + * no guarantee that this will hit the disk before the next checkpoint + * moves the redo pointer. */ if (relpersistence == RELPERSISTENCE_UNLOGGED) { @@ -1654,8 +1654,8 @@ heap_drop_with_catalog(Oid relid) /* * There can no longer be anyone *else* touching the relation, but we - * might still have open queries or cursors, or pending trigger events, - * in our own session. + * might still have open queries or cursors, or pending trigger events, in + * our own session. */ CheckTableNotInUse(rel, "DROP TABLE"); @@ -1664,8 +1664,8 @@ heap_drop_with_catalog(Oid relid) */ if (rel->rd_rel->relkind == RELKIND_FOREIGN_TABLE) { - Relation rel; - HeapTuple tuple; + Relation rel; + HeapTuple tuple; rel = heap_open(ForeignTableRelationId, RowExclusiveLock); @@ -1899,7 +1899,7 @@ StoreRelCheck(Relation rel, char *ccname, Node *expr, CONSTRAINT_CHECK, /* Constraint Type */ false, /* Is Deferrable */ false, /* Is Deferred */ - true, /* Is Validated */ + true, /* Is Validated */ RelationGetRelid(rel), /* relation */ attNos, /* attrs in the constraint */ keycount, /* # attrs in the constraint */ diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c index 679255a199..1bf74b3d4f 100644 --- a/src/backend/catalog/index.c +++ b/src/backend/catalog/index.c @@ -187,18 +187,18 @@ index_check_primary_key(Relation heapRel, int i; /* - * If ALTER TABLE, check that there isn't already a PRIMARY KEY. In - * CREATE TABLE, we have faith that the parser rejected multiple pkey - * clauses; and CREATE INDEX doesn't have a way to say PRIMARY KEY, so - * it's no problem either. + * If ALTER TABLE, check that there isn't already a PRIMARY KEY. In CREATE + * TABLE, we have faith that the parser rejected multiple pkey clauses; + * and CREATE INDEX doesn't have a way to say PRIMARY KEY, so it's no + * problem either. */ if (is_alter_table && relationHasPrimaryKey(heapRel)) { ereport(ERROR, (errcode(ERRCODE_INVALID_TABLE_DEFINITION), - errmsg("multiple primary keys for table \"%s\" are not allowed", - RelationGetRelationName(heapRel)))); + errmsg("multiple primary keys for table \"%s\" are not allowed", + RelationGetRelationName(heapRel)))); } /* @@ -222,7 +222,7 @@ index_check_primary_key(Relation heapRel, continue; atttuple = SearchSysCache2(ATTNUM, - ObjectIdGetDatum(RelationGetRelid(heapRel)), + ObjectIdGetDatum(RelationGetRelid(heapRel)), Int16GetDatum(attnum)); if (!HeapTupleIsValid(atttuple)) elog(ERROR, "cache lookup failed for attribute %d of relation %u", @@ -243,15 +243,14 @@ index_check_primary_key(Relation heapRel, } /* - * XXX: Shouldn't the ALTER TABLE .. SET NOT NULL cascade to child - * tables? Currently, since the PRIMARY KEY itself doesn't cascade, - * we don't cascade the notnull constraint(s) either; but this is - * pretty debatable. + * XXX: Shouldn't the ALTER TABLE .. SET NOT NULL cascade to child tables? + * Currently, since the PRIMARY KEY itself doesn't cascade, we don't + * cascade the notnull constraint(s) either; but this is pretty debatable. * - * XXX: possible future improvement: when being called from ALTER - * TABLE, it would be more efficient to merge this with the outer - * ALTER TABLE, so as to avoid two scans. But that seems to - * complicate DefineIndex's API unduly. + * XXX: possible future improvement: when being called from ALTER TABLE, + * it would be more efficient to merge this with the outer ALTER TABLE, so + * as to avoid two scans. But that seems to complicate DefineIndex's API + * unduly. */ if (cmds) AlterTableInternal(RelationGetRelid(heapRel), cmds, false); @@ -788,8 +787,8 @@ index_create(Relation heapRelation, if (!OidIsValid(indexRelationId)) { /* - * Use binary-upgrade override for pg_class.oid/relfilenode, - * if supplied. + * Use binary-upgrade override for pg_class.oid/relfilenode, if + * supplied. */ if (OidIsValid(binary_upgrade_next_index_pg_class_oid)) { @@ -872,7 +871,7 @@ index_create(Relation heapRelation, * ---------------- */ UpdateIndexRelation(indexRelationId, heapRelationId, indexInfo, - collationObjectId, classObjectId, coloptions, isprimary, is_exclusion, + collationObjectId, classObjectId, coloptions, isprimary, is_exclusion, !deferrable, !concurrent); @@ -947,7 +946,7 @@ index_create(Relation heapRelation, /* * If there are no simply-referenced columns, give the index an - * auto dependency on the whole table. In most cases, this will + * auto dependency on the whole table. In most cases, this will * be redundant, but it might not be if the index expressions and * predicate contain no Vars or only whole-row Vars. */ @@ -1067,7 +1066,7 @@ index_create(Relation heapRelation, /* * Close the index; but we keep the lock that we acquired above until end - * of transaction. Closing the heap is caller's responsibility. + * of transaction. Closing the heap is caller's responsibility. */ index_close(indexRelation, NoLock); @@ -1176,8 +1175,8 @@ index_constraint_create(Relation heapRelation, /* * If the constraint is deferrable, create the deferred uniqueness - * checking trigger. (The trigger will be given an internal - * dependency on the constraint by CreateTrigger.) + * checking trigger. (The trigger will be given an internal dependency on + * the constraint by CreateTrigger.) */ if (deferrable) { @@ -1213,7 +1212,7 @@ index_constraint_create(Relation heapRelation, * have been so marked already, so no need to clear the flag in the other * case. * - * Note: this might better be done by callers. We do it here to avoid + * Note: this might better be done by callers. We do it here to avoid * exposing index_update_stats() globally, but that wouldn't be necessary * if relhaspkey went away. */ @@ -1235,10 +1234,10 @@ index_constraint_create(Relation heapRelation, */ if (update_pgindex && (mark_as_primary || deferrable)) { - Relation pg_index; - HeapTuple indexTuple; - Form_pg_index indexForm; - bool dirty = false; + Relation pg_index; + HeapTuple indexTuple; + Form_pg_index indexForm; + bool dirty = false; pg_index = heap_open(IndexRelationId, RowExclusiveLock); @@ -1303,8 +1302,8 @@ index_drop(Oid indexId) userIndexRelation = index_open(indexId, AccessExclusiveLock); /* - * There can no longer be anyone *else* touching the index, but we - * might still have open queries using it in our own session. + * There can no longer be anyone *else* touching the index, but we might + * still have open queries using it in our own session. */ CheckTableNotInUse(userIndexRelation, "DROP INDEX"); @@ -1739,7 +1738,8 @@ index_build(Relation heapRelation, */ if (heapRelation->rd_rel->relpersistence == RELPERSISTENCE_UNLOGGED) { - RegProcedure ambuildempty = indexRelation->rd_am->ambuildempty; + RegProcedure ambuildempty = indexRelation->rd_am->ambuildempty; + RelationOpenSmgr(indexRelation); smgrcreate(indexRelation->rd_smgr, INIT_FORKNUM, false); OidFunctionCall1(ambuildempty, PointerGetDatum(indexRelation)); @@ -2410,7 +2410,7 @@ validate_index(Oid heapId, Oid indexId, Snapshot snapshot) ivinfo.strategy = NULL; state.tuplesort = tuplesort_begin_datum(TIDOID, - TIDLessOperator, InvalidOid, false, + TIDLessOperator, InvalidOid, false, maintenance_work_mem, false); state.htups = state.itups = state.tups_inserted = 0; @@ -2834,7 +2834,7 @@ reindex_index(Oid indexId, bool skip_constraint_checks) * use catalog indexes while collecting the list.) * * To avoid deadlocks, VACUUM FULL or CLUSTER on a system catalog must omit the - * REINDEX_CHECK_CONSTRAINTS flag. REINDEX should be used to rebuild an index + * REINDEX_CHECK_CONSTRAINTS flag. REINDEX should be used to rebuild an index * if constraint inconsistency is suspected. For optimal performance, other * callers should include the flag only after transforming the data in a manner * that risks a change in constraint validity. diff --git a/src/backend/catalog/namespace.c b/src/backend/catalog/namespace.c index 734581e485..f8fd827693 100644 --- a/src/backend/catalog/namespace.c +++ b/src/backend/catalog/namespace.c @@ -2446,10 +2446,10 @@ CheckSetNamespace(Oid oldNspOid, Oid nspOid, Oid classid, Oid objid) if (oldNspOid == nspOid) ereport(ERROR, (classid == RelationRelationId ? - errcode(ERRCODE_DUPLICATE_TABLE) : + errcode(ERRCODE_DUPLICATE_TABLE) : classid == ProcedureRelationId ? - errcode(ERRCODE_DUPLICATE_FUNCTION) : - errcode(ERRCODE_DUPLICATE_OBJECT), + errcode(ERRCODE_DUPLICATE_FUNCTION) : + errcode(ERRCODE_DUPLICATE_OBJECT), errmsg("%s is already in schema \"%s\"", getObjectDescriptionOids(classid, objid), get_namespace_name(nspOid)))); @@ -2458,7 +2458,7 @@ CheckSetNamespace(Oid oldNspOid, Oid nspOid, Oid classid, Oid objid) if (isAnyTempNamespace(nspOid) || isAnyTempNamespace(oldNspOid)) ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("cannot move objects into or out of temporary schemas"))); + errmsg("cannot move objects into or out of temporary schemas"))); /* same for TOAST schema */ if (nspOid == PG_TOAST_NAMESPACE || oldNspOid == PG_TOAST_NAMESPACE) @@ -2525,7 +2525,7 @@ QualifiedNameGetCreationNamespace(List *names, char **objname_p) /* * get_namespace_oid - given a namespace name, look up the OID * - * If missing_ok is false, throw an error if namespace name not found. If + * If missing_ok is false, throw an error if namespace name not found. If * true, just return InvalidOid. */ Oid @@ -2535,9 +2535,9 @@ get_namespace_oid(const char *nspname, bool missing_ok) oid = GetSysCacheOid1(NAMESPACENAME, CStringGetDatum(nspname)); if (!OidIsValid(oid) && !missing_ok) - ereport(ERROR, - (errcode(ERRCODE_UNDEFINED_SCHEMA), - errmsg("schema \"%s\" does not exist", nspname))); + ereport(ERROR, + (errcode(ERRCODE_UNDEFINED_SCHEMA), + errmsg("schema \"%s\" does not exist", nspname))); return oid; } @@ -2727,7 +2727,7 @@ GetTempNamespaceBackendId(Oid namespaceId) /* See if the namespace name starts with "pg_temp_" or "pg_toast_temp_" */ nspname = get_namespace_name(namespaceId); if (!nspname) - return InvalidBackendId; /* no such namespace? */ + return InvalidBackendId; /* no such namespace? */ if (strncmp(nspname, "pg_temp_", 8) == 0) result = atoi(nspname + 8); else if (strncmp(nspname, "pg_toast_temp_", 14) == 0) @@ -2798,8 +2798,8 @@ GetOverrideSearchPath(MemoryContext context) * * It's possible that newpath->useTemp is set but there is no longer any * active temp namespace, if the path was saved during a transaction that - * created a temp namespace and was later rolled back. In that case we just - * ignore useTemp. A plausible alternative would be to create a new temp + * created a temp namespace and was later rolled back. In that case we just + * ignore useTemp. A plausible alternative would be to create a new temp * namespace, but for existing callers that's not necessary because an empty * temp namespace wouldn't affect their results anyway. * @@ -3522,7 +3522,7 @@ check_search_path(char **newval, void **extra, GucSource source) if (source == PGC_S_TEST) ereport(NOTICE, (errcode(ERRCODE_UNDEFINED_SCHEMA), - errmsg("schema \"%s\" does not exist", curname))); + errmsg("schema \"%s\" does not exist", curname))); else { GUC_check_errdetail("schema \"%s\" does not exist", curname); diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index 0d21d310a6..bf25091582 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -78,7 +78,7 @@ static Relation get_relation_by_qualified_name(ObjectType objtype, static ObjectAddress get_object_address_relobject(ObjectType objtype, List *objname, Relation *relp); static ObjectAddress get_object_address_attribute(ObjectType objtype, - List *objname, Relation *relp, LOCKMODE lockmode); + List *objname, Relation *relp, LOCKMODE lockmode); static ObjectAddress get_object_address_opcf(ObjectType objtype, List *objname, List *objargs); static bool object_exists(ObjectAddress address); @@ -108,8 +108,8 @@ ObjectAddress get_object_address(ObjectType objtype, List *objname, List *objargs, Relation *relp, LOCKMODE lockmode) { - ObjectAddress address; - Relation relation = NULL; + ObjectAddress address; + Relation relation = NULL; /* Some kind of lock must be taken. */ Assert(lockmode != NoLock); @@ -130,7 +130,7 @@ get_object_address(ObjectType objtype, List *objname, List *objargs, case OBJECT_COLUMN: address = get_object_address_attribute(objtype, objname, &relation, - lockmode); + lockmode); break; case OBJECT_RULE: case OBJECT_TRIGGER: @@ -201,10 +201,10 @@ get_object_address(ObjectType objtype, List *objname, List *objargs, break; case OBJECT_CAST: { - TypeName *sourcetype = (TypeName *) linitial(objname); - TypeName *targettype = (TypeName *) linitial(objargs); - Oid sourcetypeid = typenameTypeId(NULL, sourcetype); - Oid targettypeid = typenameTypeId(NULL, targettype); + TypeName *sourcetype = (TypeName *) linitial(objname); + TypeName *targettype = (TypeName *) linitial(objargs); + Oid sourcetypeid = typenameTypeId(NULL, sourcetype); + Oid targettypeid = typenameTypeId(NULL, targettype); address.classId = CastRelationId; address.objectId = @@ -242,8 +242,8 @@ get_object_address(ObjectType objtype, List *objname, List *objargs, /* * If we're dealing with a relation or attribute, then the relation is - * already locked. If we're dealing with any other type of object, we need - * to lock it and then verify that it still exists. + * already locked. If we're dealing with any other type of object, we + * need to lock it and then verify that it still exists. */ if (address.classId != RelationRelationId) { @@ -308,7 +308,7 @@ get_object_address_unqualified(ObjectType objtype, List *qualname) break; default: elog(ERROR, "unrecognized objtype: %d", (int) objtype); - msg = NULL; /* placate compiler */ + msg = NULL; /* placate compiler */ } ereport(ERROR, (errcode(ERRCODE_SYNTAX_ERROR), @@ -379,7 +379,7 @@ static Relation get_relation_by_qualified_name(ObjectType objtype, List *objname, LOCKMODE lockmode) { - Relation relation; + Relation relation; relation = relation_openrv(makeRangeVarFromNameList(objname), lockmode); switch (objtype) @@ -449,7 +449,7 @@ get_object_address_relobject(ObjectType objtype, List *objname, Relation *relp) nnames = list_length(objname); if (nnames < 2) { - Oid reloid; + Oid reloid; /* * For compatibility with very old releases, we sometimes allow users @@ -514,7 +514,7 @@ static ObjectAddress get_object_address_attribute(ObjectType objtype, List *objname, Relation *relp, LOCKMODE lockmode) { - ObjectAddress address; + ObjectAddress address; List *relname; Oid reloid; Relation relation; @@ -534,7 +534,7 @@ get_object_address_attribute(ObjectType objtype, List *objname, ereport(ERROR, (errcode(ERRCODE_UNDEFINED_COLUMN), errmsg("column \"%s\" of relation \"%s\" does not exist", - attname, RelationGetRelationName(relation)))); + attname, RelationGetRelationName(relation)))); *relp = relation; return address; @@ -584,8 +584,8 @@ object_exists(ObjectAddress address) int cache = -1; Oid indexoid = InvalidOid; Relation rel; - ScanKeyData skey[1]; - SysScanDesc sd; + ScanKeyData skey[1]; + SysScanDesc sd; bool found; /* Sub-objects require special treatment. */ @@ -609,9 +609,9 @@ object_exists(ObjectAddress address) /* * For object types that have a relevant syscache, we use it; for - * everything else, we'll have to do an index-scan. This switch - * sets either the cache to be used for the syscache lookup, or the - * index to be used for the index scan. + * everything else, we'll have to do an index-scan. This switch sets + * either the cache to be used for the syscache lookup, or the index to be + * used for the index scan. */ switch (address.classId) { @@ -664,6 +664,7 @@ object_exists(ObjectAddress address) cache = OPFAMILYOID; break; case LargeObjectRelationId: + /* * Weird backward compatibility hack: ObjectAddress notation uses * LargeObjectRelationId for large objects, but since PostgreSQL @@ -816,15 +817,15 @@ check_object_ownership(Oid roleid, ObjectType objtype, ObjectAddress address, ereport(ERROR, (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE), errmsg("must be owner of large object %u", - address.objectId))); + address.objectId))); break; case OBJECT_CAST: { /* We can only check permissions on the source/target types */ - TypeName *sourcetype = (TypeName *) linitial(objname); - TypeName *targettype = (TypeName *) linitial(objargs); - Oid sourcetypeid = typenameTypeId(NULL, sourcetype); - Oid targettypeid = typenameTypeId(NULL, targettype); + TypeName *sourcetype = (TypeName *) linitial(objname); + TypeName *targettype = (TypeName *) linitial(objargs); + Oid sourcetypeid = typenameTypeId(NULL, sourcetype); + Oid targettypeid = typenameTypeId(NULL, targettype); if (!pg_type_ownercheck(sourcetypeid, roleid) && !pg_type_ownercheck(targettypeid, roleid)) @@ -851,6 +852,7 @@ check_object_ownership(Oid roleid, ObjectType objtype, ObjectAddress address, NameListToString(objname)); break; case OBJECT_ROLE: + /* * We treat roles as being "owned" by those with CREATEROLE priv, * except that superusers are only owned by superusers. diff --git a/src/backend/catalog/pg_collation.c b/src/backend/catalog/pg_collation.c index 708078463b..5b92a4c0c2 100644 --- a/src/backend/catalog/pg_collation.c +++ b/src/backend/catalog/pg_collation.c @@ -46,7 +46,9 @@ CollationCreate(const char *collname, Oid collnamespace, HeapTuple tup; Datum values[Natts_pg_collation]; bool nulls[Natts_pg_collation]; - NameData name_name, name_collate, name_ctype; + NameData name_name, + name_collate, + name_ctype; Oid oid; ObjectAddress myself, referenced; @@ -60,9 +62,9 @@ CollationCreate(const char *collname, Oid collnamespace, /* * Make sure there is no existing collation of same name & encoding. * - * This would be caught by the unique index anyway; we're just giving - * a friendlier error message. The unique index provides a backstop - * against race conditions. + * This would be caught by the unique index anyway; we're just giving a + * friendlier error message. The unique index provides a backstop against + * race conditions. */ if (SearchSysCacheExists3(COLLNAMEENCNSP, PointerGetDatum(collname), @@ -74,9 +76,9 @@ CollationCreate(const char *collname, Oid collnamespace, collname, pg_encoding_to_char(collencoding)))); /* - * Also forbid matching an any-encoding entry. This test of course is - * not backed up by the unique index, but it's not a problem since we - * don't support adding any-encoding entries after initdb. + * Also forbid matching an any-encoding entry. This test of course is not + * backed up by the unique index, but it's not a problem since we don't + * support adding any-encoding entries after initdb. */ if (SearchSysCacheExists3(COLLNAMEENCNSP, PointerGetDatum(collname), diff --git a/src/backend/catalog/pg_constraint.c b/src/backend/catalog/pg_constraint.c index 6619eed431..69979942af 100644 --- a/src/backend/catalog/pg_constraint.c +++ b/src/backend/catalog/pg_constraint.c @@ -799,10 +799,10 @@ get_constraint_oid(Oid relid, const char *conname, bool missing_ok) * the rel of interest are Vars with the indicated varno/varlevelsup. * * Currently we only check to see if the rel has a primary key that is a - * subset of the grouping_columns. We could also use plain unique constraints + * subset of the grouping_columns. We could also use plain unique constraints * if all their columns are known not null, but there's a problem: we need * to be able to represent the not-null-ness as part of the constraints added - * to *constraintDeps. FIXME whenever not-null constraints get represented + * to *constraintDeps. FIXME whenever not-null constraints get represented * in pg_constraint. */ bool @@ -852,7 +852,7 @@ check_functional_grouping(Oid relid, if (isNull) elog(ERROR, "null conkey for constraint %u", HeapTupleGetOid(tuple)); - arr = DatumGetArrayTypeP(adatum); /* ensure not toasted */ + arr = DatumGetArrayTypeP(adatum); /* ensure not toasted */ numkeys = ARR_DIMS(arr)[0]; if (ARR_NDIM(arr) != 1 || numkeys < 0 || diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c index 2bb7bb3d5f..67aad86d4e 100644 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@ -126,7 +126,7 @@ recordMultipleDependencies(const ObjectAddress *depender, /* * If we are executing a CREATE EXTENSION operation, mark the given object - * as being a member of the extension. Otherwise, do nothing. + * as being a member of the extension. Otherwise, do nothing. * * This must be called during creation of any user-definable object type * that could be a member of an extension. @@ -136,7 +136,7 @@ recordDependencyOnCurrentExtension(const ObjectAddress *object) { if (creating_extension) { - ObjectAddress extension; + ObjectAddress extension; extension.classId = ExtensionRelationId; extension.objectId = CurrentExtensionObject; @@ -155,7 +155,7 @@ recordDependencyOnCurrentExtension(const ObjectAddress *object) * (possibly with some differences from before). * * If skipExtensionDeps is true, we do not delete any dependencies that - * show that the given object is a member of an extension. This avoids + * show that the given object is a member of an extension. This avoids * needing a lot of extra logic to fetch and recreate that dependency. */ long @@ -185,7 +185,7 @@ deleteDependencyRecordsFor(Oid classId, Oid objectId, while (HeapTupleIsValid(tup = systable_getnext(scan))) { if (skipExtensionDeps && - ((Form_pg_depend) GETSTRUCT(tup))->deptype == DEPENDENCY_EXTENSION) + ((Form_pg_depend) GETSTRUCT(tup))->deptype == DEPENDENCY_EXTENSION) continue; simple_heap_delete(depRel, &tup->t_self); diff --git a/src/backend/catalog/pg_enum.c b/src/backend/catalog/pg_enum.c index e87a9311bd..08d8aa13f3 100644 --- a/src/backend/catalog/pg_enum.c +++ b/src/backend/catalog/pg_enum.c @@ -29,7 +29,7 @@ /* Potentially set by contrib/pg_upgrade_support functions */ -Oid binary_upgrade_next_pg_enum_oid = InvalidOid; +Oid binary_upgrade_next_pg_enum_oid = InvalidOid; static void RenumberEnumType(Relation pg_enum, HeapTuple *existing, int nelems); static int oid_cmp(const void *p1, const void *p2); @@ -58,9 +58,9 @@ EnumValuesCreate(Oid enumTypeOid, List *vals) num_elems = list_length(vals); /* - * We do not bother to check the list of values for duplicates --- if - * you have any, you'll get a less-than-friendly unique-index violation. - * It is probably not worth trying harder. + * We do not bother to check the list of values for duplicates --- if you + * have any, you'll get a less-than-friendly unique-index violation. It is + * probably not worth trying harder. */ pg_enum = heap_open(EnumRelationId, RowExclusiveLock); @@ -69,10 +69,9 @@ EnumValuesCreate(Oid enumTypeOid, List *vals) * Allocate OIDs for the enum's members. * * While this method does not absolutely guarantee that we generate no - * duplicate OIDs (since we haven't entered each oid into the table - * before allocating the next), trouble could only occur if the OID - * counter wraps all the way around before we finish. Which seems - * unlikely. + * duplicate OIDs (since we haven't entered each oid into the table before + * allocating the next), trouble could only occur if the OID counter wraps + * all the way around before we finish. Which seems unlikely. */ oids = (Oid *) palloc(num_elems * sizeof(Oid)); @@ -83,9 +82,10 @@ EnumValuesCreate(Oid enumTypeOid, List *vals) * tells the comparison functions the OIDs are in the correct sort * order and can be compared directly. */ - Oid new_oid; + Oid new_oid; - do { + do + { new_oid = GetNewOid(pg_enum); } while (new_oid & 1); oids[elemno] = new_oid; @@ -202,9 +202,9 @@ AddEnumLabel(Oid enumTypeOid, /* * Acquire a lock on the enum type, which we won't release until commit. * This ensures that two backends aren't concurrently modifying the same - * enum type. Without that, we couldn't be sure to get a consistent - * view of the enum members via the syscache. Note that this does not - * block other backends from inspecting the type; see comments for + * enum type. Without that, we couldn't be sure to get a consistent view + * of the enum members via the syscache. Note that this does not block + * other backends from inspecting the type; see comments for * RenumberEnumType. */ LockDatabaseObject(TypeRelationId, enumTypeOid, 0, ExclusiveLock); @@ -217,7 +217,7 @@ restart: /* Get the list of existing members of the enum */ list = SearchSysCacheList1(ENUMTYPOIDNAME, ObjectIdGetDatum(enumTypeOid)); - nelems = list->n_members; + nelems = list->n_members; /* Sort the existing members by enumsortorder */ existing = (HeapTuple *) palloc(nelems * sizeof(HeapTuple)); @@ -229,8 +229,8 @@ restart: if (neighbor == NULL) { /* - * Put the new label at the end of the list. - * No change to existing tuples is required. + * Put the new label at the end of the list. No change to existing + * tuples is required. */ if (nelems > 0) { @@ -244,10 +244,10 @@ restart: else { /* BEFORE or AFTER was specified */ - int nbr_index; - int other_nbr_index; - Form_pg_enum nbr_en; - Form_pg_enum other_nbr_en; + int nbr_index; + int other_nbr_index; + Form_pg_enum nbr_en; + Form_pg_enum other_nbr_en; /* Locate the neighbor element */ for (nbr_index = 0; nbr_index < nelems; nbr_index++) @@ -265,14 +265,14 @@ restart: nbr_en = (Form_pg_enum) GETSTRUCT(existing[nbr_index]); /* - * Attempt to assign an appropriate enumsortorder value: one less - * than the smallest member, one more than the largest member, - * or halfway between two existing members. + * Attempt to assign an appropriate enumsortorder value: one less than + * the smallest member, one more than the largest member, or halfway + * between two existing members. * * In the "halfway" case, because of the finite precision of float4, - * we might compute a value that's actually equal to one or the - * other of its neighbors. In that case we renumber the existing - * members and try again. + * we might compute a value that's actually equal to one or the other + * of its neighbors. In that case we renumber the existing members + * and try again. */ if (newValIsAfter) other_nbr_index = nbr_index + 1; @@ -291,10 +291,10 @@ restart: /* * On some machines, newelemorder may be in a register that's - * wider than float4. We need to force it to be rounded to - * float4 precision before making the following comparisons, - * or we'll get wrong results. (Such behavior violates the C - * standard, but fixing the compilers is out of our reach.) + * wider than float4. We need to force it to be rounded to float4 + * precision before making the following comparisons, or we'll get + * wrong results. (Such behavior violates the C standard, but + * fixing the compilers is out of our reach.) */ newelemorder = DatumGetFloat4(Float4GetDatum(newelemorder)); @@ -314,9 +314,9 @@ restart: if (OidIsValid(binary_upgrade_next_pg_enum_oid)) { /* - * Use binary-upgrade override for pg_enum.oid, if supplied. - * During binary upgrade, all pg_enum.oid's are set this way - * so they are guaranteed to be consistent. + * Use binary-upgrade override for pg_enum.oid, if supplied. During + * binary upgrade, all pg_enum.oid's are set this way so they are + * guaranteed to be consistent. */ if (neighbor != NULL) ereport(ERROR, @@ -337,7 +337,7 @@ restart: */ for (;;) { - bool sorts_ok; + bool sorts_ok; /* Get a new OID (different from all existing pg_enum tuples) */ newOid = GetNewOid(pg_enum); @@ -345,8 +345,8 @@ restart: /* * Detect whether it sorts correctly relative to existing * even-numbered labels of the enum. We can ignore existing - * labels with odd Oids, since a comparison involving one of - * those will not take the fast path anyway. + * labels with odd Oids, since a comparison involving one of those + * will not take the fast path anyway. */ sorts_ok = true; for (i = 0; i < nelems; i++) @@ -385,9 +385,9 @@ restart: break; /* - * If it's odd, and sorts OK, loop back to get another OID - * and try again. Probably, the next available even OID - * will sort correctly too, so it's worth trying. + * If it's odd, and sorts OK, loop back to get another OID and + * try again. Probably, the next available even OID will sort + * correctly too, so it's worth trying. */ } else @@ -435,7 +435,7 @@ restart: * We avoid doing this unless absolutely necessary; in most installations * it will never happen. The reason is that updating existing pg_enum * entries creates hazards for other backends that are concurrently reading - * pg_enum with SnapshotNow semantics. A concurrent SnapshotNow scan could + * pg_enum with SnapshotNow semantics. A concurrent SnapshotNow scan could * see both old and new versions of an updated row as valid, or neither of * them, if the commit happens between scanning the two versions. It's * also quite likely for a concurrent scan to see an inconsistent set of @@ -510,10 +510,10 @@ oid_cmp(const void *p1, const void *p2) static int sort_order_cmp(const void *p1, const void *p2) { - HeapTuple v1 = *((const HeapTuple *) p1); - HeapTuple v2 = *((const HeapTuple *) p2); - Form_pg_enum en1 = (Form_pg_enum) GETSTRUCT(v1); - Form_pg_enum en2 = (Form_pg_enum) GETSTRUCT(v2); + HeapTuple v1 = *((const HeapTuple *) p1); + HeapTuple v2 = *((const HeapTuple *) p2); + Form_pg_enum en1 = (Form_pg_enum) GETSTRUCT(v1); + Form_pg_enum en2 = (Form_pg_enum) GETSTRUCT(v2); if (en1->enumsortorder < en2->enumsortorder) return -1; diff --git a/src/backend/catalog/pg_proc.c b/src/backend/catalog/pg_proc.c index 6138165cc3..47a8ff4d98 100644 --- a/src/backend/catalog/pg_proc.c +++ b/src/backend/catalog/pg_proc.c @@ -842,8 +842,8 @@ fmgr_sql_validator(PG_FUNCTION_ARGS) if (!haspolyarg) { /* - * OK to do full precheck: analyze and rewrite the queries, - * then verify the result type. + * OK to do full precheck: analyze and rewrite the queries, then + * verify the result type. */ SQLFunctionParseInfoPtr pinfo; @@ -858,7 +858,7 @@ fmgr_sql_validator(PG_FUNCTION_ARGS) querytree_sublist = pg_analyze_and_rewrite_params(parsetree, prosrc, - (ParserSetupHook) sql_fn_parser_setup, + (ParserSetupHook) sql_fn_parser_setup, pinfo); querytree_list = list_concat(querytree_list, querytree_sublist); diff --git a/src/backend/catalog/pg_type.c b/src/backend/catalog/pg_type.c index 06301c075b..9e35e73f9c 100644 --- a/src/backend/catalog/pg_type.c +++ b/src/backend/catalog/pg_type.c @@ -115,7 +115,7 @@ TypeShellMake(const char *typeName, Oid typeNamespace, Oid ownerId) values[i++] = ObjectIdGetDatum(InvalidOid); /* typbasetype */ values[i++] = Int32GetDatum(-1); /* typtypmod */ values[i++] = Int32GetDatum(0); /* typndims */ - values[i++] = ObjectIdGetDatum(InvalidOid); /* typcollation */ + values[i++] = ObjectIdGetDatum(InvalidOid); /* typcollation */ nulls[i++] = true; /* typdefaultbin */ nulls[i++] = true; /* typdefault */ @@ -352,7 +352,7 @@ TypeCreate(Oid newTypeOid, values[i++] = ObjectIdGetDatum(baseType); /* typbasetype */ values[i++] = Int32GetDatum(typeMod); /* typtypmod */ values[i++] = Int32GetDatum(typNDims); /* typndims */ - values[i++] = ObjectIdGetDatum(typeCollation); /* typcollation */ + values[i++] = ObjectIdGetDatum(typeCollation); /* typcollation */ /* * initialize the default binary value for this type. Check for nulls of diff --git a/src/backend/catalog/storage.c b/src/backend/catalog/storage.c index 221f9f5c12..57987be2c0 100644 --- a/src/backend/catalog/storage.c +++ b/src/backend/catalog/storage.c @@ -119,7 +119,7 @@ RelationCreateStorage(RelFileNode rnode, char relpersistence) break; default: elog(ERROR, "invalid relpersistence: %c", relpersistence); - return; /* placate compiler */ + return; /* placate compiler */ } srel = smgropen(rnode, backend); @@ -379,7 +379,7 @@ smgrDoPendingDeletes(bool isCommit) * *ptr is set to point to a freshly-palloc'd array of RelFileNodes. * If there are no relations to be deleted, *ptr is set to NULL. * - * Only non-temporary relations are included in the returned list. This is OK + * Only non-temporary relations are included in the returned list. This is OK * because the list is used only in contexts where temporary relations don't * matter: we're either writing to the two-phase state file (and transactions * that have touched temp tables can't be prepared) or we're writing to xlog diff --git a/src/backend/catalog/toasting.c b/src/backend/catalog/toasting.c index 5d5496df98..452ca9bef0 100644 --- a/src/backend/catalog/toasting.c +++ b/src/backend/catalog/toasting.c @@ -279,7 +279,7 @@ create_toast_table(Relation rel, Oid toastOid, Oid toastIndexOid, Datum reloptio list_make2("chunk_id", "chunk_seq"), BTREE_AM_OID, rel->rd_rel->reltablespace, - collationObjectId, classObjectId, coloptions, (Datum) 0, + collationObjectId, classObjectId, coloptions, (Datum) 0, true, false, false, false, true, false, false); diff --git a/src/backend/commands/alter.c b/src/backend/commands/alter.c index 99fdd7dba3..215e21cae0 100644 --- a/src/backend/commands/alter.c +++ b/src/backend/commands/alter.c @@ -282,26 +282,26 @@ AlterObjectNamespace_oid(Oid classId, Oid objid, Oid nspOid) switch (getObjectClass(&dep)) { case OCLASS_CLASS: - { - Relation rel; - Relation classRel; + { + Relation rel; + Relation classRel; - rel = relation_open(objid, AccessExclusiveLock); - oldNspOid = RelationGetNamespace(rel); + rel = relation_open(objid, AccessExclusiveLock); + oldNspOid = RelationGetNamespace(rel); - classRel = heap_open(RelationRelationId, RowExclusiveLock); + classRel = heap_open(RelationRelationId, RowExclusiveLock); - AlterRelationNamespaceInternal(classRel, - objid, - oldNspOid, - nspOid, - true); + AlterRelationNamespaceInternal(classRel, + objid, + oldNspOid, + nspOid, + true); - heap_close(classRel, RowExclusiveLock); + heap_close(classRel, RowExclusiveLock); - relation_close(rel, NoLock); - break; - } + relation_close(rel, NoLock); + break; + } case OCLASS_PROC: oldNspOid = AlterFunctionNamespace_oid(objid, nspOid); @@ -386,9 +386,11 @@ AlterObjectNamespace(Relation rel, int oidCacheId, int nameCacheId, { Oid classId = RelationGetRelid(rel); Oid oldNspOid; - Datum name, namespace; - bool isnull; - HeapTuple tup, newtup; + Datum name, + namespace; + bool isnull; + HeapTuple tup, + newtup; Datum *values; bool *nulls; bool *replaces; @@ -410,7 +412,7 @@ AlterObjectNamespace(Relation rel, int oidCacheId, int nameCacheId, /* Permission checks ... superusers can always do it */ if (!superuser()) { - Datum owner; + Datum owner; Oid ownerId; AclResult aclresult; diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c index 774bb04471..dde301b89a 100644 --- a/src/backend/commands/analyze.c +++ b/src/backend/commands/analyze.c @@ -95,7 +95,7 @@ static void compute_index_stats(Relation onerel, double totalrows, HeapTuple *rows, int numrows, MemoryContext col_context); static VacAttrStats *examine_attribute(Relation onerel, int attnum, - Node *index_expr); + Node *index_expr); static int acquire_sample_rows(Relation onerel, HeapTuple *rows, int targrows, double *totalrows, double *totaldeadrows); static double random_fract(void); @@ -160,8 +160,8 @@ analyze_rel(Oid relid, VacuumStmt *vacstmt, if (IsAutoVacuumWorkerProcess() && Log_autovacuum_min_duration >= 0) ereport(LOG, (errcode(ERRCODE_LOCK_NOT_AVAILABLE), - errmsg("skipping analyze of \"%s\" --- lock not available", - vacstmt->relation->relname))); + errmsg("skipping analyze of \"%s\" --- lock not available", + vacstmt->relation->relname))); } if (!onerel) return; @@ -853,10 +853,10 @@ examine_attribute(Relation onerel, int attnum, Node *index_expr) /* * When analyzing an expression index, believe the expression tree's type * not the column datatype --- the latter might be the opckeytype storage - * type of the opclass, which is not interesting for our purposes. (Note: + * type of the opclass, which is not interesting for our purposes. (Note: * if we did anything with non-expression index columns, we'd need to * figure out where to get the correct type info from, but for now that's - * not a problem.) It's not clear whether anyone will care about the + * not a problem.) It's not clear whether anyone will care about the * typmod, but we store that too just in case. */ if (index_expr) diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c index 4c4f356e79..2cc2aaa8f6 100644 --- a/src/backend/commands/cluster.c +++ b/src/backend/commands/cluster.c @@ -718,7 +718,7 @@ copy_heap_data(Oid OIDNewHeap, Oid OIDOldHeap, Oid OIDOldIndex, TransactionId OldestXmin; TransactionId FreezeXid; RewriteState rwstate; - bool use_sort; + bool use_sort; Tuplesortstate *tuplesort; double num_tuples = 0, tups_vacuumed = 0, @@ -813,11 +813,11 @@ copy_heap_data(Oid OIDNewHeap, Oid OIDOldHeap, Oid OIDOldIndex, rwstate = begin_heap_rewrite(NewHeap, OldestXmin, FreezeXid, use_wal); /* - * Decide whether to use an indexscan or seqscan-and-optional-sort to - * scan the OldHeap. We know how to use a sort to duplicate the ordering - * of a btree index, and will use seqscan-and-sort for that case if the - * planner tells us it's cheaper. Otherwise, always indexscan if an - * index is provided, else plain seqscan. + * Decide whether to use an indexscan or seqscan-and-optional-sort to scan + * the OldHeap. We know how to use a sort to duplicate the ordering of a + * btree index, and will use seqscan-and-sort for that case if the planner + * tells us it's cheaper. Otherwise, always indexscan if an index is + * provided, else plain seqscan. */ if (OldIndex != NULL && OldIndex->rd_rel->relam == BTREE_AM_OID) use_sort = plan_cluster_use_sort(OIDOldHeap, OIDOldIndex); @@ -869,8 +869,8 @@ copy_heap_data(Oid OIDNewHeap, Oid OIDOldHeap, Oid OIDOldIndex, /* * Scan through the OldHeap, either in OldIndex order or sequentially; * copy each tuple into the NewHeap, or transiently to the tuplesort - * module. Note that we don't bother sorting dead tuples (they won't - * get to the new table anyway). + * module. Note that we don't bother sorting dead tuples (they won't get + * to the new table anyway). */ for (;;) { @@ -984,8 +984,8 @@ copy_heap_data(Oid OIDNewHeap, Oid OIDOldHeap, Oid OIDOldIndex, heap_endscan(heapScan); /* - * In scan-and-sort mode, complete the sort, then read out all live - * tuples from the tuplestore and write them to the new relation. + * In scan-and-sort mode, complete the sort, then read out all live tuples + * from the tuplestore and write them to the new relation. */ if (tuplesort != NULL) { @@ -1554,7 +1554,7 @@ reform_and_rewrite_tuple(HeapTuple tuple, bool newRelHasOids, RewriteState rwstate) { HeapTuple copiedTuple; - int i; + int i; heap_deform_tuple(tuple, oldTupDesc, values, isnull); diff --git a/src/backend/commands/collationcmds.c b/src/backend/commands/collationcmds.c index 2a6938fd04..7f8a108374 100644 --- a/src/backend/commands/collationcmds.c +++ b/src/backend/commands/collationcmds.c @@ -34,7 +34,7 @@ #include "utils/syscache.h" static void AlterCollationOwner_internal(Relation rel, Oid collationOid, - Oid newOwnerId); + Oid newOwnerId); /* * CREATE COLLATION @@ -46,10 +46,10 @@ DefineCollation(List *names, List *parameters) Oid collNamespace; AclResult aclresult; ListCell *pl; - DefElem *fromEl = NULL; - DefElem *localeEl = NULL; - DefElem *lccollateEl = NULL; - DefElem *lcctypeEl = NULL; + DefElem *fromEl = NULL; + DefElem *localeEl = NULL; + DefElem *lccollateEl = NULL; + DefElem *lcctypeEl = NULL; char *collcollate = NULL; char *collctype = NULL; Oid newoid; @@ -63,7 +63,7 @@ DefineCollation(List *names, List *parameters) foreach(pl, parameters) { - DefElem *defel = (DefElem *) lfirst(pl); + DefElem *defel = (DefElem *) lfirst(pl); DefElem **defelp; if (pg_strcasecmp(defel->defname, "from") == 0) @@ -97,7 +97,7 @@ DefineCollation(List *names, List *parameters) Oid collid; HeapTuple tp; - collid = get_collation_oid(defGetQualifiedName(fromEl), false); + collid = get_collation_oid(defGetQualifiedName(fromEl), false); tp = SearchSysCache1(COLLOID, ObjectIdGetDatum(collid)); if (!HeapTupleIsValid(tp)) elog(ERROR, "cache lookup failed for collation %u", collid); @@ -123,7 +123,7 @@ DefineCollation(List *names, List *parameters) if (!collcollate) ereport(ERROR, (errcode(ERRCODE_INVALID_OBJECT_DEFINITION), - errmsg("parameter \"lc_collate\" parameter must be specified"))); + errmsg("parameter \"lc_collate\" parameter must be specified"))); if (!collctype) ereport(ERROR, @@ -391,7 +391,7 @@ AlterCollationNamespace(List *name, const char *newschema) Oid AlterCollationNamespace_oid(Oid collOid, Oid newNspOid) { - Oid oldNspOid; + Oid oldNspOid; Relation rel; char *collation_name; diff --git a/src/backend/commands/comment.c b/src/backend/commands/comment.c index 3fbeefa018..d09bef0682 100644 --- a/src/backend/commands/comment.c +++ b/src/backend/commands/comment.c @@ -37,8 +37,8 @@ void CommentObject(CommentStmt *stmt) { - ObjectAddress address; - Relation relation; + ObjectAddress address; + Relation relation; /* * When loading a dump, we may see a COMMENT ON DATABASE for the old name @@ -46,12 +46,13 @@ CommentObject(CommentStmt *stmt) * (which is really pg_restore's fault, but for now we will work around * the problem here). Consensus is that the best fix is to treat wrong * database name as a WARNING not an ERROR; hence, the following special - * case. (If the length of stmt->objname is not 1, get_object_address will - * throw an error below; that's OK.) + * case. (If the length of stmt->objname is not 1, get_object_address + * will throw an error below; that's OK.) */ if (stmt->objtype == OBJECT_DATABASE && list_length(stmt->objname) == 1) { - char *database = strVal(linitial(stmt->objname)); + char *database = strVal(linitial(stmt->objname)); + if (!OidIsValid(get_database_oid(database, true))) { ereport(WARNING, @@ -62,10 +63,10 @@ CommentObject(CommentStmt *stmt) } /* - * Translate the parser representation that identifies this object into - * an ObjectAddress. get_object_address() will throw an error if the - * object does not exist, and will also acquire a lock on the target - * to guard against concurrent DROP operations. + * Translate the parser representation that identifies this object into an + * ObjectAddress. get_object_address() will throw an error if the object + * does not exist, and will also acquire a lock on the target to guard + * against concurrent DROP operations. */ address = get_object_address(stmt->objtype, stmt->objname, stmt->objargs, &relation, ShareUpdateExclusiveLock); @@ -78,6 +79,7 @@ CommentObject(CommentStmt *stmt) switch (stmt->objtype) { case OBJECT_COLUMN: + /* * Allow comments only on columns of tables, views, composite * types, and foreign tables (which are the only relkinds for diff --git a/src/backend/commands/conversioncmds.c b/src/backend/commands/conversioncmds.c index b5e4420ca8..2c1c6da900 100644 --- a/src/backend/commands/conversioncmds.c +++ b/src/backend/commands/conversioncmds.c @@ -335,7 +335,8 @@ AlterConversionOwner_internal(Relation rel, Oid conversionOid, Oid newOwnerId) void AlterConversionNamespace(List *name, const char *newschema) { - Oid convOid, nspOid; + Oid convOid, + nspOid; Relation rel; rel = heap_open(ConversionRelationId, RowExclusiveLock); @@ -361,7 +362,7 @@ AlterConversionNamespace(List *name, const char *newschema) Oid AlterConversionNamespace_oid(Oid convOid, Oid newNspOid) { - Oid oldNspOid; + Oid oldNspOid; Relation rel; rel = heap_open(ConversionRelationId, RowExclusiveLock); diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c index 3af0b09719..57429035e8 100644 --- a/src/backend/commands/copy.c +++ b/src/backend/commands/copy.c @@ -115,7 +115,7 @@ typedef struct CopyStateData char *quote; /* CSV quote char (must be 1 byte) */ char *escape; /* CSV escape char (must be 1 byte) */ List *force_quote; /* list of column names */ - bool force_quote_all; /* FORCE QUOTE *? */ + bool force_quote_all; /* FORCE QUOTE *? */ bool *force_quote_flags; /* per-column CSV FQ flags */ List *force_notnull; /* list of column names */ bool *force_notnull_flags; /* per-column CSV FNN flags */ @@ -161,8 +161,8 @@ typedef struct CopyStateData /* field raw data pointers found by COPY FROM */ - int max_fields; - char ** raw_fields; + int max_fields; + char **raw_fields; /* * Similarly, line_buf holds the whole input line being processed. The @@ -266,10 +266,10 @@ static const char BinarySignature[11] = "PGCOPY\n\377\r\n\0"; /* non-export function prototypes */ static CopyState BeginCopy(bool is_from, Relation rel, Node *raw_query, - const char *queryString, List *attnamelist, List *options); + const char *queryString, List *attnamelist, List *options); static void EndCopy(CopyState cstate); static CopyState BeginCopyTo(Relation rel, Node *query, const char *queryString, - const char *filename, List *attnamelist, List *options); + const char *filename, List *attnamelist, List *options); static void EndCopyTo(CopyState cstate); static uint64 DoCopyTo(CopyState cstate); static uint64 CopyTo(CopyState cstate); @@ -278,8 +278,8 @@ static void CopyOneRowTo(CopyState cstate, Oid tupleOid, static uint64 CopyFrom(CopyState cstate); static bool CopyReadLine(CopyState cstate); static bool CopyReadLineText(CopyState cstate); -static int CopyReadAttributesText(CopyState cstate); -static int CopyReadAttributesCSV(CopyState cstate); +static int CopyReadAttributesText(CopyState cstate); +static int CopyReadAttributesCSV(CopyState cstate); static Datum CopyReadBinaryAttribute(CopyState cstate, int column_no, FmgrInfo *flinfo, Oid typioparam, int32 typmod, @@ -748,17 +748,17 @@ DoCopy(const CopyStmt *stmt, const char *queryString) if (stmt->relation) { - TupleDesc tupDesc; - AclMode required_access = (is_from ? ACL_INSERT : ACL_SELECT); - RangeTblEntry *rte; - List *attnums; - ListCell *cur; + TupleDesc tupDesc; + AclMode required_access = (is_from ? ACL_INSERT : ACL_SELECT); + RangeTblEntry *rte; + List *attnums; + ListCell *cur; Assert(!stmt->query); /* Open and lock the relation, using the appropriate lock type. */ rel = heap_openrv(stmt->relation, - (is_from ? RowExclusiveLock : AccessShareLock)); + (is_from ? RowExclusiveLock : AccessShareLock)); rte = makeNode(RangeTblEntry); rte->rtekind = RTE_RELATION; @@ -770,8 +770,8 @@ DoCopy(const CopyStmt *stmt, const char *queryString) attnums = CopyGetAttnums(tupDesc, rel, stmt->attlist); foreach(cur, attnums) { - int attno = lfirst_int(cur) - - FirstLowInvalidHeapAttributeNumber; + int attno = lfirst_int(cur) - + FirstLowInvalidHeapAttributeNumber; if (is_from) rte->modifiedCols = bms_add_member(rte->modifiedCols, attno); @@ -1136,8 +1136,8 @@ BeginCopy(bool is_from, cstate = (CopyStateData *) palloc0(sizeof(CopyStateData)); /* - * We allocate everything used by a cstate in a new memory context. - * This avoids memory leaks during repeated use of COPY in a query. + * We allocate everything used by a cstate in a new memory context. This + * avoids memory leaks during repeated use of COPY in a query. */ cstate->copycontext = AllocSetContextCreate(CurrentMemoryContext, "COPY", @@ -1300,9 +1300,9 @@ BeginCopy(bool is_from, cstate->file_encoding = pg_get_client_encoding(); /* - * Set up encoding conversion info. Even if the file and server - * encodings are the same, we must apply pg_any_to_server() to validate - * data in multibyte encodings. + * Set up encoding conversion info. Even if the file and server encodings + * are the same, we must apply pg_any_to_server() to validate data in + * multibyte encodings. */ cstate->need_transcoding = (cstate->file_encoding != GetDatabaseEncoding() || @@ -1552,8 +1552,8 @@ CopyTo(CopyState cstate) */ if (cstate->need_transcoding) cstate->null_print_client = pg_server_to_any(cstate->null_print, - cstate->null_print_len, - cstate->file_encoding); + cstate->null_print_len, + cstate->file_encoding); /* if a header has been requested send the line */ if (cstate->header_line) @@ -2001,9 +2001,9 @@ CopyFrom(CopyState cstate) { slot = ExecBRInsertTriggers(estate, resultRelInfo, slot); - if (slot == NULL) /* "do nothing" */ + if (slot == NULL) /* "do nothing" */ skip_tuple = true; - else /* trigger might have changed tuple */ + else /* trigger might have changed tuple */ tuple = ExecMaterializeSlot(slot); } @@ -2159,7 +2159,7 @@ BeginCopyFrom(Relation rel, { /* Initialize expressions in copycontext. */ defexprs[num_defaults] = ExecInitExpr( - expression_planner((Expr *) defexpr), NULL); + expression_planner((Expr *) defexpr), NULL); defmap[num_defaults] = attnum - 1; num_defaults++; } @@ -2255,7 +2255,7 @@ BeginCopyFrom(Relation rel, if (!cstate->binary) { AttrNumber attr_count = list_length(cstate->attnumlist); - int nfields = cstate->file_has_oids ? (attr_count + 1) : attr_count; + int nfields = cstate->file_has_oids ? (attr_count + 1) : attr_count; cstate->max_fields = nfields; cstate->raw_fields = (char **) palloc(nfields * sizeof(char *)); @@ -2291,7 +2291,7 @@ NextCopyFromRawFields(CopyState cstate, char ***fields, int *nfields) { cstate->cur_lineno++; if (CopyReadLine(cstate)) - return false; /* done */ + return false; /* done */ } cstate->cur_lineno++; @@ -2300,9 +2300,9 @@ NextCopyFromRawFields(CopyState cstate, char ***fields, int *nfields) done = CopyReadLine(cstate); /* - * EOF at start of line means we're done. If we see EOF after - * some characters, we act as though it was newline followed by - * EOF, ie, process the line and then exit loop on next iteration. + * EOF at start of line means we're done. If we see EOF after some + * characters, we act as though it was newline followed by EOF, ie, + * process the line and then exit loop on next iteration. */ if (done && cstate->line_buf.len == 0) return false; @@ -2341,7 +2341,7 @@ NextCopyFrom(CopyState cstate, ExprContext *econtext, FmgrInfo *in_functions = cstate->in_functions; Oid *typioparams = cstate->typioparams; int i; - int nfields; + int nfields; bool isnull; bool file_has_oids = cstate->file_has_oids; int *defmap = cstate->defmap; @@ -2456,18 +2456,18 @@ NextCopyFrom(CopyState cstate, ExprContext *econtext, if (fld_count == -1) { /* - * Received EOF marker. In a V3-protocol copy, wait for - * the protocol-level EOF, and complain if it doesn't come - * immediately. This ensures that we correctly handle - * CopyFail, if client chooses to send that now. + * Received EOF marker. In a V3-protocol copy, wait for the + * protocol-level EOF, and complain if it doesn't come + * immediately. This ensures that we correctly handle CopyFail, + * if client chooses to send that now. * - * Note that we MUST NOT try to read more data in an - * old-protocol copy, since there is no protocol-level EOF - * marker then. We could go either way for copy from file, - * but choose to throw error if there's data after the EOF - * marker, for consistency with the new-protocol case. + * Note that we MUST NOT try to read more data in an old-protocol + * copy, since there is no protocol-level EOF marker then. We + * could go either way for copy from file, but choose to throw + * error if there's data after the EOF marker, for consistency + * with the new-protocol case. */ - char dummy; + char dummy; if (cstate->copy_dest != COPY_OLD_FE && CopyGetData(cstate, &dummy, 1, 1) > 0) @@ -2485,14 +2485,14 @@ NextCopyFrom(CopyState cstate, ExprContext *econtext, if (file_has_oids) { - Oid loaded_oid; + Oid loaded_oid; cstate->cur_attname = "oid"; loaded_oid = DatumGetObjectId(CopyReadBinaryAttribute(cstate, 0, - &cstate->oid_in_function, - cstate->oid_typioparam, + &cstate->oid_in_function, + cstate->oid_typioparam, -1, &isnull)); if (isnull || loaded_oid == InvalidOid) @@ -2524,8 +2524,8 @@ NextCopyFrom(CopyState cstate, ExprContext *econtext, /* * Now compute and insert any defaults available for the columns not - * provided by the input data. Anything not processed here or above - * will remain NULL. + * provided by the input data. Anything not processed here or above will + * remain NULL. */ for (i = 0; i < num_defaults; i++) { @@ -3023,12 +3023,12 @@ GetDecimalFromHex(char hex) * performing de-escaping as needed. * * The input is in line_buf. We use attribute_buf to hold the result - * strings. cstate->raw_fields[k] is set to point to the k'th attribute - * string, or NULL when the input matches the null marker string. + * strings. cstate->raw_fields[k] is set to point to the k'th attribute + * string, or NULL when the input matches the null marker string. * This array is expanded as necessary. * - * (Note that the caller cannot check for nulls since the returned - * string would be the post-de-escaping equivalent, which may look + * (Note that the caller cannot check for nulls since the returned + * string would be the post-de-escaping equivalent, which may look * the same as some valid data string.) * * delim is the column delimiter string (must be just one byte for now). @@ -3090,8 +3090,8 @@ CopyReadAttributesText(CopyState cstate) if (fieldno >= cstate->max_fields) { cstate->max_fields *= 2; - cstate->raw_fields = - repalloc(cstate->raw_fields, cstate->max_fields*sizeof(char *)); + cstate->raw_fields = + repalloc(cstate->raw_fields, cstate->max_fields * sizeof(char *)); } /* Remember start of field on both input and output sides */ @@ -3307,8 +3307,8 @@ CopyReadAttributesCSV(CopyState cstate) if (fieldno >= cstate->max_fields) { cstate->max_fields *= 2; - cstate->raw_fields = - repalloc(cstate->raw_fields, cstate->max_fields*sizeof(char *)); + cstate->raw_fields = + repalloc(cstate->raw_fields, cstate->max_fields * sizeof(char *)); } /* Remember start of field on both input and output sides */ diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c index 87d9e545b4..f319eb539c 100644 --- a/src/backend/commands/dbcommands.c +++ b/src/backend/commands/dbcommands.c @@ -680,8 +680,8 @@ createdb(const CreatedbStmt *stmt) void check_encoding_locale_matches(int encoding, const char *collate, const char *ctype) { - int ctype_encoding = pg_get_encoding_from_locale(ctype, true); - int collate_encoding = pg_get_encoding_from_locale(collate, true); + int ctype_encoding = pg_get_encoding_from_locale(ctype, true); + int collate_encoding = pg_get_encoding_from_locale(collate, true); if (!(ctype_encoding == encoding || ctype_encoding == PG_SQL_ASCII || @@ -1849,10 +1849,10 @@ get_database_oid(const char *dbname, bool missing_ok) heap_close(pg_database, AccessShareLock); if (!OidIsValid(oid) && !missing_ok) - ereport(ERROR, - (errcode(ERRCODE_UNDEFINED_DATABASE), - errmsg("database \"%s\" does not exist", - dbname))); + ereport(ERROR, + (errcode(ERRCODE_UNDEFINED_DATABASE), + errmsg("database \"%s\" does not exist", + dbname))); return oid; } diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c index 1d9586f07d..7a361585bd 100644 --- a/src/backend/commands/explain.c +++ b/src/backend/commands/explain.c @@ -59,26 +59,26 @@ static void ExplainNode(PlanState *planstate, List *ancestors, const char *relationship, const char *plan_name, ExplainState *es); static void show_plan_tlist(PlanState *planstate, List *ancestors, - ExplainState *es); + ExplainState *es); static void show_expression(Node *node, const char *qlabel, PlanState *planstate, List *ancestors, bool useprefix, ExplainState *es); static void show_qual(List *qual, const char *qlabel, - PlanState *planstate, List *ancestors, - bool useprefix, ExplainState *es); + PlanState *planstate, List *ancestors, + bool useprefix, ExplainState *es); static void show_scan_qual(List *qual, const char *qlabel, - PlanState *planstate, List *ancestors, - ExplainState *es); + PlanState *planstate, List *ancestors, + ExplainState *es); static void show_upper_qual(List *qual, const char *qlabel, - PlanState *planstate, List *ancestors, - ExplainState *es); + PlanState *planstate, List *ancestors, + ExplainState *es); static void show_sort_keys(SortState *sortstate, List *ancestors, - ExplainState *es); + ExplainState *es); static void show_merge_append_keys(MergeAppendState *mstate, List *ancestors, - ExplainState *es); + ExplainState *es); static void show_sort_keys_common(PlanState *planstate, - int nkeys, AttrNumber *keycols, - List *ancestors, ExplainState *es); + int nkeys, AttrNumber *keycols, + List *ancestors, ExplainState *es); static void show_sort_info(SortState *sortstate, ExplainState *es); static void show_hash_info(HashState *hashstate, ExplainState *es); static void show_foreignscan_info(ForeignScanState *fsstate, ExplainState *es); @@ -89,7 +89,7 @@ static void ExplainTargetRel(Plan *plan, Index rti, ExplainState *es); static void ExplainMemberNodes(List *plans, PlanState **planstates, List *ancestors, ExplainState *es); static void ExplainSubPlans(List *plans, List *ancestors, - const char *relationship, ExplainState *es); + const char *relationship, ExplainState *es); static void ExplainProperty(const char *qlabel, const char *value, bool numeric, ExplainState *es); static void ExplainOpenGroup(const char *objtype, const char *labelname, @@ -1358,7 +1358,7 @@ show_scan_qual(List *qual, const char *qlabel, { bool useprefix; - useprefix = (IsA(planstate->plan, SubqueryScan) || es->verbose); + useprefix = (IsA(planstate->plan, SubqueryScan) ||es->verbose); show_qual(qual, qlabel, planstate, ancestors, useprefix, es); } diff --git a/src/backend/commands/extension.c b/src/backend/commands/extension.c index 7c3e8107de..d848926ae5 100644 --- a/src/backend/commands/extension.c +++ b/src/backend/commands/extension.c @@ -56,8 +56,8 @@ /* Globally visible state variables */ -bool creating_extension = false; -Oid CurrentExtensionObject = InvalidOid; +bool creating_extension = false; +Oid CurrentExtensionObject = InvalidOid; /* * Internal data structure to hold the results of parsing a control file @@ -66,8 +66,8 @@ typedef struct ExtensionControlFile { char *name; /* name of the extension */ char *directory; /* directory for script files */ - char *default_version; /* default install target version, if any */ - char *module_pathname; /* string to substitute for MODULE_PATHNAME */ + char *default_version; /* default install target version, if any */ + char *module_pathname; /* string to substitute for MODULE_PATHNAME */ char *comment; /* comment, if any */ char *schema; /* target schema (allowed if !relocatable) */ bool relocatable; /* is ALTER EXTENSION SET SCHEMA supported? */ @@ -85,9 +85,9 @@ typedef struct ExtensionVersionInfo List *reachable; /* List of ExtensionVersionInfo's */ bool installable; /* does this version have an install script? */ /* working state for Dijkstra's algorithm: */ - bool distance_known; /* is distance from start known yet? */ + bool distance_known; /* is distance from start known yet? */ int distance; /* current worst-case distance estimate */ - struct ExtensionVersionInfo *previous; /* current best predecessor */ + struct ExtensionVersionInfo *previous; /* current best predecessor */ } ExtensionVersionInfo; /* Local functions */ @@ -107,7 +107,7 @@ static void ApplyExtensionUpdates(Oid extensionOid, /* * get_extension_oid - given an extension name, look up the OID * - * If missing_ok is false, throw an error if extension name not found. If + * If missing_ok is false, throw an error if extension name not found. If * true, just return InvalidOid. */ Oid @@ -142,10 +142,10 @@ get_extension_oid(const char *extname, bool missing_ok) heap_close(rel, AccessShareLock); if (!OidIsValid(result) && !missing_ok) - ereport(ERROR, - (errcode(ERRCODE_UNDEFINED_OBJECT), - errmsg("extension \"%s\" does not exist", - extname))); + ereport(ERROR, + (errcode(ERRCODE_UNDEFINED_OBJECT), + errmsg("extension \"%s\" does not exist", + extname))); return result; } @@ -237,8 +237,8 @@ check_valid_extension_name(const char *extensionname) int namelen = strlen(extensionname); /* - * Disallow empty names (the parser rejects empty identifiers anyway, - * but let's check). + * Disallow empty names (the parser rejects empty identifiers anyway, but + * let's check). */ if (namelen == 0) ereport(ERROR, @@ -256,16 +256,16 @@ check_valid_extension_name(const char *extensionname) errdetail("Extension names must not contain \"--\"."))); /* - * No leading or trailing dash either. (We could probably allow this, - * but it would require much care in filename parsing and would make - * filenames visually if not formally ambiguous. Since there's no - * real-world use case, let's just forbid it.) + * No leading or trailing dash either. (We could probably allow this, but + * it would require much care in filename parsing and would make filenames + * visually if not formally ambiguous. Since there's no real-world use + * case, let's just forbid it.) */ if (extensionname[0] == '-' || extensionname[namelen - 1] == '-') ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), errmsg("invalid extension name: \"%s\"", extensionname), - errdetail("Extension names must not begin or end with \"-\"."))); + errdetail("Extension names must not begin or end with \"-\"."))); /* * No directory separators either (this is sufficient to prevent ".." @@ -290,7 +290,7 @@ check_valid_version_name(const char *versionname) if (namelen == 0) ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("invalid extension version name: \"%s\"", versionname), + errmsg("invalid extension version name: \"%s\"", versionname), errdetail("Version names must not be empty."))); /* @@ -299,7 +299,7 @@ check_valid_version_name(const char *versionname) if (strstr(versionname, "--")) ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("invalid extension version name: \"%s\"", versionname), + errmsg("invalid extension version name: \"%s\"", versionname), errdetail("Version names must not contain \"--\"."))); /* @@ -308,8 +308,8 @@ check_valid_version_name(const char *versionname) if (versionname[0] == '-' || versionname[namelen - 1] == '-') ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("invalid extension version name: \"%s\"", versionname), - errdetail("Version names must not begin or end with \"-\"."))); + errmsg("invalid extension version name: \"%s\"", versionname), + errdetail("Version names must not begin or end with \"-\"."))); /* * No directory separators either (this is sufficient to prevent ".." @@ -318,7 +318,7 @@ check_valid_version_name(const char *versionname) if (first_dir_separator(versionname) != NULL) ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("invalid extension version name: \"%s\"", versionname), + errmsg("invalid extension version name: \"%s\"", versionname), errdetail("Version names must not contain directory separator characters."))); } @@ -386,7 +386,7 @@ get_extension_script_directory(ExtensionControlFile *control) get_share_path(my_exec_path, sharepath); result = (char *) palloc(MAXPGPATH); - snprintf(result, MAXPGPATH, "%s/%s", sharepath, control->directory); + snprintf(result, MAXPGPATH, "%s/%s", sharepath, control->directory); return result; } @@ -434,7 +434,7 @@ get_extension_script_filename(ExtensionControlFile *control, /* * Parse contents of primary or auxiliary control file, and fill in - * fields of *control. We parse primary file if version == NULL, + * fields of *control. We parse primary file if version == NULL, * else the optional auxiliary file for that version. * * Control files are supposed to be very short, half a dozen lines, @@ -448,8 +448,8 @@ parse_extension_control_file(ExtensionControlFile *control, char *filename; FILE *file; ConfigVariable *item, - *head = NULL, - *tail = NULL; + *head = NULL, + *tail = NULL; /* * Locate the file to read. Auxiliary files are optional. @@ -553,8 +553,8 @@ parse_extension_control_file(ExtensionControlFile *control, /* syntax error in name list */ ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("parameter \"%s\" must be a list of extension names", - item->name))); + errmsg("parameter \"%s\" must be a list of extension names", + item->name))); } } else @@ -632,12 +632,12 @@ static char * read_extension_script_file(const ExtensionControlFile *control, const char *filename) { - int src_encoding; - int dest_encoding = GetDatabaseEncoding(); - bytea *content; + int src_encoding; + int dest_encoding = GetDatabaseEncoding(); + bytea *content; char *src_str; - char *dest_str; - int len; + char *dest_str; + int len; content = read_binary_file(filename, 0, -1); @@ -675,7 +675,7 @@ read_extension_script_file(const ExtensionControlFile *control, * filename is used only to report errors. * * Note: it's tempting to just use SPI to execute the string, but that does - * not work very well. The really serious problem is that SPI will parse, + * not work very well. The really serious problem is that SPI will parse, * analyze, and plan the whole string before executing any of it; of course * this fails if there are any plannable statements referring to objects * created earlier in the script. A lesser annoyance is that SPI insists @@ -774,7 +774,7 @@ execute_extension_script(Oid extensionOid, ExtensionControlFile *control, List *requiredSchemas, const char *schemaName, Oid schemaOid) { - char *filename; + char *filename; char *save_client_min_messages, *save_log_min_messages, *save_search_path; @@ -809,8 +809,8 @@ execute_extension_script(Oid extensionOid, ExtensionControlFile *control, * so that we won't spam the user with useless NOTICE messages from common * script actions like creating shell types. * - * We use the equivalent of SET LOCAL to ensure the setting is undone - * upon error. + * We use the equivalent of SET LOCAL to ensure the setting is undone upon + * error. */ save_client_min_messages = pstrdup(GetConfigOption("client_min_messages", false)); @@ -832,8 +832,8 @@ execute_extension_script(Oid extensionOid, ExtensionControlFile *control, * makes the target schema be the default creation target namespace. * * Note: it might look tempting to use PushOverrideSearchPath for this, - * but we cannot do that. We have to actually set the search_path GUC - * in case the extension script examines or changes it. + * but we cannot do that. We have to actually set the search_path GUC in + * case the extension script examines or changes it. */ save_search_path = pstrdup(GetConfigOption("search_path", false)); @@ -855,32 +855,32 @@ execute_extension_script(Oid extensionOid, ExtensionControlFile *control, /* * Set creating_extension and related variables so that * recordDependencyOnCurrentExtension and other functions do the right - * things. On failure, ensure we reset these variables. + * things. On failure, ensure we reset these variables. */ creating_extension = true; CurrentExtensionObject = extensionOid; PG_TRY(); { - char *sql = read_extension_script_file(control, filename); + char *sql = read_extension_script_file(control, filename); /* * If it's not relocatable, substitute the target schema name for * occcurrences of @extschema@. * - * For a relocatable extension, we just run the script as-is. - * There cannot be any need for @extschema@, else it wouldn't - * be relocatable. + * For a relocatable extension, we just run the script as-is. There + * cannot be any need for @extschema@, else it wouldn't be + * relocatable. */ if (!control->relocatable) { - const char *qSchemaName = quote_identifier(schemaName); + const char *qSchemaName = quote_identifier(schemaName); sql = text_to_cstring( - DatumGetTextPP( - DirectFunctionCall3(replace_text, - CStringGetTextDatum(sql), - CStringGetTextDatum("@extschema@"), - CStringGetTextDatum(qSchemaName)))); + DatumGetTextPP( + DirectFunctionCall3(replace_text, + CStringGetTextDatum(sql), + CStringGetTextDatum("@extschema@"), + CStringGetTextDatum(qSchemaName)))); } /* @@ -890,11 +890,11 @@ execute_extension_script(Oid extensionOid, ExtensionControlFile *control, if (control->module_pathname) { sql = text_to_cstring( - DatumGetTextPP( - DirectFunctionCall3(replace_text, - CStringGetTextDatum(sql), - CStringGetTextDatum("MODULE_PATHNAME"), - CStringGetTextDatum(control->module_pathname)))); + DatumGetTextPP( + DirectFunctionCall3(replace_text, + CStringGetTextDatum(sql), + CStringGetTextDatum("MODULE_PATHNAME"), + CStringGetTextDatum(control->module_pathname)))); } execute_sql_string(sql, filename); @@ -1004,7 +1004,7 @@ get_ext_ver_list(ExtensionControlFile *control) struct dirent *de; location = get_extension_script_directory(control); - dir = AllocateDir(location); + dir = AllocateDir(location); while ((de = ReadDir(dir, location)) != NULL) { char *vername; @@ -1094,7 +1094,7 @@ identify_update_path(ExtensionControlFile *control, * is still good. * * Result is a List of names of versions to transition through (the initial - * version is *not* included). Returns NIL if no such path. + * version is *not* included). Returns NIL if no such path. */ static List * find_update_path(List *evi_list, @@ -1132,7 +1132,7 @@ find_update_path(List *evi_list, foreach(lc, evi->reachable) { ExtensionVersionInfo *evi2 = (ExtensionVersionInfo *) lfirst(lc); - int newdist; + int newdist; newdist = evi->distance + 1; if (newdist < evi2->distance) @@ -1178,10 +1178,10 @@ CreateExtension(CreateExtensionStmt *stmt) DefElem *d_schema = NULL; DefElem *d_new_version = NULL; DefElem *d_old_version = NULL; - char *schemaName; + char *schemaName; Oid schemaOid; - char *versionName; - char *oldVersionName; + char *versionName; + char *oldVersionName; Oid extowner = GetUserId(); ExtensionControlFile *pcontrol; ExtensionControlFile *control; @@ -1195,10 +1195,10 @@ CreateExtension(CreateExtensionStmt *stmt) check_valid_extension_name(stmt->extname); /* - * Check for duplicate extension name. The unique index on + * Check for duplicate extension name. The unique index on * pg_extension.extname would catch this anyway, and serves as a backstop - * in case of race conditions; but this is a friendlier error message, - * and besides we need a check to support IF NOT EXISTS. + * in case of race conditions; but this is a friendlier error message, and + * besides we need a check to support IF NOT EXISTS. */ if (get_extension_oid(stmt->extname, true) != InvalidOid) { @@ -1218,8 +1218,8 @@ CreateExtension(CreateExtensionStmt *stmt) } /* - * We use global variables to track the extension being created, so we - * can create only one extension at the same time. + * We use global variables to track the extension being created, so we can + * create only one extension at the same time. */ if (creating_extension) ereport(ERROR, @@ -1306,8 +1306,8 @@ CreateExtension(CreateExtensionStmt *stmt) if (list_length(updateVersions) == 1) { /* - * Simple case where there's just one update script to run. - * We will not need any follow-on update steps. + * Simple case where there's just one update script to run. We + * will not need any follow-on update steps. */ Assert(strcmp((char *) linitial(updateVersions), versionName) == 0); updateVersions = NIL; @@ -1351,9 +1351,9 @@ CreateExtension(CreateExtensionStmt *stmt) strcmp(control->schema, schemaName) != 0) ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("extension \"%s\" must be installed in schema \"%s\"", - control->name, - control->schema))); + errmsg("extension \"%s\" must be installed in schema \"%s\"", + control->name, + control->schema))); /* If the user is giving us the schema name, it must exist already */ schemaOid = get_namespace_oid(schemaName, false); @@ -1362,7 +1362,7 @@ CreateExtension(CreateExtensionStmt *stmt) { /* * The extension is not relocatable and the author gave us a schema - * for it. We create the schema here if it does not already exist. + * for it. We create the schema here if it does not already exist. */ schemaName = control->schema; schemaOid = get_namespace_oid(schemaName, true); @@ -1380,13 +1380,13 @@ CreateExtension(CreateExtensionStmt *stmt) * Else, use the current default creation namespace, which is the * first explicit entry in the search_path. */ - List *search_path = fetch_search_path(false); + List *search_path = fetch_search_path(false); - if (search_path == NIL) /* probably can't happen */ + if (search_path == NIL) /* probably can't happen */ elog(ERROR, "there is no default creation target"); schemaOid = linitial_oid(search_path); schemaName = get_namespace_name(schemaOid); - if (schemaName == NULL) /* recently-deleted namespace? */ + if (schemaName == NULL) /* recently-deleted namespace? */ elog(ERROR, "there is no default creation target"); list_free(search_path); @@ -1397,13 +1397,13 @@ CreateExtension(CreateExtensionStmt *stmt) * extension script actually creates any objects there, it will fail if * the user doesn't have such permissions. But there are cases such as * procedural languages where it's convenient to set schema = pg_catalog - * yet we don't want to restrict the command to users with ACL_CREATE - * for pg_catalog. + * yet we don't want to restrict the command to users with ACL_CREATE for + * pg_catalog. */ /* - * Look up the prerequisite extensions, and build lists of their OIDs - * and the OIDs of their target schemas. + * Look up the prerequisite extensions, and build lists of their OIDs and + * the OIDs of their target schemas. */ requiredExtensions = NIL; requiredSchemas = NIL; @@ -1453,8 +1453,8 @@ CreateExtension(CreateExtensionStmt *stmt) schemaName, schemaOid); /* - * If additional update scripts have to be executed, apply the updates - * as though a series of ALTER EXTENSION UPDATE commands were given + * If additional update scripts have to be executed, apply the updates as + * though a series of ALTER EXTENSION UPDATE commands were given */ ApplyExtensionUpdates(extensionOid, pcontrol, versionName, updateVersions); @@ -1653,7 +1653,7 @@ RemoveExtensionById(Oid extId) /* * This function lists the available extensions (one row per primary control - * file in the control directory). We parse each control file and report the + * file in the control directory). We parse each control file and report the * interesting fields. * * The system view pg_available_extensions provides a user interface to this @@ -1663,14 +1663,14 @@ RemoveExtensionById(Oid extId) Datum pg_available_extensions(PG_FUNCTION_ARGS) { - ReturnSetInfo *rsinfo = (ReturnSetInfo *) fcinfo->resultinfo; - TupleDesc tupdesc; - Tuplestorestate *tupstore; - MemoryContext per_query_ctx; - MemoryContext oldcontext; - char *location; - DIR *dir; - struct dirent *de; + ReturnSetInfo *rsinfo = (ReturnSetInfo *) fcinfo->resultinfo; + TupleDesc tupdesc; + Tuplestorestate *tupstore; + MemoryContext per_query_ctx; + MemoryContext oldcontext; + char *location; + DIR *dir; + struct dirent *de; /* check to see if caller supports us returning a tuplestore */ if (rsinfo == NULL || !IsA(rsinfo, ReturnSetInfo)) @@ -1699,11 +1699,11 @@ pg_available_extensions(PG_FUNCTION_ARGS) MemoryContextSwitchTo(oldcontext); location = get_extension_control_directory(); - dir = AllocateDir(location); + dir = AllocateDir(location); /* - * If the control directory doesn't exist, we want to silently return - * an empty set. Any other error will be reported by ReadDir. + * If the control directory doesn't exist, we want to silently return an + * empty set. Any other error will be reported by ReadDir. */ if (dir == NULL && errno == ENOENT) { @@ -1762,7 +1762,7 @@ pg_available_extensions(PG_FUNCTION_ARGS) /* * This function lists the available extension versions (one row per - * extension installation script). For each version, we parse the related + * extension installation script). For each version, we parse the related * control file(s) and report the interesting fields. * * The system view pg_available_extension_versions provides a user interface @@ -1772,14 +1772,14 @@ pg_available_extensions(PG_FUNCTION_ARGS) Datum pg_available_extension_versions(PG_FUNCTION_ARGS) { - ReturnSetInfo *rsinfo = (ReturnSetInfo *) fcinfo->resultinfo; - TupleDesc tupdesc; - Tuplestorestate *tupstore; - MemoryContext per_query_ctx; - MemoryContext oldcontext; - char *location; - DIR *dir; - struct dirent *de; + ReturnSetInfo *rsinfo = (ReturnSetInfo *) fcinfo->resultinfo; + TupleDesc tupdesc; + Tuplestorestate *tupstore; + MemoryContext per_query_ctx; + MemoryContext oldcontext; + char *location; + DIR *dir; + struct dirent *de; /* check to see if caller supports us returning a tuplestore */ if (rsinfo == NULL || !IsA(rsinfo, ReturnSetInfo)) @@ -1808,11 +1808,11 @@ pg_available_extension_versions(PG_FUNCTION_ARGS) MemoryContextSwitchTo(oldcontext); location = get_extension_control_directory(); - dir = AllocateDir(location); + dir = AllocateDir(location); /* - * If the control directory doesn't exist, we want to silently return - * an empty set. Any other error will be reported by ReadDir. + * If the control directory doesn't exist, we want to silently return an + * empty set. Any other error will be reported by ReadDir. */ if (dir == NULL && errno == ENOENT) { @@ -1867,7 +1867,7 @@ get_available_versions_for_extension(ExtensionControlFile *pcontrol, struct dirent *de; location = get_extension_script_directory(pcontrol); - dir = AllocateDir(location); + dir = AllocateDir(location); /* Note this will fail if script directory doesn't exist */ while ((de = ReadDir(dir, location)) != NULL) { @@ -1962,11 +1962,11 @@ Datum pg_extension_update_paths(PG_FUNCTION_ARGS) { Name extname = PG_GETARG_NAME(0); - ReturnSetInfo *rsinfo = (ReturnSetInfo *) fcinfo->resultinfo; - TupleDesc tupdesc; - Tuplestorestate *tupstore; - MemoryContext per_query_ctx; - MemoryContext oldcontext; + ReturnSetInfo *rsinfo = (ReturnSetInfo *) fcinfo->resultinfo; + TupleDesc tupdesc; + Tuplestorestate *tupstore; + MemoryContext per_query_ctx; + MemoryContext oldcontext; List *evi_list; ExtensionControlFile *control; ListCell *lc1; @@ -2079,8 +2079,8 @@ pg_extension_config_dump(PG_FUNCTION_ARGS) text *wherecond = PG_GETARG_TEXT_P(1); char *tablename; Relation extRel; - ScanKeyData key[1]; - SysScanDesc extScan; + ScanKeyData key[1]; + SysScanDesc extScan; HeapTuple extTup; Datum arrayDatum; Datum elementDatum; @@ -2092,8 +2092,8 @@ pg_extension_config_dump(PG_FUNCTION_ARGS) ArrayType *a; /* - * We only allow this to be called from an extension's SQL script. - * We shouldn't need any permissions check beyond that. + * We only allow this to be called from an extension's SQL script. We + * shouldn't need any permissions check beyond that. */ if (!creating_extension) ereport(ERROR, @@ -2103,8 +2103,8 @@ pg_extension_config_dump(PG_FUNCTION_ARGS) /* * Check that the table exists and is a member of the extension being - * created. This ensures that we don't need to register a dependency - * to protect the extconfig entry. + * created. This ensures that we don't need to register a dependency to + * protect the extconfig entry. */ tablename = get_rel_name(tableoid); if (tablename == NULL) @@ -2115,12 +2115,12 @@ pg_extension_config_dump(PG_FUNCTION_ARGS) CurrentExtensionObject) ereport(ERROR, (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE), - errmsg("table \"%s\" is not a member of the extension being created", - tablename))); + errmsg("table \"%s\" is not a member of the extension being created", + tablename))); /* - * Add the table OID and WHERE condition to the extension's extconfig - * and extcondition arrays. + * Add the table OID and WHERE condition to the extension's extconfig and + * extcondition arrays. */ /* Find the pg_extension tuple */ @@ -2136,7 +2136,7 @@ pg_extension_config_dump(PG_FUNCTION_ARGS) extTup = systable_getnext(extScan); - if (!HeapTupleIsValid(extTup)) /* should not happen */ + if (!HeapTupleIsValid(extTup)) /* should not happen */ elog(ERROR, "extension with oid %u does not exist", CurrentExtensionObject); @@ -2162,7 +2162,7 @@ pg_extension_config_dump(PG_FUNCTION_ARGS) Assert(ARR_NDIM(a) == 1); Assert(ARR_LBOUND(a)[0] == 1); - arrayIndex = ARR_DIMS(a)[0] + 1; /* add after end */ + arrayIndex = ARR_DIMS(a)[0] + 1; /* add after end */ a = array_set(a, 1, &arrayIndex, elementDatum, @@ -2193,7 +2193,7 @@ pg_extension_config_dump(PG_FUNCTION_ARGS) Assert(ARR_NDIM(a) == 1); Assert(ARR_LBOUND(a)[0] == 1); - arrayIndex = ARR_DIMS(a)[0] + 1; /* add after end */ + arrayIndex = ARR_DIMS(a)[0] + 1; /* add after end */ a = array_set(a, 1, &arrayIndex, elementDatum, @@ -2231,12 +2231,12 @@ AlterExtensionNamespace(List *names, const char *newschema) Oid oldNspOid = InvalidOid; AclResult aclresult; Relation extRel; - ScanKeyData key[2]; - SysScanDesc extScan; + ScanKeyData key[2]; + SysScanDesc extScan; HeapTuple extTup; Form_pg_extension extForm; Relation depRel; - SysScanDesc depScan; + SysScanDesc depScan; HeapTuple depTup; if (list_length(names) != 1) @@ -2275,7 +2275,7 @@ AlterExtensionNamespace(List *names, const char *newschema) extTup = systable_getnext(extScan); - if (!HeapTupleIsValid(extTup)) /* should not happen */ + if (!HeapTupleIsValid(extTup)) /* should not happen */ elog(ERROR, "extension with oid %u does not exist", extensionOid); /* Copy tuple so we can modify it below */ @@ -2285,8 +2285,8 @@ AlterExtensionNamespace(List *names, const char *newschema) systable_endscan(extScan); /* - * If the extension is already in the target schema, just silently - * do nothing. + * If the extension is already in the target schema, just silently do + * nothing. */ if (extForm->extnamespace == nspOid) { @@ -2323,10 +2323,10 @@ AlterExtensionNamespace(List *names, const char *newschema) { Form_pg_depend pg_depend = (Form_pg_depend) GETSTRUCT(depTup); ObjectAddress dep; - Oid dep_oldNspOid; + Oid dep_oldNspOid; /* - * Ignore non-membership dependencies. (Currently, the only other + * Ignore non-membership dependencies. (Currently, the only other * case we could see here is a normal dependency from another * extension.) */ @@ -2388,13 +2388,13 @@ void ExecAlterExtensionStmt(AlterExtensionStmt *stmt) { DefElem *d_new_version = NULL; - char *versionName; - char *oldVersionName; + char *versionName; + char *oldVersionName; ExtensionControlFile *control; Oid extensionOid; Relation extRel; - ScanKeyData key[1]; - SysScanDesc extScan; + ScanKeyData key[1]; + SysScanDesc extScan; HeapTuple extTup; List *updateVersions; Datum datum; @@ -2402,8 +2402,8 @@ ExecAlterExtensionStmt(AlterExtensionStmt *stmt) ListCell *lc; /* - * We use global variables to track the extension being created, so we - * can create/update only one extension at the same time. + * We use global variables to track the extension being created, so we can + * create/update only one extension at the same time. */ if (creating_extension) ereport(ERROR, @@ -2426,10 +2426,10 @@ ExecAlterExtensionStmt(AlterExtensionStmt *stmt) extTup = systable_getnext(extScan); if (!HeapTupleIsValid(extTup)) - ereport(ERROR, - (errcode(ERRCODE_UNDEFINED_OBJECT), - errmsg("extension \"%s\" does not exist", - stmt->extname))); + ereport(ERROR, + (errcode(ERRCODE_UNDEFINED_OBJECT), + errmsg("extension \"%s\" does not exist", + stmt->extname))); extensionOid = HeapTupleGetOid(extTup); @@ -2499,8 +2499,8 @@ ExecAlterExtensionStmt(AlterExtensionStmt *stmt) if (strcmp(oldVersionName, versionName) == 0) { ereport(NOTICE, - (errmsg("version \"%s\" of extension \"%s\" is already installed", - versionName, stmt->extname))); + (errmsg("version \"%s\" of extension \"%s\" is already installed", + versionName, stmt->extname))); return; } @@ -2545,8 +2545,8 @@ ApplyExtensionUpdates(Oid extensionOid, List *requiredExtensions; List *requiredSchemas; Relation extRel; - ScanKeyData key[1]; - SysScanDesc extScan; + ScanKeyData key[1]; + SysScanDesc extScan; HeapTuple extTup; Form_pg_extension extForm; Datum values[Natts_pg_extension]; @@ -2573,7 +2573,7 @@ ApplyExtensionUpdates(Oid extensionOid, extTup = systable_getnext(extScan); - if (!HeapTupleIsValid(extTup)) /* should not happen */ + if (!HeapTupleIsValid(extTup)) /* should not happen */ elog(ERROR, "extension with oid %u does not exist", extensionOid); @@ -2668,9 +2668,9 @@ ApplyExtensionUpdates(Oid extensionOid, schemaName, schemaOid); /* - * Update prior-version name and loop around. Since execute_sql_string - * did a final CommandCounterIncrement, we can update the pg_extension - * row again. + * Update prior-version name and loop around. Since + * execute_sql_string did a final CommandCounterIncrement, we can + * update the pg_extension row again. */ oldVersionName = versionName; } @@ -2682,10 +2682,10 @@ ApplyExtensionUpdates(Oid extensionOid, void ExecAlterExtensionContentsStmt(AlterExtensionContentsStmt *stmt) { - ObjectAddress extension; - ObjectAddress object; - Relation relation; - Oid oldExtension; + ObjectAddress extension; + ObjectAddress object; + Relation relation; + Oid oldExtension; extension.classId = ExtensionRelationId; extension.objectId = get_extension_oid(stmt->extname, false); @@ -2697,10 +2697,10 @@ ExecAlterExtensionContentsStmt(AlterExtensionContentsStmt *stmt) stmt->extname); /* - * Translate the parser representation that identifies the object into - * an ObjectAddress. get_object_address() will throw an error if the - * object does not exist, and will also acquire a lock on the object to - * guard against concurrent DROP and ALTER EXTENSION ADD/DROP operations. + * Translate the parser representation that identifies the object into an + * ObjectAddress. get_object_address() will throw an error if the object + * does not exist, and will also acquire a lock on the object to guard + * against concurrent DROP and ALTER EXTENSION ADD/DROP operations. */ object = get_object_address(stmt->objtype, stmt->objname, stmt->objargs, &relation, ShareUpdateExclusiveLock); diff --git a/src/backend/commands/foreigncmds.c b/src/backend/commands/foreigncmds.c index 13d6d882f8..21d52e06ba 100644 --- a/src/backend/commands/foreigncmds.c +++ b/src/backend/commands/foreigncmds.c @@ -586,8 +586,8 @@ AlterForeignDataWrapper(AlterFdwStmt *stmt) */ if (OidIsValid(fdwvalidator)) ereport(WARNING, - (errmsg("changing the foreign-data wrapper validator can cause " - "the options for dependent objects to become invalid"))); + (errmsg("changing the foreign-data wrapper validator can cause " + "the options for dependent objects to become invalid"))); } else { @@ -643,8 +643,8 @@ AlterForeignDataWrapper(AlterFdwStmt *stmt) ObjectAddress referenced; /* - * Flush all existing dependency records of this FDW on functions; - * we assume there can be none other than the ones we are fixing. + * Flush all existing dependency records of this FDW on functions; we + * assume there can be none other than the ones we are fixing. */ deleteDependencyRecordsForClass(ForeignDataWrapperRelationId, fdwId, diff --git a/src/backend/commands/functioncmds.c b/src/backend/commands/functioncmds.c index c8cbe035f0..03da168ff2 100644 --- a/src/backend/commands/functioncmds.c +++ b/src/backend/commands/functioncmds.c @@ -1665,7 +1665,7 @@ CreateCast(CreateCastStmt *stmt) * We also disallow creating binary-compatibility casts involving * domains. Casting from a domain to its base type is already * allowed, and casting the other way ought to go through domain - * coercion to permit constraint checking. Again, if you're intent on + * coercion to permit constraint checking. Again, if you're intent on * having your own semantics for that, create a no-op cast function. * * NOTE: if we were to relax this, the above checks for composites @@ -1830,7 +1830,7 @@ DropCast(DropCastStmt *stmt) Oid get_cast_oid(Oid sourcetypeid, Oid targettypeid, bool missing_ok) { - Oid oid; + Oid oid; oid = GetSysCacheOid2(CASTSOURCETARGET, ObjectIdGetDatum(sourcetypeid), diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c index cfcce55967..05e8234a0f 100644 --- a/src/backend/commands/indexcmds.c +++ b/src/backend/commands/indexcmds.c @@ -395,7 +395,7 @@ DefineIndex(RangeVar *heapRelation, indexRelationId = index_create(rel, indexRelationName, indexRelationId, indexInfo, indexColNames, - accessMethodId, tablespaceId, collationObjectId, classObjectId, + accessMethodId, tablespaceId, collationObjectId, classObjectId, coloptions, reloptions, primary, isconstraint, deferrable, initdeferred, allowSystemTableMods, @@ -840,14 +840,14 @@ ComputeIndexAttrs(IndexInfo *indexInfo, else { /* Index expression */ - Node *expr = attribute->expr; + Node *expr = attribute->expr; Assert(expr != NULL); atttype = exprType(expr); attcollation = exprCollation(expr); /* - * Strip any top-level COLLATE clause. This ensures that we treat + * Strip any top-level COLLATE clause. This ensures that we treat * "x COLLATE y" and "(x COLLATE y)" alike. */ while (IsA(expr, CollateExpr)) @@ -864,7 +864,7 @@ ComputeIndexAttrs(IndexInfo *indexInfo, } else { - indexInfo->ii_KeyAttrNumbers[attn] = 0; /* marks expression */ + indexInfo->ii_KeyAttrNumbers[attn] = 0; /* marks expression */ indexInfo->ii_Expressions = lappend(indexInfo->ii_Expressions, expr); @@ -876,7 +876,7 @@ ComputeIndexAttrs(IndexInfo *indexInfo, if (contain_subplans(expr)) ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("cannot use subquery in index expression"))); + errmsg("cannot use subquery in index expression"))); if (contain_agg_clause(expr)) ereport(ERROR, (errcode(ERRCODE_GROUPING_ERROR), @@ -904,8 +904,8 @@ ComputeIndexAttrs(IndexInfo *indexInfo, /* * Check we have a collation iff it's a collatable type. The only * expected failures here are (1) COLLATE applied to a noncollatable - * type, or (2) index expression had an unresolved collation. But - * we might as well code this to be a complete consistency check. + * type, or (2) index expression had an unresolved collation. But we + * might as well code this to be a complete consistency check. */ if (type_is_collatable(atttype)) { diff --git a/src/backend/commands/opclasscmds.c b/src/backend/commands/opclasscmds.c index 68072dd421..aff5ac6ec4 100644 --- a/src/backend/commands/opclasscmds.c +++ b/src/backend/commands/opclasscmds.c @@ -126,7 +126,7 @@ OpFamilyCacheLookup(Oid amID, List *opfamilyname, bool missing_ok) if (!HeapTupleIsValid(htup) && !missing_ok) { - HeapTuple amtup; + HeapTuple amtup; amtup = SearchSysCache1(AMOID, ObjectIdGetDatum(amID)); if (!HeapTupleIsValid(amtup)) @@ -134,8 +134,8 @@ OpFamilyCacheLookup(Oid amID, List *opfamilyname, bool missing_ok) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("operator family \"%s\" does not exist for access method \"%s\"", - NameListToString(opfamilyname), - NameStr(((Form_pg_am) GETSTRUCT(amtup))->amname)))); + NameListToString(opfamilyname), + NameStr(((Form_pg_am) GETSTRUCT(amtup))->amname)))); } return htup; @@ -143,7 +143,7 @@ OpFamilyCacheLookup(Oid amID, List *opfamilyname, bool missing_ok) /* * get_opfamily_oid - * find an opfamily OID by possibly qualified name + * find an opfamily OID by possibly qualified name * * If not found, returns InvalidOid if missing_ok, else throws error. */ @@ -202,7 +202,7 @@ OpClassCacheLookup(Oid amID, List *opclassname, bool missing_ok) if (!HeapTupleIsValid(htup) && !missing_ok) { - HeapTuple amtup; + HeapTuple amtup; amtup = SearchSysCache1(AMOID, ObjectIdGetDatum(amID)); if (!HeapTupleIsValid(amtup)) @@ -219,7 +219,7 @@ OpClassCacheLookup(Oid amID, List *opclassname, bool missing_ok) /* * get_opclass_oid - * find an opclass OID by possibly qualified name + * find an opclass OID by possibly qualified name * * If not found, returns InvalidOid if missing_ok, else throws error. */ @@ -1088,11 +1088,11 @@ assignOperTypes(OpFamilyMember *member, Oid amoid, Oid typeoid) if (OidIsValid(member->sortfamily)) { /* - * Ordering op, check index supports that. (We could perhaps also + * Ordering op, check index supports that. (We could perhaps also * check that the operator returns a type supported by the sortfamily, * but that seems more trouble than it's worth here. If it does not, - * the operator will never be matchable to any ORDER BY clause, but - * no worse consequences can ensue. Also, trying to check that would + * the operator will never be matchable to any ORDER BY clause, but no + * worse consequences can ensue. Also, trying to check that would * create an ordering hazard during dump/reload: it's possible that * the family has been created but not yet populated with the required * operators.) @@ -1108,8 +1108,8 @@ assignOperTypes(OpFamilyMember *member, Oid amoid, Oid typeoid) if (!pg_am->amcanorderbyop) ereport(ERROR, (errcode(ERRCODE_INVALID_OBJECT_DEFINITION), - errmsg("access method \"%s\" does not support ordering operators", - NameStr(pg_am->amname)))); + errmsg("access method \"%s\" does not support ordering operators", + NameStr(pg_am->amname)))); ReleaseSysCache(amtup); } @@ -1276,7 +1276,7 @@ storeOperators(List *opfamilyname, Oid amoid, foreach(l, operators) { OpFamilyMember *op = (OpFamilyMember *) lfirst(l); - char oppurpose; + char oppurpose; /* * If adding to an existing family, check for conflict with an @@ -1566,7 +1566,7 @@ RemoveOpClass(RemoveOpClassStmt *stmt) { ereport(NOTICE, (errmsg("operator class \"%s\" does not exist for access method \"%s\"", - NameListToString(stmt->opclassname), stmt->amname))); + NameListToString(stmt->opclassname), stmt->amname))); return; } @@ -1617,7 +1617,7 @@ RemoveOpFamily(RemoveOpFamilyStmt *stmt) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("operator family \"%s\" does not exist for access method \"%s\"", - NameListToString(stmt->opfamilyname), stmt->amname))); + NameListToString(stmt->opfamilyname), stmt->amname))); return; } @@ -2029,7 +2029,7 @@ AlterOpClassNamespace(List *name, char *access_method, const char *newschema) Oid AlterOpClassNamespace_oid(Oid opclassOid, Oid newNspOid) { - Oid oldNspOid; + Oid oldNspOid; Relation rel; rel = heap_open(OperatorClassRelationId, RowExclusiveLock); @@ -2238,7 +2238,7 @@ AlterOpFamilyNamespace(List *name, char *access_method, const char *newschema) Oid AlterOpFamilyNamespace_oid(Oid opfamilyOid, Oid newNspOid) { - Oid oldNspOid; + Oid oldNspOid; Relation rel; rel = heap_open(OperatorFamilyRelationId, RowExclusiveLock); diff --git a/src/backend/commands/operatorcmds.c b/src/backend/commands/operatorcmds.c index b4374a62f4..c99de4b240 100644 --- a/src/backend/commands/operatorcmds.c +++ b/src/backend/commands/operatorcmds.c @@ -464,7 +464,8 @@ AlterOperatorNamespace(List *names, List *argtypes, const char *newschema) List *operatorName = names; TypeName *typeName1 = (TypeName *) linitial(argtypes); TypeName *typeName2 = (TypeName *) lsecond(argtypes); - Oid operOid, nspOid; + Oid operOid, + nspOid; Relation rel; rel = heap_open(OperatorRelationId, RowExclusiveLock); @@ -490,7 +491,7 @@ AlterOperatorNamespace(List *names, List *argtypes, const char *newschema) Oid AlterOperatorNamespace_oid(Oid operOid, Oid newNspOid) { - Oid oldNspOid; + Oid oldNspOid; Relation rel; rel = heap_open(OperatorRelationId, RowExclusiveLock); diff --git a/src/backend/commands/portalcmds.c b/src/backend/commands/portalcmds.c index 60aca3ce8e..89086aa371 100644 --- a/src/backend/commands/portalcmds.c +++ b/src/backend/commands/portalcmds.c @@ -255,10 +255,10 @@ PortalCleanup(Portal portal) if (queryDesc) { /* - * Reset the queryDesc before anything else. This prevents us - * from trying to shut down the executor twice, in case of an - * error below. The transaction abort mechanisms will take care - * of resource cleanup in such a case. + * Reset the queryDesc before anything else. This prevents us from + * trying to shut down the executor twice, in case of an error below. + * The transaction abort mechanisms will take care of resource cleanup + * in such a case. */ portal->queryDesc = NULL; diff --git a/src/backend/commands/prepare.c b/src/backend/commands/prepare.c index adbf5872f3..dfa2ab0026 100644 --- a/src/backend/commands/prepare.c +++ b/src/backend/commands/prepare.c @@ -382,7 +382,7 @@ EvaluateParams(PreparedStatement *pstmt, List *params, /* sizeof(ParamListInfoData) includes the first array element */ paramLI = (ParamListInfo) palloc(sizeof(ParamListInfoData) + - (num_params - 1) *sizeof(ParamExternData)); + (num_params - 1) * sizeof(ParamExternData)); /* we have static list of params, so no hooks needed */ paramLI->paramFetch = NULL; paramLI->paramFetchArg = NULL; diff --git a/src/backend/commands/seclabel.c b/src/backend/commands/seclabel.c index 1c96b005d7..7afb7139a6 100644 --- a/src/backend/commands/seclabel.c +++ b/src/backend/commands/seclabel.c @@ -1,7 +1,7 @@ /* ------------------------------------------------------------------------- * * seclabel.c - * routines to support security label feature. + * routines to support security label feature. * * Portions Copyright (c) 1996-2011, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California @@ -28,7 +28,7 @@ typedef struct { const char *provider_name; - check_object_relabel_type hook; + check_object_relabel_type hook; } LabelProvider; static List *label_provider_list = NIL; @@ -42,9 +42,9 @@ void ExecSecLabelStmt(SecLabelStmt *stmt) { LabelProvider *provider = NULL; - ObjectAddress address; - Relation relation; - ListCell *lc; + ObjectAddress address; + Relation relation; + ListCell *lc; /* * Find the named label provider, or if none specified, check whether @@ -55,16 +55,16 @@ ExecSecLabelStmt(SecLabelStmt *stmt) if (label_provider_list == NIL) ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("no security label providers have been loaded"))); + errmsg("no security label providers have been loaded"))); if (lnext(list_head(label_provider_list)) != NULL) ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("must specify provider when multiple security label providers have been loaded"))); + errmsg("must specify provider when multiple security label providers have been loaded"))); provider = (LabelProvider *) linitial(label_provider_list); } else { - foreach (lc, label_provider_list) + foreach(lc, label_provider_list) { LabelProvider *lp = lfirst(lc); @@ -82,10 +82,10 @@ ExecSecLabelStmt(SecLabelStmt *stmt) } /* - * Translate the parser representation which identifies this object - * into an ObjectAddress. get_object_address() will throw an error if - * the object does not exist, and will also acquire a lock on the - * target to guard against concurrent modifications. + * Translate the parser representation which identifies this object into + * an ObjectAddress. get_object_address() will throw an error if the + * object does not exist, and will also acquire a lock on the target to + * guard against concurrent modifications. */ address = get_object_address(stmt->objtype, stmt->objname, stmt->objargs, &relation, ShareUpdateExclusiveLock); @@ -98,6 +98,7 @@ ExecSecLabelStmt(SecLabelStmt *stmt) switch (stmt->objtype) { case OBJECT_COLUMN: + /* * Allow security labels only on columns of tables, views, * composite types, and foreign tables (which are the only @@ -117,7 +118,7 @@ ExecSecLabelStmt(SecLabelStmt *stmt) } /* Provider gets control here, may throw ERROR to veto new label. */ - (*provider->hook)(&address, stmt->label); + (*provider->hook) (&address, stmt->label); /* Apply new label. */ SetSecurityLabel(&address, provider->provider_name, stmt->label); @@ -140,8 +141,8 @@ char * GetSecurityLabel(const ObjectAddress *object, const char *provider) { Relation pg_seclabel; - ScanKeyData keys[4]; - SysScanDesc scan; + ScanKeyData keys[4]; + SysScanDesc scan; HeapTuple tuple; Datum datum; bool isnull; @@ -196,8 +197,8 @@ SetSecurityLabel(const ObjectAddress *object, const char *provider, const char *label) { Relation pg_seclabel; - ScanKeyData keys[4]; - SysScanDesc scan; + ScanKeyData keys[4]; + SysScanDesc scan; HeapTuple oldtup; HeapTuple newtup = NULL; Datum values[Natts_pg_seclabel]; @@ -281,8 +282,8 @@ void DeleteSecurityLabel(const ObjectAddress *object) { Relation pg_seclabel; - ScanKeyData skey[3]; - SysScanDesc scan; + ScanKeyData skey[3]; + SysScanDesc scan; HeapTuple oldtup; int nkeys; @@ -323,8 +324,8 @@ DeleteSecurityLabel(const ObjectAddress *object) void register_label_provider(const char *provider_name, check_object_relabel_type hook) { - LabelProvider *provider; - MemoryContext oldcxt; + LabelProvider *provider; + MemoryContext oldcxt; oldcxt = MemoryContextSwitchTo(TopMemoryContext); provider = palloc(sizeof(LabelProvider)); diff --git a/src/backend/commands/sequence.c b/src/backend/commands/sequence.c index bfa94a0c11..6a91a102dc 100644 --- a/src/backend/commands/sequence.c +++ b/src/backend/commands/sequence.c @@ -287,7 +287,7 @@ ResetSequence(Oid seq_relid) seq->log_cnt = 1; /* - * Create a new storage file for the sequence. We want to keep the + * Create a new storage file for the sequence. We want to keep the * sequence's relfrozenxid at 0, since it won't contain any unfrozen XIDs. */ RelationSetNewRelfilenode(seq_rel, InvalidTransactionId); @@ -1037,7 +1037,7 @@ init_sequence(Oid relid, SeqTable *p_elm, Relation *p_rel) /* * If the sequence has been transactionally replaced since we last saw it, - * discard any cached-but-unissued values. We do not touch the currval() + * discard any cached-but-unissued values. We do not touch the currval() * state, however. */ if (seqrel->rd_rel->relfilenode != elm->filenode) diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index 886b656b43..790bc2a521 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -286,9 +286,9 @@ static void ATWrongRelkindError(Relation rel, int allowed_targets); static void ATSimpleRecursion(List **wqueue, Relation rel, AlterTableCmd *cmd, bool recurse, LOCKMODE lockmode); static void ATTypedTableRecursion(List **wqueue, Relation rel, AlterTableCmd *cmd, - LOCKMODE lockmode); + LOCKMODE lockmode); static List *find_typed_table_dependencies(Oid typeOid, const char *typeName, - DropBehavior behavior); + DropBehavior behavior); static void ATPrepAddColumn(List **wqueue, Relation rel, bool recurse, bool recursing, AlterTableCmd *cmd, LOCKMODE lockmode); static void ATExecAddColumn(List **wqueue, AlteredTableInfo *tab, Relation rel, @@ -311,7 +311,7 @@ static void ATExecSetOptions(Relation rel, const char *colName, static void ATExecSetStorage(Relation rel, const char *colName, Node *newValue, LOCKMODE lockmode); static void ATPrepDropColumn(List **wqueue, Relation rel, bool recurse, bool recursing, - AlterTableCmd *cmd, LOCKMODE lockmode); + AlterTableCmd *cmd, LOCKMODE lockmode); static void ATExecDropColumn(List **wqueue, Relation rel, const char *colName, DropBehavior behavior, bool recurse, bool recursing, @@ -320,9 +320,9 @@ static void ATExecAddIndex(AlteredTableInfo *tab, Relation rel, IndexStmt *stmt, bool is_rebuild, LOCKMODE lockmode); static void ATExecAddConstraint(List **wqueue, AlteredTableInfo *tab, Relation rel, - Constraint *newConstraint, bool recurse, LOCKMODE lockmode); + Constraint *newConstraint, bool recurse, LOCKMODE lockmode); static void ATExecAddIndexConstraint(AlteredTableInfo *tab, Relation rel, - IndexStmt *stmt, LOCKMODE lockmode); + IndexStmt *stmt, LOCKMODE lockmode); static void ATAddCheckConstraint(List **wqueue, AlteredTableInfo *tab, Relation rel, Constraint *constr, @@ -339,7 +339,7 @@ static void ATPrepAlterColumnType(List **wqueue, AlterTableCmd *cmd, LOCKMODE lockmode); static bool ATColumnChangeRequiresRewrite(Node *expr, AttrNumber varattno); static void ATExecAlterColumnType(AlteredTableInfo *tab, Relation rel, - AlterTableCmd *cmd, LOCKMODE lockmode); + AlterTableCmd *cmd, LOCKMODE lockmode); static void ATPostAlterTypeCleanup(List **wqueue, AlteredTableInfo *tab, LOCKMODE lockmode); static void ATPostAlterTypeParse(char *cmd, List **wqueue, LOCKMODE lockmode); static void change_owner_recurse_to_sequences(Oid relationOid, @@ -351,7 +351,7 @@ static void ATPrepSetTableSpace(AlteredTableInfo *tab, Relation rel, static void ATExecSetTableSpace(Oid tableOid, Oid newTableSpace, LOCKMODE lockmode); static void ATExecSetRelOptions(Relation rel, List *defList, bool isReset, LOCKMODE lockmode); static void ATExecEnableDisableTrigger(Relation rel, char *trigname, - char fires_when, bool skip_system, LOCKMODE lockmode); + char fires_when, bool skip_system, LOCKMODE lockmode); static void ATExecEnableDisableRule(Relation rel, char *rulename, char fires_when, LOCKMODE lockmode); static void ATPrepAddInherit(Relation child_rel); @@ -412,7 +412,7 @@ DefineRelation(CreateStmt *stmt, char relkind, Oid ownerId) /* * Check consistency of arguments */ - if (stmt->oncommit != ONCOMMIT_NOOP + if (stmt->oncommit != ONCOMMIT_NOOP && stmt->relation->relpersistence != RELPERSISTENCE_TEMP) ereport(ERROR, (errcode(ERRCODE_INVALID_TABLE_DEFINITION), @@ -547,7 +547,7 @@ DefineRelation(CreateStmt *stmt, char relkind, Oid ownerId) if (relkind == RELKIND_FOREIGN_TABLE) ereport(ERROR, (errcode(ERRCODE_WRONG_OBJECT_TYPE), - errmsg("default values on foreign tables are not supported"))); + errmsg("default values on foreign tables are not supported"))); Assert(colDef->cooked_default == NULL); @@ -706,7 +706,7 @@ DropErrorMsgWrongType(const char *relname, char wrongkind, char rightkind) /* * RemoveRelations * Implements DROP TABLE, DROP INDEX, DROP SEQUENCE, DROP VIEW, - * DROP FOREIGN TABLE + * DROP FOREIGN TABLE */ void RemoveRelations(DropStmt *drop) @@ -1454,11 +1454,11 @@ MergeAttributes(List *schema, List *supers, char relpersistence, if (defCollId != attribute->attcollation) ereport(ERROR, (errcode(ERRCODE_COLLATION_MISMATCH), - errmsg("inherited column \"%s\" has a collation conflict", - attributeName), + errmsg("inherited column \"%s\" has a collation conflict", + attributeName), errdetail("\"%s\" versus \"%s\"", get_collation_name(defCollId), - get_collation_name(attribute->attcollation)))); + get_collation_name(attribute->attcollation)))); /* Copy storage parameter */ if (def->storage == 0) @@ -2061,8 +2061,8 @@ renameatt_internal(Oid myrelid, relkind != RELKIND_FOREIGN_TABLE) ereport(ERROR, (errcode(ERRCODE_WRONG_OBJECT_TYPE), - errmsg("\"%s\" is not a table, view, composite type, index or foreign table", - RelationGetRelationName(targetrelation)))); + errmsg("\"%s\" is not a table, view, composite type, index or foreign table", + RelationGetRelationName(targetrelation)))); /* * permissions checking. only the owner of a class can change its schema. @@ -2138,7 +2138,7 @@ renameatt_internal(Oid myrelid, ListCell *lo; child_oids = find_typed_table_dependencies(targetrelation->rd_rel->reltype, - RelationGetRelationName(targetrelation), + RelationGetRelationName(targetrelation), behavior); foreach(lo, child_oids) @@ -2211,11 +2211,11 @@ void renameatt(Oid myrelid, RenameStmt *stmt) { renameatt_internal(myrelid, - stmt->subname, /* old att name */ - stmt->newname, /* new att name */ - interpretInhOption(stmt->relation->inhOpt), /* recursive? */ - false, /* recursing? */ - 0, /* expected inhcount */ + stmt->subname, /* old att name */ + stmt->newname, /* new att name */ + interpretInhOption(stmt->relation->inhOpt), /* recursive? */ + false, /* recursing? */ + 0, /* expected inhcount */ stmt->behavior); } @@ -2460,7 +2460,7 @@ void AlterTable(AlterTableStmt *stmt) { Relation rel; - LOCKMODE lockmode = AlterTableGetLockLevel(stmt->cmds); + LOCKMODE lockmode = AlterTableGetLockLevel(stmt->cmds); /* * Acquire same level of lock as already acquired during parsing. @@ -2531,7 +2531,7 @@ AlterTable(AlterTableStmt *stmt) } ATController(rel, stmt->cmds, interpretInhOption(stmt->relation->inhOpt), - lockmode); + lockmode); } /* @@ -2549,7 +2549,7 @@ void AlterTableInternal(Oid relid, List *cmds, bool recurse) { Relation rel; - LOCKMODE lockmode = AlterTableGetLockLevel(cmds); + LOCKMODE lockmode = AlterTableGetLockLevel(cmds); rel = relation_open(relid, lockmode); @@ -2581,31 +2581,33 @@ LOCKMODE AlterTableGetLockLevel(List *cmds) { ListCell *lcmd; - LOCKMODE lockmode = ShareUpdateExclusiveLock; + LOCKMODE lockmode = ShareUpdateExclusiveLock; foreach(lcmd, cmds) { AlterTableCmd *cmd = (AlterTableCmd *) lfirst(lcmd); - LOCKMODE cmd_lockmode = AccessExclusiveLock; /* default for compiler */ + LOCKMODE cmd_lockmode = AccessExclusiveLock; /* default for compiler */ switch (cmd->subtype) { - /* - * Need AccessExclusiveLock for these subcommands because they - * affect or potentially affect both read and write operations. - * - * New subcommand types should be added here by default. - */ - case AT_AddColumn: /* may rewrite heap, in some cases and visible to SELECT */ - case AT_DropColumn: /* change visible to SELECT */ + /* + * Need AccessExclusiveLock for these subcommands because they + * affect or potentially affect both read and write + * operations. + * + * New subcommand types should be added here by default. + */ + case AT_AddColumn: /* may rewrite heap, in some cases and visible + * to SELECT */ + case AT_DropColumn: /* change visible to SELECT */ case AT_AddColumnToView: /* CREATE VIEW */ case AT_AlterColumnType: /* must rewrite heap */ case AT_DropConstraint: /* as DROP INDEX */ - case AT_AddOids: /* must rewrite heap */ - case AT_DropOids: /* calls AT_DropColumn */ + case AT_AddOids: /* must rewrite heap */ + case AT_DropOids: /* calls AT_DropColumn */ case AT_EnableAlwaysRule: /* may change SELECT rules */ case AT_EnableReplicaRule: /* may change SELECT rules */ - case AT_EnableRule: /* may change SELECT rules */ + case AT_EnableRule: /* may change SELECT rules */ case AT_DisableRule: /* may change SELECT rules */ case AT_ChangeOwner: /* change visible to SELECT */ case AT_SetTableSpace: /* must rewrite heap */ @@ -2615,12 +2617,12 @@ AlterTableGetLockLevel(List *cmds) cmd_lockmode = AccessExclusiveLock; break; - /* - * These subcommands affect write operations only. - */ + /* + * These subcommands affect write operations only. + */ case AT_ColumnDefault: - case AT_ProcessedConstraint: /* becomes AT_AddConstraint */ - case AT_AddConstraintRecurse: /* becomes AT_AddConstraint */ + case AT_ProcessedConstraint: /* becomes AT_AddConstraint */ + case AT_AddConstraintRecurse: /* becomes AT_AddConstraint */ case AT_EnableTrig: case AT_EnableAlwaysTrig: case AT_EnableReplicaTrig: @@ -2629,7 +2631,7 @@ AlterTableGetLockLevel(List *cmds) case AT_DisableTrig: case AT_DisableTrigAll: case AT_DisableTrigUser: - case AT_AddIndex: /* from ADD CONSTRAINT */ + case AT_AddIndex: /* from ADD CONSTRAINT */ case AT_AddIndexConstraint: cmd_lockmode = ShareRowExclusiveLock; break; @@ -2644,14 +2646,17 @@ AlterTableGetLockLevel(List *cmds) case CONSTR_EXCLUSION: case CONSTR_PRIMARY: case CONSTR_UNIQUE: + /* * Cases essentially the same as CREATE INDEX. We - * could reduce the lock strength to ShareLock if we - * can work out how to allow concurrent catalog updates. + * could reduce the lock strength to ShareLock if + * we can work out how to allow concurrent catalog + * updates. */ cmd_lockmode = ShareRowExclusiveLock; break; case CONSTR_FOREIGN: + /* * We add triggers to both tables when we add a * Foreign Key, so the lock level must be at least @@ -2666,26 +2671,29 @@ AlterTableGetLockLevel(List *cmds) } break; - /* - * These subcommands affect inheritance behaviour. Queries started before us - * will continue to see the old inheritance behaviour, while queries started - * after we commit will see new behaviour. No need to prevent reads or writes - * to the subtable while we hook it up though. In both cases the parent table - * is locked with AccessShareLock. - */ + /* + * These subcommands affect inheritance behaviour. Queries + * started before us will continue to see the old inheritance + * behaviour, while queries started after we commit will see + * new behaviour. No need to prevent reads or writes to the + * subtable while we hook it up though. In both cases the + * parent table is locked with AccessShareLock. + */ case AT_AddInherit: case AT_DropInherit: cmd_lockmode = ShareUpdateExclusiveLock; break; - /* - * These subcommands affect general strategies for performance and maintenance, - * though don't change the semantic results from normal data reads and writes. - * Delaying an ALTER TABLE behind currently active writes only delays the point - * where the new strategy begins to take effect, so there is no benefit in waiting. - * In this case the minimum restriction applies: we don't currently allow - * concurrent catalog updates. - */ + /* + * These subcommands affect general strategies for performance + * and maintenance, though don't change the semantic results + * from normal data reads and writes. Delaying an ALTER TABLE + * behind currently active writes only delays the point where + * the new strategy begins to take effect, so there is no + * benefit in waiting. In this case the minimum restriction + * applies: we don't currently allow concurrent catalog + * updates. + */ case AT_SetStatistics: case AT_ClusterOn: case AT_DropCluster: @@ -2698,7 +2706,7 @@ AlterTableGetLockLevel(List *cmds) cmd_lockmode = ShareUpdateExclusiveLock; break; - default: /* oops */ + default: /* oops */ elog(ERROR, "unrecognized alter table type: %d", (int) cmd->subtype); break; @@ -2773,7 +2781,7 @@ ATPrepCmd(List **wqueue, Relation rel, AlterTableCmd *cmd, { case AT_AddColumn: /* ADD COLUMN */ ATSimplePermissions(rel, - ATT_TABLE|ATT_COMPOSITE_TYPE|ATT_FOREIGN_TABLE); + ATT_TABLE | ATT_COMPOSITE_TYPE | ATT_FOREIGN_TABLE); ATPrepAddColumn(wqueue, rel, recurse, recursing, cmd, lockmode); /* Recursion occurs during execution phase */ pass = AT_PASS_ADD_COL; @@ -2793,19 +2801,19 @@ ATPrepCmd(List **wqueue, Relation rel, AlterTableCmd *cmd, * substitutes default values into INSERTs before it expands * rules. */ - ATSimplePermissions(rel, ATT_TABLE|ATT_VIEW); + ATSimplePermissions(rel, ATT_TABLE | ATT_VIEW); ATSimpleRecursion(wqueue, rel, cmd, recurse, lockmode); /* No command-specific prep needed */ pass = cmd->def ? AT_PASS_ADD_CONSTR : AT_PASS_DROP; break; case AT_DropNotNull: /* ALTER COLUMN DROP NOT NULL */ - ATSimplePermissions(rel, ATT_TABLE|ATT_FOREIGN_TABLE); + ATSimplePermissions(rel, ATT_TABLE | ATT_FOREIGN_TABLE); ATSimpleRecursion(wqueue, rel, cmd, recurse, lockmode); /* No command-specific prep needed */ pass = AT_PASS_DROP; break; case AT_SetNotNull: /* ALTER COLUMN SET NOT NULL */ - ATSimplePermissions(rel, ATT_TABLE|ATT_FOREIGN_TABLE); + ATSimplePermissions(rel, ATT_TABLE | ATT_FOREIGN_TABLE); ATSimpleRecursion(wqueue, rel, cmd, recurse, lockmode); /* No command-specific prep needed */ pass = AT_PASS_ADD_CONSTR; @@ -2818,7 +2826,7 @@ ATPrepCmd(List **wqueue, Relation rel, AlterTableCmd *cmd, break; case AT_SetOptions: /* ALTER COLUMN SET ( options ) */ case AT_ResetOptions: /* ALTER COLUMN RESET ( options ) */ - ATSimplePermissions(rel, ATT_TABLE|ATT_INDEX); + ATSimplePermissions(rel, ATT_TABLE | ATT_INDEX); /* This command never recurses */ pass = AT_PASS_MISC; break; @@ -2830,7 +2838,7 @@ ATPrepCmd(List **wqueue, Relation rel, AlterTableCmd *cmd, break; case AT_DropColumn: /* DROP COLUMN */ ATSimplePermissions(rel, - ATT_TABLE|ATT_COMPOSITE_TYPE|ATT_FOREIGN_TABLE); + ATT_TABLE | ATT_COMPOSITE_TYPE | ATT_FOREIGN_TABLE); ATPrepDropColumn(wqueue, rel, recurse, recursing, cmd, lockmode); /* Recursion occurs during execution phase */ pass = AT_PASS_DROP; @@ -2849,7 +2857,7 @@ ATPrepCmd(List **wqueue, Relation rel, AlterTableCmd *cmd, cmd->subtype = AT_AddConstraintRecurse; pass = AT_PASS_ADD_CONSTR; break; - case AT_AddIndexConstraint: /* ADD CONSTRAINT USING INDEX */ + case AT_AddIndexConstraint: /* ADD CONSTRAINT USING INDEX */ ATSimplePermissions(rel, ATT_TABLE); /* This command never recurses */ /* No command-specific prep needed */ @@ -2865,7 +2873,7 @@ ATPrepCmd(List **wqueue, Relation rel, AlterTableCmd *cmd, break; case AT_AlterColumnType: /* ALTER COLUMN TYPE */ ATSimplePermissions(rel, - ATT_TABLE|ATT_COMPOSITE_TYPE|ATT_FOREIGN_TABLE); + ATT_TABLE | ATT_COMPOSITE_TYPE | ATT_FOREIGN_TABLE); /* Performs own recursion */ ATPrepAlterColumnType(wqueue, tab, rel, recurse, recursing, cmd, lockmode); pass = AT_PASS_ALTER_TYPE; @@ -2904,14 +2912,14 @@ ATPrepCmd(List **wqueue, Relation rel, AlterTableCmd *cmd, pass = AT_PASS_DROP; break; case AT_SetTableSpace: /* SET TABLESPACE */ - ATSimplePermissions(rel, ATT_TABLE|ATT_INDEX); + ATSimplePermissions(rel, ATT_TABLE | ATT_INDEX); /* This command never recurses */ ATPrepSetTableSpace(tab, rel, cmd->name, lockmode); pass = AT_PASS_MISC; /* doesn't actually matter */ break; case AT_SetRelOptions: /* SET (...) */ case AT_ResetRelOptions: /* RESET (...) */ - ATSimplePermissions(rel, ATT_TABLE|ATT_INDEX); + ATSimplePermissions(rel, ATT_TABLE | ATT_INDEX); /* This command never recurses */ /* No command-specific prep needed */ pass = AT_PASS_MISC; @@ -3072,11 +3080,11 @@ ATExecCmd(List **wqueue, AlteredTableInfo *tab, Relation rel, break; case AT_DropColumn: /* DROP COLUMN */ ATExecDropColumn(wqueue, rel, cmd->name, - cmd->behavior, false, false, cmd->missing_ok, lockmode); + cmd->behavior, false, false, cmd->missing_ok, lockmode); break; case AT_DropColumnRecurse: /* DROP COLUMN with recursion */ ATExecDropColumn(wqueue, rel, cmd->name, - cmd->behavior, true, false, cmd->missing_ok, lockmode); + cmd->behavior, true, false, cmd->missing_ok, lockmode); break; case AT_AddIndex: /* ADD INDEX */ ATExecAddIndex(tab, rel, (IndexStmt *) cmd->def, false, lockmode); @@ -3092,7 +3100,7 @@ ATExecCmd(List **wqueue, AlteredTableInfo *tab, Relation rel, ATExecAddConstraint(wqueue, tab, rel, (Constraint *) cmd->def, true, lockmode); break; - case AT_AddIndexConstraint: /* ADD CONSTRAINT USING INDEX */ + case AT_AddIndexConstraint: /* ADD CONSTRAINT USING INDEX */ ATExecAddIndexConstraint(tab, rel, (IndexStmt *) cmd->def, lockmode); break; case AT_ValidateConstraint: @@ -3156,7 +3164,7 @@ ATExecCmd(List **wqueue, AlteredTableInfo *tab, Relation rel, case AT_EnableTrig: /* ENABLE TRIGGER name */ ATExecEnableDisableTrigger(rel, cmd->name, - TRIGGER_FIRES_ON_ORIGIN, false, lockmode); + TRIGGER_FIRES_ON_ORIGIN, false, lockmode); break; case AT_EnableAlwaysTrig: /* ENABLE ALWAYS TRIGGER name */ ATExecEnableDisableTrigger(rel, cmd->name, @@ -3164,7 +3172,7 @@ ATExecCmd(List **wqueue, AlteredTableInfo *tab, Relation rel, break; case AT_EnableReplicaTrig: /* ENABLE REPLICA TRIGGER name */ ATExecEnableDisableTrigger(rel, cmd->name, - TRIGGER_FIRES_ON_REPLICA, false, lockmode); + TRIGGER_FIRES_ON_REPLICA, false, lockmode); break; case AT_DisableTrig: /* DISABLE TRIGGER name */ ATExecEnableDisableTrigger(rel, cmd->name, @@ -3172,7 +3180,7 @@ ATExecCmd(List **wqueue, AlteredTableInfo *tab, Relation rel, break; case AT_EnableTrigAll: /* ENABLE TRIGGER ALL */ ATExecEnableDisableTrigger(rel, NULL, - TRIGGER_FIRES_ON_ORIGIN, false, lockmode); + TRIGGER_FIRES_ON_ORIGIN, false, lockmode); break; case AT_DisableTrigAll: /* DISABLE TRIGGER ALL */ ATExecEnableDisableTrigger(rel, NULL, @@ -3180,7 +3188,7 @@ ATExecCmd(List **wqueue, AlteredTableInfo *tab, Relation rel, break; case AT_EnableTrigUser: /* ENABLE TRIGGER USER */ ATExecEnableDisableTrigger(rel, NULL, - TRIGGER_FIRES_ON_ORIGIN, true, lockmode); + TRIGGER_FIRES_ON_ORIGIN, true, lockmode); break; case AT_DisableTrigUser: /* DISABLE TRIGGER USER */ ATExecEnableDisableTrigger(rel, NULL, @@ -3254,8 +3262,8 @@ ATRewriteTables(List **wqueue, LOCKMODE lockmode) * (Eventually we'll probably need to check for composite type * dependencies even when we're just scanning the table without a * rewrite, but at the moment a composite type does not enforce any - * constraints, so it's not necessary/appropriate to enforce them - * just during ALTER.) + * constraints, so it's not necessary/appropriate to enforce them just + * during ALTER.) */ if (tab->newvals != NIL || tab->rewrite) { @@ -3386,8 +3394,8 @@ ATRewriteTables(List **wqueue, LOCKMODE lockmode) con->conid); /* - * No need to mark the constraint row as validated, - * we did that when we inserted the row earlier. + * No need to mark the constraint row as validated, we did + * that when we inserted the row earlier. */ heap_close(refrel, NoLock); @@ -3723,7 +3731,7 @@ ATGetQueueEntry(List **wqueue, Relation rel) static void ATSimplePermissions(Relation rel, int allowed_targets) { - int actual_target; + int actual_target; switch (rel->rd_rel->relkind) { @@ -3779,16 +3787,16 @@ ATWrongRelkindError(Relation rel, int allowed_targets) case ATT_TABLE: msg = _("\"%s\" is not a table"); break; - case ATT_TABLE|ATT_INDEX: + case ATT_TABLE | ATT_INDEX: msg = _("\"%s\" is not a table or index"); break; - case ATT_TABLE|ATT_VIEW: + case ATT_TABLE | ATT_VIEW: msg = _("\"%s\" is not a table or view"); break; - case ATT_TABLE|ATT_FOREIGN_TABLE: + case ATT_TABLE | ATT_FOREIGN_TABLE: msg = _("\"%s\" is not a table or foreign table"); break; - case ATT_TABLE|ATT_COMPOSITE_TYPE|ATT_FOREIGN_TABLE: + case ATT_TABLE | ATT_COMPOSITE_TYPE | ATT_FOREIGN_TABLE: msg = _("\"%s\" is not a table, composite type, or foreign table"); break; case ATT_VIEW: @@ -4032,7 +4040,7 @@ find_typed_table_dependencies(Oid typeOid, const char *typeName, DropBehavior be (errcode(ERRCODE_DEPENDENT_OBJECTS_STILL_EXIST), errmsg("cannot alter type \"%s\" because it is the type of a typed table", typeName), - errhint("Use ALTER ... CASCADE to alter the typed tables too."))); + errhint("Use ALTER ... CASCADE to alter the typed tables too."))); else result = lappend_oid(result, HeapTupleGetOid(tuple)); } @@ -4103,9 +4111,9 @@ ATExecAddColumn(List **wqueue, AlteredTableInfo *tab, Relation rel, /* * Are we adding the column to a recursion child? If so, check whether to - * merge with an existing definition for the column. If we do merge, - * we must not recurse. Children will already have the column, and - * recursing into them would mess up attinhcount. + * merge with an existing definition for the column. If we do merge, we + * must not recurse. Children will already have the column, and recursing + * into them would mess up attinhcount. */ if (colDef->inhcount > 0) { @@ -4133,10 +4141,10 @@ ATExecAddColumn(List **wqueue, AlteredTableInfo *tab, Relation rel, ereport(ERROR, (errcode(ERRCODE_COLLATION_MISMATCH), errmsg("child table \"%s\" has different collation for column \"%s\"", - RelationGetRelationName(rel), colDef->colname), + RelationGetRelationName(rel), colDef->colname), errdetail("\"%s\" versus \"%s\"", get_collation_name(ccollid), - get_collation_name(childatt->attcollation)))); + get_collation_name(childatt->attcollation)))); /* If it's OID, child column must actually be OID */ if (isOid && childatt->attnum != ObjectIdAttributeNumber) @@ -4265,7 +4273,7 @@ ATExecAddColumn(List **wqueue, AlteredTableInfo *tab, Relation rel, if (relkind == RELKIND_FOREIGN_TABLE) ereport(ERROR, (errcode(ERRCODE_WRONG_OBJECT_TYPE), - errmsg("default values on foreign tables are not supported"))); + errmsg("default values on foreign tables are not supported"))); rawEnt = (RawColumnDefault *) palloc(sizeof(RawColumnDefault)); rawEnt->attnum = attribute.attnum; @@ -5170,10 +5178,11 @@ ATExecAddIndexConstraint(AlteredTableInfo *tab, Relation rel, elog(ERROR, "index \"%s\" is not unique", indexName); /* - * Determine name to assign to constraint. We require a constraint to + * Determine name to assign to constraint. We require a constraint to * have the same name as the underlying index; therefore, use the index's - * existing name as the default constraint name, and if the user explicitly - * gives some other name for the constraint, rename the index to match. + * existing name as the default constraint name, and if the user + * explicitly gives some other name for the constraint, rename the index + * to match. */ constraintName = stmt->idxname; if (constraintName == NULL) @@ -5216,7 +5225,7 @@ ATExecAddIndexConstraint(AlteredTableInfo *tab, Relation rel, */ static void ATExecAddConstraint(List **wqueue, AlteredTableInfo *tab, Relation rel, - Constraint *newConstraint, bool recurse, LOCKMODE lockmode) + Constraint *newConstraint, bool recurse, LOCKMODE lockmode) { Assert(IsA(newConstraint, Constraint)); @@ -5337,9 +5346,9 @@ ATAddCheckConstraint(List **wqueue, AlteredTableInfo *tab, Relation rel, /* * If the constraint got merged with an existing constraint, we're done. - * We mustn't recurse to child tables in this case, because they've already - * got the constraint, and visiting them again would lead to an incorrect - * value for coninhcount. + * We mustn't recurse to child tables in this case, because they've + * already got the constraint, and visiting them again would lead to an + * incorrect value for coninhcount. */ if (newcons == NIL) return; @@ -5655,8 +5664,8 @@ ATAddForeignKeyConstraint(AlteredTableInfo *tab, Relation rel, /* * Tell Phase 3 to check that the constraint is satisfied by existing rows - * We can skip this during table creation or if requested explicitly - * by specifying NOT VALID on an alter table statement. + * We can skip this during table creation or if requested explicitly by + * specifying NOT VALID on an alter table statement. */ if (!fkconstraint->skip_validation) { @@ -5718,8 +5727,8 @@ ATExecValidateConstraint(Relation rel, const char *constrName) if (!found) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), - errmsg("foreign key constraint \"%s\" of relation \"%s\" does not exist", - constrName, RelationGetRelationName(rel)))); + errmsg("foreign key constraint \"%s\" of relation \"%s\" does not exist", + constrName, RelationGetRelationName(rel)))); if (!con->convalidated) { @@ -5729,17 +5738,16 @@ ATExecValidateConstraint(Relation rel, const char *constrName) Relation refrel; /* - * Triggers are already in place on both tables, so a - * concurrent write that alters the result here is not - * possible. Normally we can run a query here to do the - * validation, which would only require AccessShareLock. - * In some cases, it is possible that we might need to - * fire triggers to perform the check, so we take a lock - * at RowShareLock level just in case. + * Triggers are already in place on both tables, so a concurrent write + * that alters the result here is not possible. Normally we can run a + * query here to do the validation, which would only require + * AccessShareLock. In some cases, it is possible that we might need + * to fire triggers to perform the check, so we take a lock at + * RowShareLock level just in case. */ refrel = heap_open(con->confrelid, RowShareLock); - validateForeignKeyConstraint((char *)constrName, rel, refrel, + validateForeignKeyConstraint((char *) constrName, rel, refrel, con->conindid, conid); @@ -6571,12 +6579,12 @@ ATPrepAlterColumnType(List **wqueue, if (tab->relkind == RELKIND_RELATION) { /* - * Set up an expression to transform the old data value to the new type. - * If a USING option was given, transform and use that expression, else - * just take the old value and try to coerce it. We do this first so that - * type incompatibility can be detected before we waste effort, and - * because we need the expression to be parsed against the original table - * rowtype. + * Set up an expression to transform the old data value to the new + * type. If a USING option was given, transform and use that + * expression, else just take the old value and try to coerce it. We + * do this first so that type incompatibility can be detected before + * we waste effort, and because we need the expression to be parsed + * against the original table rowtype. */ if (transform) { @@ -6596,13 +6604,13 @@ ATPrepAlterColumnType(List **wqueue, if (expression_returns_set(transform)) ereport(ERROR, (errcode(ERRCODE_DATATYPE_MISMATCH), - errmsg("transform expression must not return a set"))); + errmsg("transform expression must not return a set"))); /* No subplans or aggregates, either... */ if (pstate->p_hasSubLinks) ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("cannot use subquery in transform expression"))); + errmsg("cannot use subquery in transform expression"))); if (pstate->p_hasAggs) ereport(ERROR, (errcode(ERRCODE_GROUPING_ERROR), @@ -6615,7 +6623,7 @@ ATPrepAlterColumnType(List **wqueue, else { transform = (Node *) makeVar(1, attnum, - attTup->atttypid, attTup->atttypmod, attTup->attcollation, + attTup->atttypid, attTup->atttypmod, attTup->attcollation, 0); } @@ -6649,14 +6657,14 @@ ATPrepAlterColumnType(List **wqueue, else if (transform) ereport(ERROR, (errcode(ERRCODE_WRONG_OBJECT_TYPE), - errmsg("ALTER TYPE USING is only supported on plain tables"))); + errmsg("ALTER TYPE USING is only supported on plain tables"))); if (tab->relkind == RELKIND_COMPOSITE_TYPE || tab->relkind == RELKIND_FOREIGN_TABLE) { /* - * For composite types, do this check now. Tables will check - * it later when the table is being rewritten. + * For composite types, do this check now. Tables will check it later + * when the table is being rewritten. */ find_composite_type_dependencies(rel->rd_rel->reltype, rel, NULL); } @@ -6699,7 +6707,7 @@ ATColumnChangeRequiresRewrite(Node *expr, AttrNumber varattno) for (;;) { /* only one varno, so no need to check that */ - if (IsA(expr, Var) && ((Var *) expr)->varattno == varattno) + if (IsA(expr, Var) &&((Var *) expr)->varattno == varattno) return false; else if (IsA(expr, RelabelType)) expr = (Node *) ((RelabelType *) expr)->arg; @@ -6924,13 +6932,14 @@ ATExecAlterColumnType(AlteredTableInfo *tab, Relation rel, break; case OCLASS_TRIGGER: + /* * A trigger can depend on a column because the column is * specified as an update target, or because the column is * used in the trigger's WHEN condition. The first case would * not require any extra work, but the second case would * require updating the WHEN expression, which will take a - * significant amount of new code. Since we can't easily tell + * significant amount of new code. Since we can't easily tell * which case applies, we punt for both. FIXME someday. */ ereport(ERROR, @@ -7940,7 +7949,7 @@ copy_relation_data(SMgrRelation src, SMgrRelation dst, */ static void ATExecEnableDisableTrigger(Relation rel, char *trigname, - char fires_when, bool skip_system, LOCKMODE lockmode) + char fires_when, bool skip_system, LOCKMODE lockmode) { EnableDisableTrigger(rel, trigname, fires_when, skip_system); } @@ -8558,18 +8567,18 @@ ATExecDropInherit(Relation rel, RangeVar *parent, LOCKMODE lockmode) static void ATExecGenericOptions(Relation rel, List *options) { - Relation ftrel; - ForeignServer *server; + Relation ftrel; + ForeignServer *server; ForeignDataWrapper *fdw; - HeapTuple tuple; - bool isnull; - Datum repl_val[Natts_pg_foreign_table]; - bool repl_null[Natts_pg_foreign_table]; - bool repl_repl[Natts_pg_foreign_table]; - Datum datum; - Form_pg_foreign_table tableform; - - if (options == NIL) + HeapTuple tuple; + bool isnull; + Datum repl_val[Natts_pg_foreign_table]; + bool repl_null[Natts_pg_foreign_table]; + bool repl_repl[Natts_pg_foreign_table]; + Datum datum; + Form_pg_foreign_table tableform; + + if (options == NIL) return; ftrel = heap_open(ForeignTableRelationId, RowExclusiveLock); @@ -8579,7 +8588,7 @@ ATExecGenericOptions(Relation rel, List *options) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("foreign table \"%s\" does not exist", - RelationGetRelationName(rel)))); + RelationGetRelationName(rel)))); tableform = (Form_pg_foreign_table) GETSTRUCT(tuple); server = GetForeignServer(tableform->ftserver); fdw = GetForeignDataWrapper(server->fdwid); @@ -8718,8 +8727,8 @@ AlterTableNamespace(RangeVar *relation, const char *newschema, default: ereport(ERROR, (errcode(ERRCODE_WRONG_OBJECT_TYPE), - errmsg("\"%s\" is not a table, view, sequence, or foreign table", - RelationGetRelationName(rel)))); + errmsg("\"%s\" is not a table, view, sequence, or foreign table", + RelationGetRelationName(rel)))); } /* get schema OID and check its permissions */ @@ -8836,7 +8845,7 @@ AlterIndexNamespaces(Relation classRel, Relation rel, */ static void AlterSeqNamespaces(Relation classRel, Relation rel, - Oid oldNspOid, Oid newNspOid, const char *newNspName, LOCKMODE lockmode) + Oid oldNspOid, Oid newNspOid, const char *newNspName, LOCKMODE lockmode) { Relation depRel; SysScanDesc scan; diff --git a/src/backend/commands/tablespace.c b/src/backend/commands/tablespace.c index 42a704beb1..3024dc4b64 100644 --- a/src/backend/commands/tablespace.c +++ b/src/backend/commands/tablespace.c @@ -559,7 +559,7 @@ create_tablespace_directories(const char *location, const Oid tablespaceoid) (errcode(ERRCODE_UNDEFINED_FILE), errmsg("directory \"%s\" does not exist", location), InRecovery ? errhint("Create this directory for the tablespace before " - "restarting the server."): 0)); + "restarting the server.") : 0)); else ereport(ERROR, (errcode_for_file_access(), @@ -573,8 +573,8 @@ create_tablespace_directories(const char *location, const Oid tablespaceoid) /* * Our theory for replaying a CREATE is to forcibly drop the target - * subdirectory if present, and then recreate it. This may be - * more work than needed, but it is simple to implement. + * subdirectory if present, and then recreate it. This may be more + * work than needed, but it is simple to implement. */ if (stat(location_with_version_dir, &st) == 0 && S_ISDIR(st.st_mode)) { @@ -1353,10 +1353,10 @@ get_tablespace_oid(const char *tablespacename, bool missing_ok) heap_close(rel, AccessShareLock); if (!OidIsValid(result) && !missing_ok) - ereport(ERROR, - (errcode(ERRCODE_UNDEFINED_OBJECT), - errmsg("tablespace \"%s\" does not exist", - tablespacename))); + ereport(ERROR, + (errcode(ERRCODE_UNDEFINED_OBJECT), + errmsg("tablespace \"%s\" does not exist", + tablespacename))); return result; } diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c index 329d4d95f1..6b1ade8990 100644 --- a/src/backend/commands/trigger.c +++ b/src/backend/commands/trigger.c @@ -144,11 +144,11 @@ CreateTrigger(CreateTrigStmt *stmt, const char *queryString, referenced; /* - * ShareRowExclusiveLock is sufficient to prevent concurrent write activity - * to the relation, and thus to lock out any operations that might want to - * fire triggers on the relation. If we had ON SELECT triggers we would - * need to take an AccessExclusiveLock to add one of those, just as we do - * with ON SELECT rules. + * ShareRowExclusiveLock is sufficient to prevent concurrent write + * activity to the relation, and thus to lock out any operations that + * might want to fire triggers on the relation. If we had ON SELECT + * triggers we would need to take an AccessExclusiveLock to add one of + * those, just as we do with ON SELECT rules. */ rel = heap_openrv(stmt->relation, ShareRowExclusiveLock); @@ -244,7 +244,7 @@ CreateTrigger(CreateTrigStmt *stmt, const char *queryString, if (stmt->whenClause) ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("INSTEAD OF triggers cannot have WHEN conditions"))); + errmsg("INSTEAD OF triggers cannot have WHEN conditions"))); if (stmt->columns != NIL) ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), @@ -480,8 +480,8 @@ CreateTrigger(CreateTrigStmt *stmt, const char *queryString, * can skip this for internally generated triggers, since the name * modification above should be sufficient. * - * NOTE that this is cool only because we have ShareRowExclusiveLock on the - * relation, so the trigger set won't be changing underneath us. + * NOTE that this is cool only because we have ShareRowExclusiveLock on + * the relation, so the trigger set won't be changing underneath us. */ if (!isInternal) { @@ -1036,8 +1036,8 @@ DropTrigger(Oid relid, const char *trigname, DropBehavior behavior, if (!OidIsValid(object.objectId)) { ereport(NOTICE, - (errmsg("trigger \"%s\" for table \"%s\" does not exist, skipping", - trigname, get_rel_name(relid)))); + (errmsg("trigger \"%s\" for table \"%s\" does not exist, skipping", + trigname, get_rel_name(relid)))); return; } @@ -1083,9 +1083,9 @@ RemoveTriggerById(Oid trigOid) /* * Open and lock the relation the trigger belongs to. As in - * CreateTrigger, this is sufficient to lock out all operations that - * could fire or add triggers; but it would need to be revisited if - * we had ON SELECT triggers. + * CreateTrigger, this is sufficient to lock out all operations that could + * fire or add triggers; but it would need to be revisited if we had ON + * SELECT triggers. */ relid = ((Form_pg_trigger) GETSTRUCT(tup))->tgrelid; @@ -1960,7 +1960,7 @@ ExecBRInsertTriggers(EState *estate, ResultRelInfo *relinfo, if (newtuple != slottuple) { /* - * Return the modified tuple using the es_trig_tuple_slot. We assume + * Return the modified tuple using the es_trig_tuple_slot. We assume * the tuple was allocated in per-tuple memory context, and therefore * will go away by itself. The tuple table slot should not try to * clear it. @@ -2035,7 +2035,7 @@ ExecIRInsertTriggers(EState *estate, ResultRelInfo *relinfo, if (newtuple != slottuple) { /* - * Return the modified tuple using the es_trig_tuple_slot. We assume + * Return the modified tuple using the es_trig_tuple_slot. We assume * the tuple was allocated in per-tuple memory context, and therefore * will go away by itself. The tuple table slot should not try to * clear it. @@ -2378,7 +2378,7 @@ ExecBRUpdateTriggers(EState *estate, EPQState *epqstate, if (newtuple != slottuple) { /* - * Return the modified tuple using the es_trig_tuple_slot. We assume + * Return the modified tuple using the es_trig_tuple_slot. We assume * the tuple was allocated in per-tuple memory context, and therefore * will go away by itself. The tuple table slot should not try to * clear it. @@ -2461,7 +2461,7 @@ ExecIRUpdateTriggers(EState *estate, ResultRelInfo *relinfo, if (newtuple != slottuple) { /* - * Return the modified tuple using the es_trig_tuple_slot. We assume + * Return the modified tuple using the es_trig_tuple_slot. We assume * the tuple was allocated in per-tuple memory context, and therefore * will go away by itself. The tuple table slot should not try to * clear it. @@ -2891,7 +2891,7 @@ typedef struct AfterTriggerEventDataOneCtid { TriggerFlags ate_flags; /* status bits and offset to shared data */ ItemPointerData ate_ctid1; /* inserted, deleted, or old updated tuple */ -} AfterTriggerEventDataOneCtid; +} AfterTriggerEventDataOneCtid; #define SizeofTriggerEvent(evt) \ (((evt)->ate_flags & AFTER_TRIGGER_2CTIDS) ? \ diff --git a/src/backend/commands/tsearchcmds.c b/src/backend/commands/tsearchcmds.c index 81f129dff6..80a30e180d 100644 --- a/src/backend/commands/tsearchcmds.c +++ b/src/backend/commands/tsearchcmds.c @@ -407,7 +407,8 @@ RenameTSParser(List *oldname, const char *newname) void AlterTSParserNamespace(List *name, const char *newschema) { - Oid prsId, nspOid; + Oid prsId, + nspOid; Relation rel; rel = heap_open(TSParserRelationId, RowExclusiveLock); @@ -429,7 +430,7 @@ AlterTSParserNamespace(List *name, const char *newschema) Oid AlterTSParserNamespace_oid(Oid prsId, Oid newNspOid) { - Oid oldNspOid; + Oid oldNspOid; Relation rel; rel = heap_open(TSParserRelationId, RowExclusiveLock); @@ -685,7 +686,8 @@ RenameTSDictionary(List *oldname, const char *newname) void AlterTSDictionaryNamespace(List *name, const char *newschema) { - Oid dictId, nspOid; + Oid dictId, + nspOid; Relation rel; rel = heap_open(TSDictionaryRelationId, RowExclusiveLock); @@ -708,7 +710,7 @@ AlterTSDictionaryNamespace(List *name, const char *newschema) Oid AlterTSDictionaryNamespace_oid(Oid dictId, Oid newNspOid) { - Oid oldNspOid; + Oid oldNspOid; Relation rel; rel = heap_open(TSDictionaryRelationId, RowExclusiveLock); @@ -1218,7 +1220,8 @@ RenameTSTemplate(List *oldname, const char *newname) void AlterTSTemplateNamespace(List *name, const char *newschema) { - Oid tmplId, nspOid; + Oid tmplId, + nspOid; Relation rel; rel = heap_open(TSTemplateRelationId, RowExclusiveLock); @@ -1240,7 +1243,7 @@ AlterTSTemplateNamespace(List *name, const char *newschema) Oid AlterTSTemplateNamespace_oid(Oid tmplId, Oid newNspOid) { - Oid oldNspOid; + Oid oldNspOid; Relation rel; rel = heap_open(TSTemplateRelationId, RowExclusiveLock); @@ -1668,7 +1671,8 @@ RenameTSConfiguration(List *oldname, const char *newname) void AlterTSConfigurationNamespace(List *name, const char *newschema) { - Oid cfgId, nspOid; + Oid cfgId, + nspOid; Relation rel; rel = heap_open(TSConfigRelationId, RowExclusiveLock); @@ -1691,7 +1695,7 @@ AlterTSConfigurationNamespace(List *name, const char *newschema) Oid AlterTSConfigurationNamespace_oid(Oid cfgId, Oid newNspOid) { - Oid oldNspOid; + Oid oldNspOid; Relation rel; rel = heap_open(TSConfigRelationId, RowExclusiveLock); diff --git a/src/backend/commands/typecmds.c b/src/backend/commands/typecmds.c index 4c06d898a8..1a20b0d91b 100644 --- a/src/backend/commands/typecmds.c +++ b/src/backend/commands/typecmds.c @@ -138,7 +138,7 @@ DefineType(List *names, List *parameters) DefElem *byValueEl = NULL; DefElem *alignmentEl = NULL; DefElem *storageEl = NULL; - DefElem *collatableEl = NULL; + DefElem *collatableEl = NULL; Oid inputOid; Oid outputOid; Oid receiveOid = InvalidOid; @@ -537,7 +537,7 @@ DefineType(List *names, List *parameters) * now have TypeCreate do all the real work. * * Note: the pg_type.oid is stored in user tables as array elements (base - * types) in ArrayType and in composite types in DatumTupleFields. This + * types) in ArrayType and in composite types in DatumTupleFields. This * oid must be preserved by binary upgrades. */ typoid = @@ -1179,7 +1179,7 @@ DefineEnum(CreateEnumStmt *stmt) -1, /* typMod (Domains only) */ 0, /* Array dimensions of typbasetype */ false, /* Type NOT NULL */ - InvalidOid); /* typcollation */ + InvalidOid); /* typcollation */ /* Enter the enum's values into pg_enum */ EnumValuesCreate(enumTypeOid, stmt->vals); @@ -2416,7 +2416,7 @@ domainAddConstraint(Oid domainOid, Oid domainNamespace, Oid baseTypeOid, CONSTRAINT_CHECK, /* Constraint Type */ false, /* Is Deferrable */ false, /* Is Deferred */ - true, /* Is Validated */ + true, /* Is Validated */ InvalidOid, /* not a relation constraint */ NULL, 0, diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c index f13eb2891e..9c9164d3bc 100644 --- a/src/backend/commands/user.c +++ b/src/backend/commands/user.c @@ -84,7 +84,7 @@ CreateRole(CreateRoleStmt *stmt) bool createrole = false; /* Can this user create roles? */ bool createdb = false; /* Can the user create databases? */ bool canlogin = false; /* Can this user login? */ - bool isreplication = false; /* Is this a replication role? */ + bool isreplication = false; /* Is this a replication role? */ int connlimit = -1; /* maximum connections allowed */ List *addroleto = NIL; /* roles to make this a member of */ List *rolemembers = NIL; /* roles to be members of this role */ @@ -98,7 +98,7 @@ CreateRole(CreateRoleStmt *stmt) DefElem *dcreaterole = NULL; DefElem *dcreatedb = NULL; DefElem *dcanlogin = NULL; - DefElem *disreplication = NULL; + DefElem *disreplication = NULL; DefElem *dconnlimit = NULL; DefElem *daddroleto = NULL; DefElem *drolemembers = NULL; @@ -240,9 +240,10 @@ CreateRole(CreateRoleStmt *stmt) if (dissuper) { issuper = intVal(dissuper->arg) != 0; + /* - * Superusers get replication by default, but only if - * NOREPLICATION wasn't explicitly mentioned + * Superusers get replication by default, but only if NOREPLICATION + * wasn't explicitly mentioned */ if (!(disreplication && intVal(disreplication->arg) == 0)) isreplication = 1; @@ -287,7 +288,7 @@ CreateRole(CreateRoleStmt *stmt) if (!superuser()) ereport(ERROR, (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE), - errmsg("must be superuser to create replication users"))); + errmsg("must be superuser to create replication users"))); } else { @@ -384,8 +385,8 @@ CreateRole(CreateRoleStmt *stmt) tuple = heap_form_tuple(pg_authid_dsc, new_record, new_record_nulls); /* - * pg_largeobject_metadata contains pg_authid.oid's, so we - * use the binary-upgrade override, if specified. + * pg_largeobject_metadata contains pg_authid.oid's, so we use the + * binary-upgrade override, if specified. */ if (OidIsValid(binary_upgrade_next_pg_authid_oid)) { @@ -467,7 +468,7 @@ AlterRole(AlterRoleStmt *stmt) int createrole = -1; /* Can this user create roles? */ int createdb = -1; /* Can the user create databases? */ int canlogin = -1; /* Can this user login? */ - int isreplication = -1; /* Is this a replication role? */ + int isreplication = -1; /* Is this a replication role? */ int connlimit = -1; /* maximum connections allowed */ List *rolemembers = NIL; /* roles to be added/removed */ char *validUntil = NULL; /* time the login is valid until */ @@ -479,7 +480,7 @@ AlterRole(AlterRoleStmt *stmt) DefElem *dcreaterole = NULL; DefElem *dcreatedb = NULL; DefElem *dcanlogin = NULL; - DefElem *disreplication = NULL; + DefElem *disreplication = NULL; DefElem *dconnlimit = NULL; DefElem *drolemembers = NULL; DefElem *dvalidUntil = NULL; diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c index 1651aa94dc..90c413a988 100644 --- a/src/backend/commands/vacuum.c +++ b/src/backend/commands/vacuum.c @@ -527,7 +527,7 @@ vac_update_relstats(Relation relation, /* * If we have discovered that there are no indexes, then there's no - * primary key either. This could be done more thoroughly... + * primary key either. This could be done more thoroughly... */ if (pgcform->relhaspkey && !hasindex) { @@ -839,8 +839,8 @@ vacuum_rel(Oid relid, VacuumStmt *vacstmt, bool do_toast, bool for_wraparound, * There's a race condition here: the rel may have gone away since the * last time we saw it. If so, we don't need to vacuum it. * - * If we've been asked not to wait for the relation lock, acquire it - * first in non-blocking mode, before calling try_relation_open(). + * If we've been asked not to wait for the relation lock, acquire it first + * in non-blocking mode, before calling try_relation_open(). */ if (!(vacstmt->options & VACOPT_NOWAIT)) onerel = try_relation_open(relid, lmode); @@ -852,8 +852,8 @@ vacuum_rel(Oid relid, VacuumStmt *vacstmt, bool do_toast, bool for_wraparound, if (IsAutoVacuumWorkerProcess() && Log_autovacuum_min_duration >= 0) ereport(LOG, (errcode(ERRCODE_LOCK_NOT_AVAILABLE), - errmsg("skipping vacuum of \"%s\" --- lock not available", - vacstmt->relation->relname))); + errmsg("skipping vacuum of \"%s\" --- lock not available", + vacstmt->relation->relname))); } if (!onerel) diff --git a/src/backend/commands/vacuumlazy.c b/src/backend/commands/vacuumlazy.c index a5c024cc19..9393fa0727 100644 --- a/src/backend/commands/vacuumlazy.c +++ b/src/backend/commands/vacuumlazy.c @@ -705,15 +705,16 @@ lazy_scan_heap(Relation onerel, LVRelStats *vacrelstats, PageSetAllVisible(page); SetBufferCommitInfoNeedsSave(buf); } + /* * It's possible for the value returned by GetOldestXmin() to move * backwards, so it's not wrong for us to see tuples that appear to * not be visible to everyone yet, while PD_ALL_VISIBLE is already * set. The real safe xmin value never moves backwards, but * GetOldestXmin() is conservative and sometimes returns a value - * that's unnecessarily small, so if we see that contradiction it - * just means that the tuples that we think are not visible to - * everyone yet actually are, and the PD_ALL_VISIBLE flag is correct. + * that's unnecessarily small, so if we see that contradiction it just + * means that the tuples that we think are not visible to everyone yet + * actually are, and the PD_ALL_VISIBLE flag is correct. * * There should never be dead tuples on a page with PD_ALL_VISIBLE * set, however. diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c index 2cec713089..5d0fbdfb40 100644 --- a/src/backend/commands/variable.c +++ b/src/backend/commands/variable.c @@ -132,8 +132,8 @@ check_datestyle(char **newval, void **extra, GucSource source) * We can't simply "return check_datestyle(...)" because we need * to handle constructs like "DEFAULT, ISO". */ - char *subval; - void *subextra = NULL; + char *subval; + void *subextra = NULL; subval = strdup(GetConfigOptionResetString("datestyle")); if (!subval) @@ -262,9 +262,9 @@ check_timezone(char **newval, void **extra, GucSource source) { /* * The boot_val given for TimeZone in guc.c is NULL. When we see this - * we just do nothing. If this isn't overridden from the config file + * we just do nothing. If this isn't overridden from the config file * then pg_timezone_initialize() will eventually select a default - * value from the environment. This hack has two purposes: to avoid + * value from the environment. This hack has two purposes: to avoid * wasting cycles loading values that might soon be overridden from * the config file, and to avoid trying to read the timezone files * during InitializeGUCOptions(). The latter doesn't work in an @@ -289,7 +289,7 @@ check_timezone(char **newval, void **extra, GucSource source) if (pg_strncasecmp(*newval, "interval", 8) == 0) { /* - * Support INTERVAL 'foo'. This is for SQL spec compliance, not + * Support INTERVAL 'foo'. This is for SQL spec compliance, not * because it has any actual real-world usefulness. */ const char *valueptr = *newval; @@ -391,13 +391,13 @@ check_timezone(char **newval, void **extra, GucSource source) * * Note: the result string should be something that we'd accept as input. * We use the numeric format for interval cases, because it's simpler to - * reload. In the named-timezone case, *newval is already OK and need not + * reload. In the named-timezone case, *newval is already OK and need not * be changed; it might not have the canonical casing, but that's taken * care of by show_timezone. */ if (myextra.HasCTZSet) { - char *result = (char *) malloc(64); + char *result = (char *) malloc(64); if (!result) return false; @@ -567,7 +567,7 @@ show_log_timezone(void) * We allow idempotent changes (r/w -> r/w and r/o -> r/o) at any time, and * we also always allow changes from read-write to read-only. However, * read-only may be changed to read-write only when in a top-level transaction - * that has not yet taken an initial snapshot. Can't do it in a hot standby + * that has not yet taken an initial snapshot. Can't do it in a hot standby * slave, either. */ bool @@ -719,7 +719,7 @@ check_transaction_deferrable(bool *newval, void **extra, GucSource source) * * We can't roll back the random sequence on error, and we don't want * config file reloads to affect it, so we only want interactive SET SEED - * commands to set it. We use the "extra" storage to ensure that rollbacks + * commands to set it. We use the "extra" storage to ensure that rollbacks * don't try to do the operation again. */ @@ -851,8 +851,8 @@ check_session_authorization(char **newval, void **extra, GucSource source) { /* * Can't do catalog lookups, so fail. The result of this is that - * session_authorization cannot be set in postgresql.conf, which - * seems like a good thing anyway, so we don't work hard to avoid it. + * session_authorization cannot be set in postgresql.conf, which seems + * like a good thing anyway, so we don't work hard to avoid it. */ return false; } @@ -977,7 +977,7 @@ const char * show_role(void) { /* - * Check whether SET ROLE is active; if not return "none". This is a + * Check whether SET ROLE is active; if not return "none". This is a * kluge to deal with the fact that SET SESSION AUTHORIZATION logically * resets SET ROLE to NONE, but we cannot set the GUC role variable from * assign_session_authorization (because we haven't got enough info to diff --git a/src/backend/commands/view.c b/src/backend/commands/view.c index 508fb23c9a..be681e3fd4 100644 --- a/src/backend/commands/view.c +++ b/src/backend/commands/view.c @@ -120,7 +120,7 @@ DefineVirtualRelation(const RangeVar *relation, List *tlist, bool replace) def->colname = pstrdup(tle->resname); def->typeName = makeTypeNameFromOid(exprType((Node *) tle->expr), - exprTypmod((Node *) tle->expr)); + exprTypmod((Node *) tle->expr)); def->inhcount = 0; def->is_local = true; def->is_not_null = false; @@ -130,6 +130,7 @@ DefineVirtualRelation(const RangeVar *relation, List *tlist, bool replace) def->cooked_default = NULL; def->collClause = NULL; def->collOid = exprCollation((Node *) tle->expr); + /* * It's possible that the column is of a collatable type but the * collation could not be resolved, so double-check. @@ -240,7 +241,7 @@ DefineVirtualRelation(const RangeVar *relation, List *tlist, bool replace) } else { - Oid relid; + Oid relid; /* * now set the parameters for keys/inheritance etc. All of these are @@ -437,8 +438,8 @@ DefineView(ViewStmt *stmt, const char *queryString) /* * Check for unsupported cases. These tests are redundant with ones in - * DefineQueryRewrite(), but that function will complain about a bogus - * ON SELECT rule, and we'd rather the message complain about a view. + * DefineQueryRewrite(), but that function will complain about a bogus ON + * SELECT rule, and we'd rather the message complain about a view. */ if (viewParse->intoClause != NULL) ereport(ERROR, @@ -447,7 +448,7 @@ DefineView(ViewStmt *stmt, const char *queryString) if (viewParse->hasModifyingCTE) ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("views must not contain data-modifying statements in WITH"))); + errmsg("views must not contain data-modifying statements in WITH"))); /* * If a list of column names was given, run through and insert these into @@ -500,7 +501,7 @@ DefineView(ViewStmt *stmt, const char *queryString) if (view->relpersistence == RELPERSISTENCE_UNLOGGED) ereport(ERROR, (errcode(ERRCODE_SYNTAX_ERROR), - errmsg("views cannot be unlogged because they do not have storage"))); + errmsg("views cannot be unlogged because they do not have storage"))); /* * Create the view relation diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c index caa9faea87..86ec987019 100644 --- a/src/backend/executor/execMain.c +++ b/src/backend/executor/execMain.c @@ -19,7 +19,7 @@ * ExecutorRun accepts direction and count arguments that specify whether * the plan is to be executed forwards, backwards, and for how many tuples. * In some cases ExecutorRun may be called multiple times to process all - * the tuples for a plan. It is also acceptable to stop short of executing + * the tuples for a plan. It is also acceptable to stop short of executing * the whole plan (but only if it is a SELECT). * * ExecutorFinish must be called after the final ExecutorRun call and @@ -168,6 +168,7 @@ standard_ExecutorStart(QueryDesc *queryDesc, int eflags) switch (queryDesc->operation) { case CMD_SELECT: + /* * SELECT INTO, SELECT FOR UPDATE/SHARE and modifying CTEs need to * mark tuples @@ -332,12 +333,12 @@ standard_ExecutorRun(QueryDesc *queryDesc, * ExecutorFinish * * This routine must be called after the last ExecutorRun call. - * It performs cleanup such as firing AFTER triggers. It is + * It performs cleanup such as firing AFTER triggers. It is * separate from ExecutorEnd because EXPLAIN ANALYZE needs to * include these actions in the total runtime. * * We provide a function hook variable that lets loadable plugins - * get control when ExecutorFinish is called. Such a plugin would + * get control when ExecutorFinish is called. Such a plugin would * normally call standard_ExecutorFinish(). * * ---------------------------------------------------------------- @@ -425,9 +426,9 @@ standard_ExecutorEnd(QueryDesc *queryDesc) Assert(estate != NULL); /* - * Check that ExecutorFinish was called, unless in EXPLAIN-only mode. - * This Assert is needed because ExecutorFinish is new as of 9.1, and - * callers might forget to call it. + * Check that ExecutorFinish was called, unless in EXPLAIN-only mode. This + * Assert is needed because ExecutorFinish is new as of 9.1, and callers + * might forget to call it. */ Assert(estate->es_finished || (estate->es_top_eflags & EXEC_FLAG_EXPLAIN_ONLY)); @@ -519,7 +520,7 @@ ExecCheckRTPerms(List *rangeTable, bool ereport_on_violation) foreach(l, rangeTable) { - RangeTblEntry *rte = (RangeTblEntry *) lfirst(l); + RangeTblEntry *rte = (RangeTblEntry *) lfirst(l); result = ExecCheckRTEPerms(rte); if (!result) @@ -533,8 +534,8 @@ ExecCheckRTPerms(List *rangeTable, bool ereport_on_violation) } if (ExecutorCheckPerms_hook) - result = (*ExecutorCheckPerms_hook)(rangeTable, - ereport_on_violation); + result = (*ExecutorCheckPerms_hook) (rangeTable, + ereport_on_violation); return result; } @@ -980,7 +981,7 @@ InitPlan(QueryDesc *queryDesc, int eflags) void CheckValidResultRel(Relation resultRel, CmdType operation) { - TriggerDesc *trigDesc = resultRel->trigdesc; + TriggerDesc *trigDesc = resultRel->trigdesc; switch (resultRel->rd_rel->relkind) { @@ -1005,26 +1006,26 @@ CheckValidResultRel(Relation resultRel, CmdType operation) case CMD_INSERT: if (!trigDesc || !trigDesc->trig_insert_instead_row) ereport(ERROR, - (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE), - errmsg("cannot insert into view \"%s\"", - RelationGetRelationName(resultRel)), - errhint("You need an unconditional ON INSERT DO INSTEAD rule or an INSTEAD OF INSERT trigger."))); + (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE), + errmsg("cannot insert into view \"%s\"", + RelationGetRelationName(resultRel)), + errhint("You need an unconditional ON INSERT DO INSTEAD rule or an INSTEAD OF INSERT trigger."))); break; case CMD_UPDATE: if (!trigDesc || !trigDesc->trig_update_instead_row) ereport(ERROR, - (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE), - errmsg("cannot update view \"%s\"", - RelationGetRelationName(resultRel)), - errhint("You need an unconditional ON UPDATE DO INSTEAD rule or an INSTEAD OF UPDATE trigger."))); + (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE), + errmsg("cannot update view \"%s\"", + RelationGetRelationName(resultRel)), + errhint("You need an unconditional ON UPDATE DO INSTEAD rule or an INSTEAD OF UPDATE trigger."))); break; case CMD_DELETE: if (!trigDesc || !trigDesc->trig_delete_instead_row) ereport(ERROR, - (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE), - errmsg("cannot delete from view \"%s\"", - RelationGetRelationName(resultRel)), - errhint("You need an unconditional ON DELETE DO INSTEAD rule or an INSTEAD OF DELETE trigger."))); + (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE), + errmsg("cannot delete from view \"%s\"", + RelationGetRelationName(resultRel)), + errhint("You need an unconditional ON DELETE DO INSTEAD rule or an INSTEAD OF DELETE trigger."))); break; default: elog(ERROR, "unrecognized CmdType: %d", (int) operation); @@ -1137,8 +1138,8 @@ ExecGetTriggerResultRel(EState *estate, Oid relid) /* * Open the target relation's relcache entry. We assume that an * appropriate lock is still held by the backend from whenever the trigger - * event got queued, so we need take no new lock here. Also, we need - * not recheck the relkind, so no need for CheckValidResultRel. + * event got queued, so we need take no new lock here. Also, we need not + * recheck the relkind, so no need for CheckValidResultRel. */ rel = heap_open(relid, NoLock); @@ -1238,12 +1239,12 @@ ExecPostprocessPlan(EState *estate) /* * Run any secondary ModifyTable nodes to completion, in case the main - * query did not fetch all rows from them. (We do this to ensure that + * query did not fetch all rows from them. (We do this to ensure that * such nodes have predictable results.) */ foreach(lc, estate->es_auxmodifytables) { - PlanState *ps = (PlanState *) lfirst(lc); + PlanState *ps = (PlanState *) lfirst(lc); for (;;) { @@ -2220,9 +2221,9 @@ EvalPlanQualStart(EPQState *epqstate, EState *parentestate, Plan *planTree) * ExecInitSubPlan expects to be able to find these entries. Some of the * SubPlans might not be used in the part of the plan tree we intend to * run, but since it's not easy to tell which, we just initialize them - * all. (However, if the subplan is headed by a ModifyTable node, then - * it must be a data-modifying CTE, which we will certainly not need to - * re-run, so we can skip initializing it. This is just an efficiency + * all. (However, if the subplan is headed by a ModifyTable node, then it + * must be a data-modifying CTE, which we will certainly not need to + * re-run, so we can skip initializing it. This is just an efficiency * hack; it won't skip data-modifying CTEs for which the ModifyTable node * is not at the top.) */ diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c index c153ca00db..5f0b58f43b 100644 --- a/src/backend/executor/execQual.c +++ b/src/backend/executor/execQual.c @@ -79,9 +79,9 @@ static Datum ExecEvalWholeRowSlow(ExprState *exprstate, ExprContext *econtext, static Datum ExecEvalConst(ExprState *exprstate, ExprContext *econtext, bool *isNull, ExprDoneCond *isDone); static Datum ExecEvalParamExec(ExprState *exprstate, ExprContext *econtext, - bool *isNull, ExprDoneCond *isDone); + bool *isNull, ExprDoneCond *isDone); static Datum ExecEvalParamExtern(ExprState *exprstate, ExprContext *econtext, - bool *isNull, ExprDoneCond *isDone); + bool *isNull, ExprDoneCond *isDone); static void init_fcache(Oid foid, Oid input_collation, FuncExprState *fcache, MemoryContext fcacheCxt, bool needDescForSets); static void ShutdownFuncExpr(Datum arg); @@ -1043,7 +1043,7 @@ ExecEvalParamExtern(ExprState *exprstate, ExprContext *econtext, ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), errmsg("no value found for parameter %d", thisParamId))); - return (Datum) 0; /* keep compiler quiet */ + return (Datum) 0; /* keep compiler quiet */ } diff --git a/src/backend/executor/execUtils.c b/src/backend/executor/execUtils.c index 7e84ccdd9c..0cbbe04d3b 100644 --- a/src/backend/executor/execUtils.c +++ b/src/backend/executor/execUtils.c @@ -1319,9 +1319,9 @@ retry: /* * Ordinarily, at this point the search should have found the originally * inserted tuple, unless we exited the loop early because of conflict. - * However, it is possible to define exclusion constraints for which - * that wouldn't be true --- for instance, if the operator is <>. - * So we no longer complain if found_self is still false. + * However, it is possible to define exclusion constraints for which that + * wouldn't be true --- for instance, if the operator is <>. So we no + * longer complain if found_self is still false. */ econtext->ecxt_scantuple = save_scantuple; diff --git a/src/backend/executor/functions.c b/src/backend/executor/functions.c index 70d126c521..9c867bbae2 100644 --- a/src/backend/executor/functions.c +++ b/src/backend/executor/functions.c @@ -81,7 +81,7 @@ typedef struct char *fname; /* function name (for error msgs) */ char *src; /* function body text (for error msgs) */ - SQLFunctionParseInfoPtr pinfo; /* data for parser callback hooks */ + SQLFunctionParseInfoPtr pinfo; /* data for parser callback hooks */ Oid rettype; /* actual return type */ int16 typlen; /* length of the return type */ @@ -119,7 +119,7 @@ typedef struct SQLFunctionParseInfo Oid *argtypes; /* resolved types of input arguments */ int nargs; /* number of input arguments */ Oid collation; /* function's input collation, if known */ -} SQLFunctionParseInfo; +} SQLFunctionParseInfo; /* non-export function prototypes */ @@ -255,7 +255,7 @@ sql_fn_param_ref(ParseState *pstate, ParamRef *pref) * Set up the per-query execution_state records for a SQL function. * * The input is a List of Lists of parsed and rewritten, but not planned, - * querytrees. The sublist structure denotes the original query boundaries. + * querytrees. The sublist structure denotes the original query boundaries. */ static List * init_execution_state(List *queryTree_list, @@ -299,8 +299,8 @@ init_execution_state(List *queryTree_list, ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), /* translator: %s is a SQL statement name */ - errmsg("%s is not allowed in a non-volatile function", - CreateCommandTag(stmt)))); + errmsg("%s is not allowed in a non-volatile function", + CreateCommandTag(stmt)))); /* OK, build the execution_state for this query */ newes = (execution_state *) palloc(sizeof(execution_state)); @@ -311,8 +311,8 @@ init_execution_state(List *queryTree_list, newes->next = NULL; newes->status = F_EXEC_START; - newes->setsResult = false; /* might change below */ - newes->lazyEval = false; /* might change below */ + newes->setsResult = false; /* might change below */ + newes->lazyEval = false; /* might change below */ newes->stmt = stmt; newes->qd = NULL; @@ -442,7 +442,7 @@ init_sql_fcache(FmgrInfo *finfo, bool lazyEvalOK) fcache->src = TextDatumGetCString(tmp); /* - * Parse and rewrite the queries in the function text. Use sublists to + * Parse and rewrite the queries in the function text. Use sublists to * keep track of the original query boundaries. But we also build a * "flat" list of the rewritten queries to pass to check_sql_fn_retval. * This is because the last canSetTag query determines the result type @@ -462,7 +462,7 @@ init_sql_fcache(FmgrInfo *finfo, bool lazyEvalOK) queryTree_sublist = pg_analyze_and_rewrite_params(parsetree, fcache->src, - (ParserSetupHook) sql_fn_parser_setup, + (ParserSetupHook) sql_fn_parser_setup, fcache->pinfo); queryTree_list = lappend(queryTree_list, queryTree_sublist); flat_query_list = list_concat(flat_query_list, @@ -657,7 +657,7 @@ postquel_sub_params(SQLFunctionCachePtr fcache, { /* sizeof(ParamListInfoData) includes the first array element */ paramLI = (ParamListInfo) palloc(sizeof(ParamListInfoData) + - (nargs - 1) *sizeof(ParamExternData)); + (nargs - 1) * sizeof(ParamExternData)); /* we have static list of params, so no hooks needed */ paramLI->paramFetch = NULL; paramLI->paramFetchArg = NULL; @@ -748,8 +748,8 @@ fmgr_sql(PG_FUNCTION_ARGS) execution_state *es; TupleTableSlot *slot; Datum result; - List *eslist; - ListCell *eslc; + List *eslist; + ListCell *eslc; /* * Switch to context in which the fcache lives. This ensures that @@ -847,10 +847,10 @@ fmgr_sql(PG_FUNCTION_ARGS) * * In a non-read-only function, we rely on the fact that we'll never * suspend execution between queries of the function: the only reason to - * suspend execution before completion is if we are returning a row from - * a lazily-evaluated SELECT. So, when first entering this loop, we'll + * suspend execution before completion is if we are returning a row from a + * lazily-evaluated SELECT. So, when first entering this loop, we'll * either start a new query (and push a fresh snapshot) or re-establish - * the active snapshot from the existing query descriptor. If we need to + * the active snapshot from the existing query descriptor. If we need to * start a new query in a subsequent execution of the loop, either we need * a fresh snapshot (and pushed_snapshot is false) or the existing * snapshot is on the active stack and we can just bump its command ID. @@ -927,10 +927,10 @@ fmgr_sql(PG_FUNCTION_ARGS) es = (execution_state *) lfirst(eslc); /* - * Flush the current snapshot so that we will take a new one - * for the new query list. This ensures that new snaps are - * taken at original-query boundaries, matching the behavior - * of interactive execution. + * Flush the current snapshot so that we will take a new one for + * the new query list. This ensures that new snaps are taken at + * original-query boundaries, matching the behavior of interactive + * execution. */ if (pushed_snapshot) { @@ -1183,7 +1183,7 @@ ShutdownSQLFunction(Datum arg) { SQLFunctionCachePtr fcache = (SQLFunctionCachePtr) DatumGetPointer(arg); execution_state *es; - ListCell *lc; + ListCell *lc; foreach(lc, fcache->func_state) { @@ -1415,7 +1415,7 @@ check_sql_fn_retval(Oid func_id, Oid rettype, List *queryTreeList, * the function that's calling it. * * XXX Note that if rettype is RECORD, the IsBinaryCoercible check - * will succeed for any composite restype. For the moment we rely on + * will succeed for any composite restype. For the moment we rely on * runtime type checking to catch any discrepancy, but it'd be nice to * do better at parse time. */ @@ -1432,7 +1432,7 @@ check_sql_fn_retval(Oid func_id, Oid rettype, List *queryTreeList, tle->expr = (Expr *) makeRelabelType(tle->expr, rettype, -1, - get_typcollation(rettype), + get_typcollation(rettype), COERCE_DONTCARE); /* Relabel is dangerous if sort/group or setop column */ if (tle->ressortgroupref != 0 || parse->setOperations) @@ -1536,7 +1536,7 @@ check_sql_fn_retval(Oid func_id, Oid rettype, List *queryTreeList, tle->expr = (Expr *) makeRelabelType(tle->expr, atttype, -1, - get_typcollation(atttype), + get_typcollation(atttype), COERCE_DONTCARE); /* Relabel is dangerous if sort/group or setop column */ if (tle->ressortgroupref != 0 || parse->setOperations) diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c index 51b1228c26..47555bab55 100644 --- a/src/backend/executor/nodeAgg.c +++ b/src/backend/executor/nodeAgg.c @@ -199,7 +199,7 @@ typedef struct AggStatePerAggData */ Tuplesortstate *sortstate; /* sort object, if DISTINCT or ORDER BY */ -} AggStatePerAggData; +} AggStatePerAggData; /* * AggStatePerGroupData - per-aggregate-per-group working state @@ -246,7 +246,7 @@ typedef struct AggHashEntryData TupleHashEntryData shared; /* common header for hash table entries */ /* per-aggregate transition status array - must be last! */ AggStatePerGroupData pergroup[1]; /* VARIABLE LENGTH ARRAY */ -} AggHashEntryData; /* VARIABLE LENGTH STRUCT */ +} AggHashEntryData; /* VARIABLE LENGTH STRUCT */ static void initialize_aggregates(AggState *aggstate, @@ -827,7 +827,7 @@ build_hash_table(AggState *aggstate) Assert(node->numGroups > 0); entrysize = sizeof(AggHashEntryData) + - (aggstate->numaggs - 1) *sizeof(AggStatePerGroupData); + (aggstate->numaggs - 1) * sizeof(AggStatePerGroupData); aggstate->hashtable = BuildTupleHashTable(node->numCols, node->grpColIdx, @@ -899,7 +899,7 @@ hash_agg_entry_size(int numAggs) /* This must match build_hash_table */ entrysize = sizeof(AggHashEntryData) + - (numAggs - 1) *sizeof(AggStatePerGroupData); + (numAggs - 1) * sizeof(AggStatePerGroupData); entrysize = MAXALIGN(entrysize); /* Account for hashtable overhead (assuming fill factor = 1) */ entrysize += 3 * sizeof(void *); diff --git a/src/backend/executor/nodeBitmapIndexscan.c b/src/backend/executor/nodeBitmapIndexscan.c index 90ff0403ab..4de54ea55f 100644 --- a/src/backend/executor/nodeBitmapIndexscan.c +++ b/src/backend/executor/nodeBitmapIndexscan.c @@ -307,8 +307,8 @@ ExecInitBitmapIndexScan(BitmapIndexScan *node, EState *estate, int eflags) indexstate->biss_NumScanKeys); /* - * If no run-time keys to calculate, go ahead and pass the scankeys to - * the index AM. + * If no run-time keys to calculate, go ahead and pass the scankeys to the + * index AM. */ if (indexstate->biss_NumRuntimeKeys == 0 && indexstate->biss_NumArrayKeys == 0) diff --git a/src/backend/executor/nodeForeignscan.c b/src/backend/executor/nodeForeignscan.c index c4309a981e..d50489c7f4 100644 --- a/src/backend/executor/nodeForeignscan.c +++ b/src/backend/executor/nodeForeignscan.c @@ -40,7 +40,7 @@ static TupleTableSlot * ForeignNext(ForeignScanState *node) { TupleTableSlot *slot; - ForeignScan *plan = (ForeignScan *) node->ss.ps.plan; + ForeignScan *plan = (ForeignScan *) node->ss.ps.plan; ExprContext *econtext = node->ss.ps.ps_ExprContext; MemoryContext oldcontext; diff --git a/src/backend/executor/nodeHash.c b/src/backend/executor/nodeHash.c index 295563011f..1af98c81a6 100644 --- a/src/backend/executor/nodeHash.c +++ b/src/backend/executor/nodeHash.c @@ -960,13 +960,11 @@ void ExecPrepHashTableForUnmatched(HashJoinState *hjstate) { /* - *---------- - * During this scan we use the HashJoinState fields as follows: + * ---------- During this scan we use the HashJoinState fields as follows: * - * hj_CurBucketNo: next regular bucket to scan - * hj_CurSkewBucketNo: next skew bucket (an index into skewBucketNums) - * hj_CurTuple: last tuple returned, or NULL to start next bucket - *---------- + * hj_CurBucketNo: next regular bucket to scan hj_CurSkewBucketNo: next + * skew bucket (an index into skewBucketNums) hj_CurTuple: last tuple + * returned, or NULL to start next bucket ---------- */ hjstate->hj_CurBucketNo = 0; hjstate->hj_CurSkewBucketNo = 0; @@ -1003,7 +1001,7 @@ ExecScanHashTableForUnmatched(HashJoinState *hjstate, ExprContext *econtext) } else if (hjstate->hj_CurSkewBucketNo < hashtable->nSkewBuckets) { - int j = hashtable->skewBucketNums[hjstate->hj_CurSkewBucketNo]; + int j = hashtable->skewBucketNums[hjstate->hj_CurSkewBucketNo]; hashTuple = hashtable->skewBucket[j]->tuples; hjstate->hj_CurSkewBucketNo++; @@ -1020,7 +1018,7 @@ ExecScanHashTableForUnmatched(HashJoinState *hjstate, ExprContext *econtext) /* insert hashtable's tuple into exec slot */ inntuple = ExecStoreMinimalTuple(HJTUPLE_MINTUPLE(hashTuple), hjstate->hj_HashTupleSlot, - false); /* do not pfree */ + false); /* do not pfree */ econtext->ecxt_innertuple = inntuple; /* @@ -1091,7 +1089,7 @@ ExecHashTableResetMatchFlags(HashJoinTable hashtable) /* ... and the same for the skew buckets, if any */ for (i = 0; i < hashtable->nSkewBuckets; i++) { - int j = hashtable->skewBucketNums[i]; + int j = hashtable->skewBucketNums[i]; HashSkewBucket *skewBucket = hashtable->skewBucket[j]; for (tuple = skewBucket->tuples; tuple != NULL; tuple = tuple->next) diff --git a/src/backend/executor/nodeHashjoin.c b/src/backend/executor/nodeHashjoin.c index a6847c956f..7c02db94ad 100644 --- a/src/backend/executor/nodeHashjoin.c +++ b/src/backend/executor/nodeHashjoin.c @@ -113,6 +113,7 @@ ExecHashJoin(HashJoinState *node) switch (node->hj_JoinState) { case HJ_BUILD_HASHTABLE: + /* * First time through: build hash table for inner relation. */ @@ -123,12 +124,12 @@ ExecHashJoin(HashJoinState *node) * right/full join, we can quit without building the hash * table. However, for an inner join it is only a win to * check this when the outer relation's startup cost is less - * than the projected cost of building the hash - * table. Otherwise it's best to build the hash table first - * and see if the inner relation is empty. (When it's a left - * join, we should always make this check, since we aren't - * going to be able to skip the join on the strength of an - * empty inner relation anyway.) + * than the projected cost of building the hash table. + * Otherwise it's best to build the hash table first and see + * if the inner relation is empty. (When it's a left join, we + * should always make this check, since we aren't going to be + * able to skip the join on the strength of an empty inner + * relation anyway.) * * If we are rescanning the join, we make use of information * gained on the previous scan: don't bother to try the @@ -185,8 +186,8 @@ ExecHashJoin(HashJoinState *node) return NULL; /* - * need to remember whether nbatch has increased since we began - * scanning the outer relation + * need to remember whether nbatch has increased since we + * began scanning the outer relation */ hashtable->nbatch_outstart = hashtable->nbatch; @@ -202,6 +203,7 @@ ExecHashJoin(HashJoinState *node) /* FALL THRU */ case HJ_NEED_NEW_OUTER: + /* * We don't have an outer tuple, try to get the next one */ @@ -250,7 +252,7 @@ ExecHashJoin(HashJoinState *node) Assert(batchno > hashtable->curbatch); ExecHashJoinSaveTuple(ExecFetchSlotMinimalTuple(outerTupleSlot), hashvalue, - &hashtable->outerBatchFile[batchno]); + &hashtable->outerBatchFile[batchno]); /* Loop around, staying in HJ_NEED_NEW_OUTER state */ continue; } @@ -261,6 +263,7 @@ ExecHashJoin(HashJoinState *node) /* FALL THRU */ case HJ_SCAN_BUCKET: + /* * Scan the selected hash bucket for matches to current outer */ @@ -296,8 +299,8 @@ ExecHashJoin(HashJoinState *node) } /* - * In a semijoin, we'll consider returning the first match, - * but after that we're done with this outer tuple. + * In a semijoin, we'll consider returning the first + * match, but after that we're done with this outer tuple. */ if (node->js.jointype == JOIN_SEMI) node->hj_JoinState = HJ_NEED_NEW_OUTER; @@ -320,10 +323,11 @@ ExecHashJoin(HashJoinState *node) break; case HJ_FILL_OUTER_TUPLE: + /* * The current outer tuple has run out of matches, so check - * whether to emit a dummy outer-join tuple. Whether we - * emit one or not, the next state is NEED_NEW_OUTER. + * whether to emit a dummy outer-join tuple. Whether we emit + * one or not, the next state is NEED_NEW_OUTER. */ node->hj_JoinState = HJ_NEED_NEW_OUTER; @@ -354,6 +358,7 @@ ExecHashJoin(HashJoinState *node) break; case HJ_FILL_INNER_TUPLES: + /* * We have finished a batch, but we are doing right/full join, * so any unmatched inner tuples in the hashtable have to be @@ -389,11 +394,12 @@ ExecHashJoin(HashJoinState *node) break; case HJ_NEED_NEW_BATCH: + /* * Try to advance to next batch. Done if there are no more. */ if (!ExecHashJoinNewBatch(node)) - return NULL; /* end of join */ + return NULL; /* end of join */ node->hj_JoinState = HJ_NEED_NEW_OUTER; break; @@ -783,7 +789,7 @@ ExecHashJoinNewBatch(HashJoinState *hjstate) } if (curbatch >= nbatch) - return false; /* no more batches */ + return false; /* no more batches */ hashtable->curbatch = curbatch; @@ -829,7 +835,7 @@ ExecHashJoinNewBatch(HashJoinState *hjstate) if (BufFileSeek(hashtable->outerBatchFile[curbatch], 0, 0L, SEEK_SET)) ereport(ERROR, (errcode_for_file_access(), - errmsg("could not rewind hash-join temporary file: %m"))); + errmsg("could not rewind hash-join temporary file: %m"))); } return true; @@ -944,14 +950,13 @@ ExecReScanHashJoin(HashJoinState *node) ExecHashTableResetMatchFlags(node->hj_HashTable); /* - * Also, we need to reset our state about the emptiness of - * the outer relation, so that the new scan of the outer will - * update it correctly if it turns out to be empty this time. - * (There's no harm in clearing it now because ExecHashJoin won't - * need the info. In the other cases, where the hash table - * doesn't exist or we are destroying it, we leave this state - * alone because ExecHashJoin will need it the first time - * through.) + * Also, we need to reset our state about the emptiness of the + * outer relation, so that the new scan of the outer will update + * it correctly if it turns out to be empty this time. (There's no + * harm in clearing it now because ExecHashJoin won't need the + * info. In the other cases, where the hash table doesn't exist + * or we are destroying it, we leave this state alone because + * ExecHashJoin will need it the first time through.) */ node->hj_OuterNotEmpty = false; diff --git a/src/backend/executor/nodeIndexscan.c b/src/backend/executor/nodeIndexscan.c index 3b8741fc21..d8e59ca39e 100644 --- a/src/backend/executor/nodeIndexscan.c +++ b/src/backend/executor/nodeIndexscan.c @@ -212,7 +212,7 @@ ExecIndexEvalRuntimeKeys(ExprContext *econtext, /* * For each run-time key, extract the run-time expression and evaluate - * it with respect to the current context. We then stick the result + * it with respect to the current context. We then stick the result * into the proper scan key. * * Note: the result of the eval could be a pass-by-ref value that's @@ -605,16 +605,16 @@ ExecInitIndexScan(IndexScan *node, EState *estate, int eflags) indexstate->iss_RelationDesc, estate->es_snapshot, indexstate->iss_NumScanKeys, - indexstate->iss_NumOrderByKeys); + indexstate->iss_NumOrderByKeys); /* - * If no run-time keys to calculate, go ahead and pass the scankeys to - * the index AM. + * If no run-time keys to calculate, go ahead and pass the scankeys to the + * index AM. */ if (indexstate->iss_NumRuntimeKeys == 0) index_rescan(indexstate->iss_ScanDesc, indexstate->iss_ScanKeys, indexstate->iss_NumScanKeys, - indexstate->iss_OrderByKeys, indexstate->iss_NumOrderByKeys); + indexstate->iss_OrderByKeys, indexstate->iss_NumOrderByKeys); /* * all done. @@ -703,11 +703,11 @@ ExecIndexBuildScanKeys(PlanState *planstate, Relation index, Index scanrelid, scan_keys = (ScanKey) palloc(n_scan_keys * sizeof(ScanKeyData)); /* - * runtime_keys array is dynamically resized as needed. We handle it - * this way so that the same runtime keys array can be shared between - * indexquals and indexorderbys, which will be processed in separate - * calls of this function. Caller must be sure to pass in NULL/0 for - * first call. + * runtime_keys array is dynamically resized as needed. We handle it this + * way so that the same runtime keys array can be shared between + * indexquals and indexorderbys, which will be processed in separate calls + * of this function. Caller must be sure to pass in NULL/0 for first + * call. */ runtime_keys = *runtimeKeys; n_runtime_keys = max_runtime_keys = *numRuntimeKeys; diff --git a/src/backend/executor/nodeLimit.c b/src/backend/executor/nodeLimit.c index edbe0558b7..85d1a6e27f 100644 --- a/src/backend/executor/nodeLimit.c +++ b/src/backend/executor/nodeLimit.c @@ -346,14 +346,14 @@ pass_down_bound(LimitState *node, PlanState *child_node) else if (IsA(child_node, ResultState)) { /* - * An extra consideration here is that if the Result is projecting - * a targetlist that contains any SRFs, we can't assume that every - * input tuple generates an output tuple, so a Sort underneath - * might need to return more than N tuples to satisfy LIMIT N. - * So we cannot use bounded sort. + * An extra consideration here is that if the Result is projecting a + * targetlist that contains any SRFs, we can't assume that every input + * tuple generates an output tuple, so a Sort underneath might need to + * return more than N tuples to satisfy LIMIT N. So we cannot use + * bounded sort. * - * If Result supported qual checking, we'd have to punt on seeing - * a qual, too. Note that having a resconstantqual is not a + * If Result supported qual checking, we'd have to punt on seeing a + * qual, too. Note that having a resconstantqual is not a * showstopper: if that fails we're not getting any rows at all. */ if (outerPlanState(child_node) && diff --git a/src/backend/executor/nodeLockRows.c b/src/backend/executor/nodeLockRows.c index 2e08008807..d71278ebd7 100644 --- a/src/backend/executor/nodeLockRows.c +++ b/src/backend/executor/nodeLockRows.c @@ -291,7 +291,7 @@ ExecInitLockRows(LockRows *node, EState *estate, int eflags) /* * Locate the ExecRowMark(s) that this node is responsible for, and - * construct ExecAuxRowMarks for them. (InitPlan should already have + * construct ExecAuxRowMarks for them. (InitPlan should already have * built the global list of ExecRowMarks.) */ lrstate->lr_arowMarks = NIL; diff --git a/src/backend/executor/nodeMergeAppend.c b/src/backend/executor/nodeMergeAppend.c index 73920f21c8..4ebe0cbe03 100644 --- a/src/backend/executor/nodeMergeAppend.c +++ b/src/backend/executor/nodeMergeAppend.c @@ -48,8 +48,8 @@ * contains integers which index into the slots array. These typedefs try to * clear it up, but they're only documentation. */ -typedef int SlotNumber; -typedef int HeapPosition; +typedef int SlotNumber; +typedef int HeapPosition; static void heap_insert_slot(MergeAppendState *node, SlotNumber new_slot); static void heap_siftup_slot(MergeAppendState *node); @@ -128,13 +128,13 @@ ExecInitMergeAppend(MergeAppend *node, EState *estate, int eflags) * initialize sort-key information */ mergestate->ms_nkeys = node->numCols; - mergestate->ms_scankeys = palloc0(sizeof(ScanKeyData) * node->numCols); + mergestate->ms_scankeys = palloc0(sizeof(ScanKeyData) * node->numCols); for (i = 0; i < node->numCols; i++) { - Oid sortFunction; - bool reverse; - int flags; + Oid sortFunction; + bool reverse; + int flags; if (!get_compare_function_for_ordering_op(node->sortOperators[i], &sortFunction, &reverse)) @@ -187,8 +187,8 @@ ExecMergeAppend(MergeAppendState *node) if (!node->ms_initialized) { /* - * First time through: pull the first tuple from each subplan, - * and set up the heap. + * First time through: pull the first tuple from each subplan, and set + * up the heap. */ for (i = 0; i < node->ms_nplans; i++) { @@ -243,7 +243,7 @@ heap_insert_slot(MergeAppendState *node, SlotNumber new_slot) j = node->ms_heap_size++; /* j is where the "hole" is */ while (j > 0) { - int i = (j-1)/2; + int i = (j - 1) / 2; if (heap_compare_slots(node, new_slot, node->ms_heap[i]) >= 0) break; @@ -269,11 +269,11 @@ heap_siftup_slot(MergeAppendState *node) i = 0; /* i is where the "hole" is */ for (;;) { - int j = 2 * i + 1; + int j = 2 * i + 1; if (j >= n) break; - if (j+1 < n && heap_compare_slots(node, heap[j], heap[j+1]) > 0) + if (j + 1 < n && heap_compare_slots(node, heap[j], heap[j + 1]) > 0) j++; if (heap_compare_slots(node, heap[n], heap[j]) <= 0) break; @@ -298,13 +298,13 @@ heap_compare_slots(MergeAppendState *node, SlotNumber slot1, SlotNumber slot2) for (nkey = 0; nkey < node->ms_nkeys; nkey++) { - ScanKey scankey = node->ms_scankeys + nkey; - AttrNumber attno = scankey->sk_attno; - Datum datum1, - datum2; - bool isNull1, - isNull2; - int32 compare; + ScanKey scankey = node->ms_scankeys + nkey; + AttrNumber attno = scankey->sk_attno; + Datum datum1, + datum2; + bool isNull1, + isNull2; + int32 compare; datum1 = slot_getattr(s1, attno, &isNull1); datum2 = slot_getattr(s2, attno, &isNull2); diff --git a/src/backend/executor/nodeMergejoin.c b/src/backend/executor/nodeMergejoin.c index 75c3a64535..ce5462e961 100644 --- a/src/backend/executor/nodeMergejoin.c +++ b/src/backend/executor/nodeMergejoin.c @@ -143,7 +143,7 @@ typedef struct MergeJoinClauseData bool reverse; /* if true, negate the cmpfn's output */ bool nulls_first; /* if true, nulls sort low */ FmgrInfo cmpfinfo; -} MergeJoinClauseData; +} MergeJoinClauseData; /* Result type for MJEvalOuterValues and MJEvalInnerValues */ typedef enum diff --git a/src/backend/executor/nodeModifyTable.c b/src/backend/executor/nodeModifyTable.c index f10f70a17d..c0eab4bf0d 100644 --- a/src/backend/executor/nodeModifyTable.c +++ b/src/backend/executor/nodeModifyTable.c @@ -544,7 +544,7 @@ ExecUpdate(ItemPointer tupleid, * * If we generate a new candidate tuple after EvalPlanQual testing, we * must loop back here and recheck constraints. (We don't need to - * redo triggers, however. If there are any BEFORE triggers then + * redo triggers, however. If there are any BEFORE triggers then * trigger.c will have done heap_lock_tuple to lock the correct tuple, * so there's no need to do them again.) */ @@ -608,11 +608,10 @@ lreplace:; /* * Note: instead of having to update the old index tuples associated - * with the heap tuple, all we do is form and insert new index - * tuples. This is because UPDATEs are actually DELETEs and INSERTs, - * and index tuple deletion is done later by VACUUM (see notes in - * ExecDelete). All we do here is insert new index tuples. -cim - * 9/27/89 + * with the heap tuple, all we do is form and insert new index tuples. + * This is because UPDATEs are actually DELETEs and INSERTs, and index + * tuple deletion is done later by VACUUM (see notes in ExecDelete). + * All we do here is insert new index tuples. -cim 9/27/89 */ /* @@ -713,7 +712,7 @@ ExecModifyTable(ModifyTableState *node) TupleTableSlot *planSlot; ItemPointer tupleid = NULL; ItemPointerData tuple_ctid; - HeapTupleHeader oldtuple = NULL; + HeapTupleHeader oldtuple = NULL; /* * If we've already completed processing, don't try to do more. We need @@ -740,7 +739,7 @@ ExecModifyTable(ModifyTableState *node) /* * es_result_relation_info must point to the currently active result - * relation while we are within this ModifyTable node. Even though + * relation while we are within this ModifyTable node. Even though * ModifyTable nodes can't be nested statically, they can be nested * dynamically (since our subplan could include a reference to a modifying * CTE). So we have to save and restore the caller's value. @@ -756,7 +755,7 @@ ExecModifyTable(ModifyTableState *node) for (;;) { /* - * Reset the per-output-tuple exprcontext. This is needed because + * Reset the per-output-tuple exprcontext. This is needed because * triggers expect to use that context as workspace. It's a bit ugly * to do this below the top level of the plan, however. We might need * to rethink this later. @@ -806,7 +805,8 @@ ExecModifyTable(ModifyTableState *node) elog(ERROR, "ctid is NULL"); tupleid = (ItemPointer) DatumGetPointer(datum); - tuple_ctid = *tupleid; /* be sure we don't free ctid!! */ + tuple_ctid = *tupleid; /* be sure we don't free + * ctid!! */ tupleid = &tuple_ctid; } else @@ -836,11 +836,11 @@ ExecModifyTable(ModifyTableState *node) break; case CMD_UPDATE: slot = ExecUpdate(tupleid, oldtuple, slot, planSlot, - &node->mt_epqstate, estate, node->canSetTag); + &node->mt_epqstate, estate, node->canSetTag); break; case CMD_DELETE: slot = ExecDelete(tupleid, oldtuple, planSlot, - &node->mt_epqstate, estate, node->canSetTag); + &node->mt_epqstate, estate, node->canSetTag); break; default: elog(ERROR, "unknown operation"); @@ -922,9 +922,9 @@ ExecInitModifyTable(ModifyTable *node, EState *estate, int eflags) /* * call ExecInitNode on each of the plans to be executed and save the - * results into the array "mt_plans". This is also a convenient place - * to verify that the proposed target relations are valid and open their - * indexes for insertion of new index entries. Note we *must* set + * results into the array "mt_plans". This is also a convenient place to + * verify that the proposed target relations are valid and open their + * indexes for insertion of new index entries. Note we *must* set * estate->es_result_relation_info correctly while we initialize each * sub-plan; ExecContextForcesOids depends on that! */ @@ -944,7 +944,7 @@ ExecInitModifyTable(ModifyTable *node, EState *estate, int eflags) /* * If there are indices on the result relation, open them and save * descriptors in the result relation info, so that we can add new - * index entries for the tuples we add/update. We need not do this + * index entries for the tuples we add/update. We need not do this * for a DELETE, however, since deletion doesn't affect indexes. */ if (resultRelInfo->ri_RelationDesc->rd_rel->relhasindex && @@ -1147,10 +1147,10 @@ ExecInitModifyTable(ModifyTable *node, EState *estate, int eflags) * Lastly, if this is not the primary (canSetTag) ModifyTable node, add it * to estate->es_auxmodifytables so that it will be run to completion by * ExecPostprocessPlan. (It'd actually work fine to add the primary - * ModifyTable node too, but there's no need.) Note the use of lcons - * not lappend: we need later-initialized ModifyTable nodes to be shut - * down before earlier ones. This ensures that we don't throw away - * RETURNING rows that need to be seen by a later CTE subplan. + * ModifyTable node too, but there's no need.) Note the use of lcons not + * lappend: we need later-initialized ModifyTable nodes to be shut down + * before earlier ones. This ensures that we don't throw away RETURNING + * rows that need to be seen by a later CTE subplan. */ if (!mtstate->canSetTag) estate->es_auxmodifytables = lcons(mtstate, diff --git a/src/backend/executor/nodeNestloop.c b/src/backend/executor/nodeNestloop.c index 4893a6ea6d..e98bc0f5a3 100644 --- a/src/backend/executor/nodeNestloop.c +++ b/src/backend/executor/nodeNestloop.c @@ -137,9 +137,8 @@ ExecNestLoop(NestLoopState *node) node->nl_MatchedOuter = false; /* - * fetch the values of any outer Vars that must be passed to - * the inner scan, and store them in the appropriate PARAM_EXEC - * slots. + * fetch the values of any outer Vars that must be passed to the + * inner scan, and store them in the appropriate PARAM_EXEC slots. */ foreach(lc, nl->nestParams) { @@ -330,9 +329,9 @@ ExecInitNestLoop(NestLoop *node, EState *estate, int eflags) * * If we have no parameters to pass into the inner rel from the outer, * tell the inner child that cheap rescans would be good. If we do have - * such parameters, then there is no point in REWIND support at all in - * the inner child, because it will always be rescanned with fresh - * parameter values. + * such parameters, then there is no point in REWIND support at all in the + * inner child, because it will always be rescanned with fresh parameter + * values. */ outerPlanState(nlstate) = ExecInitNode(outerPlan(node), estate, eflags); if (node->nestParams == NIL) diff --git a/src/backend/executor/nodeRecursiveunion.c b/src/backend/executor/nodeRecursiveunion.c index 84c051854b..12e1b9a585 100644 --- a/src/backend/executor/nodeRecursiveunion.c +++ b/src/backend/executor/nodeRecursiveunion.c @@ -29,7 +29,7 @@ typedef struct RUHashEntryData *RUHashEntry; typedef struct RUHashEntryData { TupleHashEntryData shared; /* common header for hash table entries */ -} RUHashEntryData; +} RUHashEntryData; /* diff --git a/src/backend/executor/nodeSetOp.c b/src/backend/executor/nodeSetOp.c index aa352d7822..9106f14873 100644 --- a/src/backend/executor/nodeSetOp.c +++ b/src/backend/executor/nodeSetOp.c @@ -76,7 +76,7 @@ typedef struct SetOpHashEntryData { TupleHashEntryData shared; /* common header for hash table entries */ SetOpStatePerGroupData pergroup; -} SetOpHashEntryData; +} SetOpHashEntryData; static TupleTableSlot *setop_retrieve_direct(SetOpState *setopstate); diff --git a/src/backend/executor/nodeWindowAgg.c b/src/backend/executor/nodeWindowAgg.c index 5680efeb69..25d9298cef 100644 --- a/src/backend/executor/nodeWindowAgg.c +++ b/src/backend/executor/nodeWindowAgg.c @@ -92,7 +92,7 @@ typedef struct WindowStatePerFuncData int aggno; /* if so, index of its PerAggData */ WindowObject winobj; /* object used in window function API */ -} WindowStatePerFuncData; +} WindowStatePerFuncData; /* * For plain aggregate window functions, we also have one of these. diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c index a717a0deea..6e723ca092 100644 --- a/src/backend/executor/spi.c +++ b/src/backend/executor/spi.c @@ -1787,8 +1787,8 @@ _SPI_execute_plan(SPIPlanPtr plan, ParamListInfo paramLI, * snapshot != InvalidSnapshot, read_only = true: use exactly the given * snapshot. * - * snapshot != InvalidSnapshot, read_only = false: use the given - * snapshot, modified by advancing its command ID before each querytree. + * snapshot != InvalidSnapshot, read_only = false: use the given snapshot, + * modified by advancing its command ID before each querytree. * * snapshot == InvalidSnapshot, read_only = true: use the entry-time * ActiveSnapshot, if any (if there isn't one, we run with no snapshot). @@ -1797,8 +1797,8 @@ _SPI_execute_plan(SPIPlanPtr plan, ParamListInfo paramLI, * snapshot for each user command, and advance its command ID before each * querytree within the command. * - * In the first two cases, we can just push the snap onto the stack - * once for the whole plan list. + * In the first two cases, we can just push the snap onto the stack once + * for the whole plan list. */ if (snapshot != InvalidSnapshot) { @@ -2028,7 +2028,7 @@ _SPI_convert_params(int nargs, Oid *argtypes, /* sizeof(ParamListInfoData) includes the first array element */ paramLI = (ParamListInfo) palloc(sizeof(ParamListInfoData) + - (nargs - 1) *sizeof(ParamExternData)); + (nargs - 1) * sizeof(ParamExternData)); /* we have static list of params, so no hooks needed */ paramLI->paramFetch = NULL; paramLI->paramFetchArg = NULL; diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c index 151ec5613b..d003b1206a 100644 --- a/src/backend/libpq/auth.c +++ b/src/backend/libpq/auth.c @@ -61,6 +61,7 @@ static int recv_and_check_password_packet(Port *port); #define IDENT_PORT 113 static int ident_inet(hbaPort *port); + #ifdef HAVE_UNIX_SOCKETS static int auth_peer(hbaPort *port); #endif @@ -182,7 +183,7 @@ static int pg_GSS_recvauth(Port *port); *---------------------------------------------------------------- */ #ifdef ENABLE_SSPI -typedef SECURITY_STATUS +typedef SECURITY_STATUS (WINAPI * QUERY_SECURITY_CONTEXT_TOKEN_FN) ( PCtxtHandle, void **); static int pg_SSPI_recvauth(Port *port); @@ -543,7 +544,7 @@ ClientAuthentication(Port *port) } #endif status = auth_peer(port); -#else /* HAVE_UNIX_SOCKETS */ +#else /* HAVE_UNIX_SOCKETS */ Assert(false); #endif break; @@ -598,7 +599,7 @@ ClientAuthentication(Port *port) } if (ClientAuthentication_hook) - (*ClientAuthentication_hook)(port, status); + (*ClientAuthentication_hook) (port, status); if (status == STATUS_OK) sendAuthRequest(port, AUTH_REQ_OK); @@ -844,7 +845,7 @@ pg_krb5_recvauth(Port *port) return ret; retval = krb5_recvauth(pg_krb5_context, &auth_context, - (krb5_pointer) & port->sock, pg_krb_srvnam, + (krb5_pointer) &port->sock, pg_krb_srvnam, pg_krb5_server, 0, pg_krb5_keytab, &ticket); if (retval) { @@ -1814,7 +1815,6 @@ auth_peer(hbaPort *port) } strlcpy(ident_user, pass->pw_name, IDENT_USERNAME_MAX + 1); - #elif defined(SO_PEERCRED) /* Linux style: use getsockopt(SO_PEERCRED) */ struct ucred peercred; @@ -1843,7 +1843,6 @@ auth_peer(hbaPort *port) } strlcpy(ident_user, pass->pw_name, IDENT_USERNAME_MAX + 1); - #elif defined(HAVE_GETPEERUCRED) /* Solaris > 10 */ uid_t uid; @@ -1879,7 +1878,6 @@ auth_peer(hbaPort *port) } strlcpy(ident_user, pass->pw_name, IDENT_USERNAME_MAX + 1); - #elif defined(HAVE_STRUCT_CMSGCRED) || defined(HAVE_STRUCT_FCRED) || (defined(HAVE_STRUCT_SOCKCRED) && defined(LOCAL_CREDS)) struct msghdr msg; @@ -1947,7 +1945,6 @@ auth_peer(hbaPort *port) } strlcpy(ident_user, pw->pw_name, IDENT_USERNAME_MAX + 1); - #else ereport(LOG, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), @@ -2768,10 +2765,10 @@ CheckRADIUSAuth(Port *port) pg_freeaddrinfo_all(hint.ai_family, serveraddrs); /* - * Figure out at what time we should time out. We can't just use - * a single call to select() with a timeout, since somebody can - * be sending invalid packets to our port thus causing us to - * retry in a loop and never time out. + * Figure out at what time we should time out. We can't just use a single + * call to select() with a timeout, since somebody can be sending invalid + * packets to our port thus causing us to retry in a loop and never time + * out. */ gettimeofday(&endtime, NULL); endtime.tv_sec += RADIUS_TIMEOUT; @@ -2780,7 +2777,7 @@ CheckRADIUSAuth(Port *port) { struct timeval timeout; struct timeval now; - int64 timeoutval; + int64 timeoutval; gettimeofday(&now, NULL); timeoutval = (endtime.tv_sec * 1000000 + endtime.tv_usec) - (now.tv_sec * 1000000 + now.tv_usec); @@ -2820,12 +2817,12 @@ CheckRADIUSAuth(Port *port) /* * Attempt to read the response packet, and verify the contents. * - * Any packet that's not actually a RADIUS packet, or otherwise - * does not validate as an explicit reject, is just ignored and - * we retry for another packet (until we reach the timeout). This - * is to avoid the possibility to denial-of-service the login by - * flooding the server with invalid packets on the port that - * we're expecting the RADIUS response on. + * Any packet that's not actually a RADIUS packet, or otherwise does + * not validate as an explicit reject, is just ignored and we retry + * for another packet (until we reach the timeout). This is to avoid + * the possibility to denial-of-service the login by flooding the + * server with invalid packets on the port that we're expecting the + * RADIUS response on. */ addrsize = sizeof(remoteaddr); @@ -2846,12 +2843,12 @@ CheckRADIUSAuth(Port *port) { #ifdef HAVE_IPV6 ereport(LOG, - (errmsg("RADIUS response was sent from incorrect port: %i", - ntohs(remoteaddr.sin6_port)))); + (errmsg("RADIUS response was sent from incorrect port: %i", + ntohs(remoteaddr.sin6_port)))); #else ereport(LOG, - (errmsg("RADIUS response was sent from incorrect port: %i", - ntohs(remoteaddr.sin_port)))); + (errmsg("RADIUS response was sent from incorrect port: %i", + ntohs(remoteaddr.sin_port)))); #endif continue; } @@ -2885,12 +2882,12 @@ CheckRADIUSAuth(Port *port) */ cryptvector = palloc(packetlength + strlen(port->hba->radiussecret)); - memcpy(cryptvector, receivepacket, 4); /* code+id+length */ - memcpy(cryptvector + 4, packet->vector, RADIUS_VECTOR_LENGTH); /* request - * authenticator, from - * original packet */ - if (packetlength > RADIUS_HEADER_LENGTH) /* there may be no attributes - * at all */ + memcpy(cryptvector, receivepacket, 4); /* code+id+length */ + memcpy(cryptvector + 4, packet->vector, RADIUS_VECTOR_LENGTH); /* request + * authenticator, from + * original packet */ + if (packetlength > RADIUS_HEADER_LENGTH) /* there may be no + * attributes at all */ memcpy(cryptvector + RADIUS_HEADER_LENGTH, receive_buffer + RADIUS_HEADER_LENGTH, packetlength - RADIUS_HEADER_LENGTH); memcpy(cryptvector + packetlength, port->hba->radiussecret, strlen(port->hba->radiussecret)); @@ -2899,7 +2896,7 @@ CheckRADIUSAuth(Port *port) encryptedpassword)) { ereport(LOG, - (errmsg("could not perform MD5 encryption of received packet"))); + (errmsg("could not perform MD5 encryption of received packet"))); pfree(cryptvector); continue; } @@ -2925,9 +2922,9 @@ CheckRADIUSAuth(Port *port) else { ereport(LOG, - (errmsg("RADIUS response has invalid code (%i) for user \"%s\"", - receivepacket->code, port->user_name))); + (errmsg("RADIUS response has invalid code (%i) for user \"%s\"", + receivepacket->code, port->user_name))); continue; } - } /* while (true) */ + } /* while (true) */ } diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c index 2def6cea89..fdc29aaa72 100644 --- a/src/backend/libpq/hba.c +++ b/src/backend/libpq/hba.c @@ -543,7 +543,7 @@ check_db(const char *dbname, const char *role, Oid roleid, char *param_str) } static bool -ipv4eq(struct sockaddr_in *a, struct sockaddr_in *b) +ipv4eq(struct sockaddr_in * a, struct sockaddr_in * b) { return (a->sin_addr.s_addr == b->sin_addr.s_addr); } @@ -551,9 +551,9 @@ ipv4eq(struct sockaddr_in *a, struct sockaddr_in *b) #ifdef HAVE_IPV6 static bool -ipv6eq(struct sockaddr_in6 *a, struct sockaddr_in6 *b) +ipv6eq(struct sockaddr_in6 * a, struct sockaddr_in6 * b) { - int i; + int i; for (i = 0; i < 16; i++) if (a->sin6_addr.s6_addr[i] != b->sin6_addr.s6_addr[i]) @@ -561,8 +561,7 @@ ipv6eq(struct sockaddr_in6 *a, struct sockaddr_in6 *b) return true; } - -#endif /* HAVE_IPV6 */ +#endif /* HAVE_IPV6 */ /* * Check whether host name matches pattern. @@ -572,8 +571,8 @@ hostname_match(const char *pattern, const char *actual_hostname) { if (pattern[0] == '.') /* suffix match */ { - size_t plen = strlen(pattern); - size_t hlen = strlen(actual_hostname); + size_t plen = strlen(pattern); + size_t hlen = strlen(actual_hostname); if (hlen < plen) return false; @@ -590,7 +589,8 @@ hostname_match(const char *pattern, const char *actual_hostname) static bool check_hostname(hbaPort *port, const char *hostname) { - struct addrinfo *gai_result, *gai; + struct addrinfo *gai_result, + *gai; int ret; bool found; @@ -632,7 +632,7 @@ check_hostname(hbaPort *port, const char *hostname) if (gai->ai_addr->sa_family == AF_INET) { if (ipv4eq((struct sockaddr_in *) gai->ai_addr, - (struct sockaddr_in *) &port->raddr.addr)) + (struct sockaddr_in *) & port->raddr.addr)) { found = true; break; @@ -642,7 +642,7 @@ check_hostname(hbaPort *port, const char *hostname) else if (gai->ai_addr->sa_family == AF_INET6) { if (ipv6eq((struct sockaddr_in6 *) gai->ai_addr, - (struct sockaddr_in6 *) &port->raddr.addr)) + (struct sockaddr_in6 *) & port->raddr.addr)) { found = true; break; @@ -974,8 +974,8 @@ parse_hba_line(List *line, int line_num, HbaLine *parsedline) (errcode(ERRCODE_CONFIG_FILE_ERROR), errmsg("specifying both host name and CIDR mask is invalid: \"%s\"", token), - errcontext("line %d of configuration file \"%s\"", - line_num, HbaFileName))); + errcontext("line %d of configuration file \"%s\"", + line_num, HbaFileName))); pfree(token); return false; } diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c index 3232e64d4a..b83a2efb69 100644 --- a/src/backend/libpq/pqcomm.c +++ b/src/backend/libpq/pqcomm.c @@ -85,7 +85,7 @@ #ifdef HAVE_UTIME_H #include #endif -#ifdef WIN32_ONLY_COMPILER /* mstcpip.h is missing on mingw */ +#ifdef WIN32_ONLY_COMPILER /* mstcpip.h is missing on mingw */ #include #endif @@ -745,7 +745,7 @@ TouchSocketFile(void) */ /* -------------------------------- - * pq_set_nonblocking - set socket blocking/non-blocking + * pq_set_nonblocking - set socket blocking/non-blocking * * Sets the socket non-blocking if nonblocking is TRUE, or sets it * blocking otherwise. @@ -760,16 +760,17 @@ pq_set_nonblocking(bool nonblocking) #ifdef WIN32 pgwin32_noblock = nonblocking ? 1 : 0; #else + /* - * Use COMMERROR on failure, because ERROR would try to send the error - * to the client, which might require changing the mode again, leading - * to infinite recursion. + * Use COMMERROR on failure, because ERROR would try to send the error to + * the client, which might require changing the mode again, leading to + * infinite recursion. */ if (nonblocking) { if (!pg_set_noblock(MyProcPort->sock)) ereport(COMMERROR, - (errmsg("could not set socket to non-blocking mode: %m"))); + (errmsg("could not set socket to non-blocking mode: %m"))); } else { @@ -903,18 +904,17 @@ pq_getbyte_if_available(unsigned char *c) { /* * Ok if no data available without blocking or interrupted (though - * EINTR really shouldn't happen with a non-blocking socket). - * Report other errors. + * EINTR really shouldn't happen with a non-blocking socket). Report + * other errors. */ if (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR) r = 0; else { /* - * Careful: an ereport() that tries to write to the client - * would cause recursion to here, leading to stack overflow - * and core dump! This message must go *only* to the - * postmaster log. + * Careful: an ereport() that tries to write to the client would + * cause recursion to here, leading to stack overflow and core + * dump! This message must go *only* to the postmaster log. */ ereport(COMMERROR, (errcode_for_socket_access(), @@ -1219,8 +1219,8 @@ internal_flush(void) continue; /* Ok if we were interrupted */ /* - * Ok if no data writable without blocking, and the socket - * is in non-blocking mode. + * Ok if no data writable without blocking, and the socket is in + * non-blocking mode. */ if (errno == EAGAIN || errno == EWOULDBLOCK) @@ -1369,8 +1369,8 @@ fail: void pq_putmessage_noblock(char msgtype, const char *s, size_t len) { - int res; - int required; + int res; + int required; /* * Ensure we have enough space in the output buffer for the message header @@ -1383,7 +1383,8 @@ pq_putmessage_noblock(char msgtype, const char *s, size_t len) PqSendBufferSize = required; } res = pq_putmessage(msgtype, s, len); - Assert(res == 0); /* should not fail when the message fits in buffer */ + Assert(res == 0); /* should not fail when the message fits in + * buffer */ } @@ -1434,13 +1435,13 @@ pq_endcopyout(bool errorAbort) static int pq_setkeepaliveswin32(Port *port, int idle, int interval) { - struct tcp_keepalive ka; - DWORD retsize; + struct tcp_keepalive ka; + DWORD retsize; if (idle <= 0) - idle = 2 * 60 * 60; /* default = 2 hours */ + idle = 2 * 60 * 60; /* default = 2 hours */ if (interval <= 0) - interval = 1; /* default = 1 second */ + interval = 1; /* default = 1 second */ ka.onoff = 1; ka.keepalivetime = idle * 1000; @@ -1500,11 +1501,11 @@ pq_getkeepalivesidle(Port *port) elog(LOG, "getsockopt(TCP_KEEPALIVE) failed: %m"); port->default_keepalives_idle = -1; /* don't know */ } -#endif /* TCP_KEEPIDLE */ -#else /* WIN32 */ +#endif /* TCP_KEEPIDLE */ +#else /* WIN32 */ /* We can't get the defaults on Windows, so return "don't know" */ port->default_keepalives_idle = -1; -#endif /* WIN32 */ +#endif /* WIN32 */ } return port->default_keepalives_idle; @@ -1555,10 +1556,10 @@ pq_setkeepalivesidle(int idle, Port *port) #endif port->keepalives_idle = idle; -#else /* WIN32 */ +#else /* WIN32 */ return pq_setkeepaliveswin32(port, idle, port->keepalives_interval); #endif -#else /* TCP_KEEPIDLE || SIO_KEEPALIVE_VALS */ +#else /* TCP_KEEPIDLE || SIO_KEEPALIVE_VALS */ if (idle != 0) { elog(LOG, "setting the keepalive idle time is not supported"); @@ -1593,7 +1594,7 @@ pq_getkeepalivesinterval(Port *port) #else /* We can't get the defaults on Windows, so return "don't know" */ port->default_keepalives_interval = -1; -#endif /* WIN32 */ +#endif /* WIN32 */ } return port->default_keepalives_interval; @@ -1635,7 +1636,7 @@ pq_setkeepalivesinterval(int interval, Port *port) } port->keepalives_interval = interval; -#else /* WIN32 */ +#else /* WIN32 */ return pq_setkeepaliveswin32(port, port->keepalives_idle, interval); #endif #else diff --git a/src/backend/main/main.c b/src/backend/main/main.c index 43d182b4db..c4ef56dc6c 100644 --- a/src/backend/main/main.c +++ b/src/backend/main/main.c @@ -204,7 +204,7 @@ main(int argc, char *argv[]) /* * Place platform-specific startup hacks here. This is the right * place to put code that must be executed early in the launch of any new - * server process. Note that this code will NOT be executed when a backend + * server process. Note that this code will NOT be executed when a backend * or sub-bootstrap process is forked, unless we are in a fork/exec * environment (ie EXEC_BACKEND is defined). * @@ -218,8 +218,8 @@ startup_hacks(const char *progname) /* * On some platforms, unaligned memory accesses result in a kernel trap; * the default kernel behavior is to emulate the memory access, but this - * results in a significant performance penalty. We want PG never to - * make such unaligned memory accesses, so this code disables the kernel + * results in a significant performance penalty. We want PG never to make + * such unaligned memory accesses, so this code disables the kernel * emulation: unaligned accesses will result in SIGBUS instead. */ #ifdef NOFIXADE @@ -230,7 +230,7 @@ startup_hacks(const char *progname) #if defined(__alpha) /* no __alpha__ ? */ { - int buffer[] = {SSIN_UACPROC, UAC_SIGBUS | UAC_NOPRINT}; + int buffer[] = {SSIN_UACPROC, UAC_SIGBUS | UAC_NOPRINT}; if (setsysinfo(SSI_NVPAIRS, buffer, 1, (caddr_t) NULL, (unsigned long) NULL) < 0) @@ -238,7 +238,6 @@ startup_hacks(const char *progname) progname, strerror(errno)); } #endif /* __alpha */ - #endif /* NOFIXADE */ /* diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c index 0eac9826a4..c0d2294317 100644 --- a/src/backend/nodes/copyfuncs.c +++ b/src/backend/nodes/copyfuncs.c @@ -581,7 +581,7 @@ _copyForeignScan(ForeignScan *from) static FdwPlan * _copyFdwPlan(FdwPlan *from) { - FdwPlan *newnode = makeNode(FdwPlan); + FdwPlan *newnode = makeNode(FdwPlan); COPY_SCALAR_FIELD(startup_cost); COPY_SCALAR_FIELD(total_cost); @@ -1468,7 +1468,7 @@ _copyConvertRowtypeExpr(ConvertRowtypeExpr *from) static CollateExpr * _copyCollateExpr(CollateExpr *from) { - CollateExpr *newnode = makeNode(CollateExpr); + CollateExpr *newnode = makeNode(CollateExpr); COPY_NODE_FIELD(arg); COPY_SCALAR_FIELD(collOid); @@ -2269,7 +2269,7 @@ _copyTypeCast(TypeCast *from) static CollateClause * _copyCollateClause(CollateClause *from) { - CollateClause *newnode = makeNode(CollateClause); + CollateClause *newnode = makeNode(CollateClause); COPY_NODE_FIELD(arg); COPY_NODE_FIELD(collname); diff --git a/src/backend/nodes/nodeFuncs.c b/src/backend/nodes/nodeFuncs.c index af1ccb7efe..0e57f6c6d7 100644 --- a/src/backend/nodes/nodeFuncs.c +++ b/src/backend/nodes/nodeFuncs.c @@ -675,10 +675,10 @@ exprCollation(Node *expr) coll = ((NullIfExpr *) expr)->opcollid; break; case T_ScalarArrayOpExpr: - coll = InvalidOid; /* result is always boolean */ + coll = InvalidOid; /* result is always boolean */ break; case T_BoolExpr: - coll = InvalidOid; /* result is always boolean */ + coll = InvalidOid; /* result is always boolean */ break; case T_SubLink: { @@ -736,7 +736,7 @@ exprCollation(Node *expr) coll = ((FieldSelect *) expr)->resultcollid; break; case T_FieldStore: - coll = InvalidOid; /* result is always composite */ + coll = InvalidOid; /* result is always composite */ break; case T_RelabelType: coll = ((RelabelType *) expr)->resultcollid; @@ -748,7 +748,7 @@ exprCollation(Node *expr) coll = ((ArrayCoerceExpr *) expr)->resultcollid; break; case T_ConvertRowtypeExpr: - coll = InvalidOid; /* result is always composite */ + coll = InvalidOid; /* result is always composite */ break; case T_CollateExpr: coll = ((CollateExpr *) expr)->collOid; @@ -763,10 +763,10 @@ exprCollation(Node *expr) coll = ((ArrayExpr *) expr)->array_collid; break; case T_RowExpr: - coll = InvalidOid; /* result is always composite */ + coll = InvalidOid; /* result is always composite */ break; case T_RowCompareExpr: - coll = InvalidOid; /* result is always boolean */ + coll = InvalidOid; /* result is always boolean */ break; case T_CoalesceExpr: coll = ((CoalesceExpr *) expr)->coalescecollid; @@ -775,10 +775,11 @@ exprCollation(Node *expr) coll = ((MinMaxExpr *) expr)->minmaxcollid; break; case T_XmlExpr: + /* * XMLSERIALIZE returns text from non-collatable inputs, so its - * collation is always default. The other cases return boolean - * or XML, which are non-collatable. + * collation is always default. The other cases return boolean or + * XML, which are non-collatable. */ if (((XmlExpr *) expr)->op == IS_XMLSERIALIZE) coll = DEFAULT_COLLATION_OID; @@ -786,10 +787,10 @@ exprCollation(Node *expr) coll = InvalidOid; break; case T_NullTest: - coll = InvalidOid; /* result is always boolean */ + coll = InvalidOid; /* result is always boolean */ break; case T_BooleanTest: - coll = InvalidOid; /* result is always boolean */ + coll = InvalidOid; /* result is always boolean */ break; case T_CoerceToDomain: coll = ((CoerceToDomain *) expr)->resultcollid; @@ -801,7 +802,7 @@ exprCollation(Node *expr) coll = ((SetToDefault *) expr)->collation; break; case T_CurrentOfExpr: - coll = InvalidOid; /* result is always boolean */ + coll = InvalidOid; /* result is always boolean */ break; case T_PlaceHolderVar: coll = exprCollation((Node *) ((PlaceHolderVar *) expr)->phexpr); @@ -907,10 +908,10 @@ exprSetCollation(Node *expr, Oid collation) ((NullIfExpr *) expr)->opcollid = collation; break; case T_ScalarArrayOpExpr: - Assert(!OidIsValid(collation)); /* result is always boolean */ + Assert(!OidIsValid(collation)); /* result is always boolean */ break; case T_BoolExpr: - Assert(!OidIsValid(collation)); /* result is always boolean */ + Assert(!OidIsValid(collation)); /* result is always boolean */ break; case T_SubLink: #ifdef USE_ASSERT_CHECKING @@ -937,13 +938,13 @@ exprSetCollation(Node *expr, Oid collation) Assert(!OidIsValid(collation)); } } -#endif /* USE_ASSERT_CHECKING */ +#endif /* USE_ASSERT_CHECKING */ break; case T_FieldSelect: ((FieldSelect *) expr)->resultcollid = collation; break; case T_FieldStore: - Assert(!OidIsValid(collation)); /* result is always composite */ + Assert(!OidIsValid(collation)); /* result is always composite */ break; case T_RelabelType: ((RelabelType *) expr)->resultcollid = collation; @@ -955,7 +956,7 @@ exprSetCollation(Node *expr, Oid collation) ((ArrayCoerceExpr *) expr)->resultcollid = collation; break; case T_ConvertRowtypeExpr: - Assert(!OidIsValid(collation)); /* result is always composite */ + Assert(!OidIsValid(collation)); /* result is always composite */ break; case T_CaseExpr: ((CaseExpr *) expr)->casecollid = collation; @@ -964,10 +965,10 @@ exprSetCollation(Node *expr, Oid collation) ((ArrayExpr *) expr)->array_collid = collation; break; case T_RowExpr: - Assert(!OidIsValid(collation)); /* result is always composite */ + Assert(!OidIsValid(collation)); /* result is always composite */ break; case T_RowCompareExpr: - Assert(!OidIsValid(collation)); /* result is always boolean */ + Assert(!OidIsValid(collation)); /* result is always boolean */ break; case T_CoalesceExpr: ((CoalesceExpr *) expr)->coalescecollid = collation; @@ -981,10 +982,10 @@ exprSetCollation(Node *expr, Oid collation) (collation == InvalidOid)); break; case T_NullTest: - Assert(!OidIsValid(collation)); /* result is always boolean */ + Assert(!OidIsValid(collation)); /* result is always boolean */ break; case T_BooleanTest: - Assert(!OidIsValid(collation)); /* result is always boolean */ + Assert(!OidIsValid(collation)); /* result is always boolean */ break; case T_CoerceToDomain: ((CoerceToDomain *) expr)->resultcollid = collation; @@ -996,7 +997,7 @@ exprSetCollation(Node *expr, Oid collation) ((SetToDefault *) expr)->collation = collation; break; case T_CurrentOfExpr: - Assert(!OidIsValid(collation)); /* result is always boolean */ + Assert(!OidIsValid(collation)); /* result is always boolean */ break; default: elog(ERROR, "unrecognized node type: %d", (int) nodeTag(expr)); diff --git a/src/backend/nodes/params.c b/src/backend/nodes/params.c index d6e6e6a2bd..62d766a282 100644 --- a/src/backend/nodes/params.c +++ b/src/backend/nodes/params.c @@ -43,7 +43,7 @@ copyParamList(ParamListInfo from) /* sizeof(ParamListInfoData) includes the first array element */ size = sizeof(ParamListInfoData) + - (from->numParams - 1) *sizeof(ParamExternData); + (from->numParams - 1) * sizeof(ParamExternData); retval = (ParamListInfo) palloc(size); retval->paramFetch = NULL; diff --git a/src/backend/optimizer/path/allpaths.c b/src/backend/optimizer/path/allpaths.c index dc2a23bb27..47ab08e502 100644 --- a/src/backend/optimizer/path/allpaths.c +++ b/src/backend/optimizer/path/allpaths.c @@ -66,7 +66,7 @@ static void set_cte_pathlist(PlannerInfo *root, RelOptInfo *rel, static void set_worktable_pathlist(PlannerInfo *root, RelOptInfo *rel, RangeTblEntry *rte); static void set_foreign_pathlist(PlannerInfo *root, RelOptInfo *rel, - RangeTblEntry *rte); + RangeTblEntry *rte); static RelOptInfo *make_rel_from_joinlist(PlannerInfo *root, List *joinlist); static bool subquery_is_pushdown_safe(Query *subquery, Query *topquery, bool *differentTypes); @@ -413,11 +413,11 @@ set_append_rel_pathlist(PlannerInfo *root, RelOptInfo *rel, /* * We have to make child entries in the EquivalenceClass data - * structures as well. This is needed either if the parent - * participates in some eclass joins (because we will want to - * consider inner-indexscan joins on the individual children) - * or if the parent has useful pathkeys (because we should try - * to build MergeAppend paths that produce those sort orderings). + * structures as well. This is needed either if the parent + * participates in some eclass joins (because we will want to consider + * inner-indexscan joins on the individual children) or if the parent + * has useful pathkeys (because we should try to build MergeAppend + * paths that produce those sort orderings). */ if (rel->has_eclass_joins || has_useful_pathkeys(root, rel)) add_child_rel_equivalences(root, appinfo, rel, childrel); @@ -462,7 +462,7 @@ set_append_rel_pathlist(PlannerInfo *root, RelOptInfo *rel, /* Have we already seen this ordering? */ foreach(lpk, all_child_pathkeys) { - List *existing_pathkeys = (List *) lfirst(lpk); + List *existing_pathkeys = (List *) lfirst(lpk); if (compare_pathkeys(existing_pathkeys, childkeys) == PATHKEYS_EQUAL) @@ -540,18 +540,18 @@ set_append_rel_pathlist(PlannerInfo *root, RelOptInfo *rel, /* * Next, build MergeAppend paths based on the collected list of child - * pathkeys. We consider both cheapest-startup and cheapest-total - * cases, ie, for each interesting ordering, collect all the cheapest - * startup subpaths and all the cheapest total paths, and build a - * MergeAppend path for each list. + * pathkeys. We consider both cheapest-startup and cheapest-total cases, + * ie, for each interesting ordering, collect all the cheapest startup + * subpaths and all the cheapest total paths, and build a MergeAppend path + * for each list. */ foreach(l, all_child_pathkeys) { - List *pathkeys = (List *) lfirst(l); - List *startup_subpaths = NIL; - List *total_subpaths = NIL; - bool startup_neq_total = false; - ListCell *lcr; + List *pathkeys = (List *) lfirst(l); + List *startup_subpaths = NIL; + List *total_subpaths = NIL; + bool startup_neq_total = false; + ListCell *lcr; /* Select the child paths for this ordering... */ foreach(lcr, live_childrels) @@ -581,8 +581,8 @@ set_append_rel_pathlist(PlannerInfo *root, RelOptInfo *rel, /* * Notice whether we actually have different paths for the - * "cheapest" and "total" cases; frequently there will be no - * point in two create_merge_append_path() calls. + * "cheapest" and "total" cases; frequently there will be no point + * in two create_merge_append_path() calls. */ if (cheapest_startup != cheapest_total) startup_neq_total = true; @@ -623,7 +623,7 @@ accumulate_append_subpath(List *subpaths, Path *path) { if (IsA(path, AppendPath)) { - AppendPath *apath = (AppendPath *) path; + AppendPath *apath = (AppendPath *) path; /* list_copy is important here to avoid sharing list substructure */ return list_concat(subpaths, list_copy(apath->subpaths)); diff --git a/src/backend/optimizer/path/costsize.c b/src/backend/optimizer/path/costsize.c index 8f763b4369..e200dcf472 100644 --- a/src/backend/optimizer/path/costsize.c +++ b/src/backend/optimizer/path/costsize.c @@ -1096,7 +1096,7 @@ cost_recursive_union(Plan *runion, Plan *nrterm, Plan *rterm) * accesses (XXX can't we refine that guess?) * * By default, we charge two operator evals per tuple comparison, which should - * be in the right ballpark in most cases. The caller can tweak this by + * be in the right ballpark in most cases. The caller can tweak this by * specifying nonzero comparison_cost; typically that's used for any extra * work that has to be done to prepare the inputs to the comparison operators. * @@ -1218,7 +1218,7 @@ cost_sort(Path *path, PlannerInfo *root, * Determines and returns the cost of a MergeAppend node. * * MergeAppend merges several pre-sorted input streams, using a heap that - * at any given instant holds the next tuple from each stream. If there + * at any given instant holds the next tuple from each stream. If there * are N streams, we need about N*log2(N) tuple comparisons to construct * the heap at startup, and then for each output tuple, about log2(N) * comparisons to delete the top heap entry and another log2(N) comparisons @@ -2909,7 +2909,7 @@ adjust_semi_join(PlannerInfo *root, JoinPath *path, SpecialJoinInfo *sjinfo, List *nrclauses; nrclauses = select_nonredundant_join_clauses(root, - path->joinrestrictinfo, + path->joinrestrictinfo, path->innerjoinpath); *indexed_join_quals = (nrclauses == NIL); } @@ -3185,7 +3185,7 @@ set_subquery_size_estimates(PlannerInfo *root, RelOptInfo *rel, /* * Compute per-output-column width estimates by examining the subquery's - * targetlist. For any output that is a plain Var, get the width estimate + * targetlist. For any output that is a plain Var, get the width estimate * that was made while planning the subquery. Otherwise, fall back on a * datatype-based estimate. */ @@ -3210,7 +3210,7 @@ set_subquery_size_estimates(PlannerInfo *root, RelOptInfo *rel, if (IsA(texpr, Var) && subroot->parse->setOperations == NULL) { - Var *var = (Var *) texpr; + Var *var = (Var *) texpr; RelOptInfo *subrel = find_base_rel(subroot, var->varno); item_width = subrel->attr_widths[var->varattno - subrel->min_attr]; @@ -3332,7 +3332,7 @@ set_cte_size_estimates(PlannerInfo *root, RelOptInfo *rel, Plan *cteplan) * of estimating baserestrictcost, so we set that, and we also set up width * using what will be purely datatype-driven estimates from the targetlist. * There is no way to do anything sane with the rows value, so we just put - * a default estimate and hope that the wrapper can improve on it. The + * a default estimate and hope that the wrapper can improve on it. The * wrapper's PlanForeignScan function will be called momentarily. * * The rel's targetlist and restrictinfo list must have been constructed @@ -3396,8 +3396,8 @@ set_rel_width(PlannerInfo *root, RelOptInfo *rel) ndx = var->varattno - rel->min_attr; /* - * If it's a whole-row Var, we'll deal with it below after we - * have already cached as many attr widths as possible. + * If it's a whole-row Var, we'll deal with it below after we have + * already cached as many attr widths as possible. */ if (var->varattno == 0) { @@ -3406,8 +3406,8 @@ set_rel_width(PlannerInfo *root, RelOptInfo *rel) } /* - * The width may have been cached already (especially if it's - * a subquery), so don't duplicate effort. + * The width may have been cached already (especially if it's a + * subquery), so don't duplicate effort. */ if (rel->attr_widths[ndx] > 0) { @@ -3464,13 +3464,13 @@ set_rel_width(PlannerInfo *root, RelOptInfo *rel) */ if (have_wholerow_var) { - int32 wholerow_width = sizeof(HeapTupleHeaderData); + int32 wholerow_width = sizeof(HeapTupleHeaderData); if (reloid != InvalidOid) { /* Real relation, so estimate true tuple width */ wholerow_width += get_relation_data_width(reloid, - rel->attr_widths - rel->min_attr); + rel->attr_widths - rel->min_attr); } else { @@ -3484,8 +3484,8 @@ set_rel_width(PlannerInfo *root, RelOptInfo *rel) rel->attr_widths[0 - rel->min_attr] = wholerow_width; /* - * Include the whole-row Var as part of the output tuple. Yes, - * that really is what happens at runtime. + * Include the whole-row Var as part of the output tuple. Yes, that + * really is what happens at runtime. */ tuple_width += wholerow_width; } diff --git a/src/backend/optimizer/path/equivclass.c b/src/backend/optimizer/path/equivclass.c index 9a32e16940..a365beecd8 100644 --- a/src/backend/optimizer/path/equivclass.c +++ b/src/backend/optimizer/path/equivclass.c @@ -385,7 +385,7 @@ process_equivalence(PlannerInfo *root, RestrictInfo *restrictinfo, * Also, the expression's exposed collation must match the EC's collation. * This is important because in comparisons like "foo < bar COLLATE baz", * only one of the expressions has the correct exposed collation as we receive - * it from the parser. Forcing both of them to have it ensures that all + * it from the parser. Forcing both of them to have it ensures that all * variant spellings of such a construct behave the same. Again, we can * stick on a RelabelType to force the right exposed collation. (It might * work to not label the collation at all in EC members, but this is risky @@ -414,13 +414,13 @@ canonicalize_ec_expression(Expr *expr, Oid req_type, Oid req_collation) exprCollation((Node *) expr) != req_collation) { /* - * Strip any existing RelabelType, then add a new one if needed. - * This is to preserve the invariant of no redundant RelabelTypes. + * Strip any existing RelabelType, then add a new one if needed. This + * is to preserve the invariant of no redundant RelabelTypes. * * If we have to change the exposed type of the stripped expression, * set typmod to -1 (since the new type may not have the same typmod - * interpretation). If we only have to change collation, preserve - * the exposed typmod. + * interpretation). If we only have to change collation, preserve the + * exposed typmod. */ while (expr && IsA(expr, RelabelType)) expr = (Expr *) ((RelabelType *) expr)->arg; @@ -1784,8 +1784,8 @@ add_child_rel_equivalences(PlannerInfo *root, ListCell *lc2; /* - * If this EC contains a constant, then it's not useful for sorting - * or driving an inner index-scan, so we skip generating child EMs. + * If this EC contains a constant, then it's not useful for sorting or + * driving an inner index-scan, so we skip generating child EMs. * * If this EC contains a volatile expression, then generating child * EMs would be downright dangerous. We rely on a volatile EC having diff --git a/src/backend/optimizer/path/indxpath.c b/src/backend/optimizer/path/indxpath.c index 76f842631f..ef65cf2224 100644 --- a/src/backend/optimizer/path/indxpath.c +++ b/src/backend/optimizer/path/indxpath.c @@ -119,7 +119,7 @@ static bool match_special_index_operator(Expr *clause, static Expr *expand_boolean_index_clause(Node *clause, int indexcol, IndexOptInfo *index); static List *expand_indexqual_opclause(RestrictInfo *rinfo, - Oid opfamily, Oid idxcollation); + Oid opfamily, Oid idxcollation); static RestrictInfo *expand_indexqual_rowcompare(RestrictInfo *rinfo, IndexOptInfo *index, int indexcol); @@ -1159,8 +1159,8 @@ group_clauses_by_indexkey(IndexOptInfo *index, * (2) must contain an operator which is in the same family as the index * operator for this column, or is a "special" operator as recognized * by match_special_index_operator(); - * and - * (3) must match the collation of the index, if collation is relevant. + * and + * (3) must match the collation of the index, if collation is relevant. * * Our definition of "const" is pretty liberal: we allow Vars belonging * to the caller-specified outer_relids relations (which had better not @@ -1312,7 +1312,7 @@ match_clause_to_indexcol(IndexOptInfo *index, * is a "special" indexable operator. */ if (plain_op && - match_special_index_operator(clause, opfamily, idxcollation, true)) + match_special_index_operator(clause, opfamily, idxcollation, true)) return true; return false; } @@ -1438,7 +1438,7 @@ match_rowcompare_to_indexcol(IndexOptInfo *index, /**************************************************************************** - * ---- ROUTINES TO CHECK ORDERING OPERATORS ---- + * ---- ROUTINES TO CHECK ORDERING OPERATORS ---- ****************************************************************************/ /* @@ -1461,7 +1461,7 @@ match_index_to_pathkeys(IndexOptInfo *index, List *pathkeys) foreach(lc1, pathkeys) { - PathKey *pathkey = (PathKey *) lfirst(lc1); + PathKey *pathkey = (PathKey *) lfirst(lc1); bool found = false; ListCell *lc2; @@ -1483,7 +1483,7 @@ match_index_to_pathkeys(IndexOptInfo *index, List *pathkeys) foreach(lc2, pathkey->pk_eclass->ec_members) { EquivalenceMember *member = (EquivalenceMember *) lfirst(lc2); - int indexcol; + int indexcol; /* No possibility of match if it references other relations */ if (!bms_equal(member->em_relids, index->rel->relids)) @@ -1491,7 +1491,7 @@ match_index_to_pathkeys(IndexOptInfo *index, List *pathkeys) for (indexcol = 0; indexcol < index->ncolumns; indexcol++) { - Expr *expr; + Expr *expr; expr = match_clause_to_ordering_op(index, indexcol, @@ -1535,7 +1535,7 @@ match_index_to_pathkeys(IndexOptInfo *index, List *pathkeys) * Note that we currently do not consider the collation of the ordering * operator's result. In practical cases the result type will be numeric * and thus have no collation, and it's not very clear what to match to - * if it did have a collation. The index's collation should match the + * if it did have a collation. The index's collation should match the * ordering operator's input collation, not its result. * * If successful, return 'clause' as-is if the indexkey is on the left, @@ -1598,8 +1598,8 @@ match_clause_to_ordering_op(IndexOptInfo *index, return NULL; /* - * Is the (commuted) operator an ordering operator for the opfamily? - * And if so, does it yield the right sorting semantics? + * Is the (commuted) operator an ordering operator for the opfamily? And + * if so, does it yield the right sorting semantics? */ sortfamily = get_op_opfamily_sortfamily(expr_op, opfamily); if (sortfamily != pk_opfamily) @@ -2198,9 +2198,9 @@ relation_has_unique_index_for(PlannerInfo *root, RelOptInfo *rel, continue; /* - * XXX at some point we may need to check collations here - * too. For the moment we assume all collations reduce to - * the same notion of equality. + * XXX at some point we may need to check collations here too. + * For the moment we assume all collations reduce to the same + * notion of equality. */ /* OK, see if the condition operand matches the index key */ @@ -2544,10 +2544,10 @@ match_special_index_operator(Expr *clause, Oid opfamily, Oid idxcollation, * * The non-pattern opclasses will not sort the way we need in most non-C * locales. We can use such an index anyway for an exact match (simple - * equality), but not for prefix-match cases. Note that we are looking - * at the index's collation, not the expression's collation -- this test - * is not dependent on the LIKE/regex operator's collation (which would - * only affect case folding behavior of ILIKE, anyway). + * equality), but not for prefix-match cases. Note that we are looking at + * the index's collation, not the expression's collation -- this test is + * not dependent on the LIKE/regex operator's collation (which would only + * affect case folding behavior of ILIKE, anyway). */ switch (expr_op) { @@ -2657,7 +2657,7 @@ expand_indexqual_conditions(IndexOptInfo *index, List *clausegroups) resultquals = list_concat(resultquals, expand_indexqual_opclause(rinfo, curFamily, - curCollation)); + curCollation)); } else if (IsA(clause, ScalarArrayOpExpr)) { @@ -3254,7 +3254,7 @@ network_prefix_quals(Node *leftop, Oid expr_op, Oid opfamily, Datum rightop) expr = make_opclause(opr1oid, BOOLOID, false, (Expr *) leftop, (Expr *) makeConst(datatype, -1, - InvalidOid, /* not collatable */ + InvalidOid, /* not collatable */ -1, opr1right, false, false), InvalidOid, InvalidOid); @@ -3272,7 +3272,7 @@ network_prefix_quals(Node *leftop, Oid expr_op, Oid opfamily, Datum rightop) expr = make_opclause(opr2oid, BOOLOID, false, (Expr *) leftop, (Expr *) makeConst(datatype, -1, - InvalidOid, /* not collatable */ + InvalidOid, /* not collatable */ -1, opr2right, false, false), InvalidOid, InvalidOid); diff --git a/src/backend/optimizer/path/joinpath.c b/src/backend/optimizer/path/joinpath.c index 740dc32dc7..7d3cf425da 100644 --- a/src/backend/optimizer/path/joinpath.c +++ b/src/backend/optimizer/path/joinpath.c @@ -97,11 +97,11 @@ add_paths_to_joinrel(PlannerInfo *root, /* * 1. Consider mergejoin paths where both relations must be explicitly - * sorted. Skip this if we can't mergejoin. + * sorted. Skip this if we can't mergejoin. */ if (mergejoin_allowed) sort_inner_and_outer(root, joinrel, outerrel, innerrel, - restrictlist, mergeclause_list, jointype, sjinfo); + restrictlist, mergeclause_list, jointype, sjinfo); /* * 2. Consider paths where the outer relation need not be explicitly @@ -112,7 +112,7 @@ add_paths_to_joinrel(PlannerInfo *root, */ if (mergejoin_allowed) match_unsorted_outer(root, joinrel, outerrel, innerrel, - restrictlist, mergeclause_list, jointype, sjinfo); + restrictlist, mergeclause_list, jointype, sjinfo); #ifdef NOT_USED @@ -129,7 +129,7 @@ add_paths_to_joinrel(PlannerInfo *root, */ if (mergejoin_allowed) match_unsorted_inner(root, joinrel, outerrel, innerrel, - restrictlist, mergeclause_list, jointype, sjinfo); + restrictlist, mergeclause_list, jointype, sjinfo); #endif /* diff --git a/src/backend/optimizer/path/joinrels.c b/src/backend/optimizer/path/joinrels.c index 42618649fb..bbb79c582d 100644 --- a/src/backend/optimizer/path/joinrels.c +++ b/src/backend/optimizer/path/joinrels.c @@ -30,7 +30,7 @@ static bool has_legal_joinclause(PlannerInfo *root, RelOptInfo *rel); static bool is_dummy_rel(RelOptInfo *rel); static void mark_dummy_rel(RelOptInfo *rel); static bool restriction_is_constant_false(List *restrictlist, - bool only_pushed_down); + bool only_pushed_down); /* @@ -604,10 +604,10 @@ make_join_rel(PlannerInfo *root, RelOptInfo *rel1, RelOptInfo *rel2) * * Also, a provably constant-false join restriction typically means that * we can skip evaluating one or both sides of the join. We do this by - * marking the appropriate rel as dummy. For outer joins, a constant-false - * restriction that is pushed down still means the whole join is dummy, - * while a non-pushed-down one means that no inner rows will join so we - * can treat the inner rel as dummy. + * marking the appropriate rel as dummy. For outer joins, a + * constant-false restriction that is pushed down still means the whole + * join is dummy, while a non-pushed-down one means that no inner rows + * will join so we can treat the inner rel as dummy. * * We need only consider the jointypes that appear in join_info_list, plus * JOIN_INNER. diff --git a/src/backend/optimizer/path/pathkeys.c b/src/backend/optimizer/path/pathkeys.c index 47597a5d35..e5228a81c6 100644 --- a/src/backend/optimizer/path/pathkeys.c +++ b/src/backend/optimizer/path/pathkeys.c @@ -253,7 +253,7 @@ make_pathkey_from_sortinfo(PlannerInfo *root, /* * EquivalenceClasses need to contain opfamily lists based on the family * membership of mergejoinable equality operators, which could belong to - * more than one opfamily. So we have to look up the opfamily's equality + * more than one opfamily. So we have to look up the opfamily's equality * operator and get its membership. */ equality_op = get_opfamily_member(opfamily, @@ -558,9 +558,9 @@ build_index_pathkeys(PlannerInfo *root, true); /* - * If the sort key isn't already present in any EquivalenceClass, - * then it's not an interesting sort order for this query. So - * we can stop now --- lower-order sort keys aren't useful either. + * If the sort key isn't already present in any EquivalenceClass, then + * it's not an interesting sort order for this query. So we can stop + * now --- lower-order sort keys aren't useful either. */ if (!cpathkey) break; @@ -747,8 +747,8 @@ convert_subquery_pathkeys(PlannerInfo *root, RelOptInfo *rel, continue; /* - * Build a representation of this targetlist entry as - * an outer Var. + * Build a representation of this targetlist entry as an + * outer Var. */ outer_expr = (Expr *) makeVarFromTargetEntry(rel->relid, tle); @@ -923,7 +923,7 @@ make_pathkeys_for_sortclauses(PlannerInfo *root, * right sides. * * Note this is called before EC merging is complete, so the links won't - * necessarily point to canonical ECs. Before they are actually used for + * necessarily point to canonical ECs. Before they are actually used for * anything, update_mergeclause_eclasses must be called to ensure that * they've been updated to point to canonical ECs. */ diff --git a/src/backend/optimizer/plan/analyzejoins.c b/src/backend/optimizer/plan/analyzejoins.c index 80d42f3be6..1784ac2fc5 100644 --- a/src/backend/optimizer/plan/analyzejoins.c +++ b/src/backend/optimizer/plan/analyzejoins.c @@ -31,7 +31,7 @@ /* local functions */ static bool join_is_removable(PlannerInfo *root, SpecialJoinInfo *sjinfo); static void remove_rel_from_query(PlannerInfo *root, int relid, - Relids joinrelids); + Relids joinrelids); static List *remove_rel_from_joinlist(List *joinlist, int relid, int *nremoved); @@ -238,10 +238,10 @@ join_is_removable(PlannerInfo *root, SpecialJoinInfo *sjinfo) !bms_equal(restrictinfo->required_relids, joinrelids)) { /* - * If such a clause actually references the inner rel then - * join removal has to be disallowed. We have to check this - * despite the previous attr_needed checks because of the - * possibility of pushed-down clauses referencing the rel. + * If such a clause actually references the inner rel then join + * removal has to be disallowed. We have to check this despite + * the previous attr_needed checks because of the possibility of + * pushed-down clauses referencing the rel. */ if (bms_is_member(innerrelid, restrictinfo->clause_relids)) return false; @@ -365,8 +365,8 @@ remove_rel_from_query(PlannerInfo *root, int relid, Relids joinrelids) * Likewise remove references from SpecialJoinInfo data structures. * * This is relevant in case the outer join we're deleting is nested inside - * other outer joins: the upper joins' relid sets have to be adjusted. - * The RHS of the target outer join will be made empty here, but that's OK + * other outer joins: the upper joins' relid sets have to be adjusted. The + * RHS of the target outer join will be made empty here, but that's OK * since caller will delete that SpecialJoinInfo entirely. */ foreach(l, root->join_info_list) @@ -426,6 +426,7 @@ remove_rel_from_query(PlannerInfo *root, int relid, Relids joinrelids) { /* Recheck that qual doesn't actually reference the target rel */ Assert(!bms_is_member(relid, rinfo->clause_relids)); + /* * The required_relids probably aren't shared with anything else, * but let's copy them just to be sure. diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c index f130881251..1a9540ce06 100644 --- a/src/backend/optimizer/plan/createplan.c +++ b/src/backend/optimizer/plan/createplan.c @@ -108,7 +108,7 @@ static TidScan *make_tidscan(List *qptlist, List *qpqual, Index scanrelid, List *tidquals); static FunctionScan *make_functionscan(List *qptlist, List *qpqual, Index scanrelid, Node *funcexpr, List *funccolnames, - List *funccoltypes, List *funccoltypmods, List *funccolcollations); + List *funccoltypes, List *funccoltypmods, List *funccolcollations); static ValuesScan *make_valuesscan(List *qptlist, List *qpqual, Index scanrelid, List *values_lists); static CteScan *make_ctescan(List *qptlist, List *qpqual, @@ -143,24 +143,25 @@ static MergeJoin *make_mergejoin(List *tlist, bool *mergenullsfirst, Plan *lefttree, Plan *righttree, JoinType jointype); -static Sort *make_sort(PlannerInfo *root, Plan *lefttree, int numCols, - AttrNumber *sortColIdx, Oid *sortOperators, Oid *collations, bool *nullsFirst, +static Sort * +make_sort(PlannerInfo *root, Plan *lefttree, int numCols, +AttrNumber *sortColIdx, Oid *sortOperators, Oid *collations, bool *nullsFirst, double limit_tuples); static Plan *prepare_sort_from_pathkeys(PlannerInfo *root, - Plan *lefttree, List *pathkeys, - bool adjust_tlist_in_place, - int *p_numsortkeys, - AttrNumber **p_sortColIdx, - Oid **p_sortOperators, - Oid **p_collations, - bool **p_nullsFirst); + Plan *lefttree, List *pathkeys, + bool adjust_tlist_in_place, + int *p_numsortkeys, + AttrNumber **p_sortColIdx, + Oid **p_sortOperators, + Oid **p_collations, + bool **p_nullsFirst); static Material *make_material(Plan *lefttree); /* * create_plan * Creates the access plan for a query by recursively processing the - * desired tree of pathnodes, starting at the node 'best_path'. For + * desired tree of pathnodes, starting at the node 'best_path'. For * every pathnode found, we create a corresponding plan node containing * appropriate id, target list, and qualification information. * @@ -737,7 +738,7 @@ create_merge_append_plan(PlannerInfo *root, MergeAppendPath *best_path) /* Now, insert a Sort node if subplan isn't sufficiently ordered */ if (!pathkeys_contained_in(pathkeys, subpath->pathkeys)) subplan = (Plan *) make_sort(root, subplan, numsortkeys, - sortColIdx, sortOperators, collations, nullsFirst, + sortColIdx, sortOperators, collations, nullsFirst, best_path->limit_tuples); subplans = lappend(subplans, subplan); @@ -983,7 +984,7 @@ create_unique_plan(PlannerInfo *root, UniquePath *best_path) sortcl->eqop = eqop; sortcl->sortop = sortop; sortcl->nulls_first = false; - sortcl->hashable = false; /* no need to make this accurate */ + sortcl->hashable = false; /* no need to make this accurate */ sortList = lappend(sortList, sortcl); groupColPos++; } @@ -1153,8 +1154,8 @@ create_indexscan_plan(PlannerInfo *root, qpqual = extract_actual_clauses(qpqual, false); /* - * We have to replace any outer-relation variables with nestloop params - * in the indexqualorig, qpqual, and indexorderbyorig expressions. A bit + * We have to replace any outer-relation variables with nestloop params in + * the indexqualorig, qpqual, and indexorderbyorig expressions. A bit * annoying to have to do this separately from the processing in * fix_indexqual_references --- rethink this when generalizing the inner * indexscan support. But note we can't really do this earlier because @@ -1465,6 +1466,7 @@ create_bitmap_subplan(PlannerInfo *root, Path *bitmapqual, *indexqual = lappend(*indexqual, pred); } } + /* * Replace outer-relation variables with nestloop params, but only * after doing the above comparisons to index predicates. @@ -2330,10 +2332,10 @@ replace_nestloop_params_mutator(Node *node, PlannerInfo *root) return NULL; if (IsA(node, Var)) { - Var *var = (Var *) node; - Param *param; + Var *var = (Var *) node; + Param *param; NestLoopParam *nlp; - ListCell *lc; + ListCell *lc; /* Upper-level Vars should be long gone at this point */ Assert(var->varlevelsup == 0); @@ -2493,7 +2495,7 @@ fix_indexqual_references(PlannerInfo *root, IndexPath *index_path, * * This is a simplified version of fix_indexqual_references. The input does * not have RestrictInfo nodes, and we assume that indxqual.c already - * commuted the clauses to put the index keys on the left. Also, we don't + * commuted the clauses to put the index keys on the left. Also, we don't * bother to support any cases except simple OpExprs, since nothing else * is allowed for ordering operators. */ @@ -3082,8 +3084,8 @@ make_append(List *appendplans, List *tlist) * If you change this, see also create_append_path(). Also, the size * calculations should match set_append_rel_pathlist(). It'd be better * not to duplicate all this logic, but some callers of this function - * aren't working from an appendrel or AppendPath, so there's noplace - * to copy the data from. + * aren't working from an appendrel or AppendPath, so there's noplace to + * copy the data from. */ plan->startup_cost = 0; plan->total_cost = 0; @@ -3320,7 +3322,7 @@ make_mergejoin(List *tlist, */ static Sort * make_sort(PlannerInfo *root, Plan *lefttree, int numCols, - AttrNumber *sortColIdx, Oid *sortOperators, Oid *collations, bool *nullsFirst, +AttrNumber *sortColIdx, Oid *sortOperators, Oid *collations, bool *nullsFirst, double limit_tuples) { Sort *node = makeNode(Sort); @@ -3398,7 +3400,7 @@ add_sort_column(AttrNumber colIdx, Oid sortOp, Oid coll, bool nulls_first, * prepare_sort_from_pathkeys * Prepare to sort according to given pathkeys * - * This is used to set up for both Sort and MergeAppend nodes. It calculates + * This is used to set up for both Sort and MergeAppend nodes. It calculates * the executor's representation of the sort key information, and adjusts the * plan targetlist if needed to add resjunk sort columns. * @@ -3608,7 +3610,7 @@ prepare_sort_from_pathkeys(PlannerInfo *root, Plan *lefttree, List *pathkeys, pathkey->pk_eclass->ec_collation, pathkey->pk_nulls_first, numsortkeys, - sortColIdx, sortOperators, collations, nullsFirst); + sortColIdx, sortOperators, collations, nullsFirst); } Assert(numsortkeys > 0); @@ -3653,7 +3655,7 @@ make_sort_from_pathkeys(PlannerInfo *root, Plan *lefttree, List *pathkeys, /* Now build the Sort node */ return make_sort(root, lefttree, numsortkeys, - sortColIdx, sortOperators, collations, nullsFirst, limit_tuples); + sortColIdx, sortOperators, collations, nullsFirst, limit_tuples); } /* @@ -3699,7 +3701,7 @@ make_sort_from_sortclauses(PlannerInfo *root, List *sortcls, Plan *lefttree) exprCollation((Node *) tle->expr), sortcl->nulls_first, numsortkeys, - sortColIdx, sortOperators, collations, nullsFirst); + sortColIdx, sortOperators, collations, nullsFirst); } Assert(numsortkeys > 0); @@ -3761,7 +3763,7 @@ make_sort_from_groupcols(PlannerInfo *root, exprCollation((Node *) tle->expr), grpcl->nulls_first, numsortkeys, - sortColIdx, sortOperators, collations, nullsFirst); + sortColIdx, sortOperators, collations, nullsFirst); grpno++; } diff --git a/src/backend/optimizer/plan/initsplan.c b/src/backend/optimizer/plan/initsplan.c index 0e00df6433..333ede218e 100644 --- a/src/backend/optimizer/plan/initsplan.c +++ b/src/backend/optimizer/plan/initsplan.c @@ -188,10 +188,11 @@ add_vars_to_targetlist(PlannerInfo *root, List *vars, Relids where_needed) phinfo->ph_needed = bms_add_members(phinfo->ph_needed, where_needed); + /* - * Update ph_may_need too. This is currently only necessary - * when being called from build_base_rel_tlists, but we may as - * well do it always. + * Update ph_may_need too. This is currently only necessary when + * being called from build_base_rel_tlists, but we may as well do + * it always. */ phinfo->ph_may_need = bms_add_members(phinfo->ph_may_need, where_needed); @@ -704,8 +705,8 @@ make_outerjoininfo(PlannerInfo *root, * this join's nullable side, and it may get used above this join, then * ensure that min_righthand contains the full eval_at set of the PHV. * This ensures that the PHV actually can be evaluated within the RHS. - * Note that this works only because we should already have determined - * the final eval_at level for any PHV syntactically within this join. + * Note that this works only because we should already have determined the + * final eval_at level for any PHV syntactically within this join. */ foreach(l, root->placeholder_list) { @@ -1070,7 +1071,7 @@ distribute_qual_to_rels(PlannerInfo *root, Node *clause, * * In all cases, it's important to initialize the left_ec and right_ec * fields of a mergejoinable clause, so that all possibly mergejoinable - * expressions have representations in EquivalenceClasses. If + * expressions have representations in EquivalenceClasses. If * process_equivalence is successful, it will take care of that; * otherwise, we have to call initialize_mergeclause_eclasses to do it. */ diff --git a/src/backend/optimizer/plan/planagg.c b/src/backend/optimizer/plan/planagg.c index f2ddf2a844..7fce92c2f1 100644 --- a/src/backend/optimizer/plan/planagg.c +++ b/src/backend/optimizer/plan/planagg.c @@ -10,9 +10,9 @@ * ORDER BY col ASC/DESC * LIMIT 1) * Given a suitable index on tab.col, this can be much faster than the - * generic scan-all-the-rows aggregation plan. We can handle multiple + * generic scan-all-the-rows aggregation plan. We can handle multiple * MIN/MAX aggregates by generating multiple subqueries, and their - * orderings can be different. However, if the query contains any + * orderings can be different. However, if the query contains any * non-optimizable aggregates, there's no point since we'll have to * scan all the rows anyway. * @@ -87,10 +87,10 @@ preprocess_minmax_aggregates(PlannerInfo *root, List *tlist) * * We don't handle GROUP BY or windowing, because our current * implementations of grouping require looking at all the rows anyway, and - * so there's not much point in optimizing MIN/MAX. (Note: relaxing - * this would likely require some restructuring in grouping_planner(), - * since it performs assorted processing related to these features between - * calling preprocess_minmax_aggregates and optimize_minmax_aggregates.) + * so there's not much point in optimizing MIN/MAX. (Note: relaxing this + * would likely require some restructuring in grouping_planner(), since it + * performs assorted processing related to these features between calling + * preprocess_minmax_aggregates and optimize_minmax_aggregates.) */ if (parse->groupClause || parse->hasWindowFuncs) return; @@ -119,7 +119,7 @@ preprocess_minmax_aggregates(PlannerInfo *root, List *tlist) /* * Scan the tlist and HAVING qual to find all the aggregates and verify - * all are MIN/MAX aggregates. Stop as soon as we find one that isn't. + * all are MIN/MAX aggregates. Stop as soon as we find one that isn't. */ aggs_list = NIL; if (find_minmax_aggs_walker((Node *) tlist, &aggs_list)) @@ -146,7 +146,7 @@ preprocess_minmax_aggregates(PlannerInfo *root, List *tlist) * ordering operator. */ eqop = get_equality_op_for_ordering_op(mminfo->aggsortop, &reverse); - if (!OidIsValid(eqop)) /* shouldn't happen */ + if (!OidIsValid(eqop)) /* shouldn't happen */ elog(ERROR, "could not find equality operator for ordering operator %u", mminfo->aggsortop); @@ -154,7 +154,7 @@ preprocess_minmax_aggregates(PlannerInfo *root, List *tlist) * We can use either an ordering that gives NULLS FIRST or one that * gives NULLS LAST; furthermore there's unlikely to be much * performance difference between them, so it doesn't seem worth - * costing out both ways if we get a hit on the first one. NULLS + * costing out both ways if we get a hit on the first one. NULLS * FIRST is more likely to be available if the operator is a * reverse-sort operator, so try that first if reverse. */ @@ -169,8 +169,8 @@ preprocess_minmax_aggregates(PlannerInfo *root, List *tlist) /* * We're done until path generation is complete. Save info for later. - * (Setting root->minmax_aggs non-NIL signals we succeeded in making - * index access paths for all the aggregates.) + * (Setting root->minmax_aggs non-NIL signals we succeeded in making index + * access paths for all the aggregates.) */ root->minmax_aggs = aggs_list; } @@ -333,7 +333,7 @@ find_minmax_aggs_walker(Node *node, List **context) mminfo->aggfnoid = aggref->aggfnoid; mminfo->aggsortop = aggsortop; mminfo->target = curTarget->expr; - mminfo->subroot = NULL; /* don't compute path yet */ + mminfo->subroot = NULL; /* don't compute path yet */ mminfo->path = NULL; mminfo->pathcost = 0; mminfo->param = NULL; @@ -424,7 +424,7 @@ build_minmax_path(PlannerInfo *root, MinMaxAggInfo *mminfo, sortcl->eqop = eqop; sortcl->sortop = sortop; sortcl->nulls_first = nulls_first; - sortcl->hashable = false; /* no need to make this accurate */ + sortcl->hashable = false; /* no need to make this accurate */ parse->sortClause = list_make1(sortcl); /* set up expressions for LIMIT 1 */ @@ -450,8 +450,8 @@ build_minmax_path(PlannerInfo *root, MinMaxAggInfo *mminfo, subroot->query_pathkeys = subroot->sort_pathkeys; /* - * Generate the best paths for this query, telling query_planner that - * we have LIMIT 1. + * Generate the best paths for this query, telling query_planner that we + * have LIMIT 1. */ query_planner(subroot, parse->targetList, 1.0, 1.0, &cheapest_path, &sorted_path, &dNumGroups); @@ -527,11 +527,11 @@ make_agg_subplan(PlannerInfo *root, MinMaxAggInfo *mminfo) exprCollation((Node *) mminfo->target)); /* - * Make sure the initplan gets into the outer PlannerInfo, along with - * any other initplans generated by the sub-planning run. We had to - * include the outer PlannerInfo's pre-existing initplans into the - * inner one's init_plans list earlier, so make sure we don't put back - * any duplicate entries. + * Make sure the initplan gets into the outer PlannerInfo, along with any + * other initplans generated by the sub-planning run. We had to include + * the outer PlannerInfo's pre-existing initplans into the inner one's + * init_plans list earlier, so make sure we don't put back any duplicate + * entries. */ root->init_plans = list_concat_unique_ptr(root->init_plans, subroot->init_plans); diff --git a/src/backend/optimizer/plan/planmain.c b/src/backend/optimizer/plan/planmain.c index 3dc23662e7..ff39d5754d 100644 --- a/src/backend/optimizer/plan/planmain.c +++ b/src/backend/optimizer/plan/planmain.c @@ -179,12 +179,12 @@ query_planner(PlannerInfo *root, List *tlist, /* * Examine the targetlist and join tree, adding entries to baserel * targetlists for all referenced Vars, and generating PlaceHolderInfo - * entries for all referenced PlaceHolderVars. Restrict and join clauses - * are added to appropriate lists belonging to the mentioned relations. - * We also build EquivalenceClasses for provably equivalent expressions. - * The SpecialJoinInfo list is also built to hold information about join - * order restrictions. Finally, we form a target joinlist for - * make_one_rel() to work from. + * entries for all referenced PlaceHolderVars. Restrict and join clauses + * are added to appropriate lists belonging to the mentioned relations. We + * also build EquivalenceClasses for provably equivalent expressions. The + * SpecialJoinInfo list is also built to hold information about join order + * restrictions. Finally, we form a target joinlist for make_one_rel() to + * work from. */ build_base_rel_tlists(root, tlist); @@ -216,7 +216,7 @@ query_planner(PlannerInfo *root, List *tlist, /* * Examine any "placeholder" expressions generated during subquery pullup. * Make sure that the Vars they need are marked as needed at the relevant - * join level. This must be done before join removal because it might + * join level. This must be done before join removal because it might * cause Vars or placeholders to be needed above a join when they weren't * so marked before. */ diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c index 56d25abc6d..58a5bf8ece 100644 --- a/src/backend/optimizer/plan/planner.c +++ b/src/backend/optimizer/plan/planner.c @@ -345,16 +345,16 @@ subquery_planner(PlannerGlobal *glob, Query *parse, inline_set_returning_functions(root); /* - * Check to see if any subqueries in the jointree can be merged into - * this query. + * Check to see if any subqueries in the jointree can be merged into this + * query. */ parse->jointree = (FromExpr *) pull_up_subqueries(root, (Node *) parse->jointree, NULL, NULL); /* - * If this is a simple UNION ALL query, flatten it into an appendrel. - * We do this now because it requires applying pull_up_subqueries to the - * leaf queries of the UNION ALL, which weren't touched above because they + * If this is a simple UNION ALL query, flatten it into an appendrel. We + * do this now because it requires applying pull_up_subqueries to the leaf + * queries of the UNION ALL, which weren't touched above because they * weren't referenced by the jointree (they will be after we do this). */ if (parse->setOperations) @@ -575,7 +575,7 @@ subquery_planner(PlannerGlobal *glob, Query *parse, plan = (Plan *) make_modifytable(parse->commandType, parse->canSetTag, - list_make1_int(parse->resultRelation), + list_make1_int(parse->resultRelation), list_make1(plan), returningLists, rowMarks, @@ -3116,9 +3116,9 @@ plan_cluster_use_sort(Oid tableOid, Oid indexOid) /* * Determine eval cost of the index expressions, if any. We need to - * charge twice that amount for each tuple comparison that happens - * during the sort, since tuplesort.c will have to re-evaluate the - * index expressions each time. (XXX that's pretty inefficient...) + * charge twice that amount for each tuple comparison that happens during + * the sort, since tuplesort.c will have to re-evaluate the index + * expressions each time. (XXX that's pretty inefficient...) */ cost_qual_eval(&indexExprCost, indexInfo->indexprs, root); comparisonCost = 2.0 * (indexExprCost.startup + indexExprCost.per_tuple); diff --git a/src/backend/optimizer/prep/prepjointree.c b/src/backend/optimizer/prep/prepjointree.c index bd678ac7ed..a40f116bf9 100644 --- a/src/backend/optimizer/prep/prepjointree.c +++ b/src/backend/optimizer/prep/prepjointree.c @@ -1429,7 +1429,7 @@ pullup_replace_vars_callback(Var *var, * * If a query's setOperations tree consists entirely of simple UNION ALL * operations, flatten it into an append relation, which we can process more - * intelligently than the general setops case. Otherwise, do nothing. + * intelligently than the general setops case. Otherwise, do nothing. * * In most cases, this can succeed only for a top-level query, because for a * subquery in FROM, the parent query's invocation of pull_up_subqueries would @@ -1478,10 +1478,10 @@ flatten_simple_union_all(PlannerInfo *root) /* * Make a copy of the leftmost RTE and add it to the rtable. This copy - * will represent the leftmost leaf query in its capacity as a member - * of the appendrel. The original will represent the appendrel as a - * whole. (We must do things this way because the upper query's Vars - * have to be seen as referring to the whole appendrel.) + * will represent the leftmost leaf query in its capacity as a member of + * the appendrel. The original will represent the appendrel as a whole. + * (We must do things this way because the upper query's Vars have to be + * seen as referring to the whole appendrel.) */ childRTE = copyObject(leftmostRTE); parse->rtable = lappend(parse->rtable, childRTE); @@ -1503,8 +1503,8 @@ flatten_simple_union_all(PlannerInfo *root) parse->jointree->fromlist = list_make1(rtr); /* - * Now pretend the query has no setops. We must do this before trying - * to do subquery pullup, because of Assert in pull_up_simple_subquery. + * Now pretend the query has no setops. We must do this before trying to + * do subquery pullup, because of Assert in pull_up_simple_subquery. */ parse->setOperations = NULL; @@ -1842,9 +1842,9 @@ reduce_outer_joins_pass2(Node *jtnode, * never both, to the children of an outer join. * * Note that a SEMI join works like an inner join here: it's okay - * to pass down both local and upper constraints. (There can't - * be any upper constraints affecting its inner side, but it's - * not worth having a separate code path to avoid passing them.) + * to pass down both local and upper constraints. (There can't be + * any upper constraints affecting its inner side, but it's not + * worth having a separate code path to avoid passing them.) * * At a FULL join we just punt and pass nothing down --- is it * possible to be smarter? @@ -1882,7 +1882,7 @@ reduce_outer_joins_pass2(Node *jtnode, pass_nonnullable_vars = local_nonnullable_vars; pass_forced_null_vars = local_forced_null_vars; } - else if (jointype != JOIN_FULL) /* ie, LEFT or ANTI */ + else if (jointype != JOIN_FULL) /* ie, LEFT or ANTI */ { /* can't pass local constraints to non-nullable side */ pass_nonnullable_rels = nonnullable_rels; diff --git a/src/backend/optimizer/prep/prepqual.c b/src/backend/optimizer/prep/prepqual.c index 10e00d90dd..f6f00c4ee9 100644 --- a/src/backend/optimizer/prep/prepqual.c +++ b/src/backend/optimizer/prep/prepqual.c @@ -54,12 +54,12 @@ static Expr *process_duplicate_ors(List *orlist); * Although this can be invoked on its own, it's mainly intended as a helper * for eval_const_expressions(), and that context drives several design * decisions. In particular, if the input is already AND/OR flat, we must - * preserve that property. We also don't bother to recurse in situations + * preserve that property. We also don't bother to recurse in situations * where we can assume that lower-level executions of eval_const_expressions * would already have simplified sub-clauses of the input. * * The difference between this and a simple make_notclause() is that this - * tries to get rid of the NOT node by logical simplification. It's clearly + * tries to get rid of the NOT node by logical simplification. It's clearly * always a win if the NOT node can be eliminated altogether. However, our * use of DeMorgan's laws could result in having more NOT nodes rather than * fewer. We do that unconditionally anyway, because in WHERE clauses it's @@ -141,21 +141,21 @@ negate_clause(Node *node) switch (expr->boolop) { - /*-------------------- - * Apply DeMorgan's Laws: - * (NOT (AND A B)) => (OR (NOT A) (NOT B)) - * (NOT (OR A B)) => (AND (NOT A) (NOT B)) - * i.e., swap AND for OR and negate each subclause. - * - * If the input is already AND/OR flat and has no NOT - * directly above AND or OR, this transformation preserves - * those properties. For example, if no direct child of - * the given AND clause is an AND or a NOT-above-OR, then - * the recursive calls of negate_clause() can't return any - * OR clauses. So we needn't call pull_ors() before - * building a new OR clause. Similarly for the OR case. - *-------------------- - */ + /*-------------------- + * Apply DeMorgan's Laws: + * (NOT (AND A B)) => (OR (NOT A) (NOT B)) + * (NOT (OR A B)) => (AND (NOT A) (NOT B)) + * i.e., swap AND for OR and negate each subclause. + * + * If the input is already AND/OR flat and has no NOT + * directly above AND or OR, this transformation preserves + * those properties. For example, if no direct child of + * the given AND clause is an AND or a NOT-above-OR, then + * the recursive calls of negate_clause() can't return any + * OR clauses. So we needn't call pull_ors() before + * building a new OR clause. Similarly for the OR case. + *-------------------- + */ case AND_EXPR: { List *nargs = NIL; @@ -183,6 +183,7 @@ negate_clause(Node *node) } break; case NOT_EXPR: + /* * NOT underneath NOT: they cancel. We assume the * input is already simplified, so no need to recurse. @@ -218,8 +219,8 @@ negate_clause(Node *node) break; case T_BooleanTest: { - BooleanTest *expr = (BooleanTest *) node; - BooleanTest *newexpr = makeNode(BooleanTest); + BooleanTest *expr = (BooleanTest *) node; + BooleanTest *newexpr = makeNode(BooleanTest); newexpr->arg = expr->arg; switch (expr->booltesttype) diff --git a/src/backend/optimizer/prep/preptlist.c b/src/backend/optimizer/prep/preptlist.c index 4ba8921528..c97150c6f7 100644 --- a/src/backend/optimizer/prep/preptlist.c +++ b/src/backend/optimizer/prep/preptlist.c @@ -4,7 +4,7 @@ * Routines to preprocess the parse tree target list * * For INSERT and UPDATE queries, the targetlist must contain an entry for - * each attribute of the target relation in the correct order. For all query + * each attribute of the target relation in the correct order. For all query * types, we may need to add junk tlist entries for Vars used in the RETURNING * list and row ID information needed for EvalPlanQual checking. * @@ -80,7 +80,7 @@ preprocess_targetlist(PlannerInfo *root, List *tlist) /* * Add necessary junk columns for rowmarked rels. These values are needed * for locking of rels selected FOR UPDATE/SHARE, and to do EvalPlanQual - * rechecking. See comments for PlanRowMark in plannodes.h. + * rechecking. See comments for PlanRowMark in plannodes.h. */ foreach(lc, root->rowMarks) { diff --git a/src/backend/optimizer/prep/prepunion.c b/src/backend/optimizer/prep/prepunion.c index e15a862042..0ed9535d94 100644 --- a/src/backend/optimizer/prep/prepunion.c +++ b/src/backend/optimizer/prep/prepunion.c @@ -938,7 +938,7 @@ generate_setop_tlist(List *colTypes, int flag, * The Vars are always generated with varno 0. */ static List * -generate_append_tlist(List *colTypes, List*colCollations, bool flag, +generate_append_tlist(List *colTypes, List *colCollations, bool flag, List *input_plans, List *refnames_tlist) { diff --git a/src/backend/optimizer/util/clauses.c b/src/backend/optimizer/util/clauses.c index b1069259f9..b3c2aec97b 100644 --- a/src/backend/optimizer/util/clauses.c +++ b/src/backend/optimizer/util/clauses.c @@ -2042,7 +2042,7 @@ rowtype_field_matches(Oid rowtypeid, int fieldnum, * * Whenever a function is eliminated from the expression by means of * constant-expression evaluation or inlining, we add the function to - * root->glob->invalItems. This ensures the plan is known to depend on + * root->glob->invalItems. This ensures the plan is known to depend on * such functions, even though they aren't referenced anymore. * * We assume that the tree has already been type-checked and contains @@ -2437,8 +2437,8 @@ eval_const_expressions_mutator(Node *node, context); /* - * Use negate_clause() to see if we can simplify away - * the NOT. + * Use negate_clause() to see if we can simplify away the + * NOT. */ return negate_clause(arg); } @@ -2548,9 +2548,9 @@ eval_const_expressions_mutator(Node *node, makeConst(OIDOID, -1, InvalidOid, sizeof(Oid), ObjectIdGetDatum(intypioparam), false, true), - makeConst(INT4OID, -1, InvalidOid, sizeof(int32), - Int32GetDatum(-1), - false, true)); + makeConst(INT4OID, -1, InvalidOid, sizeof(int32), + Int32GetDatum(-1), + false, true)); simple = simplify_function(infunc, expr->resulttype, -1, @@ -2618,9 +2618,9 @@ eval_const_expressions_mutator(Node *node, /* * If we can simplify the input to a constant, then we don't need the * CollateExpr node at all: just change the constcollid field of the - * Const node. Otherwise, replace the CollateExpr with a RelabelType. - * (We do that so as to improve uniformity of expression representation - * and thus simplify comparison of expressions.) + * Const node. Otherwise, replace the CollateExpr with a RelabelType. + * (We do that so as to improve uniformity of expression + * representation and thus simplify comparison of expressions.) */ CollateExpr *collate = (CollateExpr *) node; Node *arg; @@ -2675,7 +2675,7 @@ eval_const_expressions_mutator(Node *node, * placeholder nodes, so that we have the opportunity to reduce * constant test conditions. For example this allows * CASE 0 WHEN 0 THEN 1 ELSE 1/0 END - * to reduce to 1 rather than drawing a divide-by-0 error. Note + * to reduce to 1 rather than drawing a divide-by-0 error. Note * that when the test expression is constant, we don't have to * include it in the resulting CASE; for example * CASE 0 WHEN x THEN y ELSE z END @@ -2855,9 +2855,9 @@ eval_const_expressions_mutator(Node *node, /* * We can remove null constants from the list. For a non-null * constant, if it has not been preceded by any other - * non-null-constant expressions then it is the result. Otherwise, - * it's the next argument, but we can drop following arguments - * since they will never be reached. + * non-null-constant expressions then it is the result. + * Otherwise, it's the next argument, but we can drop following + * arguments since they will never be reached. */ if (IsA(e, Const)) { @@ -3353,12 +3353,12 @@ simplify_boolean_equality(Oid opno, List *args) if (DatumGetBool(((Const *) leftop)->constvalue)) return rightop; /* true = foo */ else - return negate_clause(rightop); /* false = foo */ + return negate_clause(rightop); /* false = foo */ } else { if (DatumGetBool(((Const *) leftop)->constvalue)) - return negate_clause(rightop); /* true <> foo */ + return negate_clause(rightop); /* true <> foo */ else return rightop; /* false <> foo */ } @@ -3902,7 +3902,7 @@ inline_function(Oid funcid, Oid result_type, Oid result_collid, fexpr->funcresulttype = result_type; fexpr->funcretset = false; fexpr->funcformat = COERCE_DONTCARE; /* doesn't matter */ - fexpr->funccollid = result_collid; /* doesn't matter */ + fexpr->funccollid = result_collid; /* doesn't matter */ fexpr->inputcollid = input_collid; fexpr->args = args; fexpr->location = -1; @@ -4060,18 +4060,18 @@ inline_function(Oid funcid, Oid result_type, Oid result_collid, MemoryContextDelete(mycxt); /* - * If the result is of a collatable type, force the result to expose - * the correct collation. In most cases this does not matter, but - * it's possible that the function result is used directly as a sort key - * or in other places where we expect exprCollation() to tell the truth. + * If the result is of a collatable type, force the result to expose the + * correct collation. In most cases this does not matter, but it's + * possible that the function result is used directly as a sort key or in + * other places where we expect exprCollation() to tell the truth. */ if (OidIsValid(result_collid)) { - Oid exprcoll = exprCollation(newexpr); + Oid exprcoll = exprCollation(newexpr); if (OidIsValid(exprcoll) && exprcoll != result_collid) { - CollateExpr *newnode = makeNode(CollateExpr); + CollateExpr *newnode = makeNode(CollateExpr); newnode->arg = (Expr *) newexpr; newnode->collOid = result_collid; @@ -4370,11 +4370,11 @@ inline_set_returning_function(PlannerInfo *root, RangeTblEntry *rte) oldcxt = MemoryContextSwitchTo(mycxt); /* - * When we call eval_const_expressions below, it might try to add items - * to root->glob->invalItems. Since it is running in the temp context, - * those items will be in that context, and will need to be copied out - * if we're successful. Temporarily reset the list so that we can keep - * those items separate from the pre-existing list contents. + * When we call eval_const_expressions below, it might try to add items to + * root->glob->invalItems. Since it is running in the temp context, those + * items will be in that context, and will need to be copied out if we're + * successful. Temporarily reset the list so that we can keep those items + * separate from the pre-existing list contents. */ saveInvalItems = root->glob->invalItems; root->glob->invalItems = NIL; @@ -4419,8 +4419,8 @@ inline_set_returning_function(PlannerInfo *root, RangeTblEntry *rte) goto fail; /* - * Set up to handle parameters while parsing the function body. We - * can use the FuncExpr just created as the input for + * Set up to handle parameters while parsing the function body. We can + * use the FuncExpr just created as the input for * prepare_sql_fn_parse_info. */ pinfo = prepare_sql_fn_parse_info(func_tuple, @@ -4438,7 +4438,7 @@ inline_set_returning_function(PlannerInfo *root, RangeTblEntry *rte) querytree_list = pg_analyze_and_rewrite_params(linitial(raw_parsetree_list), src, - (ParserSetupHook) sql_fn_parser_setup, + (ParserSetupHook) sql_fn_parser_setup, pinfo); if (list_length(querytree_list) != 1) goto fail; @@ -4513,8 +4513,8 @@ inline_set_returning_function(PlannerInfo *root, RangeTblEntry *rte) ReleaseSysCache(func_tuple); /* - * We don't have to fix collations here because the upper query is - * already parsed, ie, the collations in the RTE are what count. + * We don't have to fix collations here because the upper query is already + * parsed, ie, the collations in the RTE are what count. */ /* diff --git a/src/backend/optimizer/util/pathnode.c b/src/backend/optimizer/util/pathnode.c index b60c88d925..55218b5869 100644 --- a/src/backend/optimizer/util/pathnode.c +++ b/src/backend/optimizer/util/pathnode.c @@ -745,7 +745,7 @@ create_merge_append_path(PlannerInfo *root, else { /* We'll need to insert a Sort node, so include cost for that */ - Path sort_path; /* dummy for result of cost_sort */ + Path sort_path; /* dummy for result of cost_sort */ cost_sort(&sort_path, root, @@ -1432,11 +1432,11 @@ create_foreignscan_path(PlannerInfo *root, RelOptInfo *rel) ForeignPath *pathnode = makeNode(ForeignPath); RangeTblEntry *rte; FdwRoutine *fdwroutine; - FdwPlan *fdwplan; + FdwPlan *fdwplan; pathnode->path.pathtype = T_ForeignScan; pathnode->path.parent = rel; - pathnode->path.pathkeys = NIL; /* result is always unordered */ + pathnode->path.pathkeys = NIL; /* result is always unordered */ /* Get FDW's callback info */ rte = planner_rt_fetch(rel->relid, root); diff --git a/src/backend/optimizer/util/placeholder.c b/src/backend/optimizer/util/placeholder.c index 61edd4991c..9796fbf9b6 100644 --- a/src/backend/optimizer/util/placeholder.c +++ b/src/backend/optimizer/util/placeholder.c @@ -25,7 +25,7 @@ /* Local functions */ static Relids find_placeholders_recurse(PlannerInfo *root, Node *jtnode); static void find_placeholders_in_qual(PlannerInfo *root, Node *qual, - Relids relids); + Relids relids); /* @@ -179,7 +179,7 @@ find_placeholders_recurse(PlannerInfo *root, Node *jtnode) { elog(ERROR, "unrecognized node type: %d", (int) nodeTag(jtnode)); - jtrelids = NULL; /* keep compiler quiet */ + jtrelids = NULL; /* keep compiler quiet */ } return jtrelids; } diff --git a/src/backend/optimizer/util/predtest.c b/src/backend/optimizer/util/predtest.c index 72fd3e4ca7..a7e83729b1 100644 --- a/src/backend/optimizer/util/predtest.c +++ b/src/backend/optimizer/util/predtest.c @@ -1696,7 +1696,7 @@ get_btree_test_op(Oid pred_op, Oid clause_op, bool refute_it) else if (OidIsValid(clause_op_negator)) { clause_tuple = SearchSysCache3(AMOPOPID, - ObjectIdGetDatum(clause_op_negator), + ObjectIdGetDatum(clause_op_negator), CharGetDatum(AMOP_SEARCH), ObjectIdGetDatum(opfamily_id)); if (HeapTupleIsValid(clause_tuple)) diff --git a/src/backend/optimizer/util/var.c b/src/backend/optimizer/util/var.c index 944db23800..edf507c405 100644 --- a/src/backend/optimizer/util/var.c +++ b/src/backend/optimizer/util/var.c @@ -694,7 +694,7 @@ pull_var_clause_walker(Node *node, pull_var_clause_context *context) * entries might now be arbitrary expressions, not just Vars. This affects * this function in one important way: we might find ourselves inserting * SubLink expressions into subqueries, and we must make sure that their - * Query.hasSubLinks fields get set to TRUE if so. If there are any + * Query.hasSubLinks fields get set to TRUE if so. If there are any * SubLinks in the join alias lists, the outer Query should already have * hasSubLinks = TRUE, so this is only relevant to un-flattened subqueries. * diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c index 315f067b17..e4e83a6716 100644 --- a/src/backend/parser/analyze.c +++ b/src/backend/parser/analyze.c @@ -759,8 +759,8 @@ transformInsertRow(ParseState *pstate, List *exprlist, * columns. Add a suitable hint if that seems to be the problem, * because the main error message is quite misleading for this case. * (If there's no stmtcols, you'll get something about data type - * mismatch, which is less misleading so we don't worry about giving - * a hint in that case.) + * mismatch, which is less misleading so we don't worry about giving a + * hint in that case.) */ ereport(ERROR, (errcode(ERRCODE_SYNTAX_ERROR), @@ -809,7 +809,7 @@ transformInsertRow(ParseState *pstate, List *exprlist, * return -1 if expression isn't a RowExpr or a Var referencing one. * * This is currently used only for hint purposes, so we aren't terribly - * tense about recognizing all possible cases. The Var case is interesting + * tense about recognizing all possible cases. The Var case is interesting * because that's what we'll get in the INSERT ... SELECT (...) case. */ static int @@ -1100,8 +1100,8 @@ transformValuesClause(ParseState *pstate, SelectStmt *stmt) /* * We must assign collations now because assign_query_collations * doesn't process rangetable entries. We just assign all the - * collations independently in each row, and don't worry about - * whether they are consistent vertically either. + * collations independently in each row, and don't worry about whether + * they are consistent vertically either. */ assign_list_collations(pstate, newsublist); @@ -1452,7 +1452,7 @@ transformSetOperationStmt(ParseState *pstate, SelectStmt *stmt) * Recursively transform leaves and internal nodes of a set-op tree * * In addition to returning the transformed node, if targetlist isn't NULL - * then we return a list of its non-resjunk TargetEntry nodes. For a leaf + * then we return a list of its non-resjunk TargetEntry nodes. For a leaf * set-op node these are the actual targetlist entries; otherwise they are * dummy entries created to carry the type, typmod, collation, and location * (for error messages) of each output column of the set-op node. This info @@ -1672,7 +1672,7 @@ transformSetOperationTree(ParseState *pstate, SelectStmt *stmt, * child query's semantics. * * If a child expression is an UNKNOWN-type Const or Param, we - * want to replace it with the coerced expression. This can only + * want to replace it with the coerced expression. This can only * happen when the child is a leaf set-op node. It's safe to * replace the expression because if the child query's semantics * depended on the type of this output column, it'd have already @@ -1721,8 +1721,8 @@ transformSetOperationTree(ParseState *pstate, SelectStmt *stmt, * collation.) */ rescolcoll = select_common_collation(pstate, - list_make2(lcolnode, rcolnode), - (op->op == SETOP_UNION && op->all)); + list_make2(lcolnode, rcolnode), + (op->op == SETOP_UNION && op->all)); /* emit results */ op->colTypes = lappend_oid(op->colTypes, rescoltype); @@ -1778,7 +1778,7 @@ transformSetOperationTree(ParseState *pstate, SelectStmt *stmt, rescolnode->collation = rescolcoll; rescolnode->location = bestlocation; restle = makeTargetEntry((Expr *) rescolnode, - 0, /* no need to set resno */ + 0, /* no need to set resno */ NULL, false); *targetlist = lappend(*targetlist, restle); @@ -2331,10 +2331,10 @@ transformLockingClause(ParseState *pstate, Query *qry, LockingClause *lc, case RTE_RELATION: if (rte->relkind == RELKIND_FOREIGN_TABLE) ereport(ERROR, - (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("SELECT FOR UPDATE/SHARE cannot be used with foreign table \"%s\"", - rte->eref->aliasname), - parser_errposition(pstate, thisrel->location))); + (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), + errmsg("SELECT FOR UPDATE/SHARE cannot be used with foreign table \"%s\"", + rte->eref->aliasname), + parser_errposition(pstate, thisrel->location))); applyLockingClause(qry, i, lc->forUpdate, lc->noWait, pushedDown); diff --git a/src/backend/parser/parse_agg.c b/src/backend/parser/parse_agg.c index 523d6e6989..8356133796 100644 --- a/src/backend/parser/parse_agg.c +++ b/src/backend/parser/parse_agg.c @@ -631,7 +631,7 @@ check_ungrouped_columns_walker(Node *node, /* * Check whether the Var is known functionally dependent on the GROUP - * BY columns. If so, we can allow the Var to be used, because the + * BY columns. If so, we can allow the Var to be used, because the * grouping is really a no-op for this table. However, this deduction * depends on one or more constraints of the table, so we have to add * those constraints to the query's constraintDeps list, because it's @@ -642,11 +642,11 @@ check_ungrouped_columns_walker(Node *node, * Because this is a pretty expensive check, and will have the same * outcome for all columns of a table, we remember which RTEs we've * already proven functional dependency for in the func_grouped_rels - * list. This test also prevents us from adding duplicate entries - * to the constraintDeps list. + * list. This test also prevents us from adding duplicate entries to + * the constraintDeps list. */ if (list_member_int(*context->func_grouped_rels, var->varno)) - return false; /* previously proven acceptable */ + return false; /* previously proven acceptable */ Assert(var->varno > 0 && (int) var->varno <= list_length(context->pstate->p_rtable)); @@ -661,7 +661,7 @@ check_ungrouped_columns_walker(Node *node, { *context->func_grouped_rels = lappend_int(*context->func_grouped_rels, var->varno); - return false; /* acceptable */ + return false; /* acceptable */ } } diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c index 6c0a78474c..c5fe6b6a3f 100644 --- a/src/backend/parser/parse_clause.c +++ b/src/backend/parser/parse_clause.c @@ -1078,7 +1078,7 @@ buildMergedJoinVar(ParseState *pstate, JoinType jointype, else if (l_colvar->vartypmod != outcoltypmod) l_node = (Node *) makeRelabelType((Expr *) l_colvar, outcoltype, outcoltypmod, - InvalidOid, /* fixed below */ + InvalidOid, /* fixed below */ COERCE_IMPLICIT_CAST); else l_node = (Node *) l_colvar; @@ -1090,7 +1090,7 @@ buildMergedJoinVar(ParseState *pstate, JoinType jointype, else if (r_colvar->vartypmod != outcoltypmod) r_node = (Node *) makeRelabelType((Expr *) r_colvar, outcoltype, outcoltypmod, - InvalidOid, /* fixed below */ + InvalidOid, /* fixed below */ COERCE_IMPLICIT_CAST); else r_node = (Node *) r_colvar; @@ -1143,8 +1143,8 @@ buildMergedJoinVar(ParseState *pstate, JoinType jointype, /* * Apply assign_expr_collations to fix up the collation info in the - * coercion and CoalesceExpr nodes, if we made any. This must be done - * now so that the join node's alias vars show correct collation info. + * coercion and CoalesceExpr nodes, if we made any. This must be done now + * so that the join node's alias vars show correct collation info. */ assign_expr_collations(pstate, res_node); diff --git a/src/backend/parser/parse_coerce.c b/src/backend/parser/parse_coerce.c index 895c3ad985..0418972517 100644 --- a/src/backend/parser/parse_coerce.c +++ b/src/backend/parser/parse_coerce.c @@ -285,7 +285,7 @@ coerce_type(ParseState *pstate, Node *node, { /* * If we have a COLLATE clause, we have to push the coercion - * underneath the COLLATE. This is really ugly, but there is little + * underneath the COLLATE. This is really ugly, but there is little * choice because the above hacks on Consts and Params wouldn't happen * otherwise. */ @@ -1959,7 +1959,7 @@ find_coercion_pathway(Oid targetTypeId, Oid sourceTypeId, Oid sourceElem; if ((targetElem = get_element_type(targetTypeId)) != InvalidOid && - (sourceElem = get_base_element_type(sourceTypeId)) != InvalidOid) + (sourceElem = get_base_element_type(sourceTypeId)) != InvalidOid) { CoercionPathType elempathtype; Oid elemfuncid; @@ -2091,8 +2091,8 @@ is_complex_array(Oid typid) static bool typeIsOfTypedTable(Oid reltypeId, Oid reloftypeId) { - Oid relid = typeidTypeRelid(reltypeId); - bool result = false; + Oid relid = typeidTypeRelid(reltypeId); + bool result = false; if (relid) { diff --git a/src/backend/parser/parse_collate.c b/src/backend/parser/parse_collate.c index 3e557db266..f0cd3f88d2 100644 --- a/src/backend/parser/parse_collate.c +++ b/src/backend/parser/parse_collate.c @@ -14,19 +14,19 @@ * 1. The output collation of each expression node, or InvalidOid if it * returns a noncollatable data type. This can also be InvalidOid if the * result type is collatable but the collation is indeterminate. - * 2. The collation to be used in executing each function. InvalidOid means + * 2. The collation to be used in executing each function. InvalidOid means * that there are no collatable inputs or their collation is indeterminate. * This value is only stored in node types that might call collation-using * functions. * * You might think we could get away with storing only one collation per - * node, but the two concepts really need to be kept distinct. Otherwise + * node, but the two concepts really need to be kept distinct. Otherwise * it's too confusing when a function produces a collatable output type but * has no collatable inputs or produces noncollatable output from collatable * inputs. * * Cases with indeterminate collation might result in an error being thrown - * at runtime. If we knew exactly which functions require collation + * at runtime. If we knew exactly which functions require collation * information, we could throw those errors at parse time instead. * * Portions Copyright (c) 1996-2011, PostgreSQL Global Development Group @@ -72,7 +72,7 @@ typedef struct static bool assign_query_collations_walker(Node *node, ParseState *pstate); static bool assign_collations_walker(Node *node, - assign_collations_context *context); + assign_collations_context *context); /* @@ -116,8 +116,8 @@ assign_query_collations_walker(Node *node, ParseState *pstate) return false; /* - * We don't want to recurse into a set-operations tree; it's already - * been fully processed in transformSetOperationStmt. + * We don't want to recurse into a set-operations tree; it's already been + * fully processed in transformSetOperationStmt. */ if (IsA(node, SetOperationStmt)) return false; @@ -144,7 +144,7 @@ assign_list_collations(ParseState *pstate, List *exprs) foreach(lc, exprs) { - Node *node = (Node *) lfirst(lc); + Node *node = (Node *) lfirst(lc); assign_expr_collations(pstate, node); } @@ -231,7 +231,7 @@ select_common_collation(ParseState *pstate, List *exprs, bool none_ok) * Recursive guts of collation processing. * * Nodes with no children (eg, Vars, Consts, Params) must have been marked - * when built. All upper-level nodes are marked here. + * when built. All upper-level nodes are marked here. * * Note: if this is invoked directly on a List, it will attempt to infer a * common collation for all the list members. In particular, it will throw @@ -250,9 +250,9 @@ assign_collations_walker(Node *node, assign_collations_context *context) return false; /* - * Prepare for recursion. For most node types, though not all, the - * first thing we do is recurse to process all nodes below this one. - * Each level of the tree has its own local context. + * Prepare for recursion. For most node types, though not all, the first + * thing we do is recurse to process all nodes below this one. Each level + * of the tree has its own local context. */ loccontext.pstate = context->pstate; loccontext.collation = InvalidOid; @@ -323,11 +323,11 @@ assign_collations_walker(Node *node, assign_collations_context *context) { /* * CaseExpr is a special case because we do not want to - * recurse into the test expression (if any). It was - * already marked with collations during transformCaseExpr, - * and furthermore its collation is not relevant to the - * result of the CASE --- only the output expressions are. - * So we can't use expression_tree_walker here. + * recurse into the test expression (if any). It was already + * marked with collations during transformCaseExpr, and + * furthermore its collation is not relevant to the result of + * the CASE --- only the output expressions are. So we can't + * use expression_tree_walker here. */ CaseExpr *expr = (CaseExpr *) node; Oid typcollation; @@ -338,6 +338,7 @@ assign_collations_walker(Node *node, assign_collations_context *context) CaseWhen *when = (CaseWhen *) lfirst(lc); Assert(IsA(when, CaseWhen)); + /* * The condition expressions mustn't affect the CASE's * result collation either; but since they are known to @@ -401,11 +402,11 @@ assign_collations_walker(Node *node, assign_collations_context *context) case T_RowExpr: { /* - * RowExpr is a special case because the subexpressions - * are independent: we don't want to complain if some of - * them have incompatible explicit collations. + * RowExpr is a special case because the subexpressions are + * independent: we don't want to complain if some of them have + * incompatible explicit collations. */ - RowExpr *expr = (RowExpr *) node; + RowExpr *expr = (RowExpr *) node; assign_list_collations(context->pstate, expr->args); @@ -414,7 +415,7 @@ assign_collations_walker(Node *node, assign_collations_context *context) * has a collation, we can just stop here: this node has no * impact on the collation of its parent. */ - return false; /* done */ + return false; /* done */ } case T_RowCompareExpr: { @@ -431,9 +432,9 @@ assign_collations_walker(Node *node, assign_collations_context *context) forboth(l, expr->largs, r, expr->rargs) { - Node *le = (Node *) lfirst(l); - Node *re = (Node *) lfirst(r); - Oid coll; + Node *le = (Node *) lfirst(l); + Node *re = (Node *) lfirst(r); + Oid coll; coll = select_common_collation(context->pstate, list_make2(le, re), @@ -443,11 +444,11 @@ assign_collations_walker(Node *node, assign_collations_context *context) expr->inputcollids = colls; /* - * Since the result is always boolean and therefore never - * has a collation, we can just stop here: this node has no - * impact on the collation of its parent. + * Since the result is always boolean and therefore never has + * a collation, we can just stop here: this node has no impact + * on the collation of its parent. */ - return false; /* done */ + return false; /* done */ } case T_CoerceToDomain: { @@ -455,12 +456,12 @@ assign_collations_walker(Node *node, assign_collations_context *context) * If the domain declaration included a non-default COLLATE * spec, then use that collation as the output collation of * the coercion. Otherwise allow the input collation to - * bubble up. (The input should be of the domain's base - * type, therefore we don't need to worry about it not being + * bubble up. (The input should be of the domain's base type, + * therefore we don't need to worry about it not being * collatable when the domain is.) */ CoerceToDomain *expr = (CoerceToDomain *) node; - Oid typcollation = get_typcollation(expr->resulttype); + Oid typcollation = get_typcollation(expr->resulttype); /* ... but first, recurse */ (void) expression_tree_walker(node, @@ -510,7 +511,7 @@ assign_collations_walker(Node *node, assign_collations_context *context) /* * TargetEntry can have only one child, and should bubble that - * state up to its parent. We can't use the general-case code + * state up to its parent. We can't use the general-case code * below because exprType and friends don't work on TargetEntry. */ collation = loccontext.collation; @@ -525,9 +526,9 @@ assign_collations_walker(Node *node, assign_collations_context *context) * There are some cases where there might not be a failure, for * example if the planner chooses to use hash aggregation instead * of sorting for grouping; but it seems better to predictably - * throw an error. (Compare transformSetOperationTree, which will - * throw error for indeterminate collation of set-op columns, - * even though the planner might be able to implement the set-op + * throw an error. (Compare transformSetOperationTree, which will + * throw error for indeterminate collation of set-op columns, even + * though the planner might be able to implement the set-op * without sorting.) */ if (strength == COLLATE_CONFLICT && @@ -548,6 +549,7 @@ assign_collations_walker(Node *node, assign_collations_context *context) (void) expression_tree_walker(node, assign_collations_walker, (void *) &loccontext); + /* * When we're invoked on a query's jointree, we don't need to do * anything with join nodes except recurse through them to process @@ -599,6 +601,7 @@ assign_collations_walker(Node *node, assign_collations_context *context) case T_CaseTestExpr: case T_SetToDefault: case T_CurrentOfExpr: + /* * General case for childless expression nodes. These should * already have a collation assigned; it is not this function's @@ -610,10 +613,10 @@ assign_collations_walker(Node *node, assign_collations_context *context) /* * Note: in most cases, there will be an assigned collation * whenever type_is_collatable(exprType(node)); but an exception - * occurs for a Var referencing a subquery output column for - * which a unique collation was not determinable. That may lead - * to a runtime failure if a collation-sensitive function is - * applied to the Var. + * occurs for a Var referencing a subquery output column for which + * a unique collation was not determinable. That may lead to a + * runtime failure if a collation-sensitive function is applied to + * the Var. */ if (OidIsValid(collation)) @@ -626,10 +629,10 @@ assign_collations_walker(Node *node, assign_collations_context *context) default: { /* - * General case for most expression nodes with children. - * First recurse, then figure out what to assign here. + * General case for most expression nodes with children. First + * recurse, then figure out what to assign here. */ - Oid typcollation; + Oid typcollation; (void) expression_tree_walker(node, assign_collations_walker, @@ -668,9 +671,9 @@ assign_collations_walker(Node *node, assign_collations_context *context) } /* - * Save the result collation into the expression node. - * If the state is COLLATE_CONFLICT, we'll set the collation - * to InvalidOid, which might result in an error at runtime. + * Save the result collation into the expression node. If the + * state is COLLATE_CONFLICT, we'll set the collation to + * InvalidOid, which might result in an error at runtime. */ if (strength == COLLATE_CONFLICT) exprSetCollation(node, InvalidOid); diff --git a/src/backend/parser/parse_cte.c b/src/backend/parser/parse_cte.c index c527f7589e..41097263b4 100644 --- a/src/backend/parser/parse_cte.c +++ b/src/backend/parser/parse_cte.c @@ -245,7 +245,7 @@ analyzeCTE(ParseState *pstate, CommonTableExpr *cte) cte->ctequery = (Node *) query; /* - * Check that we got something reasonable. These first two cases should + * Check that we got something reasonable. These first two cases should * be prevented by the grammar. */ if (!IsA(query, Query)) @@ -310,7 +310,7 @@ analyzeCTE(ParseState *pstate, CommonTableExpr *cte) continue; varattno++; Assert(varattno == te->resno); - if (lctyp == NULL || lctypmod == NULL || lccoll == NULL) /* shouldn't happen */ + if (lctyp == NULL || lctypmod == NULL || lccoll == NULL) /* shouldn't happen */ elog(ERROR, "wrong number of output columns in WITH"); texpr = (Node *) te->expr; if (exprType(texpr) != lfirst_oid(lctyp) || @@ -338,7 +338,7 @@ analyzeCTE(ParseState *pstate, CommonTableExpr *cte) lctypmod = lnext(lctypmod); lccoll = lnext(lccoll); } - if (lctyp != NULL || lctypmod != NULL || lccoll != NULL) /* shouldn't happen */ + if (lctyp != NULL || lctypmod != NULL || lccoll != NULL) /* shouldn't happen */ elog(ERROR, "wrong number of output columns in WITH"); } } @@ -645,7 +645,7 @@ checkWellFormedRecursion(CteState *cstate) CommonTableExpr *cte = cstate->items[i].cte; SelectStmt *stmt = (SelectStmt *) cte->ctequery; - Assert(!IsA(stmt, Query)); /* not analyzed yet */ + Assert(!IsA(stmt, Query)); /* not analyzed yet */ /* Ignore items that weren't found to be recursive */ if (!cte->cterecursive) diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c index 4986e0e5fa..08f0439e7e 100644 --- a/src/backend/parser/parse_expr.c +++ b/src/backend/parser/parse_expr.c @@ -163,6 +163,7 @@ transformExpr(ParseState *pstate, Node *expr) typenameTypeIdAndMod(pstate, tc->typeName, &targetType, &targetTypmod); + /* * If target is a domain over array, work with the base * array type here. transformTypeCast below will cast the @@ -1283,9 +1284,9 @@ transformCaseExpr(ParseState *pstate, CaseExpr *c) /* * Run collation assignment on the test expression so that we know - * what collation to mark the placeholder with. In principle we - * could leave it to parse_collate.c to do that later, but propagating - * the result to the CaseTestExpr would be unnecessarily complicated. + * what collation to mark the placeholder with. In principle we could + * leave it to parse_collate.c to do that later, but propagating the + * result to the CaseTestExpr would be unnecessarily complicated. */ assign_expr_collations(pstate, arg); @@ -2122,15 +2123,16 @@ static Node * transformCollateClause(ParseState *pstate, CollateClause *c) { CollateExpr *newc; - Oid argtype; + Oid argtype; newc = makeNode(CollateExpr); newc->arg = (Expr *) transformExpr(pstate, c->arg); argtype = exprType((Node *) newc->arg); + /* - * The unknown type is not collatable, but coerce_type() takes - * care of it separately, so we'll let it go here. + * The unknown type is not collatable, but coerce_type() takes care of it + * separately, so we'll let it go here. */ if (!type_is_collatable(argtype) && argtype != UNKNOWNOID) ereport(ERROR, @@ -2351,7 +2353,7 @@ make_row_comparison_op(ParseState *pstate, List *opname, rcexpr->rctype = rctype; rcexpr->opnos = opnos; rcexpr->opfamilies = opfamilies; - rcexpr->inputcollids = NIL; /* assign_expr_collations will fix this */ + rcexpr->inputcollids = NIL; /* assign_expr_collations will fix this */ rcexpr->largs = largs; rcexpr->rargs = rargs; diff --git a/src/backend/parser/parse_func.c b/src/backend/parser/parse_func.c index ba699e9a1e..75f1e20475 100644 --- a/src/backend/parser/parse_func.c +++ b/src/backend/parser/parse_func.c @@ -288,9 +288,9 @@ ParseFuncOrColumn(ParseState *pstate, List *funcname, List *fargs, errmsg("function %s does not exist", func_signature_string(funcname, nargs, argnames, actual_arg_types)), - errhint("No aggregate function matches the given name and argument types. " - "Perhaps you misplaced ORDER BY; ORDER BY must appear " - "after all regular arguments of the aggregate."), + errhint("No aggregate function matches the given name and argument types. " + "Perhaps you misplaced ORDER BY; ORDER BY must appear " + "after all regular arguments of the aggregate."), parser_errposition(pstate, location))); } else @@ -1034,7 +1034,7 @@ func_get_detail(List *funcname, case COERCION_PATH_COERCEVIAIO: if ((sourceType == RECORDOID || ISCOMPLEX(sourceType)) && - TypeCategory(targetType) == TYPCATEGORY_STRING) + TypeCategory(targetType) == TYPCATEGORY_STRING) iscoercion = false; else iscoercion = true; diff --git a/src/backend/parser/parse_node.c b/src/backend/parser/parse_node.c index 07257accc8..7b5c040cb4 100644 --- a/src/backend/parser/parse_node.c +++ b/src/backend/parser/parse_node.c @@ -220,7 +220,7 @@ transformArrayType(Oid *arrayType, int32 *arrayTypmod) * If the input is a domain, smash to base type, and extract the actual * typmod to be applied to the base type. Subscripting a domain is an * operation that necessarily works on the base array type, not the domain - * itself. (Note that we provide no method whereby the creator of a + * itself. (Note that we provide no method whereby the creator of a * domain over an array type could hide its ability to be subscripted.) */ *arrayType = getBaseTypeAndTypmod(*arrayType, arrayTypmod); @@ -290,8 +290,8 @@ transformArraySubscripts(ParseState *pstate, /* * Caller may or may not have bothered to determine elementType. Note - * that if the caller did do so, arrayType/arrayTypMod must be as - * modified by transformArrayType, ie, smash domain to base type. + * that if the caller did do so, arrayType/arrayTypMod must be as modified + * by transformArrayType, ie, smash domain to base type. */ if (!OidIsValid(elementType)) elementType = transformArrayType(&arrayType, &arrayTypMod); @@ -542,7 +542,7 @@ make_const(ParseState *pstate, Value *value, int location) con = makeConst(typeid, -1, /* typmod -1 is OK for all cases */ - InvalidOid, /* all cases are uncollatable types */ + InvalidOid, /* all cases are uncollatable types */ typelen, val, false, diff --git a/src/backend/parser/parse_oper.c b/src/backend/parser/parse_oper.c index 822e0a0a62..15a3bb3a01 100644 --- a/src/backend/parser/parse_oper.c +++ b/src/backend/parser/parse_oper.c @@ -214,9 +214,9 @@ get_sort_group_operators(Oid argtype, /* * If the datatype is an array, then we can use array_lt and friends ... * but only if there are suitable operators for the element type. - * Likewise, array types are only hashable if the element type is. - * Testing all three operator IDs here should be redundant, but let's do - * it anyway. + * Likewise, array types are only hashable if the element type is. Testing + * all three operator IDs here should be redundant, but let's do it + * anyway. */ if (lt_opr == ARRAY_LT_OP || eq_opr == ARRAY_EQ_OP || diff --git a/src/backend/parser/parse_param.c b/src/backend/parser/parse_param.c index 1895f92d7c..3b8a67619e 100644 --- a/src/backend/parser/parse_param.c +++ b/src/backend/parser/parse_param.c @@ -233,8 +233,8 @@ variable_coerce_param_hook(ParseState *pstate, Param *param, /* * This module always sets a Param's collation to be the default for - * its datatype. If that's not what you want, you should be using - * the more general parser substitution hooks. + * its datatype. If that's not what you want, you should be using the + * more general parser substitution hooks. */ param->paramcollid = get_typcollation(param->paramtype); diff --git a/src/backend/parser/parse_relation.c b/src/backend/parser/parse_relation.c index 1af3f2f3b5..d603ce2f42 100644 --- a/src/backend/parser/parse_relation.c +++ b/src/backend/parser/parse_relation.c @@ -1393,14 +1393,14 @@ addRangeTableEntryForCTE(ParseState *pstate, */ if (IsA(cte->ctequery, Query)) { - Query *ctequery = (Query *) cte->ctequery; + Query *ctequery = (Query *) cte->ctequery; if (ctequery->commandType != CMD_SELECT && ctequery->returningList == NIL) ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("WITH query \"%s\" does not have a RETURNING clause", - cte->ctename), + errmsg("WITH query \"%s\" does not have a RETURNING clause", + cte->ctename), parser_errposition(pstate, rv->location))); } @@ -1871,7 +1871,7 @@ expandTupleDesc(TupleDesc tupdesc, Alias *eref, * what type the Const claims to be. */ *colvars = lappend(*colvars, - makeNullConst(INT4OID, -1, InvalidOid)); + makeNullConst(INT4OID, -1, InvalidOid)); } } continue; @@ -1893,7 +1893,7 @@ expandTupleDesc(TupleDesc tupdesc, Alias *eref, Var *varnode; varnode = makeVar(rtindex, attr->attnum, - attr->atttypid, attr->atttypmod, attr->attcollation, + attr->atttypid, attr->atttypmod, attr->attcollation, sublevels_up); varnode->location = location; diff --git a/src/backend/parser/parse_target.c b/src/backend/parser/parse_target.c index 52c6db2eb5..3f630147b0 100644 --- a/src/backend/parser/parse_target.c +++ b/src/backend/parser/parse_target.c @@ -671,7 +671,7 @@ transformAssignmentIndirection(ParseState *pstate, parser_errposition(pstate, location))); get_atttypetypmodcoll(typrelid, attnum, - &fieldTypeId, &fieldTypMod, &fieldCollation); + &fieldTypeId, &fieldTypMod, &fieldCollation); /* recurse to create appropriate RHS for field assign */ rhs = transformAssignmentIndirection(pstate, @@ -783,8 +783,8 @@ transformAssignmentSubscripts(ParseState *pstate, /* * Array normally has same collation as elements, but there's an - * exception: we might be subscripting a domain over an array type. - * In that case use collation of the base type. + * exception: we might be subscripting a domain over an array type. In + * that case use collation of the base type. */ if (arrayType == targetTypeId) collationNeeded = targetCollation; diff --git a/src/backend/parser/parse_utilcmd.c b/src/backend/parser/parse_utilcmd.c index b65f5f991c..22411f1608 100644 --- a/src/backend/parser/parse_utilcmd.c +++ b/src/backend/parser/parse_utilcmd.c @@ -121,7 +121,7 @@ static void transformFKConstraints(CreateStmtContext *cxt, bool skipValidation, bool isAddConstraint); static void transformConstraintAttrs(CreateStmtContext *cxt, - List *constraintList); + List *constraintList); static void transformColumnType(CreateStmtContext *cxt, ColumnDef *column); static void setSchemaName(char *context_schema, char **stmt_schema_name); @@ -368,8 +368,8 @@ transformColumnDefinition(CreateStmtContext *cxt, ColumnDef *column) * If this is ALTER ADD COLUMN, make sure the sequence will be owned * by the table's owner. The current user might be someone else * (perhaps a superuser, or someone who's only a member of the owning - * role), but the SEQUENCE OWNED BY mechanisms will bleat unless - * table and sequence have exactly the same owning role. + * role), but the SEQUENCE OWNED BY mechanisms will bleat unless table + * and sequence have exactly the same owning role. */ if (cxt->rel) seqstmt->ownerId = cxt->rel->rd_rel->relowner; @@ -732,7 +732,7 @@ transformInhRelation(CreateStmtContext *cxt, InhRelation *inhRelation) /* Copy comment on constraint */ if ((inhRelation->options & CREATE_TABLE_LIKE_COMMENTS) && (comment = GetComment(get_constraint_oid(RelationGetRelid(relation), - n->conname, false), + n->conname, false), ConstraintRelationId, 0)) != NULL) { @@ -1390,8 +1390,8 @@ transformIndexConstraint(Constraint *constraint, CreateStmtContext *cxt) /* * If it's ALTER TABLE ADD CONSTRAINT USING INDEX, look up the index and * verify it's usable, then extract the implied column name list. (We - * will not actually need the column name list at runtime, but we need - * it now to check for duplicate column entries below.) + * will not actually need the column name list at runtime, but we need it + * now to check for duplicate column entries below.) */ if (constraint->indexname != NULL) { @@ -1436,8 +1436,8 @@ transformIndexConstraint(Constraint *constraint, CreateStmtContext *cxt) if (OidIsValid(get_index_constraint(index_oid))) ereport(ERROR, (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE), - errmsg("index \"%s\" is already associated with a constraint", - index_name), + errmsg("index \"%s\" is already associated with a constraint", + index_name), parser_errposition(cxt->pstate, constraint->location))); /* Perform validity checks on the index */ @@ -1482,8 +1482,8 @@ transformIndexConstraint(Constraint *constraint, CreateStmtContext *cxt) parser_errposition(cxt->pstate, constraint->location))); /* - * It's probably unsafe to change a deferred index to non-deferred. - * (A non-constraint index couldn't be deferred anyway, so this case + * It's probably unsafe to change a deferred index to non-deferred. (A + * non-constraint index couldn't be deferred anyway, so this case * should never occur; no need to sweat, but let's check it.) */ if (!index_form->indimmediate && !constraint->deferrable) @@ -1494,7 +1494,7 @@ transformIndexConstraint(Constraint *constraint, CreateStmtContext *cxt) parser_errposition(cxt->pstate, constraint->location))); /* - * Insist on it being a btree. That's the only kind that supports + * Insist on it being a btree. That's the only kind that supports * uniqueness at the moment anyway; but we must have an index that * exactly matches what you'd get from plain ADD CONSTRAINT syntax, * else dump and reload will produce a different index (breaking @@ -1514,15 +1514,15 @@ transformIndexConstraint(Constraint *constraint, CreateStmtContext *cxt) for (i = 0; i < index_form->indnatts; i++) { - int2 attnum = index_form->indkey.values[i]; + int2 attnum = index_form->indkey.values[i]; Form_pg_attribute attform; - char *attname; - Oid defopclass; + char *attname; + Oid defopclass; /* * We shouldn't see attnum == 0 here, since we already rejected - * expression indexes. If we do, SystemAttributeDefinition - * will throw an error. + * expression indexes. If we do, SystemAttributeDefinition will + * throw an error. */ if (attnum > 0) { @@ -1531,11 +1531,11 @@ transformIndexConstraint(Constraint *constraint, CreateStmtContext *cxt) } else attform = SystemAttributeDefinition(attnum, - heap_rel->rd_rel->relhasoids); + heap_rel->rd_rel->relhasoids); attname = pstrdup(NameStr(attform->attname)); /* - * Insist on default opclass and sort options. While the index + * Insist on default opclass and sort options. While the index * would still work as a constraint with non-default settings, it * might not provide exactly the same uniqueness semantics as * you'd get from a normally-created constraint; and there's also @@ -1549,7 +1549,7 @@ transformIndexConstraint(Constraint *constraint, CreateStmtContext *cxt) (errcode(ERRCODE_WRONG_OBJECT_TYPE), errmsg("index \"%s\" does not have default sorting behavior", index_name), errdetail("Cannot create a PRIMARY KEY or UNIQUE constraint using such an index."), - parser_errposition(cxt->pstate, constraint->location))); + parser_errposition(cxt->pstate, constraint->location))); constraint->keys = lappend(constraint->keys, makeString(attname)); } @@ -1694,13 +1694,13 @@ transformIndexConstraint(Constraint *constraint, CreateStmtContext *cxt) (errcode(ERRCODE_DUPLICATE_COLUMN), errmsg("column \"%s\" appears twice in primary key constraint", key), - parser_errposition(cxt->pstate, constraint->location))); + parser_errposition(cxt->pstate, constraint->location))); else ereport(ERROR, (errcode(ERRCODE_DUPLICATE_COLUMN), errmsg("column \"%s\" appears twice in unique constraint", key), - parser_errposition(cxt->pstate, constraint->location))); + parser_errposition(cxt->pstate, constraint->location))); } } @@ -1743,7 +1743,7 @@ transformFKConstraints(CreateStmtContext *cxt, Constraint *constraint = (Constraint *) lfirst(fkclist); constraint->skip_validation = true; - constraint->initially_valid = true; + constraint->initially_valid = true; } } @@ -2120,18 +2120,18 @@ transformRuleStmt(RuleStmt *stmt, const char *queryString, * However, they were already in the outer rangetable when we * analyzed the query, so we have to check. * - * Note that in the INSERT...SELECT case, we need to examine - * the CTE lists of both top_subqry and sub_qry. + * Note that in the INSERT...SELECT case, we need to examine the + * CTE lists of both top_subqry and sub_qry. * - * Note that we aren't digging into the body of the query - * looking for WITHs in nested sub-SELECTs. A WITH down there - * can legitimately refer to OLD/NEW, because it'd be an + * Note that we aren't digging into the body of the query looking + * for WITHs in nested sub-SELECTs. A WITH down there can + * legitimately refer to OLD/NEW, because it'd be an * indirect-correlated outer reference. */ if (rangeTableEntry_used((Node *) top_subqry->cteList, PRS2_OLD_VARNO, 0) || rangeTableEntry_used((Node *) sub_qry->cteList, - PRS2_OLD_VARNO, 0)) + PRS2_OLD_VARNO, 0)) ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), errmsg("cannot refer to OLD within WITH query"))); @@ -2226,12 +2226,13 @@ transformAlterTableStmt(AlterTableStmt *stmt, const char *queryString) lockmode = AlterTableGetLockLevel(stmt->cmds); /* - * Acquire appropriate lock on the target relation, which will be held until - * end of transaction. This ensures any decisions we make here based on - * the state of the relation will still be good at execution. We must get - * lock now because execution will later require it; taking a lower grade lock - * now and trying to upgrade later risks deadlock. Any new commands we add - * after this must not upgrade the lock level requested here. + * Acquire appropriate lock on the target relation, which will be held + * until end of transaction. This ensures any decisions we make here + * based on the state of the relation will still be good at execution. We + * must get lock now because execution will later require it; taking a + * lower grade lock now and trying to upgrade later risks deadlock. Any + * new commands we add after this must not upgrade the lock level + * requested here. */ rel = relation_openrv(stmt->relation, lockmode); @@ -2522,7 +2523,7 @@ transformColumnType(CreateStmtContext *cxt, ColumnDef *column) if (column->collClause) { Form_pg_type typtup = (Form_pg_type) GETSTRUCT(ctype); - Oid collOid; + Oid collOid; collOid = LookupCollation(cxt->pstate, column->collClause->collname, diff --git a/src/backend/port/dynloader/freebsd.c b/src/backend/port/dynloader/freebsd.c index 373d6aaec8..bc40079178 100644 --- a/src/backend/port/dynloader/freebsd.c +++ b/src/backend/port/dynloader/freebsd.c @@ -89,7 +89,7 @@ BSD44_derived_dlsym(void *handle, const char *name) snprintf(buf, sizeof(buf), "_%s", name); name = buf; } -#endif /* !__ELF__ */ +#endif /* !__ELF__ */ if ((vp = dlsym(handle, (char *) name)) == NULL) snprintf(error_message, sizeof(error_message), "dlsym (%s) failed", name); diff --git a/src/backend/port/dynloader/netbsd.c b/src/backend/port/dynloader/netbsd.c index d120656141..1bac83784a 100644 --- a/src/backend/port/dynloader/netbsd.c +++ b/src/backend/port/dynloader/netbsd.c @@ -89,7 +89,7 @@ BSD44_derived_dlsym(void *handle, const char *name) snprintf(buf, sizeof(buf), "_%s", name); name = buf; } -#endif /* !__ELF__ */ +#endif /* !__ELF__ */ if ((vp = dlsym(handle, (char *) name)) == NULL) snprintf(error_message, sizeof(error_message), "dlsym (%s) failed", name); diff --git a/src/backend/port/dynloader/openbsd.c b/src/backend/port/dynloader/openbsd.c index 2d061efb1e..4556a2dfeb 100644 --- a/src/backend/port/dynloader/openbsd.c +++ b/src/backend/port/dynloader/openbsd.c @@ -89,7 +89,7 @@ BSD44_derived_dlsym(void *handle, const char *name) snprintf(buf, sizeof(buf), "_%s", name); name = buf; } -#endif /* !__ELF__ */ +#endif /* !__ELF__ */ if ((vp = dlsym(handle, (char *) name)) == NULL) snprintf(error_message, sizeof(error_message), "dlsym (%s) failed", name); diff --git a/src/backend/port/pipe.c b/src/backend/port/pipe.c index eeed3fc2e1..b86a53ad34 100644 --- a/src/backend/port/pipe.c +++ b/src/backend/port/pipe.c @@ -37,7 +37,7 @@ pgpipe(int handles[2]) serv_addr.sin_family = AF_INET; serv_addr.sin_port = htons(0); serv_addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK); - if (bind(s, (SOCKADDR *) & serv_addr, len) == SOCKET_ERROR) + if (bind(s, (SOCKADDR *) &serv_addr, len) == SOCKET_ERROR) { ereport(LOG, (errmsg_internal("pgpipe failed to bind: %ui", WSAGetLastError()))); closesocket(s); @@ -49,7 +49,7 @@ pgpipe(int handles[2]) closesocket(s); return -1; } - if (getsockname(s, (SOCKADDR *) & serv_addr, &len) == SOCKET_ERROR) + if (getsockname(s, (SOCKADDR *) &serv_addr, &len) == SOCKET_ERROR) { ereport(LOG, (errmsg_internal("pgpipe failed to getsockname: %ui", WSAGetLastError()))); closesocket(s); @@ -62,13 +62,13 @@ pgpipe(int handles[2]) return -1; } - if (connect(handles[1], (SOCKADDR *) & serv_addr, len) == SOCKET_ERROR) + if (connect(handles[1], (SOCKADDR *) &serv_addr, len) == SOCKET_ERROR) { ereport(LOG, (errmsg_internal("pgpipe failed to connect socket: %ui", WSAGetLastError()))); closesocket(s); return -1; } - if ((handles[0] = accept(s, (SOCKADDR *) & serv_addr, &len)) == INVALID_SOCKET) + if ((handles[0] = accept(s, (SOCKADDR *) &serv_addr, &len)) == INVALID_SOCKET) { ereport(LOG, (errmsg_internal("pgpipe failed to accept socket: %ui", WSAGetLastError()))); closesocket(handles[1]); diff --git a/src/backend/port/sysv_shmem.c b/src/backend/port/sysv_shmem.c index 102a28ed04..754d2ac7e0 100644 --- a/src/backend/port/sysv_shmem.c +++ b/src/backend/port/sysv_shmem.c @@ -153,7 +153,7 @@ InternalIpcMemoryCreate(IpcMemoryKey memKey, Size size) "segment exceeded your kernel's SHMMAX parameter. You can either " "reduce the request size or reconfigure the kernel with larger SHMMAX. " "To reduce the request size (currently %lu bytes), reduce " - "PostgreSQL's shared memory usage, perhaps by reducing shared_buffers " + "PostgreSQL's shared memory usage, perhaps by reducing shared_buffers " "or max_connections.\n" "If the request size is already small, it's possible that it is less than " "your kernel's SHMMIN parameter, in which case raising the request size or " @@ -164,10 +164,10 @@ InternalIpcMemoryCreate(IpcMemoryKey memKey, Size size) (errno == ENOMEM) ? errhint("This error usually means that PostgreSQL's request for a shared " "memory segment exceeded available memory or swap space, " - "or exceeded your kernel's SHMALL parameter. You can either " + "or exceeded your kernel's SHMALL parameter. You can either " "reduce the request size or reconfigure the kernel with larger SHMALL. " "To reduce the request size (currently %lu bytes), reduce " - "PostgreSQL's shared memory usage, perhaps by reducing shared_buffers " + "PostgreSQL's shared memory usage, perhaps by reducing shared_buffers " "or max_connections.\n" "The PostgreSQL documentation contains more information about shared " "memory configuration.", @@ -203,7 +203,7 @@ InternalIpcMemoryCreate(IpcMemoryKey memKey, Size size) * hurt, but might confuse humans). */ { - char line[64]; + char line[64]; sprintf(line, "%9lu %9lu", (unsigned long) memKey, (unsigned long) shmid); diff --git a/src/backend/port/unix_latch.c b/src/backend/port/unix_latch.c index 32d0cb5e3f..6dae7c94c0 100644 --- a/src/backend/port/unix_latch.c +++ b/src/backend/port/unix_latch.c @@ -37,11 +37,11 @@ * * for (;;) * { - * ResetLatch(); - * if (work to do) - * Do Stuff(); + * ResetLatch(); + * if (work to do) + * Do Stuff(); * - * WaitLatch(); + * WaitLatch(); * } * * It's important to reset the latch *before* checking if there's work to @@ -100,8 +100,8 @@ static volatile sig_atomic_t waiting = false; /* Read and write end of the self-pipe */ -static int selfpipe_readfd = -1; -static int selfpipe_writefd = -1; +static int selfpipe_readfd = -1; +static int selfpipe_writefd = -1; /* private function prototypes */ static void initSelfPipe(void); @@ -205,7 +205,8 @@ int WaitLatchOrSocket(volatile Latch *latch, pgsocket sock, bool forRead, bool forWrite, long timeout) { - struct timeval tv, *tvp = NULL; + struct timeval tv, + *tvp = NULL; fd_set input_mask; fd_set output_mask; int rc; @@ -225,13 +226,13 @@ WaitLatchOrSocket(volatile Latch *latch, pgsocket sock, bool forRead, waiting = true; for (;;) { - int hifd; + int hifd; /* * Clear the pipe, and check if the latch is set already. If someone - * sets the latch between this and the select() below, the setter - * will write a byte to the pipe (or signal us and the signal handler - * will do that), and the select() will return immediately. + * sets the latch between this and the select() below, the setter will + * write a byte to the pipe (or signal us and the signal handler will + * do that), and the select() will return immediately. */ drainSelfPipe(); if (latch->is_set) @@ -278,7 +279,7 @@ WaitLatchOrSocket(volatile Latch *latch, pgsocket sock, bool forRead, (forWrite && FD_ISSET(sock, &output_mask)))) { result = 2; - break; /* data available in socket */ + break; /* data available in socket */ } } waiting = false; @@ -293,7 +294,7 @@ WaitLatchOrSocket(volatile Latch *latch, pgsocket sock, bool forRead, void SetLatch(volatile Latch *latch) { - pid_t owner_pid; + pid_t owner_pid; /* Quick exit if already set */ if (latch->is_set) @@ -302,17 +303,17 @@ SetLatch(volatile Latch *latch) latch->is_set = true; /* - * See if anyone's waiting for the latch. It can be the current process - * if we're in a signal handler. We use the self-pipe to wake up the - * select() in that case. If it's another process, send a signal. + * See if anyone's waiting for the latch. It can be the current process if + * we're in a signal handler. We use the self-pipe to wake up the select() + * in that case. If it's another process, send a signal. * - * Fetch owner_pid only once, in case the owner simultaneously disowns - * the latch and clears owner_pid. XXX: This assumes that pid_t is - * atomic, which isn't guaranteed to be true! In practice, the effective - * range of pid_t fits in a 32 bit integer, and so should be atomic. In - * the worst case, we might end up signaling wrong process if the right - * one disowns the latch just as we fetch owner_pid. Even then, you're - * very unlucky if a process with that bogus pid exists. + * Fetch owner_pid only once, in case the owner simultaneously disowns the + * latch and clears owner_pid. XXX: This assumes that pid_t is atomic, + * which isn't guaranteed to be true! In practice, the effective range of + * pid_t fits in a 32 bit integer, and so should be atomic. In the worst + * case, we might end up signaling wrong process if the right one disowns + * the latch just as we fetch owner_pid. Even then, you're very unlucky if + * a process with that bogus pid exists. */ owner_pid = latch->owner_pid; if (owner_pid == 0) @@ -351,15 +352,14 @@ latch_sigusr1_handler(void) static void initSelfPipe(void) { - int pipefd[2]; + int pipefd[2]; /* * Set up the self-pipe that allows a signal handler to wake up the * select() in WaitLatch. Make the write-end non-blocking, so that * SetLatch won't block if the event has already been set many times - * filling the kernel buffer. Make the read-end non-blocking too, so - * that we can easily clear the pipe by reading until EAGAIN or - * EWOULDBLOCK. + * filling the kernel buffer. Make the read-end non-blocking too, so that + * we can easily clear the pipe by reading until EAGAIN or EWOULDBLOCK. */ if (pipe(pipefd) < 0) elog(FATAL, "pipe() failed: %m"); @@ -376,8 +376,8 @@ initSelfPipe(void) static void sendSelfPipeByte(void) { - int rc; - char dummy = 0; + int rc; + char dummy = 0; retry: rc = write(selfpipe_writefd, &dummy, 1); @@ -388,16 +388,16 @@ retry: goto retry; /* - * If the pipe is full, we don't need to retry, the data that's - * there already is enough to wake up WaitLatch. + * If the pipe is full, we don't need to retry, the data that's there + * already is enough to wake up WaitLatch. */ if (errno == EAGAIN || errno == EWOULDBLOCK) return; /* - * Oops, the write() failed for some other reason. We might be in - * a signal handler, so it's not safe to elog(). We have no choice - * but silently ignore the error. + * Oops, the write() failed for some other reason. We might be in a + * signal handler, so it's not safe to elog(). We have no choice but + * silently ignore the error. */ return; } @@ -408,11 +408,11 @@ static void drainSelfPipe(void) { /* - * There shouldn't normally be more than one byte in the pipe, or maybe - * a few more if multiple processes run SetLatch at the same instant. + * There shouldn't normally be more than one byte in the pipe, or maybe a + * few more if multiple processes run SetLatch at the same instant. */ - char buf[16]; - int rc; + char buf[16]; + int rc; for (;;) { @@ -420,9 +420,9 @@ drainSelfPipe(void) if (rc < 0) { if (errno == EAGAIN || errno == EWOULDBLOCK) - break; /* the pipe is empty */ + break; /* the pipe is empty */ else if (errno == EINTR) - continue; /* retry */ + continue; /* retry */ else elog(ERROR, "read() on self-pipe failed: %m"); } diff --git a/src/backend/port/win32/crashdump.c b/src/backend/port/win32/crashdump.c index b58b181ed9..98bde14804 100644 --- a/src/backend/port/win32/crashdump.c +++ b/src/backend/port/win32/crashdump.c @@ -1,7 +1,7 @@ /*------------------------------------------------------------------------- * * win32_crashdump.c - * Automatic crash dump creation for PostgreSQL on Windows + * Automatic crash dump creation for PostgreSQL on Windows * * The crashdump feature traps unhandled win32 exceptions produced by the * backend, and tries to produce a Windows MiniDump crash @@ -57,11 +57,11 @@ * http://www.debuginfo.com/articles/effminidumps.html */ -typedef BOOL (WINAPI *MINIDUMPWRITEDUMP)(HANDLE hProcess, DWORD dwPid, HANDLE hFile, MINIDUMP_TYPE DumpType, - CONST PMINIDUMP_EXCEPTION_INFORMATION ExceptionParam, - CONST PMINIDUMP_USER_STREAM_INFORMATION UserStreamParam, - CONST PMINIDUMP_CALLBACK_INFORMATION CallbackParam - ); +typedef BOOL (WINAPI * MINIDUMPWRITEDUMP) (HANDLE hProcess, DWORD dwPid, HANDLE hFile, MINIDUMP_TYPE DumpType, + CONST PMINIDUMP_EXCEPTION_INFORMATION ExceptionParam, + CONST PMINIDUMP_USER_STREAM_INFORMATION UserStreamParam, + CONST PMINIDUMP_CALLBACK_INFORMATION CallbackParam +); /* @@ -76,24 +76,25 @@ typedef BOOL (WINAPI *MINIDUMPWRITEDUMP)(HANDLE hProcess, DWORD dwPid, HANDLE hF * any PostgreSQL functions. */ static LONG WINAPI -crashDumpHandler(struct _EXCEPTION_POINTERS *pExceptionInfo) +crashDumpHandler(struct _EXCEPTION_POINTERS * pExceptionInfo) { /* - * We only write crash dumps if the "crashdumps" directory within - * the postgres data directory exists. + * We only write crash dumps if the "crashdumps" directory within the + * postgres data directory exists. */ - DWORD attribs = GetFileAttributesA("crashdumps"); - if (attribs != INVALID_FILE_ATTRIBUTES && (attribs & FILE_ATTRIBUTE_DIRECTORY) ) + DWORD attribs = GetFileAttributesA("crashdumps"); + + if (attribs != INVALID_FILE_ATTRIBUTES && (attribs & FILE_ATTRIBUTE_DIRECTORY)) { /* 'crashdumps' exists and is a directory. Try to write a dump' */ - HMODULE hDll = NULL; + HMODULE hDll = NULL; MINIDUMPWRITEDUMP pDump = NULL; MINIDUMP_TYPE dumpType; - char dumpPath[_MAX_PATH]; - HANDLE selfProcHandle = GetCurrentProcess(); - DWORD selfPid = GetProcessId(selfProcHandle); - HANDLE dumpFile; - DWORD systemTicks; + char dumpPath[_MAX_PATH]; + HANDLE selfProcHandle = GetCurrentProcess(); + DWORD selfPid = GetProcessId(selfProcHandle); + HANDLE dumpFile; + DWORD systemTicks; struct _MINIDUMP_EXCEPTION_INFORMATION ExInfo; ExInfo.ThreadId = GetCurrentThreadId(); @@ -108,19 +109,18 @@ crashDumpHandler(struct _EXCEPTION_POINTERS *pExceptionInfo) return EXCEPTION_CONTINUE_SEARCH; } - pDump = (MINIDUMPWRITEDUMP)GetProcAddress(hDll, "MiniDumpWriteDump"); + pDump = (MINIDUMPWRITEDUMP) GetProcAddress(hDll, "MiniDumpWriteDump"); - if (pDump==NULL) + if (pDump == NULL) { write_stderr("could not load required functions in dbghelp.dll, cannot write crashdump\n"); return EXCEPTION_CONTINUE_SEARCH; } /* - * Dump as much as we can, except shared memory, code segments, - * and memory mapped files. - * Exactly what we can dump depends on the version of dbghelp.dll, - * see: + * Dump as much as we can, except shared memory, code segments, and + * memory mapped files. Exactly what we can dump depends on the + * version of dbghelp.dll, see: * http://msdn.microsoft.com/en-us/library/ms680519(v=VS.85).aspx */ dumpType = MiniDumpNormal | MiniDumpWithHandleData | @@ -135,25 +135,25 @@ crashDumpHandler(struct _EXCEPTION_POINTERS *pExceptionInfo) systemTicks = GetTickCount(); snprintf(dumpPath, _MAX_PATH, - "crashdumps\\postgres-pid%0i-%0i.mdmp", selfPid, systemTicks); - dumpPath[_MAX_PATH-1] = '\0'; + "crashdumps\\postgres-pid%0i-%0i.mdmp", selfPid, systemTicks); + dumpPath[_MAX_PATH - 1] = '\0'; dumpFile = CreateFile(dumpPath, GENERIC_WRITE, FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - if (dumpFile==INVALID_HANDLE_VALUE) + if (dumpFile == INVALID_HANDLE_VALUE) { write_stderr("could not open crash dump file %s for writing: error code %d\n", - dumpPath, GetLastError()); + dumpPath, GetLastError()); return EXCEPTION_CONTINUE_SEARCH; } - if ((*pDump)(selfProcHandle, selfPid, dumpFile, dumpType, &ExInfo, - NULL, NULL)) + if ((*pDump) (selfProcHandle, selfPid, dumpFile, dumpType, &ExInfo, + NULL, NULL)) write_stderr("wrote crash dump to %s\n", dumpPath); else write_stderr("could not write crash dump to %s: error code %08x\n", - dumpPath, GetLastError()); + dumpPath, GetLastError()); CloseHandle(dumpFile); } diff --git a/src/backend/port/win32/timer.c b/src/backend/port/win32/timer.c index 1eb6de9bdb..e118d96a4b 100644 --- a/src/backend/port/win32/timer.c +++ b/src/backend/port/win32/timer.c @@ -27,7 +27,7 @@ typedef struct timerCA struct itimerval value; HANDLE event; CRITICAL_SECTION crit_sec; -} timerCA; +} timerCA; static timerCA timerCommArea; static HANDLE timerThreadHandle = INVALID_HANDLE_VALUE; diff --git a/src/backend/port/win32_latch.c b/src/backend/port/win32_latch.c index f42cfef40e..b158300d57 100644 --- a/src/backend/port/win32_latch.c +++ b/src/backend/port/win32_latch.c @@ -50,8 +50,7 @@ InitSharedLatch(volatile Latch *latch) latch->is_shared = true; /* - * Set up security attributes to specify that the events are - * inherited. + * Set up security attributes to specify that the events are inherited. */ ZeroMemory(&sa, sizeof(sa)); sa.nLength = sizeof(sa); @@ -106,7 +105,7 @@ WaitLatchOrSocket(volatile Latch *latch, SOCKET sock, bool forRead, numevents = 2; if (sock != PGINVALID_SOCKET && (forRead || forWrite)) { - int flags = 0; + int flags = 0; if (forRead) flags |= FD_READ; @@ -135,7 +134,7 @@ WaitLatchOrSocket(volatile Latch *latch, SOCKET sock, bool forRead, } rc = WaitForMultipleObjects(numevents, events, FALSE, - (timeout >= 0) ? (timeout / 1000) : INFINITE); + (timeout >= 0) ? (timeout / 1000) : INFINITE); if (rc == WAIT_FAILED) elog(ERROR, "WaitForMultipleObjects() failed: error code %d", (int) GetLastError()); else if (rc == WAIT_TIMEOUT) @@ -178,7 +177,7 @@ WaitLatchOrSocket(volatile Latch *latch, SOCKET sock, bool forRead, void SetLatch(volatile Latch *latch) { - HANDLE handle; + HANDLE handle; /* Quick exit if already set */ if (latch->is_set) @@ -187,21 +186,22 @@ SetLatch(volatile Latch *latch) latch->is_set = true; /* - * See if anyone's waiting for the latch. It can be the current process - * if we're in a signal handler. Use a local variable here in case the - * latch is just disowned between the test and the SetEvent call, and - * event field set to NULL. + * See if anyone's waiting for the latch. It can be the current process if + * we're in a signal handler. Use a local variable here in case the latch + * is just disowned between the test and the SetEvent call, and event + * field set to NULL. * - * Fetch handle field only once, in case the owner simultaneously - * disowns the latch and clears handle. This assumes that HANDLE is - * atomic, which isn't guaranteed to be true! In practice, it should be, - * and in the worst case we end up calling SetEvent with a bogus handle, - * and SetEvent will return an error with no harm done. + * Fetch handle field only once, in case the owner simultaneously disowns + * the latch and clears handle. This assumes that HANDLE is atomic, which + * isn't guaranteed to be true! In practice, it should be, and in the + * worst case we end up calling SetEvent with a bogus handle, and SetEvent + * will return an error with no harm done. */ handle = latch->event; if (handle) { SetEvent(handle); + /* * Note that we silently ignore any errors. We might be in a signal * handler or other critical path where it's not safe to call elog(). diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c index 619facc752..9fa63a4e6e 100644 --- a/src/backend/postmaster/autovacuum.c +++ b/src/backend/postmaster/autovacuum.c @@ -210,7 +210,7 @@ typedef struct WorkerInfoData int wi_cost_delay; int wi_cost_limit; int wi_cost_limit_base; -} WorkerInfoData; +} WorkerInfoData; typedef struct WorkerInfoData *WorkerInfo; @@ -224,7 +224,7 @@ typedef enum AutoVacForkFailed, /* failed trying to start a worker */ AutoVacRebalance, /* rebalance the cost limits */ AutoVacNumSignals /* must be last */ -} AutoVacuumSignal; +} AutoVacuumSignal; /*------------- * The main autovacuum shmem struct. On shared memory we store this main @@ -1527,9 +1527,9 @@ AutoVacWorkerMain(int argc, char *argv[]) SetConfigOption("statement_timeout", "0", PGC_SUSET, PGC_S_OVERRIDE); /* - * Force synchronous replication off to allow regular maintenance even - * if we are waiting for standbys to connect. This is important to - * ensure we aren't blocked from performing anti-wraparound tasks. + * Force synchronous replication off to allow regular maintenance even if + * we are waiting for standbys to connect. This is important to ensure we + * aren't blocked from performing anti-wraparound tasks. */ if (synchronous_commit > SYNCHRONOUS_COMMIT_LOCAL_FLUSH) SetConfigOption("synchronous_commit", "local", PGC_SUSET, PGC_S_OVERRIDE); @@ -1690,8 +1690,8 @@ autovac_balance_cost(void) { /* * The idea here is that we ration out I/O equally. The amount of I/O - * that a worker can consume is determined by cost_limit/cost_delay, so - * we try to equalize those ratios rather than the raw limit settings. + * that a worker can consume is determined by cost_limit/cost_delay, so we + * try to equalize those ratios rather than the raw limit settings. * * note: in cost_limit, zero also means use value from elsewhere, because * zero is not a valid value. @@ -1746,7 +1746,7 @@ autovac_balance_cost(void) /* * We put a lower bound of 1 on the cost_limit, to avoid division- - * by-zero in the vacuum code. Also, in case of roundoff trouble + * by-zero in the vacuum code. Also, in case of roundoff trouble * in these calculations, let's be sure we don't ever set * cost_limit to more than the base value. */ @@ -1785,7 +1785,7 @@ get_database_list(void) Relation rel; HeapScanDesc scan; HeapTuple tup; - MemoryContext resultcxt; + MemoryContext resultcxt; /* This is the context that we will allocate our output data in */ resultcxt = CurrentMemoryContext; @@ -1807,13 +1807,13 @@ get_database_list(void) { Form_pg_database pgdatabase = (Form_pg_database) GETSTRUCT(tup); avw_dbase *avdb; - MemoryContext oldcxt; + MemoryContext oldcxt; /* - * Allocate our results in the caller's context, not the transaction's. - * We do this inside the loop, and restore the original context at the - * end, so that leaky things like heap_getnext() are not called in a - * potentially long-lived context. + * Allocate our results in the caller's context, not the + * transaction's. We do this inside the loop, and restore the original + * context at the end, so that leaky things like heap_getnext() are + * not called in a potentially long-lived context. */ oldcxt = MemoryContextSwitchTo(resultcxt); @@ -2217,9 +2217,9 @@ do_autovacuum(void) LWLockRelease(AutovacuumScheduleLock); /* - * Remember the prevailing values of the vacuum cost GUCs. We have - * to restore these at the bottom of the loop, else we'll compute - * wrong values in the next iteration of autovac_balance_cost(). + * Remember the prevailing values of the vacuum cost GUCs. We have to + * restore these at the bottom of the loop, else we'll compute wrong + * values in the next iteration of autovac_balance_cost(). */ stdVacuumCostDelay = VacuumCostDelay; stdVacuumCostLimit = VacuumCostLimit; diff --git a/src/backend/postmaster/bgwriter.c b/src/backend/postmaster/bgwriter.c index 1b450a802b..1f4ac93d8d 100644 --- a/src/backend/postmaster/bgwriter.c +++ b/src/backend/postmaster/bgwriter.c @@ -1077,7 +1077,7 @@ RequestCheckpoint(int flags) * to the requests[] queue without checking for duplicates. The bgwriter * will have to eliminate dups internally anyway. However, if we discover * that the queue is full, we make a pass over the entire queue to compact - * it. This is somewhat expensive, but the alternative is for the backend + * it. This is somewhat expensive, but the alternative is for the backend * to perform its own fsync, which is far more expensive in practice. It * is theoretically possible a backend fsync might still be necessary, if * the queue is full and contains no duplicate entries. In that case, we @@ -1102,13 +1102,13 @@ ForwardFsyncRequest(RelFileNodeBackend rnode, ForkNumber forknum, /* * If the background writer isn't running or the request queue is full, - * the backend will have to perform its own fsync request. But before + * the backend will have to perform its own fsync request. But before * forcing that to happen, we can try to compact the background writer * request queue. */ if (BgWriterShmem->bgwriter_pid == 0 || (BgWriterShmem->num_requests >= BgWriterShmem->max_requests - && !CompactBgwriterRequestQueue())) + && !CompactBgwriterRequestQueue())) { /* * Count the subset of writes where backends have to do their own @@ -1128,12 +1128,12 @@ ForwardFsyncRequest(RelFileNodeBackend rnode, ForkNumber forknum, /* * CompactBgwriterRequestQueue - * Remove duplicates from the request queue to avoid backend fsyncs. + * Remove duplicates from the request queue to avoid backend fsyncs. * * Although a full fsync request queue is not common, it can lead to severe * performance problems when it does happen. So far, this situation has * only been observed to occur when the system is under heavy write load, - * and especially during the "sync" phase of a checkpoint. Without this + * and especially during the "sync" phase of a checkpoint. Without this * logic, each backend begins doing an fsync for every block written, which * gets very expensive and can slow down the whole system. * @@ -1144,9 +1144,10 @@ ForwardFsyncRequest(RelFileNodeBackend rnode, ForkNumber forknum, static bool CompactBgwriterRequestQueue() { - struct BgWriterSlotMapping { - BgWriterRequest request; - int slot; + struct BgWriterSlotMapping + { + BgWriterRequest request; + int slot; }; int n, @@ -1172,7 +1173,7 @@ CompactBgwriterRequestQueue() /* Initialize skip_slot array */ skip_slot = palloc0(sizeof(bool) * BgWriterShmem->num_requests); - /* + /* * The basic idea here is that a request can be skipped if it's followed * by a later, identical request. It might seem more sensible to work * backwards from the end of the queue and check whether a request is @@ -1189,7 +1190,7 @@ CompactBgwriterRequestQueue() { BgWriterRequest *request; struct BgWriterSlotMapping *slotmap; - bool found; + bool found; request = &BgWriterShmem->requests[n]; slotmap = hash_search(htab, request, HASH_ENTER, &found); @@ -1219,8 +1220,8 @@ CompactBgwriterRequestQueue() BgWriterShmem->requests[preserve_count++] = BgWriterShmem->requests[n]; } ereport(DEBUG1, - (errmsg("compacted fsync request queue from %d entries to %d entries", - BgWriterShmem->num_requests, preserve_count))); + (errmsg("compacted fsync request queue from %d entries to %d entries", + BgWriterShmem->num_requests, preserve_count))); BgWriterShmem->num_requests = preserve_count; /* Cleanup. */ diff --git a/src/backend/postmaster/pgstat.c b/src/backend/postmaster/pgstat.c index 5f0db513d2..5ed6e8337c 100644 --- a/src/backend/postmaster/pgstat.c +++ b/src/backend/postmaster/pgstat.c @@ -1319,7 +1319,7 @@ pgstat_report_analyze(Relation rel, bool adopt_counts, /* -------- * pgstat_report_recovery_conflict() - * - * Tell the collector about a Hot Standby recovery conflict. + * Tell the collector about a Hot Standby recovery conflict. * -------- */ void @@ -4075,7 +4075,7 @@ pgstat_recv_resetcounter(PgStat_MsgResetcounter *msg, int len) dbentry->functions = NULL; /* - * Reset database-level stats too. This should match the initialization + * Reset database-level stats too. This should match the initialization * code in pgstat_get_db_entry(). */ dbentry->n_xact_commit = 0; @@ -4280,22 +4280,23 @@ pgstat_recv_bgwriter(PgStat_MsgBgWriter *msg, int len) /* ---------- * pgstat_recv_recoveryconflict() - * - * Process as RECOVERYCONFLICT message. + * Process as RECOVERYCONFLICT message. * ---------- */ static void pgstat_recv_recoveryconflict(PgStat_MsgRecoveryConflict *msg, int len) { PgStat_StatDBEntry *dbentry; + dbentry = pgstat_get_db_entry(msg->m_databaseid, true); switch (msg->m_reason) { case PROCSIG_RECOVERY_CONFLICT_DATABASE: + /* - * Since we drop the information about the database as soon - * as it replicates, there is no point in counting these - * conflicts. + * Since we drop the information about the database as soon as it + * replicates, there is no point in counting these conflicts. */ break; case PROCSIG_RECOVERY_CONFLICT_TABLESPACE: diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 93e59258cc..6e7f66472f 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -385,7 +385,7 @@ typedef struct HANDLE waitHandle; HANDLE procHandle; DWORD procId; -} win32_deadchild_waitinfo; +} win32_deadchild_waitinfo; HANDLE PostmasterHandle; #endif @@ -400,7 +400,7 @@ typedef struct SOCKET origsocket; /* Original socket value, or PGINVALID_SOCKET * if not a socket */ WSAPROTOCOL_INFO wsainfo; -} InheritableSocket; +} InheritableSocket; #else typedef int InheritableSocket; #endif @@ -447,15 +447,15 @@ typedef struct char my_exec_path[MAXPGPATH]; char pkglib_path[MAXPGPATH]; char ExtraOptions[MAXPGPATH]; -} BackendParameters; +} BackendParameters; static void read_backend_variables(char *id, Port *port); -static void restore_backend_variables(BackendParameters * param, Port *port); +static void restore_backend_variables(BackendParameters *param, Port *port); #ifndef WIN32 -static bool save_backend_variables(BackendParameters * param, Port *port); +static bool save_backend_variables(BackendParameters *param, Port *port); #else -static bool save_backend_variables(BackendParameters * param, Port *port, +static bool save_backend_variables(BackendParameters *param, Port *port, HANDLE childProcess, pid_t childPid); #endif @@ -1936,9 +1936,9 @@ canAcceptConnections(void) * * In state PM_WAIT_BACKUP only superusers can connect (this must be * allowed so that a superuser can end online backup mode); we return - * CAC_WAITBACKUP code to indicate that this must be checked later. - * Note that neither CAC_OK nor CAC_WAITBACKUP can safely be returned - * until we have checked for too many children. + * CAC_WAITBACKUP code to indicate that this must be checked later. Note + * that neither CAC_OK nor CAC_WAITBACKUP can safely be returned until we + * have checked for too many children. */ if (pmState != PM_RUN) { @@ -1949,10 +1949,10 @@ canAcceptConnections(void) else if (!FatalError && (pmState == PM_STARTUP || pmState == PM_RECOVERY)) - return CAC_STARTUP; /* normal startup */ + return CAC_STARTUP; /* normal startup */ else if (!FatalError && pmState == PM_HOT_STANDBY) - result = CAC_OK; /* connection OK during hot standby */ + result = CAC_OK; /* connection OK during hot standby */ else return CAC_RECOVERY; /* else must be crash recovery */ } @@ -2004,10 +2004,10 @@ ConnCreate(int serverFd) /* * Precompute password salt values to use for this connection. It's - * slightly annoying to do this long in advance of knowing whether - * we'll need 'em or not, but we must do the random() calls before we - * fork, not after. Else the postmaster's random sequence won't get - * advanced, and all backends would end up using the same salt... + * slightly annoying to do this long in advance of knowing whether we'll + * need 'em or not, but we must do the random() calls before we fork, not + * after. Else the postmaster's random sequence won't get advanced, and + * all backends would end up using the same salt... */ RandomSalt(port->md5Salt); @@ -2611,12 +2611,13 @@ CleanupBackend(int pid, * the active backend list. */ #ifdef WIN32 + /* - * On win32, also treat ERROR_WAIT_NO_CHILDREN (128) as nonfatal - * case, since that sometimes happens under load when the process fails - * to start properly (long before it starts using shared memory). - * Microsoft reports it is related to mutex failure: - * http://archives.postgresql.org/pgsql-hackers/2010-09/msg00790.php + * On win32, also treat ERROR_WAIT_NO_CHILDREN (128) as nonfatal case, + * since that sometimes happens under load when the process fails to start + * properly (long before it starts using shared memory). Microsoft reports + * it is related to mutex failure: + * http://archives.postgresql.org/pgsql-hackers/2010-09/msg00790.php */ if (exitstatus == ERROR_WAIT_NO_CHILDREN) { @@ -3086,11 +3087,11 @@ PostmasterStateMachine(void) } /* - * If recovery failed, or the user does not want an automatic restart after - * backend crashes, wait for all non-syslogger children to exit, and then - * exit postmaster. We don't try to reinitialize when recovery fails, - * because more than likely it will just fail again and we will keep trying - * forever. + * If recovery failed, or the user does not want an automatic restart + * after backend crashes, wait for all non-syslogger children to exit, and + * then exit postmaster. We don't try to reinitialize when recovery fails, + * because more than likely it will just fail again and we will keep + * trying forever. */ if (pmState == PM_NO_CHILDREN && (RecoveryError || !restart_after_crash)) ExitPostmaster(1); @@ -3169,9 +3170,8 @@ SignalSomeChildren(int signal, int target) continue; /* - * Since target == BACKEND_TYPE_ALL is the most common case, - * we test it first and avoid touching shared memory for - * every child. + * Since target == BACKEND_TYPE_ALL is the most common case, we test + * it first and avoid touching shared memory for every child. */ if (target != BACKEND_TYPE_ALL) { @@ -4409,9 +4409,8 @@ CountChildren(int target) continue; /* - * Since target == BACKEND_TYPE_ALL is the most common case, - * we test it first and avoid touching shared memory for - * every child. + * Since target == BACKEND_TYPE_ALL is the most common case, we test + * it first and avoid touching shared memory for every child. */ if (target != BACKEND_TYPE_ALL) { @@ -4686,19 +4685,19 @@ extern pgsocket pgStatSock; #define read_inheritable_socket(dest, src) (*(dest) = *(src)) #else static bool write_duplicated_handle(HANDLE *dest, HANDLE src, HANDLE child); -static bool write_inheritable_socket(InheritableSocket * dest, SOCKET src, +static bool write_inheritable_socket(InheritableSocket *dest, SOCKET src, pid_t childPid); -static void read_inheritable_socket(SOCKET * dest, InheritableSocket * src); +static void read_inheritable_socket(SOCKET *dest, InheritableSocket *src); #endif /* Save critical backend variables into the BackendParameters struct */ #ifndef WIN32 static bool -save_backend_variables(BackendParameters * param, Port *port) +save_backend_variables(BackendParameters *param, Port *port) #else static bool -save_backend_variables(BackendParameters * param, Port *port, +save_backend_variables(BackendParameters *param, Port *port, HANDLE childProcess, pid_t childPid) #endif { @@ -4790,7 +4789,7 @@ write_duplicated_handle(HANDLE *dest, HANDLE src, HANDLE childProcess) * straight socket inheritance. */ static bool -write_inheritable_socket(InheritableSocket * dest, SOCKET src, pid_t childpid) +write_inheritable_socket(InheritableSocket *dest, SOCKET src, pid_t childpid) { dest->origsocket = src; if (src != 0 && src != PGINVALID_SOCKET) @@ -4811,7 +4810,7 @@ write_inheritable_socket(InheritableSocket * dest, SOCKET src, pid_t childpid) * Read a duplicate socket structure back, and get the socket descriptor. */ static void -read_inheritable_socket(SOCKET * dest, InheritableSocket * src) +read_inheritable_socket(SOCKET *dest, InheritableSocket *src) { SOCKET s; @@ -4920,7 +4919,7 @@ read_backend_variables(char *id, Port *port) /* Restore critical backend variables from the BackendParameters struct */ static void -restore_backend_variables(BackendParameters * param, Port *port) +restore_backend_variables(BackendParameters *param, Port *port) { memcpy(port, ¶m->port, sizeof(Port)); read_inheritable_socket(&port->sock, ¶m->portsocket); diff --git a/src/backend/postmaster/syslogger.c b/src/backend/postmaster/syslogger.c index f2eb0ad02b..a00b70f934 100644 --- a/src/backend/postmaster/syslogger.c +++ b/src/backend/postmaster/syslogger.c @@ -137,7 +137,7 @@ static void process_pipe_input(char *logbuffer, int *bytes_in_logbuffer); static void flush_pipe_input(char *logbuffer, int *bytes_in_logbuffer); static void open_csvlogfile(void); static FILE *logfile_open(const char *filename, const char *mode, - bool allow_errors); + bool allow_errors); #ifdef WIN32 static unsigned int __stdcall pipeThread(void *arg); @@ -1017,8 +1017,8 @@ logfile_open(const char *filename, const char *mode, bool allow_errors) mode_t oumask; /* - * Note we do not let Log_file_mode disable IWUSR, since we certainly - * want to be able to write the files ourselves. + * Note we do not let Log_file_mode disable IWUSR, since we certainly want + * to be able to write the files ourselves. */ oumask = umask((mode_t) ((~(Log_file_mode | S_IWUSR)) & (S_IRWXU | S_IRWXG | S_IRWXO))); fh = fopen(filename, mode); @@ -1035,7 +1035,7 @@ logfile_open(const char *filename, const char *mode, bool allow_errors) } else { - int save_errno = errno; + int save_errno = errno; ereport(allow_errors ? LOG : FATAL, (errcode_for_file_access(), diff --git a/src/backend/regex/regcomp.c b/src/backend/regex/regcomp.c index a93e99011d..6ed466a9d9 100644 --- a/src/backend/regex/regcomp.c +++ b/src/backend/regex/regcomp.c @@ -238,7 +238,7 @@ struct vars #define NOERR() {if (ISERR()) return;} /* if error seen, return */ #define NOERRN() {if (ISERR()) return NULL;} /* NOERR with retval */ #define NOERRZ() {if (ISERR()) return 0;} /* NOERR with retval */ -#define INSIST(c, e) do { if (!(c)) ERR(e); } while (0) /* error if c false */ +#define INSIST(c, e) do { if (!(c)) ERR(e); } while (0) /* error if c false */ #define NOTE(b) (v->re->re_info |= (b)) /* note visible condition */ #define EMPTYARC(x, y) newarc(v->nfa, EMPTY, 0, x, y) diff --git a/src/backend/replication/basebackup.c b/src/backend/replication/basebackup.c index d21568cb21..030a283e81 100644 --- a/src/backend/replication/basebackup.c +++ b/src/backend/replication/basebackup.c @@ -39,7 +39,7 @@ typedef struct bool fastcheckpoint; bool nowait; bool includewal; -} basebackup_options; +} basebackup_options; static int64 sendDir(char *path, int basepathlen, bool sizeonly); @@ -67,7 +67,7 @@ typedef struct char *oid; char *path; int64 size; -} tablespaceinfo; +} tablespaceinfo; /* @@ -119,7 +119,7 @@ perform_base_backup(basebackup_options *opt, DIR *tblspcdir) if (readlink(fullpath, linkpath, sizeof(linkpath) - 1) == -1) { ereport(WARNING, - (errmsg("unable to read symbolic link %s: %m", fullpath))); + (errmsg("unable to read symbolic link %s: %m", fullpath))); continue; } @@ -219,10 +219,11 @@ perform_base_backup(basebackup_options *opt, DIR *tblspcdir) ptr.xrecoff = logseg * XLogSegSize + TAR_SEND_SIZE * i; /* - * Some old compilers, e.g. gcc 2.95.3/x86, think that passing - * a struct in the same function as a longjump might clobber - * a variable. bjm 2011-02-04 - * http://lists.apple.com/archives/xcode-users/2003/Dec//msg00051.html + * Some old compilers, e.g. gcc 2.95.3/x86, think that passing + * a struct in the same function as a longjump might clobber a + * variable. bjm 2011-02-04 + * http://lists.apple.com/archives/xcode-users/2003/Dec//msg000 + * 51.html */ XLogRead(buf, ptr, TAR_SEND_SIZE); if (pq_putmessage('d', buf, TAR_SEND_SIZE)) @@ -494,13 +495,14 @@ static void sendFileWithContent(const char *filename, const char *content) { struct stat statbuf; - int pad, len; + int pad, + len; len = strlen(content); /* - * Construct a stat struct for the backup_label file we're injecting - * in the tar. + * Construct a stat struct for the backup_label file we're injecting in + * the tar. */ /* Windows doesn't have the concept of uid and gid */ #ifdef WIN32 @@ -522,7 +524,8 @@ sendFileWithContent(const char *filename, const char *content) pad = ((len + 511) & ~511) - len; if (pad > 0) { - char buf[512]; + char buf[512]; + MemSet(buf, 0, pad); pq_putmessage('d', buf, pad); } @@ -564,13 +567,13 @@ sendDir(char *path, int basepathlen, bool sizeonly) continue; /* - * Check if the postmaster has signaled us to exit, and abort - * with an error in that case. The error handler further up - * will call do_pg_abort_backup() for us. + * Check if the postmaster has signaled us to exit, and abort with an + * error in that case. The error handler further up will call + * do_pg_abort_backup() for us. */ if (walsender_shutdown_requested || walsender_ready_to_stop) ereport(ERROR, - (errmsg("shutdown requested, aborting active base backup"))); + (errmsg("shutdown requested, aborting active base backup"))); snprintf(pathbuf, MAXPGPATH, "%s/%s", path, de->d_name); @@ -707,7 +710,7 @@ _tarChecksum(char *header) /* Given the member, write the TAR header & send the file */ static void -sendFile(char *readfilename, char *tarfilename, struct stat *statbuf) +sendFile(char *readfilename, char *tarfilename, struct stat * statbuf) { FILE *fp; char buf[TAR_SEND_SIZE]; @@ -737,7 +740,7 @@ sendFile(char *readfilename, char *tarfilename, struct stat *statbuf) /* Send the chunk as a CopyData message */ if (pq_putmessage('d', buf, cnt)) ereport(ERROR, - (errmsg("base backup could not send data, aborting backup"))); + (errmsg("base backup could not send data, aborting backup"))); len += cnt; diff --git a/src/backend/replication/syncrep.c b/src/backend/replication/syncrep.c index 192aac9aea..1d4df8a448 100644 --- a/src/backend/replication/syncrep.c +++ b/src/backend/replication/syncrep.c @@ -63,7 +63,7 @@ #include "utils/ps_status.h" /* User-settable parameters for sync rep */ -char *SyncRepStandbyNames; +char *SyncRepStandbyNames; #define SyncStandbysDefined() \ (SyncRepStandbyNames != NULL && SyncRepStandbyNames[0] != '\0') @@ -73,7 +73,8 @@ static bool announce_next_takeover = true; static void SyncRepQueueInsert(void); static void SyncRepCancelWait(void); -static int SyncRepGetStandbyPriority(void); +static int SyncRepGetStandbyPriority(void); + #ifdef USE_ASSERT_CHECKING static bool SyncRepQueueIsOrderedByLSN(void); #endif @@ -96,13 +97,13 @@ static bool SyncRepQueueIsOrderedByLSN(void); void SyncRepWaitForLSN(XLogRecPtr XactCommitLSN) { - char *new_status = NULL; + char *new_status = NULL; const char *old_status; /* - * Fast exit if user has not requested sync replication, or - * there are no sync replication standby names defined. - * Note that those standbys don't need to be connected. + * Fast exit if user has not requested sync replication, or there are no + * sync replication standby names defined. Note that those standbys don't + * need to be connected. */ if (!SyncRepRequested() || !SyncStandbysDefined()) return; @@ -117,12 +118,12 @@ SyncRepWaitForLSN(XLogRecPtr XactCommitLSN) Assert(MyProc->syncRepState == SYNC_REP_NOT_WAITING); /* - * We don't wait for sync rep if WalSndCtl->sync_standbys_defined is - * not set. See SyncRepUpdateSyncStandbysDefined. + * We don't wait for sync rep if WalSndCtl->sync_standbys_defined is not + * set. See SyncRepUpdateSyncStandbysDefined. * - * Also check that the standby hasn't already replied. Unlikely - * race condition but we'll be fetching that cache line anyway - * so its likely to be a low cost check. + * Also check that the standby hasn't already replied. Unlikely race + * condition but we'll be fetching that cache line anyway so its likely to + * be a low cost check. */ if (!WalSndCtl->sync_standbys_defined || XLByteLE(XactCommitLSN, WalSndCtl->lsn)) @@ -163,12 +164,12 @@ SyncRepWaitForLSN(XLogRecPtr XactCommitLSN) */ for (;;) { - int syncRepState; + int syncRepState; /* - * Wait on latch for up to 60 seconds. This allows us to - * check for postmaster death regularly while waiting. - * Note that timeout here does not necessarily release from loop. + * Wait on latch for up to 60 seconds. This allows us to check for + * postmaster death regularly while waiting. Note that timeout here + * does not necessarily release from loop. */ WaitLatch(&MyProc->waitLatch, 60000000L); @@ -176,12 +177,13 @@ SyncRepWaitForLSN(XLogRecPtr XactCommitLSN) ResetLatch(&MyProc->waitLatch); /* - * Try checking the state without the lock first. There's no guarantee - * that we'll read the most up-to-date value, so if it looks like we're - * still waiting, recheck while holding the lock. But if it looks like - * we're done, we must really be done, because once walsender changes - * the state to SYNC_REP_WAIT_COMPLETE, it will never update it again, - * so we can't be seeing a stale value in that case. + * Try checking the state without the lock first. There's no + * guarantee that we'll read the most up-to-date value, so if it looks + * like we're still waiting, recheck while holding the lock. But if + * it looks like we're done, we must really be done, because once + * walsender changes the state to SYNC_REP_WAIT_COMPLETE, it will + * never update it again, so we can't be seeing a stale value in that + * case. */ syncRepState = MyProc->syncRepState; if (syncRepState == SYNC_REP_WAITING) @@ -195,16 +197,15 @@ SyncRepWaitForLSN(XLogRecPtr XactCommitLSN) /* * If a wait for synchronous replication is pending, we can neither - * acknowledge the commit nor raise ERROR or FATAL. The latter - * would lead the client to believe that that the transaction - * aborted, which is not true: it's already committed locally. - * The former is no good either: the client has requested - * synchronous replication, and is entitled to assume that an - * acknowledged commit is also replicated, which may not be true. - * So in this case we issue a WARNING (which some clients may - * be able to interpret) and shut off further output. We do NOT - * reset ProcDiePending, so that the process will die after the - * commit is cleaned up. + * acknowledge the commit nor raise ERROR or FATAL. The latter would + * lead the client to believe that that the transaction aborted, which + * is not true: it's already committed locally. The former is no good + * either: the client has requested synchronous replication, and is + * entitled to assume that an acknowledged commit is also replicated, + * which may not be true. So in this case we issue a WARNING (which + * some clients may be able to interpret) and shut off further output. + * We do NOT reset ProcDiePending, so that the process will die after + * the commit is cleaned up. */ if (ProcDiePending) { @@ -220,8 +221,8 @@ SyncRepWaitForLSN(XLogRecPtr XactCommitLSN) /* * It's unclear what to do if a query cancel interrupt arrives. We * can't actually abort at this point, but ignoring the interrupt - * altogether is not helpful, so we just terminate the wait with - * a suitable warning. + * altogether is not helpful, so we just terminate the wait with a + * suitable warning. */ if (QueryCancelPending) { @@ -234,8 +235,9 @@ SyncRepWaitForLSN(XLogRecPtr XactCommitLSN) } /* - * If the postmaster dies, we'll probably never get an acknowledgement, - * because all the wal sender processes will exit. So just bail out. + * If the postmaster dies, we'll probably never get an + * acknowledgement, because all the wal sender processes will exit. + * So just bail out. */ if (!PostmasterIsAlive(true)) { @@ -274,7 +276,7 @@ SyncRepWaitForLSN(XLogRecPtr XactCommitLSN) static void SyncRepQueueInsert(void) { - PGPROC *proc; + PGPROC *proc; proc = (PGPROC *) SHMQueuePrev(&(WalSndCtl->SyncRepQueue), &(WalSndCtl->SyncRepQueue), @@ -283,8 +285,8 @@ SyncRepQueueInsert(void) while (proc) { /* - * Stop at the queue element that we should after to - * ensure the queue is ordered by LSN. + * Stop at the queue element that we should after to ensure the queue + * is ordered by LSN. */ if (XLByteLT(proc->waitLSN, MyProc->waitLSN)) break; @@ -339,7 +341,7 @@ SyncRepCleanupAtProcExit(int code, Datum arg) void SyncRepInitConfig(void) { - int priority; + int priority; /* * Determine if we are a potential sync standby and remember the result @@ -352,8 +354,8 @@ SyncRepInitConfig(void) MyWalSnd->sync_standby_priority = priority; LWLockRelease(SyncRepLock); ereport(DEBUG1, - (errmsg("standby \"%s\" now has synchronous standby priority %u", - application_name, priority))); + (errmsg("standby \"%s\" now has synchronous standby priority %u", + application_name, priority))); } } @@ -369,24 +371,24 @@ SyncRepReleaseWaiters(void) { volatile WalSndCtlData *walsndctl = WalSndCtl; volatile WalSnd *syncWalSnd = NULL; - int numprocs = 0; + int numprocs = 0; int priority = 0; int i; /* * If this WALSender is serving a standby that is not on the list of - * potential standbys then we have nothing to do. If we are still - * starting up or still running base backup, then leave quickly also. + * potential standbys then we have nothing to do. If we are still starting + * up or still running base backup, then leave quickly also. */ if (MyWalSnd->sync_standby_priority == 0 || MyWalSnd->state < WALSNDSTATE_STREAMING) return; /* - * We're a potential sync standby. Release waiters if we are the - * highest priority standby. If there are multiple standbys with - * same priorities then we use the first mentioned standby. - * If you change this, also change pg_stat_get_wal_senders(). + * We're a potential sync standby. Release waiters if we are the highest + * priority standby. If there are multiple standbys with same priorities + * then we use the first mentioned standby. If you change this, also + * change pg_stat_get_wal_senders(). */ LWLockAcquire(SyncRepLock, LW_EXCLUSIVE); @@ -400,8 +402,8 @@ SyncRepReleaseWaiters(void) (priority == 0 || priority > walsnd->sync_standby_priority)) { - priority = walsnd->sync_standby_priority; - syncWalSnd = walsnd; + priority = walsnd->sync_standby_priority; + syncWalSnd = walsnd; } } @@ -423,8 +425,8 @@ SyncRepReleaseWaiters(void) if (XLByteLT(walsndctl->lsn, MyWalSnd->flush)) { /* - * Set the lsn first so that when we wake backends they will - * release up to this location. + * Set the lsn first so that when we wake backends they will release + * up to this location. */ walsndctl->lsn = MyWalSnd->flush; numprocs = SyncRepWakeQueue(false); @@ -433,9 +435,9 @@ SyncRepReleaseWaiters(void) LWLockRelease(SyncRepLock); elog(DEBUG3, "released %d procs up to %X/%X", - numprocs, - MyWalSnd->flush.xlogid, - MyWalSnd->flush.xrecoff); + numprocs, + MyWalSnd->flush.xlogid, + MyWalSnd->flush.xrecoff); /* * If we are managing the highest priority standby, though we weren't @@ -502,7 +504,7 @@ SyncRepGetStandbyPriority(void) /* * Walk queue from head. Set the state of any backends that need to be woken, - * remove them from the queue, and then wake them. Pass all = true to wake + * remove them from the queue, and then wake them. Pass all = true to wake * whole queue; otherwise, just wake up to the walsender's LSN. * * Must hold SyncRepLock. @@ -511,9 +513,9 @@ int SyncRepWakeQueue(bool all) { volatile WalSndCtlData *walsndctl = WalSndCtl; - PGPROC *proc = NULL; - PGPROC *thisproc = NULL; - int numprocs = 0; + PGPROC *proc = NULL; + PGPROC *thisproc = NULL; + int numprocs = 0; Assert(SyncRepQueueIsOrderedByLSN()); @@ -539,8 +541,8 @@ SyncRepWakeQueue(bool all) offsetof(PGPROC, syncRepLinks)); /* - * Set state to complete; see SyncRepWaitForLSN() for discussion - * of the various states. + * Set state to complete; see SyncRepWaitForLSN() for discussion of + * the various states. */ thisproc->syncRepState = SYNC_REP_WAIT_COMPLETE; @@ -603,8 +605,8 @@ SyncRepUpdateSyncStandbysDefined(void) static bool SyncRepQueueIsOrderedByLSN(void) { - PGPROC *proc = NULL; - XLogRecPtr lastLSN; + PGPROC *proc = NULL; + XLogRecPtr lastLSN; lastLSN.xlogid = 0; lastLSN.xrecoff = 0; @@ -616,8 +618,8 @@ SyncRepQueueIsOrderedByLSN(void) while (proc) { /* - * Check the queue is ordered by LSN and that multiple - * procs don't have matching LSNs + * Check the queue is ordered by LSN and that multiple procs don't + * have matching LSNs */ if (XLByteLE(proc->waitLSN, lastLSN)) return false; @@ -662,8 +664,8 @@ check_synchronous_standby_names(char **newval, void **extra, GucSource source) * Any additional validation of standby names should go here. * * Don't attempt to set WALSender priority because this is executed by - * postmaster at startup, not WALSender, so the application_name is - * not yet correctly set. + * postmaster at startup, not WALSender, so the application_name is not + * yet correctly set. */ pfree(rawstring); diff --git a/src/backend/replication/walreceiver.c b/src/backend/replication/walreceiver.c index f6259e4e30..471c844ab2 100644 --- a/src/backend/replication/walreceiver.c +++ b/src/backend/replication/walreceiver.c @@ -94,8 +94,8 @@ static struct XLogRecPtr Flush; /* last byte + 1 flushed in the standby */ } LogstreamResult; -static StandbyReplyMessage reply_message; -static StandbyHSFeedbackMessage feedback_message; +static StandbyReplyMessage reply_message; +static StandbyHSFeedbackMessage feedback_message; /* * About SIGTERM handling: @@ -329,8 +329,8 @@ WalReceiverMain(void) else { /* - * We didn't receive anything new, but send a status update to - * the master anyway, to report any progress in applying WAL. + * We didn't receive anything new, but send a status update to the + * master anyway, to report any progress in applying WAL. */ XLogWalRcvSendReply(); XLogWalRcvSendHSFeedback(); @@ -595,7 +595,7 @@ static void XLogWalRcvSendReply(void) { char buf[sizeof(StandbyReplyMessage) + 1]; - TimestampTz now; + TimestampTz now; /* * If the user doesn't want status to be reported to the master, be sure @@ -619,7 +619,7 @@ XLogWalRcvSendReply(void) if (XLByteEQ(reply_message.write, LogstreamResult.Write) && XLByteEQ(reply_message.flush, LogstreamResult.Flush) && !TimestampDifferenceExceeds(reply_message.sendTime, now, - wal_receiver_status_interval * 1000)) + wal_receiver_status_interval * 1000)) return; /* Construct a new message */ @@ -629,9 +629,9 @@ XLogWalRcvSendReply(void) reply_message.sendTime = now; elog(DEBUG2, "sending write %X/%X flush %X/%X apply %X/%X", - reply_message.write.xlogid, reply_message.write.xrecoff, - reply_message.flush.xlogid, reply_message.flush.xrecoff, - reply_message.apply.xlogid, reply_message.apply.xrecoff); + reply_message.write.xlogid, reply_message.write.xrecoff, + reply_message.flush.xlogid, reply_message.flush.xrecoff, + reply_message.apply.xlogid, reply_message.apply.xrecoff); /* Prepend with the message type and send it. */ buf[0] = 'r'; @@ -646,11 +646,11 @@ XLogWalRcvSendReply(void) static void XLogWalRcvSendHSFeedback(void) { - char buf[sizeof(StandbyHSFeedbackMessage) + 1]; - TimestampTz now; - TransactionId nextXid; - uint32 nextEpoch; - TransactionId xmin; + char buf[sizeof(StandbyHSFeedbackMessage) + 1]; + TimestampTz now; + TransactionId nextXid; + uint32 nextEpoch; + TransactionId xmin; /* * If the user doesn't want status to be reported to the master, be sure @@ -666,26 +666,25 @@ XLogWalRcvSendHSFeedback(void) * Send feedback at most once per wal_receiver_status_interval. */ if (!TimestampDifferenceExceeds(feedback_message.sendTime, now, - wal_receiver_status_interval * 1000)) + wal_receiver_status_interval * 1000)) return; /* - * If Hot Standby is not yet active there is nothing to send. - * Check this after the interval has expired to reduce number of - * calls. + * If Hot Standby is not yet active there is nothing to send. Check this + * after the interval has expired to reduce number of calls. */ if (!HotStandbyActive()) return; /* - * Make the expensive call to get the oldest xmin once we are - * certain everything else has been checked. + * Make the expensive call to get the oldest xmin once we are certain + * everything else has been checked. */ xmin = GetOldestXmin(true, false); /* - * Get epoch and adjust if nextXid and oldestXmin are different - * sides of the epoch boundary. + * Get epoch and adjust if nextXid and oldestXmin are different sides of + * the epoch boundary. */ GetNextXidAndEpoch(&nextXid, &nextEpoch); if (nextXid < xmin) @@ -699,8 +698,8 @@ XLogWalRcvSendHSFeedback(void) feedback_message.epoch = nextEpoch; elog(DEBUG2, "sending hot standby feedback xmin %u epoch %u", - feedback_message.xmin, - feedback_message.epoch); + feedback_message.xmin, + feedback_message.epoch); /* Prepend with the message type and send it. */ buf[0] = 'h'; diff --git a/src/backend/replication/walreceiverfuncs.c b/src/backend/replication/walreceiverfuncs.c index 48ab503d89..587949bfdb 100644 --- a/src/backend/replication/walreceiverfuncs.c +++ b/src/backend/replication/walreceiverfuncs.c @@ -200,8 +200,8 @@ RequestXLogStreaming(XLogRecPtr recptr, const char *conninfo) walrcv->startTime = now; /* - * If this is the first startup of walreceiver, we initialize - * receivedUpto and latestChunkStart to receiveStart. + * If this is the first startup of walreceiver, we initialize receivedUpto + * and latestChunkStart to receiveStart. */ if (walrcv->receiveStart.xlogid == 0 && walrcv->receiveStart.xrecoff == 0) diff --git a/src/backend/replication/walsender.c b/src/backend/replication/walsender.c index 1c11e7ff7a..af3c95a78b 100644 --- a/src/backend/replication/walsender.c +++ b/src/backend/replication/walsender.c @@ -66,15 +66,16 @@ WalSndCtlData *WalSndCtl = NULL; /* My slot in the shared memory array */ -WalSnd *MyWalSnd = NULL; +WalSnd *MyWalSnd = NULL; /* Global state */ bool am_walsender = false; /* Am I a walsender process ? */ /* User-settable parameters for walsender */ int max_wal_senders = 0; /* the maximum number of concurrent walsenders */ -int WalSndDelay = 1000; /* max sleep time between some actions */ -int replication_timeout = 60 * 1000; /* maximum time to send one WAL data message */ +int WalSndDelay = 1000; /* max sleep time between some actions */ +int replication_timeout = 60 * 1000; /* maximum time to send one + * WAL data message */ /* * These variables are used similarly to openLogFile/Id/Seg/Off, @@ -121,7 +122,7 @@ static void WalSndHandshake(void); static void WalSndKill(int code, Datum arg); static void XLogSend(char *msgbuf, bool *caughtup); static void IdentifySystem(void); -static void StartReplication(StartReplicationCmd * cmd); +static void StartReplication(StartReplicationCmd *cmd); static void ProcessStandbyMessage(void); static void ProcessStandbyReplyMessage(void); static void ProcessStandbyHSFeedbackMessage(void); @@ -281,8 +282,8 @@ IdentifySystem(void) XLogRecPtr logptr; /* - * Reply with a result set with one row, three columns. First col is system - * ID, second is timeline ID, and third is current xlog location. + * Reply with a result set with one row, three columns. First col is + * system ID, second is timeline ID, and third is current xlog location. */ snprintf(sysid, sizeof(sysid), UINT64_FORMAT, @@ -348,17 +349,16 @@ IdentifySystem(void) * START_REPLICATION */ static void -StartReplication(StartReplicationCmd * cmd) +StartReplication(StartReplicationCmd *cmd) { StringInfoData buf; /* - * Let postmaster know that we're streaming. Once we've declared us as - * a WAL sender process, postmaster will let us outlive the bgwriter and - * kill us last in the shutdown sequence, so we get a chance to stream - * all remaining WAL at shutdown, including the shutdown checkpoint. - * Note that there's no going back, and we mustn't write any WAL records - * after this. + * Let postmaster know that we're streaming. Once we've declared us as a + * WAL sender process, postmaster will let us outlive the bgwriter and + * kill us last in the shutdown sequence, so we get a chance to stream all + * remaining WAL at shutdown, including the shutdown checkpoint. Note that + * there's no going back, and we mustn't write any WAL records after this. */ MarkPostmasterChildWalSender(); SendPostmasterSignal(PMSIGNAL_ADVANCE_STATE_MACHINE); @@ -383,8 +383,8 @@ StartReplication(StartReplicationCmd * cmd) * For some applications, for example, synchronous replication, it is * important to have a clear state for this initial catchup mode, so we * can trigger actions when we change streaming state later. We may stay - * in this state for a long time, which is exactly why we want to be - * able to monitor whether or not we are still here. + * in this state for a long time, which is exactly why we want to be able + * to monitor whether or not we are still here. */ WalSndSetState(WALSNDSTATE_CATCHUP); @@ -476,7 +476,7 @@ ProcessRepliesIfAny(void) { unsigned char firstchar; int r; - int received = false; + int received = false; for (;;) { @@ -519,9 +519,9 @@ ProcessRepliesIfAny(void) firstchar))); } } + /* - * Save the last reply timestamp if we've received at least - * one reply. + * Save the last reply timestamp if we've received at least one reply. */ if (received) last_reply_timestamp = GetCurrentTimestamp(); @@ -533,7 +533,7 @@ ProcessRepliesIfAny(void) static void ProcessStandbyMessage(void) { - char msgtype; + char msgtype; resetStringInfo(&reply_message); @@ -577,7 +577,7 @@ ProcessStandbyMessage(void) static void ProcessStandbyReplyMessage(void) { - StandbyReplyMessage reply; + StandbyReplyMessage reply; pq_copymsgbytes(&reply_message, (char *) &reply, sizeof(StandbyReplyMessage)); @@ -587,8 +587,8 @@ ProcessStandbyReplyMessage(void) reply.apply.xlogid, reply.apply.xrecoff); /* - * Update shared state for this WalSender process - * based on reply data from standby. + * Update shared state for this WalSender process based on reply data from + * standby. */ { /* use volatile pointer to prevent code rearrangement */ @@ -610,7 +610,7 @@ ProcessStandbyReplyMessage(void) static void ProcessStandbyHSFeedbackMessage(void) { - StandbyHSFeedbackMessage reply; + StandbyHSFeedbackMessage reply; TransactionId newxmin = InvalidTransactionId; pq_copymsgbytes(&reply_message, (char *) &reply, sizeof(StandbyHSFeedbackMessage)); @@ -620,22 +620,21 @@ ProcessStandbyHSFeedbackMessage(void) reply.epoch); /* - * Update the WalSender's proc xmin to allow it to be visible - * to snapshots. This will hold back the removal of dead rows - * and thereby prevent the generation of cleanup conflicts - * on the standby server. + * Update the WalSender's proc xmin to allow it to be visible to + * snapshots. This will hold back the removal of dead rows and thereby + * prevent the generation of cleanup conflicts on the standby server. */ if (TransactionIdIsValid(reply.xmin)) { - TransactionId nextXid; - uint32 nextEpoch; - bool epochOK = false; + TransactionId nextXid; + uint32 nextEpoch; + bool epochOK = false; GetNextXidAndEpoch(&nextXid, &nextEpoch); /* - * Epoch of oldestXmin should be same as standby or - * if the counter has wrapped, then one less than reply. + * Epoch of oldestXmin should be same as standby or if the counter has + * wrapped, then one less than reply. */ if (reply.xmin <= nextXid) { @@ -657,6 +656,7 @@ ProcessStandbyHSFeedbackMessage(void) if (!TransactionIdIsValid(MyProc->xmin)) { TransactionId oldestXmin = GetOldestXmin(true, true); + if (TransactionIdPrecedes(oldestXmin, reply.xmin)) newxmin = reply.xmin; else @@ -667,7 +667,7 @@ ProcessStandbyHSFeedbackMessage(void) if (TransactionIdPrecedes(MyProc->xmin, reply.xmin)) newxmin = reply.xmin; else - newxmin = MyProc->xmin; /* stay the same */ + newxmin = MyProc->xmin; /* stay the same */ } } } @@ -735,8 +735,8 @@ WalSndLoop(void) } /* - * If we don't have any pending data in the output buffer, try to - * send some more. + * If we don't have any pending data in the output buffer, try to send + * some more. */ if (!pq_is_send_pending()) { @@ -746,8 +746,8 @@ WalSndLoop(void) * Even if we wrote all the WAL that was available when we started * sending, more might have arrived while we were sending this * batch. We had the latch set while sending, so we have not - * received any signals from that time. Let's arm the latch - * again, and after that check that we're still up-to-date. + * received any signals from that time. Let's arm the latch again, + * and after that check that we're still up-to-date. */ if (caughtup && !pq_is_send_pending()) { @@ -777,17 +777,17 @@ WalSndLoop(void) !got_SIGHUP && !walsender_shutdown_requested) { - TimestampTz finish_time = 0; + TimestampTz finish_time = 0; long sleeptime; /* Reschedule replication timeout */ if (replication_timeout > 0) { long secs; - int usecs; + int usecs; finish_time = TimestampTzPlusMilliseconds(last_reply_timestamp, - replication_timeout); + replication_timeout); TimestampDifference(GetCurrentTimestamp(), finish_time, &secs, &usecs); sleeptime = secs * 1000 + usecs / 1000; @@ -815,8 +815,8 @@ WalSndLoop(void) { /* * Since typically expiration of replication timeout means - * communication problem, we don't send the error message - * to the standby. + * communication problem, we don't send the error message to + * the standby. */ ereport(COMMERROR, (errmsg("terminating walsender process due to replication timeout"))); @@ -829,14 +829,14 @@ WalSndLoop(void) * This is an important state change for users, since before this * point data loss might occur if the primary dies and we need to * failover to the standby. The state change is also important for - * synchronous replication, since commits that started to wait at - * that point might wait for some time. + * synchronous replication, since commits that started to wait at that + * point might wait for some time. */ if (MyWalSnd->state == WALSNDSTATE_CATCHUP && caughtup) { ereport(DEBUG1, (errmsg("standby \"%s\" has now caught up with primary", - application_name))); + application_name))); WalSndSetState(WALSNDSTATE_STREAMING); } @@ -1317,7 +1317,7 @@ WalSndShmemInit(void) void WalSndWakeup(void) { - int i; + int i; for (i = 0; i < max_wal_senders; i++) SetLatch(&WalSndCtl->walsnds[i].latch); @@ -1369,16 +1369,16 @@ WalSndGetStateString(WalSndState state) Datum pg_stat_get_wal_senders(PG_FUNCTION_ARGS) { -#define PG_STAT_GET_WAL_SENDERS_COLS 8 - ReturnSetInfo *rsinfo = (ReturnSetInfo *) fcinfo->resultinfo; - TupleDesc tupdesc; - Tuplestorestate *tupstore; - MemoryContext per_query_ctx; - MemoryContext oldcontext; - int *sync_priority; - int priority = 0; - int sync_standby = -1; - int i; +#define PG_STAT_GET_WAL_SENDERS_COLS 8 + ReturnSetInfo *rsinfo = (ReturnSetInfo *) fcinfo->resultinfo; + TupleDesc tupdesc; + Tuplestorestate *tupstore; + MemoryContext per_query_ctx; + MemoryContext oldcontext; + int *sync_priority; + int priority = 0; + int sync_standby = -1; + int i; /* check to see if caller supports us returning a tuplestore */ if (rsinfo == NULL || !IsA(rsinfo, ReturnSetInfo)) @@ -1406,9 +1406,9 @@ pg_stat_get_wal_senders(PG_FUNCTION_ARGS) MemoryContextSwitchTo(oldcontext); /* - * Get the priorities of sync standbys all in one go, to minimise - * lock acquisitions and to allow us to evaluate who is the current - * sync standby. This code must match the code in SyncRepReleaseWaiters(). + * Get the priorities of sync standbys all in one go, to minimise lock + * acquisitions and to allow us to evaluate who is the current sync + * standby. This code must match the code in SyncRepReleaseWaiters(). */ sync_priority = palloc(sizeof(int) * max_wal_senders); LWLockAcquire(SyncRepLock, LW_SHARED); @@ -1442,7 +1442,7 @@ pg_stat_get_wal_senders(PG_FUNCTION_ARGS) XLogRecPtr write; XLogRecPtr flush; XLogRecPtr apply; - WalSndState state; + WalSndState state; Datum values[PG_STAT_GET_WAL_SENDERS_COLS]; bool nulls[PG_STAT_GET_WAL_SENDERS_COLS]; @@ -1463,8 +1463,8 @@ pg_stat_get_wal_senders(PG_FUNCTION_ARGS) if (!superuser()) { /* - * Only superusers can see details. Other users only get - * the pid value to know it's a walsender, but no details. + * Only superusers can see details. Other users only get the pid + * value to know it's a walsender, but no details. */ MemSet(&nulls[1], true, PG_STAT_GET_WAL_SENDERS_COLS - 1); } @@ -1485,7 +1485,7 @@ pg_stat_get_wal_senders(PG_FUNCTION_ARGS) if (flush.xlogid == 0 && flush.xrecoff == 0) nulls[4] = true; snprintf(location, sizeof(location), "%X/%X", - flush.xlogid, flush.xrecoff); + flush.xlogid, flush.xrecoff); values[4] = CStringGetTextDatum(location); if (apply.xlogid == 0 && apply.xrecoff == 0) @@ -1497,8 +1497,8 @@ pg_stat_get_wal_senders(PG_FUNCTION_ARGS) values[6] = Int32GetDatum(sync_priority[i]); /* - * More easily understood version of standby state. - * This is purely informational, not different from priority. + * More easily understood version of standby state. This is purely + * informational, not different from priority. */ if (sync_priority[i] == 0) values[7] = CStringGetTextDatum("ASYNC"); diff --git a/src/backend/rewrite/rewriteDefine.c b/src/backend/rewrite/rewriteDefine.c index a405dbfe8e..c1b97d141e 100644 --- a/src/backend/rewrite/rewriteDefine.c +++ b/src/backend/rewrite/rewriteDefine.c @@ -241,9 +241,9 @@ DefineQueryRewrite(char *rulename, /* * If we are installing an ON SELECT rule, we had better grab * AccessExclusiveLock to ensure no SELECTs are currently running on the - * event relation. For other types of rules, it is sufficient to - * grab ShareRowExclusiveLock to lock out insert/update/delete actions - * and to ensure that we lock out current CREATE RULE statements. + * event relation. For other types of rules, it is sufficient to grab + * ShareRowExclusiveLock to lock out insert/update/delete actions and to + * ensure that we lock out current CREATE RULE statements. */ if (event_type == CMD_SELECT) event_relation = heap_open(event_relid, AccessExclusiveLock); diff --git a/src/backend/rewrite/rewriteHandler.c b/src/backend/rewrite/rewriteHandler.c index a695b01239..bfc8fd7ee0 100644 --- a/src/backend/rewrite/rewriteHandler.c +++ b/src/backend/rewrite/rewriteHandler.c @@ -53,7 +53,7 @@ static Node *get_assignment_input(Node *node); static void rewriteValuesRTE(RangeTblEntry *rte, Relation target_relation, List *attrnos); static void rewriteTargetListUD(Query *parsetree, RangeTblEntry *target_rte, - Relation target_relation); + Relation target_relation); static void markQueryForLocking(Query *qry, Node *jtnode, bool forUpdate, bool noWait, bool pushedDown); static List *matchLocks(CmdType event, RuleLock *rulelocks, @@ -743,8 +743,8 @@ rewriteTargetListIU(Query *parsetree, Relation target_relation, } /* - * For an UPDATE on a view, provide a dummy entry whenever there is - * no explicit assignment. + * For an UPDATE on a view, provide a dummy entry whenever there is no + * explicit assignment. */ if (new_tle == NULL && commandType == CMD_UPDATE && target_relation->rd_rel->relkind == RELKIND_VIEW) @@ -1112,7 +1112,7 @@ rewriteValuesRTE(RangeTblEntry *rte, Relation target_relation, List *attrnos) * rewriteTargetListUD - rewrite UPDATE/DELETE targetlist as needed * * This function adds a "junk" TLE that is needed to allow the executor to - * find the original row for the update or delete. When the target relation + * find the original row for the update or delete. When the target relation * is a regular table, the junk TLE emits the ctid attribute of the original * row. When the target relation is a view, there is no ctid, so we instead * emit a whole-row Var that will contain the "old" values of the view row. @@ -1145,8 +1145,8 @@ rewriteTargetListUD(Query *parsetree, RangeTblEntry *target_rte, else { /* - * Emit whole-row Var so that executor will have the "old" view row - * to pass to the INSTEAD OF trigger. + * Emit whole-row Var so that executor will have the "old" view row to + * pass to the INSTEAD OF trigger. */ var = makeWholeRowVar(target_rte, parsetree->resultRelation, @@ -1267,11 +1267,11 @@ ApplyRetrieveRule(Query *parsetree, * fine as the result relation. * * For UPDATE/DELETE, we need to expand the view so as to have source - * data for the operation. But we also need an unmodified RTE to + * data for the operation. But we also need an unmodified RTE to * serve as the target. So, copy the RTE and add the copy to the - * rangetable. Note that the copy does not get added to the jointree. - * Also note that there's a hack in fireRIRrules to avoid calling - * this function again when it arrives at the copied RTE. + * rangetable. Note that the copy does not get added to the jointree. + * Also note that there's a hack in fireRIRrules to avoid calling this + * function again when it arrives at the copied RTE. */ if (parsetree->commandType == CMD_INSERT) return parsetree; @@ -1286,9 +1286,9 @@ ApplyRetrieveRule(Query *parsetree, parsetree->resultRelation = list_length(parsetree->rtable); /* - * There's no need to do permissions checks twice, so wipe out - * the permissions info for the original RTE (we prefer to keep - * the bits set on the result RTE). + * There's no need to do permissions checks twice, so wipe out the + * permissions info for the original RTE (we prefer to keep the + * bits set on the result RTE). */ rte->requiredPerms = 0; rte->checkAsUser = InvalidOid; @@ -1988,9 +1988,9 @@ RewriteQuery(Query *parsetree, List *rewrite_events) */ foreach(lc1, parsetree->cteList) { - CommonTableExpr *cte = (CommonTableExpr *) lfirst(lc1); - Query *ctequery = (Query *) cte->ctequery; - List *newstuff; + CommonTableExpr *cte = (CommonTableExpr *) lfirst(lc1); + Query *ctequery = (Query *) cte->ctequery; + List *newstuff; Assert(IsA(ctequery, Query)); @@ -2021,12 +2021,12 @@ RewriteQuery(Query *parsetree, List *rewrite_events) } else { - ListCell *lc2; + ListCell *lc2; /* examine queries to determine which error message to issue */ foreach(lc2, newstuff) { - Query *q = (Query *) lfirst(lc2); + Query *q = (Query *) lfirst(lc2); if (q->querySource == QSRC_QUAL_INSTEAD_RULE) ereport(ERROR, diff --git a/src/backend/rewrite/rewriteSupport.c b/src/backend/rewrite/rewriteSupport.c index 9feed7345e..7770d032b1 100644 --- a/src/backend/rewrite/rewriteSupport.c +++ b/src/backend/rewrite/rewriteSupport.c @@ -127,7 +127,7 @@ get_rewrite_oid(Oid relid, const char *rulename, bool missing_ok) * Find rule oid, given only a rule name but no rel OID. * * If there's more than one, it's an error. If there aren't any, that's an - * error, too. In general, this should be avoided - it is provided to support + * error, too. In general, this should be avoided - it is provided to support * syntax that is compatible with pre-7.3 versions of PG, where rule names * were unique across the entire database. */ diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 1f89e52705..f96685db50 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -644,17 +644,17 @@ BufferAlloc(SMgrRelation smgr, char relpersistence, ForkNumber forkNum, /* OK, do the I/O */ TRACE_POSTGRESQL_BUFFER_WRITE_DIRTY_START(forkNum, blockNum, - smgr->smgr_rnode.node.spcNode, - smgr->smgr_rnode.node.dbNode, - smgr->smgr_rnode.node.relNode); + smgr->smgr_rnode.node.spcNode, + smgr->smgr_rnode.node.dbNode, + smgr->smgr_rnode.node.relNode); FlushBuffer(buf, NULL); LWLockRelease(buf->content_lock); TRACE_POSTGRESQL_BUFFER_WRITE_DIRTY_DONE(forkNum, blockNum, - smgr->smgr_rnode.node.spcNode, - smgr->smgr_rnode.node.dbNode, - smgr->smgr_rnode.node.relNode); + smgr->smgr_rnode.node.spcNode, + smgr->smgr_rnode.node.dbNode, + smgr->smgr_rnode.node.relNode); } else { @@ -2029,7 +2029,7 @@ PrintBufferDescs(void) "[%02d] (freeNext=%d, rel=%s, " "blockNum=%u, flags=0x%x, refcount=%u %d)", i, buf->freeNext, - relpathbackend(buf->tag.rnode, InvalidBackendId, buf->tag.forkNum), + relpathbackend(buf->tag.rnode, InvalidBackendId, buf->tag.forkNum), buf->tag.blockNum, buf->flags, buf->refcount, PrivateRefCount[i]); } @@ -2765,7 +2765,7 @@ local_buffer_write_error_callback(void *arg) if (bufHdr != NULL) { char *path = relpathbackend(bufHdr->tag.rnode, MyBackendId, - bufHdr->tag.forkNum); + bufHdr->tag.forkNum); errcontext("writing block %u of relation %s", bufHdr->tag.blockNum, path); diff --git a/src/backend/storage/buffer/freelist.c b/src/backend/storage/buffer/freelist.c index 72968db026..bf9903b9f3 100644 --- a/src/backend/storage/buffer/freelist.c +++ b/src/backend/storage/buffer/freelist.c @@ -77,7 +77,7 @@ typedef struct BufferAccessStrategyData * struct. */ Buffer buffers[1]; /* VARIABLE SIZE ARRAY */ -} BufferAccessStrategyData; +} BufferAccessStrategyData; /* Prototypes for internal functions */ diff --git a/src/backend/storage/buffer/localbuf.c b/src/backend/storage/buffer/localbuf.c index 0a01ed544e..8816a5dfab 100644 --- a/src/backend/storage/buffer/localbuf.c +++ b/src/backend/storage/buffer/localbuf.c @@ -150,8 +150,8 @@ LocalBufferAlloc(SMgrRelation smgr, ForkNumber forkNum, BlockNumber blockNum, #ifdef LBDEBUG fprintf(stderr, "LB ALLOC (%u,%d,%d) %d\n", - smgr->smgr_rnode.node.relNode, forkNum, blockNum, - -nextFreeLocalBuf - 1); + smgr->smgr_rnode.node.relNode, forkNum, blockNum, + -nextFreeLocalBuf - 1); #endif /* @@ -311,7 +311,7 @@ DropRelFileNodeLocalBuffers(RelFileNode rnode, ForkNumber forkNum, elog(ERROR, "block %u of %s is still referenced (local %u)", bufHdr->tag.blockNum, relpathbackend(bufHdr->tag.rnode, MyBackendId, - bufHdr->tag.forkNum), + bufHdr->tag.forkNum), LocalRefCount[i]); /* Remove entry from hashtable */ hresult = (LocalBufferLookupEnt *) @@ -413,7 +413,7 @@ GetLocalBufferStorage(void) /* * We allocate local buffers in a context of their own, so that the * space eaten for them is easily recognizable in MemoryContextStats - * output. Create the context on first use. + * output. Create the context on first use. */ if (LocalBufferContext == NULL) LocalBufferContext = diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c index bdb97b2ad1..11bab38280 100644 --- a/src/backend/storage/file/fd.c +++ b/src/backend/storage/file/fd.c @@ -1063,15 +1063,15 @@ FileClose(File file) * If we get an error, as could happen within the ereport/elog calls, * we'll come right back here during transaction abort. Reset the * flag to ensure that we can't get into an infinite loop. This code - * is arranged to ensure that the worst-case consequence is failing - * to emit log message(s), not failing to attempt the unlink. + * is arranged to ensure that the worst-case consequence is failing to + * emit log message(s), not failing to attempt the unlink. */ vfdP->fdstate &= ~FD_TEMPORARY; if (log_temp_files >= 0) { struct stat filestats; - int stat_errno; + int stat_errno; /* first try the stat() */ if (stat(vfdP->fileName, &filestats)) @@ -1900,7 +1900,7 @@ RemovePgTempFiles(void) RemovePgTempFilesInDir(temp_path); snprintf(temp_path, sizeof(temp_path), "pg_tblspc/%s/%s", - spc_de->d_name, TABLESPACE_VERSION_DIRECTORY); + spc_de->d_name, TABLESPACE_VERSION_DIRECTORY); RemovePgTempRelationFiles(temp_path); } @@ -1977,7 +1977,7 @@ RemovePgTempRelationFiles(const char *tsdirname) while ((de = ReadDir(ts_dir, tsdirname)) != NULL) { - int i = 0; + int i = 0; /* * We're only interested in the per-database directories, which have @@ -2023,7 +2023,7 @@ RemovePgTempRelationFilesInDbspace(const char *dbspacedirname) snprintf(rm_path, sizeof(rm_path), "%s/%s", dbspacedirname, de->d_name); - unlink(rm_path); /* note we ignore any error */ + unlink(rm_path); /* note we ignore any error */ } FreeDir(dbspace_dir); @@ -2055,15 +2055,17 @@ looks_like_temp_rel_name(const char *name) /* We might have _forkname or .segment or both. */ if (name[pos] == '_') { - int forkchar = forkname_chars(&name[pos+1], NULL); + int forkchar = forkname_chars(&name[pos + 1], NULL); + if (forkchar <= 0) return false; pos += forkchar + 1; } if (name[pos] == '.') { - int segchar; - for (segchar = 1; isdigit((unsigned char) name[pos+segchar]); ++segchar) + int segchar; + + for (segchar = 1; isdigit((unsigned char) name[pos + segchar]); ++segchar) ; if (segchar <= 1) return false; diff --git a/src/backend/storage/file/reinit.c b/src/backend/storage/file/reinit.c index 54fde73de8..837ab90c8d 100644 --- a/src/backend/storage/file/reinit.c +++ b/src/backend/storage/file/reinit.c @@ -24,14 +24,15 @@ #include "utils/memutils.h" static void ResetUnloggedRelationsInTablespaceDir(const char *tsdirname, - int op); + int op); static void ResetUnloggedRelationsInDbspaceDir(const char *dbspacedirname, int op); static bool parse_filename_for_nontemp_relation(const char *name, int *oidchars, ForkNumber *fork); -typedef struct { - char oid[OIDCHARS+1]; +typedef struct +{ + char oid[OIDCHARS + 1]; } unlogged_relation_entry; /* @@ -49,13 +50,14 @@ ResetUnloggedRelations(int op) char temp_path[MAXPGPATH]; DIR *spc_dir; struct dirent *spc_de; - MemoryContext tmpctx, oldctx; + MemoryContext tmpctx, + oldctx; /* Log it. */ ereport(DEBUG1, (errmsg("resetting unlogged relations: cleanup %d init %d", - (op & UNLOGGED_RELATION_CLEANUP) != 0, - (op & UNLOGGED_RELATION_INIT) != 0))); + (op & UNLOGGED_RELATION_CLEANUP) != 0, + (op & UNLOGGED_RELATION_INIT) != 0))); /* * Just to be sure we don't leak any memory, let's create a temporary @@ -85,7 +87,7 @@ ResetUnloggedRelations(int op) continue; snprintf(temp_path, sizeof(temp_path), "pg_tblspc/%s/%s", - spc_de->d_name, TABLESPACE_VERSION_DIRECTORY); + spc_de->d_name, TABLESPACE_VERSION_DIRECTORY); ResetUnloggedRelationsInTablespaceDir(temp_path, op); } @@ -119,7 +121,7 @@ ResetUnloggedRelationsInTablespaceDir(const char *tsdirname, int op) while ((de = ReadDir(ts_dir, tsdirname)) != NULL) { - int i = 0; + int i = 0; /* * We're only interested in the per-database directories, which have @@ -184,8 +186,8 @@ ResetUnloggedRelationsInDbspaceDir(const char *dbspacedirname, int op) /* Scan the directory. */ while ((de = ReadDir(dbspace_dir, dbspacedirname)) != NULL) { - ForkNumber forkNum; - int oidchars; + ForkNumber forkNum; + int oidchars; unlogged_relation_entry ent; /* Skip anything that doesn't look like a relation data file. */ @@ -198,8 +200,8 @@ ResetUnloggedRelationsInDbspaceDir(const char *dbspacedirname, int op) continue; /* - * Put the OID portion of the name into the hash table, if it isn't - * already. + * Put the OID portion of the name into the hash table, if it + * isn't already. */ memset(ent.oid, 0, sizeof(ent.oid)); memcpy(ent.oid, de->d_name, oidchars); @@ -236,9 +238,9 @@ ResetUnloggedRelationsInDbspaceDir(const char *dbspacedirname, int op) /* Scan the directory. */ while ((de = ReadDir(dbspace_dir, dbspacedirname)) != NULL) { - ForkNumber forkNum; - int oidchars; - bool found; + ForkNumber forkNum; + int oidchars; + bool found; unlogged_relation_entry ent; /* Skip anything that doesn't look like a relation data file. */ @@ -262,7 +264,8 @@ ResetUnloggedRelationsInDbspaceDir(const char *dbspacedirname, int op) if (found) { snprintf(rm_path, sizeof(rm_path), "%s/%s", - dbspacedirname, de->d_name); + dbspacedirname, de->d_name); + /* * It's tempting to actually throw an error here, but since * this code gets run during database startup, that could @@ -284,9 +287,9 @@ ResetUnloggedRelationsInDbspaceDir(const char *dbspacedirname, int op) /* * Initialization happens after cleanup is complete: we copy each init * fork file to the corresponding main fork file. Note that if we are - * asked to do both cleanup and init, we may never get here: if the cleanup - * code determines that there are no init forks in this dbspace, it will - * return before we get to this point. + * asked to do both cleanup and init, we may never get here: if the + * cleanup code determines that there are no init forks in this dbspace, + * it will return before we get to this point. */ if ((op & UNLOGGED_RELATION_INIT) != 0) { @@ -304,11 +307,11 @@ ResetUnloggedRelationsInDbspaceDir(const char *dbspacedirname, int op) /* Scan the directory. */ while ((de = ReadDir(dbspace_dir, dbspacedirname)) != NULL) { - ForkNumber forkNum; - int oidchars; - char oidbuf[OIDCHARS+1]; - char srcpath[MAXPGPATH]; - char dstpath[MAXPGPATH]; + ForkNumber forkNum; + int oidchars; + char oidbuf[OIDCHARS + 1]; + char srcpath[MAXPGPATH]; + char dstpath[MAXPGPATH]; /* Skip anything that doesn't look like a relation data file. */ if (!parse_filename_for_nontemp_relation(de->d_name, &oidchars, @@ -370,9 +373,9 @@ parse_filename_for_nontemp_relation(const char *name, int *oidchars, *fork = MAIN_FORKNUM; else { - int forkchar; + int forkchar; - forkchar = forkname_chars(&name[pos+1], fork); + forkchar = forkname_chars(&name[pos + 1], fork); if (forkchar <= 0) return false; pos += forkchar + 1; @@ -381,8 +384,9 @@ parse_filename_for_nontemp_relation(const char *name, int *oidchars, /* Check for a segment number. */ if (name[pos] == '.') { - int segchar; - for (segchar = 1; isdigit((unsigned char) name[pos+segchar]); ++segchar) + int segchar; + + for (segchar = 1; isdigit((unsigned char) name[pos + segchar]); ++segchar) ; if (segchar <= 1) return false; diff --git a/src/backend/storage/ipc/pmsignal.c b/src/backend/storage/ipc/pmsignal.c index 391d6a6ea0..306e3f9a21 100644 --- a/src/backend/storage/ipc/pmsignal.c +++ b/src/backend/storage/ipc/pmsignal.c @@ -279,7 +279,7 @@ PostmasterIsAlive(bool amDirectChild) #ifndef WIN32 if (amDirectChild) { - pid_t ppid = getppid(); + pid_t ppid = getppid(); /* If the postmaster is still our parent, it must be alive. */ if (ppid == PostmasterPid) @@ -297,10 +297,10 @@ PostmasterIsAlive(bool amDirectChild) } /* - * Use kill() to see if the postmaster is still alive. This can - * sometimes give a false positive result, since the postmaster's PID - * may get recycled, but it is good enough for existing uses by - * indirect children and in debugging environments. + * Use kill() to see if the postmaster is still alive. This can sometimes + * give a false positive result, since the postmaster's PID may get + * recycled, but it is good enough for existing uses by indirect children + * and in debugging environments. */ return (kill(PostmasterPid, 0) == 0); #else /* WIN32 */ diff --git a/src/backend/storage/ipc/procarray.c b/src/backend/storage/ipc/procarray.c index 65fca7171a..e7593fa2eb 100644 --- a/src/backend/storage/ipc/procarray.c +++ b/src/backend/storage/ipc/procarray.c @@ -475,10 +475,10 @@ ProcArrayApplyRecoveryInfo(RunningTransactions running) return; /* - * If our initial RunningTransactionsData had an overflowed snapshot then we knew - * we were missing some subxids from our snapshot. We can use this data as - * an initial snapshot, but we cannot yet mark it valid. We know that the - * missing subxids are equal to or earlier than nextXid. After we + * If our initial RunningTransactionsData had an overflowed snapshot then + * we knew we were missing some subxids from our snapshot. We can use this + * data as an initial snapshot, but we cannot yet mark it valid. We know + * that the missing subxids are equal to or earlier than nextXid. After we * initialise we continue to apply changes during recovery, so once the * oldestRunningXid is later than the nextXid from the initial snapshot we * know that we no longer have missing information and can mark the @@ -510,8 +510,8 @@ ProcArrayApplyRecoveryInfo(RunningTransactions running) */ /* - * Release any locks belonging to old transactions that are not - * running according to the running-xacts record. + * Release any locks belonging to old transactions that are not running + * according to the running-xacts record. */ StandbyReleaseOldLocks(running->nextXid); @@ -582,9 +582,8 @@ ProcArrayApplyRecoveryInfo(RunningTransactions running) * Now we've got the running xids we need to set the global values that * are used to track snapshots as they evolve further. * - * - latestCompletedXid which will be the xmax for snapshots - * - lastOverflowedXid which shows whether snapshots overflow - * - nextXid + * - latestCompletedXid which will be the xmax for snapshots - + * lastOverflowedXid which shows whether snapshots overflow - nextXid * * If the snapshot overflowed, then we still initialise with what we know, * but the recovery snapshot isn't fully valid yet because we know there @@ -611,9 +610,8 @@ ProcArrayApplyRecoveryInfo(RunningTransactions running) /* * If a transaction wrote a commit record in the gap between taking and - * logging the snapshot then latestCompletedXid may already be higher - * than the value from the snapshot, so check before we use the incoming - * value. + * logging the snapshot then latestCompletedXid may already be higher than + * the value from the snapshot, so check before we use the incoming value. */ if (TransactionIdPrecedes(ShmemVariableCache->latestCompletedXid, running->latestCompletedXid)) @@ -1048,7 +1046,7 @@ GetOldestXmin(bool allDbs, bool ignoreVacuum) if (allDbs || proc->databaseId == MyDatabaseId || - proc->databaseId == 0) /* include WalSender */ + proc->databaseId == 0) /* include WalSender */ { /* Fetch xid just once - see GetNewTransactionId */ TransactionId xid = proc->xid; @@ -1075,8 +1073,8 @@ GetOldestXmin(bool allDbs, bool ignoreVacuum) if (RecoveryInProgress()) { /* - * Check to see whether KnownAssignedXids contains an xid value - * older than the main procarray. + * Check to see whether KnownAssignedXids contains an xid value older + * than the main procarray. */ TransactionId kaxmin = KnownAssignedXidsGetOldestXmin(); @@ -1084,7 +1082,7 @@ GetOldestXmin(bool allDbs, bool ignoreVacuum) if (TransactionIdIsNormal(kaxmin) && TransactionIdPrecedes(kaxmin, result)) - result = kaxmin; + result = kaxmin; } else { @@ -1100,9 +1098,9 @@ GetOldestXmin(bool allDbs, bool ignoreVacuum) * vacuum_defer_cleanup_age provides some additional "slop" for the * benefit of hot standby queries on slave servers. This is quick and * dirty, and perhaps not all that useful unless the master has a - * predictable transaction rate, but it's what we've got. Note that we - * are assuming vacuum_defer_cleanup_age isn't large enough to cause - * wraparound --- so guc.c should limit it to no more than the + * predictable transaction rate, but it's what we've got. Note that + * we are assuming vacuum_defer_cleanup_age isn't large enough to + * cause wraparound --- so guc.c should limit it to no more than the * xidStopLimit threshold in varsup.c. */ result -= vacuum_defer_cleanup_age; @@ -1483,9 +1481,9 @@ GetRunningTransactionData(void) suboverflowed = true; /* - * Top-level XID of a transaction is always less than any of - * its subxids, so we don't need to check if any of the subxids - * are smaller than oldestRunningXid + * Top-level XID of a transaction is always less than any of its + * subxids, so we don't need to check if any of the subxids are + * smaller than oldestRunningXid */ } } diff --git a/src/backend/storage/ipc/standby.c b/src/backend/storage/ipc/standby.c index 2e71484126..3fdb5184a9 100644 --- a/src/backend/storage/ipc/standby.c +++ b/src/backend/storage/ipc/standby.c @@ -193,7 +193,7 @@ ResolveRecoveryConflictWithVirtualXIDs(VirtualTransactionId *waitlist, return; waitStart = GetCurrentTimestamp(); - new_status = NULL; /* we haven't changed the ps display */ + new_status = NULL; /* we haven't changed the ps display */ while (VirtualTransactionIdIsValid(*waitlist)) { @@ -963,14 +963,14 @@ void LogAccessExclusiveLockPrepare(void) { /* - * Ensure that a TransactionId has been assigned to this transaction, - * for two reasons, both related to lock release on the standby. - * First, we must assign an xid so that RecordTransactionCommit() and + * Ensure that a TransactionId has been assigned to this transaction, for + * two reasons, both related to lock release on the standby. First, we + * must assign an xid so that RecordTransactionCommit() and * RecordTransactionAbort() do not optimise away the transaction - * completion record which recovery relies upon to release locks. It's - * a hack, but for a corner case not worth adding code for into the - * main commit path. Second, must must assign an xid before the lock - * is recorded in shared memory, otherwise a concurrently executing + * completion record which recovery relies upon to release locks. It's a + * hack, but for a corner case not worth adding code for into the main + * commit path. Second, must must assign an xid before the lock is + * recorded in shared memory, otherwise a concurrently executing * GetRunningTransactionLocks() might see a lock associated with an * InvalidTransactionId which we later assert cannot happen. */ diff --git a/src/backend/storage/large_object/inv_api.c b/src/backend/storage/large_object/inv_api.c index 01e3492cb8..e0441f5bf1 100644 --- a/src/backend/storage/large_object/inv_api.c +++ b/src/backend/storage/large_object/inv_api.c @@ -844,8 +844,8 @@ inv_truncate(LargeObjectDesc *obj_desc, int len) { /* * If the first page we found was after the truncation point, we're in - * a hole that we'll fill, but we need to delete the later page because - * the loop below won't visit it again. + * a hole that we'll fill, but we need to delete the later page + * because the loop below won't visit it again. */ if (olddata != NULL) { diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c index ed0ea1205f..3fbe14a409 100644 --- a/src/backend/storage/lmgr/lock.c +++ b/src/backend/storage/lmgr/lock.c @@ -586,7 +586,8 @@ LockAcquireExtended(const LOCKTAG *locktag, * standby server. Only AccessExclusiveLocks can conflict with lock types * that read-only transactions can acquire in a standby server. * - * Make sure this definition matches the one in GetRunningTransactionLocks(). + * Make sure this definition matches the one in + * GetRunningTransactionLocks(). * * First we prepare to log, then after lock acquired we issue log record. */ diff --git a/src/backend/storage/lmgr/predicate.c b/src/backend/storage/lmgr/predicate.c index 7978bef996..72385c2f3e 100644 --- a/src/backend/storage/lmgr/predicate.c +++ b/src/backend/storage/lmgr/predicate.c @@ -327,7 +327,7 @@ typedef struct OldSerXidControlData TransactionId headXid; /* newest valid Xid in the SLRU */ TransactionId tailXid; /* oldest xmin we might be interested in */ bool warningIssued; -} OldSerXidControlData; +} OldSerXidControlData; typedef struct OldSerXidControlData *OldSerXidControl; @@ -477,7 +477,7 @@ ReleasePredXact(SERIALIZABLEXACT *sxact) ptle = (PredXactListElement) (((char *) sxact) - offsetof(PredXactListElementData, sxact) - +offsetof(PredXactListElementData, link)); + + offsetof(PredXactListElementData, link)); SHMQueueDelete(&ptle->link); SHMQueueInsertBefore(&PredXact->availableList, &ptle->link); } @@ -507,7 +507,7 @@ NextPredXact(SERIALIZABLEXACT *sxact) ptle = (PredXactListElement) (((char *) sxact) - offsetof(PredXactListElementData, sxact) - +offsetof(PredXactListElementData, link)); + + offsetof(PredXactListElementData, link)); ptle = (PredXactListElement) SHMQueueNext(&PredXact->activeList, &ptle->link, @@ -746,10 +746,10 @@ OldSerXidAdd(TransactionId xid, SerCommitSeqNo minConflictCommitSeqNo) Assert(TransactionIdIsValid(tailXid)); /* - * If the SLRU is currently unused, zero out the whole active region - * from tailXid to headXid before taking it into use. Otherwise zero - * out only any new pages that enter the tailXid-headXid range as we - * advance headXid. + * If the SLRU is currently unused, zero out the whole active region from + * tailXid to headXid before taking it into use. Otherwise zero out only + * any new pages that enter the tailXid-headXid range as we advance + * headXid. */ if (oldSerXidControl->headPage < 0) { @@ -855,8 +855,8 @@ OldSerXidSetActiveSerXmin(TransactionId xid) /* * When no sxacts are active, nothing overlaps, set the xid values to * invalid to show that there are no valid entries. Don't clear headPage, - * though. A new xmin might still land on that page, and we don't want - * to repeatedly zero out the same page. + * though. A new xmin might still land on that page, and we don't want to + * repeatedly zero out the same page. */ if (!TransactionIdIsValid(xid)) { @@ -901,7 +901,7 @@ OldSerXidSetActiveSerXmin(TransactionId xid) void CheckPointPredicate(void) { - int tailPage; + int tailPage; LWLockAcquire(OldSerXidLock, LW_EXCLUSIVE); @@ -921,16 +921,15 @@ CheckPointPredicate(void) { /* * The SLRU is no longer needed. Truncate everything. If we try to - * leave the head page around to avoid re-zeroing it, we might not - * use the SLRU again until we're past the wrap-around point, which - * makes SLRU unhappy. + * leave the head page around to avoid re-zeroing it, we might not use + * the SLRU again until we're past the wrap-around point, which makes + * SLRU unhappy. * * While the API asks you to specify truncation by page, it silently - * ignores the request unless the specified page is in a segment - * past some allocated portion of the SLRU. We don't care which - * page in a later segment we hit, so just add the number of pages - * per segment to the head page to land us *somewhere* in the next - * segment. + * ignores the request unless the specified page is in a segment past + * some allocated portion of the SLRU. We don't care which page in a + * later segment we hit, so just add the number of pages per segment + * to the head page to land us *somewhere* in the next segment. */ tailPage = oldSerXidControl->headPage + SLRU_PAGES_PER_SEGMENT; oldSerXidControl->headPage = -1; @@ -1329,12 +1328,12 @@ SummarizeOldestCommittedSxact(void) /* * This function is only called if there are no sxact slots available. * Some of them must belong to old, already-finished transactions, so - * there should be something in FinishedSerializableTransactions list - * that we can summarize. However, there's a race condition: while we - * were not holding any locks, a transaction might have ended and cleaned - * up all the finished sxact entries already, freeing up their sxact - * slots. In that case, we have nothing to do here. The caller will find - * one of the slots released by the other backend when it retries. + * there should be something in FinishedSerializableTransactions list that + * we can summarize. However, there's a race condition: while we were not + * holding any locks, a transaction might have ended and cleaned up all + * the finished sxact entries already, freeing up their sxact slots. In + * that case, we have nothing to do here. The caller will find one of the + * slots released by the other backend when it retries. */ if (SHMQueueEmpty(FinishedSerializableTransactions)) { @@ -2213,7 +2212,7 @@ PredicateLockTuple(const Relation relation, const HeapTuple tuple) */ if (relation->rd_index == NULL) { - TransactionId myxid; + TransactionId myxid; targetxmin = HeapTupleHeaderGetXmin(tuple->t_data); @@ -2223,6 +2222,7 @@ PredicateLockTuple(const Relation relation, const HeapTuple tuple) if (TransactionIdFollowsOrEquals(targetxmin, TransactionXmin)) { TransactionId xid = SubTransGetTopmostTransaction(targetxmin); + if (TransactionIdEquals(xid, myxid)) { /* We wrote it; we already have a write lock. */ @@ -2272,7 +2272,7 @@ PredicateLockTupleRowVersionLink(const Relation relation, PREDICATELOCKTARGETTAG oldtupletag; PREDICATELOCKTARGETTAG oldpagetag; PREDICATELOCKTARGETTAG newtupletag; - BlockNumber oldblk, + BlockNumber oldblk, newblk; OffsetNumber oldoff, newoff; @@ -2308,10 +2308,10 @@ PredicateLockTupleRowVersionLink(const Relation relation, /* * A page-level lock on the page containing the old tuple counts too. - * Anyone holding a lock on the page is logically holding a lock on - * the old tuple, so we need to acquire a lock on his behalf on the - * new tuple too. However, if the new tuple is on the same page as the - * old one, the old page-level lock already covers the new tuple. + * Anyone holding a lock on the page is logically holding a lock on the + * old tuple, so we need to acquire a lock on his behalf on the new tuple + * too. However, if the new tuple is on the same page as the old one, the + * old page-level lock already covers the new tuple. * * A relation-level lock always covers both tuple versions, so we don't * need to worry about those here. @@ -2668,10 +2668,10 @@ PredicateLockPageSplit(const Relation relation, const BlockNumber oldblkno, /* * Move the locks to the parent. This shouldn't fail. * - * Note that here we are removing locks held by other - * backends, leading to a possible inconsistency in their - * local lock hash table. This is OK because we're replacing - * it with a lock that covers the old one. + * Note that here we are removing locks held by other backends, + * leading to a possible inconsistency in their local lock hash table. + * This is OK because we're replacing it with a lock that covers the + * old one. */ success = TransferPredicateLocksToNewTarget(oldtargettag, newtargettag, @@ -2696,16 +2696,15 @@ PredicateLockPageCombine(const Relation relation, const BlockNumber oldblkno, const BlockNumber newblkno) { /* - * Page combines differ from page splits in that we ought to be - * able to remove the locks on the old page after transferring - * them to the new page, instead of duplicating them. However, - * because we can't edit other backends' local lock tables, - * removing the old lock would leave them with an entry in their - * LocalPredicateLockHash for a lock they're not holding, which - * isn't acceptable. So we wind up having to do the same work as a - * page split, acquiring a lock on the new page and keeping the old - * page locked too. That can lead to some false positives, but - * should be rare in practice. + * Page combines differ from page splits in that we ought to be able to + * remove the locks on the old page after transferring them to the new + * page, instead of duplicating them. However, because we can't edit other + * backends' local lock tables, removing the old lock would leave them + * with an entry in their LocalPredicateLockHash for a lock they're not + * holding, which isn't acceptable. So we wind up having to do the same + * work as a page split, acquiring a lock on the new page and keeping the + * old page locked too. That can lead to some false positives, but should + * be rare in practice. */ PredicateLockPageSplit(relation, oldblkno, newblkno); } @@ -3652,15 +3651,15 @@ CheckTargetForConflictsIn(PREDICATELOCKTARGETTAG *targettag) /* * If we're getting a write lock on the tuple and we're not in a * subtransaction, we don't need a predicate (SIREAD) lock. We - * can't use this optimization within a subtransaction because - * the subtransaction could be rolled back, and we would be left + * can't use this optimization within a subtransaction because the + * subtransaction could be rolled back, and we would be left * without any lock at the top level. - * + * * At this point our transaction already has an ExclusiveRowLock - * on the relation, so we are OK to drop the predicate lock on - * the tuple, if found, without fearing that another write - * against the tuple will occur before the MVCC information - * makes it to the buffer. + * on the relation, so we are OK to drop the predicate lock on the + * tuple, if found, without fearing that another write against the + * tuple will occur before the MVCC information makes it to the + * buffer. */ if (!IsSubTransaction() && GET_PREDICATELOCKTARGETTAG_OFFSET(*targettag)) @@ -3722,8 +3721,8 @@ CheckTargetForConflictsIn(PREDICATELOCKTARGETTAG *targettag) /* * Remove entry in local lock table if it exists and has * no children. It's OK if it doesn't exist; that means - * the lock was transferred to a new target by a - * different backend. + * the lock was transferred to a new target by a different + * backend. */ if (locallock != NULL) { @@ -3733,8 +3732,8 @@ CheckTargetForConflictsIn(PREDICATELOCKTARGETTAG *targettag) { rmlocallock = (LOCALPREDICATELOCK *) hash_search_with_hash_value(LocalPredicateLockHash, - targettag, targettaghash, - HASH_REMOVE, NULL); + targettag, targettaghash, + HASH_REMOVE, NULL); Assert(rmlocallock == locallock); } } @@ -3772,9 +3771,9 @@ CheckTargetForConflictsIn(PREDICATELOCKTARGETTAG *targettag) LWLockAcquire(partitionLock, LW_SHARED); /* - * The list may have been altered by another process - * while we weren't holding the partition lock. Start - * over at the front. + * The list may have been altered by another process while + * we weren't holding the partition lock. Start over at + * the front. */ nextpredlock = (PREDICATELOCK *) SHMQueueNext(&(target->predicateLocks), @@ -3862,8 +3861,8 @@ CheckForSerializableConflictIn(const Relation relation, const HeapTuple tuple, relation->rd_node.dbNode, relation->rd_id, ItemPointerGetBlockNumber(&(tuple->t_data->t_ctid)), - ItemPointerGetOffsetNumber(&(tuple->t_data->t_ctid)), - HeapTupleHeaderGetXmin(tuple->t_data)); + ItemPointerGetOffsetNumber(&(tuple->t_data->t_ctid)), + HeapTupleHeaderGetXmin(tuple->t_data)); CheckTargetForConflictsIn(&targettag); } diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c index 9d585b6fea..6f8866836d 100644 --- a/src/backend/storage/smgr/md.c +++ b/src/backend/storage/smgr/md.c @@ -938,7 +938,7 @@ mdsync(void) int processed = 0; instr_time sync_start, sync_end, - sync_diff; + sync_diff; uint64 elapsed; uint64 longest = 0; uint64 total_elapsed = 0; @@ -1094,7 +1094,7 @@ mdsync(void) if (seg != NULL && FileSync(seg->mdfd_vfd) >= 0) { - if (log_checkpoints && (! INSTR_TIME_IS_ZERO(sync_start))) + if (log_checkpoints && (!INSTR_TIME_IS_ZERO(sync_start))) { INSTR_TIME_SET_CURRENT(sync_end); sync_diff = sync_end; @@ -1104,8 +1104,8 @@ mdsync(void) longest = elapsed; total_elapsed += elapsed; processed++; - elog(DEBUG1, "checkpoint sync: number=%d file=%s time=%.3f msec", - processed, FilePathName(seg->mdfd_vfd), (double) elapsed / 1000); + elog(DEBUG1, "checkpoint sync: number=%d file=%s time=%.3f msec", + processed, FilePathName(seg->mdfd_vfd), (double) elapsed / 1000); } break; /* success; break out of retry loop */ @@ -1268,7 +1268,7 @@ register_dirty_segment(SMgrRelation reln, ForkNumber forknum, MdfdVec *seg) return; /* passed it off successfully */ ereport(DEBUG1, - (errmsg("could not forward fsync request because request queue is full"))); + (errmsg("could not forward fsync request because request queue is full"))); if (FileSync(seg->mdfd_vfd) < 0) ereport(ERROR, diff --git a/src/backend/storage/smgr/smgr.c b/src/backend/storage/smgr/smgr.c index 82bf232645..a6610bf4f8 100644 --- a/src/backend/storage/smgr/smgr.c +++ b/src/backend/storage/smgr/smgr.c @@ -48,16 +48,16 @@ typedef struct f_smgr void (*smgr_unlink) (RelFileNodeBackend rnode, ForkNumber forknum, bool isRedo); void (*smgr_extend) (SMgrRelation reln, ForkNumber forknum, - BlockNumber blocknum, char *buffer, bool skipFsync); + BlockNumber blocknum, char *buffer, bool skipFsync); void (*smgr_prefetch) (SMgrRelation reln, ForkNumber forknum, BlockNumber blocknum); void (*smgr_read) (SMgrRelation reln, ForkNumber forknum, BlockNumber blocknum, char *buffer); void (*smgr_write) (SMgrRelation reln, ForkNumber forknum, - BlockNumber blocknum, char *buffer, bool skipFsync); + BlockNumber blocknum, char *buffer, bool skipFsync); BlockNumber (*smgr_nblocks) (SMgrRelation reln, ForkNumber forknum); void (*smgr_truncate) (SMgrRelation reln, ForkNumber forknum, - BlockNumber nblocks); + BlockNumber nblocks); void (*smgr_immedsync) (SMgrRelation reln, ForkNumber forknum); void (*smgr_pre_ckpt) (void); /* may be NULL */ void (*smgr_sync) (void); /* may be NULL */ diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index cc7945aeb6..805514b07b 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -1555,7 +1555,7 @@ exec_bind_message(StringInfo input_message) /* sizeof(ParamListInfoData) includes the first array element */ params = (ParamListInfo) palloc(sizeof(ParamListInfoData) + - (numParams - 1) *sizeof(ParamExternData)); + (numParams - 1) * sizeof(ParamExternData)); /* we have static list of params, so no hooks needed */ params->paramFetch = NULL; params->paramFetchArg = NULL; @@ -2982,17 +2982,16 @@ ia64_get_bsp(void) #ifndef __INTEL_COMPILER /* the ;; is a "stop", seems to be required before fetching BSP */ - __asm__ __volatile__( - ";;\n" - " mov %0=ar.bsp \n" -: "=r"(ret)); + __asm__ __volatile__( + ";;\n" + " mov %0=ar.bsp \n" + : "=r"(ret)); #else - ret = (char *) __getReg(_IA64_REG_AR_BSP); + ret = (char *) __getReg(_IA64_REG_AR_BSP); #endif - return ret; + return ret; } - -#endif /* IA64 */ +#endif /* IA64 */ /* @@ -3035,7 +3034,7 @@ check_stack_depth(void) (errcode(ERRCODE_STATEMENT_TOO_COMPLEX), errmsg("stack depth limit exceeded"), errhint("Increase the configuration parameter \"max_stack_depth\" (currently %dkB), " - "after ensuring the platform's stack depth limit is adequate.", + "after ensuring the platform's stack depth limit is adequate.", max_stack_depth))); } @@ -3057,10 +3056,10 @@ check_stack_depth(void) (errcode(ERRCODE_STATEMENT_TOO_COMPLEX), errmsg("stack depth limit exceeded"), errhint("Increase the configuration parameter \"max_stack_depth\" (currently %dkB), " - "after ensuring the platform's stack depth limit is adequate.", + "after ensuring the platform's stack depth limit is adequate.", max_stack_depth))); } -#endif /* IA64 */ +#endif /* IA64 */ } /* GUC check hook for max_stack_depth */ diff --git a/src/backend/tcop/pquery.c b/src/backend/tcop/pquery.c index 1286edee72..b7649c68fc 100644 --- a/src/backend/tcop/pquery.c +++ b/src/backend/tcop/pquery.c @@ -248,8 +248,8 @@ ChoosePortalStrategy(List *stmts) /* * PORTAL_ONE_SELECT and PORTAL_UTIL_SELECT need only consider the * single-statement case, since there are no rewrite rules that can add - * auxiliary queries to a SELECT or a utility command. - * PORTAL_ONE_MOD_WITH likewise allows only one top-level statement. + * auxiliary queries to a SELECT or a utility command. PORTAL_ONE_MOD_WITH + * likewise allows only one top-level statement. */ if (list_length(stmts) == 1) { @@ -1158,7 +1158,7 @@ PortalRunUtility(Portal portal, Node *utilityStmt, bool isTopLevel, * list. Transaction control, LOCK, and SET must *not* set a snapshot * since they need to be executable at the start of a transaction-snapshot * mode transaction without freezing a snapshot. By extension we allow - * SHOW not to set a snapshot. The other stmts listed are just efficiency + * SHOW not to set a snapshot. The other stmts listed are just efficiency * hacks. Beware of listing anything that can modify the database --- if, * say, it has to update an index with expressions that invoke * user-defined functions, then it had better have a snapshot. diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c index 8e13096246..b1fd5ec04f 100644 --- a/src/backend/tcop/utility.c +++ b/src/backend/tcop/utility.c @@ -562,12 +562,12 @@ standard_ProcessUtility(Node *parsetree, /* * Unless "IF NOT EXISTS" was specified and the - * relation already exists, create the pg_foreign_table - * entry. + * relation already exists, create the + * pg_foreign_table entry. */ if (relOid != InvalidOid) CreateForeignTable((CreateForeignTableStmt *) stmt, - relOid); + relOid); } else { @@ -916,6 +916,7 @@ standard_ProcessUtility(Node *parsetree, break; case T_AlterEnumStmt: /* ALTER TYPE (enum) */ + /* * We disallow this in transaction blocks, because we can't cope * with enum OID values getting into indexes and then having their diff --git a/src/backend/tsearch/spell.c b/src/backend/tsearch/spell.c index d4ddcba631..ecc880f54d 100644 --- a/src/backend/tsearch/spell.c +++ b/src/backend/tsearch/spell.c @@ -74,7 +74,7 @@ NIFinishBuild(IspellDict *Conf) * doesn't need that. The cpalloc and cpalloc0 macros are just documentation * to indicate which allocations actually require zeroing. */ -#define COMPACT_ALLOC_CHUNK 8192 /* must be > aset.c's allocChunkLimit */ +#define COMPACT_ALLOC_CHUNK 8192 /* must be > aset.c's allocChunkLimit */ #define COMPACT_MAX_REQ 1024 /* must be < COMPACT_ALLOC_CHUNK */ static void * diff --git a/src/backend/tsearch/ts_locale.c b/src/backend/tsearch/ts_locale.c index c66f4aa8bf..b8ae0fe65e 100644 --- a/src/backend/tsearch/ts_locale.c +++ b/src/backend/tsearch/ts_locale.c @@ -28,7 +28,7 @@ t_isdigit(const char *ptr) { int clen = pg_mblen(ptr); wchar_t character[2]; - Oid collation = DEFAULT_COLLATION_OID; /*TODO*/ + Oid collation = DEFAULT_COLLATION_OID; /* TODO */ if (clen == 1 || lc_ctype_is_c(collation)) return isdigit(TOUCHAR(ptr)); @@ -43,7 +43,7 @@ t_isspace(const char *ptr) { int clen = pg_mblen(ptr); wchar_t character[2]; - Oid collation = DEFAULT_COLLATION_OID; /*TODO*/ + Oid collation = DEFAULT_COLLATION_OID; /* TODO */ if (clen == 1 || lc_ctype_is_c(collation)) return isspace(TOUCHAR(ptr)); @@ -58,7 +58,7 @@ t_isalpha(const char *ptr) { int clen = pg_mblen(ptr); wchar_t character[2]; - Oid collation = DEFAULT_COLLATION_OID; /*TODO*/ + Oid collation = DEFAULT_COLLATION_OID; /* TODO */ if (clen == 1 || lc_ctype_is_c(collation)) return isalpha(TOUCHAR(ptr)); @@ -73,7 +73,7 @@ t_isprint(const char *ptr) { int clen = pg_mblen(ptr); wchar_t character[2]; - Oid collation = DEFAULT_COLLATION_OID; /*TODO*/ + Oid collation = DEFAULT_COLLATION_OID; /* TODO */ if (clen == 1 || lc_ctype_is_c(collation)) return isprint(TOUCHAR(ptr)); @@ -243,8 +243,9 @@ char * lowerstr_with_len(const char *str, int len) { char *out; + #ifdef USE_WIDE_UPPER_LOWER - Oid collation = DEFAULT_COLLATION_OID; /*TODO*/ + Oid collation = DEFAULT_COLLATION_OID; /* TODO */ #endif if (len == 0) diff --git a/src/backend/tsearch/ts_selfuncs.c b/src/backend/tsearch/ts_selfuncs.c index 7f33c16a24..366fa2ebf4 100644 --- a/src/backend/tsearch/ts_selfuncs.c +++ b/src/backend/tsearch/ts_selfuncs.c @@ -304,9 +304,9 @@ tsquery_opr_selec(QueryItem *item, char *operand, /* * Our strategy is to scan through the MCV list and add up the - * frequencies of the ones that match the prefix, thereby - * assuming that the MCVs are representative of the whole lexeme - * population in this respect. Compare histogram_selectivity(). + * frequencies of the ones that match the prefix, thereby assuming + * that the MCVs are representative of the whole lexeme population + * in this respect. Compare histogram_selectivity(). * * This is only a good plan if we have a pretty fair number of * MCVs available; we set the threshold at 100. If no stats or @@ -401,7 +401,7 @@ tsquery_opr_selec(QueryItem *item, char *operand, default: elog(ERROR, "unrecognized operator: %d", item->qoperator.oper); - selec = 0; /* keep compiler quiet */ + selec = 0; /* keep compiler quiet */ break; } } diff --git a/src/backend/tsearch/wparser_def.c b/src/backend/tsearch/wparser_def.c index 3981a50589..47d777a3e6 100644 --- a/src/backend/tsearch/wparser_def.c +++ b/src/backend/tsearch/wparser_def.c @@ -299,16 +299,16 @@ TParserInit(char *str, int len) */ if (prs->charmaxlen > 1) { - Oid collation = DEFAULT_COLLATION_OID; /*TODO*/ - + Oid collation = DEFAULT_COLLATION_OID; /* TODO */ + prs->usewide = true; - if ( lc_ctype_is_c(collation) ) + if (lc_ctype_is_c(collation)) { /* - * char2wchar doesn't work for C-locale and - * sizeof(pg_wchar) could be not equal to sizeof(wchar_t) + * char2wchar doesn't work for C-locale and sizeof(pg_wchar) could + * be not equal to sizeof(wchar_t) */ - prs->pgwstr = (pg_wchar*) palloc(sizeof(pg_wchar) * (prs->lenstr + 1)); + prs->pgwstr = (pg_wchar *) palloc(sizeof(pg_wchar) * (prs->lenstr + 1)); pg_mb2wchar_with_len(prs->str, prs->pgwstr, prs->lenstr); } else @@ -325,10 +325,11 @@ TParserInit(char *str, int len) prs->state->state = TPS_Base; #ifdef WPARSER_TRACE + /* - * Use of %.*s here is a bit risky since it can misbehave if the data - * is not in what libc thinks is the prevailing encoding. However, - * since this is just a debugging aid, we choose to live with that. + * Use of %.*s here is a bit risky since it can misbehave if the data is + * not in what libc thinks is the prevailing encoding. However, since + * this is just a debugging aid, we choose to live with that. */ fprintf(stderr, "parsing \"%.*s\"\n", len, str); #endif @@ -425,11 +426,11 @@ TParserCopyClose(TParser *prs) /* * Character-type support functions, equivalent to is* macros, but * working with any possible encodings and locales. Notes: - * - with multibyte encoding and C-locale isw* function may fail - * or give wrong result. - * - multibyte encoding and C-locale often are used for - * Asian languages. - * - if locale is C the we use pgwstr instead of wstr + * - with multibyte encoding and C-locale isw* function may fail + * or give wrong result. + * - multibyte encoding and C-locale often are used for + * Asian languages. + * - if locale is C the we use pgwstr instead of wstr */ #ifdef USE_WIDE_UPPER_LOWER @@ -447,7 +448,7 @@ p_is##type(TParser *prs) { \ } \ \ return is##type( *(unsigned char*)( prs->str + prs->state->posbyte ) ); \ -} \ +} \ \ static int \ p_isnot##type(TParser *prs) { \ @@ -719,7 +720,7 @@ p_isignore(TParser *prs) static int p_ishost(TParser *prs) { - TParser *tmpprs = TParserCopyInit(prs); + TParser *tmpprs = TParserCopyInit(prs); int res = 0; tmpprs->wanthost = true; @@ -741,7 +742,7 @@ p_ishost(TParser *prs) static int p_isURLPath(TParser *prs) { - TParser *tmpprs = TParserCopyInit(prs); + TParser *tmpprs = TParserCopyInit(prs); int res = 0; tmpprs->state = newTParserPosition(tmpprs->state); @@ -773,269 +774,269 @@ p_isspecial(TParser *prs) /* * pg_dsplen could return -1 which means error or control character */ - if ( pg_dsplen(prs->str + prs->state->posbyte) == 0 ) + if (pg_dsplen(prs->str + prs->state->posbyte) == 0) return 1; #ifdef USE_WIDE_UPPER_LOWER + /* - * Unicode Characters in the 'Mark, Spacing Combining' Category - * That characters are not alpha although they are not breakers - * of word too. - * Check that only in utf encoding, because other encodings - * aren't supported by postgres or even exists. + * Unicode Characters in the 'Mark, Spacing Combining' Category That + * characters are not alpha although they are not breakers of word too. + * Check that only in utf encoding, because other encodings aren't + * supported by postgres or even exists. */ - if ( GetDatabaseEncoding() == PG_UTF8 && prs->usewide ) + if (GetDatabaseEncoding() == PG_UTF8 && prs->usewide) { - static pg_wchar strange_letter[] = { - /* - * use binary search, so elements - * should be ordered - */ - 0x0903, /* DEVANAGARI SIGN VISARGA */ - 0x093E, /* DEVANAGARI VOWEL SIGN AA */ - 0x093F, /* DEVANAGARI VOWEL SIGN I */ - 0x0940, /* DEVANAGARI VOWEL SIGN II */ - 0x0949, /* DEVANAGARI VOWEL SIGN CANDRA O */ - 0x094A, /* DEVANAGARI VOWEL SIGN SHORT O */ - 0x094B, /* DEVANAGARI VOWEL SIGN O */ - 0x094C, /* DEVANAGARI VOWEL SIGN AU */ - 0x0982, /* BENGALI SIGN ANUSVARA */ - 0x0983, /* BENGALI SIGN VISARGA */ - 0x09BE, /* BENGALI VOWEL SIGN AA */ - 0x09BF, /* BENGALI VOWEL SIGN I */ - 0x09C0, /* BENGALI VOWEL SIGN II */ - 0x09C7, /* BENGALI VOWEL SIGN E */ - 0x09C8, /* BENGALI VOWEL SIGN AI */ - 0x09CB, /* BENGALI VOWEL SIGN O */ - 0x09CC, /* BENGALI VOWEL SIGN AU */ - 0x09D7, /* BENGALI AU LENGTH MARK */ - 0x0A03, /* GURMUKHI SIGN VISARGA */ - 0x0A3E, /* GURMUKHI VOWEL SIGN AA */ - 0x0A3F, /* GURMUKHI VOWEL SIGN I */ - 0x0A40, /* GURMUKHI VOWEL SIGN II */ - 0x0A83, /* GUJARATI SIGN VISARGA */ - 0x0ABE, /* GUJARATI VOWEL SIGN AA */ - 0x0ABF, /* GUJARATI VOWEL SIGN I */ - 0x0AC0, /* GUJARATI VOWEL SIGN II */ - 0x0AC9, /* GUJARATI VOWEL SIGN CANDRA O */ - 0x0ACB, /* GUJARATI VOWEL SIGN O */ - 0x0ACC, /* GUJARATI VOWEL SIGN AU */ - 0x0B02, /* ORIYA SIGN ANUSVARA */ - 0x0B03, /* ORIYA SIGN VISARGA */ - 0x0B3E, /* ORIYA VOWEL SIGN AA */ - 0x0B40, /* ORIYA VOWEL SIGN II */ - 0x0B47, /* ORIYA VOWEL SIGN E */ - 0x0B48, /* ORIYA VOWEL SIGN AI */ - 0x0B4B, /* ORIYA VOWEL SIGN O */ - 0x0B4C, /* ORIYA VOWEL SIGN AU */ - 0x0B57, /* ORIYA AU LENGTH MARK */ - 0x0BBE, /* TAMIL VOWEL SIGN AA */ - 0x0BBF, /* TAMIL VOWEL SIGN I */ - 0x0BC1, /* TAMIL VOWEL SIGN U */ - 0x0BC2, /* TAMIL VOWEL SIGN UU */ - 0x0BC6, /* TAMIL VOWEL SIGN E */ - 0x0BC7, /* TAMIL VOWEL SIGN EE */ - 0x0BC8, /* TAMIL VOWEL SIGN AI */ - 0x0BCA, /* TAMIL VOWEL SIGN O */ - 0x0BCB, /* TAMIL VOWEL SIGN OO */ - 0x0BCC, /* TAMIL VOWEL SIGN AU */ - 0x0BD7, /* TAMIL AU LENGTH MARK */ - 0x0C01, /* TELUGU SIGN CANDRABINDU */ - 0x0C02, /* TELUGU SIGN ANUSVARA */ - 0x0C03, /* TELUGU SIGN VISARGA */ - 0x0C41, /* TELUGU VOWEL SIGN U */ - 0x0C42, /* TELUGU VOWEL SIGN UU */ - 0x0C43, /* TELUGU VOWEL SIGN VOCALIC R */ - 0x0C44, /* TELUGU VOWEL SIGN VOCALIC RR */ - 0x0C82, /* KANNADA SIGN ANUSVARA */ - 0x0C83, /* KANNADA SIGN VISARGA */ - 0x0CBE, /* KANNADA VOWEL SIGN AA */ - 0x0CC0, /* KANNADA VOWEL SIGN II */ - 0x0CC1, /* KANNADA VOWEL SIGN U */ - 0x0CC2, /* KANNADA VOWEL SIGN UU */ - 0x0CC3, /* KANNADA VOWEL SIGN VOCALIC R */ - 0x0CC4, /* KANNADA VOWEL SIGN VOCALIC RR */ - 0x0CC7, /* KANNADA VOWEL SIGN EE */ - 0x0CC8, /* KANNADA VOWEL SIGN AI */ - 0x0CCA, /* KANNADA VOWEL SIGN O */ - 0x0CCB, /* KANNADA VOWEL SIGN OO */ - 0x0CD5, /* KANNADA LENGTH MARK */ - 0x0CD6, /* KANNADA AI LENGTH MARK */ - 0x0D02, /* MALAYALAM SIGN ANUSVARA */ - 0x0D03, /* MALAYALAM SIGN VISARGA */ - 0x0D3E, /* MALAYALAM VOWEL SIGN AA */ - 0x0D3F, /* MALAYALAM VOWEL SIGN I */ - 0x0D40, /* MALAYALAM VOWEL SIGN II */ - 0x0D46, /* MALAYALAM VOWEL SIGN E */ - 0x0D47, /* MALAYALAM VOWEL SIGN EE */ - 0x0D48, /* MALAYALAM VOWEL SIGN AI */ - 0x0D4A, /* MALAYALAM VOWEL SIGN O */ - 0x0D4B, /* MALAYALAM VOWEL SIGN OO */ - 0x0D4C, /* MALAYALAM VOWEL SIGN AU */ - 0x0D57, /* MALAYALAM AU LENGTH MARK */ - 0x0D82, /* SINHALA SIGN ANUSVARAYA */ - 0x0D83, /* SINHALA SIGN VISARGAYA */ - 0x0DCF, /* SINHALA VOWEL SIGN AELA-PILLA */ - 0x0DD0, /* SINHALA VOWEL SIGN KETTI AEDA-PILLA */ - 0x0DD1, /* SINHALA VOWEL SIGN DIGA AEDA-PILLA */ - 0x0DD8, /* SINHALA VOWEL SIGN GAETTA-PILLA */ - 0x0DD9, /* SINHALA VOWEL SIGN KOMBUVA */ - 0x0DDA, /* SINHALA VOWEL SIGN DIGA KOMBUVA */ - 0x0DDB, /* SINHALA VOWEL SIGN KOMBU DEKA */ - 0x0DDC, /* SINHALA VOWEL SIGN KOMBUVA HAA AELA-PILLA */ - 0x0DDD, /* SINHALA VOWEL SIGN KOMBUVA HAA DIGA AELA-PILLA */ - 0x0DDE, /* SINHALA VOWEL SIGN KOMBUVA HAA GAYANUKITTA */ - 0x0DDF, /* SINHALA VOWEL SIGN GAYANUKITTA */ - 0x0DF2, /* SINHALA VOWEL SIGN DIGA GAETTA-PILLA */ - 0x0DF3, /* SINHALA VOWEL SIGN DIGA GAYANUKITTA */ - 0x0F3E, /* TIBETAN SIGN YAR TSHES */ - 0x0F3F, /* TIBETAN SIGN MAR TSHES */ - 0x0F7F, /* TIBETAN SIGN RNAM BCAD */ - 0x102B, /* MYANMAR VOWEL SIGN TALL AA */ - 0x102C, /* MYANMAR VOWEL SIGN AA */ - 0x1031, /* MYANMAR VOWEL SIGN E */ - 0x1038, /* MYANMAR SIGN VISARGA */ - 0x103B, /* MYANMAR CONSONANT SIGN MEDIAL YA */ - 0x103C, /* MYANMAR CONSONANT SIGN MEDIAL RA */ - 0x1056, /* MYANMAR VOWEL SIGN VOCALIC R */ - 0x1057, /* MYANMAR VOWEL SIGN VOCALIC RR */ - 0x1062, /* MYANMAR VOWEL SIGN SGAW KAREN EU */ - 0x1063, /* MYANMAR TONE MARK SGAW KAREN HATHI */ - 0x1064, /* MYANMAR TONE MARK SGAW KAREN KE PHO */ - 0x1067, /* MYANMAR VOWEL SIGN WESTERN PWO KAREN EU */ - 0x1068, /* MYANMAR VOWEL SIGN WESTERN PWO KAREN UE */ - 0x1069, /* MYANMAR SIGN WESTERN PWO KAREN TONE-1 */ - 0x106A, /* MYANMAR SIGN WESTERN PWO KAREN TONE-2 */ - 0x106B, /* MYANMAR SIGN WESTERN PWO KAREN TONE-3 */ - 0x106C, /* MYANMAR SIGN WESTERN PWO KAREN TONE-4 */ - 0x106D, /* MYANMAR SIGN WESTERN PWO KAREN TONE-5 */ - 0x1083, /* MYANMAR VOWEL SIGN SHAN AA */ - 0x1084, /* MYANMAR VOWEL SIGN SHAN E */ - 0x1087, /* MYANMAR SIGN SHAN TONE-2 */ - 0x1088, /* MYANMAR SIGN SHAN TONE-3 */ - 0x1089, /* MYANMAR SIGN SHAN TONE-5 */ - 0x108A, /* MYANMAR SIGN SHAN TONE-6 */ - 0x108B, /* MYANMAR SIGN SHAN COUNCIL TONE-2 */ - 0x108C, /* MYANMAR SIGN SHAN COUNCIL TONE-3 */ - 0x108F, /* MYANMAR SIGN RUMAI PALAUNG TONE-5 */ - 0x17B6, /* KHMER VOWEL SIGN AA */ - 0x17BE, /* KHMER VOWEL SIGN OE */ - 0x17BF, /* KHMER VOWEL SIGN YA */ - 0x17C0, /* KHMER VOWEL SIGN IE */ - 0x17C1, /* KHMER VOWEL SIGN E */ - 0x17C2, /* KHMER VOWEL SIGN AE */ - 0x17C3, /* KHMER VOWEL SIGN AI */ - 0x17C4, /* KHMER VOWEL SIGN OO */ - 0x17C5, /* KHMER VOWEL SIGN AU */ - 0x17C7, /* KHMER SIGN REAHMUK */ - 0x17C8, /* KHMER SIGN YUUKALEAPINTU */ - 0x1923, /* LIMBU VOWEL SIGN EE */ - 0x1924, /* LIMBU VOWEL SIGN AI */ - 0x1925, /* LIMBU VOWEL SIGN OO */ - 0x1926, /* LIMBU VOWEL SIGN AU */ - 0x1929, /* LIMBU SUBJOINED LETTER YA */ - 0x192A, /* LIMBU SUBJOINED LETTER RA */ - 0x192B, /* LIMBU SUBJOINED LETTER WA */ - 0x1930, /* LIMBU SMALL LETTER KA */ - 0x1931, /* LIMBU SMALL LETTER NGA */ - 0x1933, /* LIMBU SMALL LETTER TA */ - 0x1934, /* LIMBU SMALL LETTER NA */ - 0x1935, /* LIMBU SMALL LETTER PA */ - 0x1936, /* LIMBU SMALL LETTER MA */ - 0x1937, /* LIMBU SMALL LETTER RA */ - 0x1938, /* LIMBU SMALL LETTER LA */ - 0x19B0, /* NEW TAI LUE VOWEL SIGN VOWEL SHORTENER */ - 0x19B1, /* NEW TAI LUE VOWEL SIGN AA */ - 0x19B2, /* NEW TAI LUE VOWEL SIGN II */ - 0x19B3, /* NEW TAI LUE VOWEL SIGN U */ - 0x19B4, /* NEW TAI LUE VOWEL SIGN UU */ - 0x19B5, /* NEW TAI LUE VOWEL SIGN E */ - 0x19B6, /* NEW TAI LUE VOWEL SIGN AE */ - 0x19B7, /* NEW TAI LUE VOWEL SIGN O */ - 0x19B8, /* NEW TAI LUE VOWEL SIGN OA */ - 0x19B9, /* NEW TAI LUE VOWEL SIGN UE */ - 0x19BA, /* NEW TAI LUE VOWEL SIGN AY */ - 0x19BB, /* NEW TAI LUE VOWEL SIGN AAY */ - 0x19BC, /* NEW TAI LUE VOWEL SIGN UY */ - 0x19BD, /* NEW TAI LUE VOWEL SIGN OY */ - 0x19BE, /* NEW TAI LUE VOWEL SIGN OAY */ - 0x19BF, /* NEW TAI LUE VOWEL SIGN UEY */ - 0x19C0, /* NEW TAI LUE VOWEL SIGN IY */ - 0x19C8, /* NEW TAI LUE TONE MARK-1 */ - 0x19C9, /* NEW TAI LUE TONE MARK-2 */ - 0x1A19, /* BUGINESE VOWEL SIGN E */ - 0x1A1A, /* BUGINESE VOWEL SIGN O */ - 0x1A1B, /* BUGINESE VOWEL SIGN AE */ - 0x1B04, /* BALINESE SIGN BISAH */ - 0x1B35, /* BALINESE VOWEL SIGN TEDUNG */ - 0x1B3B, /* BALINESE VOWEL SIGN RA REPA TEDUNG */ - 0x1B3D, /* BALINESE VOWEL SIGN LA LENGA TEDUNG */ - 0x1B3E, /* BALINESE VOWEL SIGN TALING */ - 0x1B3F, /* BALINESE VOWEL SIGN TALING REPA */ - 0x1B40, /* BALINESE VOWEL SIGN TALING TEDUNG */ - 0x1B41, /* BALINESE VOWEL SIGN TALING REPA TEDUNG */ - 0x1B43, /* BALINESE VOWEL SIGN PEPET TEDUNG */ - 0x1B44, /* BALINESE ADEG ADEG */ - 0x1B82, /* SUNDANESE SIGN PANGWISAD */ - 0x1BA1, /* SUNDANESE CONSONANT SIGN PAMINGKAL */ - 0x1BA6, /* SUNDANESE VOWEL SIGN PANAELAENG */ - 0x1BA7, /* SUNDANESE VOWEL SIGN PANOLONG */ - 0x1BAA, /* SUNDANESE SIGN PAMAAEH */ - 0x1C24, /* LEPCHA SUBJOINED LETTER YA */ - 0x1C25, /* LEPCHA SUBJOINED LETTER RA */ - 0x1C26, /* LEPCHA VOWEL SIGN AA */ - 0x1C27, /* LEPCHA VOWEL SIGN I */ - 0x1C28, /* LEPCHA VOWEL SIGN O */ - 0x1C29, /* LEPCHA VOWEL SIGN OO */ - 0x1C2A, /* LEPCHA VOWEL SIGN U */ - 0x1C2B, /* LEPCHA VOWEL SIGN UU */ - 0x1C34, /* LEPCHA CONSONANT SIGN NYIN-DO */ - 0x1C35, /* LEPCHA CONSONANT SIGN KANG */ - 0xA823, /* SYLOTI NAGRI VOWEL SIGN A */ - 0xA824, /* SYLOTI NAGRI VOWEL SIGN I */ - 0xA827, /* SYLOTI NAGRI VOWEL SIGN OO */ - 0xA880, /* SAURASHTRA SIGN ANUSVARA */ - 0xA881, /* SAURASHTRA SIGN VISARGA */ - 0xA8B4, /* SAURASHTRA CONSONANT SIGN HAARU */ - 0xA8B5, /* SAURASHTRA VOWEL SIGN AA */ - 0xA8B6, /* SAURASHTRA VOWEL SIGN I */ - 0xA8B7, /* SAURASHTRA VOWEL SIGN II */ - 0xA8B8, /* SAURASHTRA VOWEL SIGN U */ - 0xA8B9, /* SAURASHTRA VOWEL SIGN UU */ - 0xA8BA, /* SAURASHTRA VOWEL SIGN VOCALIC R */ - 0xA8BB, /* SAURASHTRA VOWEL SIGN VOCALIC RR */ - 0xA8BC, /* SAURASHTRA VOWEL SIGN VOCALIC L */ - 0xA8BD, /* SAURASHTRA VOWEL SIGN VOCALIC LL */ - 0xA8BE, /* SAURASHTRA VOWEL SIGN E */ - 0xA8BF, /* SAURASHTRA VOWEL SIGN EE */ - 0xA8C0, /* SAURASHTRA VOWEL SIGN AI */ - 0xA8C1, /* SAURASHTRA VOWEL SIGN O */ - 0xA8C2, /* SAURASHTRA VOWEL SIGN OO */ - 0xA8C3, /* SAURASHTRA VOWEL SIGN AU */ - 0xA952, /* REJANG CONSONANT SIGN H */ - 0xA953, /* REJANG VIRAMA */ - 0xAA2F, /* CHAM VOWEL SIGN O */ - 0xAA30, /* CHAM VOWEL SIGN AI */ - 0xAA33, /* CHAM CONSONANT SIGN YA */ - 0xAA34, /* CHAM CONSONANT SIGN RA */ - 0xAA4D /* CHAM CONSONANT SIGN FINAL H */ - }; - pg_wchar *StopLow = strange_letter, - *StopHigh = strange_letter + lengthof(strange_letter), - *StopMiddle; + static pg_wchar strange_letter[] = { + /* + * use binary search, so elements should be ordered + */ + 0x0903, /* DEVANAGARI SIGN VISARGA */ + 0x093E, /* DEVANAGARI VOWEL SIGN AA */ + 0x093F, /* DEVANAGARI VOWEL SIGN I */ + 0x0940, /* DEVANAGARI VOWEL SIGN II */ + 0x0949, /* DEVANAGARI VOWEL SIGN CANDRA O */ + 0x094A, /* DEVANAGARI VOWEL SIGN SHORT O */ + 0x094B, /* DEVANAGARI VOWEL SIGN O */ + 0x094C, /* DEVANAGARI VOWEL SIGN AU */ + 0x0982, /* BENGALI SIGN ANUSVARA */ + 0x0983, /* BENGALI SIGN VISARGA */ + 0x09BE, /* BENGALI VOWEL SIGN AA */ + 0x09BF, /* BENGALI VOWEL SIGN I */ + 0x09C0, /* BENGALI VOWEL SIGN II */ + 0x09C7, /* BENGALI VOWEL SIGN E */ + 0x09C8, /* BENGALI VOWEL SIGN AI */ + 0x09CB, /* BENGALI VOWEL SIGN O */ + 0x09CC, /* BENGALI VOWEL SIGN AU */ + 0x09D7, /* BENGALI AU LENGTH MARK */ + 0x0A03, /* GURMUKHI SIGN VISARGA */ + 0x0A3E, /* GURMUKHI VOWEL SIGN AA */ + 0x0A3F, /* GURMUKHI VOWEL SIGN I */ + 0x0A40, /* GURMUKHI VOWEL SIGN II */ + 0x0A83, /* GUJARATI SIGN VISARGA */ + 0x0ABE, /* GUJARATI VOWEL SIGN AA */ + 0x0ABF, /* GUJARATI VOWEL SIGN I */ + 0x0AC0, /* GUJARATI VOWEL SIGN II */ + 0x0AC9, /* GUJARATI VOWEL SIGN CANDRA O */ + 0x0ACB, /* GUJARATI VOWEL SIGN O */ + 0x0ACC, /* GUJARATI VOWEL SIGN AU */ + 0x0B02, /* ORIYA SIGN ANUSVARA */ + 0x0B03, /* ORIYA SIGN VISARGA */ + 0x0B3E, /* ORIYA VOWEL SIGN AA */ + 0x0B40, /* ORIYA VOWEL SIGN II */ + 0x0B47, /* ORIYA VOWEL SIGN E */ + 0x0B48, /* ORIYA VOWEL SIGN AI */ + 0x0B4B, /* ORIYA VOWEL SIGN O */ + 0x0B4C, /* ORIYA VOWEL SIGN AU */ + 0x0B57, /* ORIYA AU LENGTH MARK */ + 0x0BBE, /* TAMIL VOWEL SIGN AA */ + 0x0BBF, /* TAMIL VOWEL SIGN I */ + 0x0BC1, /* TAMIL VOWEL SIGN U */ + 0x0BC2, /* TAMIL VOWEL SIGN UU */ + 0x0BC6, /* TAMIL VOWEL SIGN E */ + 0x0BC7, /* TAMIL VOWEL SIGN EE */ + 0x0BC8, /* TAMIL VOWEL SIGN AI */ + 0x0BCA, /* TAMIL VOWEL SIGN O */ + 0x0BCB, /* TAMIL VOWEL SIGN OO */ + 0x0BCC, /* TAMIL VOWEL SIGN AU */ + 0x0BD7, /* TAMIL AU LENGTH MARK */ + 0x0C01, /* TELUGU SIGN CANDRABINDU */ + 0x0C02, /* TELUGU SIGN ANUSVARA */ + 0x0C03, /* TELUGU SIGN VISARGA */ + 0x0C41, /* TELUGU VOWEL SIGN U */ + 0x0C42, /* TELUGU VOWEL SIGN UU */ + 0x0C43, /* TELUGU VOWEL SIGN VOCALIC R */ + 0x0C44, /* TELUGU VOWEL SIGN VOCALIC RR */ + 0x0C82, /* KANNADA SIGN ANUSVARA */ + 0x0C83, /* KANNADA SIGN VISARGA */ + 0x0CBE, /* KANNADA VOWEL SIGN AA */ + 0x0CC0, /* KANNADA VOWEL SIGN II */ + 0x0CC1, /* KANNADA VOWEL SIGN U */ + 0x0CC2, /* KANNADA VOWEL SIGN UU */ + 0x0CC3, /* KANNADA VOWEL SIGN VOCALIC R */ + 0x0CC4, /* KANNADA VOWEL SIGN VOCALIC RR */ + 0x0CC7, /* KANNADA VOWEL SIGN EE */ + 0x0CC8, /* KANNADA VOWEL SIGN AI */ + 0x0CCA, /* KANNADA VOWEL SIGN O */ + 0x0CCB, /* KANNADA VOWEL SIGN OO */ + 0x0CD5, /* KANNADA LENGTH MARK */ + 0x0CD6, /* KANNADA AI LENGTH MARK */ + 0x0D02, /* MALAYALAM SIGN ANUSVARA */ + 0x0D03, /* MALAYALAM SIGN VISARGA */ + 0x0D3E, /* MALAYALAM VOWEL SIGN AA */ + 0x0D3F, /* MALAYALAM VOWEL SIGN I */ + 0x0D40, /* MALAYALAM VOWEL SIGN II */ + 0x0D46, /* MALAYALAM VOWEL SIGN E */ + 0x0D47, /* MALAYALAM VOWEL SIGN EE */ + 0x0D48, /* MALAYALAM VOWEL SIGN AI */ + 0x0D4A, /* MALAYALAM VOWEL SIGN O */ + 0x0D4B, /* MALAYALAM VOWEL SIGN OO */ + 0x0D4C, /* MALAYALAM VOWEL SIGN AU */ + 0x0D57, /* MALAYALAM AU LENGTH MARK */ + 0x0D82, /* SINHALA SIGN ANUSVARAYA */ + 0x0D83, /* SINHALA SIGN VISARGAYA */ + 0x0DCF, /* SINHALA VOWEL SIGN AELA-PILLA */ + 0x0DD0, /* SINHALA VOWEL SIGN KETTI AEDA-PILLA */ + 0x0DD1, /* SINHALA VOWEL SIGN DIGA AEDA-PILLA */ + 0x0DD8, /* SINHALA VOWEL SIGN GAETTA-PILLA */ + 0x0DD9, /* SINHALA VOWEL SIGN KOMBUVA */ + 0x0DDA, /* SINHALA VOWEL SIGN DIGA KOMBUVA */ + 0x0DDB, /* SINHALA VOWEL SIGN KOMBU DEKA */ + 0x0DDC, /* SINHALA VOWEL SIGN KOMBUVA HAA AELA-PILLA */ + 0x0DDD, /* SINHALA VOWEL SIGN KOMBUVA HAA DIGA + * AELA-PILLA */ + 0x0DDE, /* SINHALA VOWEL SIGN KOMBUVA HAA GAYANUKITTA */ + 0x0DDF, /* SINHALA VOWEL SIGN GAYANUKITTA */ + 0x0DF2, /* SINHALA VOWEL SIGN DIGA GAETTA-PILLA */ + 0x0DF3, /* SINHALA VOWEL SIGN DIGA GAYANUKITTA */ + 0x0F3E, /* TIBETAN SIGN YAR TSHES */ + 0x0F3F, /* TIBETAN SIGN MAR TSHES */ + 0x0F7F, /* TIBETAN SIGN RNAM BCAD */ + 0x102B, /* MYANMAR VOWEL SIGN TALL AA */ + 0x102C, /* MYANMAR VOWEL SIGN AA */ + 0x1031, /* MYANMAR VOWEL SIGN E */ + 0x1038, /* MYANMAR SIGN VISARGA */ + 0x103B, /* MYANMAR CONSONANT SIGN MEDIAL YA */ + 0x103C, /* MYANMAR CONSONANT SIGN MEDIAL RA */ + 0x1056, /* MYANMAR VOWEL SIGN VOCALIC R */ + 0x1057, /* MYANMAR VOWEL SIGN VOCALIC RR */ + 0x1062, /* MYANMAR VOWEL SIGN SGAW KAREN EU */ + 0x1063, /* MYANMAR TONE MARK SGAW KAREN HATHI */ + 0x1064, /* MYANMAR TONE MARK SGAW KAREN KE PHO */ + 0x1067, /* MYANMAR VOWEL SIGN WESTERN PWO KAREN EU */ + 0x1068, /* MYANMAR VOWEL SIGN WESTERN PWO KAREN UE */ + 0x1069, /* MYANMAR SIGN WESTERN PWO KAREN TONE-1 */ + 0x106A, /* MYANMAR SIGN WESTERN PWO KAREN TONE-2 */ + 0x106B, /* MYANMAR SIGN WESTERN PWO KAREN TONE-3 */ + 0x106C, /* MYANMAR SIGN WESTERN PWO KAREN TONE-4 */ + 0x106D, /* MYANMAR SIGN WESTERN PWO KAREN TONE-5 */ + 0x1083, /* MYANMAR VOWEL SIGN SHAN AA */ + 0x1084, /* MYANMAR VOWEL SIGN SHAN E */ + 0x1087, /* MYANMAR SIGN SHAN TONE-2 */ + 0x1088, /* MYANMAR SIGN SHAN TONE-3 */ + 0x1089, /* MYANMAR SIGN SHAN TONE-5 */ + 0x108A, /* MYANMAR SIGN SHAN TONE-6 */ + 0x108B, /* MYANMAR SIGN SHAN COUNCIL TONE-2 */ + 0x108C, /* MYANMAR SIGN SHAN COUNCIL TONE-3 */ + 0x108F, /* MYANMAR SIGN RUMAI PALAUNG TONE-5 */ + 0x17B6, /* KHMER VOWEL SIGN AA */ + 0x17BE, /* KHMER VOWEL SIGN OE */ + 0x17BF, /* KHMER VOWEL SIGN YA */ + 0x17C0, /* KHMER VOWEL SIGN IE */ + 0x17C1, /* KHMER VOWEL SIGN E */ + 0x17C2, /* KHMER VOWEL SIGN AE */ + 0x17C3, /* KHMER VOWEL SIGN AI */ + 0x17C4, /* KHMER VOWEL SIGN OO */ + 0x17C5, /* KHMER VOWEL SIGN AU */ + 0x17C7, /* KHMER SIGN REAHMUK */ + 0x17C8, /* KHMER SIGN YUUKALEAPINTU */ + 0x1923, /* LIMBU VOWEL SIGN EE */ + 0x1924, /* LIMBU VOWEL SIGN AI */ + 0x1925, /* LIMBU VOWEL SIGN OO */ + 0x1926, /* LIMBU VOWEL SIGN AU */ + 0x1929, /* LIMBU SUBJOINED LETTER YA */ + 0x192A, /* LIMBU SUBJOINED LETTER RA */ + 0x192B, /* LIMBU SUBJOINED LETTER WA */ + 0x1930, /* LIMBU SMALL LETTER KA */ + 0x1931, /* LIMBU SMALL LETTER NGA */ + 0x1933, /* LIMBU SMALL LETTER TA */ + 0x1934, /* LIMBU SMALL LETTER NA */ + 0x1935, /* LIMBU SMALL LETTER PA */ + 0x1936, /* LIMBU SMALL LETTER MA */ + 0x1937, /* LIMBU SMALL LETTER RA */ + 0x1938, /* LIMBU SMALL LETTER LA */ + 0x19B0, /* NEW TAI LUE VOWEL SIGN VOWEL SHORTENER */ + 0x19B1, /* NEW TAI LUE VOWEL SIGN AA */ + 0x19B2, /* NEW TAI LUE VOWEL SIGN II */ + 0x19B3, /* NEW TAI LUE VOWEL SIGN U */ + 0x19B4, /* NEW TAI LUE VOWEL SIGN UU */ + 0x19B5, /* NEW TAI LUE VOWEL SIGN E */ + 0x19B6, /* NEW TAI LUE VOWEL SIGN AE */ + 0x19B7, /* NEW TAI LUE VOWEL SIGN O */ + 0x19B8, /* NEW TAI LUE VOWEL SIGN OA */ + 0x19B9, /* NEW TAI LUE VOWEL SIGN UE */ + 0x19BA, /* NEW TAI LUE VOWEL SIGN AY */ + 0x19BB, /* NEW TAI LUE VOWEL SIGN AAY */ + 0x19BC, /* NEW TAI LUE VOWEL SIGN UY */ + 0x19BD, /* NEW TAI LUE VOWEL SIGN OY */ + 0x19BE, /* NEW TAI LUE VOWEL SIGN OAY */ + 0x19BF, /* NEW TAI LUE VOWEL SIGN UEY */ + 0x19C0, /* NEW TAI LUE VOWEL SIGN IY */ + 0x19C8, /* NEW TAI LUE TONE MARK-1 */ + 0x19C9, /* NEW TAI LUE TONE MARK-2 */ + 0x1A19, /* BUGINESE VOWEL SIGN E */ + 0x1A1A, /* BUGINESE VOWEL SIGN O */ + 0x1A1B, /* BUGINESE VOWEL SIGN AE */ + 0x1B04, /* BALINESE SIGN BISAH */ + 0x1B35, /* BALINESE VOWEL SIGN TEDUNG */ + 0x1B3B, /* BALINESE VOWEL SIGN RA REPA TEDUNG */ + 0x1B3D, /* BALINESE VOWEL SIGN LA LENGA TEDUNG */ + 0x1B3E, /* BALINESE VOWEL SIGN TALING */ + 0x1B3F, /* BALINESE VOWEL SIGN TALING REPA */ + 0x1B40, /* BALINESE VOWEL SIGN TALING TEDUNG */ + 0x1B41, /* BALINESE VOWEL SIGN TALING REPA TEDUNG */ + 0x1B43, /* BALINESE VOWEL SIGN PEPET TEDUNG */ + 0x1B44, /* BALINESE ADEG ADEG */ + 0x1B82, /* SUNDANESE SIGN PANGWISAD */ + 0x1BA1, /* SUNDANESE CONSONANT SIGN PAMINGKAL */ + 0x1BA6, /* SUNDANESE VOWEL SIGN PANAELAENG */ + 0x1BA7, /* SUNDANESE VOWEL SIGN PANOLONG */ + 0x1BAA, /* SUNDANESE SIGN PAMAAEH */ + 0x1C24, /* LEPCHA SUBJOINED LETTER YA */ + 0x1C25, /* LEPCHA SUBJOINED LETTER RA */ + 0x1C26, /* LEPCHA VOWEL SIGN AA */ + 0x1C27, /* LEPCHA VOWEL SIGN I */ + 0x1C28, /* LEPCHA VOWEL SIGN O */ + 0x1C29, /* LEPCHA VOWEL SIGN OO */ + 0x1C2A, /* LEPCHA VOWEL SIGN U */ + 0x1C2B, /* LEPCHA VOWEL SIGN UU */ + 0x1C34, /* LEPCHA CONSONANT SIGN NYIN-DO */ + 0x1C35, /* LEPCHA CONSONANT SIGN KANG */ + 0xA823, /* SYLOTI NAGRI VOWEL SIGN A */ + 0xA824, /* SYLOTI NAGRI VOWEL SIGN I */ + 0xA827, /* SYLOTI NAGRI VOWEL SIGN OO */ + 0xA880, /* SAURASHTRA SIGN ANUSVARA */ + 0xA881, /* SAURASHTRA SIGN VISARGA */ + 0xA8B4, /* SAURASHTRA CONSONANT SIGN HAARU */ + 0xA8B5, /* SAURASHTRA VOWEL SIGN AA */ + 0xA8B6, /* SAURASHTRA VOWEL SIGN I */ + 0xA8B7, /* SAURASHTRA VOWEL SIGN II */ + 0xA8B8, /* SAURASHTRA VOWEL SIGN U */ + 0xA8B9, /* SAURASHTRA VOWEL SIGN UU */ + 0xA8BA, /* SAURASHTRA VOWEL SIGN VOCALIC R */ + 0xA8BB, /* SAURASHTRA VOWEL SIGN VOCALIC RR */ + 0xA8BC, /* SAURASHTRA VOWEL SIGN VOCALIC L */ + 0xA8BD, /* SAURASHTRA VOWEL SIGN VOCALIC LL */ + 0xA8BE, /* SAURASHTRA VOWEL SIGN E */ + 0xA8BF, /* SAURASHTRA VOWEL SIGN EE */ + 0xA8C0, /* SAURASHTRA VOWEL SIGN AI */ + 0xA8C1, /* SAURASHTRA VOWEL SIGN O */ + 0xA8C2, /* SAURASHTRA VOWEL SIGN OO */ + 0xA8C3, /* SAURASHTRA VOWEL SIGN AU */ + 0xA952, /* REJANG CONSONANT SIGN H */ + 0xA953, /* REJANG VIRAMA */ + 0xAA2F, /* CHAM VOWEL SIGN O */ + 0xAA30, /* CHAM VOWEL SIGN AI */ + 0xAA33, /* CHAM CONSONANT SIGN YA */ + 0xAA34, /* CHAM CONSONANT SIGN RA */ + 0xAA4D /* CHAM CONSONANT SIGN FINAL H */ + }; + pg_wchar *StopLow = strange_letter, + *StopHigh = strange_letter + lengthof(strange_letter), + *StopMiddle; pg_wchar c; - if ( prs->pgwstr ) + if (prs->pgwstr) c = *(prs->pgwstr + prs->state->poschar); else c = (pg_wchar) *(prs->wstr + prs->state->poschar); - while( StopLow < StopHigh ) + while (StopLow < StopHigh) { StopMiddle = StopLow + ((StopHigh - StopLow) >> 1); - if ( *StopMiddle == c ) + if (*StopMiddle == c) return 1; - else if ( *StopMiddle < c ) + else if (*StopMiddle < c) StopLow = StopMiddle + 1; else StopHigh = StopMiddle; @@ -1288,7 +1289,7 @@ static const TParserStateActionItem actionTPS_InTagFirst[] = { static const TParserStateActionItem actionTPS_InXMLBegin[] = { {p_isEOF, 0, A_POP, TPS_Null, 0, NULL}, /* words[i].type)) prs->words[i].replace = 1; - else if ( HLIDSKIP(prs->words[i].type) ) + else if (HLIDSKIP(prs->words[i].type)) prs->words[i].skip = 1; } else @@ -2130,27 +2131,29 @@ mark_fragment(HeadlineParsedText *prs, int highlight, int startpos, int endpos) typedef struct { - int4 startpos; - int4 endpos; - int4 poslen; - int4 curlen; - int2 in; - int2 excluded; + int4 startpos; + int4 endpos; + int4 poslen; + int4 curlen; + int2 in; + int2 excluded; } CoverPos; static void get_next_fragment(HeadlineParsedText *prs, int *startpos, int *endpos, - int *curlen, int *poslen, int max_words) + int *curlen, int *poslen, int max_words) { - int i; - /* Objective: Generate a fragment of words between startpos and endpos - * such that it has at most max_words and both ends has query words. - * If the startpos and endpos are the endpoints of the cover and the - * cover has fewer words than max_words, then this function should - * just return the cover + int i; + + /* + * Objective: Generate a fragment of words between startpos and endpos + * such that it has at most max_words and both ends has query words. If + * the startpos and endpos are the endpoints of the cover and the cover + * has fewer words than max_words, then this function should just return + * the cover */ /* first move startpos to an item */ - for(i = *startpos; i <= *endpos; i++) + for (i = *startpos; i <= *endpos; i++) { *startpos = i; if (prs->words[i].item && !prs->words[i].repeated) @@ -2159,7 +2162,7 @@ get_next_fragment(HeadlineParsedText *prs, int *startpos, int *endpos, /* cut endpos to have only max_words */ *curlen = 0; *poslen = 0; - for(i = *startpos; i <= *endpos && *curlen < max_words; i++) + for (i = *startpos; i <= *endpos && *curlen < max_words; i++) { if (!NONWORDTOKEN(prs->words[i].type)) *curlen += 1; @@ -2170,7 +2173,7 @@ get_next_fragment(HeadlineParsedText *prs, int *startpos, int *endpos, if (*endpos > i) { *endpos = i; - for(i = *endpos; i >= *startpos; i --) + for (i = *endpos; i >= *startpos; i--) { *endpos = i; if (prs->words[i].item && !prs->words[i].repeated) @@ -2183,22 +2186,30 @@ get_next_fragment(HeadlineParsedText *prs, int *startpos, int *endpos, static void mark_hl_fragments(HeadlineParsedText *prs, TSQuery query, int highlight, - int shortword, int min_words, - int max_words, int max_fragments) + int shortword, int min_words, + int max_words, int max_fragments) { - int4 poslen, curlen, i, f, num_f = 0; - int4 stretch, maxstretch, posmarker; - - int4 startpos = 0, - endpos = 0, - p = 0, - q = 0; + int4 poslen, + curlen, + i, + f, + num_f = 0; + int4 stretch, + maxstretch, + posmarker; + + int4 startpos = 0, + endpos = 0, + p = 0, + q = 0; int4 numcovers = 0, - maxcovers = 32; + maxcovers = 32; - int4 minI, minwords, maxitems; - CoverPos *covers; + int4 minI, + minwords, + maxitems; + CoverPos *covers; covers = palloc(maxcovers * sizeof(CoverPos)); @@ -2206,12 +2217,13 @@ mark_hl_fragments(HeadlineParsedText *prs, TSQuery query, int highlight, while (hlCover(prs, query, &p, &q)) { startpos = p; - endpos = q; + endpos = q; - /* Break the cover into smaller fragments such that each fragment - * has at most max_words. Also ensure that each end of the fragment - * is a query word. This will allow us to stretch the fragment in - * either direction + /* + * Break the cover into smaller fragments such that each fragment has + * at most max_words. Also ensure that each end of the fragment is a + * query word. This will allow us to stretch the fragment in either + * direction */ while (startpos <= endpos) @@ -2220,17 +2232,17 @@ mark_hl_fragments(HeadlineParsedText *prs, TSQuery query, int highlight, if (numcovers >= maxcovers) { maxcovers *= 2; - covers = repalloc(covers, sizeof(CoverPos) * maxcovers); + covers = repalloc(covers, sizeof(CoverPos) * maxcovers); } covers[numcovers].startpos = startpos; - covers[numcovers].endpos = endpos; - covers[numcovers].curlen = curlen; - covers[numcovers].poslen = poslen; - covers[numcovers].in = 0; + covers[numcovers].endpos = endpos; + covers[numcovers].curlen = curlen; + covers[numcovers].poslen = poslen; + covers[numcovers].in = 0; covers[numcovers].excluded = 0; - numcovers ++; + numcovers++; startpos = endpos + 1; - endpos = q; + endpos = q; } /* move p to generate the next cover */ p++; @@ -2242,19 +2254,20 @@ mark_hl_fragments(HeadlineParsedText *prs, TSQuery query, int highlight, maxitems = 0; minwords = 0x7fffffff; minI = -1; - /* Choose the cover that contains max items. - * In case of tie choose the one with smaller - * number of words. + + /* + * Choose the cover that contains max items. In case of tie choose the + * one with smaller number of words. */ - for (i = 0; i < numcovers; i ++) + for (i = 0; i < numcovers; i++) { - if (!covers[i].in && !covers[i].excluded && + if (!covers[i].in && !covers[i].excluded && (maxitems < covers[i].poslen || (maxitems == covers[i].poslen - && minwords > covers[i].curlen))) + && minwords > covers[i].curlen))) { maxitems = covers[i].poslen; minwords = covers[i].curlen; - minI = i; + minI = i; } } /* if a cover was found mark it */ @@ -2263,27 +2276,27 @@ mark_hl_fragments(HeadlineParsedText *prs, TSQuery query, int highlight, covers[minI].in = 1; /* adjust the size of cover */ startpos = covers[minI].startpos; - endpos = covers[minI].endpos; - curlen = covers[minI].curlen; + endpos = covers[minI].endpos; + curlen = covers[minI].curlen; /* stretch the cover if cover size is lower than max_words */ if (curlen < max_words) { /* divide the stretch on both sides of cover */ - maxstretch = (max_words - curlen)/2; - /* first stretch the startpos - * stop stretching if - * 1. we hit the beginning of document - * 2. exceed maxstretch - * 3. we hit an already marked fragment + maxstretch = (max_words - curlen) / 2; + + /* + * first stretch the startpos stop stretching if 1. we hit the + * beginning of document 2. exceed maxstretch 3. we hit an + * already marked fragment */ - stretch = 0; + stretch = 0; posmarker = startpos; for (i = startpos - 1; i >= 0 && stretch < maxstretch && !prs->words[i].in; i--) { if (!NONWORDTOKEN(prs->words[i].type)) { - curlen ++; - stretch ++; + curlen++; + stretch++; } posmarker = i; } @@ -2291,35 +2304,35 @@ mark_hl_fragments(HeadlineParsedText *prs, TSQuery query, int highlight, for (i = posmarker; i < startpos && (NOENDTOKEN(prs->words[i].type) || prs->words[i].len <= shortword); i++) { if (!NONWORDTOKEN(prs->words[i].type)) - curlen --; + curlen--; } startpos = i; - /* now stretch the endpos as much as possible*/ + /* now stretch the endpos as much as possible */ posmarker = endpos; for (i = endpos + 1; i < prs->curwords && curlen < max_words && !prs->words[i].in; i++) { if (!NONWORDTOKEN(prs->words[i].type)) - curlen ++; + curlen++; posmarker = i; } /* cut back endpos till we find a non-short token */ - for ( i = posmarker; i > endpos && (NOENDTOKEN(prs->words[i].type) || prs->words[i].len <= shortword); i--) + for (i = posmarker; i > endpos && (NOENDTOKEN(prs->words[i].type) || prs->words[i].len <= shortword); i--) { if (!NONWORDTOKEN(prs->words[i].type)) - curlen --; + curlen--; } endpos = i; } covers[minI].startpos = startpos; - covers[minI].endpos = endpos; - covers[minI].curlen = curlen; + covers[minI].endpos = endpos; + covers[minI].curlen = curlen; /* Mark the chosen fragments (covers) */ mark_fragment(prs, highlight, startpos, endpos); - num_f ++; + num_f++; /* exclude overlapping covers */ - for (i = 0; i < numcovers; i ++) + for (i = 0; i < numcovers; i++) { - if (i != minI && ( (covers[i].startpos >= covers[minI].startpos && covers[i].startpos <= covers[minI].endpos) || (covers[i].endpos >= covers[minI].startpos && covers[i].endpos <= covers[minI].endpos))) + if (i != minI && ((covers[i].startpos >= covers[minI].startpos && covers[i].startpos <= covers[minI].endpos) || (covers[i].endpos >= covers[minI].startpos && covers[i].endpos <= covers[minI].endpos))) covers[i].excluded = 1; } } @@ -2327,7 +2340,7 @@ mark_hl_fragments(HeadlineParsedText *prs, TSQuery query, int highlight, break; } - /* show at least min_words we have not marked anything*/ + /* show at least min_words we have not marked anything */ if (num_f <= 0) { startpos = endpos = curlen = 0; @@ -2344,7 +2357,7 @@ mark_hl_fragments(HeadlineParsedText *prs, TSQuery query, int highlight, static void mark_hl_words(HeadlineParsedText *prs, TSQuery query, int highlight, - int shortword, int min_words, int max_words) + int shortword, int min_words, int max_words) { int p = 0, q = 0; @@ -2408,7 +2421,7 @@ mark_hl_words(HeadlineParsedText *prs, TSQuery query, int highlight, curlen++; if (prs->words[i].item && !prs->words[i].repeated) poslen++; - if ( curlen >= max_words ) + if (curlen >= max_words) break; if (NOENDTOKEN(prs->words[i].type) || prs->words[i].len <= shortword) continue; @@ -2472,7 +2485,7 @@ mark_hl_words(HeadlineParsedText *prs, TSQuery query, int highlight, { if (HLIDREPLACE(prs->words[i].type)) prs->words[i].replace = 1; - else if ( HLIDSKIP(prs->words[i].type) ) + else if (HLIDSKIP(prs->words[i].type)) prs->words[i].skip = 1; } else @@ -2494,11 +2507,11 @@ prsd_headline(PG_FUNCTION_ARGS) TSQuery query = PG_GETARG_TSQUERY(2); /* from opt + start and and tag */ - int min_words = 15; - int max_words = 35; - int shortword = 3; + int min_words = 15; + int max_words = 35; + int shortword = 3; int max_fragments = 0; - int highlight = 0; + int highlight = 0; ListCell *l; /* config */ diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c index 2f27018b25..dc75ad86ce 100644 --- a/src/backend/utils/adt/acl.c +++ b/src/backend/utils/adt/acl.c @@ -113,7 +113,7 @@ static AclMode convert_role_priv_string(text *priv_type_text); static AclResult pg_role_aclcheck(Oid role_oid, Oid roleid, AclMode mode); static void RoleMembershipCacheCallback(Datum arg, int cacheid, ItemPointer tuplePtr); -static Oid get_role_oid_or_public(const char *rolname); +static Oid get_role_oid_or_public(const char *rolname); /* @@ -4829,7 +4829,7 @@ get_role_oid(const char *rolname, bool missing_ok) /* * get_role_oid_or_public - As above, but return ACL_ID_PUBLIC if the - * role name is "public". + * role name is "public". */ static Oid get_role_oid_or_public(const char *rolname) diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c index e023b2458e..0869de66ce 100644 --- a/src/backend/utils/adt/arrayfuncs.c +++ b/src/backend/utils/adt/arrayfuncs.c @@ -72,7 +72,7 @@ typedef struct ArrayIteratorData /* current position information, updated on each iteration */ char *data_ptr; /* our current position in the array */ int current_item; /* the item # we're at in the array */ -} ArrayIteratorData; +} ArrayIteratorData; static bool array_isspace(char ch); static int ArrayCount(const char *str, int *dim, char typdelim); @@ -1268,7 +1268,8 @@ array_recv(PG_FUNCTION_ARGS) */ if (dim[i] != 0) { - int ub = lBound[i] + dim[i] - 1; + int ub = lBound[i] + dim[i] - 1; + if (lBound[i] > ub) ereport(ERROR, (errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE), diff --git a/src/backend/utils/adt/cash.c b/src/backend/utils/adt/cash.c index 4c3279759d..faef6f8381 100644 --- a/src/backend/utils/adt/cash.c +++ b/src/backend/utils/adt/cash.c @@ -945,11 +945,11 @@ numeric_cash(PG_FUNCTION_ARGS) Datum int4_cash(PG_FUNCTION_ARGS) { - int32 amount = PG_GETARG_INT32(0); - Cash result; - int fpoint; - int64 scale; - int i; + int32 amount = PG_GETARG_INT32(0); + Cash result; + int fpoint; + int64 scale; + int i; struct lconv *lconvert = PGLC_localeconv(); /* see comments about frac_digits in cash_in() */ @@ -964,7 +964,7 @@ int4_cash(PG_FUNCTION_ARGS) /* compute amount * scale, checking for overflow */ result = DatumGetInt64(DirectFunctionCall2(int8mul, Int64GetDatum(amount), - Int64GetDatum(scale))); + Int64GetDatum(scale))); PG_RETURN_CASH(result); } @@ -975,11 +975,11 @@ int4_cash(PG_FUNCTION_ARGS) Datum int8_cash(PG_FUNCTION_ARGS) { - int64 amount = PG_GETARG_INT64(0); - Cash result; - int fpoint; - int64 scale; - int i; + int64 amount = PG_GETARG_INT64(0); + Cash result; + int fpoint; + int64 scale; + int i; struct lconv *lconvert = PGLC_localeconv(); /* see comments about frac_digits in cash_in() */ @@ -994,7 +994,7 @@ int8_cash(PG_FUNCTION_ARGS) /* compute amount * scale, checking for overflow */ result = DatumGetInt64(DirectFunctionCall2(int8mul, Int64GetDatum(amount), - Int64GetDatum(scale))); + Int64GetDatum(scale))); PG_RETURN_CASH(result); } diff --git a/src/backend/utils/adt/date.c b/src/backend/utils/adt/date.c index f96fa6cb72..e737e720f5 100644 --- a/src/backend/utils/adt/date.c +++ b/src/backend/utils/adt/date.c @@ -472,7 +472,7 @@ date2timestamptz(DateADT dateVal) double date2timestamp_no_overflow(DateADT dateVal) { - double result; + double result; if (DATE_IS_NOBEGIN(dateVal)) result = -DBL_MAX; diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c index 0410b8384e..db0a6487ac 100644 --- a/src/backend/utils/adt/datetime.c +++ b/src/backend/utils/adt/datetime.c @@ -2397,7 +2397,7 @@ DecodeTime(char *str, int fmask, int range, /* do a sanity check */ #ifdef HAVE_INT64_TIMESTAMP - if (tm->tm_hour < 0 || tm->tm_min < 0 || tm->tm_min > MINS_PER_HOUR -1 || + if (tm->tm_hour < 0 || tm->tm_min < 0 || tm->tm_min > MINS_PER_HOUR - 1 || tm->tm_sec < 0 || tm->tm_sec > SECS_PER_MINUTE || *fsec < INT64CONST(0) || *fsec > USECS_PER_SEC) diff --git a/src/backend/utils/adt/dbsize.c b/src/backend/utils/adt/dbsize.c index 543a244bf9..73a6ad3280 100644 --- a/src/backend/utils/adt/dbsize.c +++ b/src/backend/utils/adt/dbsize.c @@ -634,7 +634,7 @@ pg_relation_filepath(PG_FUNCTION_ARGS) break; default: elog(ERROR, "invalid relpersistence: %c", relform->relpersistence); - backend = InvalidBackendId; /* placate compiler */ + backend = InvalidBackendId; /* placate compiler */ break; } diff --git a/src/backend/utils/adt/enum.c b/src/backend/utils/adt/enum.c index be4f984ed6..8f65c84d30 100644 --- a/src/backend/utils/adt/enum.c +++ b/src/backend/utils/adt/enum.c @@ -461,7 +461,7 @@ enum_range_internal(Oid enumtypoid, Oid lower, Oid upper) Datum *elems; int max, cnt; - bool left_found; + bool left_found; /* * Scan the enum members in order using pg_enum_typid_sortorder_index. @@ -486,7 +486,7 @@ enum_range_internal(Oid enumtypoid, Oid lower, Oid upper) while (HeapTupleIsValid(enum_tuple = systable_getnext_ordered(enum_scan, ForwardScanDirection))) { - Oid enum_oid = HeapTupleGetOid(enum_tuple); + Oid enum_oid = HeapTupleGetOid(enum_tuple); if (!left_found && lower == enum_oid) left_found = true; diff --git a/src/backend/utils/adt/formatting.c b/src/backend/utils/adt/formatting.c index 45e36f92e5..f895bbbb8b 100644 --- a/src/backend/utils/adt/formatting.c +++ b/src/backend/utils/adt/formatting.c @@ -662,7 +662,7 @@ typedef enum /* last */ _DCH_last_ -} DCH_poz; +} DCH_poz; typedef enum { @@ -705,7 +705,7 @@ typedef enum /* last */ _NUM_last_ -} NUM_poz; +} NUM_poz; /* ---------- * KeyWords for DATE-TIME version @@ -1497,7 +1497,7 @@ str_tolower(const char *buff, size_t nbytes, Oid collid) #ifdef USE_WIDE_UPPER_LOWER else if (pg_database_encoding_max_length() > 1) { - pg_locale_t mylocale = 0; + pg_locale_t mylocale = 0; wchar_t *workspace; size_t curr_char; size_t result_size; @@ -1549,7 +1549,7 @@ str_tolower(const char *buff, size_t nbytes, Oid collid) #endif /* USE_WIDE_UPPER_LOWER */ else { - pg_locale_t mylocale = 0; + pg_locale_t mylocale = 0; char *p; if (collid != DEFAULT_COLLATION_OID) @@ -1618,7 +1618,7 @@ str_toupper(const char *buff, size_t nbytes, Oid collid) #ifdef USE_WIDE_UPPER_LOWER else if (pg_database_encoding_max_length() > 1) { - pg_locale_t mylocale = 0; + pg_locale_t mylocale = 0; wchar_t *workspace; size_t curr_char; size_t result_size; @@ -1670,7 +1670,7 @@ str_toupper(const char *buff, size_t nbytes, Oid collid) #endif /* USE_WIDE_UPPER_LOWER */ else { - pg_locale_t mylocale = 0; + pg_locale_t mylocale = 0; char *p; if (collid != DEFAULT_COLLATION_OID) @@ -1736,7 +1736,7 @@ str_initcap(const char *buff, size_t nbytes, Oid collid) for (p = result; *p; p++) { - char c; + char c; if (wasalnum) *p = c = pg_ascii_tolower((unsigned char) *p); @@ -1751,7 +1751,7 @@ str_initcap(const char *buff, size_t nbytes, Oid collid) #ifdef USE_WIDE_UPPER_LOWER else if (pg_database_encoding_max_length() > 1) { - pg_locale_t mylocale = 0; + pg_locale_t mylocale = 0; wchar_t *workspace; size_t curr_char; size_t result_size; @@ -1815,7 +1815,7 @@ str_initcap(const char *buff, size_t nbytes, Oid collid) #endif /* USE_WIDE_UPPER_LOWER */ else { - pg_locale_t mylocale = 0; + pg_locale_t mylocale = 0; char *p; if (collid != DEFAULT_COLLATION_OID) @@ -1838,7 +1838,7 @@ str_initcap(const char *buff, size_t nbytes, Oid collid) /* * Note: we assume that toupper_l()/tolower_l() will not be so broken - * as to need guard tests. When using the default collation, we apply + * as to need guard tests. When using the default collation, we apply * the traditional Postgres behavior that forces ASCII-style treatment * of I/i, but in non-default collations you get exactly what the * collation says. @@ -2318,7 +2318,7 @@ DCH_to_char(FormatNode *node, bool is_interval, TmToChar *in, char *out, Oid col * intervals */ sprintf(s, "%0*d", S_FM(n->suffix) ? 0 : 2, - tm->tm_hour % (HOURS_PER_DAY / 2) == 0 ? HOURS_PER_DAY / 2 : + tm->tm_hour % (HOURS_PER_DAY / 2) == 0 ? HOURS_PER_DAY / 2 : tm->tm_hour % (HOURS_PER_DAY / 2)); if (S_THth(n->suffix)) str_numth(s, s, S_TH_TYPE(n->suffix)); @@ -2423,7 +2423,7 @@ DCH_to_char(FormatNode *node, bool is_interval, TmToChar *in, char *out, Oid col strcpy(s, str_toupper_z(localized_full_months[tm->tm_mon - 1], collid)); else sprintf(s, "%*s", S_FM(n->suffix) ? 0 : -9, - str_toupper_z(months_full[tm->tm_mon - 1], collid)); + str_toupper_z(months_full[tm->tm_mon - 1], collid)); s += strlen(s); break; case DCH_Month: diff --git a/src/backend/utils/adt/genfile.c b/src/backend/utils/adt/genfile.c index 7c59e9a20e..6b3f77fec1 100644 --- a/src/backend/utils/adt/genfile.c +++ b/src/backend/utils/adt/genfile.c @@ -56,18 +56,19 @@ convert_and_check_filename(text *arg) /* Disallow '/a/b/data/..' */ if (path_contains_parent_reference(filename)) ereport(ERROR, - (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE), - (errmsg("reference to parent directory (\"..\") not allowed")))); + (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE), + (errmsg("reference to parent directory (\"..\") not allowed")))); + /* - * Allow absolute paths if within DataDir or Log_directory, even - * though Log_directory might be outside DataDir. + * Allow absolute paths if within DataDir or Log_directory, even + * though Log_directory might be outside DataDir. */ if (!path_is_prefix_of_path(DataDir, filename) && (!is_absolute_path(Log_directory) || !path_is_prefix_of_path(Log_directory, filename))) ereport(ERROR, - (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE), - (errmsg("absolute path not allowed")))); + (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE), + (errmsg("absolute path not allowed")))); } else if (!path_is_relative_and_below_cwd(filename)) ereport(ERROR, diff --git a/src/backend/utils/adt/like.c b/src/backend/utils/adt/like.c index b060faa6a9..0934c69ebe 100644 --- a/src/backend/utils/adt/like.c +++ b/src/backend/utils/adt/like.c @@ -30,19 +30,19 @@ #define LIKE_ABORT (-1) -static int SB_MatchText(char *t, int tlen, char *p, int plen, - pg_locale_t locale, bool locale_is_c); +static int SB_MatchText(char *t, int tlen, char *p, int plen, + pg_locale_t locale, bool locale_is_c); static text *SB_do_like_escape(text *, text *); -static int MB_MatchText(char *t, int tlen, char *p, int plen, - pg_locale_t locale, bool locale_is_c); +static int MB_MatchText(char *t, int tlen, char *p, int plen, + pg_locale_t locale, bool locale_is_c); static text *MB_do_like_escape(text *, text *); -static int UTF8_MatchText(char *t, int tlen, char *p, int plen, - pg_locale_t locale, bool locale_is_c); +static int UTF8_MatchText(char *t, int tlen, char *p, int plen, + pg_locale_t locale, bool locale_is_c); -static int SB_IMatchText(char *t, int tlen, char *p, int plen, - pg_locale_t locale, bool locale_is_c); +static int SB_IMatchText(char *t, int tlen, char *p, int plen, + pg_locale_t locale, bool locale_is_c); static int GenericMatchText(char *s, int slen, char *p, int plen); static int Generic_Text_IC_like(text *str, text *pat, Oid collation); @@ -188,11 +188,11 @@ Generic_Text_IC_like(text *str, text *pat, Oid collation) else { /* - * Here we need to prepare locale information for SB_lower_char. - * This should match the methods used in str_tolower(). + * Here we need to prepare locale information for SB_lower_char. This + * should match the methods used in str_tolower(). */ - pg_locale_t locale = 0; - bool locale_is_c = false; + pg_locale_t locale = 0; + bool locale_is_c = false; if (lc_ctype_is_c(collation)) locale_is_c = true; diff --git a/src/backend/utils/adt/nabstime.c b/src/backend/utils/adt/nabstime.c index 4b61b21cbe..6771e78af8 100644 --- a/src/backend/utils/adt/nabstime.c +++ b/src/backend/utils/adt/nabstime.c @@ -182,8 +182,8 @@ tm2abstime(struct pg_tm * tm, int tz) tm->tm_mon < 1 || tm->tm_mon > MONTHS_PER_YEAR || tm->tm_mday < 1 || tm->tm_mday > 31 || tm->tm_hour < 0 || - tm->tm_hour > HOURS_PER_DAY || /* test for > 24:00:00 */ - (tm->tm_hour == HOURS_PER_DAY && (tm->tm_min > 0 || tm->tm_sec > 0)) || + tm->tm_hour > HOURS_PER_DAY || /* test for > 24:00:00 */ + (tm->tm_hour == HOURS_PER_DAY && (tm->tm_min > 0 || tm->tm_sec > 0)) || tm->tm_min < 0 || tm->tm_min > MINS_PER_HOUR - 1 || tm->tm_sec < 0 || tm->tm_sec > SECS_PER_MINUTE) return INVALID_ABSTIME; @@ -1163,7 +1163,7 @@ tintervalsame(PG_FUNCTION_ARGS) * 1. The interval length computations overflow at 2^31 seconds, causing * intervals longer than that to sort oddly compared to those shorter. * 2. infinity and minus infinity (NOEND_ABSTIME and NOSTART_ABSTIME) are - * just ordinary integers. Since this code doesn't handle them specially, + * just ordinary integers. Since this code doesn't handle them specially, * it's possible for [a b] to be considered longer than [c infinity] for * finite abstimes a, b, c. In combination with the previous point, the * interval [-infinity infinity] is treated as being shorter than many finite diff --git a/src/backend/utils/adt/network.c b/src/backend/utils/adt/network.c index 8cac11134c..80e5915b3e 100644 --- a/src/backend/utils/adt/network.c +++ b/src/backend/utils/adt/network.c @@ -319,7 +319,7 @@ inet_to_cidr(PG_FUNCTION_ARGS) inet *src = PG_GETARG_INET_P(0); inet *dst; int bits; - int byte; + int byte; int nbits; int maxbytes; @@ -340,15 +340,15 @@ inet_to_cidr(PG_FUNCTION_ARGS) /* clear the first byte, this might be a partial byte */ if (nbits != 0) { - ip_addr(dst)[byte] &=~(0xFF >> nbits); - byte ++; + ip_addr(dst)[byte] &= ~(0xFF >> nbits); + byte++; } /* clear remaining bytes */ maxbytes = ip_addrsize(dst); - while (byte > nbits); - byte ++; + ip_addr(dst)[byte] &= ~(0xFF >> nbits); + byte++; } /* clear remaining bytes */ maxbytes = ip_addrsize(dst); - while (byte = 8) { @@ -750,7 +750,7 @@ network_broadcast(PG_FUNCTION_ARGS) bits = 0; } - b[byte] = a[byte] |mask; + b[byte] = a[byte] | mask; } ip_family(dst) = ip_family(ip); @@ -765,7 +765,7 @@ network_network(PG_FUNCTION_ARGS) { inet *ip = PG_GETARG_INET_P(0); inet *dst; - int byte; + int byte; int bits; unsigned char mask; unsigned char *a, @@ -793,8 +793,8 @@ network_network(PG_FUNCTION_ARGS) bits = 0; } - b[byte] = a[byte] &mask; - byte ++; + b[byte] = a[byte] & mask; + byte++; } ip_family(dst) = ip_family(ip); @@ -809,7 +809,7 @@ network_netmask(PG_FUNCTION_ARGS) { inet *ip = PG_GETARG_INET_P(0); inet *dst; - int byte; + int byte; int bits; unsigned char mask; unsigned char *b; @@ -836,7 +836,7 @@ network_netmask(PG_FUNCTION_ARGS) } b[byte] = mask; - byte ++; + byte++; } ip_family(dst) = ip_family(ip); @@ -851,7 +851,7 @@ network_hostmask(PG_FUNCTION_ARGS) { inet *ip = PG_GETARG_INET_P(0); inet *dst; - int byte; + int byte; int bits; int maxbytes; unsigned char mask; @@ -884,7 +884,7 @@ network_hostmask(PG_FUNCTION_ARGS) } b[byte] = mask; - byte --; + byte--; } ip_family(dst) = ip_family(ip); @@ -994,7 +994,7 @@ bitncmp(void *l, void *r, int n) static bool addressOK(unsigned char *a, int bits, int family) { - int byte; + int byte; int nbits; int maxbits; int maxbytes; @@ -1022,12 +1022,12 @@ addressOK(unsigned char *a, int bits, int family) if (bits != 0) mask >>= nbits; - while (byte >= 8; - byte ++; + byte++; } /* * If input is narrower than int64, overflow is not possible, but we * have to do proper sign extension. */ - if (carry == 0 && byte > 16) & 0xffff; /* - * This formula computes the maximum number of NumericDigits we could - * need in order to store the specified number of decimal digits. - * Because the weight is stored as a number of NumericDigits rather - * than a number of decimal digits, it's possible that the first - * NumericDigit will contain only a single decimal digit. Thus, the - * first two decimal digits can require two NumericDigits to store, - * but it isn't until we reach DEC_DIGITS + 2 decimal digits that we - * potentially need a third NumericDigit. + * This formula computes the maximum number of NumericDigits we could need + * in order to store the specified number of decimal digits. Because the + * weight is stored as a number of NumericDigits rather than a number of + * decimal digits, it's possible that the first NumericDigit will contain + * only a single decimal digit. Thus, the first two decimal digits can + * require two NumericDigits to store, but it isn't until we reach + * DEC_DIGITS + 2 decimal digits that we potentially need a third + * NumericDigit. */ numeric_digits = (precision + 2 * (DEC_DIGITS - 1)) / DEC_DIGITS; /* * In most cases, the size of a numeric will be smaller than the value * computed below, because the varlena header will typically get toasted - * down to a single byte before being stored on disk, and it may also - * be possible to use a short numeric header. But our job here is to - * compute the worst case. + * down to a single byte before being stored on disk, and it may also be + * possible to use a short numeric header. But our job here is to compute + * the worst case. */ return NUMERIC_HDRSZ + (numeric_digits * sizeof(NumericDigit)); } @@ -761,12 +761,13 @@ numeric (PG_FUNCTION_ARGS) * If the number is certainly in bounds and due to the target scale no * rounding could be necessary, just make a copy of the input and modify * its scale fields, unless the larger scale forces us to abandon the - * short representation. (Note we assume the existing dscale is honest...) + * short representation. (Note we assume the existing dscale is + * honest...) */ ddigits = (NUMERIC_WEIGHT(num) + 1) * DEC_DIGITS; if (ddigits <= maxdigits && scale >= NUMERIC_DSCALE(num) && (NUMERIC_CAN_BE_SHORT(scale, NUMERIC_WEIGHT(num)) - || !NUMERIC_IS_SHORT(num))) + || !NUMERIC_IS_SHORT(num))) { new = (Numeric) palloc(VARSIZE(num)); memcpy(new, num, VARSIZE(num)); @@ -1427,7 +1428,7 @@ hash_numeric(PG_FUNCTION_ARGS) int end_offset; int i; int hash_len; - NumericDigit *digits; + NumericDigit *digits; /* If it's NaN, don't try to hash the rest of the fields */ if (NUMERIC_IS_NAN(key)) @@ -3727,7 +3728,7 @@ make_result(NumericVar *var) SET_VARSIZE(result, len); result->choice.n_short.n_header = (sign == NUMERIC_NEG ? (NUMERIC_SHORT | NUMERIC_SHORT_SIGN_MASK) - : NUMERIC_SHORT) + : NUMERIC_SHORT) | (var->dscale << NUMERIC_SHORT_DSCALE_SHIFT) | (weight < 0 ? NUMERIC_SHORT_WEIGHT_SIGN_MASK : 0) | (weight & NUMERIC_SHORT_WEIGHT_MASK); diff --git a/src/backend/utils/adt/numutils.c b/src/backend/utils/adt/numutils.c index 38ce38821e..37d208994c 100644 --- a/src/backend/utils/adt/numutils.c +++ b/src/backend/utils/adt/numutils.c @@ -136,7 +136,7 @@ pg_ltoa(int32 value, char *a) * Avoid problems with the most negative integer not being representable * as a positive integer. */ - if (value == (-2147483647-1)) + if (value == (-2147483647 - 1)) { memcpy(a, "-2147483648", 12); return; @@ -150,8 +150,8 @@ pg_ltoa(int32 value, char *a) /* Compute the result string backwards. */ do { - int32 remainder; - int32 oldval = value; + int32 remainder; + int32 oldval = value; value /= 10; remainder = oldval - value * 10; @@ -167,7 +167,7 @@ pg_ltoa(int32 value, char *a) /* Reverse string. */ while (start < a) { - char swap = *start; + char swap = *start; *start++ = *a; *a-- = swap; @@ -190,7 +190,7 @@ pg_lltoa(int64 value, char *a) * Avoid problems with the most negative integer not being representable * as a positive integer. */ - if (value == (-INT64CONST(0x7FFFFFFFFFFFFFFF)-1)) + if (value == (-INT64CONST(0x7FFFFFFFFFFFFFFF) - 1)) { memcpy(a, "-9223372036854775808", 21); return; @@ -204,8 +204,8 @@ pg_lltoa(int64 value, char *a) /* Compute the result string backwards. */ do { - int64 remainder; - int64 oldval = value; + int64 remainder; + int64 oldval = value; value /= 10; remainder = oldval - value * 10; @@ -221,7 +221,7 @@ pg_lltoa(int64 value, char *a) /* Reverse string. */ while (start < a) { - char swap = *start; + char swap = *start; *start++ = *a; *a-- = swap; diff --git a/src/backend/utils/adt/pg_locale.c b/src/backend/utils/adt/pg_locale.c index 09ff926cba..0e6723d469 100644 --- a/src/backend/utils/adt/pg_locale.c +++ b/src/backend/utils/adt/pg_locale.c @@ -107,7 +107,7 @@ typedef struct bool collate_is_c; /* is collation's LC_COLLATE C? */ bool ctype_is_c; /* is collation's LC_CTYPE C? */ bool flags_valid; /* true if above flags are valid */ - pg_locale_t locale; /* locale_t struct, or 0 if not valid */ + pg_locale_t locale; /* locale_t struct, or 0 if not valid */ } collation_cache_entry; static HTAB *collation_cache = NULL; @@ -242,7 +242,7 @@ check_locale(int category, const char *value) * * For most locale categories, the assign hook doesn't actually set the locale * permanently, just reset flags so that the next use will cache the - * appropriate values. (See explanation at the top of this file.) + * appropriate values. (See explanation at the top of this file.) * * Note: we accept value = "" as selecting the postmaster's environment * value, whatever it was (so long as the environment setting is legal). @@ -728,7 +728,6 @@ IsoLocaleName(const char *winlocname) return NULL; /* Not supported on this version of msvc/mingw */ #endif /* _MSC_VER >= 1400 */ } - #endif /* WIN32 && LC_MESSAGES */ @@ -750,7 +749,7 @@ IsoLocaleName(const char *winlocname) * could fail if the locale is C, so str_tolower() shouldn't call it * in that case. * - * Note that we currently lack any way to flush the cache. Since we don't + * Note that we currently lack any way to flush the cache. Since we don't * support ALTER COLLATION, this is OK. The worst case is that someone * drops a collation, and a useless cache entry hangs around in existing * backends. @@ -826,15 +825,15 @@ bool lc_collate_is_c(Oid collation) { /* - * If we're asked about "collation 0", return false, so that the code - * will go into the non-C path and report that the collation is bogus. + * If we're asked about "collation 0", return false, so that the code will + * go into the non-C path and report that the collation is bogus. */ if (!OidIsValid(collation)) return false; /* - * If we're asked about the default collation, we have to inquire of - * the C library. Cache the result so we only have to compute it once. + * If we're asked about the default collation, we have to inquire of the C + * library. Cache the result so we only have to compute it once. */ if (collation == DEFAULT_COLLATION_OID) { @@ -876,15 +875,15 @@ bool lc_ctype_is_c(Oid collation) { /* - * If we're asked about "collation 0", return false, so that the code - * will go into the non-C path and report that the collation is bogus. + * If we're asked about "collation 0", return false, so that the code will + * go into the non-C path and report that the collation is bogus. */ if (!OidIsValid(collation)) return false; /* - * If we're asked about the default collation, we have to inquire of - * the C library. Cache the result so we only have to compute it once. + * If we're asked about the default collation, we have to inquire of the C + * library. Cache the result so we only have to compute it once. */ if (collation == DEFAULT_COLLATION_OID) { @@ -921,7 +920,7 @@ lc_ctype_is_c(Oid collation) /* - * Create a locale_t from a collation OID. Results are cached for the + * Create a locale_t from a collation OID. Results are cached for the * lifetime of the backend. Thus, do not free the result with freelocale(). * * As a special optimization, the default/database collation returns 0. @@ -987,7 +986,7 @@ pg_newlocale_from_collation(Oid collid) { #ifndef WIN32 /* We need two newlocale() steps */ - locale_t loc1; + locale_t loc1; loc1 = newlocale(LC_COLLATE_MASK, collcollate, NULL); if (!loc1) @@ -1002,10 +1001,11 @@ pg_newlocale_from_collation(Oid collid) errmsg("could not create locale \"%s\": %m", collctype))); #else + /* - * XXX The _create_locale() API doesn't appear to support - * this. Could perhaps be worked around by changing - * pg_locale_t to contain two separate fields. + * XXX The _create_locale() API doesn't appear to support this. + * Could perhaps be worked around by changing pg_locale_t to + * contain two separate fields. */ ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), @@ -1016,8 +1016,7 @@ pg_newlocale_from_collation(Oid collid) cache_entry->locale = result; ReleaseSysCache(tp); - -#else /* not HAVE_LOCALE_T */ +#else /* not HAVE_LOCALE_T */ /* * For platforms that don't support locale_t, we can't do anything @@ -1025,8 +1024,8 @@ pg_newlocale_from_collation(Oid collid) */ ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("nondefault collations are not supported on this platform"))); -#endif /* not HAVE_LOCALE_T */ + errmsg("nondefault collations are not supported on this platform"))); +#endif /* not HAVE_LOCALE_T */ } return cache_entry->locale; diff --git a/src/backend/utils/adt/pgstatfuncs.c b/src/backend/utils/adt/pgstatfuncs.c index 137c811bc3..f811245cea 100644 --- a/src/backend/utils/adt/pgstatfuncs.c +++ b/src/backend/utils/adt/pgstatfuncs.c @@ -364,7 +364,7 @@ pg_stat_get_vacuum_count(PG_FUNCTION_ARGS) { Oid relid = PG_GETARG_OID(0); int64 result; - PgStat_StatTabEntry *tabentry; + PgStat_StatTabEntry *tabentry; if ((tabentry = pgstat_fetch_stat_tabentry(relid)) == NULL) result = 0; @@ -379,7 +379,7 @@ pg_stat_get_autovacuum_count(PG_FUNCTION_ARGS) { Oid relid = PG_GETARG_OID(0); int64 result; - PgStat_StatTabEntry *tabentry; + PgStat_StatTabEntry *tabentry; if ((tabentry = pgstat_fetch_stat_tabentry(relid)) == NULL) result = 0; @@ -394,7 +394,7 @@ pg_stat_get_analyze_count(PG_FUNCTION_ARGS) { Oid relid = PG_GETARG_OID(0); int64 result; - PgStat_StatTabEntry *tabentry; + PgStat_StatTabEntry *tabentry; if ((tabentry = pgstat_fetch_stat_tabentry(relid)) == NULL) result = 0; @@ -409,7 +409,7 @@ pg_stat_get_autoanalyze_count(PG_FUNCTION_ARGS) { Oid relid = PG_GETARG_OID(0); int64 result; - PgStat_StatTabEntry *tabentry; + PgStat_StatTabEntry *tabentry; if ((tabentry = pgstat_fetch_stat_tabentry(relid)) == NULL) result = 0; @@ -1263,11 +1263,11 @@ pg_stat_get_db_conflict_all(PG_FUNCTION_ARGS) result = 0; else result = (int64) ( - dbentry->n_conflict_tablespace + - dbentry->n_conflict_lock + - dbentry->n_conflict_snapshot + - dbentry->n_conflict_bufferpin + - dbentry->n_conflict_startup_deadlock); + dbentry->n_conflict_tablespace + + dbentry->n_conflict_lock + + dbentry->n_conflict_snapshot + + dbentry->n_conflict_bufferpin + + dbentry->n_conflict_startup_deadlock); PG_RETURN_INT64(result); } diff --git a/src/backend/utils/adt/ri_triggers.c b/src/backend/utils/adt/ri_triggers.c index 591d2eb16b..84797191ef 100644 --- a/src/backend/utils/adt/ri_triggers.c +++ b/src/backend/utils/adt/ri_triggers.c @@ -2608,7 +2608,7 @@ RI_FKey_keyequal_upd_fk(Trigger *trigger, Relation fk_rel, * This is not a trigger procedure, but is called during ALTER TABLE * ADD FOREIGN KEY to validate the initial table contents. * - * We expect that the caller has made provision to prevent any problems + * We expect that the caller has made provision to prevent any problems * caused by concurrent actions. This could be either by locking rel and * pkrel at ShareRowExclusiveLock or higher, or by otherwise ensuring * that triggers implementing the checks are already active. @@ -2629,8 +2629,8 @@ RI_Initial_Check(Trigger *trigger, Relation fk_rel, Relation pk_rel) char fkrelname[MAX_QUOTED_REL_NAME_LEN]; char pkattname[MAX_QUOTED_NAME_LEN + 3]; char fkattname[MAX_QUOTED_NAME_LEN + 3]; - RangeTblEntry *pkrte; - RangeTblEntry *fkrte; + RangeTblEntry *pkrte; + RangeTblEntry *fkrte; const char *sep; int i; int old_work_mem; @@ -2662,7 +2662,7 @@ RI_Initial_Check(Trigger *trigger, Relation fk_rel, Relation pk_rel) for (i = 0; i < riinfo.nkeys; i++) { - int attno; + int attno; attno = riinfo.pk_attnums[i] - FirstLowInvalidHeapAttributeNumber; pkrte->selectedCols = bms_add_member(pkrte->selectedCols, attno); @@ -2789,10 +2789,10 @@ RI_Initial_Check(Trigger *trigger, Relation fk_rel, Relation pk_rel) /* * Run the plan. For safety we force a current snapshot to be used. (In - * transaction-snapshot mode, this arguably violates transaction - * isolation rules, but we really haven't got much choice.) - * We don't need to register the snapshot, because SPI_execute_snapshot - * will see to it. We need at most one tuple returned, so pass limit = 1. + * transaction-snapshot mode, this arguably violates transaction isolation + * rules, but we really haven't got much choice.) We don't need to + * register the snapshot, because SPI_execute_snapshot will see to it. We + * need at most one tuple returned, so pass limit = 1. */ spi_result = SPI_execute_snapshot(qplan, NULL, NULL, @@ -3337,8 +3337,8 @@ ri_PerformCheck(RI_QueryKey *qkey, SPIPlanPtr qplan, /* * In READ COMMITTED mode, we just need to use an up-to-date regular * snapshot, and we will see all rows that could be interesting. But in - * transaction-snapshot mode, we can't change the transaction snapshot. - * If the caller passes detectNewRows == false then it's okay to do the query + * transaction-snapshot mode, we can't change the transaction snapshot. If + * the caller passes detectNewRows == false then it's okay to do the query * with the transaction snapshot; otherwise we use a current snapshot, and * tell the executor to error out if it finds any rows under the current * snapshot that wouldn't be visible per the transaction snapshot. Note diff --git a/src/backend/utils/adt/rul