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

Commitbac2739

Browse files
committed
Support arrays as input to array_agg() and ARRAY(SELECT ...).
These cases formerly failed with errors about "could not find array typefor data type". Now they yield arrays of the same element type and onehigher dimension.The implementation involves creating functions with API similar to theexisting accumArrayResult() family. I (tgl) also extended the base familyby adding an initArrayResult() function, which allows callers to avoidspecial-casing the zero-inputs case if they just want an empty array asresult. (Not all do, so the previous calling convention remains valid.)This allowed simplifying some existing code in xml.c and plperl.c.Ali Akbar, reviewed by Pavel Stehule, significantly modified by me
1 parent2597671 commitbac2739

File tree

18 files changed

+797
-115
lines changed

18 files changed

+797
-115
lines changed

‎doc/src/sgml/func.sgml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12035,14 +12035,29 @@ NULL baz</literallayout>(3 rows)</entry>
1203512035
<function>array_agg(<replaceable class="parameter">expression</replaceable>)</function>
1203612036
</entry>
1203712037
<entry>
12038-
any
12038+
any non-array type
1203912039
</entry>
1204012040
<entry>
1204112041
array of the argument type
1204212042
</entry>
1204312043
<entry>input values, including nulls, concatenated into an array</entry>
1204412044
</row>
1204512045

12046+
<row>
12047+
<entry>
12048+
<function>array_agg(<replaceable class="parameter">expression</replaceable>)</function>
12049+
</entry>
12050+
<entry>
12051+
any array type
12052+
</entry>
12053+
<entry>
12054+
same as argument data type
12055+
</entry>
12056+
<entry>input arrays concatenated into array of one higher dimension
12057+
(inputs must all have same dimensionality,
12058+
and cannot be empty or NULL)</entry>
12059+
</row>
12060+
1204612061
<row>
1204712062
<entry>
1204812063
<indexterm>

‎doc/src/sgml/syntax.sgml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2239,11 +2239,22 @@ SELECT ARRAY(SELECT oid FROM pg_proc WHERE proname LIKE 'bytea%');
22392239
-----------------------------------------------------------------------
22402240
{2011,1954,1948,1952,1951,1244,1950,2005,1949,1953,2006,31,2412,2413}
22412241
(1 row)
2242+
2243+
SELECT ARRAY(SELECT ARRAY[i, i*2] FROM generate_series(1,5) AS a(i));
2244+
array
2245+
----------------------------------
2246+
{{1,2},{2,4},{3,6},{4,8},{5,10}}
2247+
(1 row)
22422248
</programlisting>
2243-
The subquery must return a single column. The resulting
2249+
The subquery must return a single column.
2250+
If the subquery's output column is of a non-array type, the resulting
22442251
one-dimensional array will have an element for each row in the
22452252
subquery result, with an element type matching that of the
22462253
subquery's output column.
2254+
If the subquery's output column is of an array type, the result will be
2255+
an array of the same type but one higher dimension; in this case all
2256+
the subquery rows must yield arrays of identical dimensionality, else
2257+
the result would not be rectangular.
22472258
</para>
22482259

22492260
<para>

‎doc/src/sgml/xaggr.sgml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -359,12 +359,12 @@ SELECT attrelid::regclass, array_accum(atttypid::regtype)
359359
aggregate <function>array_agg</> is equivalent to
360360

361361
<programlisting>
362-
CREATE FUNCTION array_agg_transfn(internal,anyelement)
362+
CREATE FUNCTION array_agg_transfn(internal,anynonarray)
363363
RETURNS internal ...;
364-
CREATE FUNCTION array_agg_finalfn(internal,anyelement)
364+
CREATE FUNCTION array_agg_finalfn(internal,anynonarray)
365365
RETURNS anyarray ...;
366366

