Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit56a79a8

Browse files
committed
Split array_push into separate array_append and array_prepend functions.
There wasn't any good reason for a single C function to implement boththese SQL functions: it saved very little code overall, and it requiredsignificant pushups to re-determine at runtime which case applied. Redoingit as two functions ends up with just slightly more lines of code, but it'ssimpler to understand, and faster too because we need not repeat syscachelookups on every call.An important side benefit is that this eliminates the only case in whichdifferent aliases of the same C function had both anyarray and anyelementarguments at the same position, which would almost always be a mistake.The opr_sanity regression test will now notice such mistakes since there'sno longer a valid case where it happens.
1 parentd30292b commit56a79a8

File tree

5 files changed

+130
-107
lines changed

5 files changed

+130
-107
lines changed

‎src/backend/utils/adt/array_userfuncs.c

Lines changed: 123 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -17,101 +17,151 @@
1717
#include"utils/lsyscache.h"
1818

1919

20+
/*
21+
* fetch_array_arg_replace_nulls
22+
*
23+
* Fetch an array-valued argument; if it's null, construct an empty array
24+
* value of the proper data type. Also cache basic element type information
25+
* in fn_extra.
26+
*/
27+
staticArrayType*
28+
fetch_array_arg_replace_nulls(FunctionCallInfofcinfo,intargno)
29+
{
30+
ArrayType*v;
31+
ArrayMetaState*my_extra;
32+
33+
my_extra= (ArrayMetaState*)fcinfo->flinfo->fn_extra;
34+
if (my_extra==NULL)
35+
{
36+
/* First time through, so look up the array type and element type */
37+
Oidarr_typeid=get_fn_expr_argtype(fcinfo->flinfo,argno);
38+
Oidelement_type;
39+
40+
if (!OidIsValid(arr_typeid))
41+
ereport(ERROR,
42+
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
43+
errmsg("could not determine input data type")));
44+
element_type=get_element_type(arr_typeid);
45+
if (!OidIsValid(element_type))
46+
ereport(ERROR,
47+
(errcode(ERRCODE_DATATYPE_MISMATCH),
48+
errmsg("input data type is not an array")));
49+
50+
my_extra= (ArrayMetaState*)
51+
MemoryContextAlloc(fcinfo->flinfo->fn_mcxt,
52+
sizeof(ArrayMetaState));
53+
my_extra->element_type=element_type;
54+
55+
/* Cache info about element type */
56+
get_typlenbyvalalign(element_type,
57+
&my_extra->typlen,
58+
&my_extra->typbyval,
59+
&my_extra->typalign);
60+
61+
fcinfo->flinfo->fn_extra=my_extra;
62+
}
63+
64+
/* Now we can collect the array value */
65+
if (PG_ARGISNULL(argno))
66+
v=construct_empty_array(my_extra->element_type);
67+
else
68+
v=PG_GETARG_ARRAYTYPE_P(argno);
69+
70+
returnv;
71+
}
72+
2073
/*-----------------------------------------------------------------------------
21-
*array_push :
22-
*push an element ontoeither end of a one-dimensional array
74+
*array_append :
75+
*push an element ontothe end of a one-dimensional array
2376
*----------------------------------------------------------------------------
2477
*/
2578
Datum
26-
array_push(PG_FUNCTION_ARGS)
79+
array_append(PG_FUNCTION_ARGS)
2780
{
2881
ArrayType*v;
2982
Datumnewelem;
3083
boolisNull;
84+
ArrayType*result;
3185
int*dimv,
3286
*lb;
33-
ArrayType*result;
3487
intindx;
35-
Oidelement_type;
36-
int16typlen;
37-
booltypbyval;
38-
chartypalign;
39-
Oidarg0_typeid=get_fn_expr_argtype(fcinfo->flinfo,0);
40-
Oidarg1_typeid=get_fn_expr_argtype(fcinfo->flinfo,1);
41-
Oidarg0_elemid;
42-
Oidarg1_elemid;
4388
ArrayMetaState*my_extra;
4489

45-
if (arg0_typeid==InvalidOid||arg1_typeid==InvalidOid)
46-
ereport(ERROR,
47-
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
48-
errmsg("could not determine input data types")));
49-
50-
arg0_elemid=get_element_type(arg0_typeid);
51-
arg1_elemid=get_element_type(arg1_typeid);
90+
v=fetch_array_arg_replace_nulls(fcinfo,0);
91+
isNull=PG_ARGISNULL(1);
92+
if (isNull)
93+
newelem= (Datum)0;
94+
else
95+
newelem=PG_GETARG_DATUM(1);
5296

