Changeset: 126476ddc757 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=126476ddc757
Modified Files:
monetdb5/tests/suite_00/Tests/test_10.mal
monetdb5/tests/suite_00/Tests/test_10.stable.out
Branch: default
Log Message:
Approve output
diffs (135 lines):
diff --git a/monetdb5/tests/suite_00/Tests/test_10.mal
b/monetdb5/tests/suite_00/Tests/test_10.mal
--- a/monetdb5/tests/suite_00/Tests/test_10.mal
+++ b/monetdb5/tests/suite_00/Tests/test_10.mal
@@ -10,9 +10,6 @@
ka_a := algebra.sort(s);
la_a := io.print(ka_a);
ma_a := io.printf("#~EndVariableOutput~#\n");
- na_a := algebra.sortHT(s);
- oa_a := io.print(na_a);
- na := algebra.sortHT(s);
oa_a := io.print(na);
s := bat.new(nil:oid,nil:int);
pa_a := bat.append(s,1);
@@ -26,6 +23,3 @@
xa_a := algebra.sort(s);
ya_a := io.print(xa_a);
ab_a := io.printf("#~EndVariableOutput~#\n");
- bb_a := algebra.sortHT(s);
- cb_a := io.print(bb_a);
- db_a := clients.quit();
diff --git a/monetdb5/tests/suite_00/Tests/test_10.stable.out
b/monetdb5/tests/suite_00/Tests/test_10.stable.out
--- a/monetdb5/tests/suite_00/Tests/test_10.stable.out
+++ b/monetdb5/tests/suite_00/Tests/test_10.stable.out
@@ -5,14 +5,19 @@ stdout of test 'test_10` in directory 'm
# 07:27:19 > 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=35545
--set monet_prompt= --trace --dbname=mTests_tests_suite_00 test_10.mal <
/dev/null
# 07:27:19 >
-# 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_tests_suite_00
-# Visit http://monetdb.cwi.nl/ for further information
-# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:30579/
+# MonetDB 5 server v11.20.0
+# This is an unreleased version
+# Serving database 'mTests_monetdb5_tests_suite_00', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit
integers dynamically linked
+# Found 15.590 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2015 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:33407/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-21327/.s.monetdb.33407
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
function user.main():void;
s := bat.new(nil:oid,nil:int);
ca_a := bat.append(s,5);
@@ -28,11 +33,6 @@ function user.main():void;
la_a := io.print(ka_a);
# io.print("printf(\"#~EndVariableOutput~#\\n\");");
ma_a := io.printf("#~EndVariableOutput~#\n");
-# io.print("sortHT(s).print();");
- na_a := algebra.sortHT(s);
- oa_a := io.print(na_a);
-# io.print("sortHT(s).print();");
- na := algebra.sortHT(s);
oa_a := io.print(na);
s := bat.new(nil:oid,nil:int);
pa_a := bat.append(s,1);
@@ -48,71 +48,7 @@ function user.main():void;
ya_a := io.print(xa_a);
# io.print("printf(\"#~EndVariableOutput~#\\n\");");
ab_a := io.printf("#~EndVariableOutput~#\n");
-# io.print("sortHT(s).print();");
- bb_a := algebra.sortHT(s);
- cb_a := io.print(bb_a);
-# io.print("quit();");
- db_a := clients.quit();
end main;
-#~BeginVariableOutput~#
-#-----------------#
-# t h # name
-# int int # type
-#-----------------#
-[ 0@0, 5 ]
-[ 1@0, 3 ]
-[ 2@0, 2 ]
-[ 3@0, 1 ]
-[ 4@0, 1 ]
-[ 5@0, 2 ]
-[ 6@0, 3 ]
-#~EndVariableOutput~#
-#-----------------#
-# h t # name
-# int int # type
-#-----------------#
-[ 0@0, 5 ]
-[ 1@0, 3 ]
-[ 2@0, 2 ]
-[ 3@0, 1 ]
-[ 4@0, 1 ]
-[ 5@0, 2 ]
-[ 6@0, 3 ]
-#-----------------#
-# h t # name
-# int int # type
-#-----------------#
-[ 0@0, 5 ]
-[ 1@0, 3 ]
-[ 2@0, 2 ]
-[ 3@0, 1 ]
-[ 4@0, 1 ]
-[ 5@0, 2 ]
-[ 6@0, 3 ]
-#~BeginVariableOutput~#
-#-----------------#
-# t h # name
-# int int # type
-#-----------------#
-[ 0@0, 1 ]
-[ 1@0, 1 ]
-[ 2@0, 1 ]
-[ 3@0, 1 ]
-[ 4@0, 1 ]
-[ 5@0, 2 ]
-[ 6@0, 1 ]
-#~EndVariableOutput~#
-#-----------------#
-# h t # name
-# int int # type
-#-----------------#
-[ 0@0, 1 ]
-[ 1@0, 1 ]
-[ 2@0, 1 ]
-[ 3@0, 1 ]
-[ 4@0, 1 ]
-[ 5@0, 2 ]
-[ 6@0, 1 ]
# 07:27:19 >
# 07:27:19 > Done.
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
