Alvaro Herrera wrote: > hubert depesz lubaczewski wrote: > > > The minmax operator families don't include any cross-type operators. I'm > > not exactly sure why not.. Alvaro? > > > Anyway, try "select * from t where id = 1224::int8" > > > > It works that way, but it would be great to have it working with non-casted > > values too. > > Yeah. I didn't put in much extra effort because some simple experiments > worked with cross-type queries; my guess at the time was that the system > added casts automatically for some cases and that was good enough. But > there are several examples that don't work all that nicely, so I'm going > to rework the opfamilies a bit. Stay tuned.
This patch reworks the opfamilies in pretty much the same way btree has them: each type category has one opfamily, and there are opclasses for each datatype; then there are enough pg_amop and pg_amproc entries to cover all the cross-type operators and necessary support functions. The collapsed types, and the resulting opfamilies, are: int2, int4, int8 -> integer_minmax_ops date, timestamp, timestamptz -> datetime_minmax_ops float4, float8 -> float_minmax_ops I'm not sure if there should be something involving numeric. Btree doesn't appear to have it. Btree also has a "network" opfamily which I initially guessed to contain inet and cidr, but on looking closer it only has inet. And Brin doesn't have cidr at all, so I left this alone. I won't push this right away because I want to add the cross-type stuff to the tests, to ensure I haven't bollixed anything; I ran a few quick manual tests and everything seems to work. But if Depesz wants to test the behavior, be my guest. Note that you need to initdb after rebuilding with this patch. -- Álvaro Herrera http://www.2ndQuadrant.com/ PostgreSQL Development, 24x7 Support, Training & Services
diff --git a/src/include/catalog/pg_amop.h b/src/include/catalog/pg_amop.h index e72cc6c..7165f54 100644 --- a/src/include/catalog/pg_amop.h +++ b/src/include/catalog/pg_amop.h @@ -864,24 +864,53 @@ DATA(insert ( 4065 19 19 2 s 661 3580 0 )); DATA(insert ( 4065 19 19 3 s 93 3580 0 )); DATA(insert ( 4065 19 19 4 s 663 3580 0 )); DATA(insert ( 4065 19 19 5 s 662 3580 0 )); -/* minmax bigint */ -DATA(insert ( 4063 20 20 1 s 412 3580 0 )); -DATA(insert ( 4063 20 20 2 s 414 3580 0 )); -DATA(insert ( 4063 20 20 3 s 410 3580 0 )); -DATA(insert ( 4063 20 20 4 s 415 3580 0 )); -DATA(insert ( 4063 20 20 5 s 413 3580 0 )); -/* minmax smallint */ -DATA(insert ( 4067 21 21 1 s 95 3580 0 )); -DATA(insert ( 4067 21 21 2 s 522 3580 0 )); -DATA(insert ( 4067 21 21 3 s 94 3580 0 )); -DATA(insert ( 4067 21 21 4 s 524 3580 0 )); -DATA(insert ( 4067 21 21 5 s 520 3580 0 )); /* minmax integer */ +DATA(insert ( 4054 20 20 1 s 412 3580 0 )); +DATA(insert ( 4054 20 20 2 s 414 3580 0 )); +DATA(insert ( 4054 20 20 3 s 410 3580 0 )); +DATA(insert ( 4054 20 20 4 s 415 3580 0 )); +DATA(insert ( 4054 20 20 5 s 413 3580 0 )); +DATA(insert ( 4054 20 21 1 s 1870 3580 0 )); +DATA(insert ( 4054 20 21 2 s 1872 3580 0 )); +DATA(insert ( 4054 20 21 3 s 1868 3580 0 )); +DATA(insert ( 4054 20 21 4 s 1873 3580 0 )); +DATA(insert ( 4054 20 21 5 s 1871 3580 0 )); +DATA(insert ( 4054 20 23 1 s 418 3580 0 )); +DATA(insert ( 4054 20 23 2 s 420 3580 0 )); +DATA(insert ( 4054 20 23 3 s 416 3580 0 )); +DATA(insert ( 4054 20 23 4 s 430 3580 0 )); +DATA(insert ( 4054 20 23 5 s 419 3580 0 )); +DATA(insert ( 4054 21 21 1 s 95 3580 0 )); +DATA(insert ( 4054 21 21 2 s 522 3580 0 )); +DATA(insert ( 4054 21 21 3 s 94 3580 0 )); +DATA(insert ( 4054 21 21 4 s 524 3580 0 )); +DATA(insert ( 4054 21 21 5 s 520 3580 0 )); +DATA(insert ( 4054 21 20 1 s 1864 3580 0 )); +DATA(insert ( 4054 21 20 2 s 1866 3580 0 )); +DATA(insert ( 4054 21 20 3 s 1862 3580 0 )); +DATA(insert ( 4054 21 20 4 s 1867 3580 0 )); +DATA(insert ( 4054 21 20 5 s 1865 3580 0 )); +DATA(insert ( 4054 21 23 1 s 534 3580 0 )); +DATA(insert ( 4054 21 23 2 s 540 3580 0 )); +DATA(insert ( 4054 21 23 3 s 532 3580 0 )); +DATA(insert ( 4054 21 23 4 s 542 3580 0 )); +DATA(insert ( 4054 21 23 5 s 536 3580 0 )); DATA(insert ( 4054 23 23 1 s 97 3580 0 )); DATA(insert ( 4054 23 23 2 s 523 3580 0 )); DATA(insert ( 4054 23 23 3 s 96 3580 0 )); DATA(insert ( 4054 23 23 4 s 525 3580 0 )); DATA(insert ( 4054 23 23 5 s 521 3580 0 )); +DATA(insert ( 4054 23 21 1 s 535 3580 0 )); +DATA(insert ( 4054 23 21 2 s 541 3580 0 )); +DATA(insert ( 4054 23 21 3 s 533 3580 0 )); +DATA(insert ( 4054 23 21 4 s 543 3580 0 )); +DATA(insert ( 4054 23 21 5 s 537 3580 0 )); +DATA(insert ( 4054 23 20 1 s 37 3580 0 )); +DATA(insert ( 4054 23 20 2 s 80 3580 0 )); +DATA(insert ( 4054 23 20 3 s 15 3580 0 )); +DATA(insert ( 4054 23 20 4 s 82 3580 0 )); +DATA(insert ( 4054 23 20 5 s 76 3580 0 )); + /* minmax text */ DATA(insert ( 4056 25 25 1 s 664 3580 0 )); DATA(insert ( 4056 25 25 2 s 665 3580 0 )); @@ -900,18 +929,28 @@ DATA(insert ( 4069 27 27 2 s 2801 3580 0 )); DATA(insert ( 4069 27 27 3 s 387 3580 0 )); DATA(insert ( 4069 27 27 4 s 2802 3580 0 )); DATA(insert ( 4069 27 27 5 s 2800 3580 0 )); -/* minmax real */ +/* minmax float (float4, float8) */ DATA(insert ( 4070 700 700 1 s 622 3580 0 )); DATA(insert ( 4070 700 700 2 s 624 3580 0 )); DATA(insert ( 4070 700 700 3 s 620 3580 0 )); DATA(insert ( 4070 700 700 4 s 625 3580 0 )); DATA(insert ( 4070 700 700 5 s 623 3580 0 )); -/* minmax double precision */ -DATA(insert ( 4071 701 701 1 s 672 3580 0 )); -DATA(insert ( 4071 701 701 2 s 673 3580 0 )); -DATA(insert ( 4071 701 701 3 s 670 3580 0 )); -DATA(insert ( 4071 701 701 4 s 675 3580 0 )); -DATA(insert ( 4071 701 701 5 s 674 3580 0 )); +DATA(insert ( 4070 700 701 1 s 1122 3580 0 )); +DATA(insert ( 4070 700 701 2 s 1124 3580 0 )); +DATA(insert ( 4070 700 701 3 s 1120 3580 0 )); +DATA(insert ( 4070 700 701 4 s 1125 3580 0 )); +DATA(insert ( 4070 700 701 5 s 1123 3580 0 )); +DATA(insert ( 4070 701 700 1 s 1132 3580 0 )); +DATA(insert ( 4070 701 700 2 s 1134 3580 0 )); +DATA(insert ( 4070 701 700 3 s 1130 3580 0 )); +DATA(insert ( 4070 701 700 4 s 1135 3580 0 )); +DATA(insert ( 4070 701 700 5 s 1133 3580 0 )); +DATA(insert ( 4070 701 701 1 s 672 3580 0 )); +DATA(insert ( 4070 701 701 2 s 673 3580 0 )); +DATA(insert ( 4070 701 701 3 s 670 3580 0 )); +DATA(insert ( 4070 701 701 4 s 675 3580 0 )); +DATA(insert ( 4070 701 701 5 s 674 3580 0 )); + /* minmax abstime */ DATA(insert ( 4072 702 702 1 s 562 3580 0 )); DATA(insert ( 4072 702 702 2 s 564 3580 0 )); @@ -942,30 +981,59 @@ DATA(insert ( 4076 1042 1042 2 s 1059 3580 0 )); DATA(insert ( 4076 1042 1042 3 s 1054 3580 0 )); DATA(insert ( 4076 1042 1042 4 s 1061 3580 0 )); DATA(insert ( 4076 1042 1042 5 s 1060 3580 0 )); -/* minmax date */ -DATA(insert ( 4061 1082 1082 1 s 1095 3580 0 )); -DATA(insert ( 4061 1082 1082 2 s 1096 3580 0 )); -DATA(insert ( 4061 1082 1082 3 s 1093 3580 0 )); -DATA(insert ( 4061 1082 1082 4 s 1098 3580 0 )); -DATA(insert ( 4061 1082 1082 5 s 1097 3580 0 )); /* minmax time without time zone */ DATA(insert ( 4077 1083 1083 1 s 1110 3580 0 )); DATA(insert ( 4077 1083 1083 2 s 1111 3580 0 )); DATA(insert ( 4077 1083 1083 3 s 1108 3580 0 )); DATA(insert ( 4077 1083 1083 4 s 1113 3580 0 )); DATA(insert ( 4077 1083 1083 5 s 1112 3580 0 )); -/* minmax timestamp without time zone */ +/* minmax datetime (date, timestamp, timestamptz) */ DATA(insert ( 4059 1114 1114 1 s 2062 3580 0 )); DATA(insert ( 4059 1114 1114 2 s 2063 3580 0 )); DATA(insert ( 4059 1114 1114 3 s 2060 3580 0 )); DATA(insert ( 4059 1114 1114 4 s 2065 3580 0 )); DATA(insert ( 4059 1114 1114 5 s 2064 3580 0 )); -/* minmax timestamp with time zone */ -DATA(insert ( 4060 1184 1184 1 s 1322 3580 0 )); -DATA(insert ( 4060 1184 1184 2 s 1323 3580 0 )); -DATA(insert ( 4060 1184 1184 3 s 1320 3580 0 )); -DATA(insert ( 4060 1184 1184 4 s 1325 3580 0 )); -DATA(insert ( 4060 1184 1184 5 s 1324 3580 0 )); +DATA(insert ( 4059 1114 1082 1 s 2371 3580 0 )); +DATA(insert ( 4059 1114 1082 2 s 2372 3580 0 )); +DATA(insert ( 4059 1114 1082 3 s 2373 3580 0 )); +DATA(insert ( 4059 1114 1082 4 s 2374 3580 0 )); +DATA(insert ( 4059 1114 1082 5 s 2375 3580 0 )); +DATA(insert ( 4059 1114 1184 1 s 2534 3580 0 )); +DATA(insert ( 4059 1114 1184 2 s 2535 3580 0 )); +DATA(insert ( 4059 1114 1184 3 s 2536 3580 0 )); +DATA(insert ( 4059 1114 1184 4 s 2537 3580 0 )); +DATA(insert ( 4059 1114 1184 5 s 2538 3580 0 )); +DATA(insert ( 4059 1082 1082 1 s 1095 3580 0 )); +DATA(insert ( 4059 1082 1082 2 s 1096 3580 0 )); +DATA(insert ( 4059 1082 1082 3 s 1093 3580 0 )); +DATA(insert ( 4059 1082 1082 4 s 1098 3580 0 )); +DATA(insert ( 4059 1082 1082 5 s 1097 3580 0 )); +DATA(insert ( 4059 1082 1114 1 s 2345 3580 0 )); +DATA(insert ( 4059 1082 1114 2 s 2346 3580 0 )); +DATA(insert ( 4059 1082 1114 3 s 2347 3580 0 )); +DATA(insert ( 4059 1082 1114 4 s 2348 3580 0 )); +DATA(insert ( 4059 1082 1114 5 s 2349 3580 0 )); +DATA(insert ( 4059 1082 1184 1 s 2358 3580 0 )); +DATA(insert ( 4059 1082 1184 2 s 2359 3580 0 )); +DATA(insert ( 4059 1082 1184 3 s 2360 3580 0 )); +DATA(insert ( 4059 1082 1184 4 s 2361 3580 0 )); +DATA(insert ( 4059 1082 1184 5 s 2362 3580 0 )); +DATA(insert ( 4059 1184 1082 1 s 2384 3580 0 )); +DATA(insert ( 4059 1184 1082 2 s 2385 3580 0 )); +DATA(insert ( 4059 1184 1082 3 s 2386 3580 0 )); +DATA(insert ( 4059 1184 1082 4 s 2387 3580 0 )); +DATA(insert ( 4059 1184 1082 5 s 2388 3580 0 )); +DATA(insert ( 4059 1184 1114 1 s 2540 3580 0 )); +DATA(insert ( 4059 1184 1114 2 s 2541 3580 0 )); +DATA(insert ( 4059 1184 1114 3 s 2542 3580 0 )); +DATA(insert ( 4059 1184 1114 4 s 2543 3580 0 )); +DATA(insert ( 4059 1184 1114 5 s 2544 3580 0 )); +DATA(insert ( 4059 1184 1184 1 s 1322 3580 0 )); +DATA(insert ( 4059 1184 1184 2 s 1323 3580 0 )); +DATA(insert ( 4059 1184 1184 3 s 1320 3580 0 )); +DATA(insert ( 4059 1184 1184 4 s 1325 3580 0 )); +DATA(insert ( 4059 1184 1184 5 s 1324 3580 0 )); + /* minmax interval */ DATA(insert ( 4078 1186 1186 1 s 1332 3580 0 )); DATA(insert ( 4078 1186 1186 2 s 1333 3580 0 )); diff --git a/src/include/catalog/pg_amproc.h b/src/include/catalog/pg_amproc.h index e09f557..309aee6 100644 --- a/src/include/catalog/pg_amproc.h +++ b/src/include/catalog/pg_amproc.h @@ -460,25 +460,57 @@ DATA(insert ( 4065 19 19 11 655 )); DATA(insert ( 4065 19 19 12 656 )); DATA(insert ( 4065 19 19 13 658 )); DATA(insert ( 4065 19 19 14 657 )); -/* minmax bigint */ -DATA(insert ( 4063 20 20 1 3383 )); -DATA(insert ( 4063 20 20 2 3384 )); -DATA(insert ( 4063 20 20 3 3385 )); -DATA(insert ( 4063 20 20 4 3386 )); -DATA(insert ( 4063 20 20 11 469 )); -DATA(insert ( 4063 20 20 12 471 )); -DATA(insert ( 4063 20 20 13 472 )); -DATA(insert ( 4063 20 20 14 470 )); -/* minmax smallint */ -DATA(insert ( 4067 21 21 1 3383 )); -DATA(insert ( 4067 21 21 2 3384 )); -DATA(insert ( 4067 21 21 3 3385 )); -DATA(insert ( 4067 21 21 4 3386 )); -DATA(insert ( 4067 21 21 11 64 )); -DATA(insert ( 4067 21 21 12 148 )); -DATA(insert ( 4067 21 21 13 151 )); -DATA(insert ( 4067 21 21 14 146 )); -/* minmax integer */ +/* minmax integer: int2, int4, int8 */ +DATA(insert ( 4054 20 20 1 3383 )); +DATA(insert ( 4054 20 20 2 3384 )); +DATA(insert ( 4054 20 20 3 3385 )); +DATA(insert ( 4054 20 20 4 3386 )); +DATA(insert ( 4054 20 20 11 469 )); +DATA(insert ( 4054 20 20 12 471 )); +DATA(insert ( 4054 20 20 13 472 )); +DATA(insert ( 4054 20 20 14 470 )); +DATA(insert ( 4054 20 21 1 3383 )); +DATA(insert ( 4054 20 21 2 3384 )); +DATA(insert ( 4054 20 21 3 3385 )); +DATA(insert ( 4054 20 21 4 3386 )); +DATA(insert ( 4054 20 21 11 1858 )); +DATA(insert ( 4054 20 21 12 1860 )); +DATA(insert ( 4054 20 21 13 1861 )); +DATA(insert ( 4054 20 21 14 1859 )); +DATA(insert ( 4054 20 23 1 3383 )); +DATA(insert ( 4054 20 23 2 3384 )); +DATA(insert ( 4054 20 23 3 3385 )); +DATA(insert ( 4054 20 23 4 3386 )); +DATA(insert ( 4054 20 23 11 476 )); +DATA(insert ( 4054 20 23 12 478 )); +DATA(insert ( 4054 20 23 13 479 )); +DATA(insert ( 4054 20 23 14 477 )); + +DATA(insert ( 4054 21 21 1 3383 )); +DATA(insert ( 4054 21 21 2 3384 )); +DATA(insert ( 4054 21 21 3 3385 )); +DATA(insert ( 4054 21 21 4 3386 )); +DATA(insert ( 4054 21 21 11 64 )); +DATA(insert ( 4054 21 21 12 148 )); +DATA(insert ( 4054 21 21 13 151 )); +DATA(insert ( 4054 21 21 14 146 )); +DATA(insert ( 4054 21 20 1 3383 )); +DATA(insert ( 4054 21 20 2 3384 )); +DATA(insert ( 4054 21 20 3 3385 )); +DATA(insert ( 4054 21 20 4 3386 )); +DATA(insert ( 4054 21 20 11 1852 )); +DATA(insert ( 4054 21 20 12 1854 )); +DATA(insert ( 4054 21 20 13 1855 )); +DATA(insert ( 4054 21 20 14 1853 )); +DATA(insert ( 4054 21 23 1 3383 )); +DATA(insert ( 4054 21 23 2 3384 )); +DATA(insert ( 4054 21 23 3 3385 )); +DATA(insert ( 4054 21 23 4 3386 )); +DATA(insert ( 4054 21 23 11 160 )); +DATA(insert ( 4054 21 23 12 166 )); +DATA(insert ( 4054 21 23 13 168 )); +DATA(insert ( 4054 21 23 14 162 )); + DATA(insert ( 4054 23 23 1 3383 )); DATA(insert ( 4054 23 23 2 3384 )); DATA(insert ( 4054 23 23 3 3385 )); @@ -487,6 +519,23 @@ DATA(insert ( 4054 23 23 11 66 )); DATA(insert ( 4054 23 23 12 149 )); DATA(insert ( 4054 23 23 13 150 )); DATA(insert ( 4054 23 23 14 147 )); +DATA(insert ( 4054 23 20 1 3383 )); +DATA(insert ( 4054 23 20 2 3384 )); +DATA(insert ( 4054 23 20 3 3385 )); +DATA(insert ( 4054 23 20 4 3386 )); +DATA(insert ( 4054 23 20 11 854 )); +DATA(insert ( 4054 23 20 12 856 )); +DATA(insert ( 4054 23 20 13 857 )); +DATA(insert ( 4054 23 20 14 855 )); +DATA(insert ( 4054 23 21 1 3383 )); +DATA(insert ( 4054 23 21 2 3384 )); +DATA(insert ( 4054 23 21 3 3385 )); +DATA(insert ( 4054 23 21 4 3386 )); +DATA(insert ( 4054 23 21 11 161 )); +DATA(insert ( 4054 23 21 12 167 )); +DATA(insert ( 4054 23 21 13 169 )); +DATA(insert ( 4054 23 21 14 163 )); + /* minmax text */ DATA(insert ( 4056 25 25 1 3383 )); DATA(insert ( 4056 25 25 2 3384 )); @@ -514,7 +563,7 @@ DATA(insert ( 4069 27 27 11 2791 )); DATA(insert ( 4069 27 27 12 2793 )); DATA(insert ( 4069 27 27 13 2792 )); DATA(insert ( 4069 27 27 14 2790 )); -/* minmax real */ +/* minmax float */ DATA(insert ( 4070 700 700 1 3383 )); DATA(insert ( 4070 700 700 2 3384 )); DATA(insert ( 4070 700 700 3 3385 )); @@ -523,15 +572,34 @@ DATA(insert ( 4070 700 700 11 289 )); DATA(insert ( 4070 700 700 12 290 )); DATA(insert ( 4070 700 700 13 292 )); DATA(insert ( 4070 700 700 14 291 )); -/* minmax double precision */ -DATA(insert ( 4071 701 701 1 3383 )); -DATA(insert ( 4071 701 701 2 3384 )); -DATA(insert ( 4071 701 701 3 3385 )); -DATA(insert ( 4071 701 701 4 3386 )); -DATA(insert ( 4071 701 701 11 295 )); -DATA(insert ( 4071 701 701 12 296 )); -DATA(insert ( 4071 701 701 13 298 )); -DATA(insert ( 4071 701 701 14 297 )); + +DATA(insert ( 4070 700 701 1 3383 )); +DATA(insert ( 4070 700 701 2 3384 )); +DATA(insert ( 4070 700 701 3 3385 )); +DATA(insert ( 4070 700 701 4 3386 )); +DATA(insert ( 4070 700 701 11 301 )); +DATA(insert ( 4070 700 701 12 303 )); +DATA(insert ( 4070 700 701 13 304 )); +DATA(insert ( 4070 700 701 14 303 )); + +DATA(insert ( 4070 701 701 1 3383 )); +DATA(insert ( 4070 701 701 2 3384 )); +DATA(insert ( 4070 701 701 3 3385 )); +DATA(insert ( 4070 701 701 4 3386 )); +DATA(insert ( 4070 701 701 11 295 )); +DATA(insert ( 4070 701 701 12 296 )); +DATA(insert ( 4070 701 701 13 298 )); +DATA(insert ( 4070 701 701 14 297 )); + +DATA(insert ( 4070 701 700 1 3383 )); +DATA(insert ( 4070 701 700 2 3384 )); +DATA(insert ( 4070 701 700 3 3385 )); +DATA(insert ( 4070 701 700 4 3386 )); +DATA(insert ( 4070 701 700 11 307 )); +DATA(insert ( 4070 701 700 12 308 )); +DATA(insert ( 4070 701 700 13 310 )); +DATA(insert ( 4070 701 700 14 309 )); + /* minmax abstime */ DATA(insert ( 4072 702 702 1 3383 )); DATA(insert ( 4072 702 702 2 3384 )); @@ -577,15 +645,6 @@ DATA(insert ( 4076 1042 1042 11 1049 )); DATA(insert ( 4076 1042 1042 12 1050 )); DATA(insert ( 4076 1042 1042 13 1052 )); DATA(insert ( 4076 1042 1042 14 1051 )); -/* minmax date */ -DATA(insert ( 4061 1082 1082 1 3383 )); -DATA(insert ( 4061 1082 1082 2 3384 )); -DATA(insert ( 4061 1082 1082 3 3385 )); -DATA(insert ( 4061 1082 1082 4 3386 )); -DATA(insert ( 4061 1082 1082 11 1087 )); -DATA(insert ( 4061 1082 1082 12 1088 )); -DATA(insert ( 4061 1082 1082 13 1090 )); -DATA(insert ( 4061 1082 1082 14 1089 )); /* minmax time without time zone */ DATA(insert ( 4077 1083 1083 1 3383 )); DATA(insert ( 4077 1083 1083 2 3384 )); @@ -595,7 +654,7 @@ DATA(insert ( 4077 1083 1083 11 1102 )); DATA(insert ( 4077 1083 1083 12 1103 )); DATA(insert ( 4077 1083 1083 13 1105 )); DATA(insert ( 4077 1083 1083 14 1104 )); -/* minmax timestamp without time zone */ +/* minmax datetime (date, timestamp, timestamptz) */ DATA(insert ( 4059 1114 1114 1 3383 )); DATA(insert ( 4059 1114 1114 2 3384 )); DATA(insert ( 4059 1114 1114 3 3385 )); @@ -604,15 +663,73 @@ DATA(insert ( 4059 1114 1114 11 2054 )); DATA(insert ( 4059 1114 1114 12 2055 )); DATA(insert ( 4059 1114 1114 13 2056 )); DATA(insert ( 4059 1114 1114 14 2057 )); -/* minmax timestamp with time zone */ -DATA(insert ( 4060 1184 1184 1 3383 )); -DATA(insert ( 4060 1184 1184 2 3384 )); -DATA(insert ( 4060 1184 1184 3 3385 )); -DATA(insert ( 4060 1184 1184 4 3386 )); -DATA(insert ( 4060 1184 1184 11 1154 )); -DATA(insert ( 4060 1184 1184 12 1155 )); -DATA(insert ( 4060 1184 1184 13 1156 )); -DATA(insert ( 4060 1184 1184 14 1157 )); +DATA(insert ( 4059 1114 1184 1 3383 )); +DATA(insert ( 4059 1114 1184 2 3384 )); +DATA(insert ( 4059 1114 1184 3 3385 )); +DATA(insert ( 4059 1114 1184 4 3386 )); +DATA(insert ( 4059 1114 1184 11 2520 )); +DATA(insert ( 4059 1114 1184 12 2521 )); +DATA(insert ( 4059 1114 1184 13 2524 )); +DATA(insert ( 4059 1114 1184 14 2523 )); +DATA(insert ( 4059 1114 1082 1 3383 )); +DATA(insert ( 4059 1114 1082 2 3384 )); +DATA(insert ( 4059 1114 1082 3 3385 )); +DATA(insert ( 4059 1114 1082 4 3386 )); +DATA(insert ( 4059 1114 1082 11 2364 )); +DATA(insert ( 4059 1114 1082 12 2365 )); +DATA(insert ( 4059 1114 1082 13 2368 )); +DATA(insert ( 4059 1114 1082 14 2367 )); + +DATA(insert ( 4059 1184 1184 1 3383 )); +DATA(insert ( 4059 1184 1184 2 3384 )); +DATA(insert ( 4059 1184 1184 3 3385 )); +DATA(insert ( 4059 1184 1184 4 3386 )); +DATA(insert ( 4059 1184 1184 11 1154 )); +DATA(insert ( 4059 1184 1184 12 1155 )); +DATA(insert ( 4059 1184 1184 13 1156 )); +DATA(insert ( 4059 1184 1184 14 1157 )); +DATA(insert ( 4059 1184 1114 1 3383 )); +DATA(insert ( 4059 1184 1114 2 3384 )); +DATA(insert ( 4059 1184 1114 3 3385 )); +DATA(insert ( 4059 1184 1114 4 3386 )); +DATA(insert ( 4059 1184 1114 11 2527 )); +DATA(insert ( 4059 1184 1114 12 2528 )); +DATA(insert ( 4059 1184 1114 13 2531 )); +DATA(insert ( 4059 1184 1114 14 2530 )); +DATA(insert ( 4059 1184 1082 1 3383 )); +DATA(insert ( 4059 1184 1082 2 3384 )); +DATA(insert ( 4059 1184 1082 3 3385 )); +DATA(insert ( 4059 1184 1082 4 3386 )); +DATA(insert ( 4059 1184 1082 11 2377 )); +DATA(insert ( 4059 1184 1082 12 2378 )); +DATA(insert ( 4059 1184 1082 13 2381 )); +DATA(insert ( 4059 1184 1082 14 2379 )); + +DATA(insert ( 4059 1082 1082 1 3383 )); +DATA(insert ( 4059 1082 1082 2 3384 )); +DATA(insert ( 4059 1082 1082 3 3385 )); +DATA(insert ( 4059 1082 1082 4 3386 )); +DATA(insert ( 4059 1082 1082 11 1087 )); +DATA(insert ( 4059 1082 1082 12 1088 )); +DATA(insert ( 4059 1082 1082 13 1090 )); +DATA(insert ( 4059 1082 1082 14 1089 )); +DATA(insert ( 4059 1082 1114 1 3383 )); +DATA(insert ( 4059 1082 1114 2 3384 )); +DATA(insert ( 4059 1082 1114 3 3385 )); +DATA(insert ( 4059 1082 1114 4 3386 )); +DATA(insert ( 4059 1082 1114 11 2338 )); +DATA(insert ( 4059 1082 1114 12 2339 )); +DATA(insert ( 4059 1082 1114 13 2342 )); +DATA(insert ( 4059 1082 1114 14 2341 )); +DATA(insert ( 4059 1082 1184 1 3383 )); +DATA(insert ( 4059 1082 1184 2 3384 )); +DATA(insert ( 4059 1082 1184 3 3385 )); +DATA(insert ( 4059 1082 1184 4 3386 )); +DATA(insert ( 4059 1082 1184 11 2351 )); +DATA(insert ( 4059 1082 1184 12 2352 )); +DATA(insert ( 4059 1082 1184 13 2354 )); +DATA(insert ( 4059 1082 1184 14 2353 )); + /* minmax interval */ DATA(insert ( 4078 1186 1186 1 3383 )); DATA(insert ( 4078 1186 1186 2 3384 )); diff --git a/src/include/catalog/pg_opclass.h b/src/include/catalog/pg_opclass.h index 595cd7f..06dd5b0 100644 --- a/src/include/catalog/pg_opclass.h +++ b/src/include/catalog/pg_opclass.h @@ -241,23 +241,23 @@ DATA(insert ( 2742 jsonb_path_ops PGNSP PGUID 4037 3802 f 23 )); DATA(insert ( 3580 bytea_minmax_ops PGNSP PGUID 4064 17 t 0 )); DATA(insert ( 3580 char_minmax_ops PGNSP PGUID 4062 18 t 0 )); DATA(insert ( 3580 name_minmax_ops PGNSP PGUID 4065 19 t 0 )); -DATA(insert ( 3580 int8_minmax_ops PGNSP PGUID 4063 20 t 0 )); -DATA(insert ( 3580 int2_minmax_ops PGNSP PGUID 4067 21 t 0 )); +DATA(insert ( 3580 int8_minmax_ops PGNSP PGUID 4054 20 t 0 )); +DATA(insert ( 3580 int2_minmax_ops PGNSP PGUID 4054 21 t 0 )); DATA(insert ( 3580 int4_minmax_ops PGNSP PGUID 4054 23 t 0 )); DATA(insert ( 3580 text_minmax_ops PGNSP PGUID 4056 25 t 0 )); DATA(insert ( 3580 oid_minmax_ops PGNSP PGUID 4068 26 t 0 )); DATA(insert ( 3580 tid_minmax_ops PGNSP PGUID 4069 27 t 0 )); DATA(insert ( 3580 float4_minmax_ops PGNSP PGUID 4070 700 t 0 )); -DATA(insert ( 3580 float8_minmax_ops PGNSP PGUID 4071 701 t 0 )); +DATA(insert ( 3580 float8_minmax_ops PGNSP PGUID 4070 701 t 0 )); DATA(insert ( 3580 abstime_minmax_ops PGNSP PGUID 4072 702 t 0 )); DATA(insert ( 3580 reltime_minmax_ops PGNSP PGUID 4073 703 t 0 )); DATA(insert ( 3580 macaddr_minmax_ops PGNSP PGUID 4074 829 t 0 )); -DATA(insert ( 3580 inet_minmax_ops PGNSP PGUID 4075 869 t 0 )); +DATA(insert ( 3580 inet_minmax_ops PGNSP PGUID 4074 869 t 0 )); DATA(insert ( 3580 bpchar_minmax_ops PGNSP PGUID 4076 1042 t 0 )); -DATA(insert ( 3580 date_minmax_ops PGNSP PGUID 4061 1082 t 0 )); DATA(insert ( 3580 time_minmax_ops PGNSP PGUID 4077 1083 t 0 )); +DATA(insert ( 3580 date_minmax_ops PGNSP PGUID 4059 1082 t 0 )); DATA(insert ( 3580 timestamp_minmax_ops PGNSP PGUID 4059 1114 t 0 )); -DATA(insert ( 3580 timestamptz_minmax_ops PGNSP PGUID 4060 1184 t 0 )); +DATA(insert ( 3580 timestamptz_minmax_ops PGNSP PGUID 4059 1184 t 0 )); DATA(insert ( 3580 interval_minmax_ops PGNSP PGUID 4078 1186 t 0 )); DATA(insert ( 3580 timetz_minmax_ops PGNSP PGUID 4058 1266 t 0 )); DATA(insert ( 3580 bit_minmax_ops PGNSP PGUID 4079 1560 t 0 )); diff --git a/src/include/catalog/pg_opfamily.h b/src/include/catalog/pg_opfamily.h index 2d8af76..9019af5 100644 --- a/src/include/catalog/pg_opfamily.h +++ b/src/include/catalog/pg_opfamily.h @@ -157,22 +157,17 @@ DATA(insert OID = 4035 ( 783 jsonb_ops PGNSP PGUID )); DATA(insert OID = 4036 ( 2742 jsonb_ops PGNSP PGUID )); DATA(insert OID = 4037 ( 2742 jsonb_path_ops PGNSP PGUID )); -DATA(insert OID = 4054 ( 3580 int4_minmax_ops PGNSP PGUID )); +DATA(insert OID = 4054 ( 3580 integer_minmax_ops PGNSP PGUID )); DATA(insert OID = 4055 ( 3580 numeric_minmax_ops PGNSP PGUID )); DATA(insert OID = 4056 ( 3580 text_minmax_ops PGNSP PGUID )); DATA(insert OID = 4058 ( 3580 timetz_minmax_ops PGNSP PGUID )); -DATA(insert OID = 4059 ( 3580 timestamp_minmax_ops PGNSP PGUID )); -DATA(insert OID = 4060 ( 3580 timestamptz_minmax_ops PGNSP PGUID )); -DATA(insert OID = 4061 ( 3580 date_minmax_ops PGNSP PGUID )); +DATA(insert OID = 4059 ( 3580 datetime_minmax_ops PGNSP PGUID )); DATA(insert OID = 4062 ( 3580 char_minmax_ops PGNSP PGUID )); -DATA(insert OID = 4063 ( 3580 int8_minmax_ops PGNSP PGUID )); DATA(insert OID = 4064 ( 3580 bytea_minmax_ops PGNSP PGUID )); DATA(insert OID = 4065 ( 3580 name_minmax_ops PGNSP PGUID )); -DATA(insert OID = 4067 ( 3580 int2_minmax_ops PGNSP PGUID )); DATA(insert OID = 4068 ( 3580 oid_minmax_ops PGNSP PGUID )); DATA(insert OID = 4069 ( 3580 tid_minmax_ops PGNSP PGUID )); -DATA(insert OID = 4070 ( 3580 float4_minmax_ops PGNSP PGUID )); -DATA(insert OID = 4071 ( 3580 float8_minmax_ops PGNSP PGUID )); +DATA(insert OID = 4070 ( 3580 float_minmax_ops PGNSP PGUID )); DATA(insert OID = 4072 ( 3580 abstime_minmax_ops PGNSP PGUID )); DATA(insert OID = 4073 ( 3580 reltime_minmax_ops PGNSP PGUID )); DATA(insert OID = 4074 ( 3580 macaddr_minmax_ops PGNSP PGUID ));
-- Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-hackers
