Changeset: 226a182e7737 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=226a182e7737
Modified Files:
sql/scripts/29_array.sql
Branch: sciql
Log Message:
Change the SciQL AGGR functions from FILTER FUNCTION to table returning
function and some cosmetics
diffs (87 lines):
diff --git a/sql/scripts/29_array.sql b/sql/scripts/29_array.sql
--- a/sql/scripts/29_array.sql
+++ b/sql/scripts/29_array.sql
@@ -22,52 +22,37 @@
-- and re-established after the cluster operation.
-- TODO: DATE, TIME, TIMESTAMP, CHAR and VARCHAR not supported yet
-create function array_series("start" tinyint, step tinyint, stop tinyint, N
integer, M integer) returns table (id bigint, dimval tinyint)
- external name "array".series_;
-create function array_series("start" smallint, step smallint, stop smallint, N
integer, M integer) returns table (id bigint, dimval smallint)
- external name "array".series_;
-create function array_series("start" integer, step integer, stop integer, N
integer, M integer) returns table (id bigint, dimval integer)
- external name "array".series_;
-create function array_series("start" bigint, step bigint, stop bigint, N
integer, M integer) returns table (id bigint, dimval bigint)
- external name "array".series_;
-create function array_series("start" float, step float, stop float, N integer,
M integer) returns table (id bigint, dimval float)
- external name "array".series_;
+create function array_series("start" tinyint, step tinyint, stop tinyint, N
integer, M integer) returns table (id bigint, dimval tinyint) external name
"array".series_;
+create function array_series("start" smallint, step smallint, stop smallint, N
integer, M integer) returns table (id bigint, dimval smallint) external name
"array".series_;
+create function array_series("start" integer, step integer, stop integer, N
integer, M integer) returns table (id bigint, dimval integer) external name
"array".series_;
+create function array_series("start" bigint, step bigint, stop bigint, N
integer, M integer) returns table (id bigint, dimval bigint) external name
"array".series_;
+create function array_series("start" real, step real, stop real, N
integer, M integer) returns table (id bigint, dimval real) external name
"array".series_;
+create function array_series("start" double, step double, stop double, N
integer, M integer) returns table (id bigint, dimval double) external name
"array".series_;
-create function array_series1("start" tinyint, step tinyint, stop tinyint, N
integer, M integer) returns table (idimval tinyint)
- external name "array".series;
-create function array_series1("start" smallint, step smallint, stop smallint,
N integer, M integer) returns table (dimval smallint)
- external name "array".series;
-create function array_series1("start" integer, step integer, stop integer, N
integer, M integer) returns table (dimval integer)
- external name "array".series;
-create function array_series1("start" bigint, step bigint, stop bigint, N
integer, M integer) returns table (dimval bigint)
- external name "array".series;
-create function array_series1("start" float, step float, stop float, N
integer, M integer) returns table (dimval float)
- external name "array".series;
+create function array_series1("start" tinyint, step tinyint, stop tinyint,
N integer, M integer) returns table (dimval tinyint) external name
"array".series;
+create function array_series1("start" smallint, step smallint, stop smallint,
N integer, M integer) returns table (dimval smallint) external name
"array".series;
+create function array_series1("start" integer, step integer, stop integer,
N integer, M integer) returns table (dimval integer) external name
"array".series;
+create function array_series1("start" bigint, step bigint, stop bigint,
N integer, M integer) returns table (dimval bigint) external name
"array".series;
+create function array_series1("start" real, step real, stop real,
N integer, M integer) returns table (dimval real) external name
"array".series;
+create function array_series1("start" double, step double, stop double,
N integer, M integer) returns table (dimval double) external name
"array".series;
-create function array_filler(cnt bigint, val tinyint) returns table (id
bigint, cellval tinyint)
- external name "array".filler_;
-create function array_filler(cnt bigint, val smallint) returns table (id
bigint, cellval smallint)
- external name "array".filler_;
-create function array_filler(cnt bigint, val integer) returns table (id
bigint, cellval integer)
- external name "array".filler_;
-create function array_filler(cnt bigint, val bigint) returns table (id bigint,
cellval bigint)
- external name "array".filler_;
-create function array_filler(cnt bigint, val real) returns table (id bigint,
cellval real)
- external name "array".filler_;
-create function array_filler(cnt bigint, val double) returns table (id bigint,
cellval double)
- external name "array".filler_;
-create function array_filler(cnt bigint, val date) returns table (id bigint,
vals date)
- external name "array".filler_;
-create function array_filler(cnt bigint, val time) returns table (id bigint,
vals time)
- external name "array".filler_;
-create function array_filler(cnt bigint, val timestamp) returns table (id
bigint, vals timestamp)
- external name "array".filler_;
-create function array_filler(cnt bigint, val char(2048)) returns table (id
bigint, vals char(2048))
- external name "array".filler_;
-create function array_filler(cnt bigint, val varchar(2048)) returns table (id
bigint, vals varchar(2048))
- external name "array".filler_;
-create function array_filler(cnt bigint, val blob) returns table (id bigint,
vals blob)
- external name "array".filler_;
-create function array_filler(cnt bigint, val clob) returns table (id bigint,
vals clob)
- external name "array".filler_;
+create function array_filler(cnt bigint, val tinyint) returns table (id
bigint, cellval tinyint) external name "array".filler_;
+create function array_filler(cnt bigint, val smallint) returns table (id
bigint, cellval smallint) external name "array".filler_;
+create function array_filler(cnt bigint, val integer) returns table (id
bigint, cellval integer) external name "array".filler_;
+create function array_filler(cnt bigint, val bigint) returns table (id
bigint, cellval bigint) external name "array".filler_;
+create function array_filler(cnt bigint, val real) returns table (id
bigint, cellval real) external name "array".filler_;
+create function array_filler(cnt bigint, val double) returns table (id
bigint, cellval double) external name "array".filler_;
+create function array_filler(cnt bigint, val date) returns table (id
bigint, vals date) external name "array".filler_;
+create function array_filler(cnt bigint, val time) returns table (id
bigint, vals time) external name "array".filler_;
+create function array_filler(cnt bigint, val timestamp) returns table (id
bigint, vals timestamp) external name "array".filler_;
+create function array_filler(cnt bigint, val char(2048)) returns table (id
bigint, vals char(2048)) external name "array".filler_;
+create function array_filler(cnt bigint, val varchar(2048)) returns table (id
bigint, vals varchar(2048)) external name "array".filler_;
+create function array_filler(cnt bigint, val blob) returns table (id
bigint, vals blob) external name "array".filler_;
+create function array_filler(cnt bigint, val clob) returns table (id
bigint, vals clob) external name "array".filler_;
+create function array_tavg(val int, dim1 int, dim2 int, offsets1 int,
offsets2 int, size1 int, size2 int) returns table (a double) external name
"array".avg;
+create function array_tavg(val real, dim1 int, dim2 int, offsets1 int,
offsets2 int, size1 int, size2 int) returns table (a real) external name
"array".avg;
+
+create function array_tsum(val int, dim1 int, dim2 int, offsets1 int,
offsets2 int, size1 int, size2 int) returns table (s bigint) external name
"array".sum;
+create function array_tsum(val real, dim1 int, dim2 int, offsets1 int,
offsets2 int, size1 int, size2 int) returns table (s real) external name
"array".sum;
+
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
