Changeset: 80f017865b6d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=80f017865b6d
Modified Files:
geom/monetdb5/geom.c
sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.SQL.py
sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.stable.err
sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.stable.out
sql/test/BugTracker-2016/Tests/storagemodel.Bug-3923.stable.out
sql/test/BugTracker-2016/Tests/stream_table_crash.Bug-3952.sql
sql/test/BugTracker-2016/Tests/stream_table_crash.Bug-3952.stable.err
sql/test/BugTracker-2016/Tests/stream_table_crash.Bug-3952.stable.out
sql/test/Users/Tests/copyinto.stable.err
sql/test/Users/Tests/dropManyUsers.Bug-3764.stable.out
sql/test/Users/Tests/grantMonetdb.stable.err
Branch: leftmart
Log Message:
merge with default
diffs (216 lines):
diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c
--- a/geom/monetdb5/geom.c
+++ b/geom/monetdb5/geom.c
@@ -2858,13 +2858,14 @@ wkbGetCoordinate(dbl *out, wkb **geom, i
}
gcs = GEOSGeom_getCoordSeq(geosGeometry);
+
+ if (gcs == NULL) {
+ GEOSGeom_destroy(geosGeometry);
+ throw(MAL, "geom.wkbGetCoordinate", "GEOSGeom_getCoordSeq
failed");
+ }
+
+ GEOSCoordSeq_getOrdinate(gcs, 0, *dimNum, out);
GEOSGeom_destroy(geosGeometry);
-
- if (gcs == NULL) {
- throw(MAL, "geom.wkbGetCoordinate", "GEOSGeom_getCoordSeq
failed");
- }
-
- GEOSCoordSeq_getOrdinate(gcs, 0, *dimNum, out);
/* gcs shouldn't be freed, it's internal to the GEOSGeom */
return MAL_SUCCEED;
diff --git a/sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.SQL.py
b/sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.SQL.py
--- a/sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.SQL.py
+++ b/sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.SQL.py
@@ -88,9 +88,16 @@ try:
c.execute(rtable)
c.execute(atable)
- c.execute("select * from " + shardtable + workers[0]['tpf'] )
- print str(c.fetchall())
+ try:
+ c.execute("select * from " + shardtable + workers[0]['tpf'] )
+ except monetdb.sql.OperationalError as e:
+ print(e)
+ else:
+ print(str(c.fetchall()))
finally:
+ masterproc.communicate()
+ for worker in workers:
+ workerrec['proc'].communicate()
if os.path.exists(tmpdir):
shutil.rmtree(tmpdir)
diff --git a/sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.stable.err
b/sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.stable.err
--- a/sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.stable.err
+++ b/sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.stable.err
@@ -66,21 +66,8 @@ stderr of test 'schemadiff.Bug-3778` in
# cmdline opt mapi_port = 48845
# cmdline opt gdk_dbpath = /tmp/tmpou_du0/worker_0/worker_0
# cmdline opt gdk_debug = 536870922
-Traceback (most recent call last):
- File "schemadiff.Bug-3778.SQL.py", line 85, in <module>
- c.execute("select * from " + shardtable + workers[0]['tpf'] )
- File
"/home/niels/scratch/monetdb/Linux-x86_64/lib/python2.7/site-packages/monetdb/sql/cursors.py",
line 158, in execute
- block = self.connection.execute(query)
- File
"/home/niels/scratch/monetdb/Linux-x86_64/lib/python2.7/site-packages/monetdb/sql/connections.py",
line 127, in execute
- return self.command('s' + query + '\n;')
- File
"/home/niels/scratch/monetdb/Linux-x86_64/lib/python2.7/site-packages/monetdb/sql/connections.py",
line 132, in command
- return self.mapi.cmd(command)
- File
"/home/niels/scratch/monetdb/Linux-x86_64/lib/python2.7/site-packages/monetdb/mapi.py",
line 178, in cmd
- raise OperationalError(response[1:])
-monetdb.exceptions.OperationalError:
(mapi:monetdb://monetdb@localhost/worker_0) 'user.l1' undefined in:
rmt5_X_1_bat_oid_int:bat[:oid,:int] := user.l1();
-!failed to open file: No such file or directory
(/tmp/tmpou_du0/worker_0/worker_0/.uplog)!failed to open file: No such file or
directory (/tmp/tmpou_du0/master/master/.uplog)
-# 12:53:25 >
-# 12:53:25 > "Done."
-# 12:53:25 >
+# 11:56:09 >
+# 11:56:09 > "Done."
+# 11:56:09 >
diff --git a/sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.stable.out
b/sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.stable.out
--- a/sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.stable.out
+++ b/sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.stable.out
@@ -27,6 +27,7 @@ Ready.
# 15:29:05 > "/usr/bin/python2" "schemadiff.Bug-3778.SQL.py"
"schemadiff.Bug-3778"
# 15:29:05 >
+(mapi:monetdb://monetdb@localhost/worker_0) 'user.l1' undefined in:
rmt5_X_1_bat_int:bat[:int] := user.l1();
# 15:29:06 >
# 15:29:06 > "Done."
diff --git
a/sql/test/BugTracker-2016/Tests/stream_table_crash.Bug-3952.stable.err
b/sql/test/BugTracker-2016/Tests/stream_table_crash.Bug-3952.stable.err
--- a/sql/test/BugTracker-2016/Tests/stream_table_crash.Bug-3952.stable.err
+++ b/sql/test/BugTracker-2016/Tests/stream_table_crash.Bug-3952.stable.err
@@ -1,11 +1,11 @@
stderr of test 'stream_table_crash.Bug-3952` in directory
'sql/test/BugTracker-2016` itself:
-# 11:43:56 >
-# 11:43:56 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=34393" "--set"
"mapi_usock=/var/tmp/mtest-8448/.s.monetdb.34393" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2016"
"--set" "embedded_r=yes"
-# 11:43:56 >
+# 22:03:48 >
+# 22:03:48 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=34898" "--set"
"mapi_usock=/var/tmp/mtest-8540/.s.monetdb.34898" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2016"
"--set" "embedded_r=yes"
+# 22:03:48 >
-# builtin opt gdk_dbpath =
/home/niels/scratch/monetdb/Linux-x86_64/var/monetdb5/dbfarm/demo
+# builtin opt gdk_dbpath =
/home/niels/scratch/rc-clean/Linux-x86_64/var/monetdb5/dbfarm/demo
# builtin opt gdk_debug = 0
# builtin opt gdk_vmtrim = no
# builtin opt monet_prompt = >
@@ -17,22 +17,22 @@ stderr of test 'stream_table_crash.Bug-3
# builtin opt sql_debug = 0
# cmdline opt gdk_nr_threads = 0
# cmdline opt mapi_open = true
-# cmdline opt mapi_port = 34393
-# cmdline opt mapi_usock = /var/tmp/mtest-8448/.s.monetdb.34393
+# cmdline opt mapi_port = 34898
+# cmdline opt mapi_usock = /var/tmp/mtest-8540/.s.monetdb.34898
# cmdline opt monet_prompt =
-# cmdline opt gdk_dbpath =
/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2016
+# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2016
# cmdline opt embedded_r = yes
# cmdline opt gdk_debug = 536870922
-# 11:43:57 >
-# 11:43:57 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-8448" "--port=34393"
-# 11:43:57 >
+# 22:03:49 >
+# 22:03:49 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-8540" "--port=34898"
+# 22:03:49 >
-MAPI = (monetdb) /var/tmp/mtest-8448/.s.monetdb.34393
+MAPI = (monetdb) /var/tmp/mtest-8540/.s.monetdb.34898
QUERY = insert into temp values(timestamp '2016-03-13 08:58:14', 1, 23.4);
ERROR = !INSERT INTO: cannot insert into stream 'temp'
-# 11:43:57 >
-# 11:43:57 > "Done."
-# 11:43:57 >
+# 22:03:49 >
+# 22:03:49 > "Done."
+# 22:03:49 >
diff --git
a/sql/test/BugTracker-2016/Tests/stream_table_crash.Bug-3952.stable.out
b/sql/test/BugTracker-2016/Tests/stream_table_crash.Bug-3952.stable.out
--- a/sql/test/BugTracker-2016/Tests/stream_table_crash.Bug-3952.stable.out
+++ b/sql/test/BugTracker-2016/Tests/stream_table_crash.Bug-3952.stable.out
@@ -1,11 +1,11 @@
stdout of test 'stream_table_crash.Bug-3952` in directory
'sql/test/BugTracker-2016` itself:
-# 11:43:56 >
-# 11:43:56 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=34393" "--set"
"mapi_usock=/var/tmp/mtest-8448/.s.monetdb.34393" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2016"
"--set" "embedded_r=yes"
-# 11:43:56 >
+# 22:03:48 >
+# 22:03:48 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=34898" "--set"
"mapi_usock=/var/tmp/mtest-8540/.s.monetdb.34898" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2016"
"--set" "embedded_r=yes"
+# 22:03:48 >
-# MonetDB 5 server v11.24.0
+# MonetDB 5 server v11.23.0
# This is an unreleased version
# Serving database 'mTests_sql_test_BugTracker-2016', using 4 threads
# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit
integers dynamically linked
@@ -13,21 +13,21 @@ stdout of test 'stream_table_crash.Bug-3
# Copyright (c) 1993-July 2008 CWI.
# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
# Visit http://www.monetdb.org/ for further information
-# Listening for connection requests on mapi:monetdb://localhost.nes.nl:34393/
-# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-8448/.s.monetdb.34393
+# Listening for connection requests on mapi:monetdb://localhost.nes.nl:34898/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-8540/.s.monetdb.34898
# MonetDB/GIS module loaded
# MonetDB/SQL module loaded
# MonetDB/R module loaded
Ready.
-# 11:43:57 >
-# 11:43:57 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-8448" "--port=34393"
-# 11:43:57 >
+# 22:03:49 >
+# 22:03:49 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-8540" "--port=34898"
+# 22:03:49 >
#create stream table temp(t timestamp, room integer, payload decimal(8,2));
-# 11:43:57 >
-# 11:43:57 > "Done."
-# 11:43:57 >
+# 22:03:49 >
+# 22:03:49 > "Done."
+# 22:03:49 >
diff --git a/sql/test/Users/Tests/copyinto.stable.err
b/sql/test/Users/Tests/copyinto.stable.err
--- a/sql/test/Users/Tests/copyinto.stable.err
+++ b/sql/test/Users/Tests/copyinto.stable.err
@@ -30,8 +30,8 @@ stderr of test 'copyinto` in directory '
# 19:39:23 > "/usr/bin/python2" "copyinto.SQL.py" "copyinto"
# 19:39:23 >
-MAPI = (copyuser) /var/tmp/mtest-31068/.s.monetdb.38178
-QUERY = COPY 5 RECORDS INTO region from
'/home/niels/data/MonetDB/sql/benchmarks/tpch/SF-0.01//region.tbl' USING
DELIMITERS '|', '|
+MAPI = (copyuser) /var/tmp/mtest-8540/.s.monetdb.34898
+QUERY = COPY 5 RECORDS INTO region from
'/home/niels/data/rc/clean/sql/benchmarks/tpch/SF-0.01//region.tbl' USING
DELIMITERS '|', '|
';select count(*) from region;
ERROR = !COPY INTO: insufficient privileges: COPY INTO from file(s) requires
database administrator rights, use 'COPY INTO "region" FROM STDIN' instead
diff --git a/sql/test/Users/Tests/grantMonetdb.stable.err
b/sql/test/Users/Tests/grantMonetdb.stable.err
--- a/sql/test/Users/Tests/grantMonetdb.stable.err
+++ b/sql/test/Users/Tests/grantMonetdb.stable.err
@@ -30,10 +30,10 @@ stderr of test 'grantMonetdb` in directo
# 10:44:51 > "/usr/bin/python2" "grantMonetdb.SQL.py" "grantMonetdb"
# 10:44:51 >
-MAPI = (alice) /var/tmp/mtest-8728/.s.monetdb.34092
+MAPI = (alice) /var/tmp/mtest-8540/.s.monetdb.34898
QUERY = CREATE USER may WITH PASSWORD 'may' NAME 'May' SCHEMA library;
ERROR = !CREATE USER: access denied for user 'alice'
-MAPI = (alice) /var/tmp/mtest-8728/.s.monetdb.34092
+MAPI = (alice) /var/tmp/mtest-8540/.s.monetdb.34898
QUERY = GRANT sysadmin TO april;
ERROR = !GRANT: insufficient privileges to grant ROLE 'sysadmin'
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
