Changeset: c39a4bdf7a5b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c39a4bdf7a5b
Modified Files:
geom/sql/Tests/geom_polygon.stable.err.Debian4.0
geom/sql/Tests/geom_polygon.stable.err.Fedora10
sql/test/BugTracker-2010/Tests/connectto.Bug-2548.stable.err.Windows
sql/test/BugTracker-2010/Tests/incomplete-utf8-sequence.Bug-2575.stable.err.Windows
Branch: sciql
Log Message:
merged with default
diffs (truncated from 1666 to 300 lines):
diff --git a/gdk/gdk_batop.mx b/gdk/gdk_batop.mx
--- a/gdk/gdk_batop.mx
+++ b/gdk/gdk_batop.mx
@@ -1045,6 +1045,10 @@
Examine type, and values for lower- and higher-bound.
@c
batcnt = BATcount(b);
+ /* preliminarily determine result types */
+ ht = BAThtype(b);
+ tt = tail ? BATttype(b) : TYPE_void;
+
t = b->ttype;
nil = ATOMnilptr(t);
lnil = ATOMcmp(t, tl, nil) == 0;
@@ -1056,14 +1060,12 @@
th = tl;
hval = 1; /* equi-select */
} else {
- hval = ATOMcmp(t, th, nil);
+ hval = ATOMcmp(t, th, nil) != 0;
}
- if (equi && nequi) {
- equi = 0;
- li = !li;
- hi = !hi;
- } else if (nequi) { /* swap sub-ranges */
- if (!lval || !hval) {
+ if (nequi) {
+ if (!lval != !hval) {
+ /* one of the end points is nil and the other
+ * isn't: swap sub-ranges */
ptr tv;
bit ti;
ti = li;
@@ -1073,13 +1075,25 @@
tl = th;
th = tv;
nequi = 0;
- }
+ equi = 0;
+ } else if (!lval && !hval) {
+ /* antiselect for nil-nil range: all non-nil
+ * values are in range, so we need to return
+ * all but, but we also don't want to return
+ * nils, so instead we return nothing. */
+ return BATnew(ht, tt, 10);
+ } else if (equi && lnil) {
+ /* antiselect for nil value: turn into range
+ * select for nil-nil range (i.e. everything
+ * but nil) */
+ equi = 0;
+ nequi = 0;
+ lval = 0;
+ hval = 0;
+ } else
+ equi = 0;
}
- /* preliminarily determine result types */
- ht = BAThtype(b);
- tt = tail ? BATttype(b) : TYPE_void;
-
if (hval && ((ATOMcmp(t, tl, th) > 0) || (equi && !(li && hi)))) {
/* empty range */
ALGODEBUG THRprintf(GDKout, "#BAT_select_(b=%s): empty
range;\n", BATgetId(b));
diff --git a/geom/sql/Tests/geom_polygon.stable.err.Debian4.0
b/geom/sql/Tests/geom_polygon.stable.err.Debian4.0
deleted file mode 100644
--- a/geom/sql/Tests/geom_polygon.stable.err.Debian4.0
+++ /dev/null
@@ -1,118 +0,0 @@
-stderr of test 'geom_polygon` in directory 'sql` itself:
-
-
-# 21:15:16 >
-# 21:15:16 > Mtimeout -timeout 180 Mserver
"--config=/ufs/niels/scratch/monetdb/Linux-x86_64/etc/MonetDB.conf" --debug=10
--set
"monet_mod_path=/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB4:/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB4/lib:/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB4/bin"
--set "gdk_dbfarm=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB4/dbfarm"
--set
"sql_logdir=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB4/sql_logs"
--set
"xquery_logdir=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB4/xquery_logs"
--set mapi_port=36438 --set xrpc_port=48112 --set monet_prompt= --trace
"--dbname=mTests_src_sql" --dbinit="module(geom);module(sql_server);
module(sql_server);" ; echo ; echo Over..
-# 21:15:16 >
-
-# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
-# builtin opt gdk_version = 1.25.0
-# builtin opt monet_pid = 4460
-# builtin opt prefix = /home/sjoerd/Monet
-# builtin opt exec_prefix = ${prefix}
-# builtin opt gdk_dbname = tst
-# builtin opt gdk_dbfarm = ${prefix}/var/MonetDB
-# builtin opt gdk_debug = 8
-# builtin opt gdk_mem_bigsize = 262144
-# builtin opt gdk_alloc_map = yes
-# builtin opt gdk_mem_pagebits = 14
-# builtin opt gdk_vmtrim = yes
-# builtin opt monet_admin = adm
-# builtin opt monet_prompt = >
-# builtin opt monet_welcome = yes
-# builtin opt monet_mod_path = ${prefix}/lib64/MonetDB:${prefix}/lib64/bin
-# builtin opt monet_daemon = yes
-# builtin opt host = localhost
-# builtin opt mapi_port = 50000
-# builtin opt mapi_noheaders = no
-# builtin opt mapi_debug = 0
-# builtin opt mapi_clients = 2
-# builtin opt sql_debug = 0
-# builtin opt sql_logdir = ${prefix}/var/MonetDB
-# builtin opt xquery_logdir = ${prefix}/var/MonetDB
-# builtin opt standoff_ns = http://monetdb.cwi.nl/standoff
-# builtin opt standoff_start = start
-# builtin opt standoff_end = end
-# config opt prefix = /home/sjoerd/Monet
-# config opt config = ${prefix}/etc/monetdb5.conf
-# config opt prefix = /home/sjoerd/Monet
-# config opt exec_prefix = ${prefix}
-# config opt gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm
-# config opt gdk_dbname = demo
-# config opt gdk_alloc_map = no
-# config opt gdk_embedded = no
-# config opt gdk_debug = 0
-# config opt monet_mod_path =
${prefix}/lib64/MonetDB5:${prefix}/lib64/MonetDB5/lib:${prefix}/lib64/MonetDB5/bin
-# config opt monet_daemon = no
-# config opt monet_welcome = yes
-# config opt mero_msglog = ${prefix}/var/log/merovingian.log
-# config opt mero_errlog = ${prefix}/var/log/merovingian.log
-# config opt mero_timeinterval = 600
-# config opt mero_pidfile = ${prefix}/var/run/merovingian.pid
-# config opt mero_exittimeout = 7
-# config opt mero_doproxy = yes
-# config opt mero_discoveryttl = 600
-# config opt mal_init = ${prefix}/lib64/MonetDB5/mal_init.mal
-# config opt mal_listing = 58
-# config opt checkpoint_dir = ${prefix}/var/MonetDB5/chkpnt
-# config opt mapi_port = 50000
-# config opt mapi_open = false
-# config opt sql_debug = 0
-# config opt sql_logdir = ${prefix}/var/MonetDB5/sql_logs
-# config opt sql_init = ${prefix}/lib64/MonetDB5/sql_init.sql
-# cmdline opt config = /home/sjoerd/Monet/etc/monetdb5.conf
-# cmdline opt gdk_nr_threads = 0
-# cmdline opt monet_mod_path =
/home/sjoerd/src/MonetDB/devel/geom/x86_64-unknown-linux-gnu/src/monetdb5/.libs:/home/sjoerd/src/MonetDB/devel/geom/x86_64-unknown-linux-gnu/src/monetdb5:/home/sjoerd/Monet/lib64/MonetDB5:/home/sjoerd/Monet/lib64/MonetDB5/lib:/home/sjoerd/Monet/lib64/MonetDB5/bin:/home/sjoerd/Monet/lib64/MonetDB5:/home/sjoerd/Monet/lib64/MonetDB5/lib:/home/sjoerd/Monet/lib64/MonetDB5/bin
-# cmdline opt gdk_dbfarm =
/home/sjoerd/src/MonetDB/devel/geom/x86_64-unknown-linux-gnu/dbfarm
-# cmdline opt sql_logdir =
/home/sjoerd/src/MonetDB/devel/geom/x86_64-unknown-linux-gnu/sql_logs
-# cmdline opt xquery_logdir =
/home/sjoerd/src/MonetDB/devel/geom/x86_64-unknown-linux-gnu/xquery_logs
-# cmdline opt mapi_open = true
-# cmdline opt xrpc_open = true
-# cmdline opt mapi_port = 38689
-# cmdline opt xrpc_port = 41370
-# cmdline opt monet_prompt =
-# cmdline opt gdk_dbname = mTests_src_sql
-# cmdline opt mal_listing = 0
-# cmdline opt gdk_debug = 10
-#warning: please don't forget to set your vault key!
-#(see /home/sjoerd/Monet/etc/monetdb5.conf)
-
-# 20:49:35 >
-# 20:49:35 > mclient -lsql -umonetdb -Pmonetdb --host=koolmees --port=38689
-# 20:49:35 >
-
-MAPI = monetdb@ottar:32754
-QUERY = INSERT INTO polygons values ('LINESTRING(10 10, 20 20)');
-ERROR = !MALException:wkb.FromText:Geometry type 'Polygon' not found
-MAPI = monetdb@ottar:32754
-QUERY = INSERT INTO polygons values ('LINESTRING(10 10, 20 20, 30 40)');
-ERROR = !MALException:wkb.FromText:Geometry type 'Polygon' not found
-MAPI = monetdb@ottar:32754
-QUERY = INSERT INTO polygons values ('POLYGON((10 10, 10 20, 20 20, 20 15))');
-ERROR = !MALException:wkb.FromText:IllegalArgumentException: points must form
a closed linestring
-MAPI = monetdb@ottar:32754
-QUERY = INSERT INTO polygons values ('POINT(10 10)');
-ERROR = !MALException:wkb.FromText:Geometry type 'Polygon' not found
-MAPI = monetdb@ottar:32754
-QUERY = INSERT INTO polygons values ('POLYGON((10 10))');
-ERROR = !MALException:wkb.FromText:IllegalArgumentException: point array must
contain 0 or >1 elements
-MAPI = monetdb@ottar:32754
-QUERY = INSERT INTO polygons values ('POLYGON((10))');
-ERROR = !MALException:wkb.FromText:ParseException: Expected number but
encountered ')'
-MAPI = monetdb@ottar:32754
-QUERY = INSERT INTO polygons values ('POLYGON(())');
-ERROR = !MALException:wkb.FromText:ParseException: Expected number but
encountered ')'
-MAPI = monetdb@ottar:32754
-QUERY = INSERT INTO polygons values ('POLYGON()');
-ERROR = !MALException:wkb.FromText:ParseException: Expected 'EMPTY' or '(' but
encountered : ')'
-MAPI = monetdb@ottar:32754
-QUERY = INSERT INTO polygons values ('POLYGON');
-ERROR = !MALException:wkb.FromText:ParseException: Expected word but
encountered end of stream
-MAPI = monetdb@ottar:32754
-QUERY = INSERT INTO polygons values ('');
-ERROR = !MALException:wkb.FromText:ParseException: Expected word but
encountered end of stream
-
-# 21:15:16 >
-# 21:15:16 > Done.
-# 21:15:16 >
-
diff --git a/geom/sql/Tests/geom_polygon.stable.err.Fedora10
b/geom/sql/Tests/geom_polygon.stable.err.Fedora10
deleted file mode 100644
--- a/geom/sql/Tests/geom_polygon.stable.err.Fedora10
+++ /dev/null
@@ -1,118 +0,0 @@
-stderr of test 'geom_polygon` in directory 'sql` itself:
-
-
-# 21:15:16 >
-# 21:15:16 > Mtimeout -timeout 180 Mserver
"--config=/ufs/niels/scratch/monetdb/Linux-x86_64/etc/MonetDB.conf" --debug=10
--set
"monet_mod_path=/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB4:/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB4/lib:/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB4/bin"
--set "gdk_dbfarm=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB4/dbfarm"
--set
"sql_logdir=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB4/sql_logs"
--set
"xquery_logdir=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB4/xquery_logs"
--set mapi_port=36438 --set xrpc_port=48112 --set monet_prompt= --trace
"--dbname=mTests_src_sql" --dbinit="module(geom);module(sql_server);
module(sql_server);" ; echo ; echo Over..
-# 21:15:16 >
-
-# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
-# builtin opt gdk_version = 1.25.0
-# builtin opt monet_pid = 4460
-# builtin opt prefix = /home/sjoerd/Monet
-# builtin opt exec_prefix = ${prefix}
-# builtin opt gdk_dbname = tst
-# builtin opt gdk_dbfarm = ${prefix}/var/MonetDB
-# builtin opt gdk_debug = 8
-# builtin opt gdk_mem_bigsize = 262144
-# builtin opt gdk_alloc_map = yes
-# builtin opt gdk_mem_pagebits = 14
-# builtin opt gdk_vmtrim = yes
-# builtin opt monet_admin = adm
-# builtin opt monet_prompt = >
-# builtin opt monet_welcome = yes
-# builtin opt monet_mod_path = ${prefix}/lib64/MonetDB:${prefix}/lib64/bin
-# builtin opt monet_daemon = yes
-# builtin opt host = localhost
-# builtin opt mapi_port = 50000
-# builtin opt mapi_noheaders = no
-# builtin opt mapi_debug = 0
-# builtin opt mapi_clients = 2
-# builtin opt sql_debug = 0
-# builtin opt sql_logdir = ${prefix}/var/MonetDB
-# builtin opt xquery_logdir = ${prefix}/var/MonetDB
-# builtin opt standoff_ns = http://monetdb.cwi.nl/standoff
-# builtin opt standoff_start = start
-# builtin opt standoff_end = end
-# config opt prefix = /home/sjoerd/Monet
-# config opt config = ${prefix}/etc/monetdb5.conf
-# config opt prefix = /home/sjoerd/Monet
-# config opt exec_prefix = ${prefix}
-# config opt gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm
-# config opt gdk_dbname = demo
-# config opt gdk_alloc_map = no
-# config opt gdk_embedded = no
-# config opt gdk_debug = 0
-# config opt monet_mod_path =
${prefix}/lib64/MonetDB5:${prefix}/lib64/MonetDB5/lib:${prefix}/lib64/MonetDB5/bin
-# config opt monet_daemon = no
-# config opt monet_welcome = yes
-# config opt mero_msglog = ${prefix}/var/log/merovingian.log
-# config opt mero_errlog = ${prefix}/var/log/merovingian.log
-# config opt mero_timeinterval = 600
-# config opt mero_pidfile = ${prefix}/var/run/merovingian.pid
-# config opt mero_exittimeout = 7
-# config opt mero_doproxy = yes
-# config opt mero_discoveryttl = 600
-# config opt mal_init = ${prefix}/lib64/MonetDB5/mal_init.mal
-# config opt mal_listing = 58
-# config opt checkpoint_dir = ${prefix}/var/MonetDB5/chkpnt
-# config opt mapi_port = 50000
-# config opt mapi_open = false
-# config opt sql_debug = 0
-# config opt sql_logdir = ${prefix}/var/MonetDB5/sql_logs
-# config opt sql_init = ${prefix}/lib64/MonetDB5/sql_init.sql
-# cmdline opt config = /home/sjoerd/Monet/etc/monetdb5.conf
-# cmdline opt gdk_nr_threads = 0
-# cmdline opt monet_mod_path =
/home/sjoerd/src/MonetDB/devel/geom/x86_64-unknown-linux-gnu/src/monetdb5/.libs:/home/sjoerd/src/MonetDB/devel/geom/x86_64-unknown-linux-gnu/src/monetdb5:/home/sjoerd/Monet/lib64/MonetDB5:/home/sjoerd/Monet/lib64/MonetDB5/lib:/home/sjoerd/Monet/lib64/MonetDB5/bin:/home/sjoerd/Monet/lib64/MonetDB5:/home/sjoerd/Monet/lib64/MonetDB5/lib:/home/sjoerd/Monet/lib64/MonetDB5/bin
-# cmdline opt gdk_dbfarm =
/home/sjoerd/src/MonetDB/devel/geom/x86_64-unknown-linux-gnu/dbfarm
-# cmdline opt sql_logdir =
/home/sjoerd/src/MonetDB/devel/geom/x86_64-unknown-linux-gnu/sql_logs
-# cmdline opt xquery_logdir =
/home/sjoerd/src/MonetDB/devel/geom/x86_64-unknown-linux-gnu/xquery_logs
-# cmdline opt mapi_open = true
-# cmdline opt xrpc_open = true
-# cmdline opt mapi_port = 38689
-# cmdline opt xrpc_port = 41370
-# cmdline opt monet_prompt =
-# cmdline opt gdk_dbname = mTests_src_sql
-# cmdline opt mal_listing = 0
-# cmdline opt gdk_debug = 10
-#warning: please don't forget to set your vault key!
-#(see /home/sjoerd/Monet/etc/monetdb5.conf)
-
-# 20:49:35 >
-# 20:49:35 > mclient -lsql -umonetdb -Pmonetdb --host=koolmees --port=38689
-# 20:49:35 >
-
-MAPI = monetdb@ottar:32754
-QUERY = INSERT INTO polygons values ('LINESTRING(10 10, 20 20)');
-ERROR = !MALException:wkb.FromText:Geometry type 'Polygon' not found
-MAPI = monetdb@ottar:32754
-QUERY = INSERT INTO polygons values ('LINESTRING(10 10, 20 20, 30 40)');
-ERROR = !MALException:wkb.FromText:Geometry type 'Polygon' not found
-MAPI = monetdb@ottar:32754
-QUERY = INSERT INTO polygons values ('POLYGON((10 10, 10 20, 20 20, 20 15))');
-ERROR = !MALException:wkb.FromText:IllegalArgumentException: points must form
a closed linestring
-MAPI = monetdb@ottar:32754
-QUERY = INSERT INTO polygons values ('POINT(10 10)');
-ERROR = !MALException:wkb.FromText:Geometry type 'Polygon' not found
-MAPI = monetdb@ottar:32754
-QUERY = INSERT INTO polygons values ('POLYGON((10 10))');
-ERROR = !MALException:wkb.FromText:IllegalArgumentException: point array must
contain 0 or >1 elements
-MAPI = monetdb@ottar:32754
-QUERY = INSERT INTO polygons values ('POLYGON((10))');
-ERROR = !MALException:wkb.FromText:ParseException: Expected number but
encountered ')'
-MAPI = monetdb@ottar:32754
-QUERY = INSERT INTO polygons values ('POLYGON(())');
-ERROR = !MALException:wkb.FromText:ParseException: Expected number but
encountered ')'
-MAPI = monetdb@ottar:32754
-QUERY = INSERT INTO polygons values ('POLYGON()');
-ERROR = !MALException:wkb.FromText:ParseException: Expected 'EMPTY' or '(' but
encountered : ')'
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
