Changeset: 1dd89e5ef039 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1dd89e5ef039
Modified Files:
Branch: default
Log Message:
Merge with Oct2010 branch.
diffs (truncated from 357 to 300 lines):
diff -r 7cfb21f75108 -r 1dd89e5ef039
sql/src/test/BugTracker-2009/Tests/create_on_ro_db_crash.SF-2830238.py
--- a/sql/src/test/BugTracker-2009/Tests/create_on_ro_db_crash.SF-2830238.py
Tue Oct 26 15:32:23 2010 +0200
+++ b/sql/src/test/BugTracker-2009/Tests/create_on_ro_db_crash.SF-2830238.py
Tue Oct 26 17:36:04 2010 +0200
@@ -2,28 +2,6 @@
import os
from MonetDBtesting import process
-def server():
- s = process.server('sql', args = ["--set", "gdk_readonly=yes"],
- stdin = process.PIPE,
- stdout = process.PIPE,
- stderr = process.PIPE)
- s.stdin.write('\nio.printf("\\nReady.\\n");\n')
- s.stdin.flush()
- while True:
- ln = s.stdout.readline()
- if not ln:
- print 'Unexpected EOF from server'
- sys.exit(1)
- sys.stdout.write(ln)
- if 'Ready' in ln:
- break
- return s
-
-def server_stop(s):
- out, err = s.communicate()
- sys.stdout.write(out)
- sys.stderr.write(err)
-
def client(input):
c = process.client('sql',
stdin = process.PIPE,
@@ -38,9 +16,14 @@
'''
def main():
- s = server()
+ s = process.server('sql', args = ["--set", "gdk_readonly=yes"],
+ stdin = process.PIPE,
+ stdout = process.PIPE,
+ stderr = process.PIPE)
client(script1)
- server_stop(s)
+ out, err = s.communicate()
+ sys.stdout.write(out)
+ sys.stderr.write(err)
if __name__ == '__main__':
main()
diff -r 7cfb21f75108 -r 1dd89e5ef039
sql/src/test/BugTracker-2009/Tests/create_on_ro_db_crash.SF-2830238.stable.out
---
a/sql/src/test/BugTracker-2009/Tests/create_on_ro_db_crash.SF-2830238.stable.out
Tue Oct 26 15:32:23 2010 +0200
+++
b/sql/src/test/BugTracker-2009/Tests/create_on_ro_db_crash.SF-2830238.stable.out
Tue Oct 26 17:36:04 2010 +0200
@@ -14,7 +14,6 @@
# Listening for connection requests on mapi:monetdb://alf.ins.cwi.nl:39382/
# MonetDB/SQL module v2.32.0 loaded
-Ready.
# 21:37:20 >
# 21:37:20 > Done.
diff -r 7cfb21f75108 -r 1dd89e5ef039
sql/src/test/BugTracker-2009/Tests/lost_update.SF-2790020.py
--- a/sql/src/test/BugTracker-2009/Tests/lost_update.SF-2790020.py Tue Oct
26 15:32:23 2010 +0200
+++ b/sql/src/test/BugTracker-2009/Tests/lost_update.SF-2790020.py Tue Oct
26 17:36:04 2010 +0200
@@ -4,21 +4,10 @@
from MonetDBtesting import process
def server():
- s = process.server('sql',
- stdin = process.PIPE,
- stdout = process.PIPE,
- stderr = process.PIPE)
- s.stdin.write('\nio.printf("\\nReady.\\n");\n')
- s.stdin.flush()
- while True:
- ln = s.stdout.readline()
- if not ln:
- print 'Unexpected EOF from server'
- sys.exit(1)
- sys.stdout.write(ln)
- if 'Ready' in ln:
- break
- return s
+ return process.server('sql',
+ stdin = process.PIPE,
+ stdout = process.PIPE,
+ stderr = process.PIPE)
def server_stop(s):
out, err = s.communicate()
diff -r 7cfb21f75108 -r 1dd89e5ef039
sql/src/test/BugTracker-2009/Tests/lost_update.SF-2790020.stable.out
--- a/sql/src/test/BugTracker-2009/Tests/lost_update.SF-2790020.stable.out
Tue Oct 26 15:32:23 2010 +0200
+++ b/sql/src/test/BugTracker-2009/Tests/lost_update.SF-2790020.stable.out
Tue Oct 26 17:36:04 2010 +0200
@@ -14,7 +14,6 @@
# Listening for connection requests on mapi:monetdb://ottar.ins.cwi.nl:35847/
# MonetDB/SQL module v2.30.0 loaded
-Ready.
[ 1 ]
[ 1 ]
# MonetDB server v5.12.0, based on kernel v1.30.0
@@ -26,7 +25,6 @@
# Listening for connection requests on mapi:monetdb://ottar.ins.cwi.nl:35847/
# MonetDB/SQL module v2.30.0 loaded
-Ready.
[ 1 ]
[ 1 ]
[ 1 ]
@@ -50,7 +48,6 @@
# Listening for connection requests on mapi:monetdb://ottar.ins.cwi.nl:35847/
# MonetDB/SQL module v2.30.0 loaded
-Ready.
% sys.lost_update_t2 # table_name
% a # name
% int # type
@@ -65,7 +62,6 @@
# Listening for connection requests on mapi:monetdb://ottar.ins.cwi.nl:35847/
# MonetDB/SQL module v2.30.0 loaded
-Ready.
# 14:43:33 >
# 14:43:33 > Done.
diff -r 7cfb21f75108 -r 1dd89e5ef039
sql/src/test/BugTracker-2010/Tests/Mbedded-crash.Bug-2701
--- a/sql/src/test/BugTracker-2010/Tests/Mbedded-crash.Bug-2701 Tue Oct 26
15:32:23 2010 +0200
+++ b/sql/src/test/BugTracker-2010/Tests/Mbedded-crash.Bug-2701 Tue Oct 26
17:36:04 2010 +0200
@@ -1,1 +1,1 @@
-echo 'select name from tables where system = false;' | Mbeddedsql5
+echo 'select name from tables where system = false;' | Mbeddedsql5
--dbfarm="$GDK_DBFARM" --dbname="$TSTDB"
diff -r 7cfb21f75108 -r 1dd89e5ef039
sql/src/test/BugTracker-2010/Tests/Mbedded-crash.Bug-2701.bat
--- a/sql/src/test/BugTracker-2010/Tests/Mbedded-crash.Bug-2701.bat Tue Oct
26 15:32:23 2010 +0200
+++ b/sql/src/test/BugTracker-2010/Tests/Mbedded-crash.Bug-2701.bat Tue Oct
26 17:36:04 2010 +0200
@@ -1,1 +1,1 @@
-...@echo select name from tables where system = false; | Mbeddedsql5
+...@echo select name from tables where system = false; | Mbeddedsql5
"--dbfarm=%GDK_DBFARM%" "--dbname=%TSTDB%"
diff -r 7cfb21f75108 -r 1dd89e5ef039 sql/src/test/VOC/Tests/VOC.SQL.py
--- a/sql/src/test/VOC/Tests/VOC.SQL.py Tue Oct 26 15:32:23 2010 +0200
+++ b/sql/src/test/VOC/Tests/VOC.SQL.py Tue Oct 26 17:36:04 2010 +0200
@@ -4,14 +4,13 @@
d = os.environ['RELSRCDIR']
def client(file, user, passwd):
+ sys.stdout.flush()
+ sys.stderr.flush()
c = process.client(lang = 'sql',
user = user, passwd = passwd,
args = [os.path.join(d, os.pardir, file)],
- stdout = process.PIPE, stderr = process.PIPE,
log = True)
- out, err = c.communicate()
- sys.stdout.write(out)
- sys.stdout.write(err)
+ c.communicate()
client('VOCcreate_user.sql', 'monetdb', 'monetdb')
client('VOCschema.sql', 'voc', 'voc')
@@ -20,6 +19,3 @@
client('VOCmanual_examples.sql', 'voc', 'voc')
client('VOCdrop.sql', 'voc', 'voc')
client('VOCdrop_user.sql', 'monetdb', 'monetdb')
-
-sys.stdout.flush()
-sys.stderr.flush()
diff -r 7cfb21f75108 -r 1dd89e5ef039
sql/src/test/mserver5-sql-readonly/Tests/mserver5-sql-readonly-table.py
--- a/sql/src/test/mserver5-sql-readonly/Tests/mserver5-sql-readonly-table.py
Tue Oct 26 15:32:23 2010 +0200
+++ b/sql/src/test/mserver5-sql-readonly/Tests/mserver5-sql-readonly-table.py
Tue Oct 26 17:36:04 2010 +0200
@@ -2,40 +2,6 @@
import os
from MonetDBtesting import process
-def server_readonly():
- s = process.server('sql', args = ["--readonly"],
- stdin = process.PIPE,
- stdout = process.PIPE,
- stderr = process.PIPE)
- s.stdin.write('\nio.printf("\\nReady.\\n");\n')
- s.stdin.flush()
- while True:
- ln = s.stdout.readline()
- if not ln:
- print 'Unexpected EOF from server'
- sys.exit(1)
- sys.stdout.write(ln)
- if 'Ready' in ln:
- break
- return s
-
-def server():
- s = process.server('sql', args = [],
- stdin = process.PIPE,
- stdout = process.PIPE,
- stderr = process.PIPE)
- s.stdin.write('\nio.printf("\\nReady.\\n");\n')
- s.stdin.flush()
- while True:
- ln = s.stdout.readline()
- if not ln:
- print 'Unexpected EOF from server'
- sys.exit(1)
- sys.stdout.write(ln)
- if 'Ready' in ln:
- break
- return s
-
def server_stop(s):
out, err = s.communicate()
sys.stdout.write(out)
@@ -106,14 +72,20 @@
'''
def main():
- s = server()
+ s = process.server('sql', args = [],
+ stdin = process.PIPE,
+ stdout = process.PIPE,
+ stderr = process.PIPE)
client(script1)
client(script3)
client(script4)
client(script2)
client(script5)
server_stop(s)
- s = server_readonly()
+ s = process.server('sql', args = ["--readonly"],
+ stdin = process.PIPE,
+ stdout = process.PIPE,
+ stderr = process.PIPE)
client(script8)
client(script4)
client(script2)
diff -r 7cfb21f75108 -r 1dd89e5ef039
sql/src/test/mserver5-sql-readonly/Tests/mserver5-sql-readonly-table.stable.out
---
a/sql/src/test/mserver5-sql-readonly/Tests/mserver5-sql-readonly-table.stable.out
Tue Oct 26 15:32:23 2010 +0200
+++
b/sql/src/test/mserver5-sql-readonly/Tests/mserver5-sql-readonly-table.stable.out
Tue Oct 26 17:36:04 2010 +0200
@@ -17,7 +17,6 @@
# Listening for connection requests on mapi:monetdb://yngling.ins.cwi.nl:36267/
# MonetDB/SQL module v2.39.0 loaded
-Ready.
[ 1 ]
#select * from t1;
% sys.t1 # table_name
@@ -38,7 +37,6 @@
# Listening for connection requests on mapi:monetdb://yngling.ins.cwi.nl:36267/
# MonetDB/SQL module v2.39.0 loaded
-Ready.
#select * from t1;
% sys.t1 # table_name
% a # name
diff -r 7cfb21f75108 -r 1dd89e5ef039
sql/src/test/mserver5-sql-readonly/Tests/mserver5-sql-readonly-view.py
--- a/sql/src/test/mserver5-sql-readonly/Tests/mserver5-sql-readonly-view.py
Tue Oct 26 15:32:23 2010 +0200
+++ b/sql/src/test/mserver5-sql-readonly/Tests/mserver5-sql-readonly-view.py
Tue Oct 26 17:36:04 2010 +0200
@@ -1,41 +1,6 @@
import sys
-import os
from MonetDBtesting import process
-def server_readonly():
- s = process.server('sql', args = ["--readonly"],
- stdin = process.PIPE,
- stdout = process.PIPE,
- stderr = process.PIPE)
- s.stdin.write('\nio.printf("\\nReady.\\n");\n')
- s.stdin.flush()
- while True:
- ln = s.stdout.readline()
- if not ln:
- print 'Unexpected EOF from server'
- sys.exit(1)
- sys.stdout.write(ln)
- if 'Ready' in ln:
- break
- return s
-
-def server():
- s = process.server('sql', args = [],
- stdin = process.PIPE,
- stdout = process.PIPE,
- stderr = process.PIPE)
- s.stdin.write('\nio.printf("\\nReady.\\n");\n')
- s.stdin.flush()
- while True:
- ln = s.stdout.readline()
- if not ln:
- print 'Unexpected EOF from server'
- sys.exit(1)
- sys.stdout.write(ln)
- if 'Ready' in ln:
- break
- return s
-
def server_stop(s):
out, err = s.communicate()
sys.stdout.write(out)
@@ -99,7 +64,10 @@
'''
def main():
- s = server()
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