367-
CREATE AGGREGATE array_agg (anyelement)
367+
CREATE AGGREGATE array_agg (anynonarray)
368368
(
369369
sfunc = array_agg_transfn,
370370
stype = internal,
@@ -376,7 +376,7 @@ CREATE AGGREGATE array_agg (anyelement)
376376
Here, the <literal>finalfunc_extra</> option specifies that the final
377377
function receives, in addition to the state value, extra dummy
378378
argument(s) corresponding to the aggregate's input argument(s).
379-
The extra <type>anyelement</> argument allows the declaration
379+
The extra <type>anynonarray</> argument allows the declaration
380380
of <function>array_agg_finalfn</> to be valid.
381381
</para>
382382

‎src/backend/executor/nodeSubplan.c

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ ExecScanSubPlan(SubPlanState *node,
231231
boolfound= false;/* TRUE if got at least one subplan tuple */
232232
ListCell*pvar;
233233
ListCell*l;
234-
ArrayBuildState*astate=NULL;
234+
ArrayBuildStateAny*astate=NULL;
235235

236236
/*
237237
* MULTIEXPR subplans, when "executed", just return NULL; but first we
@@ -259,6 +259,11 @@ ExecScanSubPlan(SubPlanState *node,
259259
return (Datum)0;
260260
}
261261

262+
/* Initialize ArrayBuildStateAny in caller's context, if needed */
263+
if (subLinkType==ARRAY_SUBLINK)
264+
astate=initArrayResultAny(subplan->firstColType,
265+
CurrentMemoryContext);
266+
262267
/*
263268
* We are probably in a short-lived expression-evaluation context. Switch
264269
* to the per-query context for manipulating the child plan's chgParam,
@@ -366,8 +371,8 @@ ExecScanSubPlan(SubPlanState *node,
366371
/* stash away current value */
367372
Assert(subplan->firstColType==tdesc->attrs[0]->atttypid);
368373
dvalue=slot_getattr(slot,1,&disnull);
369-
astate=accumArrayResult(astate,dvalue,disnull,
370-
subplan->firstColType,oldcontext);
374+
astate=accumArrayResultAny(astate,dvalue,disnull,
375+
subplan->firstColType,oldcontext);
371376
/* keep scanning subplan to collect all values */
372377
continue;
373378
}
@@ -437,10 +442,7 @@ ExecScanSubPlan(SubPlanState *node,
437442
if (subLinkType==ARRAY_SUBLINK)
438443
{
439444
/* We return the result in the caller's context */
440-
if (astate!=NULL)
441-
result=makeArrayResult(astate,oldcontext);
442-
else
443-
result=PointerGetDatum(construct_empty_array(subplan->firstColType));
445+
result=makeArrayResultAny(astate,oldcontext, true);
444446
}
445447
elseif (!found)
446448
{
@@ -951,14 +953,19 @@ ExecSetParamPlan(SubPlanState *node, ExprContext *econtext)
951953
ListCell*pvar;
952954
ListCell*l;
953955
boolfound= false;
954-
ArrayBuildState*astate=NULL;
956+
ArrayBuildStateAny*astate=NULL;
955957

956958
if (subLinkType==ANY_SUBLINK||
957959
subLinkType==ALL_SUBLINK)
958960
elog(ERROR,"ANY/ALL subselect unsupported as initplan");
959961
if (subLinkType==CTE_SUBLINK)
960962
elog(ERROR,"CTE subplans should not be executed via ExecSetParamPlan");
961963

964+
/* Initialize ArrayBuildStateAny in caller's context, if needed */
965+
if (subLinkType==ARRAY_SUBLINK)
966+
astate=initArrayResultAny(subplan->firstColType,
967+
CurrentMemoryContext);
968+
962969
/*
963970
* Must switch to per-query memory context.
964971
*/
@@ -1018,8 +1025,8 @@ ExecSetParamPlan(SubPlanState *node, ExprContext *econtext)
10181025
/* stash away current value */
10191026
Assert(subplan->firstColType==tdesc->attrs[0]->atttypid);
10201027
dvalue=slot_getattr(slot,1,&disnull);
1021-
astate=accumArrayResult(astate,dvalue,disnull,
1022-
subplan->firstColType,oldcontext);
1028+
astate=accumArrayResultAny(astate,dvalue,disnull,
1029+
subplan->firstColType,oldcontext);
10231030
/* keep scanning subplan to collect all values */
10241031
continue;
10251032
}
@@ -1072,14 +1079,9 @@ ExecSetParamPlan(SubPlanState *node, ExprContext *econtext)
10721079
*/
10731080
if (node->curArray!=PointerGetDatum(NULL))
10741081
pfree(DatumGetPointer(node->curArray));
1075-
if (astate!=NULL)
1076-
node->curArray=makeArrayResult(astate,
1077-
econtext->ecxt_per_query_memory);
1078-
else
1079-
{
1080-
MemoryContextSwitchTo(econtext->ecxt_per_query_memory);
1081-
node->curArray=PointerGetDatum(construct_empty_array(subplan->firstColType));
1082-
}
1082+
node->curArray=makeArrayResultAny(astate,
1083+
econtext->ecxt_per_query_memory,
1084+
true);
10831085
prm->execPlan=NULL;
10841086
prm->value=node->curArray;
10851087
prm->isnull= false;

‎src/backend/nodes/nodeFuncs.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ exprType(const Node *expr)
108108
type=exprType((Node*)tent->expr);
109109
if (sublink->subLinkType==ARRAY_SUBLINK)
110110
{
111-
type=get_array_type(type);
111+
type=get_promoted_array_type(type);
112112
if (!OidIsValid(type))
113113
ereport(ERROR,
114114
(errcode(ERRCODE_UNDEFINED_OBJECT),
@@ -139,7 +139,7 @@ exprType(const Node *expr)
139139
type=subplan->firstColType;
140140
if (subplan->subLinkType==ARRAY_SUBLINK)
141141
{
142-
type=get_array_type(type);
142+
type=get_promoted_array_type(type);
143143
if (!OidIsValid(type))
144144
ereport(ERROR,
145145
(errcode(ERRCODE_UNDEFINED_OBJECT),

‎src/backend/optimizer/plan/subselect.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -668,7 +668,7 @@ build_subplan(PlannerInfo *root, Plan *plan, PlannerInfo *subroot,
668668

669669
Assert(!te->resjunk);
670670
Assert(testexpr==NULL);
671-
arraytype=get_array_type(exprType((Node*)te->expr));
671+
arraytype=get_promoted_array_type(exprType((Node*)te->expr));
672672
if (!OidIsValid(arraytype))
673673
elog(ERROR,"could not find array type for datatype %s",
674674
format_type_be(exprType((Node*)te->expr)));

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

Lines changed: 78 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ create_singleton_array(FunctionCallInfo fcinfo,
471471

472472

473473
/*
474-
* ARRAY_AGG aggregate function
474+
* ARRAY_AGG(anynonarray) aggregate function
475475
*/
476476
Datum
477477
array_agg_transfn(PG_FUNCTION_ARGS)
@@ -486,6 +486,12 @@ array_agg_transfn(PG_FUNCTION_ARGS)
486486
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
487487
errmsg("could not determine input data type")));
488488

489+
/*
490+
* Note: we do not need a run-time check about whether arg1_typeid is a
491+
* valid array element type, because the parser would have verified that
492+
* while resolving the input/result types of this polymorphic aggregate.
493+
*/
494+
489495
if (!AggCheckCallContext(fcinfo,&aggcontext))
490496
{
491497
/* cannot be called directly because of internal-type argument */
@@ -516,18 +522,13 @@ array_agg_finalfn(PG_FUNCTION_ARGS)
516522
intdims[1];
517523
intlbs[1];
518524

519-
/*
520-
* Test for null before Asserting we are in right context. This is to
521-
* avoid possible Assert failure in 8.4beta installations, where it is
522-
* possible for users to create NULL constants of type internal.
523-
*/
524-
if (PG_ARGISNULL(0))
525-
PG_RETURN_NULL();/* returns null iff no input values */
526-
527525
/* cannot be called directly because of internal-type argument */
528526
Assert(AggCheckCallContext(fcinfo,NULL));
529527

530-
state= (ArrayBuildState*)PG_GETARG_POINTER(0);
528+
state=PG_ARGISNULL(0) ?NULL : (ArrayBuildState*)PG_GETARG_POINTER(0);
529+
530+
if (state==NULL)
531+
PG_RETURN_NULL();/* returns null iff no input values */
531532

532533
dims[0]=state->nelems;
533534
lbs[0]=1;
@@ -544,3 +545,70 @@ array_agg_finalfn(PG_FUNCTION_ARGS)
544545

545546
PG_RETURN_DATUM(result);
546547
}
548+
549+
/*
550+
* ARRAY_AGG(anyarray) aggregate function
551+
*/
552+
Datum
553+
array_agg_array_transfn(PG_FUNCTION_ARGS)
554+
{
555+
Oidarg1_typeid=get_fn_expr_argtype(fcinfo->flinfo,1);
556+
MemoryContextaggcontext;
557+
ArrayBuildStateArr*state;
558+
559+
if (arg1_typeid==InvalidOid)
560+
ereport(ERROR,
561+
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
562+
errmsg("could not determine input data type")));
563+
564+
/*
565+
* Note: we do not need a run-time check about whether arg1_typeid is a
566+
* valid array type, because the parser would have verified that while
567+
* resolving the input/result types of this polymorphic aggregate.
568+
*/
569+
570+
if (!AggCheckCallContext(fcinfo,&aggcontext))
571+
{
572+
/* cannot be called directly because of internal-type argument */
573+
elog(ERROR,"array_agg_array_transfn called in non-aggregate context");
574+
}
575+
576+
state=PG_ARGISNULL(0) ?NULL : (ArrayBuildStateArr*)PG_GETARG_POINTER(0);
577+
state=accumArrayResultArr(state,
578+
PG_GETARG_DATUM(1),
579+
PG_ARGISNULL(1),
580+
arg1_typeid,
581+
aggcontext);
582+
583+
/*
584+
* The transition type for array_agg() is declared to be "internal", which
585+
* is a pass-by-value type the same size as a pointer. So we can safely
586+
* pass the ArrayBuildStateArr pointer through nodeAgg.c's machinations.
587+
*/
588+
PG_RETURN_POINTER(state);
589+
}
590+
591+
Datum
592+
array_agg_array_finalfn(PG_FUNCTION_ARGS)
593+
{
594+
Datumresult;
595+
ArrayBuildStateArr*state;
596+
597+
/* cannot be called directly because of internal-type argument */
598+
Assert(AggCheckCallContext(fcinfo,NULL));
599+
600+
state=PG_ARGISNULL(0) ?NULL : (ArrayBuildStateArr*)PG_GETARG_POINTER(0);
601+
602+
if (state==NULL)
603+
PG_RETURN_NULL();/* returns null iff no input values */
604+
605+
/*
606+
* Make the result. We cannot release the ArrayBuildStateArr because
607+
* sometimes aggregate final functions are re-executed. Rather, it is
608+
* nodeAgg.c's responsibility to reset the aggcontext when it's safe to do
609+
* so.
610+
*/
611+
result=makeArrayResultArr(state,CurrentMemoryContext, false);
612+
613+
PG_RETURN_DATUM(result);
614+
}

0 commit comments

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