Skip to content

Commit 7861d72

Browse files
alvherrealvherre
committed
Modify the float4 datatype to be pass-by-val. Along the way, remove the last
uses of the long-deprecated float32 in contrib/seg; the definitions themselves are still there, but no longer used. fmgr/README updated to match. I added a CREATE FUNCTION to account for existing seg_center() code in seg.c too, and some tests for it and the neighbor functions. At the same time, remove checks for NULL which are not needed (because the functions are declared STRICT). I had to do some adjustments to contrib's btree_gist too. The choices for representation there are not ideal for changing the underlying types :-( Original patch by Zoltan Boszormenyi, with some adjustments by me.
1 parent b8e5581 commit 7861d72

File tree

20 files changed

+392
-129
lines changed

20 files changed

+392
-129
lines changed

‎config/c-compiler.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Macros to detect C compiler features
2-
# $PostgreSQL: pgsql/config/c-compiler.m4,v 1.15 2008/02/17 16:36:42 petere Exp $
2+
# $PostgreSQL: pgsql/config/c-compiler.m4,v 1.16 2008/04/18 18:43:08 alvherre Exp $
33

44

55
# PGAC_C_SIGNED
@@ -62,7 +62,7 @@ AC_COMPILE_IFELSE([AC_LANG_BOOL_COMPILE_TRY([], [sizeof($1) == 8])],
6262
6363
Ac_define=$Ac_cachevar
6464
if test x"$Ac_cachevar" = xyes ; then
65-
AC_DEFINE(Ac_define,, [Define to 1 if `]$1[' works and is 64 bits.])
65+
AC_DEFINE(Ac_define, 1, [Define to 1 if `]$1[' works and is 64 bits.])
6666
fi
6767
undefine([Ac_define])dnl
6868
undefine([Ac_cachevar])dnl

‎configure

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19693,7 +19693,7 @@ HAVE_LONG_INT_64=$pgac_cv_type_long_int_64
1969319693
if test x"$pgac_cv_type_long_int_64" = xyes ; then
1969419694

1969519695
cat >>confdefs.h <<\_ACEOF
19696-
#define HAVE_LONG_INT_64
19696+
#define HAVE_LONG_INT_64 1
1969719697
_ACEOF
1969819698

1969919699
fi
@@ -19826,7 +19826,7 @@ HAVE_LONG_LONG_INT_64=$pgac_cv_type_long_long_int_64
1982619826
if test x"$pgac_cv_type_long_long_int_64" = xyes ; then
1982719827

1982819828
cat >>confdefs.h <<\_ACEOF
19829-
#define HAVE_LONG_LONG_INT_64
19829+
#define HAVE_LONG_LONG_INT_64 1
1983019830
_ACEOF
1983119831

1983219832
fi

‎contrib/btree_gist/btree_utils_num.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@ gbt_num_compress(GISTENTRY *retval, GISTENTRY *entry, const gbtree_ninfo * tinfo
1313
{
1414
int16 i2;
1515
int32 i4;
16+
float4 f4;
1617
DateADT dt;
1718
} v;
1819

19-
GBT_NUMKEY *r = (GBT_NUMKEY *) palloc(2 * tinfo->size);
20+
GBT_NUMKEY *r = (GBT_NUMKEY *) palloc0(2 * tinfo->size);
2021
void *leaf = NULL;
2122

2223
switch (tinfo->t)
@@ -37,11 +38,14 @@ gbt_num_compress(GISTENTRY *retval, GISTENTRY *entry, const gbtree_ninfo * tinfo
3738
v.dt = DatumGetDateADT(entry->key);
3839
leaf = &v.dt;
3940
break;
41+
case gbt_t_float4:
42+
v.f4 = DatumGetFloat4(entry->key);
43+
leaf = &v.f4;
44+
break;
4045
default:
4146
leaf = DatumGetPointer(entry->key);
4247
}
4348

44-
memset((void *) &r[0], 0, 2 * tinfo->size);
4549
memcpy((void *) &r[0], leaf, tinfo->size);
4650
memcpy((void *) &r[tinfo->size], leaf, tinfo->size);
4751
retval = palloc(sizeof(GISTENTRY));

‎contrib/seg/data/test_seg.data

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2575,3 +2575,4 @@
25752575
23.7
25762576
24
25772577
24.0
2578+
\N

‎contrib/seg/expected/seg.out

Lines changed: 151 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1065,3 +1065,154 @@ SELECT * FROM test_seg WHERE s @> '11..11.3' GROUP BY s;
10651065
10.7 .. 12.3
10661066
(143 rows)
10671067

1068+
-- Test functions
1069+
SELECT seg_lower(s), seg_center(s), seg_upper(s)
1070+
FROM test_seg WHERE s @> '11.2..11.3' OR s IS NULL ORDER BY s;
1071+
seg_lower | seg_center | seg_upper
1072+
-----------+------------+-----------
1073+
-Infinity | -Infinity | 40
1074+
-Infinity | -Infinity | 82
1075+
-Infinity | -Infinity | 90
1076+
1 | 7 | 13
1077+
1.3 | 6.65 | 12
1078+
2 | 6.75 | 11.5
1079+
2.1 | 6.95 | 11.8
1080+
2.3 | Infinity | Infinity
1081+
2.3 | Infinity | Infinity
1082+
2.4 | 6.85 | 11.3
1083+
2.5 | 7 | 11.5
1084+
2.5 | 7.15 | 11.8
1085+
2.6 | Infinity | Infinity
1086+
2.7 | 7.35 | 12
1087+
3 | Infinity | Infinity
1088+
3 | 30.5 | 58
1089+
3.1 | 7.3 | 11.5
1090+
3.5 | 7.5 | 11.5
1091+
3.5 | 7.85 | 12.2
1092+
4 | 8 | 12
1093+
4 | Infinity | Infinity
1094+
4 | 8 | 12
1095+
4 | 7.85 | 11.7
1096+
4 | 8.25 | 12.5
1097+
4 | 8.5 | 13
1098+
4 | 32 | 60
1099+
4 | Infinity | Infinity
1100+
4.2 | 7.85 | 11.5
1101+
4.2 | 7.95 | 11.7
1102+
4.5 | 8.25 | 12
1103+
4.5 | 8 | 11.5
1104+
4.5 | 8.25 | 12
1105+
4.5 | 8.25 | 12
1106+
4.5 | 8.5 | 12.5
1107+
4.5 | 59.75 | 115
1108+
4.7 | 8.25 | 11.8
1109+
4.8 | 8.15 | 11.5
1110+
4.8 | 8.2 | 11.6
1111+
4.8 | 8.65 | 12.5
1112+
4.8 | Infinity | Infinity
1113+
4.9 | 8.45 | 12
1114+
4.9 | Infinity | Infinity
1115+
5 | 8.25 | 11.5
1116+
5 | 8.5 | 12
1117+
5 | 17.5 | 30
1118+
5 | 8.2 | 11.4
1119+
5 | 8.25 | 11.5
1120+
5 | 8.3 | 11.6
1121+
5 | 8.35 | 11.7
1122+
5 | 8.5 | 12
1123+
5 | 8.5 | 12
1124+
5 | 8.5 | 12
1125+
5.2 | 8.35 | 11.5
1126+
5.2 | 8.6 | 12
1127+
5.25 | 8.625 | 12
1128+
5.3 | 8.4 | 11.5
1129+
5.3 | 9.15 | 13
1130+
5.3 | 47.65 | 90
1131+
5.3 | Infinity | Infinity
1132+
5.4 | Infinity | Infinity
1133+
5.5 | 8.5 | 11.5
1134+
5.5 | 8.6 | 11.7
1135+
5.5 | 8.75 | 12
1136+
5.5 | 8.75 | 12
1137+
5.5 | 9 | 12.5
1138+
5.5 | 9.5 | 13.5
1139+
5.5 | Infinity | Infinity
1140+
5.5 | Infinity | Infinity
1141+
5.7 | Infinity | Infinity
1142+
5.9 | Infinity | Infinity
1143+
6 | 8.75 | 11.5
1144+
6 | 9 | 12
1145+
6 | 8.75 | 11.5
1146+
6 | 9.5 | 13
1147+
6 | 8.75 | 11.5
1148+
6.1 | 9.05 | 12
1149+
6.1 | Infinity | Infinity
1150+
6.2 | 8.85 | 11.5
1151+
6.3 | Infinity | Infinity
1152+
6.5 | 9 | 11.5
1153+
6.5 | 9.25 | 12
1154+
6.5 | 9.25 | 12
1155+
6.5 | Infinity | Infinity
1156+
6.6 | Infinity | Infinity
1157+
6.7 | 9.1 | 11.5
1158+
6.7 | Infinity | Infinity
1159+
6.75 | Infinity | Infinity
1160+
6.8 | Infinity | Infinity
1161+
6.9 | 9.55 | 12.2
1162+
6.9 | 48.45 | 90
1163+
6.9 | Infinity | Infinity
1164+
7 | 9.25 | 11.5
1165+
7 | 9.25 | 11.5
1166+
7 | 9.25 | 11.5
1167+
7 | Infinity | Infinity
1168+
7.15 | Infinity | Infinity
1169+
7.2 | 10.35 | 13.5
1170+
7.3 | 48.65 | 90
1171+
7.3 | Infinity | Infinity
1172+
7.3 | Infinity | Infinity
1173+
7.4 | 9.75 | 12.1
1174+
7.4 | Infinity | Infinity
1175+
7.5 | 9.5 | 11.5
1176+
7.5 | 9.75 | 12
1177+
7.5 | Infinity | Infinity
1178+
7.7 | 9.6 | 11.5
1179+
7.7 | Infinity | Infinity
1180+
7.75 | Infinity | Infinity
1181+
8 | 9.85 | 11.7
1182+
8 | 10 | 12
1183+
8 | 10.5 | 13
1184+
8.2 | Infinity | Infinity
1185+
8.3 | Infinity | Infinity
1186+
8.5 | 10 | 11.5
1187+
8.5 | 10.5 | 12.5
1188+
8.5 | Infinity | Infinity
1189+
8.6 | 53.8 | 99
1190+
8.7 | 10 | 11.3
1191+
8.7 | 10.2 | 11.7
1192+
8.9 | 10.2 | 11.5
1193+
9 | 10.5 | 12
1194+
9 | 10.15 | 11.3
1195+
9 | 10.25 | 11.5
1196+
9 | 10.5 | 12
1197+
9 | Infinity | Infinity
1198+
9.2 | 10.6 | 12
1199+
9.4 | 10.8 | 12.2
1200+
9.5 | 10.75 | 12
1201+
9.5 | 10.85 | 12.2
1202+
9.5 | Infinity | Infinity
1203+
9.6 | 10.55 | 11.5
1204+
9.7 | 10.6 | 11.5
1205+
9.7 | 10.85 | 12
1206+
9.8 | 11.15 | 12.5
1207+
10 | 10.8 | 11.6
1208+
10 | 10.75 | 11.5
1209+
10 | 11.25 | 12.5
1210+
10 | 11.25 | 12.5
1211+
10.2 | 11 | 11.8
1212+
10.5 | 11 | 11.5
1213+
10.5 | 11 | 11.5
1214+
10.5 | 12 | 13.5
1215+
10.7 | 11.5 | 12.3
1216+
| |
1217+
(144 rows)
1218+

‎contrib/seg/expected/seg_1.out

Lines changed: 151 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1065,3 +1065,154 @@ SELECT * FROM test_seg WHERE s @> '11..11.3' GROUP BY s;
10651065
10.7 .. 12.3
10661066
(143 rows)
10671067

1068+
-- Test functions
1069+
SELECT seg_lower(s), seg_center(s), seg_upper(s)
1070+
FROM test_seg WHERE s @> '11.2..11.3' OR s IS NULL ORDER BY s;
1071+
seg_lower | seg_center | seg_upper
1072+
-----------+------------+-----------
1073+
-Infinity | -Infinity | 40
1074+
-Infinity | -Infinity | 82
1075+
-Infinity | -Infinity | 90
1076+
1 | 7 | 13
1077+
1.3 | 6.65 | 12
1078+
2 | 6.75 | 11.5
1079+
2.1 | 6.95 | 11.8
1080+
2.3 | Infinity | Infinity
1081+
2.3 | Infinity | Infinity
1082+
2.4 | 6.85 | 11.3
1083+
2.5 | 7 | 11.5
1084+
2.5 | 7.15 | 11.8
1085+
2.6 | Infinity | Infinity
1086+
2.7 | 7.35 | 12
1087+
3 | Infinity | Infinity
1088+
3 | 30.5 | 58
1089+
3.1 | 7.3 | 11.5
1090+
3.5 | 7.5 | 11.5
1091+
3.5 | 7.85 | 12.2
1092+
4 | 8 | 12
1093+
4 | Infinity | Infinity
1094+
4 | 8 | 12
1095+
4 | 7.85 | 11.7
1096+
4 | 8.25 | 12.5
1097+
4 | 8.5 | 13
1098+
4 | 32 | 60
1099+
4 | Infinity | Infinity
1100+
4.2 | 7.85 | 11.5
1101+
4.2 | 7.95 | 11.7
1102+
4.5 | 8.25 | 12
1103+
4.5 | 8 | 11.5
1104+
4.5 | 8.25 | 12
1105+
4.5 | 8.25 | 12
1106+
4.5 | 8.5 | 12.5
1107+
4.5 | 59.75 | 115
1108+
4.7 | 8.25 | 11.8
1109+
4.8 | 8.15 | 11.5
1110+
4.8 | 8.2 | 11.6
1111+
4.8 | 8.65 | 12.5
1112+
4.8 | Infinity | Infinity
1113+
4.9 | 8.45 | 12
1114+
4.9 | Infinity | Infinity
1115+
5 | 8.25 | 11.5
1116+
5 | 8.5 | 12
1117+
5 | 17.5 | 30
1118+
5 | 8.2 | 11.4
1119+
5 | 8.25 | 11.5
1120+
5 | 8.3 | 11.6
1121+
5 | 8.35 | 11.7
1122+
5 | 8.5 | 12
1123+
5 | 8.5 | 12
1124+
5 | 8.5 | 12
1125+
5.2 | 8.35 | 11.5
1126+
5.2 | 8.6 | 12
1127+
5.25 | 8.625 | 12
1128+
5.3 | 8.4 | 11.5
1129+
5.3 | 9.15 | 13
1130+
5.3 | 47.65 | 90
1131+
5.3 | Infinity | Infinity
1132+
5.4 | Infinity | Infinity
1133+
5.5 | 8.5 | 11.5
1134+
5.5 | 8.6 | 11.7
1135+
5.5 | 8.75 | 12
1136+
5.5 | 8.75 | 12
1137+
5.5 | 9 | 12.5
1138+
5.5 | 9.5 | 13.5
1139+
5.5 | Infinity | Infinity
1140+
5.5 | Infinity | Infinity
1141+
5.7 | Infinity | Infinity
1142+
5.9 | Infinity | Infinity
1143+
6 | 8.75 | 11.5
1144+
6 | 9 | 12
1145+
6 | 8.75 | 11.5
1146+
6 | 9.5 | 13
1147+
6 | 8.75 | 11.5
1148+
6.1 | 9.05 | 12
1149+
6.1 | Infinity | Infinity
1150+
6.2 | 8.85 | 11.5
1151+
6.3 | Infinity | Infinity
1152+
6.5 | 9 | 11.5
1153+
6.5 | 9.25 | 12
1154+
6.5 | 9.25 | 12
1155+
6.5 | Infinity | Infinity
1156+
6.6 | Infinity | Infinity
1157+
6.7 | 9.1 | 11.5
1158+
6.7 | Infinity | Infinity
1159+
6.75 | Infinity | Infinity
1160+
6.8 | Infinity | Infinity
1161+
6.9 | 9.55 | 12.2
1162+
6.9 | 48.45 | 90
1163+
6.9 | Infinity | Infinity
1164+
7 | 9.25 | 11.5
1165+
7 | 9.25 | 11.5
1166+
7 | 9.25 | 11.5
1167+
7 | Infinity | Infinity
1168+
7.15 | Infinity | Infinity
1169+
7.2 | 10.35 | 13.5
1170+
7.3 | 48.65 | 90
1171+
7.3 | Infinity | Infinity
1172+
7.3 | Infinity | Infinity
1173+
7.4 | 9.75 | 12.1
1174+
7.4 | Infinity | Infinity
1175+
7.5 | 9.5 | 11.5
1176+
7.5 | 9.75 | 12
1177+
7.5 | Infinity | Infinity
1178+
7.7 | 9.6 | 11.5
1179+
7.7 | Infinity | Infinity
1180+
7.75 | Infinity | Infinity
1181+
8 | 9.85 | 11.7
1182+
8 | 10 | 12
1183+
8 | 10.5 | 13
1184+
8.2 | Infinity | Infinity
1185+
8.3 | Infinity | Infinity
1186+
8.5 | 10 | 11.5
1187+
8.5 | 10.5 | 12.5
1188+
8.5 | Infinity | Infinity
1189+
8.6 | 53.8 | 99
1190+
8.7 | 10 | 11.3
1191+
8.7 | 10.2 | 11.7
1192+
8.9 | 10.2 | 11.5
1193+
9 | 10.5 | 12
1194+
9 | 10.15 | 11.3
1195+
9 | 10.25 | 11.5
1196+
9 | 10.5 | 12
1197+
9 | Infinity | Infinity
1198+
9.2 | 10.6 | 12
1199+
9.4 | 10.8 | 12.2
1200+
9.5 | 10.75 | 12
1201+
9.5 | 10.85 | 12.2
1202+
9.5 | Infinity | Infinity
1203+
9.6 | 10.55 | 11.5
1204+
9.7 | 10.6 | 11.5
1205+
9.7 | 10.85 | 12
1206+
9.8 | 11.15 | 12.5
1207+
10 | 10.8 | 11.6
1208+
10 | 10.75 | 11.5
1209+
10 | 11.25 | 12.5
1210+
10 | 11.25 | 12.5
1211+
10.2 | 11 | 11.8
1212+
10.5 | 11 | 11.5
1213+
10.5 | 11 | 11.5
1214+
10.5 | 12 | 13.5
1215+
10.7 | 11.5 | 12.3
1216+
| |
1217+
(144 rows)
1218+

0 commit comments

Comments
 (0)