Changeset: ff5d6b6ce1cd for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ff5d6b6ce1cd
Modified Files:
        monetdb5/modules/mal/array.mx
Branch: sciql
Log Message:

another temporary hack to get CREATE ARRAY working,

but this disables direct call to the funcs array_series and array_filler in 
query like "select * from array_series(...)"


diffs (39 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
@@ -40,11 +40,12 @@
 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) :bat[:str,:bat];
-       b1 := bat.new(:str,:bat,1);
-       b2 := series_(start, step, stop, N, M);
-       b3 := bat.insert(b1, "dim", b2);
-       return series := b3;
+function series (start:@1, step:@1, stop:@1, N:int, M:int) :bat[:oid, :@1];
+#      b1 := bat.new(:str,:bat,1);
+#      b2 := series_(start, step, stop, N, M);
+       return series_(start, step, stop, N, M);
+#      b3 := bat.insert(b1, "dim", b2);
+#      return series := b3;
 end series;
 
 @mal
@@ -70,11 +71,12 @@
 address ARRAYfiller
 comment "Create an array value representation of CNT items and fill it with V";
 
-function filler(cnt:lng, v:any_2):bat[:str,:bat];
-       b1 := bat.new(:str,:bat,1);
-       b2 := filler_(cnt, v);
-       b3 := bat.insert(b1, "vals", b2);
-       return filler := b3;
+function filler(cnt:lng, v:any_2):bat[:oid,:any_2];
+#      b1 := bat.new(:str,:bat,1);
+#      b2 := filler_(cnt, v);
+       return filler_(cnt, v);
+#      b3 := bat.insert(b1, "vals", b2);
+#      return filler := b3;
 end filler;
 
 pattern map(dims:bat[:oid,:any]...):bat[:oid,:oid]
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to