Changeset: 7984253ba304 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7984253ba304
Modified Files:
sql/src/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.out
Branch: default
Log Message:
Merge with Oct2010 branch.
diffs (134 lines):
diff -r c41336fb65d7 -r 7984253ba304 MonetDB/src/gdk/gdk_utils.mx
--- a/MonetDB/src/gdk/gdk_utils.mx Fri Oct 01 13:09:02 2010 +0200
+++ b/MonetDB/src/gdk/gdk_utils.mx Fri Oct 01 14:54:38 2010 +0200
@@ -1667,6 +1667,7 @@
GDKnr_threads = GDKgetenv_int("gdk_nr_threads", 0);
if (GDKnr_threads == 0)
GDKnr_threads = MT_check_nr_cores();
+ GDK_testing = GDKgetenv_istrue("gdk_testing");
#ifdef NATIVE_WIN32
if (GDKnr_threads)
GDK_mmap_minsize /= GDKnr_threads;
@@ -1692,10 +1693,16 @@
@h
gdk_export int GDKstopped;
gdk_export int GDKnr_threads;
+gdk_export int GDK_testing; /* used to switch on/off code for testing purposes
*/
@c
int GDKstopped = 1;
int GDKnr_threads = 0;
+/* GDK_testing is used to switch code on/off that is meant to be used
+ during testing only (an example is splitting small tables in the
+ mitosis optimizer to test mitosis/mergetable). The value is set on
+ the command line using --set gdk_testing=true by Mtest.py. */
+int GDK_testing = 0;
@h
gdk_export void GDKexit(int status);
diff -r c41336fb65d7 -r 7984253ba304
MonetDB4/tests/BugTracker/Tests/project_on_BAT_with_batFirst.SF-2020806.stable.out
---
a/MonetDB4/tests/BugTracker/Tests/project_on_BAT_with_batFirst.SF-2020806.stable.out
Fri Oct 01 13:09:02 2010 +0200
+++
b/MonetDB4/tests/BugTracker/Tests/project_on_BAT_with_batFirst.SF-2020806.stable.out
Fri Oct 01 14:54:38 2010 +0200
@@ -41,6 +41,7 @@
[ "gdk_mem_maxsize ", 1 ]
[ "gdk_mem_pagebits", 1 ]
[ "gdk_nr_threads", 1 ]
+[ "gdk_testing", 1 ]
[ "gdk_version", 1 ]
[ "gdk_vmtrim", 1 ]
[ "host", 1 ]
diff -r c41336fb65d7 -r 7984253ba304 MonetDB5/src/optimizer/opt_mergetable.mx
--- a/MonetDB5/src/optimizer/opt_mergetable.mx Fri Oct 01 13:09:02 2010 +0200
+++ b/MonetDB5/src/optimizer/opt_mergetable.mx Fri Oct 01 14:54:38 2010 +0200
@@ -2292,7 +2292,7 @@
continue;
}
@-
-The mark operators are a special case of apply on parts as we need too
+The mark operators are a special case of apply on parts as we need to
correct the mark base oid's
@c
if (match == 1 &&
diff -r c41336fb65d7 -r 7984253ba304 MonetDB5/src/optimizer/opt_mitosis.mx
--- a/MonetDB5/src/optimizer/opt_mitosis.mx Fri Oct 01 13:09:02 2010 +0200
+++ b/MonetDB5/src/optimizer/opt_mitosis.mx Fri Oct 01 14:54:38 2010 +0200
@@ -136,7 +136,7 @@
would fit into memory conveniently for processing. We attempt to use
at least all threads.
Experience shows that the pieces should not be too small.
-To keep the threads working, we create more pieces then threads.
+To keep the threads working, we create more pieces than threads.
The pieces to be used may be overruled by the octopus optimizer.
@c
@@ -146,8 +146,8 @@
r= (BUN) (monet_memory /typewidth/GDKnr_threads); /* how much
fits */
if (rowcnt > r )
pieces = (int) (rowcnt /r+1);
- if (pieces < GDKnr_threads )
- pieces = GDKnr_threads;
+ if (GDK_testing && pieces < GDKnr_threads )
+ pieces = GDKnr_threads; /* split up anyway when
testing */
if (pieces > MAXSLICES)
pieces = MAXSLICES; /* cut off potential plan explosion
*/
diff -r c41336fb65d7 -r 7984253ba304
sql/src/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.err
---
a/sql/src/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.err
Fri Oct 01 13:09:02 2010 +0200
+++
b/sql/src/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.err
Fri Oct 01 14:54:38 2010 +0200
@@ -68,9 +68,10 @@
# 22:29:10 > mclient -lsql -i -umonetdb -Pmonetdb --host=pegasus --port=30332
# 22:29:10 >
-MAPI = mone...@alf:32679
+MAPI = mone...@ottar:39527
QUERY = select * from env() as env where name = ( select 'prefix' from env()
as env );
-ERROR = !SQLException:zero_or_one:cardinality violation (51>1)
+ERROR = !SQLException:zero_or_one:cardinality violation (52>1)
+
# 13:22:15 >
# 13:22:15 > Done.
diff -r c41336fb65d7 -r 7984253ba304
sql/src/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.out
---
a/sql/src/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.out
Fri Oct 01 13:09:02 2010 +0200
+++
b/sql/src/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.out
Fri Oct 01 14:54:38 2010 +0200
@@ -54,6 +54,7 @@
[ "standoff_end" ]
[ "config" ]
[ "gdk_nr_threads" ]
+[ "gdk_testing" ]
[ "xrpc_open" ]
[ "xrpc_port" ]
[ "mal_listing" ]
diff -r c41336fb65d7 -r 7984253ba304
sql/src/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
--- a/sql/src/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
Fri Oct 01 13:09:02 2010 +0200
+++ b/sql/src/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
Fri Oct 01 14:54:38 2010 +0200
@@ -80,10 +80,10 @@
# 21:00:43 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=38808
# 21:00:43 >
-MAPI = mone...@alf:32679
+MAPI = mone...@ottar:39527
QUERY = select * from env() as env where name = ( select 'prefix' from env()
as env );
-ERROR = !SQLException:zero_or_one:cardinality violation (51>1)
-MAPI = mone...@alf:32679
+ERROR = !SQLException:zero_or_one:cardinality violation (52>1)
+MAPI = mone...@ottar:39527
QUERY = select * from columns where name = (select columns.name from _tables,
columns where _tables.id = columns.table_id);
ERROR = !SQLException:zero_or_one:cardinality violation (288>1)
diff -r c41336fb65d7 -r 7984253ba304 testing/src/Mtest.py.in
--- a/testing/src/Mtest.py.in Fri Oct 01 13:09:02 2010 +0200
+++ b/testing/src/Mtest.py.in Fri Oct 01 14:54:38 2010 +0200
@@ -3481,10 +3481,10 @@
exe = {}
exe['Mtimeout'] = CheckExec('Mtimeout') , 'Mtimeout -timeout
%d ' % par['TIMEOUT']
if par['M5']:
- exe['Mserver'] = CheckExec('mserver5') , '%s mserver5
"--config=%s" --debug=%s --set gdk_nr_threads=%s %s %s %s --set mapi_open=true
--set xrpc_open=true --set mapi_port=%s --set xrpc_port=%s --set monet_prompt=
--set mal_listing=2 --trace %s' % \
+ exe['Mserver'] = CheckExec('mserver5') , '%s mserver5
"--config=%s" --debug=%s --set gdk_nr_threads=%s --set gdk_testing=true %s %s
%s --set mapi_open=true --set xrpc_open=true --set mapi_port=%s --set
xrpc_port=%s --set monet_prompt= --set mal_listing=2 --trace %s' % \
(env['setDBG'],
config, env['GDK_DEBUG'], env['GDK_NR_THREADS'], env['setMONETDB_MOD_PATH'],
env['setGDK_DBFARM'], env['setXRPC_DOCROOT'], env['MAPIPORT'], env['XRPCPORT'],
env['MSERVER_SET'])
if par['M4']:
- exe['Mserver'] = CheckExec('Mserver') , '%s Mserver
"--config=%s" --debug=%s --set gdk_nr_threads=%s %s %s %s --set mapi_open=true
--set xrpc_open=true --set mapi_port=%s --set xrpc_port=%s --set monet_prompt=
--trace %s' % \
+ exe['Mserver'] = CheckExec('Mserver') , '%s Mserver
"--config=%s" --debug=%s --set gdk_nr_threads=%s --set gdk_testing=true %s %s
%s --set mapi_open=true --set xrpc_open=true --set mapi_port=%s --set
xrpc_port=%s --set monet_prompt= --trace %s' % \
(env['setDBG'],
config, env['GDK_DEBUG'], env['GDK_NR_THREADS'], env['setMONETDB_MOD_PATH'],
env['setGDK_DBFARM'], env['setXRPC_DOCROOT'], env['MAPIPORT'], env['XRPCPORT'],
env['MSERVER_SET'])
exe['Mdiff'] = CheckExec('Mdiff') , 'Mdiff'
exe['python'] = CheckExec(sys.executable) , sys.executable
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
