Skip to content

Commit f2b2d0d

Browse files
estebanzimanyiestebanzimanyi
committed
Drop the unnecessary Agg suffix from non-colliding aggregates
Keep the Agg suffix only on aggregates whose name collides with a scalar of the same name (TminAgg/TmaxAgg vs the box time-bound accessors; MergeAgg, AppendInstantAgg, AppendSequenceAgg vs their scalar forms). The non-colliding aggregates (Tand, Tor, Tcount, Tsum, Tavg, Tcentroid, Wcount, Wsum, Wavg, Wmin, Wmax, SetUnion, SpanUnion) take the bare canonical name.
1 parent e5d0464 commit f2b2d0d

10 files changed

Lines changed: 74 additions & 74 deletions

‎src/geo/spatial_aggregates.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ void SpatialAggregates::AddExtentOverloads(AggregateFunctionSet &extent_set) {
281281
}
282282

283283
void SpatialAggregates::RegisterTcentroid(ExtensionLoader &loader) {
284-
AggregateFunctionSet tcentroid_set("TcentroidAgg");
284+
AggregateFunctionSet tcentroid_set("Tcentroid");
285285
tcentroid_set.AddFunction(MakeTcentroidAggregate(TgeompointType::TGEOMPOINT()));
286286
loader.RegisterFunction(std::move(tcentroid_set));
287287
}

‎src/temporal/set.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1067,7 +1067,7 @@ struct SetUnionSetFunction {
10671067
} // anonymous namespace
10681068

