Changeset: 7c4d2d4b948d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7c4d2d4b948d
Modified Files:
Branch: default
Log Message:
Merge with Aug2011 branch.
diffs (truncated from 355 to 300 lines):
diff --git a/geom/monetdb5/geom.mx b/geom/monetdb5/geom.mx
--- a/geom/monetdb5/geom.mx
+++ b/geom/monetdb5/geom.mx
@@ -256,7 +256,7 @@ end @2;
@:ctypes(MultiSurface,multisurface,6)@
@:ctypes(MultiPoly,multipolygon,6)@
@:ctypes(Geom,geometry,7)@
-@:ctypes(GeomCollection,geometrycollection,7)@
+@:ctypes(GeomCollection,geomcollection,7)@
module geom;
command calc.isnil(v:wkb):bit
diff --git a/sql/test/BugTracker-2009/Tests/create_on_ro_db_crash.SF-2830238.py
b/sql/test/BugTracker-2009/Tests/create_on_ro_db_crash.SF-2830238.py
--- a/sql/test/BugTracker-2009/Tests/create_on_ro_db_crash.SF-2830238.py
+++ b/sql/test/BugTracker-2009/Tests/create_on_ro_db_crash.SF-2830238.py
@@ -19,7 +19,7 @@ create table t2 (a int);
'''
def main():
- s = process.server('sql', args = ["--set", "gdk_readonly=yes"],
+ s = process.server(args = ["--set", "gdk_readonly=yes"],
stdin = process.PIPE,
stdout = process.PIPE,
stderr = process.PIPE)
diff --git a/sql/test/BugTracker-2009/Tests/lost_update.SF-2790020.py
b/sql/test/BugTracker-2009/Tests/lost_update.SF-2790020.py
--- a/sql/test/BugTracker-2009/Tests/lost_update.SF-2790020.py
+++ b/sql/test/BugTracker-2009/Tests/lost_update.SF-2790020.py
@@ -7,8 +7,7 @@ except ImportError:
import process
def server():
- return process.server('sql',
- stdin = process.PIPE,
+ return process.server(stdin = process.PIPE,
stdout = process.PIPE,
stderr = process.PIPE)
diff --git a/sql/test/BugTracker-2010/Tests/new-readonly-db.Bug-2695.py
b/sql/test/BugTracker-2010/Tests/new-readonly-db.Bug-2695.py
--- a/sql/test/BugTracker-2010/Tests/new-readonly-db.Bug-2695.py
+++ b/sql/test/BugTracker-2010/Tests/new-readonly-db.Bug-2695.py
@@ -4,6 +4,6 @@ except ImportError:
import process
import os
-s = process.server(lang = 'sql', args = ['--readonly'],
+s = process.server(args = ['--readonly'],
dbname = '%s-2695' % os.getenv('TSTDB'))
s.wait()
diff --git a/sql/test/BugTracker-2011/Tests/All
b/sql/test/BugTracker-2011/Tests/All
--- a/sql/test/BugTracker-2011/Tests/All
+++ b/sql/test/BugTracker-2011/Tests/All
@@ -34,3 +34,4 @@ case-when-alias.Bug-2848
multicolumn_constraints.Bug-2849
CASE_nested_functions.Bug-2852
FK_self_reference.Bug-2862
+time_precision.Bug-2873
diff --git a/sql/test/BugTracker-2011/Tests/time_precision.Bug-2873.sql
b/sql/test/BugTracker-2011/Tests/time_precision.Bug-2873.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2011/Tests/time_precision.Bug-2873.sql
@@ -0,0 +1,9 @@
+create table t (tm time);
+insert into t values ('20:04:04.847');
+select tm from t;
+select tm + interval '0' second from t;
+select tm + interval '0.333' second(5) from t;
+select time '20:04:04.847' - time '20:04:04.947';
+select time(5) '20:04:04.947' - time(5) '20:04:04.847';
+drop table t;
+
diff --git a/sql/test/BugTracker-2011/Tests/time_precision.Bug-2873.stable.err
b/sql/test/BugTracker-2011/Tests/time_precision.Bug-2873.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2011/Tests/time_precision.Bug-2873.stable.err
@@ -0,0 +1,39 @@
+stderr of test 'time_precision.Bug-2873` in directory 'test/BugTracker-2011`
itself:
+
+
+# 23:49:03 >
+# 23:49:03 > mserver5 --debug=10 --set gdk_nr_threads=0 --set
"gdk_dbfarm=/export/scratch0/zhang/monet-install/Apr2011/debug/var/MonetDB"
--set mapi_open=true --set mapi_port=36158 --set monet_prompt= --trace
--forcemito --set mal_listing=2 "--dbname=mTests_test_BugTracker-2011" --set
mal_listing=0 ; echo ; echo Over..
+# 23:49:03 >
+
+# builtin opt gdk_dbname = demo
+# builtin opt gdk_dbfarm =
/export/scratch0/zhang/monet-install/Apr2011/debug/var/monetdb5/dbfarm
+# builtin opt gdk_debug = 0
+# builtin opt gdk_alloc_map = no
+# builtin opt gdk_vmtrim = yes
+# builtin opt monet_prompt = >
+# builtin opt monet_daemon = no
+# builtin opt mapi_port = 50000
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt default_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# builtin opt minimal_pipe = inline,remap,deadcode,multiplex,garbageCollector
+# builtin opt sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt gdk_dbfarm =
/export/scratch0/zhang/monet-install/Apr2011/debug/var/MonetDB
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 36158
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbname = mTests_test_BugTracker-2011
+# cmdline opt mal_listing = 0
+
+# 23:49:03 >
+# 23:49:03 > mclient -lsql -ftest -i -e --host=jarl --port=36158
+# 23:49:03 >
+
+
+# 23:49:03 >
+# 23:49:03 > Done.
+# 23:49:03 >
+
diff --git a/sql/test/BugTracker-2011/Tests/time_precision.Bug-2873.stable.out
b/sql/test/BugTracker-2011/Tests/time_precision.Bug-2873.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2011/Tests/time_precision.Bug-2873.stable.out
@@ -0,0 +1,67 @@
+stdout of test 'time_precision.Bug-2873` in directory 'test/BugTracker-2011`
itself:
+
+
+# 23:49:03 >
+# 23:49:03 > mserver5 --debug=10 --set gdk_nr_threads=0 --set
"gdk_dbfarm=/export/scratch0/zhang/monet-install/Apr2011/debug/var/MonetDB"
--set mapi_open=true --set mapi_port=36158 --set monet_prompt= --trace
--forcemito --set mal_listing=2 "--dbname=mTests_test_BugTracker-2011" --set
mal_listing=0 ; echo ; echo Over..
+# 23:49:03 >
+
+# MonetDB 5 server v11.3.8
+# This is an unreleased version
+# Serving database 'mTests_test_BugTracker-2011', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 7.749 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2011 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://jarl.ins.cwi.nl:36158/
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+# SQL catalog created, loading sql scripts once
+
+Over..
+
+# 23:49:03 >
+# 23:49:03 > mclient -lsql -ftest -i -e --host=jarl --port=36158
+# 23:49:03 >
+
+#create table t (tm time);
+#insert into t values ('20:04:04.847');
+[ 1 ]
+#select tm from t;
+% sys.t # table_name
+% tm # name
+% time # type
+% 8 # length
+[ 20:04:04 ]
+#select tm + interval '0' second from t;
+% sys. # table_name
+% sql_add_tm # name
+% time # type
+% 15 # length
+[ 20:04:04.000000 ]
+#select tm + interval '0.333' second(5) from t;
+% sys. # table_name
+% sql_add_tm # name
+% time # type
+% 15 # length
+[ 20:04:04.333000 ]
+#select time '20:04:04.847' - time '20:04:04.947';
+% . # table_name
+% sql_sub_single_value # name
+% time # type
+% 15 # length
+[ 00:00:00.000000 ]
+#select time(5) '20:04:04.947' - time(5) '20:04:04.847';
+% . # table_name
+% sql_sub_single_value # name
+% time # type
+% 15 # length
+[ 00:00:00.100000 ]
+#drop table t;
+
+# 23:49:03 >
+# 23:49:03 > Done.
+# 23:49:03 >
+
diff --git a/sql/test/BugTracker/Tests/connect_crash.SF-1436626.py
b/sql/test/BugTracker/Tests/connect_crash.SF-1436626.py
--- a/sql/test/BugTracker/Tests/connect_crash.SF-1436626.py
+++ b/sql/test/BugTracker/Tests/connect_crash.SF-1436626.py
@@ -4,7 +4,7 @@ try:
except ImportError:
import process
-srv = process.server('sql', stdin = process.PIPE, stdout = process.PIPE,
stderr = process.PIPE)
+srv = process.server(stdin = process.PIPE, stdout = process.PIPE, stderr =
process.PIPE)
clt = process.client('sql', stdin = process.PIPE, stdout = process.PIPE,
stderr = process.PIPE)
out, err = clt.communicate('select 1;\n')
diff --git
a/sql/test/BugTracker/Tests/mdb_starts_with_sql_debug_64.SF-1999354.py
b/sql/test/BugTracker/Tests/mdb_starts_with_sql_debug_64.SF-1999354.py
--- a/sql/test/BugTracker/Tests/mdb_starts_with_sql_debug_64.SF-1999354.py
+++ b/sql/test/BugTracker/Tests/mdb_starts_with_sql_debug_64.SF-1999354.py
@@ -7,7 +7,7 @@ except ImportError:
def server_start(args):
sys.stderr.write('#mserver: "%s"\n' % ' '.join(args))
sys.stderr.flush()
- srv = process.server('sql', args = args, stdin = process.PIPE,
+ srv = process.server(args = args, stdin = process.PIPE,
stdout = process.PIPE, stderr = process.PIPE)
return srv
diff --git a/sql/test/BugTracker/Tests/set_a_new_user_password.SF-1844050.py
b/sql/test/BugTracker/Tests/set_a_new_user_password.SF-1844050.py
--- a/sql/test/BugTracker/Tests/set_a_new_user_password.SF-1844050.py
+++ b/sql/test/BugTracker/Tests/set_a_new_user_password.SF-1844050.py
@@ -4,10 +4,10 @@ try:
except ImportError:
import process
-def server_start(lang):
+def server_start():
sys.stderr.write('#mserver\n')
sys.stderr.flush()
- srv = process.server(lang, stdin = process.PIPE,
+ srv = process.server(stdin = process.PIPE,
stdout = process.PIPE, stderr = process.PIPE)
return srv
@@ -20,7 +20,7 @@ def client(lang, file, user = 'monetdb',
return clt.communicate()
def main():
- srv = server_start('sql')
+ srv = server_start()
out, err = client('sql',
os.path.join(os.getenv('RELSRCDIR'),
'set_a_new_user_password.SF-1844050_create_user.sql'))
@@ -30,7 +30,7 @@ def main():
sys.stdout.write(out)
sys.stderr.write(err)
- srv = server_start('sql')
+ srv = server_start()
out, err = client('sql',
os.path.join(os.getenv('RELSRCDIR'),
'set_a_new_user_password.SF-1844050_select.sql'),
@@ -41,7 +41,7 @@ def main():
sys.stdout.write(out)
sys.stderr.write(err)
- srv = server_start('sql')
+ srv = server_start()
out, err = client('sql',
os.path.join(os.getenv('RELSRCDIR'),
'set_a_new_user_password.SF-1844050_drop_user.sql'))
diff --git
a/sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.py
b/sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.py
--- a/sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.py
+++ b/sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.py
@@ -7,7 +7,7 @@ except ImportError:
def server_start(args = []):
sys.stderr.write('#mserver\n')
sys.stderr.flush()
- srv = process.server('sql', args = args, stdin = process.PIPE,
+ srv = process.server(args = args, stdin = process.PIPE,
stdout = process.PIPE, stderr = process.PIPE)
return srv
diff --git a/sql/test/Connections/Tests/connections.py
b/sql/test/Connections/Tests/connections.py
--- a/sql/test/Connections/Tests/connections.py
+++ b/sql/test/Connections/Tests/connections.py
@@ -12,7 +12,7 @@ def remote_server_start(x,s):
sys.stdout.flush()
sys.stderr.flush()
port = os.getenv('MAPIPORT', '50000')
- srv = process.server('sql', mapiport = int(port) + 1,
+ srv = process.server(mapiport = int(port) + 1,
dbname = '%s_test1' % os.getenv('TSTDB'),
stdin = process.PIPE,
stdout = process.PIPE, stderr = process.PIPE)
@@ -25,7 +25,7 @@ def server_start(x,s):
sys.stderr.write('#mserver\n')
sys.stdout.flush()
sys.stderr.flush()
- srv = process.server('sql', stdin = process.PIPE,
+ srv = process.server(stdin = process.PIPE,
stdout = process.PIPE, stderr = process.PIPE)
return srv
diff --git
a/sql/test/mserver5-sql-readonly/Tests/mserver5-sql-readonly-table.py
b/sql/test/mserver5-sql-readonly/Tests/mserver5-sql-readonly-table.py
--- a/sql/test/mserver5-sql-readonly/Tests/mserver5-sql-readonly-table.py
+++ b/sql/test/mserver5-sql-readonly/Tests/mserver5-sql-readonly-table.py
@@ -75,7 +75,7 @@ delete from t1 where a = 1;
'''
def main():
- s = process.server('sql', args = [],
+ s = process.server(args = [],
stdin = process.PIPE,
stdout = process.PIPE,
stderr = process.PIPE)
@@ -85,7 +85,7 @@ def main():
client(script2)
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
