Changeset: f04613aac332 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f04613aac332
Modified Files:
monetdb5/modules/mal/array.mx
sql/scripts/29_array.sql
Branch: sciql
Log Message:
reorganising sql/mal function names
use normal names for permanent functions, use name+'_' for functions that might
be changed later
diffs (148 lines):
diff --git a/monetdb5/modules/mal/array.mx b/monetdb5/modules/mal/array.mx
--- a/monetdb5/modules/mal/array.mx
+++ b/monetdb5/modules/mal/array.mx
@@ -36,16 +36,16 @@ for each shape tripple.
@{
@= array_mdefs
-command series_(start:@1, step:@1, stop:@1, N:int, M:int) :bat[:oid,:@1]
+command series(start:@1, step:@1, stop:@1, N:int, M:int) :bat[:oid,:@1]
address ARRAYseries_@1
comment "Generates a single series BAT based on range condition, repeating
each value N times and repeat the process M times.";
-function series (start:@1, step:@1, stop:@1, N:int, M:int) (id:bat[:oid,:lng],
dimval:bat[:oid,:@1]);
- b1 := array.series_(start, step, stop, N, M);
+function series_ (start:@1, step:@1, stop:@1, N:int, M:int)
(id:bat[:oid,:lng], dimval:bat[:oid,:@1]);
+ b1 := array.series(start, step, stop, N, M);
b2 := bat.mirror(b1);
b3 := batcalc.lng(b2);
return (b3,b1);
-end series;
+end series_;
@mal
module array;
@@ -63,22 +63,22 @@ to be dealt with differently
@:array_mdefs(timestamp)@
@mal
-pattern filler_(idx:bat[:oid,:any_1], v:any_2):bat[:oid,:any_2]
+pattern filler(idx:bat[:oid,:any_1], v:any_2):bat[:oid,:any_2]
address ARRAYfiller_bat
comment "Create an array value representation described by a series column and
fill it with V";
-pattern filler_(cnt:lng, v:any_1):bat[:oid,:any_1]
+pattern filler(cnt:lng, v:any_1):bat[:oid,:any_1]
address ARRAYfiller
comment "Create an array value representation of CNT items and fill it with V";
-function filler(cnt:lng, v:any_1)(id:bat[:oid,:lng], cellval:bat[:oid,:any_1]);
- b1 := array.filler_(cnt, v);
+function filler_(cnt:lng, v:any_1)(id:bat[:oid,:lng],
cellval:bat[:oid,:any_1]);
+ b1 := array.filler(cnt, v);
# TODO: why is a markH necessary here, but no in array.series?
b2 := algebra.markH(b1, 0@0);
b3 := bat.mirror(b2);
b4 := batcalc.lng(b3);
return (b4,b2);
-end filler;
+end filler_;
pattern map(dims:bat[:oid,:any]...):bat[:oid,:oid]
address ARRAYmap
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
@@ -23,51 +23,51 @@
-- 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_series1("start" tinyint, step tinyint, stop tinyint, N
integer, M integer) returns table (idimval 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)
+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_series("start" integer, step integer, stop integer, N
integer, M integer) returns table (id bigint, dimval integer)
+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_series("start" bigint, step bigint, stop bigint, N
integer, M integer) returns table (id bigint, dimval bigint)
+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_series("start" float, step float, stop float, N integer,
M integer) returns table (id bigint, dimval float)
+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 (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_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;
-
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
