Changeset: 6913c5ddcf63 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6913c5ddcf63
Modified Files:
monetdb5/modules/mal/Tests/inspect05.malC
monetdb5/modules/mal/Tests/mapi01.malC
monetdb5/modules/mal/Tests/mapi07.malC
monetdb5/modules/mal/Tests/orderidx01.malC
monetdb5/modules/mal/Tests/orderidx02.malC
monetdb5/modules/mal/Tests/remote04.malC
Branch: malupgrade
Log Message:
More test approvals
diffs (161 lines):
diff --git a/monetdb5/modules/mal/Tests/inspect05.malC
b/monetdb5/modules/mal/Tests/inspect05.malC
--- a/monetdb5/modules/mal/Tests/inspect05.malC
+++ b/monetdb5/modules/mal/Tests/inspect05.malC
@@ -1,6 +1,6 @@
#Illustrate the modules loaded after start
m:= inspect.getModule();
-m0:= algebra.subselect(m,nil:bat[:oid],"bat", "bat", true,true,false); # limit
the list
+m0:= algebra.select(m,nil:bat[:oid],"bat", "bat", true,true,false); # limit
the list
m1:= algebra.projection(m0,m);
k:= inspect.getKind();
k0:= algebra.projection(m0,k);
diff --git a/monetdb5/modules/mal/Tests/mapi01.malC
b/monetdb5/modules/mal/Tests/mapi01.malC
--- a/monetdb5/modules/mal/Tests/mapi01.malC
+++ b/monetdb5/modules/mal/Tests/mapi01.malC
@@ -12,10 +12,10 @@ mapi.rpc(mid,"bat.append(rb,3);");
mapi.rpc(mid,"bat.append(rb,5);");
mapi.rpc(mid,"bat.append(rb,6);");
mapi.rpc(mid,"bat.append(rb,7);");
-mapi.rpc(mid,"c1:=algebra.subselect(rb,0,12,true,true,false);c:=algebra.projection(c1,rb);");
+mapi.rpc(mid,"c1:=algebra.select(rb,0,12,true,true,false);c:=algebra.projection(c1,rb);");
c:bat[:int]:= mapi.rpc(mid, "io.print(c);");
io.print(c);
-mapi.rpc(mid,"c1:=algebra.subselect(rb,0,4,true,true,false);");
+mapi.rpc(mid,"c1:=algebra.select(rb,0,4,true,true,false);");
c:bat[:int]:= mapi.rpc(mid, "io.print(c1);");
io.print(c);
@@ -23,10 +23,10 @@ b:bat[:int]:= mapi.bind(mid,"rbat");
io.print(b);
# see if we can do some remote selections.
-mapi.rpc(mid,"d:=algebra.subselect(b,5,10,true,true,false);");
+mapi.rpc(mid,"d:=algebra.select(b,5,10,true,true,false);");
low:= 5+1;
mapi.put(mid,"low",low);
-mapi.rpc(mid,"e:=algebra.subselect(b,d,low,7,true,true,false);");
+mapi.rpc(mid,"e:=algebra.select(b,d,low,7,true,true,false);");
mapi.rpc(mid,"i:=aggr.count(e);");
i:lng:= mapi.rpc(mid,"io.print(i);");
io.printf(" count %d\n",i);
diff --git a/monetdb5/modules/mal/Tests/mapi07.malC
b/monetdb5/modules/mal/Tests/mapi07.malC
--- a/monetdb5/modules/mal/Tests/mapi07.malC
+++ b/monetdb5/modules/mal/Tests/mapi07.malC
@@ -12,11 +12,11 @@ mapi.rpc(mid,"bat.append(rb,3);");
mapi.rpc(mid,"bat.append(rb,5);");
mapi.rpc(mid,"bat.append(rb,6);");
mapi.rpc(mid,"bat.append(rb,7);");
-mapi.rpc(mid,"c:=algebra.subselect(rb,0,12,true,true,false);");
+mapi.rpc(mid,"c:=algebra.select(rb,0,12,true,true,false);");
low:= 5+1;
mapi.put(mid,"low",low);
-i:lng:= mapi.rpc(mid,"e:=algebra.subselect(rb,low,7,true,true,false);
i:=aggr.count(e); io.print(i);");
+i:lng:= mapi.rpc(mid,"e:=algebra.select(rb,low,7,true,true,false);
i:=aggr.count(e); io.print(i);");
io.printf(" count %d\n",i);
d:bat[:int]:= mapi.rpc(mid,"io.print(i);");
io.print(d);
diff --git a/monetdb5/modules/mal/Tests/orderidx01.malC
b/monetdb5/modules/mal/Tests/orderidx01.malC
--- a/monetdb5/modules/mal/Tests/orderidx01.malC
+++ b/monetdb5/modules/mal/Tests/orderidx01.malC
@@ -16,30 +16,30 @@ bat.setAccess(bv,"r");
io.print(bv);
-s0:= algebra.subselect(bv,nil:bat[:oid],nil:int,nil:int,false,false,false);
+s0:= algebra.select(bv,nil:bat[:oid],nil:int,nil:int,false,false,false);
io.print(s0);
-s1:= algebra.subselect(bv,nil:bat[:oid],nil:int,959217167,true,true,false);
+s1:= algebra.select(bv,nil:bat[:oid],nil:int,959217167,true,true,false);
io.print(s1);
-s2:= algebra.subselect(bv,nil:bat[:oid],959217167,959217167,true,true,false);
+s2:= algebra.select(bv,nil:bat[:oid],959217167,959217167,true,true,false);
io.print(s2);
-s3:= algebra.subselect(bv,nil:bat[:oid],1863672321,nil:int,true,true,false);
+s3:= algebra.select(bv,nil:bat[:oid],1863672321,nil:int,true,true,false);
io.print(s3);
# introduce an oid index, it should produce the same results
bat.orderidx(bv,3);
ord := bat.getorderidx(bv);
io.print(ord);
-x0:= algebra.subselect(bv,nil:bat[:oid],nil:int,nil:int,false,false,false);
+x0:= algebra.select(bv,nil:bat[:oid],nil:int,nil:int,false,false,false);
io.print(x0);
-x1:= algebra.subselect(bv,nil:bat[:oid],nil:int,959217167,true,true,false);
+x1:= algebra.select(bv,nil:bat[:oid],nil:int,959217167,true,true,false);
io.print(x1);
-x2:= algebra.subselect(bv,nil:bat[:oid],959217167,959217167,true,true,false);
+x2:= algebra.select(bv,nil:bat[:oid],959217167,959217167,true,true,false);
io.print(x2);
-x3:= algebra.subselect(bv,nil:bat[:oid],1863672321,nil:int,true,true,false);
+x3:= algebra.select(bv,nil:bat[:oid],1863672321,nil:int,true,true,false);
io.print(x3);
diff --git a/monetdb5/modules/mal/Tests/orderidx02.malC
b/monetdb5/modules/mal/Tests/orderidx02.malC
--- a/monetdb5/modules/mal/Tests/orderidx02.malC
+++ b/monetdb5/modules/mal/Tests/orderidx02.malC
@@ -16,19 +16,19 @@ bat.setAccess(bv,"r");
vv:= algebra.slice(bv,0,10);
-s0:= algebra.subselect(vv,nil:bat[:oid],nil:int,nil:int,false,false,false);
+s0:= algebra.select(vv,nil:bat[:oid],nil:int,nil:int,false,false,false);
s0v := algebra.projection(s0,vv);
io.print(s0,s0v);
-s1:= algebra.subselect(vv,nil:bat[:oid],nil:int,959217167,true,true,false);
+s1:= algebra.select(vv,nil:bat[:oid],nil:int,959217167,true,true,false);
s1v := algebra.projection(s1,vv);
io.print(s1,s1v);
-s2:= algebra.subselect(vv,nil:bat[:oid],959217167,959217167,true,true,false);
+s2:= algebra.select(vv,nil:bat[:oid],959217167,959217167,true,true,false);
s2v := algebra.projection(s2,vv);
io.print(s2,s2v);
-s3:= algebra.subselect(vv,nil:bat[:oid],1863672321,nil:int,true,true,false);
+s3:= algebra.select(vv,nil:bat[:oid],1863672321,nil:int,true,true,false);
s3v := algebra.projection(s3,vv);
io.print(s3,s3v);
@@ -36,18 +36,18 @@ io.print(s3,s3v);
bat.orderidx(vv,3);
ord := bat.getorderidx(vv);
io.print(ord,vv);
-x0:= algebra.subselect(vv,nil:bat[:oid],nil:int,nil:int,false,false,false);
+x0:= algebra.select(vv,nil:bat[:oid],nil:int,nil:int,false,false,false);
x0v := algebra.projection(x0,vv);
io.print(x0,x0v);
-x1:= algebra.subselect(vv,nil:bat[:oid],nil:int,959217167,true,true,false);
+x1:= algebra.select(vv,nil:bat[:oid],nil:int,959217167,true,true,false);
x1v := algebra.projection(x1,vv);
io.print(x1,x1v);
-x2:= algebra.subselect(vv,nil:bat[:oid],959217167,959217167,true,true,false);
+x2:= algebra.select(vv,nil:bat[:oid],959217167,959217167,true,true,false);
x2v := algebra.projection(x2,vv);
io.print(x2,x2v);
-x3:= algebra.subselect(vv,nil:bat[:oid],1863672321,nil:int,true,true,false);
+x3:= algebra.select(vv,nil:bat[:oid],1863672321,nil:int,true,true,false);
x3v := algebra.projection(x3,vv);
io.print(x3,x3v);
diff --git a/monetdb5/modules/mal/Tests/remote04.malC
b/monetdb5/modules/mal/Tests/remote04.malC
--- a/monetdb5/modules/mal/Tests/remote04.malC
+++ b/monetdb5/modules/mal/Tests/remote04.malC
@@ -23,7 +23,7 @@ tt:= remote.put(conn,true:bit);
tf:= remote.put(conn,false:bit);
# perform a selection remote, and get the result back
-bok := remote.exec(conn, "algebra", "subselect", k, l, m, tt,tt,tf);
+bok := remote.exec(conn, "algebra", "select", k, l, m, tt,tt,tf);
j:bat[:oid] := remote.get(conn, bok);
io.print(j);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
