Changeset: b63435222efa for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b63435222efa
Modified Files:
Branch: Aug2011
Log Message:
merging
diffs (174 lines):
diff --git a/geom/monetdb5/geom.mx b/geom/monetdb5/geom.mx
--- a/geom/monetdb5/geom.mx
+++ b/geom/monetdb5/geom.mx
@@ -1072,18 +1072,16 @@ wkbcreatepoint_bat(int *out, int *ix, in
throw(MAL, "geom.point", "bunins failed");
}
-geom_export str mbroverlaps(bit *out, mbr *b1, mbr *b2);
+geom_export str mbroverlaps(bit *out, mbr **b1, mbr **b2);
str
-mbroverlaps(bit *out, mbr *b1, mbr *b2)
+mbroverlaps(bit *out, mbr **b1, mbr **b2)
{
- if (mbr_isnil(b1) || mbr_isnil(b2))
+ if (mbr_isnil(*b1) || mbr_isnil(*b2))
*out = 0;
else
- *out = ((b1->ymax >= b2->ymax && b1->xmin <= b2->ymax) ||
- (b2->ymax >= b1->ymax && b2->xmin <= b1->ymax)) &&
- ((b1->xmax >= b2->xmax && b1->ymin <= b2->xmax) ||
- (b2->xmax >= b1->xmax && b2->ymin <= b1->xmax));
+ *out = !(((*b2)->ymax < (*b1)->ymin) || ((*b2)->ymin >
(*b1)->ymax) ||
+ ((*b2)->xmax < (*b1)->xmin) || ((*b2)->xmin >
(*b1)->xmax));
return MAL_SUCCEED;
}
diff --git a/monetdb5/extras/crackers/60_crackers.mal
b/monetdb5/extras/crackers/60_crackers.mal
--- a/monetdb5/extras/crackers/60_crackers.mal
+++ b/monetdb5/extras/crackers/60_crackers.mal
@@ -16,6 +16,7 @@
# All Rights Reserved.
# This loads the MonetDB/Crackers module
+library crackers;
include opt_crack;
include opt_sidcrack;
include opt_selcrack;
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
@@ -55,3 +55,4 @@ predicate.Bug-2908
history.Bug-2909
interrupted-initialization.Bug-2875
case-overflow.Bug-2239
+sqltables.Bug-2921
diff --git a/sql/test/BugTracker-2011/Tests/sqltables.Bug-2921.sql
b/sql/test/BugTracker-2011/Tests/sqltables.Bug-2921.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2011/Tests/sqltables.Bug-2921.sql
@@ -0,0 +1,5 @@
+create local temporary table loctemp (i int);
+create global temporary table globtemp (i int);
+select e."value" as table_cat, s."name" as table_schem, t."name" as
table_name, case when t."type" = 0 and t."system" = false and t."temporary" = 0
and s."name" <> 'tmp' then cast('TABLE' as varchar(20)) when t."type" = 0 and
t."system" = false and t."temporary" = 0 and s."name" = 'tmp' then cast('GLOBAL
TEMPORARY' as varchar(20)) when t."type" = 0 and t."system" = true and
t."temporary" = 0 then cast('SYSTEM TABLE' as varchar(20)) when t."type" = 1
then cast('VIEW' as varchar(20)) when t."type" = 0 and t."system" = false and
t."temporary" = 1 then cast('LOCAL TEMPORARY' as varchar(20)) else
cast('INTERNAL TABLE TYPE' as varchar(20)) end as table_type, cast(null as
varchar(1)) as remarks from sys."schemas" s, sys."tables" t, sys."env"() e
where s."id" = t."schema_id" and e.name = 'gdk_dbname' and ((t."type" = 0 and
t."system" = false and t."temporary" = 0 and s."name" = 'tmp') or (t."type" = 0
and t."system" = false and t."temporary" = 1)) order by table_type,
table_schem, t
able_name;
+select e."value" as table_cat, s."name" as table_schem, t."name" as
table_name, case when t."type" = 0 and t."system" = false and t."temporary" = 0
and s."name" <> 'tmp' then cast('TABLE' as varchar(20)) when t."type" = 0 and
t."system" = false and t."temporary" = 0 and s."name" = 'tmp' then cast('GLOBAL
TEMPORARY' as varchar(20)) when t."type" = 0 and t."system" = true and
t."temporary" = 0 then cast('SYSTEM TABLE' as varchar(20)) when t."type" = 1
then cast('VIEW' as varchar(20)) when t."type" = 0 and t."system" = false and
t."temporary" = 1 then cast('LOCAL TEMPORARY' as varchar(20)) else
cast('INTERNAL TABLE TYPE' as varchar(20)) end as table_type, cast(null as
varchar(1)) as remarks from sys."schemas" s, sys."tables" t, sys."env"() e
where s."id" = t."schema_id" and e.name = 'gdk_dbname' and ((t."type" = 0 and
t."system" = false and t."temporary" = 0 and s."name" = 'tmp')) order by
table_type, table_schem, table_name;
+select e."value" as table_cat, s."name" as table_schem, t."name" as
table_name, case when t."type" = 0 and t."system" = false and t."temporary" = 0
and s."name" <> 'tmp' then cast('TABLE' as varchar(20)) when t."type" = 0 and
t."system" = false and t."temporary" = 0 and s."name" = 'tmp' then cast('GLOBAL
TEMPORARY' as varchar(20)) when t."type" = 0 and t."system" = true and
t."temporary" = 0 then cast('SYSTEM TABLE' as varchar(20)) when t."type" = 1
then cast('VIEW' as varchar(20)) when t."type" = 0 and t."system" = false and
t."temporary" = 1 then cast('LOCAL TEMPORARY' as varchar(20)) else
cast('INTERNAL TABLE TYPE' as varchar(20)) end as table_type, cast(null as
varchar(1)) as remarks from sys."schemas" s, sys."tables" t, sys."env"() e
where s."id" = t."schema_id" and e.name = 'gdk_dbname' and ((t."type" = 0 and
t."system" = false and t."temporary" = 1)) order by table_type, table_schem,
table_name;
diff --git a/sql/test/BugTracker-2011/Tests/sqltables.Bug-2921.stable.err
b/sql/test/BugTracker-2011/Tests/sqltables.Bug-2921.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2011/Tests/sqltables.Bug-2921.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'sqltables.Bug-2921` in directory 'test/BugTracker-2011` itself:
+
+
+# 15:24:04 >
+# 15:24:04 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/ufs/sjoerd/Monet-stable/var/MonetDB" "--set" "mapi_open=true"
"--set" "mapi_port=34383" "--set" "monet_prompt=" "--trace" "--forcemito"
"--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2011" "--set"
"mal_listing=0"
+# 15:24:04 >
+
+# builtin opt gdk_dbname = demo
+# builtin opt gdk_dbfarm = /ufs/sjoerd/Monet-stable/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 sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt gdk_dbfarm = /ufs/sjoerd/Monet-stable/var/MonetDB
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 34383
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbname = mTests_test_BugTracker-2011
+# cmdline opt mal_listing = 0
+
+# 15:24:04 >
+# 15:24:04 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=madrid"
"--port=34383"
+# 15:24:04 >
+
+
+# 15:24:05 >
+# 15:24:05 > "Done."
+# 15:24:05 >
+
diff --git a/sql/test/BugTracker-2011/Tests/sqltables.Bug-2921.stable.out
b/sql/test/BugTracker-2011/Tests/sqltables.Bug-2921.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2011/Tests/sqltables.Bug-2921.stable.out
@@ -0,0 +1,71 @@
+stdout of test 'sqltables.Bug-2921` in directory 'test/BugTracker-2011` itself:
+
+
+# 15:24:04 >
+# 15:24:04 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/ufs/sjoerd/Monet-stable/var/MonetDB" "--set" "mapi_open=true"
"--set" "mapi_port=34383" "--set" "monet_prompt=" "--trace" "--forcemito"
"--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2011" "--set"
"mal_listing=0"
+# 15:24:04 >
+
+# MonetDB 5 server v11.5.8
+# This is an unreleased version
+# Serving database 'mTests_test_BugTracker-2011', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 15.662 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://madrid.ins.cwi.nl:34383/
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+# SQL catalog created, loading sql scripts once
+# loading sql script: 10_math.sql
+# loading sql script: 11_times.sql
+# loading sql script: 12_url.sql
+# loading sql script: 13_date.sql
+# loading sql script: 14_inet.sql
+# loading sql script: 15_history.sql
+# loading sql script: 16_tracelog.sql
+# loading sql script: 17_compress.sql
+# loading sql script: 18_dictionary.sql
+# loading sql script: 19_cluster.sql
+# loading sql script: 20_vacuum.sql
+# loading sql script: 21_dependency_functions.sql
+# loading sql script: 22_clients.sql
+# loading sql script: 23_skyserver.sql
+# loading sql script: 24_zorder.sql
+# loading sql script: 25_debug.sql
+# loading sql script: 40_geom.sql
+# loading sql script: 80_udf.sql
+# loading sql script: 99_system.sql
+
+# 15:24:04 >
+# 15:24:04 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=madrid"
"--port=34383"
+# 15:24:04 >
+
+#create local temporary table loctemp (i int);
+#create global temporary table globtemp (i int);
+#select e."value" as table_cat, s."name" as table_schem, t."name" as
table_name, case when t."type" = 0 and t."system" = false and t."temporary" = 0
and s."name" <> 'tmp' then cast('TABLE' as varchar(20)) when t."type" = 0 and
t."system" = false and t."temporary" = 0 and s."name" = 'tmp' then cast('GLOBAL
TEMPORARY' as varchar(20)) when t."type" = 0 and t."system" = true and
t."temporary" = 0 then cast('SYSTEM TABLE' as varchar(20)) when t."type" = 1
then cast('VIEW' as varchar(20)) when t."type" = 0 and t."system" = false and
t."temporary" = 1 then cast('LOCAL TEMPORARY' as varchar(20)) else
cast('INTERNAL TABLE TYPE' as varchar(20)) end as table_type, cast(null as
varchar(1)) as remarks from sys."schemas" s, sys."tables" t, sys."env"() e
where s."id" = t."schema_id" and e.name = 'gdk_dbname' and ((t."type" = 0 and
t."system" = false and t."temporary" = 0 and s."name" = 'tmp') or (t."type" = 0
and t."system" = false and t."temporary" = 1)) order by table_type,
table_schem,
table_name;
+% .e, .s, .t, ., . # table_name
+% table_cat, table_schem, table_name, table_type, remarks # name
+% varchar, varchar, varchar, varchar, varchar # type
+% 27, 3, 7, 16, 0 # length
+[ "mTests_test_BugTracker-2011", "tmp", "globtemp", "GLOBAL
TEMPORARY", NULL ]
+[ "mTests_test_BugTracker-2011", "tmp", "loctemp", "LOCAL
TEMPORARY", NULL ]
+#select e."value" as table_cat, s."name" as table_schem, t."name" as
table_name, case when t."type" = 0 and t."system" = false and t."temporary" = 0
and s."name" <> 'tmp' then cast('TABLE' as varchar(20)) when t."type" = 0 and
t."system" = false and t."temporary" = 0 and s."name" = 'tmp' then cast('GLOBAL
TEMPORARY' as varchar(20)) when t."type" = 0 and t."system" = true and
t."temporary" = 0 then cast('SYSTEM TABLE' as varchar(20)) when t."type" = 1
then cast('VIEW' as varchar(20)) when t."type" = 0 and t."system" = false and
t."temporary" = 1 then cast('LOCAL TEMPORARY' as varchar(20)) else
cast('INTERNAL TABLE TYPE' as varchar(20)) end as table_type, cast(null as
varchar(1)) as remarks from sys."schemas" s, sys."tables" t, sys."env"() e
where s."id" = t."schema_id" and e.name = 'gdk_dbname' and ((t."type" = 0 and
t."system" = false and t."temporary" = 0 and s."name" = 'tmp')) order by
table_type, table_schem, table_name;
+% .e, .s, .t, ., . # table_name
+% table_cat, table_schem, table_name, table_type, remarks # name
+% varchar, varchar, varchar, varchar, varchar # type
+% 27, 3, 8, 16, 0 # length
+[ "mTests_test_BugTracker-2011", "tmp", "globtemp", "GLOBAL
TEMPORARY", NULL ]
+#select e."value" as table_cat, s."name" as table_schem, t."name" as
table_name, case when t."type" = 0 and t."system" = false and t."temporary" = 0
and s."name" <> 'tmp' then cast('TABLE' as varchar(20)) when t."type" = 0 and
t."system" = false and t."temporary" = 0 and s."name" = 'tmp' then cast('GLOBAL
TEMPORARY' as varchar(20)) when t."type" = 0 and t."system" = true and
t."temporary" = 0 then cast('SYSTEM TABLE' as varchar(20)) when t."type" = 1
then cast('VIEW' as varchar(20)) when t."type" = 0 and t."system" = false and
t."temporary" = 1 then cast('LOCAL TEMPORARY' as varchar(20)) else
cast('INTERNAL TABLE TYPE' as varchar(20)) end as table_type, cast(null as
varchar(1)) as remarks from sys."schemas" s, sys."tables" t, sys."env"() e
where s."id" = t."schema_id" and e.name = 'gdk_dbname' and ((t."type" = 0 and
t."system" = false and t."temporary" = 1)) order by table_type, table_schem,
table_name;
+% .e, .s, .t, ., . # table_name
+% table_cat, table_schem, table_name, table_type, remarks # name
+% varchar, varchar, varchar, varchar, varchar # type
+% 27, 3, 7, 15, 0 # length
+[ "mTests_test_BugTracker-2011", "tmp", "loctemp", "LOCAL
TEMPORARY", NULL ]
+
+# 15:24:05 >
+# 15:24:05 > "Done."
+# 15:24:05 >
+
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