53-
if (arg0_elemid!=InvalidOid)
54-
{
55-
if (PG_ARGISNULL(0))
56-
v=construct_empty_array(arg0_elemid);
57-
else
58-
v=PG_GETARG_ARRAYTYPE_P(0);
59-
isNull=PG_ARGISNULL(1);
60-
if (isNull)
61-
newelem= (Datum)0;
62-
else
63-
newelem=PG_GETARG_DATUM(1);
64-
}
65-
elseif (arg1_elemid!=InvalidOid)
97+
if (ARR_NDIM(v)==1)
6698
{
67-
if (PG_ARGISNULL(1))
68-
v=construct_empty_array(arg1_elemid);
69-
else
70-
v=PG_GETARG_ARRAYTYPE_P(1);
71-
isNull=PG_ARGISNULL(0);
72-
if (isNull)
73-
newelem= (Datum)0;
74-
else
75-
newelem=PG_GETARG_DATUM(0);
99+
/* append newelem */
100+
intub;
101+
102+
lb=ARR_LBOUND(v);
103+
dimv=ARR_DIMS(v);
104+
ub=dimv[0]+lb[0]-1;
105+
indx=ub+1;
106+
107+
/* overflow? */
108+
if (indx<ub)
109+
ereport(ERROR,
110+
(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
111+
errmsg("integer out of range")));
76112
}
113+
elseif (ARR_NDIM(v)==0)
114+
indx=1;
77115
else
78-
{
79-
/* Shouldn't get here given proper type checking in parser */
80116
ereport(ERROR,
81-
(errcode(ERRCODE_DATATYPE_MISMATCH),
82-
errmsg("neither input type is an array")));
83-
PG_RETURN_NULL();/* keep compiler quiet */
84-
}
117+
(errcode(ERRCODE_DATA_EXCEPTION),
118+
errmsg("argument must be empty or one-dimensional array")));
119+
120+
/* Perform element insertion */
121+
my_extra= (ArrayMetaState*)fcinfo->flinfo->fn_extra;
85122

86-
element_type=ARR_ELEMTYPE(v);
123+
result=array_set(v,1,&indx,newelem,isNull,
124+
-1,my_extra->typlen,my_extra->typbyval,my_extra->typalign);
125+
126+
PG_RETURN_ARRAYTYPE_P(result);
127+
}
128+
129+
/*-----------------------------------------------------------------------------
130+
* array_prepend :
131+
*push an element onto the front of a one-dimensional array
132+
*----------------------------------------------------------------------------
133+
*/
134+
Datum
135+
array_prepend(PG_FUNCTION_ARGS)
136+
{
137+
ArrayType*v;
138+
Datumnewelem;
139+
boolisNull;
140+
ArrayType*result;
141+
int*dimv,
142+
*lb;
143+
intindx;
144+
ArrayMetaState*my_extra;
145+
146+
isNull=PG_ARGISNULL(0);
147+
if (isNull)
148+
newelem= (Datum)0;
149+
else
150+
newelem=PG_GETARG_DATUM(0);
151+
v=fetch_array_arg_replace_nulls(fcinfo,1);
87152

88153
if (ARR_NDIM(v)==1)
89154
{
155+
/* prepend newelem */
90156
lb=ARR_LBOUND(v);
91157
dimv=ARR_DIMS(v);
158+
indx=lb[0]-1;
92159

93-
if (arg0_elemid!=InvalidOid)
94-
{
95-
/* append newelem */
96-
intub=dimv[0]+lb[0]-1;
97-
98-
indx=ub+1;
99-
/* overflow? */
100-
if (indx<ub)
101-
ereport(ERROR,
102-
(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
103-
errmsg("integer out of range")));
104-
}
105-
else
106-
{
107-
/* prepend newelem */
108-
indx=lb[0]-1;
109-
/* overflow? */
110-
if (indx>lb[0])
111-
ereport(ERROR,
112-
(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
113-
errmsg("integer out of range")));
114-
}
160+
/* overflow? */
161+
if (indx>lb[0])
162+
ereport(ERROR,
163+
(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
164+
errmsg("integer out of range")));
115165
}
116166
elseif (ARR_NDIM(v)==0)
117167
indx=1;
@@ -120,39 +170,13 @@ array_push(PG_FUNCTION_ARGS)
120170
(errcode(ERRCODE_DATA_EXCEPTION),
121171
errmsg("argument must be empty or one-dimensional array")));
122172

123-
/*
124-
* We arrange to look up info about element type only once per series of
125-
* calls, assuming the element type doesn't change underneath us.
126-
*/
173+
/* Perform element insertion */
127174
my_extra= (ArrayMetaState*)fcinfo->flinfo->fn_extra;
128-
if (my_extra==NULL)
129-
{
130-
fcinfo->flinfo->fn_extra=MemoryContextAlloc(fcinfo->flinfo->fn_mcxt,
131-
sizeof(ArrayMetaState));
132-
my_extra= (ArrayMetaState*)fcinfo->flinfo->fn_extra;
133-
my_extra->element_type= ~element_type;
134-
}
135-
136-
if (my_extra->element_type!=element_type)
137-
{
138-
/* Get info about element type */
139-
get_typlenbyvalalign(element_type,
140-
&my_extra->typlen,
141-
&my_extra->typbyval,
142-
&my_extra->typalign);
143-
my_extra->element_type=element_type;
144-
}
145-
typlen=my_extra->typlen;
146-
typbyval=my_extra->typbyval;
147-
typalign=my_extra->typalign;
148175

