rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
postgresql/contrib/btree_gist/btree_utils_var.c

615 lines
14 KiB
C
Raw Normal View History

Add $PostgreSQL$ markers to a lot of files that were missing them. This particular batch was just for *.c and *.h file. The changes were made with the following 2 commands: find . \( \( -name 'libstemmer' -o -name 'expected' -o -name 'ppport.h' \) -prune \) -o \( -name '*.[ch]' \) \( -exec grep -q '\$PostgreSQL' {} \; -o -print \) | while read file ; do head -n 1 < $file | grep -q '^/\*' && echo $file; done | xargs -l sed -i -e '1s/^\// /' -e '1i/*\n * $PostgreSQL:$ \n *' find . \( \( -name 'libstemmer' -o -name 'expected' -o -name 'ppport.h' \) -prune \) -o \( -name '*.[ch]' \) \( -exec grep -q '\$PostgreSQL' {} \; -o -print \) | xargs -l sed -i -e '1i/*\n * $PostgreSQL:$ \n */'
2008-05-17 03:28:26 +02:00
/*
Remove cvs keywords from all files.
2010-09-20 22:08:53 +02:00
* contrib/btree_gist/btree_utils_var.c
Add $PostgreSQL$ markers to a lot of files that were missing them. This particular batch was just for *.c and *.h file. The changes were made with the following 2 commands: find . \( \( -name 'libstemmer' -o -name 'expected' -o -name 'ppport.h' \) -prune \) -o \( -name '*.[ch]' \) \( -exec grep -q '\$PostgreSQL' {} \; -o -print \) | while read file ; do head -n 1 < $file | grep -q '^/\*' && echo $file; done | xargs -l sed -i -e '1s/^\// /' -e '1i/*\n * $PostgreSQL:$ \n *' find . \( \( -name 'libstemmer' -o -name 'expected' -o -name 'ppport.h' \) -prune \) -o \( -name '*.[ch]' \) \( -exec grep -q '\$PostgreSQL' {} \; -o -print \) | xargs -l sed -i -e '1i/*\n * $PostgreSQL:$ \n */'
2008-05-17 03:28:26 +02:00
*/
Add postgres.h to *.c files for pg_upgrade, ltree, and btree_gist, and remove from local *.h files. Per suggestion from Alvaro.
2011-08-27 03:16:24 +02:00
#include "postgres.h"
Fix a passel of recently-committed violations of the rule 'thou shalt have no other gods before c.h'. Also remove some demonstrably redundant #include lines, mostly of <errno.h> which was added to c.h years ago.
2006-07-14 07:28:29 +02:00
#include "btree_gist.h"
Adjust /contrib for new include file contents.
2006-07-13 18:57:31 +02:00
#include <math.h>
Add additional includes needed on some platforms.
2006-07-14 06:44:46 +02:00
#include <limits.h>
#include <float.h>
Adjust /contrib for new include file contents.
2006-07-13 18:57:31 +02:00
New version. Add support for int2, int8, float4, float8, timestamp with/without time zone, time with/without time zone, date, interval, oid, money and macaddr, char, varchar/text, bytea, numeric, bit, varbit, inet/cidr types for GiST
2004-05-28 12:43:32 +02:00
#include "btree_utils_var.h"
Sort reference of include files, "A" - "F".
2006-07-11 18:35:33 +02:00
#include "utils/pg_locale.h"
Fixes from Janko Richter <jankorichter@yahoo.de> - Fix wrong index results on text, char, varchar for multibyte strings - Fix some SIGFPE signals - Add support for infinite timestamps - Because of locale settings, btree_gist can not be a prefix index anymore (for text). Each node holds now just the lower and upper boundary.
2005-07-01 15:44:56 +02:00
#include "utils/builtins.h"
Improve our #include situation by moving pointer types away from the corresponding struct definitions. This allows other headers to avoid including certain highly-loaded headers such as rel.h and relscan.h, instead using just relcache.h, heapam.h or genam.h, which are more lightweight and thus cause less unnecessary dependencies.
2008-06-19 02:46:06 +02:00
#include "utils/rel.h"
New version. Add support for int2, int8, float4, float8, timestamp with/without time zone, time with/without time zone, date, interval, oid, money and macaddr, char, varchar/text, bytea, numeric, bit, varbit, inet/cidr types for GiST
2004-05-28 12:43:32 +02:00
Fix contrib/btree_gist to handle collations properly. Make use of the collation attached to the index column, instead of hard-wiring DEFAULT_COLLATION_OID. (Note: in theory this could require reindexing btree_gist indexes on textual columns, but I rather doubt anyone has one with a non-default declared collation as yet.)
2011-04-23 02:19:58 +02:00
/* used for key sorting */
typedef struct
{
int i;
GBT_VARKEY *t;
} Vsrt;
typedef struct
{
const gbtree_vinfo *tinfo;
Oid collation;
Post-PG 10 beta1 pgindent run perltidy run not included.
2017-05-17 22:31:56 +02:00
FmgrInfo *flinfo;
Fix contrib/btree_gist to handle collations properly. Make use of the collation attached to the index column, instead of hard-wiring DEFAULT_COLLATION_OID. (Note: in theory this could require reindexing btree_gist indexes on textual columns, but I rather doubt anyone has one with a non-default declared collation as yet.)
2011-04-23 02:19:58 +02:00
} gbt_vsrt_arg;
Simplify/clean up code for varlena types
2005-03-01 16:40:04 +01:00
PG_FUNCTION_INFO_V1(gbt_var_decompress);
Add index-only scan support to btree_gist. inet, cidr, and timetz indexes still cannot support index-only scans, because they don't store the original unmodified value in the index, but a derived approximate value.
2015-03-27 22:35:16 +01:00
PG_FUNCTION_INFO_V1(gbt_var_fetch);
Simplify/clean up code for varlena types
2005-03-01 16:40:04 +01:00
Datum
gbt_var_decompress(PG_FUNCTION_ARGS)
{
Cleanup of GiST extensions in contrib/: now that we always invoke GiST methods in a short-lived memory context, there is no need for GiST methods to do their own manual (and error-prone) memory management.
2005-05-21 14:08:06 +02:00
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
Standard pgindent run for 8.1.
2005-10-15 04:49:52 +02:00
GBT_VARKEY *key = (GBT_VARKEY *) DatumGetPointer(PG_DETOAST_DATUM(entry->key));
Simplify/clean up code for varlena types
2005-03-01 16:40:04 +01:00
Cleanup of GiST extensions in contrib/: now that we always invoke GiST methods in a short-lived memory context, there is no need for GiST methods to do their own manual (and error-prone) memory management.
2005-05-21 14:08:06 +02:00
if (key != (GBT_VARKEY *) DatumGetPointer(entry->key))
{
GISTENTRY *retval = (GISTENTRY *) palloc(sizeof(GISTENTRY));
Simplify/clean up code for varlena types
2005-03-01 16:40:04 +01:00
Cleanup of GiST extensions in contrib/: now that we always invoke GiST methods in a short-lived memory context, there is no need for GiST methods to do their own manual (and error-prone) memory management.
2005-05-21 14:08:06 +02:00
gistentryinit(*retval, PointerGetDatum(key),
entry->rel, entry->page,
Changes * new split algorithm (as proposed in http://archives.postgresql.org/pgsql-hackers/2006-06/msg00254.php) * possible call pickSplit() for second and below columns * add spl_(l|r)datum_exists to GIST_SPLITVEC - pickSplit should check its values to use already defined spl_(l|r)datum for splitting. pickSplit should set spl_(l|r)datum_exists to 'false' (if they was 'true') to signal to caller about using spl_(l|r)datum. * support for old pickSplit(): not very optimal but correct split * remove 'bytes' field from GISTENTRY: in any case size of value is defined by it's type. * split GIST_SPLITVEC to two structures: one for using in picksplit and second - for internal use. * some code refactoring * support of subsplit to rtree opclasses TODO: add support of subsplit to contrib modules
2006-06-28 14:00:14 +02:00
entry->offset, FALSE);
Simplify/clean up code for varlena types
2005-03-01 16:40:04 +01:00
Cleanup of GiST extensions in contrib/: now that we always invoke GiST methods in a short-lived memory context, there is no need for GiST methods to do their own manual (and error-prone) memory management.
2005-05-21 14:08:06 +02:00
PG_RETURN_POINTER(retval);
}
Simplify/clean up code for varlena types
2005-03-01 16:40:04 +01:00
Cleanup of GiST extensions in contrib/: now that we always invoke GiST methods in a short-lived memory context, there is no need for GiST methods to do their own manual (and error-prone) memory management.
2005-05-21 14:08:06 +02:00
PG_RETURN_POINTER(entry);
Simplify/clean up code for varlena types
2005-03-01 16:40:04 +01:00
}
Fix misc typos. Oskari Saarenmaa. Backpatch to stable branches where applicable.
2015-09-05 10:35:49 +02:00
/* Returns a better readable representation of variable key ( sets pointer ) */
This patch makes some minor style cleanups to contrib/btree_gist: remove the "extern" keyword from function definitions, reorganize some PG_GETARG_XXX() usage, and similar.
2005-05-12 02:39:37 +02:00
GBT_VARKEY_R
8.4 pgindent run, with new combined Linux/FreeBSD/MinGW typedef list provided by Andrew.
2009-06-11 16:49:15 +02:00
gbt_var_key_readable(const GBT_VARKEY *k)
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
{
GBT_VARKEY_R r;
r.lower = (bytea *) &(((char *) k)[VARHDRSZ]);
if (VARSIZE(k) > (VARHDRSZ + (VARSIZE(r.lower))))
r.upper = (bytea *) &(((char *) k)[VARHDRSZ + INTALIGN(VARSIZE(r.lower))]);
else
r.upper = r.lower;
return r;
New version. Add support for int2, int8, float4, float8, timestamp with/without time zone, time with/without time zone, date, interval, oid, money and macaddr, char, varchar/text, bytea, numeric, bit, varbit, inet/cidr types for GiST
2004-05-28 12:43:32 +02:00
}
Minor refactoring of btree_gist code. The gbt_var_key_copy function was doing two different things depending on the boolean argument. Seems cleaner to have two separate functions. Remove unused argument from gbt_num_compress.
2015-03-26 22:10:10 +01:00
/*
* Create a leaf-entry to store in the index, from a single Datum.
*/
static GBT_VARKEY *
Initial pgindent run with pg_bsd_indent version 2.0. The new indent version includes numerous fixes thanks to Piotr Stefaniak. The main changes visible in this commit are: * Nicer formatting of function-pointer declarations. * No longer unexpectedly removes spaces in expressions using casts, sizeof, or offsetof. * No longer wants to add a space in "struct structname *varname", as well as some similar cases for const- or volatile-qualified pointers. * Declarations using PG_USED_FOR_ASSERTS_ONLY are formatted more nicely. * Fixes bug where comments following declarations were sometimes placed with no space separating them from the code. * Fixes some odd decisions for comments following case labels. * Fixes some cases where comments following code were indented to less than the expected column 33. On the less good side, it now tends to put more whitespace around typedef names that are not listed in typedefs.list. This might encourage us to put more effort into typedef name collection; it's not really a bug in indent itself. There are more changes coming after this round, having to do with comment indentation and alignment of lines appearing within parentheses. I wanted to limit the size of the diffs to something that could be reviewed without one's eyes completely glazing over, so it seemed better to split up the changes as much as practical. Discussion: https://postgr.es/m/E1dAmxK-0006EE-1r@gemulon.postgresql.org Discussion: https://postgr.es/m/30527.1495162840@sss.pgh.pa.us
2017-06-21 20:39:04 +02:00
gbt_var_key_from_datum(const struct varlena *u)
Minor refactoring of btree_gist code. The gbt_var_key_copy function was doing two different things depending on the boolean argument. Seems cleaner to have two separate functions. Remove unused argument from gbt_num_compress.
2015-03-26 22:10:10 +01:00
{
int32 lowersize = VARSIZE(u);
GBT_VARKEY *r;
r = (GBT_VARKEY *) palloc(lowersize + VARHDRSZ);
memcpy(VARDATA(r), u, lowersize);
SET_VARSIZE(r, lowersize + VARHDRSZ);
return r;
}
/*
* Create an entry to store in the index, from lower and upper bound.
*/
This patch makes some minor style cleanups to contrib/btree_gist: remove the "extern" keyword from function definitions, reorganize some PG_GETARG_XXX() usage, and similar.
2005-05-12 02:39:37 +02:00
GBT_VARKEY *
Minor refactoring of btree_gist code. The gbt_var_key_copy function was doing two different things depending on the boolean argument. Seems cleaner to have two separate functions. Remove unused argument from gbt_num_compress.
2015-03-26 22:10:10 +01:00
gbt_var_key_copy(const GBT_VARKEY_R *u)
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
{
Suppress some more valgrind whining about btree_gist. A couple of functions didn't bother to zero out pad bytes in datums that would ultimately go to disk. Harmless, but valgrind doesn't know that.
2014-05-16 21:29:02 +02:00
int32 lowersize = VARSIZE(u->lower);
int32 uppersize = VARSIZE(u->upper);
Minor refactoring of btree_gist code. The gbt_var_key_copy function was doing two different things depending on the boolean argument. Seems cleaner to have two separate functions. Remove unused argument from gbt_num_compress.
2015-03-26 22:10:10 +01:00
GBT_VARKEY *r;
r = (GBT_VARKEY *) palloc0(INTALIGN(lowersize) + uppersize + VARHDRSZ);
memcpy(VARDATA(r), u->lower, lowersize);
memcpy(VARDATA(r) + INTALIGN(lowersize), u->upper, uppersize);
SET_VARSIZE(r, INTALIGN(lowersize) + uppersize + VARHDRSZ);
New version. Add support for int2, int8, float4, float8, timestamp with/without time zone, time with/without time zone, date, interval, oid, money and macaddr, char, varchar/text, bytea, numeric, bit, varbit, inet/cidr types for GiST
2004-05-28 12:43:32 +02:00
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
return r;
New version. Add support for int2, int8, float4, float8, timestamp with/without time zone, time with/without time zone, date, interval, oid, money and macaddr, char, varchar/text, bytea, numeric, bit, varbit, inet/cidr types for GiST
2004-05-28 12:43:32 +02:00
}
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
static GBT_VARKEY *
Use CallerFInfoFunctionCall with btree_gist for varlena types Follow up to commit 393bb504d7 which did this for numeric types.
2017-03-21 14:53:35 +01:00
gbt_var_leaf2node(GBT_VARKEY *leaf, const gbtree_vinfo *tinfo, FmgrInfo *flinfo)
New version. Add support for int2, int8, float4, float8, timestamp with/without time zone, time with/without time zone, date, interval, oid, money and macaddr, char, varchar/text, bytea, numeric, bit, varbit, inet/cidr types for GiST
2004-05-28 12:43:32 +02:00
{
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
GBT_VARKEY *out = leaf;
New version. Add support for int2, int8, float4, float8, timestamp with/without time zone, time with/without time zone, date, interval, oid, money and macaddr, char, varchar/text, bytea, numeric, bit, varbit, inet/cidr types for GiST
2004-05-28 12:43:32 +02:00
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
if (tinfo->f_l2n)
Use CallerFInfoFunctionCall with btree_gist for varlena types Follow up to commit 393bb504d7 which did this for numeric types.
2017-03-21 14:53:35 +01:00
out = (*tinfo->f_l2n) (leaf, flinfo);
New version. Add support for int2, int8, float4, float8, timestamp with/without time zone, time with/without time zone, date, interval, oid, money and macaddr, char, varchar/text, bytea, numeric, bit, varbit, inet/cidr types for GiST
2004-05-28 12:43:32 +02:00
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
return out;
New version. Add support for int2, int8, float4, float8, timestamp with/without time zone, time with/without time zone, date, interval, oid, money and macaddr, char, varchar/text, bytea, numeric, bit, varbit, inet/cidr types for GiST
2004-05-28 12:43:32 +02:00
}
/*
* returns the common prefix length of a node key
*/
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
static int32
8.4 pgindent run, with new combined Linux/FreeBSD/MinGW typedef list provided by Andrew.
2009-06-11 16:49:15 +02:00
gbt_var_node_cp_len(const GBT_VARKEY *node, const gbtree_vinfo *tinfo)
New version. Add support for int2, int8, float4, float8, timestamp with/without time zone, time with/without time zone, date, interval, oid, money and macaddr, char, varchar/text, bytea, numeric, bit, varbit, inet/cidr types for GiST
2004-05-28 12:43:32 +02:00
{
Standard pgindent run for 8.1.
2005-10-15 04:49:52 +02:00
GBT_VARKEY_R r = gbt_var_key_readable(node);
int32 i = 0;
int32 l = 0;
int32 t1len = VARSIZE(r.lower) - VARHDRSZ;
int32 t2len = VARSIZE(r.upper) - VARHDRSZ;
int32 ml = Min(t1len, t2len);
char *p1 = VARDATA(r.lower);
char *p2 = VARDATA(r.upper);
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
Standard pgindent run for 8.1.
2005-10-15 04:49:52 +02:00
if (ml == 0)
return 0;
Fixes from Janko Richter <jankorichter@yahoo.de> - Fix wrong index results on text, char, varchar for multibyte strings - Fix some SIGFPE signals - Add support for infinite timestamps - Because of locale settings, btree_gist can not be a prefix index anymore (for text). Each node holds now just the lower and upper boundary.
2005-07-01 15:44:56 +02:00
Standard pgindent run for 8.1.
2005-10-15 04:49:52 +02:00
while (i < ml)
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
{
Standard pgindent run for 8.1.
2005-10-15 04:49:52 +02:00
if (tinfo->eml > 1 && l == 0)
{
if ((l = pg_mblen(p1)) != pg_mblen(p2))
{
return i;
}
}
if (*p1 != *p2)
{
if (tinfo->eml > 1)
{
return (i - l + 1);
}
else
{
return i;
}
}
p1++;
p2++;
l--;
i++;
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
}
Remove unnecessary parentheses in return statements The parenthesized style has only been used in a few modules. Change that to use the style that is predominant across the whole tree. Reviewed-by: Michael Paquier <michael.paquier@gmail.com> Reviewed-by: Ryan Murphy <ryanfmurphy@gmail.com>
2017-08-17 18:39:20 +02:00
return ml; /* lower == upper */
New version. Add support for int2, int8, float4, float8, timestamp with/without time zone, time with/without time zone, date, interval, oid, money and macaddr, char, varchar/text, bytea, numeric, bit, varbit, inet/cidr types for GiST
2004-05-28 12:43:32 +02:00
}
/*
Fixes from Janko Richter <jankorichter@yahoo.de> - Fix wrong index results on text, char, varchar for multibyte strings - Fix some SIGFPE signals - Add support for infinite timestamps - Because of locale settings, btree_gist can not be a prefix index anymore (for text). Each node holds now just the lower and upper boundary.
2005-07-01 15:44:56 +02:00
* returns true, if query matches prefix ( common prefix )
Fix contrib/btree_gist to handle collations properly. Make use of the collation attached to the index column, instead of hard-wiring DEFAULT_COLLATION_OID. (Note: in theory this could require reindexing btree_gist indexes on textual columns, but I rather doubt anyone has one with a non-default declared collation as yet.)
2011-04-23 02:19:58 +02:00
*/
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
static bool
8.4 pgindent run, with new combined Linux/FreeBSD/MinGW typedef list provided by Andrew.
2009-06-11 16:49:15 +02:00
gbt_bytea_pf_match(const bytea *pf, const bytea *query, const gbtree_vinfo *tinfo)
New version. Add support for int2, int8, float4, float8, timestamp with/without time zone, time with/without time zone, date, interval, oid, money and macaddr, char, varchar/text, bytea, numeric, bit, varbit, inet/cidr types for GiST
2004-05-28 12:43:32 +02:00
{
Standard pgindent run for 8.1.
2005-10-15 04:49:52 +02:00
bool out = FALSE;
int32 qlen = VARSIZE(query) - VARHDRSZ;
int32 nlen = VARSIZE(pf) - VARHDRSZ;
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
if (nlen <= qlen)
{
Standard pgindent run for 8.1.
2005-10-15 04:49:52 +02:00
char *q = VARDATA(query);
char *n = VARDATA(pf);
Fix contrib/btree_gist to handle collations properly. Make use of the collation attached to the index column, instead of hard-wiring DEFAULT_COLLATION_OID. (Note: in theory this could require reindexing btree_gist indexes on textual columns, but I rather doubt anyone has one with a non-default declared collation as yet.)
2011-04-23 02:19:58 +02:00
out = (memcmp(q, n, nlen) == 0);
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
}
return out;
New version. Add support for int2, int8, float4, float8, timestamp with/without time zone, time with/without time zone, date, interval, oid, money and macaddr, char, varchar/text, bytea, numeric, bit, varbit, inet/cidr types for GiST
2004-05-28 12:43:32 +02:00
}
/*
* returns true, if query matches node using common prefix
Fix contrib/btree_gist to handle collations properly. Make use of the collation attached to the index column, instead of hard-wiring DEFAULT_COLLATION_OID. (Note: in theory this could require reindexing btree_gist indexes on textual columns, but I rather doubt anyone has one with a non-default declared collation as yet.)
2011-04-23 02:19:58 +02:00
*/
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
static bool
8.4 pgindent run, with new combined Linux/FreeBSD/MinGW typedef list provided by Andrew.
2009-06-11 16:49:15 +02:00
gbt_var_node_pf_match(const GBT_VARKEY_R *node, const bytea *query, const gbtree_vinfo *tinfo)
New version. Add support for int2, int8, float4, float8, timestamp with/without time zone, time with/without time zone, date, interval, oid, money and macaddr, char, varchar/text, bytea, numeric, bit, varbit, inet/cidr types for GiST
2004-05-28 12:43:32 +02:00
{
Standard pgindent run for 8.1.
2005-10-15 04:49:52 +02:00
return (tinfo->trnc && (
gbt_bytea_pf_match(node->lower, query, tinfo) ||
gbt_bytea_pf_match(node->upper, query, tinfo)
));
New version. Add support for int2, int8, float4, float8, timestamp with/without time zone, time with/without time zone, date, interval, oid, money and macaddr, char, varchar/text, bytea, numeric, bit, varbit, inet/cidr types for GiST
2004-05-28 12:43:32 +02:00
}
/*
* truncates / compresses the node key
Fixes from Janko Richter <jankorichter@yahoo.de> - Fix wrong index results on text, char, varchar for multibyte strings - Fix some SIGFPE signals - Add support for infinite timestamps - Because of locale settings, btree_gist can not be a prefix index anymore (for text). Each node holds now just the lower and upper boundary.
2005-07-01 15:44:56 +02:00
* cpf_length .. common prefix length
New version. Add support for int2, int8, float4, float8, timestamp with/without time zone, time with/without time zone, date, interval, oid, money and macaddr, char, varchar/text, bytea, numeric, bit, varbit, inet/cidr types for GiST
2004-05-28 12:43:32 +02:00
*/
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
static GBT_VARKEY *
8.4 pgindent run, with new combined Linux/FreeBSD/MinGW typedef list provided by Andrew.
2009-06-11 16:49:15 +02:00
gbt_var_node_truncate(const GBT_VARKEY *node, int32 cpf_length, const gbtree_vinfo *tinfo)
New version. Add support for int2, int8, float4, float8, timestamp with/without time zone, time with/without time zone, date, interval, oid, money and macaddr, char, varchar/text, bytea, numeric, bit, varbit, inet/cidr types for GiST
2004-05-28 12:43:32 +02:00
{
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
GBT_VARKEY *out = NULL;
GBT_VARKEY_R r = gbt_var_key_readable(node);
Standard pgindent run for 8.1.
2005-10-15 04:49:52 +02:00
int32 len1 = VARSIZE(r.lower) - VARHDRSZ;
int32 len2 = VARSIZE(r.upper) - VARHDRSZ;
Replace direct assignments to VARATT_SIZEP(x) with SET_VARSIZE(x, len). Get rid of VARATT_SIZE and VARATT_DATA, which were simply redundant with VARSIZE and VARDATA, and as a consequence almost no code was using the longer names. Rename the length fields of struct varlena and various derived structures to catch anyplace that was accessing them directly; and clean up various places so caught. In itself this patch doesn't change any behavior at all, but it is necessary infrastructure if we hope to play any games with the representation of varlena headers. Greg Stark and Tom Lane
2007-02-28 00:48:10 +01:00
int32 si;
char *out2;
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
Standard pgindent run for 8.1.
2005-10-15 04:49:52 +02:00
len1 = Min(len1, (cpf_length + 1));
len2 = Min(len2, (cpf_length + 1));
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
Replace direct assignments to VARATT_SIZEP(x) with SET_VARSIZE(x, len). Get rid of VARATT_SIZE and VARATT_DATA, which were simply redundant with VARSIZE and VARDATA, and as a consequence almost no code was using the longer names. Rename the length fields of struct varlena and various derived structures to catch anyplace that was accessing them directly; and clean up various places so caught. In itself this patch doesn't change any behavior at all, but it is necessary infrastructure if we hope to play any games with the representation of varlena headers. Greg Stark and Tom Lane
2007-02-28 00:48:10 +01:00
si = 2 * VARHDRSZ + INTALIGN(len1 + VARHDRSZ) + len2;
Suppress some more valgrind whining about btree_gist. A couple of functions didn't bother to zero out pad bytes in datums that would ultimately go to disk. Harmless, but valgrind doesn't know that.
2014-05-16 21:29:02 +02:00
out = (GBT_VARKEY *) palloc0(si);
Replace direct assignments to VARATT_SIZEP(x) with SET_VARSIZE(x, len). Get rid of VARATT_SIZE and VARATT_DATA, which were simply redundant with VARSIZE and VARDATA, and as a consequence almost no code was using the longer names. Rename the length fields of struct varlena and various derived structures to catch anyplace that was accessing them directly; and clean up various places so caught. In itself this patch doesn't change any behavior at all, but it is necessary infrastructure if we hope to play any games with the representation of varlena headers. Greg Stark and Tom Lane
2007-02-28 00:48:10 +01:00
SET_VARSIZE(out, si);
memcpy(VARDATA(out), r.lower, len1 + VARHDRSZ);
SET_VARSIZE(VARDATA(out), len1 + VARHDRSZ);
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
Replace direct assignments to VARATT_SIZEP(x) with SET_VARSIZE(x, len). Get rid of VARATT_SIZE and VARATT_DATA, which were simply redundant with VARSIZE and VARDATA, and as a consequence almost no code was using the longer names. Rename the length fields of struct varlena and various derived structures to catch anyplace that was accessing them directly; and clean up various places so caught. In itself this patch doesn't change any behavior at all, but it is necessary infrastructure if we hope to play any games with the representation of varlena headers. Greg Stark and Tom Lane
2007-02-28 00:48:10 +01:00
out2 = VARDATA(out) + INTALIGN(len1 + VARHDRSZ);
memcpy(out2, r.upper, len2 + VARHDRSZ);
SET_VARSIZE(out2, len2 + VARHDRSZ);
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
return out;
New version. Add support for int2, int8, float4, float8, timestamp with/without time zone, time with/without time zone, date, interval, oid, money and macaddr, char, varchar/text, bytea, numeric, bit, varbit, inet/cidr types for GiST
2004-05-28 12:43:32 +02:00
}
This patch makes some minor style cleanups to contrib/btree_gist: remove the "extern" keyword from function definitions, reorganize some PG_GETARG_XXX() usage, and similar.
2005-05-12 02:39:37 +02:00
void
Fix contrib/btree_gist to handle collations properly. Make use of the collation attached to the index column, instead of hard-wiring DEFAULT_COLLATION_OID. (Note: in theory this could require reindexing btree_gist indexes on textual columns, but I rather doubt anyone has one with a non-default declared collation as yet.)
2011-04-23 02:19:58 +02:00
gbt_var_bin_union(Datum *u, GBT_VARKEY *e, Oid collation,
Use CallerFInfoFunctionCall with btree_gist for varlena types Follow up to commit 393bb504d7 which did this for numeric types.
2017-03-21 14:53:35 +01:00
const gbtree_vinfo *tinfo, FmgrInfo *flinfo)
New version. Add support for int2, int8, float4, float8, timestamp with/without time zone, time with/without time zone, date, interval, oid, money and macaddr, char, varchar/text, bytea, numeric, bit, varbit, inet/cidr types for GiST
2004-05-28 12:43:32 +02:00
{
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
GBT_VARKEY_R eo = gbt_var_key_readable(e);
Fix erroneous range-union logic for varlena types in contrib/btree_gist. gbt_var_bin_union() failed to do the right thing when the existing range needed to be widened at both ends rather than just one end. This could result in an invalid index in which keys that are present would not be found by searches, because the searches would not think they need to descend to the relevant leaf pages. This error affected all the varlena datatypes supported by btree_gist (text, bytea, bit, numeric). Per investigation of a trouble report from Tomas Vondra. (There is also an issue in gbt_var_penalty(), but that should only result in inefficiency not wrong answers. I'm committing this separately so that we have a git state in which it can be tested that bad penalty results don't produce invalid indexes.) Back-patch to all supported branches.
2013-02-08 00:22:19 +01:00
GBT_VARKEY_R nr;
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
if (eo.lower == eo.upper) /* leaf */
{
Fix erroneous range-union logic for varlena types in contrib/btree_gist. gbt_var_bin_union() failed to do the right thing when the existing range needed to be widened at both ends rather than just one end. This could result in an invalid index in which keys that are present would not be found by searches, because the searches would not think they need to descend to the relevant leaf pages. This error affected all the varlena datatypes supported by btree_gist (text, bytea, bit, numeric). Per investigation of a trouble report from Tomas Vondra. (There is also an issue in gbt_var_penalty(), but that should only result in inefficiency not wrong answers. I'm committing this separately so that we have a git state in which it can be tested that bad penalty results don't produce invalid indexes.) Back-patch to all supported branches.
2013-02-08 00:22:19 +01:00
GBT_VARKEY *tmp;
Use CallerFInfoFunctionCall with btree_gist for varlena types Follow up to commit 393bb504d7 which did this for numeric types.
2017-03-21 14:53:35 +01:00
tmp = gbt_var_leaf2node(e, tinfo, flinfo);
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
if (tmp != e)
eo = gbt_var_key_readable(tmp);
}
if (DatumGetPointer(*u))
{
GBT_VARKEY_R ro = gbt_var_key_readable((GBT_VARKEY *) DatumGetPointer(*u));
Fix erroneous range-union logic for varlena types in contrib/btree_gist. gbt_var_bin_union() failed to do the right thing when the existing range needed to be widened at both ends rather than just one end. This could result in an invalid index in which keys that are present would not be found by searches, because the searches would not think they need to descend to the relevant leaf pages. This error affected all the varlena datatypes supported by btree_gist (text, bytea, bit, numeric). Per investigation of a trouble report from Tomas Vondra. (There is also an issue in gbt_var_penalty(), but that should only result in inefficiency not wrong answers. I'm committing this separately so that we have a git state in which it can be tested that bad penalty results don't produce invalid indexes.) Back-patch to all supported branches.
2013-02-08 00:22:19 +01:00
bool update = false;
nr.lower = ro.lower;
nr.upper = ro.upper;
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
Use CallerFInfoFunctionCall with btree_gist for varlena types Follow up to commit 393bb504d7 which did this for numeric types.
2017-03-21 14:53:35 +01:00
if ((*tinfo->f_cmp) (ro.lower, eo.lower, collation, flinfo) > 0)
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
{
nr.lower = eo.lower;
Fix erroneous range-union logic for varlena types in contrib/btree_gist. gbt_var_bin_union() failed to do the right thing when the existing range needed to be widened at both ends rather than just one end. This could result in an invalid index in which keys that are present would not be found by searches, because the searches would not think they need to descend to the relevant leaf pages. This error affected all the varlena datatypes supported by btree_gist (text, bytea, bit, numeric). Per investigation of a trouble report from Tomas Vondra. (There is also an issue in gbt_var_penalty(), but that should only result in inefficiency not wrong answers. I'm committing this separately so that we have a git state in which it can be tested that bad penalty results don't produce invalid indexes.) Back-patch to all supported branches.
2013-02-08 00:22:19 +01:00
update = true;
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
}
Cleanup of GiST extensions in contrib/: now that we always invoke GiST methods in a short-lived memory context, there is no need for GiST methods to do their own manual (and error-prone) memory management.
2005-05-21 14:08:06 +02:00
Use CallerFInfoFunctionCall with btree_gist for varlena types Follow up to commit 393bb504d7 which did this for numeric types.
2017-03-21 14:53:35 +01:00
if ((*tinfo->f_cmp) (ro.upper, eo.upper, collation, flinfo) < 0)
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
{
nr.upper = eo.upper;
Fix erroneous range-union logic for varlena types in contrib/btree_gist. gbt_var_bin_union() failed to do the right thing when the existing range needed to be widened at both ends rather than just one end. This could result in an invalid index in which keys that are present would not be found by searches, because the searches would not think they need to descend to the relevant leaf pages. This error affected all the varlena datatypes supported by btree_gist (text, bytea, bit, numeric). Per investigation of a trouble report from Tomas Vondra. (There is also an issue in gbt_var_penalty(), but that should only result in inefficiency not wrong answers. I'm committing this separately so that we have a git state in which it can be tested that bad penalty results don't produce invalid indexes.) Back-patch to all supported branches.
2013-02-08 00:22:19 +01:00
update = true;
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
}
Cleanup of GiST extensions in contrib/: now that we always invoke GiST methods in a short-lived memory context, there is no need for GiST methods to do their own manual (and error-prone) memory management.
2005-05-21 14:08:06 +02:00
Fix erroneous range-union logic for varlena types in contrib/btree_gist. gbt_var_bin_union() failed to do the right thing when the existing range needed to be widened at both ends rather than just one end. This could result in an invalid index in which keys that are present would not be found by searches, because the searches would not think they need to descend to the relevant leaf pages. This error affected all the varlena datatypes supported by btree_gist (text, bytea, bit, numeric). Per investigation of a trouble report from Tomas Vondra. (There is also an issue in gbt_var_penalty(), but that should only result in inefficiency not wrong answers. I'm committing this separately so that we have a git state in which it can be tested that bad penalty results don't produce invalid indexes.) Back-patch to all supported branches.
2013-02-08 00:22:19 +01:00
if (update)
Minor refactoring of btree_gist code. The gbt_var_key_copy function was doing two different things depending on the boolean argument. Seems cleaner to have two separate functions. Remove unused argument from gbt_num_compress.
2015-03-26 22:10:10 +01:00
*u = PointerGetDatum(gbt_var_key_copy(&nr));
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
}
else
{
nr.lower = eo.lower;
nr.upper = eo.upper;
Minor refactoring of btree_gist code. The gbt_var_key_copy function was doing two different things depending on the boolean argument. Seems cleaner to have two separate functions. Remove unused argument from gbt_num_compress.
2015-03-26 22:10:10 +01:00
*u = PointerGetDatum(gbt_var_key_copy(&nr));
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
}
New version. Add support for int2, int8, float4, float8, timestamp with/without time zone, time with/without time zone, date, interval, oid, money and macaddr, char, varchar/text, bytea, numeric, bit, varbit, inet/cidr types for GiST
2004-05-28 12:43:32 +02:00
}
This patch makes some minor style cleanups to contrib/btree_gist: remove the "extern" keyword from function definitions, reorganize some PG_GETARG_XXX() usage, and similar.
2005-05-12 02:39:37 +02:00
GISTENTRY *
8.4 pgindent run, with new combined Linux/FreeBSD/MinGW typedef list provided by Andrew.
2009-06-11 16:49:15 +02:00
gbt_var_compress(GISTENTRY *entry, const gbtree_vinfo *tinfo)
New version. Add support for int2, int8, float4, float8, timestamp with/without time zone, time with/without time zone, date, interval, oid, money and macaddr, char, varchar/text, bytea, numeric, bit, varbit, inet/cidr types for GiST
2004-05-28 12:43:32 +02:00
{
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
GISTENTRY *retval;
New version. Add support for int2, int8, float4, float8, timestamp with/without time zone, time with/without time zone, date, interval, oid, money and macaddr, char, varchar/text, bytea, numeric, bit, varbit, inet/cidr types for GiST
2004-05-28 12:43:32 +02:00
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
if (entry->leafkey)
{
Minor refactoring of btree_gist code. The gbt_var_key_copy function was doing two different things depending on the boolean argument. Seems cleaner to have two separate functions. Remove unused argument from gbt_num_compress.
2015-03-26 22:10:10 +01:00
struct varlena *leaf = PG_DETOAST_DATUM(entry->key);
GBT_VARKEY *r;
New version. Add support for int2, int8, float4, float8, timestamp with/without time zone, time with/without time zone, date, interval, oid, money and macaddr, char, varchar/text, bytea, numeric, bit, varbit, inet/cidr types for GiST
2004-05-28 12:43:32 +02:00
Minor refactoring of btree_gist code. The gbt_var_key_copy function was doing two different things depending on the boolean argument. Seems cleaner to have two separate functions. Remove unused argument from gbt_num_compress.
2015-03-26 22:10:10 +01:00
r = gbt_var_key_from_datum(leaf);
New version. Add support for int2, int8, float4, float8, timestamp with/without time zone, time with/without time zone, date, interval, oid, money and macaddr, char, varchar/text, bytea, numeric, bit, varbit, inet/cidr types for GiST
2004-05-28 12:43:32 +02:00
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
retval = palloc(sizeof(GISTENTRY));
gistentryinit(*retval, PointerGetDatum(r),
entry->rel, entry->page,
Changes * new split algorithm (as proposed in http://archives.postgresql.org/pgsql-hackers/2006-06/msg00254.php) * possible call pickSplit() for second and below columns * add spl_(l|r)datum_exists to GIST_SPLITVEC - pickSplit should check its values to use already defined spl_(l|r)datum for splitting. pickSplit should set spl_(l|r)datum_exists to 'false' (if they was 'true') to signal to caller about using spl_(l|r)datum. * support for old pickSplit(): not very optimal but correct split * remove 'bytes' field from GISTENTRY: in any case size of value is defined by it's type. * split GIST_SPLITVEC to two structures: one for using in picksplit and second - for internal use. * some code refactoring * support of subsplit to rtree opclasses TODO: add support of subsplit to contrib modules
2006-06-28 14:00:14 +02:00
entry->offset, TRUE);
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
}
else
retval = entry;
New version. Add support for int2, int8, float4, float8, timestamp with/without time zone, time with/without time zone, date, interval, oid, money and macaddr, char, varchar/text, bytea, numeric, bit, varbit, inet/cidr types for GiST
2004-05-28 12:43:32 +02:00
Remove unnecessary parentheses in return statements The parenthesized style has only been used in a few modules. Change that to use the style that is predominant across the whole tree. Reviewed-by: Michael Paquier <michael.paquier@gmail.com> Reviewed-by: Ryan Murphy <ryanfmurphy@gmail.com>
2017-08-17 18:39:20 +02:00
return retval;
New version. Add support for int2, int8, float4, float8, timestamp with/without time zone, time with/without time zone, date, interval, oid, money and macaddr, char, varchar/text, bytea, numeric, bit, varbit, inet/cidr types for GiST
2004-05-28 12:43:32 +02:00
}
Add index-only scan support to btree_gist. inet, cidr, and timetz indexes still cannot support index-only scans, because they don't store the original unmodified value in the index, but a derived approximate value.
2015-03-27 22:35:16 +01:00
Datum
gbt_var_fetch(PG_FUNCTION_ARGS)
{
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
GBT_VARKEY *key = (GBT_VARKEY *) DatumGetPointer(PG_DETOAST_DATUM(entry->key));
GBT_VARKEY_R r = gbt_var_key_readable(key);
GISTENTRY *retval;
retval = palloc(sizeof(GISTENTRY));
gistentryinit(*retval, PointerGetDatum(r.lower),
entry->rel, entry->page,
entry->offset, TRUE);
PG_RETURN_POINTER(retval);
}
This patch makes some minor style cleanups to contrib/btree_gist: remove the "extern" keyword from function definitions, reorganize some PG_GETARG_XXX() usage, and similar.
2005-05-12 02:39:37 +02:00
GBT_VARKEY *
Fix contrib/btree_gist to handle collations properly. Make use of the collation attached to the index column, instead of hard-wiring DEFAULT_COLLATION_OID. (Note: in theory this could require reindexing btree_gist indexes on textual columns, but I rather doubt anyone has one with a non-default declared collation as yet.)
2011-04-23 02:19:58 +02:00
gbt_var_union(const GistEntryVector *entryvec, int32 *size, Oid collation,
Use CallerFInfoFunctionCall with btree_gist for varlena types Follow up to commit 393bb504d7 which did this for numeric types.
2017-03-21 14:53:35 +01:00
const gbtree_vinfo *tinfo, FmgrInfo *flinfo)
New version. Add support for int2, int8, float4, float8, timestamp with/without time zone, time with/without time zone, date, interval, oid, money and macaddr, char, varchar/text, bytea, numeric, bit, varbit, inet/cidr types for GiST
2004-05-28 12:43:32 +02:00
{
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
int i = 0,
numranges = entryvec->n;
Simplify/clean up code for varlena types
2005-03-01 16:40:04 +01:00
GBT_VARKEY *cur;
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
Datum out;
GBT_VARKEY_R rk;
New version. Add support for int2, int8, float4, float8, timestamp with/without time zone, time with/without time zone, date, interval, oid, money and macaddr, char, varchar/text, bytea, numeric, bit, varbit, inet/cidr types for GiST
2004-05-28 12:43:32 +02:00
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
*size = sizeof(GBT_VARKEY);
New version. Add support for int2, int8, float4, float8, timestamp with/without time zone, time with/without time zone, date, interval, oid, money and macaddr, char, varchar/text, bytea, numeric, bit, varbit, inet/cidr types for GiST
2004-05-28 12:43:32 +02:00
Simplify/clean up code for varlena types
2005-03-01 16:40:04 +01:00
cur = (GBT_VARKEY *) DatumGetPointer(entryvec->vector[0].key);
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
rk = gbt_var_key_readable(cur);
Minor refactoring of btree_gist code. The gbt_var_key_copy function was doing two different things depending on the boolean argument. Seems cleaner to have two separate functions. Remove unused argument from gbt_num_compress.
2015-03-26 22:10:10 +01:00
out = PointerGetDatum(gbt_var_key_copy(&rk));
New version. Add support for int2, int8, float4, float8, timestamp with/without time zone, time with/without time zone, date, interval, oid, money and macaddr, char, varchar/text, bytea, numeric, bit, varbit, inet/cidr types for GiST
2004-05-28 12:43:32 +02:00
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
for (i = 1; i < numranges; i++)
{
Simplify/clean up code for varlena types
2005-03-01 16:40:04 +01:00
cur = (GBT_VARKEY *) DatumGetPointer(entryvec->vector[i].key);
Use CallerFInfoFunctionCall with btree_gist for varlena types Follow up to commit 393bb504d7 which did this for numeric types.
2017-03-21 14:53:35 +01:00
gbt_var_bin_union(&out, cur, collation, tinfo, flinfo);
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
}
New version. Add support for int2, int8, float4, float8, timestamp with/without time zone, time with/without time zone, date, interval, oid, money and macaddr, char, varchar/text, bytea, numeric, bit, varbit, inet/cidr types for GiST
2004-05-28 12:43:32 +02:00
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
/* Truncate (=compress) key */
if (tinfo->trnc)
{
int32 plen;
GBT_VARKEY *trc = NULL;
New version. Add support for int2, int8, float4, float8, timestamp with/without time zone, time with/without time zone, date, interval, oid, money and macaddr, char, varchar/text, bytea, numeric, bit, varbit, inet/cidr types for GiST
2004-05-28 12:43:32 +02:00
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
plen = gbt_var_node_cp_len((GBT_VARKEY *) DatumGetPointer(out), tinfo);
trc = gbt_var_node_truncate((GBT_VARKEY *) DatumGetPointer(out), plen + 1, tinfo);
New version. Add support for int2, int8, float4, float8, timestamp with/without time zone, time with/without time zone, date, interval, oid, money and macaddr, char, varchar/text, bytea, numeric, bit, varbit, inet/cidr types for GiST
2004-05-28 12:43:32 +02:00
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
out = PointerGetDatum(trc);
}
New version. Add support for int2, int8, float4, float8, timestamp with/without time zone, time with/without time zone, date, interval, oid, money and macaddr, char, varchar/text, bytea, numeric, bit, varbit, inet/cidr types for GiST
2004-05-28 12:43:32 +02:00
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
return ((GBT_VARKEY *) DatumGetPointer(out));
New version. Add support for int2, int8, float4, float8, timestamp with/without time zone, time with/without time zone, date, interval, oid, money and macaddr, char, varchar/text, bytea, numeric, bit, varbit, inet/cidr types for GiST
2004-05-28 12:43:32 +02:00
}
This patch makes some minor style cleanups to contrib/btree_gist: remove the "extern" keyword from function definitions, reorganize some PG_GETARG_XXX() usage, and similar.
2005-05-12 02:39:37 +02:00
bool
Fix contrib/btree_gist to handle collations properly. Make use of the collation attached to the index column, instead of hard-wiring DEFAULT_COLLATION_OID. (Note: in theory this could require reindexing btree_gist indexes on textual columns, but I rather doubt anyone has one with a non-default declared collation as yet.)
2011-04-23 02:19:58 +02:00
gbt_var_same(Datum d1, Datum d2, Oid collation,
Use CallerFInfoFunctionCall with btree_gist for varlena types Follow up to commit 393bb504d7 which did this for numeric types.
2017-03-21 14:53:35 +01:00
const gbtree_vinfo *tinfo, FmgrInfo *flinfo)
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
{
Simplify/clean up code for varlena types
2005-03-01 16:40:04 +01:00
GBT_VARKEY *t1 = (GBT_VARKEY *) DatumGetPointer(d1);
GBT_VARKEY *t2 = (GBT_VARKEY *) DatumGetPointer(d2);
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
GBT_VARKEY_R r1,
r2;
r1 = gbt_var_key_readable(t1);
r2 = gbt_var_key_readable(t2);
Use CallerFInfoFunctionCall with btree_gist for varlena types Follow up to commit 393bb504d7 which did this for numeric types.
2017-03-21 14:53:35 +01:00
return ((*tinfo->f_cmp) (r1.lower, r2.lower, collation, flinfo) == 0 &&
(*tinfo->f_cmp) (r1.upper, r2.upper, collation, flinfo) == 0);
New version. Add support for int2, int8, float4, float8, timestamp with/without time zone, time with/without time zone, date, interval, oid, money and macaddr, char, varchar/text, bytea, numeric, bit, varbit, inet/cidr types for GiST
2004-05-28 12:43:32 +02:00
}
This patch makes some minor style cleanups to contrib/btree_gist: remove the "extern" keyword from function definitions, reorganize some PG_GETARG_XXX() usage, and similar.
2005-05-12 02:39:37 +02:00
float *
Fix contrib/btree_gist to handle collations properly. Make use of the collation attached to the index column, instead of hard-wiring DEFAULT_COLLATION_OID. (Note: in theory this could require reindexing btree_gist indexes on textual columns, but I rather doubt anyone has one with a non-default declared collation as yet.)
2011-04-23 02:19:58 +02:00
gbt_var_penalty(float *res, const GISTENTRY *o, const GISTENTRY *n,
Use CallerFInfoFunctionCall with btree_gist for varlena types Follow up to commit 393bb504d7 which did this for numeric types.
2017-03-21 14:53:35 +01:00
Oid collation, const gbtree_vinfo *tinfo, FmgrInfo *flinfo)
New version. Add support for int2, int8, float4, float8, timestamp with/without time zone, time with/without time zone, date, interval, oid, money and macaddr, char, varchar/text, bytea, numeric, bit, varbit, inet/cidr types for GiST
2004-05-28 12:43:32 +02:00
{
Simplify/clean up code for varlena types
2005-03-01 16:40:04 +01:00
GBT_VARKEY *orge = (GBT_VARKEY *) DatumGetPointer(o->key);
GBT_VARKEY *newe = (GBT_VARKEY *) DatumGetPointer(n->key);
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
GBT_VARKEY_R ok,
nk;
*res = 0.0;
nk = gbt_var_key_readable(newe);
if (nk.lower == nk.upper) /* leaf */
{
Make contrib/btree_gist's GiST penalty function a bit saner. The previous coding supposed that the first differing bytes in two varlena datums must have the same sign difference as their overall comparison result. This is obviously bogus for text strings in non-C locales, and probably wrong for numeric, and even for bytea I think it was wrong on machines where char is signed. When the assumption failed, the function could deliver a zero or negative penalty in situations where such a result is quite ridiculous, leading the core GiST code to make very bad page-split decisions. To fix, take the absolute values of the byte-level differences. Also, switch the code to using unsigned char not just char, so that the behavior will be consistent whether char is signed or not. Per investigation of a trouble report from Tomas Vondra. Back-patch to all supported branches.
2013-02-08 01:13:59 +01:00
GBT_VARKEY *tmp;
Use CallerFInfoFunctionCall with btree_gist for varlena types Follow up to commit 393bb504d7 which did this for numeric types.
2017-03-21 14:53:35 +01:00
tmp = gbt_var_leaf2node(newe, tinfo, flinfo);
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
if (tmp != newe)
nk = gbt_var_key_readable(tmp);
}
ok = gbt_var_key_readable(orge);
Fixes from Janko Richter <jankorichter@yahoo.de> - Fix wrong index results on text, char, varchar for multibyte strings - Fix some SIGFPE signals - Add support for infinite timestamps - Because of locale settings, btree_gist can not be a prefix index anymore (for text). Each node holds now just the lower and upper boundary.
2005-07-01 15:44:56 +02:00
if ((VARSIZE(ok.lower) - VARHDRSZ) == 0 && (VARSIZE(ok.upper) - VARHDRSZ) == 0)
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
*res = 0.0;
Use CallerFInfoFunctionCall with btree_gist for varlena types Follow up to commit 393bb504d7 which did this for numeric types.
2017-03-21 14:53:35 +01:00
else if (!(((*tinfo->f_cmp) (nk.lower, ok.lower, collation, flinfo) >= 0 ||
Fix contrib/btree_gist to handle collations properly. Make use of the collation attached to the index column, instead of hard-wiring DEFAULT_COLLATION_OID. (Note: in theory this could require reindexing btree_gist indexes on textual columns, but I rather doubt anyone has one with a non-default declared collation as yet.)
2011-04-23 02:19:58 +02:00
gbt_bytea_pf_match(ok.lower, nk.lower, tinfo)) &&
Phase 3 of pgindent updates. Don't move parenthesized lines to the left, even if that means they flow past the right margin. By default, BSD indent lines up statement continuation lines that are within parentheses so that they start just to the right of the preceding left parenthesis. However, traditionally, if that resulted in the continuation line extending to the right of the desired right margin, then indent would push it left just far enough to not overrun the margin, if it could do so without making the continuation line start to the left of the current statement indent. That makes for a weird mix of indentations unless one has been completely rigid about never violating the 80-column limit. This behavior has been pretty universally panned by Postgres developers. Hence, disable it with indent's new -lpl switch, so that parenthesized lines are always lined up with the preceding left paren. This patch is much less interesting than the first round of indent changes, but also bulkier, so I thought it best to separate the effects. Discussion: https://postgr.es/m/E1dAmxK-0006EE-1r@gemulon.postgresql.org Discussion: https://postgr.es/m/30527.1495162840@sss.pgh.pa.us
2017-06-21 21:35:54 +02:00
((*tinfo->f_cmp) (nk.upper, ok.upper, collation, flinfo) <= 0 ||
gbt_bytea_pf_match(ok.upper, nk.upper, tinfo))))
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
{
Datum d = PointerGetDatum(0);
Make contrib/btree_gist's GiST penalty function a bit saner. The previous coding supposed that the first differing bytes in two varlena datums must have the same sign difference as their overall comparison result. This is obviously bogus for text strings in non-C locales, and probably wrong for numeric, and even for bytea I think it was wrong on machines where char is signed. When the assumption failed, the function could deliver a zero or negative penalty in situations where such a result is quite ridiculous, leading the core GiST code to make very bad page-split decisions. To fix, take the absolute values of the byte-level differences. Also, switch the code to using unsigned char not just char, so that the behavior will be consistent whether char is signed or not. Per investigation of a trouble report from Tomas Vondra. Back-patch to all supported branches.
2013-02-08 01:13:59 +01:00
double dres;
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
int32 ol,
ul;
Use CallerFInfoFunctionCall with btree_gist for varlena types Follow up to commit 393bb504d7 which did this for numeric types.
2017-03-21 14:53:35 +01:00
gbt_var_bin_union(&d, orge, collation, tinfo, flinfo);
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
ol = gbt_var_node_cp_len((GBT_VARKEY *) DatumGetPointer(d), tinfo);
Use CallerFInfoFunctionCall with btree_gist for varlena types Follow up to commit 393bb504d7 which did this for numeric types.
2017-03-21 14:53:35 +01:00
gbt_var_bin_union(&d, newe, collation, tinfo, flinfo);
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
ul = gbt_var_node_cp_len((GBT_VARKEY *) DatumGetPointer(d), tinfo);
if (ul < ol)
{
Make contrib/btree_gist's GiST penalty function a bit saner. The previous coding supposed that the first differing bytes in two varlena datums must have the same sign difference as their overall comparison result. This is obviously bogus for text strings in non-C locales, and probably wrong for numeric, and even for bytea I think it was wrong on machines where char is signed. When the assumption failed, the function could deliver a zero or negative penalty in situations where such a result is quite ridiculous, leading the core GiST code to make very bad page-split decisions. To fix, take the absolute values of the byte-level differences. Also, switch the code to using unsigned char not just char, so that the behavior will be consistent whether char is signed or not. Per investigation of a trouble report from Tomas Vondra. Back-patch to all supported branches.
2013-02-08 01:13:59 +01:00
dres = (ol - ul); /* reduction of common prefix len */
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
}
else
{
GBT_VARKEY_R uk = gbt_var_key_readable((GBT_VARKEY *) DatumGetPointer(d));
Make contrib/btree_gist's GiST penalty function a bit saner. The previous coding supposed that the first differing bytes in two varlena datums must have the same sign difference as their overall comparison result. This is obviously bogus for text strings in non-C locales, and probably wrong for numeric, and even for bytea I think it was wrong on machines where char is signed. When the assumption failed, the function could deliver a zero or negative penalty in situations where such a result is quite ridiculous, leading the core GiST code to make very bad page-split decisions. To fix, take the absolute values of the byte-level differences. Also, switch the code to using unsigned char not just char, so that the behavior will be consistent whether char is signed or not. Per investigation of a trouble report from Tomas Vondra. Back-patch to all supported branches.
2013-02-08 01:13:59 +01:00
unsigned char tmp[4];
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
Make contrib/btree_gist's GiST penalty function a bit saner. The previous coding supposed that the first differing bytes in two varlena datums must have the same sign difference as their overall comparison result. This is obviously bogus for text strings in non-C locales, and probably wrong for numeric, and even for bytea I think it was wrong on machines where char is signed. When the assumption failed, the function could deliver a zero or negative penalty in situations where such a result is quite ridiculous, leading the core GiST code to make very bad page-split decisions. To fix, take the absolute values of the byte-level differences. Also, switch the code to using unsigned char not just char, so that the behavior will be consistent whether char is signed or not. Per investigation of a trouble report from Tomas Vondra. Back-patch to all supported branches.
2013-02-08 01:13:59 +01:00
tmp[0] = (unsigned char) (((VARSIZE(ok.lower) - VARHDRSZ) <= ul) ? 0 : (VARDATA(ok.lower)[ul]));
tmp[1] = (unsigned char) (((VARSIZE(uk.lower) - VARHDRSZ) <= ul) ? 0 : (VARDATA(uk.lower)[ul]));
tmp[2] = (unsigned char) (((VARSIZE(ok.upper) - VARHDRSZ) <= ul) ? 0 : (VARDATA(ok.upper)[ul]));
tmp[3] = (unsigned char) (((VARSIZE(uk.upper) - VARHDRSZ) <= ul) ? 0 : (VARDATA(uk.upper)[ul]));
dres = Abs(tmp[0] - tmp[1]) + Abs(tmp[3] - tmp[2]);
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
dres /= 256.0;
}
*res += FLT_MIN;
*res += (float) (dres / ((double) (ol + 1)));
*res *= (FLT_MAX / (o->rel->rd_att->natts + 1));
}
return res;
New version. Add support for int2, int8, float4, float8, timestamp with/without time zone, time with/without time zone, date, interval, oid, money and macaddr, char, varchar/text, bytea, numeric, bit, varbit, inet/cidr types for GiST
2004-05-28 12:43:32 +02:00
}
Whack btree_gist code around until it has some small hope of building on non-gcc compilers.
2004-08-21 02:09:10 +02:00
static int
Make use of qsort_arg in several places that were formerly using klugy static variables. This avoids any risk of potential non-reentrancy, and in particular offers a much cleaner workaround for the Intel compiler bug that was affecting ginutil.c.
2006-10-05 19:57:40 +02:00
gbt_vsrt_cmp(const void *a, const void *b, void *arg)
Whack btree_gist code around until it has some small hope of building on non-gcc compilers.
2004-08-21 02:09:10 +02:00
{
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
GBT_VARKEY_R ar = gbt_var_key_readable(((const Vsrt *) a)->t);
GBT_VARKEY_R br = gbt_var_key_readable(((const Vsrt *) b)->t);
Fix contrib/btree_gist to handle collations properly. Make use of the collation attached to the index column, instead of hard-wiring DEFAULT_COLLATION_OID. (Note: in theory this could require reindexing btree_gist indexes on textual columns, but I rather doubt anyone has one with a non-default declared collation as yet.)
2011-04-23 02:19:58 +02:00
const gbt_vsrt_arg *varg = (const gbt_vsrt_arg *) arg;
pgindent run for 9.0
2010-02-26 03:01:40 +01:00
int res;
New version. Add support for int2, int8, float4, float8, timestamp with/without time zone, time with/without time zone, date, interval, oid, money and macaddr, char, varchar/text, bytea, numeric, bit, varbit, inet/cidr types for GiST
2004-05-28 12:43:32 +02:00
Use CallerFInfoFunctionCall with btree_gist for varlena types Follow up to commit 393bb504d7 which did this for numeric types.
2017-03-21 14:53:35 +01:00
res = (*varg->tinfo->f_cmp) (ar.lower, br.lower, varg->collation, varg->flinfo);
Preventing intersection of ranges during page split. Changes are only optimization, so don't backpatch.
2009-12-02 14:13:24 +01:00
if (res == 0)
Use CallerFInfoFunctionCall with btree_gist for varlena types Follow up to commit 393bb504d7 which did this for numeric types.
2017-03-21 14:53:35 +01:00
return (*varg->tinfo->f_cmp) (ar.upper, br.upper, varg->collation, varg->flinfo);
Preventing intersection of ranges during page split. Changes are only optimization, so don't backpatch.
2009-12-02 14:13:24 +01:00
return res;
Whack btree_gist code around until it has some small hope of building on non-gcc compilers.
2004-08-21 02:09:10 +02:00
}
New version. Add support for int2, int8, float4, float8, timestamp with/without time zone, time with/without time zone, date, interval, oid, money and macaddr, char, varchar/text, bytea, numeric, bit, varbit, inet/cidr types for GiST
2004-05-28 12:43:32 +02:00
This patch makes some minor style cleanups to contrib/btree_gist: remove the "extern" keyword from function definitions, reorganize some PG_GETARG_XXX() usage, and similar.
2005-05-12 02:39:37 +02:00
GIST_SPLITVEC *
Fix contrib/btree_gist to handle collations properly. Make use of the collation attached to the index column, instead of hard-wiring DEFAULT_COLLATION_OID. (Note: in theory this could require reindexing btree_gist indexes on textual columns, but I rather doubt anyone has one with a non-default declared collation as yet.)
2011-04-23 02:19:58 +02:00
gbt_var_picksplit(const GistEntryVector *entryvec, GIST_SPLITVEC *v,
Use CallerFInfoFunctionCall with btree_gist for varlena types Follow up to commit 393bb504d7 which did this for numeric types.
2017-03-21 14:53:35 +01:00
Oid collation, const gbtree_vinfo *tinfo, FmgrInfo *flinfo)
New version. Add support for int2, int8, float4, float8, timestamp with/without time zone, time with/without time zone, date, interval, oid, money and macaddr, char, varchar/text, bytea, numeric, bit, varbit, inet/cidr types for GiST
2004-05-28 12:43:32 +02:00
{
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
OffsetNumber i,
maxoff = entryvec->n - 1;
Vsrt *arr;
Simplify/clean up code for varlena types
2005-03-01 16:40:04 +01:00
int svcntr = 0,
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
nbytes;
Simplify/clean up code for varlena types
2005-03-01 16:40:04 +01:00
char *cur;
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
GBT_VARKEY **sv = NULL;
Fix contrib/btree_gist to handle collations properly. Make use of the collation attached to the index column, instead of hard-wiring DEFAULT_COLLATION_OID. (Note: in theory this could require reindexing btree_gist indexes on textual columns, but I rather doubt anyone has one with a non-default declared collation as yet.)
2011-04-23 02:19:58 +02:00
gbt_vsrt_arg varg;
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
arr = (Vsrt *) palloc((maxoff + 1) * sizeof(Vsrt));
nbytes = (maxoff + 2) * sizeof(OffsetNumber);
v->spl_left = (OffsetNumber *) palloc(nbytes);
v->spl_right = (OffsetNumber *) palloc(nbytes);
v->spl_ldatum = PointerGetDatum(0);
v->spl_rdatum = PointerGetDatum(0);
v->spl_nleft = 0;
v->spl_nright = 0;
sv = palloc(sizeof(bytea *) * (maxoff + 1));
/* Sort entries */
for (i = FirstOffsetNumber; i <= maxoff; i = OffsetNumberNext(i))
{
GBT_VARKEY_R ro;
Simplify/clean up code for varlena types
2005-03-01 16:40:04 +01:00
cur = (char *) DatumGetPointer(entryvec->vector[i].key);
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
ro = gbt_var_key_readable((GBT_VARKEY *) cur);
Phase 2 of pgindent updates. Change pg_bsd_indent to follow upstream rules for placement of comments to the right of code, and remove pgindent hack that caused comments following #endif to not obey the general rule. Commit e3860ffa4dd0dad0dd9eea4be9cc1412373a8c89 wasn't actually using the published version of pg_bsd_indent, but a hacked-up version that tried to minimize the amount of movement of comments to the right of code. The situation of interest is where such a comment has to be moved to the right of its default placement at column 33 because there's code there. BSD indent has always moved right in units of tab stops in such cases --- but in the previous incarnation, indent was working in 8-space tab stops, while now it knows we use 4-space tabs. So the net result is that in about half the cases, such comments are placed one tab stop left of before. This is better all around: it leaves more room on the line for comment text, and it means that in such cases the comment uniformly starts at the next 4-space tab stop after the code, rather than sometimes one and sometimes two tabs after. Also, ensure that comments following #endif are indented the same as comments following other preprocessor commands such as #else. That inconsistency turns out to have been self-inflicted damage from a poorly-thought-through post-indent "fixup" in pgindent. This patch is much less interesting than the first round of indent changes, but also bulkier, so I thought it best to separate the effects. Discussion: https://postgr.es/m/E1dAmxK-0006EE-1r@gemulon.postgresql.org Discussion: https://postgr.es/m/30527.1495162840@sss.pgh.pa.us
2017-06-21 21:18:54 +02:00
if (ro.lower == ro.upper) /* leaf */
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
{
Use CallerFInfoFunctionCall with btree_gist for varlena types Follow up to commit 393bb504d7 which did this for numeric types.
2017-03-21 14:53:35 +01:00
sv[svcntr] = gbt_var_leaf2node((GBT_VARKEY *) cur, tinfo, flinfo);
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
arr[i].t = sv[svcntr];
if (sv[svcntr] != (GBT_VARKEY *) cur)
svcntr++;
}
else
arr[i].t = (GBT_VARKEY *) cur;
arr[i].i = i;
}
/* sort */
Fix contrib/btree_gist to handle collations properly. Make use of the collation attached to the index column, instead of hard-wiring DEFAULT_COLLATION_OID. (Note: in theory this could require reindexing btree_gist indexes on textual columns, but I rather doubt anyone has one with a non-default declared collation as yet.)
2011-04-23 02:19:58 +02:00
varg.tinfo = tinfo;
varg.collation = collation;
Use CallerFInfoFunctionCall with btree_gist for varlena types Follow up to commit 393bb504d7 which did this for numeric types.
2017-03-21 14:53:35 +01:00
varg.flinfo = flinfo;
Make use of qsort_arg in several places that were formerly using klugy static variables. This avoids any risk of potential non-reentrancy, and in particular offers a much cleaner workaround for the Intel compiler bug that was affecting ginutil.c.
2006-10-05 19:57:40 +02:00
qsort_arg((void *) &arr[FirstOffsetNumber],
maxoff - FirstOffsetNumber + 1,
sizeof(Vsrt),
gbt_vsrt_cmp,
Fix contrib/btree_gist to handle collations properly. Make use of the collation attached to the index column, instead of hard-wiring DEFAULT_COLLATION_OID. (Note: in theory this could require reindexing btree_gist indexes on textual columns, but I rather doubt anyone has one with a non-default declared collation as yet.)
2011-04-23 02:19:58 +02:00
(void *) &varg);
New version. Add support for int2, int8, float4, float8, timestamp with/without time zone, time with/without time zone, date, interval, oid, money and macaddr, char, varchar/text, bytea, numeric, bit, varbit, inet/cidr types for GiST
2004-05-28 12:43:32 +02:00
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
/* We do simply create two parts */
for (i = FirstOffsetNumber; i <= maxoff; i = OffsetNumberNext(i))
{
if (i <= (maxoff - FirstOffsetNumber + 1) / 2)
{
Use CallerFInfoFunctionCall with btree_gist for varlena types Follow up to commit 393bb504d7 which did this for numeric types.
2017-03-21 14:53:35 +01:00
gbt_var_bin_union(&v->spl_ldatum, arr[i].t, collation, tinfo, flinfo);
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
v->spl_left[v->spl_nleft] = arr[i].i;
v->spl_nleft++;
}
else
{
Use CallerFInfoFunctionCall with btree_gist for varlena types Follow up to commit 393bb504d7 which did this for numeric types.
2017-03-21 14:53:35 +01:00
gbt_var_bin_union(&v->spl_rdatum, arr[i].t, collation, tinfo, flinfo);
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
v->spl_right[v->spl_nright] = arr[i].i;
v->spl_nright++;
}
}
/* Truncate (=compress) key */
if (tinfo->trnc)
{
int32 ll = gbt_var_node_cp_len((GBT_VARKEY *) DatumGetPointer(v->spl_ldatum), tinfo);
int32 lr = gbt_var_node_cp_len((GBT_VARKEY *) DatumGetPointer(v->spl_rdatum), tinfo);
GBT_VARKEY *dl;
GBT_VARKEY *dr;
ll = Max(ll, lr);
ll++;
dl = gbt_var_node_truncate((GBT_VARKEY *) DatumGetPointer(v->spl_ldatum), ll, tinfo);
dr = gbt_var_node_truncate((GBT_VARKEY *) DatumGetPointer(v->spl_rdatum), ll, tinfo);
v->spl_ldatum = PointerGetDatum(dl);
v->spl_rdatum = PointerGetDatum(dr);
}
New version. Add support for int2, int8, float4, float8, timestamp with/without time zone, time with/without time zone, date, interval, oid, money and macaddr, char, varchar/text, bytea, numeric, bit, varbit, inet/cidr types for GiST
2004-05-28 12:43:32 +02:00
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
return v;
New version. Add support for int2, int8, float4, float8, timestamp with/without time zone, time with/without time zone, date, interval, oid, money and macaddr, char, varchar/text, bytea, numeric, bit, varbit, inet/cidr types for GiST
2004-05-28 12:43:32 +02:00
}
/*
Whack btree_gist code around until it has some small hope of building on non-gcc compilers.
2004-08-21 02:09:10 +02:00
* The GiST consistent method
*/
This patch makes some minor style cleanups to contrib/btree_gist: remove the "extern" keyword from function definitions, reorganize some PG_GETARG_XXX() usage, and similar.
2005-05-12 02:39:37 +02:00
bool
Fix contrib/btree_gist to handle collations properly. Make use of the collation attached to the index column, instead of hard-wiring DEFAULT_COLLATION_OID. (Note: in theory this could require reindexing btree_gist indexes on textual columns, but I rather doubt anyone has one with a non-default declared collation as yet.)
2011-04-23 02:19:58 +02:00
gbt_var_consistent(GBT_VARKEY_R *key,
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
const void *query,
Fix contrib/btree_gist to handle collations properly. Make use of the collation attached to the index column, instead of hard-wiring DEFAULT_COLLATION_OID. (Note: in theory this could require reindexing btree_gist indexes on textual columns, but I rather doubt anyone has one with a non-default declared collation as yet.)
2011-04-23 02:19:58 +02:00
StrategyNumber strategy,
Oid collation,
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
bool is_leaf,
Use CallerFInfoFunctionCall with btree_gist for varlena types Follow up to commit 393bb504d7 which did this for numeric types.
2017-03-21 14:53:35 +01:00
const gbtree_vinfo *tinfo,
FmgrInfo *flinfo)
New version. Add support for int2, int8, float4, float8, timestamp with/without time zone, time with/without time zone, date, interval, oid, money and macaddr, char, varchar/text, bytea, numeric, bit, varbit, inet/cidr types for GiST
2004-05-28 12:43:32 +02:00
{
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
bool retval = FALSE;
Fix contrib/btree_gist to handle collations properly. Make use of the collation attached to the index column, instead of hard-wiring DEFAULT_COLLATION_OID. (Note: in theory this could require reindexing btree_gist indexes on textual columns, but I rather doubt anyone has one with a non-default declared collation as yet.)
2011-04-23 02:19:58 +02:00
switch (strategy)
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
{
case BTLessEqualStrategyNumber:
if (is_leaf)
Use CallerFInfoFunctionCall with btree_gist for varlena types Follow up to commit 393bb504d7 which did this for numeric types.
2017-03-21 14:53:35 +01:00
retval = (*tinfo->f_ge) (query, key->lower, collation, flinfo);
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
else
Use CallerFInfoFunctionCall with btree_gist for varlena types Follow up to commit 393bb504d7 which did this for numeric types.
2017-03-21 14:53:35 +01:00
retval = (*tinfo->f_cmp) (query, key->lower, collation, flinfo) >= 0
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
|| gbt_var_node_pf_match(key, query, tinfo);
break;
case BTLessStrategyNumber:
if (is_leaf)
Use CallerFInfoFunctionCall with btree_gist for varlena types Follow up to commit 393bb504d7 which did this for numeric types.
2017-03-21 14:53:35 +01:00
retval = (*tinfo->f_gt) (query, key->lower, collation, flinfo);
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
else
Use CallerFInfoFunctionCall with btree_gist for varlena types Follow up to commit 393bb504d7 which did this for numeric types.
2017-03-21 14:53:35 +01:00
retval = (*tinfo->f_cmp) (query, key->lower, collation, flinfo) >= 0
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
|| gbt_var_node_pf_match(key, query, tinfo);
break;
case BTEqualStrategyNumber:
if (is_leaf)
Use CallerFInfoFunctionCall with btree_gist for varlena types Follow up to commit 393bb504d7 which did this for numeric types.
2017-03-21 14:53:35 +01:00
retval = (*tinfo->f_eq) (query, key->lower, collation, flinfo);
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
else
Fix contrib/btree_gist to handle collations properly. Make use of the collation attached to the index column, instead of hard-wiring DEFAULT_COLLATION_OID. (Note: in theory this could require reindexing btree_gist indexes on textual columns, but I rather doubt anyone has one with a non-default declared collation as yet.)
2011-04-23 02:19:58 +02:00
retval =
Use CallerFInfoFunctionCall with btree_gist for varlena types Follow up to commit 393bb504d7 which did this for numeric types.
2017-03-21 14:53:35 +01:00
((*tinfo->f_cmp) (key->lower, query, collation, flinfo) <= 0 &&
(*tinfo->f_cmp) (query, key->upper, collation, flinfo) <= 0) ||
Fix contrib/btree_gist to handle collations properly. Make use of the collation attached to the index column, instead of hard-wiring DEFAULT_COLLATION_OID. (Note: in theory this could require reindexing btree_gist indexes on textual columns, but I rather doubt anyone has one with a non-default declared collation as yet.)
2011-04-23 02:19:58 +02:00
gbt_var_node_pf_match(key, query, tinfo);
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
break;
case BTGreaterStrategyNumber:
if (is_leaf)
Use CallerFInfoFunctionCall with btree_gist for varlena types Follow up to commit 393bb504d7 which did this for numeric types.
2017-03-21 14:53:35 +01:00
retval = (*tinfo->f_lt) (query, key->upper, collation, flinfo);
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
else
Use CallerFInfoFunctionCall with btree_gist for varlena types Follow up to commit 393bb504d7 which did this for numeric types.
2017-03-21 14:53:35 +01:00
retval = (*tinfo->f_cmp) (query, key->upper, collation, flinfo) <= 0
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
|| gbt_var_node_pf_match(key, query, tinfo);
break;
case BTGreaterEqualStrategyNumber:
if (is_leaf)
Use CallerFInfoFunctionCall with btree_gist for varlena types Follow up to commit 393bb504d7 which did this for numeric types.
2017-03-21 14:53:35 +01:00
retval = (*tinfo->f_le) (query, key->upper, collation, flinfo);
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
else
Use CallerFInfoFunctionCall with btree_gist for varlena types Follow up to commit 393bb504d7 which did this for numeric types.
2017-03-21 14:53:35 +01:00
retval = (*tinfo->f_cmp) (query, key->upper, collation, flinfo) <= 0
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
|| gbt_var_node_pf_match(key, query, tinfo);
break;
Add btree_gist support for searching on "not equals". Jeff Davis, with slight editorialization by me.
2010-08-02 18:26:48 +02:00
case BtreeGistNotEqualStrategyNumber:
Use CallerFInfoFunctionCall with btree_gist for varlena types Follow up to commit 393bb504d7 which did this for numeric types.
2017-03-21 14:53:35 +01:00
retval = !((*tinfo->f_eq) (query, key->lower, collation, flinfo) &&
(*tinfo->f_eq) (query, key->upper, collation, flinfo));
Add btree_gist support for searching on "not equals". Jeff Davis, with slight editorialization by me.
2010-08-02 18:26:48 +02:00
break;
Pgindent run for 8.0.
2004-08-29 07:07:03 +02:00
default:
retval = FALSE;
}
Fix contrib/btree_gist to handle collations properly. Make use of the collation attached to the index column, instead of hard-wiring DEFAULT_COLLATION_OID. (Note: in theory this could require reindexing btree_gist indexes on textual columns, but I rather doubt anyone has one with a non-default declared collation as yet.)
2011-04-23 02:19:58 +02:00
return retval;
New version. Add support for int2, int8, float4, float8, timestamp with/without time zone, time with/without time zone, date, interval, oid, money and macaddr, char, varchar/text, bytea, numeric, bit, varbit, inet/cidr types for GiST
2004-05-28 12:43:32 +02:00
}