Update of /cvsroot/monetdb/sql/src/benchmarks/tpch/Tests
In directory
sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv24576/src/benchmarks/tpch/Tests
Modified Files:
01-22.SQL.bat 01-22.SQL.sh load.SQL.py
Log Message:
propagated changes of Thursday Oct 25 2007 - Monday Oct 29 2007
from the SQL_2-20 branch to the development trunk
Index: 01-22.SQL.sh
===================================================================
RCS file: /cvsroot/monetdb/sql/src/benchmarks/tpch/Tests/01-22.SQL.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- 01-22.SQL.sh 29 Aug 2007 20:16:42 -0000 1.1
+++ 01-22.SQL.sh 29 Oct 2007 20:11:40 -0000 1.2
@@ -1,24 +1,24 @@
#!/bin/sh
-Mlog -x $SQL_CLIENT < $RELSRCDIR/../01.sql
-Mlog -x $SQL_CLIENT < $RELSRCDIR/../02.sql
-Mlog -x $SQL_CLIENT < $RELSRCDIR/../03.sql
-Mlog -x $SQL_CLIENT < $RELSRCDIR/../04.sql
-Mlog -x $SQL_CLIENT < $RELSRCDIR/../05.sql
-Mlog -x $SQL_CLIENT < $RELSRCDIR/../06.sql
-Mlog -x $SQL_CLIENT < $RELSRCDIR/../07.sql
-Mlog -x $SQL_CLIENT < $RELSRCDIR/../08.sql
-Mlog -x $SQL_CLIENT < $RELSRCDIR/../09.sql
-Mlog -x $SQL_CLIENT < $RELSRCDIR/../10.sql
-Mlog -x $SQL_CLIENT < $RELSRCDIR/../11.sql
-Mlog -x $SQL_CLIENT < $RELSRCDIR/../12.sql
-Mlog -x $SQL_CLIENT < $RELSRCDIR/../13.sql
-Mlog -x $SQL_CLIENT < $RELSRCDIR/../14.sql
-Mlog -x $SQL_CLIENT < $RELSRCDIR/../15.sql
-Mlog -x $SQL_CLIENT < $RELSRCDIR/../16.sql
-Mlog -x $SQL_CLIENT < $RELSRCDIR/../17.sql
-Mlog -x $SQL_CLIENT < $RELSRCDIR/../18.sql
-Mlog -x $SQL_CLIENT < $RELSRCDIR/../19.sql
-Mlog -x $SQL_CLIENT < $RELSRCDIR/../20.sql
-Mlog -x $SQL_CLIENT < $RELSRCDIR/../21.sql
-Mlog -x $SQL_CLIENT < $RELSRCDIR/../22.sql
+Mlog -x "$SQL_CLIENT < $RELSRCDIR/../01.sql"
+Mlog -x "$SQL_CLIENT < $RELSRCDIR/../02.sql"
+Mlog -x "$SQL_CLIENT < $RELSRCDIR/../03.sql"
+Mlog -x "$SQL_CLIENT < $RELSRCDIR/../04.sql"
+Mlog -x "$SQL_CLIENT < $RELSRCDIR/../05.sql"
+Mlog -x "$SQL_CLIENT < $RELSRCDIR/../06.sql"
+Mlog -x "$SQL_CLIENT < $RELSRCDIR/../07.sql"
+Mlog -x "$SQL_CLIENT < $RELSRCDIR/../08.sql"
+Mlog -x "$SQL_CLIENT < $RELSRCDIR/../09.sql"
+Mlog -x "$SQL_CLIENT < $RELSRCDIR/../10.sql"
+Mlog -x "$SQL_CLIENT < $RELSRCDIR/../11.sql"
+Mlog -x "$SQL_CLIENT < $RELSRCDIR/../12.sql"
+Mlog -x "$SQL_CLIENT < $RELSRCDIR/../13.sql"
+Mlog -x "$SQL_CLIENT < $RELSRCDIR/../14.sql"
+Mlog -x "$SQL_CLIENT < $RELSRCDIR/../15.sql"
+Mlog -x "$SQL_CLIENT < $RELSRCDIR/../16.sql"
+Mlog -x "$SQL_CLIENT < $RELSRCDIR/../17.sql"
+Mlog -x "$SQL_CLIENT < $RELSRCDIR/../18.sql"
+Mlog -x "$SQL_CLIENT < $RELSRCDIR/../19.sql"
+Mlog -x "$SQL_CLIENT < $RELSRCDIR/../20.sql"
+Mlog -x "$SQL_CLIENT < $RELSRCDIR/../21.sql"
+Mlog -x "$SQL_CLIENT < $RELSRCDIR/../22.sql"
Index: 01-22.SQL.bat
===================================================================
RCS file: /cvsroot/monetdb/sql/src/benchmarks/tpch/Tests/01-22.SQL.bat,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- 01-22.SQL.bat 15 Oct 2007 15:29:50 -0000 1.2
+++ 01-22.SQL.bat 29 Oct 2007 20:11:39 -0000 1.3
@@ -1,24 +1,25 @@
[EMAIL PROTECTED] off
[EMAIL PROTECTED] # $t $g
[EMAIL PROTECTED] on
-call Mlog.bat -x %SQL_CLIENT% < %RELSRCDIR%\..\01.sql
-call Mlog.bat -x %SQL_CLIENT% < %RELSRCDIR%\..\02.sql
-call Mlog.bat -x %SQL_CLIENT% < %RELSRCDIR%\..\03.sql
-call Mlog.bat -x %SQL_CLIENT% < %RELSRCDIR%\..\04.sql
-call Mlog.bat -x %SQL_CLIENT% < %RELSRCDIR%\..\05.sql
-call Mlog.bat -x %SQL_CLIENT% < %RELSRCDIR%\..\06.sql
-call Mlog.bat -x %SQL_CLIENT% < %RELSRCDIR%\..\07.sql
-call Mlog.bat -x %SQL_CLIENT% < %RELSRCDIR%\..\08.sql
-call Mlog.bat -x %SQL_CLIENT% < %RELSRCDIR%\..\09.sql
-call Mlog.bat -x %SQL_CLIENT% < %RELSRCDIR%\..\10.sql
-call Mlog.bat -x %SQL_CLIENT% < %RELSRCDIR%\..\11.sql
-call Mlog.bat -x %SQL_CLIENT% < %RELSRCDIR%\..\12.sql
-call Mlog.bat -x %SQL_CLIENT% < %RELSRCDIR%\..\13.sql
-call Mlog.bat -x %SQL_CLIENT% < %RELSRCDIR%\..\14.sql
-call Mlog.bat -x %SQL_CLIENT% < %RELSRCDIR%\..\15.sql
-call Mlog.bat -x %SQL_CLIENT% < %RELSRCDIR%\..\16.sql
-call Mlog.bat -x %SQL_CLIENT% < %RELSRCDIR%\..\17.sql
-call Mlog.bat -x %SQL_CLIENT% < %RELSRCDIR%\..\18.sql
-call Mlog.bat -x %SQL_CLIENT% < %RELSRCDIR%\..\19.sql
-call Mlog.bat -x %SQL_CLIENT% < %RELSRCDIR%\..\20.sql
-call Mlog.bat -x %SQL_CLIENT% < %RELSRCDIR%\..\21.sql
-call Mlog.bat -x %SQL_CLIENT% < %RELSRCDIR%\..\22.sql
+%SQL_CLIENT% < "%RELSRCDIR%\..\01.sql"
+%SQL_CLIENT% < "%RELSRCDIR%\..\02.sql"
+%SQL_CLIENT% < "%RELSRCDIR%\..\03.sql"
+%SQL_CLIENT% < "%RELSRCDIR%\..\04.sql"
+%SQL_CLIENT% < "%RELSRCDIR%\..\05.sql"
+%SQL_CLIENT% < "%RELSRCDIR%\..\06.sql"
+%SQL_CLIENT% < "%RELSRCDIR%\..\07.sql"
+%SQL_CLIENT% < "%RELSRCDIR%\..\08.sql"
+%SQL_CLIENT% < "%RELSRCDIR%\..\09.sql"
+%SQL_CLIENT% < "%RELSRCDIR%\..\10.sql"
+%SQL_CLIENT% < "%RELSRCDIR%\..\11.sql"
+%SQL_CLIENT% < "%RELSRCDIR%\..\12.sql"
+%SQL_CLIENT% < "%RELSRCDIR%\..\13.sql"
+%SQL_CLIENT% < "%RELSRCDIR%\..\14.sql"
+%SQL_CLIENT% < "%RELSRCDIR%\..\15.sql"
+%SQL_CLIENT% < "%RELSRCDIR%\..\16.sql"
+%SQL_CLIENT% < "%RELSRCDIR%\..\17.sql"
+%SQL_CLIENT% < "%RELSRCDIR%\..\18.sql"
+%SQL_CLIENT% < "%RELSRCDIR%\..\19.sql"
+%SQL_CLIENT% < "%RELSRCDIR%\..\20.sql"
+%SQL_CLIENT% < "%RELSRCDIR%\..\21.sql"
+%SQL_CLIENT% < "%RELSRCDIR%\..\22.sql"
Index: load.SQL.py
===================================================================
RCS file: /cvsroot/monetdb/sql/src/benchmarks/tpch/Tests/load.SQL.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- load.SQL.py 15 Oct 2007 15:29:50 -0000 1.11
+++ load.SQL.py 29 Oct 2007 20:11:41 -0000 1.12
@@ -22,8 +22,9 @@
CALL = SQL_CLIENT+" < load.sql"
-if os.name == "nt":
- os.system("call Mlog.bat %s" % CALL)
-else:
- os.system("Mlog '%s'" % CALL)
+import sys, time
+Mlog = "\n%s %s\n\n" % (time.strftime('# %H:%M:%S
>',time.localtime(time.time())), CALL)
+sys.stdout.write(Mlog)
+sys.stderr.write(Mlog)
+
os.system(CALL)
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