10691069
void SetTypes::RegisterSetUnionAgg(ExtensionLoader &loader) {
1070-
AggregateFunctionSet set_union_set("SetUnionAgg");
1070+
AggregateFunctionSet set_union_set("SetUnion");
10711071

10721072
// Scalar overloads: convert each value to a single-element Set.
10731073
set_union_set.AddFunction(

‎src/temporal/temporal_aggregates.cpp‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -916,19 +916,19 @@ void TemporalAggregates::RegisterAggregateFunctions(ExtensionLoader &loader) {
916916

917917
// ---- TandAgg / TorAgg on tbool ----
918918
{
919-
AggregateFunctionSet set("TandAgg");
919+
AggregateFunctionSet set("Tand");
920920
set.AddFunction(MakeTaggAggregate<TandFn>(TemporalTypes::TBOOL(), TemporalTypes::TBOOL()));
921921
loader.RegisterFunction(std::move(set));
922922
}
923923
{
924-
AggregateFunctionSet set("TorAgg");
924+
AggregateFunctionSet set("Tor");
925925
set.AddFunction(MakeTaggAggregate<TorFn>(TemporalTypes::TBOOL(), TemporalTypes::TBOOL()));
926926
loader.RegisterFunction(std::move(set));
927927
}
928928

929929
// ---- TcountAgg over each temporal type and over time-only inputs → tint ----
930930
{
931-
AggregateFunctionSet set("TcountAgg");
931+
AggregateFunctionSet set("Tcount");
932932
for (const auto &t : {TemporalTypes::TBOOL(), TemporalTypes::TINT(),
933933
TemporalTypes::TFLOAT(), TemporalTypes::TTEXT()}) {
934934
set.AddFunction(MakeTaggAggregate<TcountTempFn>(t, TemporalTypes::TINT()));
@@ -968,23 +968,23 @@ void TemporalAggregates::RegisterAggregateFunctions(ExtensionLoader &loader) {
968968

969969
// ---- TsumAgg on tint, tfloat ----
970970
{
971-
AggregateFunctionSet set("TsumAgg");
971+
AggregateFunctionSet set("Tsum");
972972
set.AddFunction(MakeTaggAggregate<TsumTintFn>(TemporalTypes::TINT(), TemporalTypes::TINT()));
973973
set.AddFunction(MakeTaggAggregate<TsumTfloatFn>(TemporalTypes::TFLOAT(), TemporalTypes::TFLOAT()));
974974
loader.RegisterFunction(std::move(set));
975975
}
976976

977977
// ---- TavgAgg on tint, tfloat → tfloat ----
978978
{
979-
AggregateFunctionSet set("TavgAgg");
979+
AggregateFunctionSet set("Tavg");
980980
set.AddFunction(MakeTaggAggregate<TavgFn>(TemporalTypes::TINT(), TemporalTypes::TFLOAT()));
981981
set.AddFunction(MakeTaggAggregate<TavgFn>(TemporalTypes::TFLOAT(), TemporalTypes::TFLOAT()));
982982
loader.RegisterFunction(std::move(set));
983983
}
984984

985985
// ---- TcentroidAgg on tgeompoint / tgeogpoint → same type ----
986986
{
987-
AggregateFunctionSet set("TcentroidAgg");
987+
AggregateFunctionSet set("Tcentroid");
988988
set.AddFunction(MakeTaggAggregate<TcentroidFn>(
989989
TgeompointType::TGEOMPOINT(), TgeompointType::TGEOMPOINT()));
990990
set.AddFunction(MakeTaggAggregate<TcentroidFn>(
@@ -1044,7 +1044,7 @@ void TemporalAggregates::RegisterAggregateFunctions(ExtensionLoader &loader) {
10441044
LogicalType out;
10451045
};
10461046
{
1047-
AggregateFunctionSet set("SpanUnionAgg");
1047+
AggregateFunctionSet set("SpanUnion");
10481048
const std::vector<SpanInputPair> span_pairs = {
10491049
{SpanTypes::INTSPAN(), SpansetTypes::intspanset()},
10501050
{SpanTypes::BIGINTSPAN(), SpansetTypes::bigintspanset()},
@@ -1070,39 +1070,39 @@ void TemporalAggregates::RegisterAggregateFunctions(ExtensionLoader &loader) {
10701070

10711071
// ---- Window aggregates: WminAgg / WmaxAgg / WsumAgg / WcountAgg / WavgAgg ----
10721072
{
1073-
AggregateFunctionSet set("WminAgg");
1073+
AggregateFunctionSet set("Wmin");
10741074
set.AddFunction(MakeWindowAggregate<WminTintFn>(TemporalTypes::TINT(), TemporalTypes::TINT()));
10751075
set.AddFunction(MakeWindowAggregate<WminTfloatFn>(TemporalTypes::TFLOAT(), TemporalTypes::TFLOAT()));
10761076
loader.RegisterFunction(std::move(set));
10771077
}
10781078
{
1079-
AggregateFunctionSet set("WmaxAgg");
1079+
AggregateFunctionSet set("Wmax");
10801080
set.AddFunction(MakeWindowAggregate<WmaxTintFn>(TemporalTypes::TINT(), TemporalTypes::TINT()));
10811081
set.AddFunction(MakeWindowAggregate<WmaxTfloatFn>(TemporalTypes::TFLOAT(), TemporalTypes::TFLOAT()));
10821082
loader.RegisterFunction(std::move(set));
10831083
}
10841084
{
1085-
AggregateFunctionSet set("WsumAgg");
1085+
AggregateFunctionSet set("Wsum");
10861086
set.AddFunction(MakeWindowAggregate<WsumTintFn>(TemporalTypes::TINT(), TemporalTypes::TINT()));
10871087
set.AddFunction(MakeWindowAggregate<WsumTfloatFn>(TemporalTypes::TFLOAT(), TemporalTypes::TFLOAT()));
10881088
loader.RegisterFunction(std::move(set));
10891089
}
10901090
{
1091-
AggregateFunctionSet set("WcountAgg");
1091+
AggregateFunctionSet set("Wcount");
10921092
set.AddFunction(MakeWindowAggregate<WcountAggFn>(TemporalTypes::TINT(), TemporalTypes::TINT()));
10931093
set.AddFunction(MakeWindowAggregate<WcountAggFn>(TemporalTypes::TFLOAT(), TemporalTypes::TINT()));
10941094
loader.RegisterFunction(std::move(set));
10951095
}
10961096
{
1097-
AggregateFunctionSet set("WavgAgg");
1097+
AggregateFunctionSet set("Wavg");
10981098
set.AddFunction(MakeWindowAggregate<WavgFn>(TemporalTypes::TINT(), TemporalTypes::TFLOAT()));
10991099
set.AddFunction(MakeWindowAggregate<WavgFn>(TemporalTypes::TFLOAT(), TemporalTypes::TFLOAT()));
11001100
loader.RegisterFunction(std::move(set));
11011101
}
11021102

11031103
// ---- SetUnionAgg(<scalar | typed-set>) -> typed set ----
11041104
{
1105-
AggregateFunctionSet set("SetUnionAgg");
1105+
AggregateFunctionSet set("SetUnion");
11061106
// Scalar inputs.
11071107
set.AddFunction(MakeSetUnionScalarAggregate<int32_t, Int32ToDatum, T_INT4>(
11081108
LogicalType::INTEGER, SetTypes::intset()));

‎test/sql/parity/015_span_aggfuncs.test‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
# group: [sql]
44
#
55
# Queries from mobilitydb/test/temporal/queries/015_span_aggfuncs.test.sql.
6-
# Aggregate infrastructure (extent, SpanUnionAgg, SetUnionAgg) is now
6+
# Aggregate infrastructure (extent, SpanUnion, SetUnion) is now
77
# registered; this file is fully active. Function names follow RFC #827:
8-
# setUnion → SetUnionAgg, spanUnion → SpanUnionAgg.
8+
# setUnion → SetUnion, spanUnion → SpanUnion.
99

1010
require mobilityduck
1111

@@ -114,16 +114,16 @@ SELECT extent(NULL::tstzspanset) FROM generate_series(1,10);
114114
----
115115
NULL
116116

117-
# SetUnionAgg / SpanUnionAgg — accumulator aggregates returning set / span
117+
# SetUnion / SpanUnion — accumulator aggregates returning set / span
118118

119119
query I
120-
SELECT SetUnionAgg(t::tstzset)::VARCHAR FROM (VALUES
120+
SELECT SetUnion(t::tstzset)::VARCHAR FROM (VALUES
121121
('{2000-01-01}'::tstzset)) t(t);
122122
----
123123
{"2000-01-01 00:00:00+01"}
124124

125125
query I
126-
SELECT SpanUnionAgg(t::tstzspan)::VARCHAR FROM (VALUES
126+
SELECT SpanUnion(t::tstzspan)::VARCHAR FROM (VALUES
127127
('[2000-01-01, 2000-01-02]'::tstzspan)) t(t);
128128
----
129129
{[2000-01-01 00:00:00+01, 2000-01-02 00:00:00+01]}

‎test/sql/parity/031_aggregates_skiplist.test‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# name: test/sql/parity/031_aggregates_skiplist.test
2-
# description: SkipList-state aggregates — TandAgg, TorAgg, TcountAgg, TminAgg,
3-
# TmaxAgg, TsumAgg, TavgAgg, TcentroidAgg, MergeAgg,
4-
# AppendInstantAgg, AppendSequenceAgg, SpanUnionAgg, SetUnionAgg,
2+
# description: SkipList-state aggregates — Tand, Tor, Tcount, TminAgg,
3+
# TmaxAgg, Tsum, Tavg, Tcentroid, MergeAgg,
4+
# AppendInstantAgg, AppendSequenceAgg, SpanUnion, SetUnion,
55
# and the window aggregates W{min,max,sum,count,avg}Agg. Names
66
# follow MobilityDB RFC #827 — every SkipList aggregate is
77
# exposed under a Pascal-cased *Agg identifier. The MobilityDB
@@ -16,46 +16,46 @@ statement ok
1616
SET TimeZone='UTC'
1717

1818
# =============================================================================
19-
# TandAgg / TorAgg on tbool
19+
# Tand / Tor on tbool
2020
# =============================================================================
2121

2222
query I
23-
SELECT TandAgg(v::tbool)::VARCHAR FROM (VALUES ('true@2000-01-01'),('true@2000-01-02')) t(v);
23+
SELECT Tand(v::tbool)::VARCHAR FROM (VALUES ('true@2000-01-01'),('true@2000-01-02')) t(v);
2424
----
2525
{t@2000-01-01 00:00:00+01, t@2000-01-02 00:00:00+01}
2626

2727
query I
28-
SELECT TorAgg(v::tbool)::VARCHAR FROM (VALUES ('true@2000-01-01'),('false@2000-01-02')) t(v);
28+
SELECT Tor(v::tbool)::VARCHAR FROM (VALUES ('true@2000-01-01'),('false@2000-01-02')) t(v);
2929
----
3030
{t@2000-01-01 00:00:00+01, f@2000-01-02 00:00:00+01}
3131

3232
# Single-row aggregate degenerates to identity over the input.
3333
query I
34-
SELECT TandAgg(v::tbool)::VARCHAR FROM (VALUES ('true@2000-01-01')) t(v);
34+
SELECT Tand(v::tbool)::VARCHAR FROM (VALUES ('true@2000-01-01')) t(v);
3535
----
3636
{t@2000-01-01 00:00:00+01}
3737

3838
# =============================================================================
39-
# TcountAgg over each temporal type → tint
39+
# Tcount over each temporal type → tint
4040
# =============================================================================
4141

4242
query I
43-
SELECT TcountAgg(v::tint)::VARCHAR FROM (VALUES ('1@2000-01-01'),('5@2000-01-02')) t(v);
43+
SELECT Tcount(v::tint)::VARCHAR FROM (VALUES ('1@2000-01-01'),('5@2000-01-02')) t(v);
4444
----
4545
{1@2000-01-01 00:00:00+01, 1@2000-01-02 00:00:00+01}
4646

4747
query I
48-
SELECT TcountAgg(v::tfloat)::VARCHAR FROM (VALUES ('1.5@2000-01-01'),('5.5@2000-01-02')) t(v);
48+
SELECT Tcount(v::tfloat)::VARCHAR FROM (VALUES ('1.5@2000-01-01'),('5.5@2000-01-02')) t(v);
4949
----
5050
{1@2000-01-01 00:00:00+01, 1@2000-01-02 00:00:00+01}
5151

5252
query I
53-
SELECT TcountAgg(v::tbool)::VARCHAR FROM (VALUES ('true@2000-01-01'),('false@2000-01-02')) t(v);
53+
SELECT Tcount(v::tbool)::VARCHAR FROM (VALUES ('true@2000-01-01'),('false@2000-01-02')) t(v);
5454
----
5555
{1@2000-01-01 00:00:00+01, 1@2000-01-02 00:00:00+01}
5656

5757
query I
58-
SELECT TcountAgg(v::ttext)::VARCHAR FROM (VALUES ('"hi"@2000-01-01'),('"bye"@2000-01-02')) t(v);
58+
SELECT Tcount(v::ttext)::VARCHAR FROM (VALUES ('"hi"@2000-01-01'),('"bye"@2000-01-02')) t(v);
5959
----
6060
{1@2000-01-01 00:00:00+01, 1@2000-01-02 00:00:00+01}
6161

@@ -84,70 +84,70 @@ SELECT TmaxAgg(v::ttext)::VARCHAR FROM (VALUES ('"a"@2000-01-01'),('"z"@2000-01-
8484
{"a"@2000-01-01 00:00:00+01, "z"@2000-01-02 00:00:00+01}
8585

8686
# =============================================================================
87-
# TsumAgg on tint, tfloat
87+
# Tsum on tint, tfloat
8888
# =============================================================================
8989

9090
query I
91-
SELECT TsumAgg(v::tint)::VARCHAR FROM (VALUES ('1@2000-01-01'),('5@2000-01-02')) t(v);
91+
SELECT Tsum(v::tint)::VARCHAR FROM (VALUES ('1@2000-01-01'),('5@2000-01-02')) t(v);
9292
----
9393
{1@2000-01-01 00:00:00+01, 5@2000-01-02 00:00:00+01}
9494

9595
query I
96-
SELECT TsumAgg(v::tfloat)::VARCHAR FROM (VALUES ('1.5@2000-01-01'),('2.5@2000-01-02')) t(v);
96+
SELECT Tsum(v::tfloat)::VARCHAR FROM (VALUES ('1.5@2000-01-01'),('2.5@2000-01-02')) t(v);
9797
----
9898
{1.5@2000-01-01 00:00:00+01, 2.5@2000-01-02 00:00:00+01}
9999

100100
# =============================================================================
101-
# TavgAgg on tint, tfloat → tfloat
101+
# Tavg on tint, tfloat → tfloat
102102
# =============================================================================
103103

104104
query I
105-
SELECT TavgAgg(v::tint)::VARCHAR FROM (VALUES ('2@2000-01-01'),('4@2000-01-02')) t(v);
105+
SELECT Tavg(v::tint)::VARCHAR FROM (VALUES ('2@2000-01-01'),('4@2000-01-02')) t(v);
106106
----
107107
{2@2000-01-01 00:00:00+01, 4@2000-01-02 00:00:00+01}
108108

109109
query I
110-
SELECT TavgAgg(v::tfloat)::VARCHAR FROM (VALUES ('2.0@2000-01-01'),('4.0@2000-01-02')) t(v);
110+
SELECT Tavg(v::tfloat)::VARCHAR FROM (VALUES ('2.0@2000-01-01'),('4.0@2000-01-02')) t(v);
111111
----
112112
{2@2000-01-01 00:00:00+01, 4@2000-01-02 00:00:00+01}
113113

114114
# =============================================================================
115-
# TcentroidAgg on tgeompoint
115+
# Tcentroid on tgeompoint
116116
#
117117
# Output is the EWKB-hex display format MobilityDuck uses for geometry, not
118118
# WKT — both points encode the input coordinates verbatim.
119119
# =============================================================================
120120

121121
query I
122-
SELECT TcentroidAgg(v::tgeompoint)::VARCHAR FROM (VALUES
122+
SELECT Tcentroid(v::tgeompoint)::VARCHAR FROM (VALUES
123123
('Point(0 0)@2000-01-01'),('Point(2 4)@2000-01-02')) t(v);
124124
----
125125
{010100000000000000000000000000000000000000@2000-01-01 00:00:00+01, 010100000000000000000000400000000000001040@2000-01-02 00:00:00+01}
126126

127127
# =============================================================================
128-
# TcountAgg over time-only inputs (timestamptz / tstzset / tstzspan / tstzspanset)
128+
# Tcount over time-only inputs (timestamptz / tstzset / tstzspan / tstzspanset)
129129
# =============================================================================
130130

131131
query I
132-
SELECT TcountAgg(t::timestamptz)::VARCHAR FROM (VALUES
132+
SELECT Tcount(t::timestamptz)::VARCHAR FROM (VALUES
133133
('2000-01-01 00:00:00+00'::timestamptz), ('2000-01-02 00:00:00+00')) t(t);
134134
----
135135
{1@2000-01-01 01:00:00+01, 1@2000-01-02 01:00:00+01}
136136

137137
query I
138-
SELECT TcountAgg(s::tstzset)::VARCHAR FROM (VALUES
138+
SELECT Tcount(s::tstzset)::VARCHAR FROM (VALUES
139139
('{2000-01-01, 2000-01-02}'::tstzset), ('{2000-01-02, 2000-01-03}')) t(s);
140140
----
141141
{1@2000-01-01 00:00:00+01, 2@2000-01-02 00:00:00+01, 1@2000-01-03 00:00:00+01}
142142

143143
query I
144-
SELECT TcountAgg(s::tstzspan)::VARCHAR FROM (VALUES
144+
SELECT Tcount(s::tstzspan)::VARCHAR FROM (VALUES
145145
('[2000-01-01, 2000-01-03)'::tstzspan), ('[2000-01-02, 2000-01-04)')) t(s);
146146
----
147147
{[1@2000-01-01 00:00:00+01, 2@2000-01-02 00:00:00+01, 1@2000-01-03 00:00:00+01, 1@2000-01-04 00:00:00+01)}
148148

149149
query I
150-
SELECT TcountAgg(s::tstzspanset)::VARCHAR FROM (VALUES
150+
SELECT Tcount(s::tstzspanset)::VARCHAR FROM (VALUES
151151
('{[2000-01-01, 2000-01-03)}'::tstzspanset), ('{[2000-01-02, 2000-01-04)}')) t(s);
152152
----
153153
{[1@2000-01-01 00:00:00+01, 2@2000-01-02 00:00:00+01, 1@2000-01-03 00:00:00+01, 1@2000-01-04 00:00:00+01)}
@@ -174,56 +174,56 @@ SELECT AppendSequenceAgg(v::tint)::VARCHAR FROM (VALUES
174174
{[1@2000-01-01 00:00:00+01, 2@2000-01-02 00:00:00+01], [5@2000-01-04 00:00:00+01, 6@2000-01-05 00:00:00+01]}
175175

176176
# =============================================================================
177-
# SpanUnionAgg / SetUnionAgg
177+
# SpanUnion / SetUnion
178178
# =============================================================================
179179

180180
query I
181-
SELECT SpanUnionAgg(s::intspan)::VARCHAR FROM (VALUES ('[1, 5)'), ('[3, 8)')) t(s);
181+
SELECT SpanUnion(s::intspan)::VARCHAR FROM (VALUES ('[1, 5)'), ('[3, 8)')) t(s);
182182
----
183183
{[1, 8)}
184184

185185
query I
186-
SELECT SpanUnionAgg(s::intspanset)::VARCHAR FROM (VALUES
186+
SELECT SpanUnion(s::intspanset)::VARCHAR FROM (VALUES
187187
('{[1, 3), [5, 7)}'), ('{[10, 15)}')) t(s);
188188
----
189189
{[1, 3), [5, 7), [10, 15)}
190190

191191
query I
192-
SELECT SetUnionAgg(v::int)::VARCHAR FROM (VALUES (1), (3), (5), (3)) t(v);
192+
SELECT SetUnion(v::int)::VARCHAR FROM (VALUES (1), (3), (5), (3)) t(v);
193193
----
194194
{1, 3, 5}
195195

196196
query I
197-
SELECT SetUnionAgg(v::intset)::VARCHAR FROM (VALUES ('{1, 3}'::intset), ('{2, 4}')) t(v);
197+
SELECT SetUnion(v::intset)::VARCHAR FROM (VALUES ('{1, 3}'::intset), ('{2, 4}')) t(v);
198198
----
199199
{1, 2, 3, 4}
200200

201201
query I
202-
SELECT SetUnionAgg(d::date)::VARCHAR FROM (VALUES ('2001-01-01'::date), ('2001-01-03')) t(d);
202+
SELECT SetUnion(d::date)::VARCHAR FROM (VALUES ('2001-01-01'::date), ('2001-01-03')) t(d);
203203
----
204204
{2001-01-01, 2001-01-03}
205205

206206
# =============================================================================
207-
# Window aggregates: WminAgg / WmaxAgg / WsumAgg / WcountAgg / WavgAgg
207+
# Window aggregates: Wmin / Wmax / Wsum / Wcount / Wavg
208208
# =============================================================================
209209

210210
query I
211-
SELECT WminAgg(v::tint, INTERVAL '2 days')::VARCHAR FROM (VALUES ('1@2000-01-01'),('5@2000-01-02'),('3@2000-01-04')) t(v);
211+
SELECT Wmin(v::tint, INTERVAL '2 days')::VARCHAR FROM (VALUES ('1@2000-01-01'),('5@2000-01-02'),('3@2000-01-04')) t(v);
212212
----
213213
{[1@2000-01-01 00:00:00+01, 1@2000-01-03 00:00:00+01], (5@2000-01-03 00:00:00+01, 3@2000-01-04 00:00:00+01, 3@2000-01-06 00:00:00+01]}
214214

215215
query I
216-
SELECT WmaxAgg(v::tfloat, INTERVAL '2 days')::VARCHAR FROM (VALUES ('1.5@2000-01-01'),('5.5@2000-01-02')) t(v);
216+
SELECT Wmax(v::tfloat, INTERVAL '2 days')::VARCHAR FROM (VALUES ('1.5@2000-01-01'),('5.5@2000-01-02')) t(v);
217217
----
218218
{[1.5@2000-01-01 00:00:00+01, 1.5@2000-01-02 00:00:00+01), [5.5@2000-01-02 00:00:00+01, 5.5@2000-01-04 00:00:00+01]}
219219

220220
query I
221-
SELECT WsumAgg(v::tint, INTERVAL '2 days')::VARCHAR FROM (VALUES ('1@2000-01-01'),('5@2000-01-02')) t(v);
221+
SELECT Wsum(v::tint, INTERVAL '2 days')::VARCHAR FROM (VALUES ('1@2000-01-01'),('5@2000-01-02')) t(v);
222222
----
223223
{[1@2000-01-01 00:00:00+01, 6@2000-01-02 00:00:00+01, 6@2000-01-03 00:00:00+01], (5@2000-01-03 00:00:00+01, 5@2000-01-04 00:00:00+01]}
224224

225225
query I
226-
SELECT WavgAgg(v::tint, INTERVAL '2 days')::VARCHAR FROM (VALUES ('2@2000-01-01'),('4@2000-01-02')) t(v);
226+
SELECT Wavg(v::tint, INTERVAL '2 days')::VARCHAR FROM (VALUES ('2@2000-01-01'),('4@2000-01-02')) t(v);
227227
----
228228
Interp=Step;{[2@2000-01-01 00:00:00+01, 3@2000-01-02 00:00:00+01, 3@2000-01-03 00:00:00+01], (4@2000-01-03 00:00:00+01, 4@2000-01-04 00:00:00+01]}
229229

@@ -232,11 +232,11 @@ Interp=Step;{[2@2000-01-01 00:00:00+01, 3@2000-01-02 00:00:00+01, 3@2000-01-03 0
232232
# =============================================================================
233233

234234
query I
235-
SELECT TandAgg(v::tbool)::VARCHAR FROM (VALUES (NULL::VARCHAR)) t(v) WHERE v IS NOT NULL;
235+
SELECT Tand(v::tbool)::VARCHAR FROM (VALUES (NULL::VARCHAR)) t(v) WHERE v IS NOT NULL;
236236
----
237237
NULL
238238

239239
query I
240-
SELECT TcountAgg(v::tint)::VARCHAR FROM (VALUES ('1@2000-01-01'),(NULL),('5@2000-01-02')) t(v);
240+
SELECT Tcount(v::tint)::VARCHAR FROM (VALUES ('1@2000-01-01'),(NULL),('5@2000-01-02')) t(v);
241241
----
242242
{1@2000-01-01 00:00:00+01, 1@2000-01-02 00:00:00+01}

0 commit comments

Comments
 (0)