>From 6e71473e8ea615bd5f047d48c7a99e3f7e47940a Mon Sep 17 00:00:00 2001 From: Kyotaro Horiguchi Date: Thu, 6 Aug 2015 21:11:55 +0900 Subject: [PATCH 5/6] Add btree operator class for int2vector. Add new opclass for use for pg_mvcoefficient. --- src/backend/access/nbtree/nbtcompare.c | 24 ++++++++++++++++++++++ src/backend/utils/adt/int.c | 37 ++++++++++++++++++++++++++++++++++ src/backend/utils/cache/syscache.c | 10 ++++----- src/include/catalog/pg_amop.h | 10 +++++++++ src/include/catalog/pg_amproc.h | 1 + src/include/catalog/pg_opclass.h | 1 + src/include/catalog/pg_operator.h | 12 ++++++++++- src/include/catalog/pg_opfamily.h | 1 + src/include/catalog/pg_proc.h | 8 ++++++++ src/include/utils/builtins.h | 6 ++++++ src/include/utils/syscache.h | 2 +- 11 files changed, 105 insertions(+), 7 deletions(-) diff --git a/src/backend/access/nbtree/nbtcompare.c b/src/backend/access/nbtree/nbtcompare.c index 8ce8009..baa28c0 100644 --- a/src/backend/access/nbtree/nbtcompare.c +++ b/src/backend/access/nbtree/nbtcompare.c @@ -308,6 +308,30 @@ btoidvectorcmp(PG_FUNCTION_ARGS) } Datum +btint2vectorcmp(PG_FUNCTION_ARGS) +{ + int2vector *a = (int2vector *) PG_GETARG_POINTER(0); + int2vector *b = (int2vector *) PG_GETARG_POINTER(1); + int i; + + /* We arbitrarily choose to sort first by vector length */ + if (a->dim1 != b->dim1) + PG_RETURN_INT32(a->dim1 - b->dim1); + + for (i = 0; i < a->dim1; i++) + { + if (a->values[i] != b->values[i]) + { + if (a->values[i] > b->values[i]) + PG_RETURN_INT32(1); + else + PG_RETURN_INT32(-1); + } + } + PG_RETURN_INT32(0); +} + +Datum btcharcmp(PG_FUNCTION_ARGS) { char a = PG_GETARG_CHAR(0); diff --git a/src/backend/utils/adt/int.c b/src/backend/utils/adt/int.c index 1a91b29..063d85a 100644 --- a/src/backend/utils/adt/int.c +++ b/src/backend/utils/adt/int.c @@ -269,6 +269,43 @@ int2vectoreq(PG_FUNCTION_ARGS) PG_RETURN_BOOL(memcmp(a->values, b->values, a->dim1 * sizeof(int16)) == 0); } +Datum +int2vectorne(PG_FUNCTION_ARGS) +{ + PG_RETURN_BOOL(!int2vectoreq(fcinfo)); +} + +Datum +int2vectorlt(PG_FUNCTION_ARGS) +{ + int32 cmp = DatumGetInt32(btint2vectorcmp(fcinfo)); + + PG_RETURN_BOOL(cmp < 0); +} + +Datum +int2vectorle(PG_FUNCTION_ARGS) +{ + int32 cmp = DatumGetInt32(btint2vectorcmp(fcinfo)); + + PG_RETURN_BOOL(cmp <= 0); +} + +Datum +int2vectorge(PG_FUNCTION_ARGS) +{ + int32 cmp = DatumGetInt32(btint2vectorcmp(fcinfo)); + + PG_RETURN_BOOL(cmp >= 0); +} + +Datum +int2vectorgt(PG_FUNCTION_ARGS) +{ + int32 cmp = DatumGetInt32(btint2vectorcmp(fcinfo)); + + PG_RETURN_BOOL(cmp > 0); +} /***************************************************************************** * PUBLIC ROUTINES * diff --git a/src/backend/utils/cache/syscache.c b/src/backend/utils/cache/syscache.c index a895405..e41268e 100644 --- a/src/backend/utils/cache/syscache.c +++ b/src/backend/utils/cache/syscache.c @@ -502,16 +502,16 @@ static const struct cachedesc cacheinfo[] = { }, 4 }, - {MvCoefficientRelationId, /* MVCOEFFICIENT */ - MvCoefficientIndexId, - 1, + {MvCoefficientRelationId, /* MVCOEFRELIDATTRS */ + MvCoefficientIndexId, + 2, { Anum_pg_mvcoefficient_mvcreloid, - 0, + Anum_pg_mvcoefficient_mvcattrs, 0, 0 }, - 4 + 8 }, {NamespaceRelationId, /* NAMESPACENAME */ NamespaceNameIndexId, diff --git a/src/include/catalog/pg_amop.h b/src/include/catalog/pg_amop.h index da5fe9d..23eb849 100644 --- a/src/include/catalog/pg_amop.h +++ b/src/include/catalog/pg_amop.h @@ -185,6 +185,16 @@ DATA(insert ( 1991 30 30 4 s 648 403 0 )); DATA(insert ( 1991 30 30 5 s 646 403 0 )); /* + * btree int2vector_ops + */ + +DATA(insert ( 3321 22 22 1 s 3317 403 0 )); +DATA(insert ( 3321 22 22 2 s 3319 403 0 )); +DATA(insert ( 3321 22 22 3 s 386 403 0 )); +DATA(insert ( 3321 22 22 4 s 3320 403 0 )); +DATA(insert ( 3321 22 22 5 s 3318 403 0 )); + +/* * btree float_ops */ diff --git a/src/include/catalog/pg_amproc.h b/src/include/catalog/pg_amproc.h index b57d6e6..72e3557 100644 --- a/src/include/catalog/pg_amproc.h +++ b/src/include/catalog/pg_amproc.h @@ -142,6 +142,7 @@ DATA(insert ( 3626 3614 3614 1 3622 )); DATA(insert ( 3683 3615 3615 1 3668 )); DATA(insert ( 3901 3831 3831 1 3870 )); DATA(insert ( 4033 3802 3802 1 4044 )); +DATA(insert ( 3321 22 22 1 3327 )); /* hash */ diff --git a/src/include/catalog/pg_opclass.h b/src/include/catalog/pg_opclass.h index e7b3148..37075ff 100644 --- a/src/include/catalog/pg_opclass.h +++ b/src/include/catalog/pg_opclass.h @@ -167,6 +167,7 @@ DATA(insert ( 403 bpchar_pattern_ops PGNSP PGUID 2097 1042 f 0 )); DATA(insert ( 403 money_ops PGNSP PGUID 2099 790 t 0 )); DATA(insert ( 405 bool_ops PGNSP PGUID 2222 16 t 0 )); DATA(insert ( 405 bytea_ops PGNSP PGUID 2223 17 t 0 )); +DATA(insert ( 403 int2vector_ops PGNSP PGUID 3321 22 t 0 )); DATA(insert ( 405 int2vector_ops PGNSP PGUID 2224 22 t 0 )); DATA(insert ( 403 tid_ops PGNSP PGUID 2789 27 t 0 )); DATA(insert ( 405 xid_ops PGNSP PGUID 2225 28 t 0 )); diff --git a/src/include/catalog/pg_operator.h b/src/include/catalog/pg_operator.h index 26c9d4e..7b11942 100644 --- a/src/include/catalog/pg_operator.h +++ b/src/include/catalog/pg_operator.h @@ -154,8 +154,18 @@ DATA(insert OID = 389 ( "!!" PGNSP PGUID l f f 0 20 1700 0 0 numeric_fac DESCR("deprecated, use ! instead"); DATA(insert OID = 385 ( "=" PGNSP PGUID b f t 29 29 16 385 0 cideq eqsel eqjoinsel )); DESCR("equal"); -DATA(insert OID = 386 ( "=" PGNSP PGUID b f t 22 22 16 386 0 int2vectoreq eqsel eqjoinsel )); +DATA(insert OID = 386 ( "=" PGNSP PGUID b t t 22 22 16 386 3316 int2vectoreq eqsel eqjoinsel )); DESCR("equal"); +DATA(insert OID = 3316 ( "<>" PGNSP PGUID b f f 22 22 16 3316 386 int2vectorne neqsel neqjoinsel )); +DESCR("not equal"); +DATA(insert OID = 3317 ( "<" PGNSP PGUID b f f 22 22 16 3318 3320 int2vectorlt scalarltsel scalarltjoinsel )); +DESCR("less than"); +DATA(insert OID = 3318 ( ">" PGNSP PGUID b f f 22 22 16 3317 3319 int2vectorgt scalargtsel scalargtjoinsel )); +DESCR("greater than"); +DATA(insert OID = 3319 ( "<=" PGNSP PGUID b f f 22 22 16 3320 3318 int2vectorle scalarltsel scalarltjoinsel )); +DESCR("less than or equal"); +DATA(insert OID = 3320 ( ">=" PGNSP PGUID b f f 22 22 16 3319 3317 int2vectorge scalargtsel scalargtjoinsel )); +DESCR("greater than or equal"); DATA(insert OID = 387 ( "=" PGNSP PGUID b t f 27 27 16 387 402 tideq eqsel eqjoinsel )); DESCR("equal"); diff --git a/src/include/catalog/pg_opfamily.h b/src/include/catalog/pg_opfamily.h index acbc100..eb9e62b 100644 --- a/src/include/catalog/pg_opfamily.h +++ b/src/include/catalog/pg_opfamily.h @@ -87,6 +87,7 @@ DATA(insert OID = 1983 ( 405 interval_ops PGNSP PGUID )); DATA(insert OID = 1984 ( 403 macaddr_ops PGNSP PGUID )); DATA(insert OID = 1985 ( 405 macaddr_ops PGNSP PGUID )); DATA(insert OID = 1986 ( 403 name_ops PGNSP PGUID )); +DATA(insert OID = 3321 ( 403 int2vector_ops PGNSP PGUID )); #define NAME_BTREE_FAM_OID 1986 DATA(insert OID = 1987 ( 405 name_ops PGNSP PGUID )); DATA(insert OID = 1988 ( 403 numeric_ops PGNSP PGUID )); diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h index ddf7c67..f3da6d6 100644 --- a/src/include/catalog/pg_proc.h +++ b/src/include/catalog/pg_proc.h @@ -536,6 +536,12 @@ DESCR("convert int2 to int4"); DATA(insert OID = 314 ( int2 PGNSP PGUID 12 1 0 0 0 f f f f t f i 1 0 21 "23" _null_ _null_ _null_ _null_ _null_ i4toi2 _null_ _null_ _null_ )); DESCR("convert int4 to int2"); DATA(insert OID = 315 ( int2vectoreq PGNSP PGUID 12 1 0 0 0 f f f f t f i 2 0 16 "22 22" _null_ _null_ _null_ _null_ _null_ int2vectoreq _null_ _null_ _null_ )); +DATA(insert OID = 3322 ( int2vectorne PGNSP PGUID 12 1 0 0 0 f f f f t f i 2 0 16 "22 22" _null_ _null_ _null_ _null_ _null_ int2vectorne _null_ _null_ _null_ )); +DATA(insert OID = 3323 ( int2vectorlt PGNSP PGUID 12 1 0 0 0 f f f f t f i 2 0 16 "22 22" _null_ _null_ _null_ _null_ _null_ int2vectorlt _null_ _null_ _null_ )); +DATA(insert OID = 3324 ( int2vectorle PGNSP PGUID 12 1 0 0 0 f f f f t f i 2 0 16 "22 22" _null_ _null_ _null_ _null_ _null_ int2vectorle _null_ _null_ _null_ )); +DATA(insert OID = 3325 ( int2vectorge PGNSP PGUID 12 1 0 0 0 f f f f t f i 2 0 16 "22 22" _null_ _null_ _null_ _null_ _null_ int2vectorge _null_ _null_ _null_ )); +DATA(insert OID = 3326 ( int2vectorgt PGNSP PGUID 12 1 0 0 0 f f f f t f i 2 0 16 "22 22" _null_ _null_ _null_ _null_ _null_ int2vectorgt _null_ _null_ _null_ )); + DATA(insert OID = 316 ( float8 PGNSP PGUID 12 1 0 0 0 f f f f t f i 1 0 701 "23" _null_ _null_ _null_ _null_ _null_ i4tod _null_ _null_ _null_ )); DESCR("convert int4 to float8"); DATA(insert OID = 317 ( int4 PGNSP PGUID 12 1 0 0 0 f f f f t f i 1 0 23 "701" _null_ _null_ _null_ _null_ _null_ dtoi4 _null_ _null_ _null_ )); @@ -644,6 +650,8 @@ DATA(insert OID = 3134 ( btoidsortsupport PGNSP PGUID 12 1 0 0 0 f f f f t f i 1 DESCR("sort support"); DATA(insert OID = 404 ( btoidvectorcmp PGNSP PGUID 12 1 0 0 0 f f f f t f i 2 0 23 "30 30" _null_ _null_ _null_ _null_ _null_ btoidvectorcmp _null_ _null_ _null_ )); DESCR("less-equal-greater"); +DATA(insert OID = 3327 ( btint2vectorcmp PGNSP PGUID 12 1 0 0 0 f f f f t f i 2 0 23 "22 22" _null_ _null_ _null_ _null_ _null_ btint2vectorcmp _null_ _null_ _null_ )); +DESCR("less-equal-greater"); DATA(insert OID = 357 ( btabstimecmp PGNSP PGUID 12 1 0 0 0 f f f f t f i 2 0 23 "702 702" _null_ _null_ _null_ _null_ _null_ btabstimecmp _null_ _null_ _null_ )); DESCR("less-equal-greater"); DATA(insert OID = 358 ( btcharcmp PGNSP PGUID 12 1 0 0 0 f f f f t f i 2 0 23 "18 18" _null_ _null_ _null_ _null_ _null_ btcharcmp _null_ _null_ _null_ )); diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h index fc1679e..89f231a 100644 --- a/src/include/utils/builtins.h +++ b/src/include/utils/builtins.h @@ -187,6 +187,11 @@ extern Datum int2vectorout(PG_FUNCTION_ARGS); extern Datum int2vectorrecv(PG_FUNCTION_ARGS); extern Datum int2vectorsend(PG_FUNCTION_ARGS); extern Datum int2vectoreq(PG_FUNCTION_ARGS); +extern Datum int2vectorne(PG_FUNCTION_ARGS); +extern Datum int2vectorlt(PG_FUNCTION_ARGS); +extern Datum int2vectorle(PG_FUNCTION_ARGS); +extern Datum int2vectorge(PG_FUNCTION_ARGS); +extern Datum int2vectorgt(PG_FUNCTION_ARGS); extern Datum int4in(PG_FUNCTION_ARGS); extern Datum int4out(PG_FUNCTION_ARGS); extern Datum int4recv(PG_FUNCTION_ARGS); @@ -310,6 +315,7 @@ extern Datum btfloat48cmp(PG_FUNCTION_ARGS); extern Datum btfloat84cmp(PG_FUNCTION_ARGS); extern Datum btoidcmp(PG_FUNCTION_ARGS); extern Datum btoidvectorcmp(PG_FUNCTION_ARGS); +extern Datum btint2vectorcmp(PG_FUNCTION_ARGS); extern Datum btabstimecmp(PG_FUNCTION_ARGS); extern Datum btreltimecmp(PG_FUNCTION_ARGS); extern Datum bttintervalcmp(PG_FUNCTION_ARGS); diff --git a/src/include/utils/syscache.h b/src/include/utils/syscache.h index 1f48d61..f5ce307 100644 --- a/src/include/utils/syscache.h +++ b/src/include/utils/syscache.h @@ -66,7 +66,7 @@ enum SysCacheIdentifier INDEXRELID, LANGNAME, LANGOID, - MVCOEFFICIENT, + MVCOEFRELIDATTRS, NAMESPACENAME, NAMESPACEOID, OPERNAMENSP, -- 1.8.3.1