Update of /cvsroot/monetdb/sql/src/test/Tests
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11808/src/test/Tests
Modified Files:
rank.stable.out string.stable.err string.stable.out
Log Message:
fixes use of txtsim functions
added more optimized versions of cast of mtime types (from string)
added more optimized verion of str to string convert
added use (first steps) of rangejoin
approved tests which changed by this (rangejoin addition)
Index: rank.stable.out
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/Tests/rank.stable.out,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- rank.stable.out 18 Dec 2007 10:49:14 -0000 1.9
+++ rank.stable.out 21 Dec 2007 17:02:27 -0000 1.10
@@ -61,110 +61,110 @@
% foo, schema_id # name
% int, int # type
% 2, 4 # length
-[ 0, 956 ]
-[ 1, 956 ]
-[ 2, 956 ]
-[ 3, 956 ]
-[ 4, 956 ]
-[ 5, 956 ]
-[ 6, 956 ]
-[ 7, 956 ]
-[ 8, 956 ]
-[ 9, 956 ]
-[ 10, 956 ]
-[ 11, 956 ]
-[ 12, 956 ]
-[ 0, 1057 ]
-[ 1, 1057 ]
-[ 2, 1057 ]
-[ 3, 1057 ]
-[ 4, 1057 ]
-[ 5, 1057 ]
-[ 13, 956 ]
-[ 14, 956 ]
-[ 15, 956 ]
-[ 16, 956 ]
-[ 17, 956 ]
-[ 18, 956 ]
-[ 19, 956 ]
-[ 6, 1057 ]
-[ 20, 956 ]
-[ 21, 956 ]
-[ 22, 956 ]
-[ 23, 956 ]
-[ 24, 956 ]
+[ 0, 980 ]
+[ 1, 980 ]
+[ 2, 980 ]
+[ 3, 980 ]
+[ 4, 980 ]
+[ 5, 980 ]
+[ 6, 980 ]
+[ 7, 980 ]
+[ 8, 980 ]
+[ 9, 980 ]
+[ 10, 980 ]
+[ 11, 980 ]
+[ 12, 980 ]
+[ 0, 1081 ]
+[ 1, 1081 ]
+[ 2, 1081 ]
+[ 3, 1081 ]
+[ 4, 1081 ]
+[ 5, 1081 ]
+[ 13, 980 ]
+[ 14, 980 ]
+[ 15, 980 ]
+[ 16, 980 ]
+[ 17, 980 ]
+[ 18, 980 ]
+[ 19, 980 ]
+[ 6, 1081 ]
+[ 20, 980 ]
+[ 21, 980 ]
+[ 22, 980 ]
+[ 23, 980 ]
+[ 24, 980 ]
% sys.tables, sys.tables # table_name
% foo, schema_id # name
% int, int # type
% 2, 4 # length
-[ 0, 956 ]
-[ 1, 956 ]
-[ 2, 956 ]
-[ 3, 956 ]
-[ 4, 956 ]
-[ 5, 956 ]
-[ 6, 956 ]
-[ 7, 956 ]
-[ 8, 956 ]
-[ 9, 956 ]
-[ 10, 956 ]
-[ 11, 956 ]
-[ 12, 956 ]
-[ 0, 1057 ]
-[ 1, 1057 ]
-[ 2, 1057 ]
-[ 3, 1057 ]
-[ 4, 1057 ]
-[ 5, 1057 ]
-[ 13, 956 ]
-[ 14, 956 ]
-[ 15, 956 ]
-[ 16, 956 ]
-[ 17, 956 ]
-[ 18, 956 ]
-[ 19, 956 ]
-[ 6, 1057 ]
-[ 20, 956 ]
-[ 21, 956 ]
-[ 22, 956 ]
-[ 23, 956 ]
-[ 24, 956 ]
+[ 0, 980 ]
+[ 1, 980 ]
+[ 2, 980 ]
+[ 3, 980 ]
+[ 4, 980 ]
+[ 5, 980 ]
+[ 6, 980 ]
+[ 7, 980 ]
+[ 8, 980 ]
+[ 9, 980 ]
+[ 10, 980 ]
+[ 11, 980 ]
+[ 12, 980 ]
+[ 0, 1081 ]
+[ 1, 1081 ]
+[ 2, 1081 ]
+[ 3, 1081 ]
+[ 4, 1081 ]
+[ 5, 1081 ]
+[ 13, 980 ]
+[ 14, 980 ]
+[ 15, 980 ]
+[ 16, 980 ]
+[ 17, 980 ]
+[ 18, 980 ]
+[ 19, 980 ]
+[ 6, 1081 ]
+[ 20, 980 ]
+[ 21, 980 ]
+[ 22, 980 ]
+[ 23, 980 ]
+[ 24, 980 ]
% ., sys.tables # table_name
% foo, schema_id # name
% int, int # type
% 2, 4 # length
-[ 0, 956 ]
-[ 1, 956 ]
-[ 2, 956 ]
-[ 3, 956 ]
-[ 4, 956 ]
-[ 5, 956 ]
-[ 6, 956 ]
-[ 7, 956 ]
-[ 8, 956 ]
-[ 9, 956 ]
-[ 10, 956 ]
-[ 11, 956 ]
-[ 12, 956 ]
-[ 13, 956 ]
-[ 14, 956 ]
-[ 15, 956 ]
-[ 16, 956 ]
-[ 17, 956 ]
-[ 18, 956 ]
-[ 19, 956 ]
-[ 20, 956 ]
-[ 21, 956 ]
-[ 22, 956 ]
-[ 23, 956 ]
-[ 24, 956 ]
-[ 25, 1057 ]
-[ 26, 1057 ]
-[ 27, 1057 ]
-[ 28, 1057 ]
-[ 29, 1057 ]
-[ 30, 1057 ]
-[ 31, 1057 ]
+[ 0, 980 ]
+[ 1, 980 ]
+[ 2, 980 ]
+[ 3, 980 ]
+[ 4, 980 ]
+[ 5, 980 ]
+[ 6, 980 ]
+[ 7, 980 ]
+[ 8, 980 ]
+[ 9, 980 ]
+[ 10, 980 ]
+[ 11, 980 ]
+[ 12, 980 ]
+[ 13, 980 ]
+[ 14, 980 ]
+[ 15, 980 ]
+[ 16, 980 ]
+[ 17, 980 ]
+[ 18, 980 ]
+[ 19, 980 ]
+[ 20, 980 ]
+[ 21, 980 ]
+[ 22, 980 ]
+[ 23, 980 ]
+[ 24, 980 ]
+[ 25, 1081 ]
+[ 26, 1081 ]
+[ 27, 1081 ]
+[ 28, 1081 ]
+[ 29, 1081 ]
+[ 30, 1081 ]
+[ 31, 1081 ]
% sys. # table_name
% foo # name
% int # type
@@ -205,110 +205,110 @@
% foo, schema_id # name
% int, int # type
% 2, 4 # length
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 13, 1057 ]
-[ 13, 1057 ]
-[ 13, 1057 ]
-[ 13, 1057 ]
-[ 13, 1057 ]
-[ 13, 1057 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 13, 1057 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 13, 1081 ]
+[ 13, 1081 ]
+[ 13, 1081 ]
+[ 13, 1081 ]
+[ 13, 1081 ]
+[ 13, 1081 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 13, 1081 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
% sys.tables, sys.tables # table_name
% foo, schema_id # name
% int, int # type
% 2, 4 # length
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 13, 1057 ]
-[ 13, 1057 ]
-[ 13, 1057 ]
-[ 13, 1057 ]
-[ 13, 1057 ]
-[ 13, 1057 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 13, 1057 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 13, 1081 ]
+[ 13, 1081 ]
+[ 13, 1081 ]
+[ 13, 1081 ]
+[ 13, 1081 ]
+[ 13, 1081 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 13, 1081 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
% ., sys.tables # table_name
% foo, schema_id # name
% int, int # type
% 2, 4 # length
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 0, 956 ]
-[ 16, 1057 ]
-[ 16, 1057 ]
-[ 16, 1057 ]
-[ 16, 1057 ]
-[ 16, 1057 ]
-[ 16, 1057 ]
-[ 16, 1057 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 0, 980 ]
+[ 16, 1081 ]
+[ 16, 1081 ]
+[ 16, 1081 ]
+[ 16, 1081 ]
+[ 16, 1081 ]
+[ 16, 1081 ]
+[ 16, 1081 ]
# 22:17:03 >
# 22:17:03 > Done.
Index: string.stable.err
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/Tests/string.stable.err,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- string.stable.err 18 Dec 2007 10:49:14 -0000 1.2
+++ string.stable.err 21 Dec 2007 17:02:27 -0000 1.3
@@ -12,15 +12,6 @@
# 12:30:46 > mclient -lsql -umonetdb -Pmonetdb --host=amelia --port=31025
# 12:30:46 >
-MAPI = [EMAIL PROTECTED]:31025
-QUERY = select str,str2,soundex(str),soundex(str2),
editdistance2(soundex(str),soundex(str2)),
editdistance(soundex(str),soundex(str2)), difference(str,str2) from test;
-ERROR = !SELECT: no such unary operator 'soundex(varchar)'
-MAPI = [EMAIL PROTECTED]:31025
-QUERY = select levenshtein(str,str2, 1, 2, 3), str, str2 from test;
-ERROR = !SELECT: no such operator 'levenshtein'
-MAPI = [EMAIL PROTECTED]:31025
-QUERY = select qgramnormalize(str) , qgramnormalize(str2), str, str2 from test;
-ERROR = !SELECT: no such unary operator 'qgramnormalize(varchar)'
# 12:30:46 >
# 12:30:46 > Done.
Index: string.stable.out
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/Tests/string.stable.out,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- string.stable.out 18 Dec 2007 10:49:14 -0000 1.2
+++ string.stable.out 21 Dec 2007 17:02:27 -0000 1.3
@@ -1,19 +1,16 @@
stdout of test 'string` in directory 'src/test` itself:
-# 12:30:46 >
-# 12:30:46 > mserver5
"--config=/ufs/goncalve/scratch/MonetDB/Stable/MonetDB5/etc/monetdb5.conf"
--debug=10 --set
"monet_mod_path=/ufs/goncalve/scratch/MonetDB/Stable/MonetDB5/lib/MonetDB5:/ufs/goncalve/scratch/MonetDB/Stable/MonetDB5/lib/MonetDB5/lib:/ufs/goncalve/scratch/MonetDB/Stable/MonetDB5/lib/MonetDB5/bin"
--set
"gdk_dbfarm=/ufs/goncalve/scratch/MonetDB/Stable/MonetDB5/var/MonetDB5/dbfarm"
--set
"sql_logdir=/ufs/goncalve/scratch/MonetDB/Stable/MonetDB5/var/MonetDB5/sql_logs"
--set mapi_open=true --set xrpc_open=true --set mapi_port=31025 --set
xrpc_port=49090 --set monet_prompt= --trace "--dbname=mTests_src_test" --set
mal_listing=0 "--dbinit= include sql;" ; echo ; echo Over..
-# 12:30:46 >
+# 16:38:09 >
+# 16:38:09 > Mserver
"--config=/ufs/niels/scratch/monetdb/Linux-x86_64/etc/MonetDB.conf" --debug=10
--set
"monet_mod_path=/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB4:/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB4/lib:/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB4/bin"
--set "gdk_dbfarm=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB4/dbfarm"
--set
"sql_logdir=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB4/sql_logs"
--set
"xquery_logdir=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB4/xquery_logs"
--set mapi_open=true --set xrpc_open=true --set mapi_port=39708 --set
xrpc_port=42376 --set monet_prompt= --trace "--dbname=mTests_src_test"
"--dbinit= module(sql_server);" ; echo ; echo Over..
+# 16:38:09 >
-!WARNING: GDKlockHome: ignoring empty or invalid .gdk_lock.
-!WARNING: BBPdir: initializing BBP.
-# MonetDB server v5.2.3, based on kernel v1.20.1
-# Serving database 'mTests_src_test'
-# Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs dynamically linked
-# Copyright (c) 1993-2007 CWI, all rights reserved
-# Visit http://monetdb.cwi.nl/ for further information
-# Listening for connection requests on mapi:monetdb://amelia.ins.cwi.nl:31025/
-# MonetDB/SQL module v2.20.3 loaded
+# MonetDB Server v4.21.0
+# based on GDK v1.21.0
+# Copyright (c) 1993-2007, CWI. All rights reserved.
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs; dynamically
linked.
+# Visit http://monetdb.cwi.nl/ for further information.
+# MonetDB/SQL module v2.21.0 loaded
Ready.
#function user.main():void;
@@ -230,8 +227,35 @@
[ 52, "test" ]
[ 52, "" ]
[ 52, " Test " ]
+% sys.test, sys.test, sys., sys., sys., sys., sys. #
table_name
+% str, str2, soundex_str, soundex_str2, editdistance2_soundex_str,
editdistance_soundex_str, difference_str # name
+% varchar, varchar, varchar, varchar, int, int,
int # type
+% 6, 4, 4, 4, 1, 1, 1 # length
+[ "", "test", "", "T230", 4, 4, 4 ]
+[ "test", "", "T230", "", 4, 4, 4 ]
+[ "", "", "", "", 0, 0, 0 ]
+[ " Test ", "", " 323", "", 4, 4, 4 ]
[ 1 ]
+% sys., sys.test, sys.test # table_name
+% levenshtein_str, str, str2 # name
+% int, varchar, varchar # type
+% 2, 13, 13 # length
+[ 4, "", "test" ]
+[ 4, "test", "" ]
+[ 0, "", "" ]
+[ 6, " Test ", "" ]
+[ 12, "monetdbiscool", "coolismonetdb" ]
[ 1 ]
+% sys., sys., sys.test, sys.test # table_name
+% qgramnormalize_str, qgramnormalize_str2, str, str2 # name
+% varchar, varchar, varchar, varchar # type
+% 16, 13, 17, 18 # length
+[ "", "TEST", "", "test" ]
+[ "TEST", "", "test", "" ]
+[ "", "", "", "" ]
+[ "TEST", "", " Test ", "" ]
+[ "MONETDBISCOOL", "COOLISMONETDB", "monetdbiscool",
"coolismonetdb" ]
+[ "MONETDB45IS COOL", "123123 123123", "monetdb45is+ cool", "
123123 123123 " ]
# 12:30:46 >
# 12:30:46 > Done.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
