MonetDB: sciql - array.{sum,avg}() -> batarray.{sum,avg}()

[Stefan Manegold]

Changeset: 38ac26dc3b94 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=38ac26dc3b94
Modified Files:
        monetdb5/modules/mal/Tests/array04.mal
        monetdb5/modules/mal/Tests/array04.stable.out
Branch: sciql
Log Message:

array.{sum,avg}() -> batarray.{sum,avg}()

On BATs, we need to call batarray.{sum,avg}()
instead of array.{sum,avg}()


diffs (89 lines):

diff --git a/monetdb5/modules/mal/Tests/array04.mal 
b/monetdb5/modules/mal/Tests/array04.mal
--- a/monetdb5/modules/mal/Tests/array04.mal
+++ b/monetdb5/modules/mal/Tests/array04.mal
@@ -22,9 +22,9 @@ mv:= array.filler(mx,37);
 #t1:= array.series(0,1,2,1,2);
 #io.print(t0,t1);
 #
-#gs:= array.sum(mv, mx, my, t0, t1, 4, 4);
+#gs:= batarray.sum(mv, mx, my, t0, t1, 4, 4);
 #io.print(gs);
-#ga:= array.avg(mv, mx, my, t0, t1, 4, 4);
+#ga:= batarray.avg(mv, mx, my, t0, t1, 4, 4);
 #io.print(ga);
 
 #select sum(M) from M group by M[x-1:x+2][y-2:y+1]
@@ -32,8 +32,8 @@ t0:= array.series(-1,1,2,3,1);
 t1:= array.series(-2,1,1,1,3);
 io.print(t0,t1);
 
-gs:= array.sum(mv, mx, t0, 4, my, t1, 4);
-ga:= array.avg(mv, mx, t0, 4, my, t1, 4);
+gs:= batarray.sum(mv, mx, t0, 4, my, t1, 4);
+ga:= batarray.avg(mv, mx, t0, 4, my, t1, 4);
 io.print(mx, my, mv, gs, ga);
 
 #create array M(x int dimension[0:1:4], y int dimension[0:1:4], v int default 
x*4+y);
@@ -54,8 +54,8 @@ mv := bat.append(mv,12);
 mv := bat.append(mv,13);
 mv := bat.append(mv,14);
 mv := bat.append(mv,15);
-gs:= array.sum(mv, mx, t0, 4, my, t1, 4);
-ga:= array.avg(mv, mx, t0, 4, my, t1, 4);
+gs:= batarray.sum(mv, mx, t0, 4, my, t1, 4);
+ga:= batarray.avg(mv, mx, t0, 4, my, t1, 4);
 io.print(mx, my, mv, gs, ga);
 
 #template:= array.map(mx,my,t0,t1);
@@ -79,6 +79,6 @@ io.print(mx, my, mv, gs, ga);
 ##now produce the tiled sum over the enlarged one
 #template:= array.map(nx,ny,t0,t1);
 #io.print(template);
-#gs:= array.sum(nv,template);
+#gs:= batarray.sum(nv,template);
 #io.print(gs);
 
diff --git a/monetdb5/modules/mal/Tests/array04.stable.out 
b/monetdb5/modules/mal/Tests/array04.stable.out
--- a/monetdb5/modules/mal/Tests/array04.stable.out
+++ b/monetdb5/modules/mal/Tests/array04.stable.out
@@ -35,16 +35,16 @@ function user.main():void;
 #t0:= array.series(0,1,2,2,1); 
 #t1:= array.series(0,1,2,1,2); 
 #io.print(t0,t1); 
-#gs:= array.sum(mv, mx, my, t0, t1, 4, 4); 
+#gs:= batarray.sum(mv, mx, my, t0, t1, 4, 4); 
 #io.print(gs); 
-#ga:= array.avg(mv, mx, my, t0, t1, 4, 4); 
+#ga:= batarray.avg(mv, mx, my, t0, t1, 4, 4); 
 #io.print(ga); 
 #select sum(M) from M group by M[x-1:x+2][y-2:y+1] 
     t0 := array.series(-1,1,2,3,1);
     t1 := array.series(-2,1,1,1,3);
     io.print(t0,t1);
-    gs := array.sum(mv,mx,t0,4,my,t1,4);
-    ga := array.avg(mv,mx,t0,4,my,t1,4);
+    gs := batarray.sum(mv,mx,t0,4,my,t1,4);
+    ga := batarray.avg(mv,mx,t0,4,my,t1,4);
     io.print(mx,my,mv,gs,ga);
 #create array M(x int dimension[0:1:4], y int dimension[0:1:4], v int default 
x*4+y); 
     mv := bat.new(:oid,:int);
@@ -64,8 +64,8 @@ function user.main():void;
     mv := bat.append(mv,13);
     mv := bat.append(mv,14);
     mv := bat.append(mv,15);
-    gs := array.sum(mv,mx,t0,4,my,t1,4);
-    ga := array.avg(mv,mx,t0,4,my,t1,4);
+    gs := batarray.sum(mv,mx,t0,4,my,t1,4);
+    ga := batarray.avg(mv,mx,t0,4,my,t1,4);
     io.print(mx,my,mv,gs,ga);
 #template:= array.map(mx,my,t0,t1); 
 #io.print(template); 
@@ -84,7 +84,7 @@ function user.main():void;
 ##now produce the tiled sum over the enlarged one 
 #template:= array.map(nx,ny,t0,t1); 
 #io.print(template); 
-#gs:= array.sum(nv,template); 
+#gs:= batarray.sum(nv,template); 
 #io.print(gs); 
 end main;
 #-------------------------#
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list