149176
result=array_set(v,1,&indx,newelem,isNull,
150-
-1,typlen,typbyval,typalign);
177+
-1,my_extra->typlen,my_extra->typbyval,my_extra->typalign);
151178

152-
/*
153-
* Readjust result's LB to match the input's. This does nothing in the
154-
* append case, but it's the simplest way to implement the prepend case.
155-
*/
179+
/* Readjust result's LB to match the input's, as expected for prepend */
156180
if (ARR_NDIM(v)==1)
157181
ARR_LBOUND(result)[0]=ARR_LBOUND(v)[0];
158182

‎src/include/catalog/catversion.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@
5353
*/
5454

5555
/*yyyymmddN */
56-
#defineCATALOG_VERSION_NO201501281
56+
#defineCATALOG_VERSION_NO201502181
5757

5858
#endif

‎src/include/catalog/pg_proc.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -878,9 +878,9 @@ DATA(insert OID = 2176 ( array_length PGNSP PGUID 12 1 0 0 0 f f f f t f i 2
878878
DESCR("array length");
879879
DATA(insert OID = 3179 ( cardinality PGNSP PGUID 12 1 0 0 0 f f f f t f i 1 0 23 "2277" _null_ _null_ _null_ _null_ array_cardinality _null_ _null_ _null_ ));
880880
DESCR("array cardinality");
881-
DATA(insert OID = 378 ( array_append PGNSP PGUID 12 1 0 0 0 f f f f f f i 2 0 2277 "2277 2283" _null_ _null_ _null_ _null_array_push _null_ _null_ _null_ ));
881+
DATA(insert OID = 378 ( array_append PGNSP PGUID 12 1 0 0 0 f f f f f f i 2 0 2277 "2277 2283" _null_ _null_ _null_ _null_array_append _null_ _null_ _null_ ));
882882
DESCR("append element onto end of array");
883-
DATA(insert OID = 379 ( array_prepend PGNSP PGUID 12 1 0 0 0 f f f f f f i 2 0 2277 "2283 2277" _null_ _null_ _null_ _null_array_push _null_ _null_ _null_ ));
883+
DATA(insert OID = 379 ( array_prepend PGNSP PGUID 12 1 0 0 0 f f f f f f i 2 0 2277 "2283 2277" _null_ _null_ _null_ _null_array_prepend _null_ _null_ _null_ ));
884884
DESCR("prepend element onto front of array");
885885
DATA(insert OID = 383 ( array_cat PGNSP PGUID 12 1 0 0 0 f f f f f f i 2 0 2277 "2277 2277" _null_ _null_ _null_ _null_ array_cat _null_ _null_ _null_ ));
886886
DATA(insert OID = 394 ( string_to_array PGNSP PGUID 12 1 0 0 0 f f f f f f i 2 0 1009 "25 25" _null_ _null_ _null_ _null_ text_to_array _null_ _null_ _null_ ));

‎src/include/utils/array.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,8 @@ extern int32 *ArrayGetIntegerTypmods(ArrayType *arr, int *n);
341341
/*
342342
* prototypes for functions defined in array_userfuncs.c
343343
*/
344-
externDatumarray_push(PG_FUNCTION_ARGS);
344+
externDatumarray_append(PG_FUNCTION_ARGS);
345+
externDatumarray_prepend(PG_FUNCTION_ARGS);
345346
externDatumarray_cat(PG_FUNCTION_ARGS);
346347

347348
externArrayType*create_singleton_array(FunctionCallInfofcinfo,

‎src/test/regress/expected/opr_sanity.out

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,7 @@ ORDER BY 1, 2;
176176
25 | 1043
177177
1114 | 1184
178178
1560 | 1562
179-
2277 | 2283
180-
(5 rows)
179+
(4 rows)
181180

182181
SELECT DISTINCT p1.proargtypes[1], p2.proargtypes[1]
183182
FROM pg_proc AS p1, pg_proc AS p2
@@ -194,8 +193,7 @@ ORDER BY 1, 2;
194193
23 | 28
195194
1114 | 1184
196195
1560 | 1562
197-
2277 | 2283
198-
(4 rows)
196+
(3 rows)
199197

200198
SELECT DISTINCT p1.proargtypes[2], p2.proargtypes[2]
201199
FROM pg_proc AS p1, pg_proc AS p2

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp