Skip to content

P
Postgres FD Implementation
Commit 8b411b8f authored by Tom Lane's avatar Tom Lane
Browse files
Options

Run reformat-dat-files to declutter the catalog data files. 

Things had gotten pretty messy here, apparently mostly but not
entirely the fault of the multirange patch.  No functional changes.
parent dce62490
Show whitespace changes
Inline Side-by-side
Showing with 229 additions and 174 deletions
src/include/catalog/pg_aggregate.dat
View file @ 8b411b8f
...@@ -544,7 +544,8 @@ ...@@ -544,7 +544,8 @@
aggcombinefn => 'range_intersect_agg_transfn', aggtranstype => 'anyrange' }, aggcombinefn => 'range_intersect_agg_transfn', aggtranstype => 'anyrange' },
{ aggfnoid => 'range_intersect_agg(anymultirange)', { aggfnoid => 'range_intersect_agg(anymultirange)',
aggtransfn => 'multirange_intersect_agg_transfn', aggtransfn => 'multirange_intersect_agg_transfn',
aggcombinefn => 'multirange_intersect_agg_transfn', aggtranstype => 'anymultirange' }, aggcombinefn => 'multirange_intersect_agg_transfn',
aggtranstype => 'anymultirange' },
{ aggfnoid => 'range_agg(anyrange)', aggtransfn => 'range_agg_transfn', { aggfnoid => 'range_agg(anyrange)', aggtransfn => 'range_agg_transfn',
aggfinalfn => 'range_agg_finalfn', aggfinalextra => 't', aggfinalfn => 'range_agg_finalfn', aggfinalextra => 't',
aggtranstype => 'internal' }, aggtranstype => 'internal' },
......
src/include/catalog/pg_amop.dat
View file @ 8b411b8f
...@@ -981,8 +981,8 @@ ...@@ -981,8 +981,8 @@
# record_ops # record_ops
{ amopfamily => 'hash/record_ops', amoplefttype => 'record', { amopfamily => 'hash/record_ops', amoplefttype => 'record',
amoprighttype => 'record', amopstrategy => '1', amoprighttype => 'record', amopstrategy => '1', amopopr => '=(record,record)',
amopopr => '=(record,record)', amopmethod => 'hash' }, amopmethod => 'hash' },
# text_ops # text_ops
{ amopfamily => 'hash/text_ops', amoplefttype => 'text', { amopfamily => 'hash/text_ops', amoplefttype => 'text',
......
src/include/catalog/pg_amproc.dat
View file @ 8b411b8f
...@@ -286,7 +286,8 @@ ...@@ -286,7 +286,8 @@
{ amprocfamily => 'btree/range_ops', amproclefttype => 'anyrange', { amprocfamily => 'btree/range_ops', amproclefttype => 'anyrange',
amprocrighttype => 'anyrange', amprocnum => '1', amproc => 'range_cmp' }, amprocrighttype => 'anyrange', amprocnum => '1', amproc => 'range_cmp' },
{ amprocfamily => 'btree/multirange_ops', amproclefttype => 'anymultirange', { amprocfamily => 'btree/multirange_ops', amproclefttype => 'anymultirange',
amprocrighttype => 'anymultirange', amprocnum => '1', amproc => 'multirange_cmp' }, amprocrighttype => 'anymultirange', amprocnum => '1',
amproc => 'multirange_cmp' },
{ amprocfamily => 'btree/jsonb_ops', amproclefttype => 'jsonb', { amprocfamily => 'btree/jsonb_ops', amproclefttype => 'jsonb',
amprocrighttype => 'jsonb', amprocnum => '1', amproc => 'jsonb_cmp' }, amprocrighttype => 'jsonb', amprocnum => '1', amproc => 'jsonb_cmp' },
{ amprocfamily => 'btree/xid8_ops', amproclefttype => 'xid8', { amprocfamily => 'btree/xid8_ops', amproclefttype => 'xid8',
...@@ -438,7 +439,8 @@ ...@@ -438,7 +439,8 @@
{ amprocfamily => 'hash/record_ops', amproclefttype => 'record', { amprocfamily => 'hash/record_ops', amproclefttype => 'record',
amprocrighttype => 'record', amprocnum => '1', amproc => 'hash_record' }, amprocrighttype => 'record', amprocnum => '1', amproc => 'hash_record' },
{ amprocfamily => 'hash/record_ops', amproclefttype => 'record', { amprocfamily => 'hash/record_ops', amproclefttype => 'record',
amprocrighttype => 'record', amprocnum => '2', amproc => 'hash_record_extended' }, amprocrighttype => 'record', amprocnum => '2',
amproc => 'hash_record_extended' },
{ amprocfamily => 'hash/pg_lsn_ops', amproclefttype => 'pg_lsn', { amprocfamily => 'hash/pg_lsn_ops', amproclefttype => 'pg_lsn',
amprocrighttype => 'pg_lsn', amprocnum => '1', amproc => 'pg_lsn_hash' }, amprocrighttype => 'pg_lsn', amprocnum => '1', amproc => 'pg_lsn_hash' },
{ amprocfamily => 'hash/pg_lsn_ops', amproclefttype => 'pg_lsn', { amprocfamily => 'hash/pg_lsn_ops', amproclefttype => 'pg_lsn',
...@@ -460,7 +462,8 @@ ...@@ -460,7 +462,8 @@
amprocrighttype => 'anyrange', amprocnum => '2', amprocrighttype => 'anyrange', amprocnum => '2',
amproc => 'hash_range_extended' }, amproc => 'hash_range_extended' },
{ amprocfamily => 'hash/multirange_ops', amproclefttype => 'anymultirange', { amprocfamily => 'hash/multirange_ops', amproclefttype => 'anymultirange',
amprocrighttype => 'anymultirange', amprocnum => '1', amproc => 'hash_multirange' }, amprocrighttype => 'anymultirange', amprocnum => '1',
amproc => 'hash_multirange' },
{ amprocfamily => 'hash/multirange_ops', amproclefttype => 'anymultirange', { amprocfamily => 'hash/multirange_ops', amproclefttype => 'anymultirange',
amprocrighttype => 'anymultirange', amprocnum => '2', amprocrighttype => 'anymultirange', amprocnum => '2',
amproc => 'hash_multirange_extended' }, amproc => 'hash_multirange_extended' },
...@@ -492,7 +495,8 @@ ...@@ -492,7 +495,8 @@
{ amprocfamily => 'gist/point_ops', amproclefttype => 'point', { amprocfamily => 'gist/point_ops', amproclefttype => 'point',
amprocrighttype => 'point', amprocnum => '9', amproc => 'gist_point_fetch' }, amprocrighttype => 'point', amprocnum => '9', amproc => 'gist_point_fetch' },
{ amprocfamily => 'gist/point_ops', amproclefttype => 'point', { amprocfamily => 'gist/point_ops', amproclefttype => 'point',
amprocrighttype => 'point', amprocnum => '11', amproc => 'gist_point_sortsupport' }, amprocrighttype => 'point', amprocnum => '11',
amproc => 'gist_point_sortsupport' },
{ amprocfamily => 'gist/box_ops', amproclefttype => 'box', { amprocfamily => 'gist/box_ops', amproclefttype => 'box',
amprocrighttype => 'box', amprocnum => '1', amproc => 'gist_box_consistent' }, amprocrighttype => 'box', amprocnum => '1', amproc => 'gist_box_consistent' },
{ amprocfamily => 'gist/box_ops', amproclefttype => 'box', { amprocfamily => 'gist/box_ops', amproclefttype => 'box',
...@@ -1311,7 +1315,8 @@ ...@@ -1311,7 +1315,8 @@
amprocrighttype => 'anyrange', amprocnum => '13', amprocrighttype => 'anyrange', amprocnum => '13',
amproc => 'range_contains' }, amproc => 'range_contains' },
{ amprocfamily => 'brin/range_inclusion_ops', amproclefttype => 'anyrange', { amprocfamily => 'brin/range_inclusion_ops', amproclefttype => 'anyrange',
amprocrighttype => 'anyrange', amprocnum => '14', amproc => 'isempty(anyrange)' }, amprocrighttype => 'anyrange', amprocnum => '14',
amproc => 'isempty(anyrange)' },
# minmax pg_lsn # minmax pg_lsn
{ amprocfamily => 'brin/pg_lsn_minmax_ops', amproclefttype => 'pg_lsn', { amprocfamily => 'brin/pg_lsn_minmax_ops', amproclefttype => 'pg_lsn',
......
src/include/catalog/pg_cast.dat
View file @ 8b411b8f
...@@ -531,16 +531,21 @@ ...@@ -531,16 +531,21 @@
castcontext => 'e', castmethod => 'f' }, castcontext => 'e', castmethod => 'f' },
# range to multirange # range to multirange
{ castsource => 'int4range', casttarget => 'int4multirange', castfunc => 'int4multirange(int4range)', { castsource => 'int4range', casttarget => 'int4multirange',
castcontext => 'e', castmethod => 'f' }, castfunc => 'int4multirange(int4range)', castcontext => 'e',
{ castsource => 'int8range', casttarget => 'int8multirange', castfunc => 'int8multirange(int8range)', castmethod => 'f' },
castcontext => 'e', castmethod => 'f' }, { castsource => 'int8range', casttarget => 'int8multirange',
{ castsource => 'numrange', casttarget => 'nummultirange', castfunc => 'nummultirange(numrange)', castfunc => 'int8multirange(int8range)', castcontext => 'e',
castcontext => 'e', castmethod => 'f' }, castmethod => 'f' },
{ castsource => 'daterange', casttarget => 'datemultirange', castfunc => 'datemultirange(daterange)', { castsource => 'numrange', casttarget => 'nummultirange',
castcontext => 'e', castmethod => 'f' }, castfunc => 'nummultirange(numrange)', castcontext => 'e',
{ castsource => 'tsrange', casttarget => 'tsmultirange', castfunc => 'tsmultirange(tsrange)', castmethod => 'f' },
castcontext => 'e', castmethod => 'f' }, { castsource => 'daterange', casttarget => 'datemultirange',
{ castsource => 'tstzrange', casttarget => 'tstzmultirange', castfunc => 'tstzmultirange(tstzrange)', castfunc => 'datemultirange(daterange)', castcontext => 'e',
castcontext => 'e', castmethod => 'f' }, castmethod => 'f' },
{ castsource => 'tsrange', casttarget => 'tsmultirange',
castfunc => 'tsmultirange(tsrange)', castcontext => 'e', castmethod => 'f' },
{ castsource => 'tstzrange', casttarget => 'tstzmultirange',
castfunc => 'tstzmultirange(tstzrange)', castcontext => 'e',
castmethod => 'f' },
] ]
src/include/catalog/pg_collation.dat
View file @ 8b411b8f
...@@ -15,7 +15,8 @@ ...@@ -15,7 +15,8 @@
{ oid => '100', oid_symbol => 'DEFAULT_COLLATION_OID', { oid => '100', oid_symbol => 'DEFAULT_COLLATION_OID',
descr => 'database\'s default collation', descr => 'database\'s default collation',
collname => 'default', collnamespace => 'PGNSP', collowner => 'PGUID', collname => 'default', collnamespace => 'PGNSP', collowner => 'PGUID',
collprovider => 'd', collencoding => '-1', collcollate => '', collctype => '' }, collprovider => 'd', collencoding => '-1', collcollate => '',
collctype => '' },
{ oid => '950', oid_symbol => 'C_COLLATION_OID', { oid => '950', oid_symbol => 'C_COLLATION_OID',
descr => 'standard C collation', descr => 'standard C collation',
collname => 'C', collnamespace => 'PGNSP', collowner => 'PGUID', collname => 'C', collnamespace => 'PGNSP', collowner => 'PGUID',
......
src/include/catalog/pg_opclass.dat
View file @ 8b411b8f
...@@ -114,8 +114,8 @@ ...@@ -114,8 +114,8 @@
opcfamily => 'hash/oidvector_ops', opcintype => 'oidvector' }, opcfamily => 'hash/oidvector_ops', opcintype => 'oidvector' },
{ opcmethod => 'btree', opcname => 'record_ops', { opcmethod => 'btree', opcname => 'record_ops',
opcfamily => 'btree/record_ops', opcintype => 'record' }, opcfamily => 'btree/record_ops', opcintype => 'record' },
{ opcmethod => 'hash', opcname => 'record_ops', { opcmethod => 'hash', opcname => 'record_ops', opcfamily => 'hash/record_ops',
opcfamily => 'hash/record_ops', opcintype => 'record' }, opcintype => 'record' },
{ opcmethod => 'btree', opcname => 'record_image_ops', { opcmethod => 'btree', opcname => 'record_image_ops',
opcfamily => 'btree/record_image_ops', opcintype => 'record', opcfamily => 'btree/record_image_ops', opcintype => 'record',
opcdefault => 'f' }, opcdefault => 'f' },
...@@ -232,12 +232,13 @@ ...@@ -232,12 +232,13 @@
opcintype => 'anyrange' }, opcintype => 'anyrange' },
{ opcmethod => 'spgist', opcname => 'range_ops', { opcmethod => 'spgist', opcname => 'range_ops',
opcfamily => 'spgist/range_ops', opcintype => 'anyrange' }, opcfamily => 'spgist/range_ops', opcintype => 'anyrange' },
{ opcmethod => 'btree', opcname => 'multirange_ops', opcfamily => 'btree/multirange_ops', { opcmethod => 'btree', opcname => 'multirange_ops',
opcintype => 'anymultirange' }, opcfamily => 'btree/multirange_ops', opcintype => 'anymultirange' },
{ opcmethod => 'hash', opcname => 'multirange_ops', opcfamily => 'hash/multirange_ops', { opcmethod => 'hash', opcname => 'multirange_ops',
opcintype => 'anymultirange' }, opcfamily => 'hash/multirange_ops', opcintype => 'anymultirange' },
{ opcmethod => 'gist', opcname => 'multirange_ops', opcfamily => 'gist/multirange_ops', { opcmethod => 'gist', opcname => 'multirange_ops',
opcintype => 'anymultirange', opckeytype => 'anyrange' }, opcfamily => 'gist/multirange_ops', opcintype => 'anymultirange',
opckeytype => 'anyrange' },
{ opcmethod => 'spgist', opcname => 'box_ops', opcfamily => 'spgist/box_ops', { opcmethod => 'spgist', opcname => 'box_ops', opcfamily => 'spgist/box_ops',
opcintype => 'box' }, opcintype => 'box' },
{ opcmethod => 'spgist', opcname => 'quad_point_ops', { opcmethod => 'spgist', opcname => 'quad_point_ops',
......
src/include/catalog/pg_operator.dat
View file @ 8b411b8f
...@@ -3009,8 +3009,8 @@ ...@@ -3009,8 +3009,8 @@
# generic record comparison operators # generic record comparison operators
{ oid => '2988', oid_symbol => 'RECORD_EQ_OP', descr => 'equal', { oid => '2988', oid_symbol => 'RECORD_EQ_OP', descr => 'equal',
oprname => '=', oprcanmerge => 't', oprcanhash => 't', oprleft => 'record', oprright => 'record', oprname => '=', oprcanmerge => 't', oprcanhash => 't', oprleft => 'record',
oprresult => 'bool', oprcom => '=(record,record)', oprright => 'record', oprresult => 'bool', oprcom => '=(record,record)',
oprnegate => '<>(record,record)', oprcode => 'record_eq', oprrest => 'eqsel', oprnegate => '<>(record,record)', oprcode => 'record_eq', oprrest => 'eqsel',
oprjoin => 'eqjoinsel' }, oprjoin => 'eqjoinsel' },
{ oid => '2989', descr => 'not equal', { oid => '2989', descr => 'not equal',
...@@ -3278,8 +3278,9 @@ ...@@ -3278,8 +3278,9 @@
oprresult => 'bool', oprcode => 'jsonb_path_match_opr(jsonb,jsonpath)', oprresult => 'bool', oprcode => 'jsonb_path_match_opr(jsonb,jsonpath)',
oprrest => 'matchingsel', oprjoin => 'matchingjoinsel' }, oprrest => 'matchingsel', oprjoin => 'matchingjoinsel' },
{ oid => '2860', descr => 'equal', { oid => '2860', descr => 'equal',
oprname => '=', oprcanmerge => 't', oprcanhash => 't', oprleft => 'anymultirange', oprname => '=', oprcanmerge => 't', oprcanhash => 't',
oprright => 'anymultirange', oprresult => 'bool', oprcom => '=(anymultirange,anymultirange)', oprleft => 'anymultirange', oprright => 'anymultirange', oprresult => 'bool',
oprcom => '=(anymultirange,anymultirange)',
oprnegate => '<>(anymultirange,anymultirange)', oprcode => 'multirange_eq', oprnegate => '<>(anymultirange,anymultirange)', oprcode => 'multirange_eq',
oprrest => 'eqsel', oprjoin => 'eqjoinsel' }, oprrest => 'eqsel', oprjoin => 'eqjoinsel' },
{ oid => '2861', descr => 'not equal', { oid => '2861', descr => 'not equal',
...@@ -3316,12 +3317,14 @@ ...@@ -3316,12 +3317,14 @@
oprresult => 'bool', oprcom => '&&(anymultirange,anyrange)', oprresult => 'bool', oprcom => '&&(anymultirange,anyrange)',
oprcode => 'range_overlaps_multirange', oprrest => 'multirangesel', oprcode => 'range_overlaps_multirange', oprrest => 'multirangesel',
oprjoin => 'areajoinsel' }, oprjoin => 'areajoinsel' },
{ oid => '2867', oid_symbol => 'OID_MULTIRANGE_OVERLAPS_RANGE_OP', descr => 'contains', { oid => '2867', oid_symbol => 'OID_MULTIRANGE_OVERLAPS_RANGE_OP',
descr => 'contains',
oprname => '&&', oprleft => 'anymultirange', oprright => 'anyrange', oprname => '&&', oprleft => 'anymultirange', oprright => 'anyrange',
oprresult => 'bool', oprcom => '&&(anyrange,anymultirange)', oprresult => 'bool', oprcom => '&&(anyrange,anymultirange)',
oprcode => 'multirange_overlaps_range', oprrest => 'multirangesel', oprcode => 'multirange_overlaps_range', oprrest => 'multirangesel',
oprjoin => 'areajoinsel' }, oprjoin => 'areajoinsel' },
{ oid => '2868', oid_symbol => 'OID_MULTIRANGE_OVERLAPS_MULTIRANGE_OP', descr => 'contains', { oid => '2868', oid_symbol => 'OID_MULTIRANGE_OVERLAPS_MULTIRANGE_OP',
descr => 'contains',
oprname => '&&', oprleft => 'anymultirange', oprright => 'anymultirange', oprname => '&&', oprleft => 'anymultirange', oprright => 'anymultirange',
oprresult => 'bool', oprcom => '&&(anymultirange,anymultirange)', oprresult => 'bool', oprcom => '&&(anymultirange,anymultirange)',
oprcode => 'multirange_overlaps_multirange', oprrest => 'multirangesel', oprcode => 'multirange_overlaps_multirange', oprrest => 'multirangesel',
...@@ -3332,12 +3335,14 @@ ...@@ -3332,12 +3335,14 @@
oprresult => 'bool', oprcom => '<@(anyelement,anymultirange)', oprresult => 'bool', oprcom => '<@(anyelement,anymultirange)',
oprcode => 'multirange_contains_elem', oprrest => 'multirangesel', oprcode => 'multirange_contains_elem', oprrest => 'multirangesel',
oprjoin => 'contjoinsel' }, oprjoin => 'contjoinsel' },
{ oid => '2870', oid_symbol => 'OID_MULTIRANGE_CONTAINS_RANGE_OP', descr => 'contains', { oid => '2870', oid_symbol => 'OID_MULTIRANGE_CONTAINS_RANGE_OP',
descr => 'contains',
oprname => '@>', oprleft => 'anymultirange', oprright => 'anyrange', oprname => '@>', oprleft => 'anymultirange', oprright => 'anyrange',
oprresult => 'bool', oprcom => '<@(anyrange,anymultirange)', oprresult => 'bool', oprcom => '<@(anyrange,anymultirange)',
oprcode => 'multirange_contains_range', oprrest => 'multirangesel', oprcode => 'multirange_contains_range', oprrest => 'multirangesel',
oprjoin => 'contjoinsel' }, oprjoin => 'contjoinsel' },
{ oid => '2871', oid_symbol => 'OID_MULTIRANGE_CONTAINS_MULTIRANGE_OP', descr => 'contains', { oid => '2871', oid_symbol => 'OID_MULTIRANGE_CONTAINS_MULTIRANGE_OP',
descr => 'contains',
oprname => '@>', oprleft => 'anymultirange', oprright => 'anymultirange', oprname => '@>', oprleft => 'anymultirange', oprright => 'anymultirange',
oprresult => 'bool', oprcom => '<@(anymultirange,anymultirange)', oprresult => 'bool', oprcom => '<@(anymultirange,anymultirange)',
oprcode => 'multirange_contains_multirange', oprrest => 'multirangesel', oprcode => 'multirange_contains_multirange', oprrest => 'multirangesel',
...@@ -3375,44 +3380,47 @@ ...@@ -3375,44 +3380,47 @@
{ oid => '2875', oid_symbol => 'OID_RANGE_OVERLAPS_LEFT_MULTIRANGE_OP', { oid => '2875', oid_symbol => 'OID_RANGE_OVERLAPS_LEFT_MULTIRANGE_OP',
descr => 'overlaps or is left of', descr => 'overlaps or is left of',
oprname => '&<', oprleft => 'anyrange', oprright => 'anymultirange', oprname => '&<', oprleft => 'anyrange', oprright => 'anymultirange',
oprresult => 'bool', oprcode => 'range_overleft_multirange', oprrest => 'multirangesel', oprresult => 'bool', oprcode => 'range_overleft_multirange',
oprjoin => 'scalarltjoinsel' }, oprrest => 'multirangesel', oprjoin => 'scalarltjoinsel' },
{ oid => '2876', oid_symbol => 'OID_MULTIRANGE_OVERLAPS_LEFT_RANGE_OP', { oid => '2876', oid_symbol => 'OID_MULTIRANGE_OVERLAPS_LEFT_RANGE_OP',
descr => 'overlaps or is left of', descr => 'overlaps or is left of',
oprname => '&<', oprleft => 'anymultirange', oprright => 'anyrange', oprname => '&<', oprleft => 'anymultirange', oprright => 'anyrange',
oprresult => 'bool', oprcode => 'multirange_overleft_range', oprrest => 'multirangesel', oprresult => 'bool', oprcode => 'multirange_overleft_range',
oprjoin => 'scalarltjoinsel' }, oprrest => 'multirangesel', oprjoin => 'scalarltjoinsel' },
{ oid => '2877', oid_symbol => 'OID_MULTIRANGE_OVERLAPS_LEFT_MULTIRANGE_OP', { oid => '2877', oid_symbol => 'OID_MULTIRANGE_OVERLAPS_LEFT_MULTIRANGE_OP',
descr => 'overlaps or is left of', descr => 'overlaps or is left of',
oprname => '&<', oprleft => 'anymultirange', oprright => 'anymultirange', oprname => '&<', oprleft => 'anymultirange', oprright => 'anymultirange',
oprresult => 'bool', oprcode => 'multirange_overleft_multirange', oprrest => 'multirangesel', oprresult => 'bool', oprcode => 'multirange_overleft_multirange',
oprjoin => 'scalargtjoinsel' }, oprrest => 'multirangesel', oprjoin => 'scalargtjoinsel' },
{ oid => '3585', oid_symbol => 'OID_RANGE_OVERLAPS_RIGHT_MULTIRANGE_OP', { oid => '3585', oid_symbol => 'OID_RANGE_OVERLAPS_RIGHT_MULTIRANGE_OP',
descr => 'overlaps or is right of', descr => 'overlaps or is right of',
oprname => '&>', oprleft => 'anyrange', oprright => 'anymultirange', oprname => '&>', oprleft => 'anyrange', oprright => 'anymultirange',
oprresult => 'bool', oprcode => 'range_overright_multirange', oprrest => 'multirangesel', oprresult => 'bool', oprcode => 'range_overright_multirange',
oprjoin => 'scalargtjoinsel' }, oprrest => 'multirangesel', oprjoin => 'scalargtjoinsel' },
{ oid => '4035', oid_symbol => 'OID_MULTIRANGE_OVERLAPS_RIGHT_RANGE_OP', { oid => '4035', oid_symbol => 'OID_MULTIRANGE_OVERLAPS_RIGHT_RANGE_OP',
descr => 'overlaps or is right of', descr => 'overlaps or is right of',
oprname => '&>', oprleft => 'anymultirange', oprright => 'anyrange', oprname => '&>', oprleft => 'anymultirange', oprright => 'anyrange',
oprresult => 'bool', oprcode => 'multirange_overright_range', oprrest => 'multirangesel', oprresult => 'bool', oprcode => 'multirange_overright_range',
oprjoin => 'scalargtjoinsel' }, oprrest => 'multirangesel', oprjoin => 'scalargtjoinsel' },
{ oid => '4142', oid_symbol => 'OID_MULTIRANGE_OVERLAPS_RIGHT_MULTIRANGE_OP', { oid => '4142', oid_symbol => 'OID_MULTIRANGE_OVERLAPS_RIGHT_MULTIRANGE_OP',
descr => 'overlaps or is right of', descr => 'overlaps or is right of',
oprname => '&>', oprleft => 'anymultirange', oprright => 'anymultirange', oprname => '&>', oprleft => 'anymultirange', oprright => 'anymultirange',
oprresult => 'bool', oprcode => 'multirange_overright_multirange', oprrest => 'multirangesel', oprresult => 'bool', oprcode => 'multirange_overright_multirange',
oprjoin => 'scalargtjoinsel' }, oprrest => 'multirangesel', oprjoin => 'scalargtjoinsel' },
{ oid => '4179', oid_symbol => 'OID_RANGE_ADJACENT_MULTIRANGE_OP', descr => 'is adjacent to', { oid => '4179', oid_symbol => 'OID_RANGE_ADJACENT_MULTIRANGE_OP',
descr => 'is adjacent to',
oprname => '-|-', oprleft => 'anyrange', oprright => 'anymultirange', oprname => '-|-', oprleft => 'anyrange', oprright => 'anymultirange',
oprresult => 'bool', oprcom => '-|-(anymultirange,anyrange)', oprresult => 'bool', oprcom => '-|-(anymultirange,anyrange)',
oprcode => 'range_adjacent_multirange', oprrest => 'matchingsel', oprcode => 'range_adjacent_multirange', oprrest => 'matchingsel',
oprjoin => 'matchingjoinsel' }, oprjoin => 'matchingjoinsel' },
{ oid => '4180', oid_symbol => 'OID_MULTIRANGE_ADJACENT_RANGE_OP', descr => 'is adjacent to', { oid => '4180', oid_symbol => 'OID_MULTIRANGE_ADJACENT_RANGE_OP',
descr => 'is adjacent to',
oprname => '-|-', oprleft => 'anymultirange', oprright => 'anyrange', oprname => '-|-', oprleft => 'anymultirange', oprright => 'anyrange',
oprresult => 'bool', oprcom => '-|-(anyrange,anymultirange)', oprresult => 'bool', oprcom => '-|-(anyrange,anymultirange)',
oprcode => 'multirange_adjacent_range', oprrest => 'matchingsel', oprcode => 'multirange_adjacent_range', oprrest => 'matchingsel',
oprjoin => 'matchingjoinsel' }, oprjoin => 'matchingjoinsel' },
{ oid => '4198', oid_symbol => 'OID_MULTIRANGE_ADJACENT_MULTIRANGE_OP', descr => 'is adjacent to', { oid => '4198', oid_symbol => 'OID_MULTIRANGE_ADJACENT_MULTIRANGE_OP',
descr => 'is adjacent to',
oprname => '-|-', oprleft => 'anymultirange', oprright => 'anymultirange', oprname => '-|-', oprleft => 'anymultirange', oprright => 'anymultirange',
oprresult => 'bool', oprcom => '-|-(anymultirange,anymultirange)', oprresult => 'bool', oprcom => '-|-(anymultirange,anymultirange)',
oprcode => 'multirange_adjacent_multirange', oprrest => 'matchingsel', oprcode => 'multirange_adjacent_multirange', oprrest => 'matchingsel',
...@@ -3428,32 +3436,38 @@ ...@@ -3428,32 +3436,38 @@
oprname => '*', oprleft => 'anymultirange', oprright => 'anymultirange', oprname => '*', oprleft => 'anymultirange', oprright => 'anymultirange',
oprresult => 'anymultirange', oprcom => '*(anymultirange,anymultirange)', oprresult => 'anymultirange', oprcom => '*(anymultirange,anymultirange)',
oprcode => 'multirange_intersect' }, oprcode => 'multirange_intersect' },
{ oid => '4395', oid_symbol => 'OID_RANGE_LEFT_MULTIRANGE_OP', descr => 'is left of', { oid => '4395', oid_symbol => 'OID_RANGE_LEFT_MULTIRANGE_OP',
descr => 'is left of',
oprname => '<<', oprleft => 'anyrange', oprright => 'anymultirange', oprname => '<<', oprleft => 'anyrange', oprright => 'anymultirange',
oprresult => 'bool', oprcom => '>>(anymultirange,anyrange)', oprresult => 'bool', oprcom => '>>(anymultirange,anyrange)',
oprcode => 'range_before_multirange', oprrest => 'multirangesel', oprcode => 'range_before_multirange', oprrest => 'multirangesel',
oprjoin => 'scalarltjoinsel' }, oprjoin => 'scalarltjoinsel' },
{ oid => '4396', oid_symbol => 'OID_MULTIRANGE_LEFT_RANGE_OP', descr => 'is left of', { oid => '4396', oid_symbol => 'OID_MULTIRANGE_LEFT_RANGE_OP',
descr => 'is left of',
oprname => '<<', oprleft => 'anymultirange', oprright => 'anyrange', oprname => '<<', oprleft => 'anymultirange', oprright => 'anyrange',
oprresult => 'bool', oprcom => '>>(anyrange,anymultirange)', oprresult => 'bool', oprcom => '>>(anyrange,anymultirange)',
oprcode => 'multirange_before_range', oprrest => 'multirangesel', oprcode => 'multirange_before_range', oprrest => 'multirangesel',
oprjoin => 'scalarltjoinsel' }, oprjoin => 'scalarltjoinsel' },
{ oid => '4397', oid_symbol => 'OID_MULTIRANGE_LEFT_MULTIRANGE_OP', descr => 'is left of', { oid => '4397', oid_symbol => 'OID_MULTIRANGE_LEFT_MULTIRANGE_OP',
descr => 'is left of',
oprname => '<<', oprleft => 'anymultirange', oprright => 'anymultirange', oprname => '<<', oprleft => 'anymultirange', oprright => 'anymultirange',
oprresult => 'bool', oprcom => '>>(anymultirange,anymultirange)', oprresult => 'bool', oprcom => '>>(anymultirange,anymultirange)',
oprcode => 'multirange_before_multirange', oprrest => 'multirangesel', oprcode => 'multirange_before_multirange', oprrest => 'multirangesel',
oprjoin => 'scalarltjoinsel' }, oprjoin => 'scalarltjoinsel' },
{ oid => '4398', oid_symbol => 'OID_RANGE_RIGHT_MULTIRANGE_OP', descr => 'is right of', { oid => '4398', oid_symbol => 'OID_RANGE_RIGHT_MULTIRANGE_OP',
descr => 'is right of',
oprname => '>>', oprleft => 'anyrange', oprright => 'anymultirange', oprname => '>>', oprleft => 'anyrange', oprright => 'anymultirange',
oprresult => 'bool', oprcom => '<<(anymultirange,anyrange)', oprresult => 'bool', oprcom => '<<(anymultirange,anyrange)',
oprcode => 'range_after_multirange', oprrest => 'multirangesel', oprcode => 'range_after_multirange', oprrest => 'multirangesel',
oprjoin => 'scalargtjoinsel' }, oprjoin => 'scalargtjoinsel' },
{ oid => '4399', oid_symbol => 'OID_MULTIRANGE_RIGHT_RANGE_OP', descr => 'is right of', { oid => '4399', oid_symbol => 'OID_MULTIRANGE_RIGHT_RANGE_OP',
descr => 'is right of',
oprname => '>>', oprleft => 'anymultirange', oprright => 'anyrange', oprname => '>>', oprleft => 'anymultirange', oprright => 'anyrange',
oprresult => 'bool', oprcom => '<<(anyrange,anymultirange)', oprresult => 'bool', oprcom => '<<(anyrange,anymultirange)',
oprcode => 'multirange_after_range', oprrest => 'multirangesel', oprcode => 'multirange_after_range', oprrest => 'multirangesel',
oprjoin => 'scalargtjoinsel' }, oprjoin => 'scalargtjoinsel' },
{ oid => '4400', oid_symbol => 'OID_MULTIRANGE_RIGHT_MULTIRANGE_OP', descr => 'is right of', { oid => '4400', oid_symbol => 'OID_MULTIRANGE_RIGHT_MULTIRANGE_OP',
descr => 'is right of',
oprname => '>>', oprleft => 'anymultirange', oprright => 'anymultirange', oprname => '>>', oprleft => 'anymultirange', oprright => 'anymultirange',
oprresult => 'bool', oprcom => '<<(anymultirange,anymultirange)', oprresult => 'bool', oprcom => '<<(anymultirange,anymultirange)',
oprcode => 'multirange_after_multirange', oprrest => 'multirangesel', oprcode => 'multirange_after_multirange', oprrest => 'multirangesel',
......
src/include/catalog/pg_proc.dat
View file @ 8b411b8f
...@@ -9693,8 +9693,8 @@ ...@@ -9693,8 +9693,8 @@
proname => 'hash_record', prorettype => 'int4', proargtypes => 'record', proname => 'hash_record', prorettype => 'int4', proargtypes => 'record',
prosrc => 'hash_record' }, prosrc => 'hash_record' },
{ oid => '9610', descr => 'hash', { oid => '9610', descr => 'hash',
proname => 'hash_record_extended', prorettype => 'int8', proargtypes => 'record int8', proname => 'hash_record_extended', prorettype => 'int8',
prosrc => 'hash_record_extended' }, proargtypes => 'record int8', prosrc => 'hash_record_extended' },
# record comparison using raw byte images # record comparison using raw byte images
{ oid => '3181', { oid => '3181',
...@@ -9928,8 +9928,7 @@ ...@@ -9928,8 +9928,7 @@
prosrc => 'multirange_gist_consistent' }, prosrc => 'multirange_gist_consistent' },
{ oid => '8019', descr => 'GiST support', { oid => '8019', descr => 'GiST support',
proname => 'multirange_gist_compress', prorettype => 'internal', proname => 'multirange_gist_compress', prorettype => 'internal',
proargtypes => 'internal', proargtypes => 'internal', prosrc => 'multirange_gist_compress' },
prosrc => 'multirange_gist_compress' },
{ oid => '3902', descr => 'hash a range', { oid => '3902', descr => 'hash a range',
proname => 'hash_range', prorettype => 'int4', proargtypes => 'anyrange', proname => 'hash_range', prorettype => 'int4', proargtypes => 'anyrange',
prosrc => 'hash_range' }, prosrc => 'hash_range' },
...@@ -9944,11 +9943,11 @@ ...@@ -9944,11 +9943,11 @@
proargtypes => 'internal oid internal int4', prosrc => 'rangesel' }, proargtypes => 'internal oid internal int4', prosrc => 'rangesel' },
{ oid => '4401', descr => 'range aggregate by intersecting', { oid => '4401', descr => 'range aggregate by intersecting',
proname => 'range_intersect_agg_transfn', prorettype => 'anyrange', proname => 'range_intersect_agg_transfn', prorettype => 'anyrange',
proargtypes => 'anyrange anyrange', prosrc => 'range_intersect_agg_transfn'}, proargtypes => 'anyrange anyrange', prosrc => 'range_intersect_agg_transfn' },
{ oid => '4450', descr => 'range aggregate by intersecting', { oid => '4450', descr => 'range aggregate by intersecting',
proname => 'range_intersect_agg', prokind => 'a', proisstrict => 'f', proname => 'range_intersect_agg', prokind => 'a', proisstrict => 'f',
prorettype => 'anyrange', proargtypes => 'anyrange', prorettype => 'anyrange', proargtypes => 'anyrange',
prosrc => 'aggregate_dummy'}, prosrc => 'aggregate_dummy' },
{ oid => '3914', descr => 'convert an int4 range to canonical form', { oid => '3914', descr => 'convert an int4 range to canonical form',
proname => 'int4range_canonical', prorettype => 'int4range', proname => 'int4range_canonical', prorettype => 'int4range',
...@@ -10019,8 +10018,9 @@ ...@@ -10019,8 +10018,9 @@
# functions for multiranges # functions for multiranges
{ oid => '4229', descr => 'I/O', { oid => '4229', descr => 'I/O',
proname => 'anymultirange_in', provolatile => 's', prorettype => 'anymultirange', proname => 'anymultirange_in', provolatile => 's',
proargtypes => 'cstring oid int4', prosrc => 'anymultirange_in' }, prorettype => 'anymultirange', proargtypes => 'cstring oid int4',
prosrc => 'anymultirange_in' },
{ oid => '4230', descr => 'I/O', { oid => '4230', descr => 'I/O',
proname => 'anymultirange_out', provolatile => 's', prorettype => 'cstring', proname => 'anymultirange_out', provolatile => 's', prorettype => 'cstring',
proargtypes => 'anymultirange', prosrc => 'anymultirange_out' }, proargtypes => 'anymultirange', prosrc => 'anymultirange_out' },
...@@ -10031,20 +10031,21 @@ ...@@ -10031,20 +10031,21 @@
proname => 'multirange_out', provolatile => 's', prorettype => 'cstring', proname => 'multirange_out', provolatile => 's', prorettype => 'cstring',
proargtypes => 'anymultirange', prosrc => 'multirange_out' }, proargtypes => 'anymultirange', prosrc => 'multirange_out' },
{ oid => '4233', descr => 'I/O', { oid => '4233', descr => 'I/O',
proname => 'multirange_recv', provolatile => 's', prorettype => 'anymultirange', proname => 'multirange_recv', provolatile => 's',
proargtypes => 'internal oid int4', prosrc => 'multirange_recv' }, prorettype => 'anymultirange', proargtypes => 'internal oid int4',
prosrc => 'multirange_recv' },
{ oid => '4234', descr => 'I/O', { oid => '4234', descr => 'I/O',
proname => 'multirange_send', provolatile => 's', prorettype => 'bytea', proname => 'multirange_send', provolatile => 's', prorettype => 'bytea',
proargtypes => 'anymultirange', prosrc => 'multirange_send' }, proargtypes => 'anymultirange', prosrc => 'multirange_send' },
{ oid => '4235', descr => 'lower bound of multirange', { oid => '4235', descr => 'lower bound of multirange',
proname => 'lower', prorettype => 'anyelement', proargtypes => 'anymultirange', proname => 'lower', prorettype => 'anyelement',
prosrc => 'multirange_lower' }, proargtypes => 'anymultirange', prosrc => 'multirange_lower' },
{ oid => '4236', descr => 'upper bound of multirange', { oid => '4236', descr => 'upper bound of multirange',
proname => 'upper', prorettype => 'anyelement', proargtypes => 'anymultirange', proname => 'upper', prorettype => 'anyelement',
prosrc => 'multirange_upper' }, proargtypes => 'anymultirange', prosrc => 'multirange_upper' },
{ oid => '4237', descr => 'is the multirange empty?', { oid => '4237', descr => 'is the multirange empty?',
proname => 'isempty', prorettype => 'bool', proname => 'isempty', prorettype => 'bool', proargtypes => 'anymultirange',
proargtypes => 'anymultirange', prosrc => 'multirange_empty' }, prosrc => 'multirange_empty' },
{ oid => '4238', descr => 'is the multirange\'s lower bound inclusive?', { oid => '4238', descr => 'is the multirange\'s lower bound inclusive?',
proname => 'lower_inc', prorettype => 'bool', proargtypes => 'anymultirange', proname => 'lower_inc', prorettype => 'bool', proargtypes => 'anymultirange',
prosrc => 'multirange_lower_inc' }, prosrc => 'multirange_lower_inc' },
...@@ -10071,55 +10072,72 @@ ...@@ -10071,55 +10072,72 @@
proargtypes => 'anymultirange anymultirange', prosrc => 'multirange_ne' }, proargtypes => 'anymultirange anymultirange', prosrc => 'multirange_ne' },
{ oid => '4246', { oid => '4246',
proname => 'range_overlaps_multirange', prorettype => 'bool', proname => 'range_overlaps_multirange', prorettype => 'bool',
proargtypes => 'anyrange anymultirange', prosrc => 'range_overlaps_multirange' }, proargtypes => 'anyrange anymultirange',
prosrc => 'range_overlaps_multirange' },
{ oid => '4247', { oid => '4247',
proname => 'multirange_overlaps_range', prorettype => 'bool', proname => 'multirange_overlaps_range', prorettype => 'bool',
proargtypes => 'anymultirange anyrange', prosrc => 'multirange_overlaps_range' }, proargtypes => 'anymultirange anyrange',
prosrc => 'multirange_overlaps_range' },
{ oid => '4248', { oid => '4248',
proname => 'multirange_overlaps_multirange', prorettype => 'bool', proname => 'multirange_overlaps_multirange', prorettype => 'bool',
proargtypes => 'anymultirange anymultirange', prosrc => 'multirange_overlaps_multirange' }, proargtypes => 'anymultirange anymultirange',
prosrc => 'multirange_overlaps_multirange' },
{ oid => '4249', { oid => '4249',
proname => 'multirange_contains_elem', prorettype => 'bool', proname => 'multirange_contains_elem', prorettype => 'bool',
proargtypes => 'anymultirange anyelement', prosrc => 'multirange_contains_elem' }, proargtypes => 'anymultirange anyelement',
prosrc => 'multirange_contains_elem' },
{ oid => '4250', { oid => '4250',
proname => 'multirange_contains_range', prorettype => 'bool', proname => 'multirange_contains_range', prorettype => 'bool',
proargtypes => 'anymultirange anyrange', prosrc => 'multirange_contains_range' }, proargtypes => 'anymultirange anyrange',
prosrc => 'multirange_contains_range' },
{ oid => '4251', { oid => '4251',
proname => 'multirange_contains_multirange', prorettype => 'bool', proname => 'multirange_contains_multirange', prorettype => 'bool',
proargtypes => 'anymultirange anymultirange', prosrc => 'multirange_contains_multirange' }, proargtypes => 'anymultirange anymultirange',
prosrc => 'multirange_contains_multirange' },
{ oid => '4252', { oid => '4252',
proname => 'elem_contained_by_multirange', prorettype => 'bool', proname => 'elem_contained_by_multirange', prorettype => 'bool',
proargtypes => 'anyelement anymultirange', prosrc => 'elem_contained_by_multirange' }, proargtypes => 'anyelement anymultirange',
prosrc => 'elem_contained_by_multirange' },
{ oid => '4253', { oid => '4253',
proname => 'range_contained_by_multirange', prorettype => 'bool', proname => 'range_contained_by_multirange', prorettype => 'bool',
proargtypes => 'anyrange anymultirange', prosrc => 'range_contained_by_multirange' }, proargtypes => 'anyrange anymultirange',
prosrc => 'range_contained_by_multirange' },
{ oid => '4541', { oid => '4541',
proname => 'range_contains_multirange', prorettype => 'bool', proname => 'range_contains_multirange', prorettype => 'bool',
proargtypes => 'anyrange anymultirange', prosrc => 'range_contains_multirange' }, proargtypes => 'anyrange anymultirange',
prosrc => 'range_contains_multirange' },
{ oid => '4542', { oid => '4542',
proname => 'multirange_contained_by_range', prorettype => 'bool', proname => 'multirange_contained_by_range', prorettype => 'bool',
proargtypes => 'anymultirange anyrange', prosrc => 'multirange_contained_by_range' }, proargtypes => 'anymultirange anyrange',
prosrc => 'multirange_contained_by_range' },
{ oid => '4254', { oid => '4254',
proname => 'multirange_contained_by_multirange', prorettype => 'bool', proname => 'multirange_contained_by_multirange', prorettype => 'bool',
proargtypes => 'anymultirange anymultirange', prosrc => 'multirange_contained_by_multirange' }, proargtypes => 'anymultirange anymultirange',
prosrc => 'multirange_contained_by_multirange' },
{ oid => '4255', { oid => '4255',
proname => 'range_adjacent_multirange', prorettype => 'bool', proname => 'range_adjacent_multirange', prorettype => 'bool',
proargtypes => 'anyrange anymultirange', prosrc => 'range_adjacent_multirange' }, proargtypes => 'anyrange anymultirange',
prosrc => 'range_adjacent_multirange' },
{ oid => '4256', { oid => '4256',
proname => 'multirange_adjacent_multirange', prorettype => 'bool', proname => 'multirange_adjacent_multirange', prorettype => 'bool',
proargtypes => 'anymultirange anymultirange', prosrc => 'multirange_adjacent_multirange' }, proargtypes => 'anymultirange anymultirange',
prosrc => 'multirange_adjacent_multirange' },
{ oid => '4257', { oid => '4257',
proname => 'multirange_adjacent_range', prorettype => 'bool', proname => 'multirange_adjacent_range', prorettype => 'bool',
proargtypes => 'anymultirange anyrange', prosrc => 'multirange_adjacent_range' }, proargtypes => 'anymultirange anyrange',
prosrc => 'multirange_adjacent_range' },
{ oid => '4258', { oid => '4258',
proname => 'range_before_multirange', prorettype => 'bool', proname => 'range_before_multirange', prorettype => 'bool',
proargtypes => 'anyrange anymultirange', prosrc => 'range_before_multirange' }, proargtypes => 'anyrange anymultirange',
prosrc => 'range_before_multirange' },
{ oid => '4259', { oid => '4259',
proname => 'multirange_before_range', prorettype => 'bool', proname => 'multirange_before_range', prorettype => 'bool',
proargtypes => 'anymultirange anyrange', prosrc => 'multirange_before_range' }, proargtypes => 'anymultirange anyrange',
prosrc => 'multirange_before_range' },
{ oid => '4260', { oid => '4260',
proname => 'multirange_before_multirange', prorettype => 'bool', proname => 'multirange_before_multirange', prorettype => 'bool',
proargtypes => 'anymultirange anymultirange', prosrc => 'multirange_before_multirange' }, proargtypes => 'anymultirange anymultirange',
prosrc => 'multirange_before_multirange' },
{ oid => '4261', { oid => '4261',
proname => 'range_after_multirange', prorettype => 'bool', proname => 'range_after_multirange', prorettype => 'bool',
proargtypes => 'anyrange anymultirange', prosrc => 'range_after_multirange' }, proargtypes => 'anyrange anymultirange', prosrc => 'range_after_multirange' },
...@@ -10128,25 +10146,32 @@ ...@@ -10128,25 +10146,32 @@
proargtypes => 'anymultirange anyrange', prosrc => 'multirange_after_range' }, proargtypes => 'anymultirange anyrange', prosrc => 'multirange_after_range' },
{ oid => '4263', { oid => '4263',
proname => 'multirange_after_multirange', prorettype => 'bool', proname => 'multirange_after_multirange', prorettype => 'bool',
proargtypes => 'anymultirange anymultirange', prosrc => 'multirange_after_multirange' }, proargtypes => 'anymultirange anymultirange',
prosrc => 'multirange_after_multirange' },
{ oid => '4264', { oid => '4264',
proname => 'range_overleft_multirange', prorettype => 'bool', proname => 'range_overleft_multirange', prorettype => 'bool',
proargtypes => 'anyrange anymultirange', prosrc => 'range_overleft_multirange' }, proargtypes => 'anyrange anymultirange',
prosrc => 'range_overleft_multirange' },
{ oid => '4265', { oid => '4265',
proname => 'multirange_overleft_range', prorettype => 'bool', proname => 'multirange_overleft_range', prorettype => 'bool',
proargtypes => 'anymultirange anyrange', prosrc => 'multirange_overleft_range' }, proargtypes => 'anymultirange anyrange',
prosrc => 'multirange_overleft_range' },
{ oid => '4266', { oid => '4266',
proname => 'multirange_overleft_multirange', prorettype => 'bool', proname => 'multirange_overleft_multirange', prorettype => 'bool',
proargtypes => 'anymultirange anymultirange', prosrc => 'multirange_overleft_multirange' }, proargtypes => 'anymultirange anymultirange',
prosrc => 'multirange_overleft_multirange' },
{ oid => '4267', { oid => '4267',
proname => 'range_overright_multirange', prorettype => 'bool', proname => 'range_overright_multirange', prorettype => 'bool',
proargtypes => 'anyrange anymultirange', prosrc => 'range_overright_multirange' }, proargtypes => 'anyrange anymultirange',
prosrc => 'range_overright_multirange' },
{ oid => '4268', { oid => '4268',
proname => 'multirange_overright_range', prorettype => 'bool', proname => 'multirange_overright_range', prorettype => 'bool',
proargtypes => 'anymultirange anyrange', prosrc => 'multirange_overright_range' }, proargtypes => 'anymultirange anyrange',
prosrc => 'multirange_overright_range' },
{ oid => '4269', { oid => '4269',
proname => 'multirange_overright_multirange', prorettype => 'bool', proname => 'multirange_overright_multirange', prorettype => 'bool',
proargtypes => 'anymultirange anymultirange', prosrc => 'multirange_overright_multirange' }, proargtypes => 'anymultirange anymultirange',
prosrc => 'multirange_overright_multirange' },
{ oid => '4270', { oid => '4270',
proname => 'multirange_union', prorettype => 'anymultirange', proname => 'multirange_union', prorettype => 'anymultirange',
proargtypes => 'anymultirange anymultirange', prosrc => 'multirange_union' }, proargtypes => 'anymultirange anymultirange', prosrc => 'multirange_union' },
...@@ -10155,7 +10180,8 @@ ...@@ -10155,7 +10180,8 @@
proargtypes => 'anymultirange anymultirange', prosrc => 'multirange_minus' }, proargtypes => 'anymultirange anymultirange', prosrc => 'multirange_minus' },
{ oid => '4272', { oid => '4272',
proname => 'multirange_intersect', prorettype => 'anymultirange', proname => 'multirange_intersect', prorettype => 'anymultirange',
proargtypes => 'anymultirange anymultirange', prosrc => 'multirange_intersect' }, proargtypes => 'anymultirange anymultirange',
prosrc => 'multirange_intersect' },
{ oid => '4273', descr => 'less-equal-greater', { oid => '4273', descr => 'less-equal-greater',
proname => 'multirange_cmp', prorettype => 'int4', proname => 'multirange_cmp', prorettype => 'int4',
proargtypes => 'anymultirange anymultirange', prosrc => 'multirange_cmp' }, proargtypes => 'anymultirange anymultirange', prosrc => 'multirange_cmp' },
...@@ -10172,8 +10198,8 @@ ...@@ -10172,8 +10198,8 @@
proname => 'multirange_gt', prorettype => 'bool', proname => 'multirange_gt', prorettype => 'bool',
proargtypes => 'anymultirange anymultirange', prosrc => 'multirange_gt' }, proargtypes => 'anymultirange anymultirange', prosrc => 'multirange_gt' },
{ oid => '4278', descr => 'hash a multirange', { oid => '4278', descr => 'hash a multirange',
proname => 'hash_multirange', prorettype => 'int4', proargtypes => 'anymultirange', proname => 'hash_multirange', prorettype => 'int4',
prosrc => 'hash_multirange' }, proargtypes => 'anymultirange', prosrc => 'hash_multirange' },
{ oid => '4279', descr => 'hash a multirange', { oid => '4279', descr => 'hash a multirange',
proname => 'hash_multirange_extended', prorettype => 'int8', proname => 'hash_multirange_extended', prorettype => 'int8',
proargtypes => 'anymultirange int8', prosrc => 'hash_multirange_extended' }, proargtypes => 'anymultirange int8', prosrc => 'hash_multirange_extended' },
...@@ -10183,35 +10209,30 @@ ...@@ -10183,35 +10209,30 @@
prorettype => 'int4multirange', proargtypes => '', prorettype => 'int4multirange', proargtypes => '',
prosrc => 'multirange_constructor0' }, prosrc => 'multirange_constructor0' },
{ oid => '4281', descr => 'int4multirange constructor', { oid => '4281', descr => 'int4multirange constructor',
proname => 'int4multirange', proisstrict => 't', proname => 'int4multirange', prorettype => 'int4multirange',
prorettype => 'int4multirange', proargtypes => 'int4range', proargtypes => 'int4range', prosrc => 'multirange_constructor1' },
prosrc => 'multirange_constructor1' },
{ oid => '4282', descr => 'int4multirange constructor', { oid => '4282', descr => 'int4multirange constructor',
proname => 'int4multirange', provariadic => 'int4range', proisstrict => 'f', proname => 'int4multirange', provariadic => 'int4range', proisstrict => 'f',
prorettype => 'int4multirange', proargtypes => '_int4range', prorettype => 'int4multirange', proargtypes => '_int4range',
proallargtypes => '{_int4range}', proargmodes => '{v}', proallargtypes => '{_int4range}', proargmodes => '{v}',
prosrc => 'multirange_constructor2' }, prosrc => 'multirange_constructor2' },
{ oid => '4283', descr => 'nummultirange constructor', { oid => '4283', descr => 'nummultirange constructor',
proname => 'nummultirange', proisstrict => 'f', proname => 'nummultirange', proisstrict => 'f', prorettype => 'nummultirange',
prorettype => 'nummultirange', proargtypes => '', proargtypes => '', prosrc => 'multirange_constructor0' },
prosrc => 'multirange_constructor0' },
{ oid => '4284', descr => 'nummultirange constructor', { oid => '4284', descr => 'nummultirange constructor',
proname => 'nummultirange', proisstrict => 't', proname => 'nummultirange', prorettype => 'nummultirange',
prorettype => 'nummultirange', proargtypes => 'numrange', proargtypes => 'numrange', prosrc => 'multirange_constructor1' },
prosrc => 'multirange_constructor1' },
{ oid => '4285', descr => 'nummultirange constructor', { oid => '4285', descr => 'nummultirange constructor',
proname => 'nummultirange', provariadic => 'numrange', proisstrict => 'f', proname => 'nummultirange', provariadic => 'numrange', proisstrict => 'f',
prorettype => 'nummultirange', proargtypes => '_numrange', prorettype => 'nummultirange', proargtypes => '_numrange',
proallargtypes => '{_numrange}', proargmodes => '{v}', proallargtypes => '{_numrange}', proargmodes => '{v}',
prosrc => 'multirange_constructor2' }, prosrc => 'multirange_constructor2' },
{ oid => '4286', descr => 'tsmultirange constructor', { oid => '4286', descr => 'tsmultirange constructor',
proname => 'tsmultirange', proisstrict => 'f', proname => 'tsmultirange', proisstrict => 'f', prorettype => 'tsmultirange',
prorettype => 'tsmultirange', proargtypes => '', proargtypes => '', prosrc => 'multirange_constructor0' },
prosrc => 'multirange_constructor0' },
{ oid => '4287', descr => 'tsmultirange constructor', { oid => '4287', descr => 'tsmultirange constructor',
proname => 'tsmultirange', proisstrict => 't', proname => 'tsmultirange', prorettype => 'tsmultirange',
prorettype => 'tsmultirange', proargtypes => 'tsrange', proargtypes => 'tsrange', prosrc => 'multirange_constructor1' },
prosrc => 'multirange_constructor1' },
{ oid => '4288', descr => 'tsmultirange constructor', { oid => '4288', descr => 'tsmultirange constructor',
proname => 'tsmultirange', provariadic => 'tsrange', proisstrict => 'f', proname => 'tsmultirange', provariadic => 'tsrange', proisstrict => 'f',
prorettype => 'tsmultirange', proargtypes => '_tsrange', prorettype => 'tsmultirange', proargtypes => '_tsrange',
...@@ -10222,9 +10243,8 @@ ...@@ -10222,9 +10243,8 @@
prorettype => 'tstzmultirange', proargtypes => '', prorettype => 'tstzmultirange', proargtypes => '',
prosrc => 'multirange_constructor0' }, prosrc => 'multirange_constructor0' },
{ oid => '4290', descr => 'tstzmultirange constructor', { oid => '4290', descr => 'tstzmultirange constructor',
proname => 'tstzmultirange', proisstrict => 't', proname => 'tstzmultirange', prorettype => 'tstzmultirange',
prorettype => 'tstzmultirange', proargtypes => 'tstzrange', proargtypes => 'tstzrange', prosrc => 'multirange_constructor1' },
prosrc => 'multirange_constructor1' },
{ oid => '4291', descr => 'tstzmultirange constructor', { oid => '4291', descr => 'tstzmultirange constructor',
proname => 'tstzmultirange', provariadic => 'tstzrange', proisstrict => 'f', proname => 'tstzmultirange', provariadic => 'tstzrange', proisstrict => 'f',
prorettype => 'tstzmultirange', proargtypes => '_tstzrange', prorettype => 'tstzmultirange', proargtypes => '_tstzrange',
...@@ -10235,9 +10255,8 @@ ...@@ -10235,9 +10255,8 @@
prorettype => 'datemultirange', proargtypes => '', prorettype => 'datemultirange', proargtypes => '',
prosrc => 'multirange_constructor0' }, prosrc => 'multirange_constructor0' },
{ oid => '4293', descr => 'datemultirange constructor', { oid => '4293', descr => 'datemultirange constructor',
proname => 'datemultirange', proisstrict => 't', proname => 'datemultirange', prorettype => 'datemultirange',
prorettype => 'datemultirange', proargtypes => 'daterange', proargtypes => 'daterange', prosrc => 'multirange_constructor1' },
prosrc => 'multirange_constructor1' },
{ oid => '4294', descr => 'datemultirange constructor', { oid => '4294', descr => 'datemultirange constructor',
proname => 'datemultirange', provariadic => 'daterange', proisstrict => 'f', proname => 'datemultirange', provariadic => 'daterange', proisstrict => 'f',
prorettype => 'datemultirange', proargtypes => '_daterange', prorettype => 'datemultirange', proargtypes => '_daterange',
...@@ -10248,35 +10267,35 @@ ...@@ -10248,35 +10267,35 @@
prorettype => 'int8multirange', proargtypes => '', prorettype => 'int8multirange', proargtypes => '',
prosrc => 'multirange_constructor0' }, prosrc => 'multirange_constructor0' },
{ oid => '4296', descr => 'int8multirange constructor', { oid => '4296', descr => 'int8multirange constructor',
proname => 'int8multirange', proisstrict => 't', proname => 'int8multirange', prorettype => 'int8multirange',
prorettype => 'int8multirange', proargtypes => 'int8range', proargtypes => 'int8range', prosrc => 'multirange_constructor1' },
prosrc => 'multirange_constructor1' },
{ oid => '4297', descr => 'int8multirange constructor', { oid => '4297', descr => 'int8multirange constructor',
proname => 'int8multirange', provariadic => 'int8range', proisstrict => 'f', proname => 'int8multirange', provariadic => 'int8range', proisstrict => 'f',
prorettype => 'int8multirange', proargtypes => '_int8range', prorettype => 'int8multirange', proargtypes => '_int8range',
proallargtypes => '{_int8range}', proargmodes => '{v}', proallargtypes => '{_int8range}', proargmodes => '{v}',
prosrc => 'multirange_constructor2' }, prosrc => 'multirange_constructor2' },
{ oid => '4298', descr => 'anymultirange cast', { oid => '4298', descr => 'anymultirange cast',
proname => 'multirange', proisstrict => 't', proname => 'multirange', prorettype => 'anymultirange',
prorettype => 'anymultirange', proargtypes => 'anyrange', proargtypes => 'anyrange', prosrc => 'multirange_constructor1' },
prosrc => 'multirange_constructor1' },
{ oid => '4299', descr => 'aggregate transition function', { oid => '4299', descr => 'aggregate transition function',
proname => 'range_agg_transfn', proisstrict => 'f', prorettype => 'internal', proname => 'range_agg_transfn', proisstrict => 'f', prorettype => 'internal',
proargtypes => 'internal anyrange', prosrc => 'range_agg_transfn' }, proargtypes => 'internal anyrange', prosrc => 'range_agg_transfn' },
{ oid => '4300', descr => 'aggregate final function', { oid => '4300', descr => 'aggregate final function',
proname => 'range_agg_finalfn', proisstrict => 'f', prorettype => 'anymultirange', proname => 'range_agg_finalfn', proisstrict => 'f',
proargtypes => 'internal anyrange', prosrc => 'range_agg_finalfn' }, prorettype => 'anymultirange', proargtypes => 'internal anyrange',
prosrc => 'range_agg_finalfn' },
{ oid => '4301', descr => 'combine aggregate input into a multirange', { oid => '4301', descr => 'combine aggregate input into a multirange',
proname => 'range_agg', prokind => 'a', proisstrict => 'f', proname => 'range_agg', prokind => 'a', proisstrict => 'f',
prorettype => 'anymultirange', proargtypes => 'anyrange', prorettype => 'anymultirange', proargtypes => 'anyrange',
prosrc => 'aggregate_dummy' }, prosrc => 'aggregate_dummy' },
{ oid => '4388', descr => 'range aggregate by intersecting', { oid => '4388', descr => 'range aggregate by intersecting',
proname => 'multirange_intersect_agg_transfn', prorettype => 'anymultirange', proname => 'multirange_intersect_agg_transfn', prorettype => 'anymultirange',
proargtypes => 'anymultirange anymultirange', prosrc => 'multirange_intersect_agg_transfn'}, proargtypes => 'anymultirange anymultirange',
prosrc => 'multirange_intersect_agg_transfn' },
{ oid => '4389', descr => 'range aggregate by intersecting', { oid => '4389', descr => 'range aggregate by intersecting',
proname => 'range_intersect_agg', prokind => 'a', proisstrict => 'f', proname => 'range_intersect_agg', prokind => 'a', proisstrict => 'f',
prorettype => 'anymultirange', proargtypes => 'anymultirange', prorettype => 'anymultirange', proargtypes => 'anymultirange',
prosrc => 'aggregate_dummy'}, prosrc => 'aggregate_dummy' },
# date, time, timestamp constructors # date, time, timestamp constructors
{ oid => '3846', descr => 'construct date', { oid => '3846', descr => 'construct date',
...@@ -10661,12 +10680,14 @@ ...@@ -10661,12 +10680,14 @@
proparallel => 'r', prorettype => 'void', proargtypes => 'oid', proparallel => 'r', prorettype => 'void', proargtypes => 'oid',
prosrc => 'binary_upgrade_set_next_array_pg_type_oid' }, prosrc => 'binary_upgrade_set_next_array_pg_type_oid' },
{ oid => '4390', descr => 'for use by pg_upgrade', { oid => '4390', descr => 'for use by pg_upgrade',
proname => 'binary_upgrade_set_next_multirange_pg_type_oid', provolatile => 'v', proname => 'binary_upgrade_set_next_multirange_pg_type_oid',
proparallel => 'r', prorettype => 'void', proargtypes => 'oid', provolatile => 'v', proparallel => 'r', prorettype => 'void',
proargtypes => 'oid',
prosrc => 'binary_upgrade_set_next_multirange_pg_type_oid' }, prosrc => 'binary_upgrade_set_next_multirange_pg_type_oid' },
{ oid => '4391', descr => 'for use by pg_upgrade', { oid => '4391', descr => 'for use by pg_upgrade',
proname => 'binary_upgrade_set_next_multirange_array_pg_type_oid', provolatile => 'v', proname => 'binary_upgrade_set_next_multirange_array_pg_type_oid',
proparallel => 'r', prorettype => 'void', proargtypes => 'oid', provolatile => 'v', proparallel => 'r', prorettype => 'void',
proargtypes => 'oid',
prosrc => 'binary_upgrade_set_next_multirange_array_pg_type_oid' }, prosrc => 'binary_upgrade_set_next_multirange_array_pg_type_oid' },
{ oid => '3586', descr => 'for use by pg_upgrade', { oid => '3586', descr => 'for use by pg_upgrade',
proname => 'binary_upgrade_set_next_heap_pg_class_oid', provolatile => 'v', proname => 'binary_upgrade_set_next_heap_pg_class_oid', provolatile => 'v',
......
src/include/catalog/pg_range.dat
View file @ 8b411b8f
...@@ -12,23 +12,23 @@ ...@@ -12,23 +12,23 @@
[ [
{ rngtypid => 'int4range', rngsubtype => 'int4', rngsubopc => 'btree/int4_ops', { rngtypid => 'int4range', rngsubtype => 'int4',
rngcanonical => 'int4range_canonical', rngsubdiff => 'int4range_subdiff', rngmultitypid => 'int4multirange', rngsubopc => 'btree/int4_ops',
rngmultitypid => 'int4multirange' }, rngcanonical => 'int4range_canonical', rngsubdiff => 'int4range_subdiff' },
{ rngtypid => 'numrange', rngsubtype => 'numeric', { rngtypid => 'numrange', rngsubtype => 'numeric',
rngsubopc => 'btree/numeric_ops', rngcanonical => '-', rngmultitypid => 'nummultirange', rngsubopc => 'btree/numeric_ops',
rngsubdiff => 'numrange_subdiff', rngmultitypid => 'nummultirange' }, rngcanonical => '-', rngsubdiff => 'numrange_subdiff' },
{ rngtypid => 'tsrange', rngsubtype => 'timestamp', { rngtypid => 'tsrange', rngsubtype => 'timestamp',
rngsubopc => 'btree/timestamp_ops', rngcanonical => '-', rngmultitypid => 'tsmultirange', rngsubopc => 'btree/timestamp_ops',
rngsubdiff => 'tsrange_subdiff', rngmultitypid => 'tsmultirange' }, rngcanonical => '-', rngsubdiff => 'tsrange_subdiff' },
{ rngtypid => 'tstzrange', rngsubtype => 'timestamptz', { rngtypid => 'tstzrange', rngsubtype => 'timestamptz',
rngsubopc => 'btree/timestamptz_ops', rngcanonical => '-', rngmultitypid => 'tstzmultirange', rngsubopc => 'btree/timestamptz_ops',
rngsubdiff => 'tstzrange_subdiff', rngmultitypid => 'tstzmultirange' }, rngcanonical => '-', rngsubdiff => 'tstzrange_subdiff' },
{ rngtypid => 'daterange', rngsubtype => 'date', rngsubopc => 'btree/date_ops', { rngtypid => 'daterange', rngsubtype => 'date',
rngcanonical => 'daterange_canonical', rngsubdiff => 'daterange_subdiff', rngmultitypid => 'datemultirange', rngsubopc => 'btree/date_ops',
rngmultitypid => 'datemultirange' }, rngcanonical => 'daterange_canonical', rngsubdiff => 'daterange_subdiff' },
{ rngtypid => 'int8range', rngsubtype => 'int8', rngsubopc => 'btree/int8_ops', { rngtypid => 'int8range', rngsubtype => 'int8',
rngcanonical => 'int8range_canonical', rngsubdiff => 'int8range_subdiff', rngmultitypid => 'int8multirange', rngsubopc => 'btree/int8_ops',
rngmultitypid => 'int8multirange' }, rngcanonical => 'int8range_canonical', rngsubdiff => 'int8range_subdiff' },
] ]
src/include/catalog/pg_type.dat
View file @ 8b411b8f
...@@ -499,36 +499,42 @@ ...@@ -499,36 +499,42 @@
# multirange types # multirange types
{ oid => '4451', array_type_oid => '8010', descr => 'multirange of integers', { oid => '4451', array_type_oid => '8010', descr => 'multirange of integers',
typname => 'int4multirange', typlen => '-1', typbyval => 'f', typtype => 'm', typname => 'int4multirange', typlen => '-1', typbyval => 'f', typtype => 'm',
typcategory => 'R', typinput => 'multirange_in', typoutput => 'multirange_out', typcategory => 'R', typinput => 'multirange_in',
typreceive => 'multirange_recv', typsend => 'multirange_send', typoutput => 'multirange_out', typreceive => 'multirange_recv',
typanalyze => 'multirange_typanalyze', typalign => 'i', typstorage => 'x' }, typsend => 'multirange_send', typanalyze => 'multirange_typanalyze',
typalign => 'i', typstorage => 'x' },
{ oid => '4532', array_type_oid => '8012', descr => 'multirange of numerics', { oid => '4532', array_type_oid => '8012', descr => 'multirange of numerics',
typname => 'nummultirange', typlen => '-1', typbyval => 'f', typtype => 'm', typname => 'nummultirange', typlen => '-1', typbyval => 'f', typtype => 'm',
typcategory => 'R', typinput => 'multirange_in', typoutput => 'multirange_out', typcategory => 'R', typinput => 'multirange_in',
typreceive => 'multirange_recv', typsend => 'multirange_send', typoutput => 'multirange_out', typreceive => 'multirange_recv',
typanalyze => 'multirange_typanalyze', typalign => 'i', typstorage => 'x' }, typsend => 'multirange_send', typanalyze => 'multirange_typanalyze',
typalign => 'i', typstorage => 'x' },
{ oid => '4533', array_type_oid => '8014', { oid => '4533', array_type_oid => '8014',
descr => 'multirange of timestamps without time zone', descr => 'multirange of timestamps without time zone',
typname => 'tsmultirange', typlen => '-1', typbyval => 'f', typtype => 'm', typname => 'tsmultirange', typlen => '-1', typbyval => 'f', typtype => 'm',
typcategory => 'R', typinput => 'multirange_in', typoutput => 'multirange_out', typcategory => 'R', typinput => 'multirange_in',
typreceive => 'multirange_recv', typsend => 'multirange_send', typoutput => 'multirange_out', typreceive => 'multirange_recv',
typanalyze => 'multirange_typanalyze', typalign => 'd', typstorage => 'x' }, typsend => 'multirange_send', typanalyze => 'multirange_typanalyze',
typalign => 'd', typstorage => 'x' },
{ oid => '4534', array_type_oid => '8016', { oid => '4534', array_type_oid => '8016',
descr => 'multirange of timestamps with time zone', descr => 'multirange of timestamps with time zone',
typname => 'tstzmultirange', typlen => '-1', typbyval => 'f', typtype => 'm', typname => 'tstzmultirange', typlen => '-1', typbyval => 'f', typtype => 'm',
typcategory => 'R', typinput => 'multirange_in', typoutput => 'multirange_out', typcategory => 'R', typinput => 'multirange_in',
typreceive => 'multirange_recv', typsend => 'multirange_send', typoutput => 'multirange_out', typreceive => 'multirange_recv',
typanalyze => 'multirange_typanalyze', typalign => 'd', typstorage => 'x' }, typsend => 'multirange_send', typanalyze => 'multirange_typanalyze',
typalign => 'd', typstorage => 'x' },
{ oid => '4535', array_type_oid => '8018', descr => 'multirange of dates', { oid => '4535', array_type_oid => '8018', descr => 'multirange of dates',
typname => 'datemultirange', typlen => '-1', typbyval => 'f', typtype => 'm', typname => 'datemultirange', typlen => '-1', typbyval => 'f', typtype => 'm',
typcategory => 'R', typinput => 'multirange_in', typoutput => 'multirange_out', typcategory => 'R', typinput => 'multirange_in',
typreceive => 'multirange_recv', typsend => 'multirange_send', typoutput => 'multirange_out', typreceive => 'multirange_recv',
typanalyze => 'multirange_typanalyze', typalign => 'i', typstorage => 'x' }, typsend => 'multirange_send', typanalyze => 'multirange_typanalyze',
typalign => 'i', typstorage => 'x' },
{ oid => '4536', array_type_oid => '8020', descr => 'multirange of bigints', { oid => '4536', array_type_oid => '8020', descr => 'multirange of bigints',
typname => 'int8multirange', typlen => '-1', typbyval => 'f', typtype => 'm', typname => 'int8multirange', typlen => '-1', typbyval => 'f', typtype => 'm',
typcategory => 'R', typinput => 'multirange_in', typoutput => 'multirange_out', typcategory => 'R', typinput => 'multirange_in',
typreceive => 'multirange_recv', typsend => 'multirange_send', typoutput => 'multirange_out', typreceive => 'multirange_recv',
typanalyze => 'multirange_typanalyze', typalign => 'd', typstorage => 'x' }, typsend => 'multirange_send', typanalyze => 'multirange_typanalyze',
typalign => 'd', typstorage => 'x' },
# pseudo-types # pseudo-types
# types with typtype='p' represent various special cases in the type system. # types with typtype='p' represent various special cases in the type system.
...@@ -663,8 +669,9 @@ ...@@ -663,8 +669,9 @@
{ oid => '4537', { oid => '4537',
descr => 'pseudo-type representing a polymorphic base type that is a multirange', descr => 'pseudo-type representing a polymorphic base type that is a multirange',
typname => 'anymultirange', typlen => '-1', typbyval => 'f', typtype => 'p', typname => 'anymultirange', typlen => '-1', typbyval => 'f', typtype => 'p',
typcategory => 'P', typinput => 'anymultirange_in', typoutput => 'anymultirange_out', typcategory => 'P', typinput => 'anymultirange_in',
typreceive => '-', typsend => '-', typalign => 'd', typstorage => 'x' }, typoutput => 'anymultirange_out', typreceive => '-', typsend => '-',
typalign => 'd', typstorage => 'x' },
{ oid => '4538', { oid => '4538',
descr => 'pseudo-type representing a multirange over a polymorphic common type', descr => 'pseudo-type representing a multirange over a polymorphic common type',
typname => 'anycompatiblemultirange', typlen => '-1', typbyval => 'f', typname => 'anycompatiblemultirange', typlen => '-1', typbyval => 'f',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment