Changeset: 7b25b7244ffd for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7b25b7244ffd
Modified Files:
monetdb5/mal/Tests/tst1502.mal
monetdb5/mal/Tests/tst1502.stable.out
monetdb5/mal/Tests/tst233.mal
monetdb5/mal/Tests/tst233.stable.out
monetdb5/mal/Tests/tst234.mal
monetdb5/mal/Tests/tst234.stable.out
monetdb5/mal/Tests/tst235.mal
monetdb5/mal/Tests/tst235.stable.out
monetdb5/mal/Tests/tst3030.mal
monetdb5/mal/Tests/tst3030.stable.out
monetdb5/mal/Tests/tst610.mal
monetdb5/mal/Tests/tst610.stable.out
monetdb5/mal/Tests/tst903.mal
monetdb5/mal/Tests/tst903.stable.out
monetdb5/modules/atoms/Tests/xml10.mal
monetdb5/modules/atoms/Tests/xml10.stable.out
monetdb5/modules/kernel/Tests/time01.mal
monetdb5/modules/kernel/Tests/time01.stable.out
monetdb5/optimizer/Tests/DCexample2.mal
monetdb5/optimizer/Tests/DCexample2.stable.out
monetdb5/optimizer/Tests/reorder00.mal
monetdb5/optimizer/Tests/reorder00.stable.out
monetdb5/optimizer/Tests/tst4700.mal
monetdb5/optimizer/Tests/tst4700.stable.out
Branch: default
Log Message:
Adjust sort experiments
The new subsort interface is used in the tests.
(JAQL still uses the old one)
diffs (truncated from 469 to 300 lines):
diff --git a/monetdb5/mal/Tests/tst1502.mal b/monetdb5/mal/Tests/tst1502.mal
--- a/monetdb5/mal/Tests/tst1502.mal
+++ b/monetdb5/mal/Tests/tst1502.mal
@@ -36,8 +36,9 @@
bat.insert(z,7@0,"c");
bat.insert(z,8@0,"a");
io.print("sort x");
- xs:=algebra.sort(x);
+ xs:=algebra.subsort(x,false:bit,false:bit);
io.print(xs);
io.print("hsort xrev");
- xrev:=bat.reverse(x);
+ xrev:=algebra.subsort(x,true:bit,false:bit);
+ io.print(xrev);
diff --git a/monetdb5/mal/Tests/tst1502.stable.out
b/monetdb5/mal/Tests/tst1502.stable.out
--- a/monetdb5/mal/Tests/tst1502.stable.out
+++ b/monetdb5/mal/Tests/tst1502.stable.out
@@ -95,10 +95,11 @@ function user.main():void;
bat.insert(z,7@0,"c");
bat.insert(z,8@0,"a");
io.print("sort x");
- xs := algebra.sort(x);
+ xs := algebra.subsort(x,false:bit,false:bit);
io.print(xs);
io.print("hsort xrev");
- xrev := bat.reverse(x);
+ xrev := algebra.subsort(x,true:bit,false:bit);
+ io.print(xrev);
end main;
[ "sort x" ]
#-----------------#
@@ -114,6 +115,18 @@ end main;
[ 7@0, 3 ]
[ 8@0, 3 ]
[ "hsort xrev" ]
+#--------------------------#
+# h t # name
+# void bte # type
+#--------------------------#
+[ 1@0, 3 ]
+[ 2@0, 3 ]
+[ 3@0, 2 ]
+[ 4@0, 2 ]
+[ 5@0, 2 ]
+[ 6@0, 2 ]
+[ 7@0, 1 ]
+[ 8@0, 1 ]
# 07:59:07 >
# 07:59:07 > Done.
diff --git a/monetdb5/mal/Tests/tst233.mal b/monetdb5/mal/Tests/tst233.mal
--- a/monetdb5/mal/Tests/tst233.mal
+++ b/monetdb5/mal/Tests/tst233.mal
@@ -4,7 +4,7 @@ function dir():void;
d:= bbp.getRefCount();
dl:=bbp.getLRefCount();
dn:= bbp.getNames();
- ds:= algebra.sort(dn);
+ ds:= algebra.subsort(dn,false,false);
io.table(ds,d,dl);
end dir;
diff --git a/monetdb5/mal/Tests/tst233.stable.out
b/monetdb5/mal/Tests/tst233.stable.out
--- a/monetdb5/mal/Tests/tst233.stable.out
+++ b/monetdb5/mal/Tests/tst233.stable.out
@@ -24,7 +24,7 @@ function user.dir():void;
d := bbp.getRefCount();
dl := bbp.getLRefCount();
dn := bbp.getNames();
- ds := algebra.sort(dn);
+ ds := algebra.subsort(dn,false,false);
io.table(ds,d,dl);
end dir;
#
diff --git a/monetdb5/mal/Tests/tst234.mal b/monetdb5/mal/Tests/tst234.mal
--- a/monetdb5/mal/Tests/tst234.mal
+++ b/monetdb5/mal/Tests/tst234.mal
@@ -4,7 +4,7 @@ function dir():void;
d:= bbp.getRefCount();
dl:=bbp.getLRefCount();
dn:= bbp.getNames();
- ds:= algebra.sort(dn);
+ ds:= algebra.subsort(dn,false,false);
io.table(ds,d,dl);
end dir;
diff --git a/monetdb5/mal/Tests/tst234.stable.out
b/monetdb5/mal/Tests/tst234.stable.out
--- a/monetdb5/mal/Tests/tst234.stable.out
+++ b/monetdb5/mal/Tests/tst234.stable.out
@@ -24,7 +24,7 @@ function user.dir():void;
d := bbp.getRefCount();
dl := bbp.getLRefCount();
dn := bbp.getNames();
- ds := algebra.sort(dn);
+ ds := algebra.subsort(dn,false,false);
io.table(ds,d,dl);
end dir;
#
diff --git a/monetdb5/mal/Tests/tst235.mal b/monetdb5/mal/Tests/tst235.mal
--- a/monetdb5/mal/Tests/tst235.mal
+++ b/monetdb5/mal/Tests/tst235.mal
@@ -5,7 +5,7 @@ function dir():void;
d:= bbp.getRefCount();
dl:=bbp.getLRefCount();
dn:= bbp.getNames();
- ds:= algebra.sort(dn);
+ ds:= algebra.subsort(dn,false,false);
io.table(ds,d,dl);
end dir;
diff --git a/monetdb5/mal/Tests/tst235.stable.out
b/monetdb5/mal/Tests/tst235.stable.out
--- a/monetdb5/mal/Tests/tst235.stable.out
+++ b/monetdb5/mal/Tests/tst235.stable.out
@@ -5,27 +5,25 @@ stdout of test 'tst235` in directory 'mo
# 11:58:32 > Mtimeout -timeout 60 mserver5
"--config=/ufs/mk/monet5/Linux/etc/MonetDB5.conf" --debug=10 --set
"monet_mod_path=/ufs/mk/monet5/Linux/lib/MonetDB5:/ufs/mk/opensource/MonetDB/Linux/lib/MonetDB"
--set "gdk_dbfarm=/ufs/mk/monet5/Linux/var/MonetDB5/dbfarm" --set
"sql_logdir=/ufs/mk/monet5/Linux/var/MonetDB5/dblogs" --set mapi_port=37722
--set monet_prompt= --trace --dbname=mTests_src_mal tst235.mal < /dev/null
# 11:58:32 >
-# MonetDB Server v4.99.19
-# Copyright (c) 1993-2006 CWI, all rights reserved
-# Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs dynamically linked
-# config:/ufs/mk/monet5/Linux/etc/MonetDB5.conf
-# dbfarm:/ufs/mk/monet5/Linux/var/MonetDB5/dbfarm
-# dbname:mTests_src_mal
-# Visit http://monetdb.cwi.nl/ for further information
-## BAT references are seens as BAT's and should be subject to the
-## same reference scheme.
-#
-#function dir():void;
-# d:= bbp.getRefCount();
-# dl:=bbp.getLRefCount();
-# dn:= bbp.getNames();
-# io.print(dn,d,dl);
-#end dir;
+# MonetDB 5 server v11.18.0
+# This is an unreleased version
+# Serving database 'mTests_monetdb5_mal', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 15.591 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2014 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://vienna.ins.cwi.nl:33727/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-9822/.s.monetdb.33727
+# MonetDB/GIS module loaded
+# MonetDB/JAQL module loaded
+# MonetDB/SQL module loaded
+
function user.dir():void;
d := bbp.getRefCount();
dl := bbp.getLRefCount();
dn := bbp.getNames();
- ds := algebra.sort(dn);
+ ds := algebra.subsort(dn,false,false);
io.table(ds,d,dl);
end dir;
function user.createBAT(name:str):bat[:oid,:int];
diff --git a/monetdb5/mal/Tests/tst3030.mal b/monetdb5/mal/Tests/tst3030.mal
--- a/monetdb5/mal/Tests/tst3030.mal
+++ b/monetdb5/mal/Tests/tst3030.mal
@@ -7,6 +7,5 @@ end newsemijoin;
z:= bat.new(:oid{sorted=true},:int);
w:= bat.new(:oid{sequence=true},:int);
w:bat[:oid,:int]:= bat.new(:oid,:int);
-y:= algebra.sort(w{sorted=true,dense=true});
+y:= algebra.subsort(w{sorted=true,dense=true},false,false);
io.print(1);
-zz:int{sorted=true}:= algebra.sort(w);
diff --git a/monetdb5/mal/Tests/tst3030.stable.out
b/monetdb5/mal/Tests/tst3030.stable.out
--- a/monetdb5/mal/Tests/tst3030.stable.out
+++ b/monetdb5/mal/Tests/tst3030.stable.out
@@ -21,17 +21,16 @@ stdout of test 'tst3030` in directory 'm
function
user.newsemijoin(A:bat[:oid,:any_1],B:bat[:oid,:any_2]):bat[:oid,:any_1];
return newsemijoin := nil;
end newsemijoin;
-!TypeException:user.main[8]:'algebra.sort' undefined in: zz:int :=
algebra.sort(w:bat[:oid,:int])
function user.main():void;
#Parsing properties and keeping them around
# note the use of the first parameter to obtain property set
z := bat.new(:oid,:int);
w:bat[:oid,:int] := bat.new(:oid,:int);
w:bat[:oid,:int] := bat.new(:oid,:int);
- y := algebra.sort(w);
+ y := algebra.subsort(w,false,false);
io.print(1);
- zz:int := algebra.sort(w);
end main;
+[ 1 ]
# 08:01:16 >
# 08:01:16 > Done.
diff --git a/monetdb5/mal/Tests/tst610.mal b/monetdb5/mal/Tests/tst610.mal
--- a/monetdb5/mal/Tests/tst610.mal
+++ b/monetdb5/mal/Tests/tst610.mal
@@ -2,7 +2,7 @@
#create a persistent bat and destroy it in test 612
function refs():void;
g:=bbp.getNames();
- gs:= algebra.sort(g);
+ gs:= algebra.subsort(g,false,false);
gr:=bbp.getRefCount();
gl:=bbp.getLRefCount();
io.table(gs,gr,gl);
diff --git a/monetdb5/mal/Tests/tst610.stable.out
b/monetdb5/mal/Tests/tst610.stable.out
--- a/monetdb5/mal/Tests/tst610.stable.out
+++ b/monetdb5/mal/Tests/tst610.stable.out
@@ -22,7 +22,7 @@ stdout of test 'tst610` in directory 'mo
#end refs;
function user.refs():void;
g := bbp.getNames();
- gs := algebra.sort(g);
+ gs := algebra.subsort(g,false,false);
gr := bbp.getRefCount();
gl := bbp.getLRefCount();
io.table(gs,gr,gl);
diff --git a/monetdb5/mal/Tests/tst903.mal b/monetdb5/mal/Tests/tst903.mal
--- a/monetdb5/mal/Tests/tst903.mal
+++ b/monetdb5/mal/Tests/tst903.mal
@@ -110,7 +110,7 @@ io.printf("#select 1.0 %d",d0);
cnt:= aggr.count(z9);
io.printf(" count %d\n",cnt);
t0:= alarm.usec();
-s:= algebra.sort(b);
+s:= algebra.subsort(b,false,false);
t1:= alarm.usec();
d0:= t1-t0;
io.printf("#head sort %d",d0);
diff --git a/monetdb5/mal/Tests/tst903.stable.out
b/monetdb5/mal/Tests/tst903.stable.out
--- a/monetdb5/mal/Tests/tst903.stable.out
+++ b/monetdb5/mal/Tests/tst903.stable.out
@@ -129,7 +129,7 @@ exit i;
cnt := aggr.count(z9);
io.printf(" count %d\n",cnt);
t0 := alarm.usec();
- s := algebra.sort(b);
+ s := algebra.subsort(b,false,false);
t1 := alarm.usec();
d0 := calc.-(t1,t0);
io.printf("#head sort %d",d0);
@@ -138,16 +138,16 @@ exit i;
cnt := aggr.count(z9);
mdb.setDebug(dbgmsk_set);
t0 := alarm.usec();
- X_98 := bat.reverse(b);
- X_100 := bat.new(nil:oid,nil:lng);
-barrier (X_104,X_105) := iterator.new(b);
- X_107 := algebra.fetch(c,X_104);
- X_109 := calc.+(X_105,X_107);
- X_110 := algebra.fetch(X_98,X_104);
- bat.insert(X_100,X_110,X_109);
- redo (X_104,X_105) := iterator.next(b);
-exit (X_104,X_105);
- x:bat[:oid,:lng] := X_100;
+ X_99 := bat.reverse(b);
+ X_101 := bat.new(nil:oid,nil:lng);
+barrier (X_105,X_106) := iterator.new(b);
+ X_108 := algebra.fetch(c,X_105);
+ X_110 := calc.+(X_106,X_108);
+ X_111 := algebra.fetch(X_99,X_105);
+ bat.insert(X_101,X_111,X_110);
+ redo (X_105,X_106) := iterator.next(b);
+exit (X_105,X_106);
+ x:bat[:oid,:lng] := X_101;
t1 := alarm.usec();
mdb.setDebug(dbgmsk_restore);
d0 := calc.-(t1,t0);
diff --git a/monetdb5/modules/atoms/Tests/xml10.mal
b/monetdb5/modules/atoms/Tests/xml10.mal
--- a/monetdb5/modules/atoms/Tests/xml10.mal
+++ b/monetdb5/modules/atoms/Tests/xml10.mal
@@ -37,7 +37,7 @@ bat.insert(g,2@0,1@0);
k:= algebra.join(g,te);
io.print(k);
-l:= algebra.sort(k);
+l:= algebra.subsort(k,false,false);
io.print(l);
ag:= xml.agg(te,g);
diff --git a/monetdb5/modules/atoms/Tests/xml10.stable.out
b/monetdb5/modules/atoms/Tests/xml10.stable.out
--- a/monetdb5/modules/atoms/Tests/xml10.stable.out
+++ b/monetdb5/modules/atoms/Tests/xml10.stable.out
@@ -50,7 +50,7 @@ function user.main():void;
bat.insert(g,2@0,1@0);
k := algebra.join(g,te);
io.print(k);
- l := algebra.sort(k);
+ l := algebra.subsort(k,false,false);
io.print(l);
ag := xml.agg(te,g);
io.print(ag);
diff --git a/monetdb5/modules/kernel/Tests/time01.mal
b/monetdb5/modules/kernel/Tests/time01.mal
--- a/monetdb5/modules/kernel/Tests/time01.mal
+++ b/monetdb5/modules/kernel/Tests/time01.mal
@@ -1,13 +1,13 @@
-x0 := mtime.daytime("10:00:00");
-x1 := mtime.daytime("10:00:20");
-x2 := mtime.daytime("10:00:50");
+x0 := mtime.daytime("10:00:50");
+x1 := mtime.daytime("10:00:00");
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
