Changeset: bd0f74b7d2a7 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bd0f74b7d2a7 Modified Files: sql/backends/monet5/LSST/Tests/All sql/backends/monet5/LSST/Tests/lsst.sql.src sql/backends/monet5/LSST/Tests/lsst.stable.err sql/backends/monet5/LSST/Tests/lsst.stable.out sql/backends/monet5/LSST/lsst.sql sql/server/rel_bin.c Branch: default Log Message:
small improvements for xmatch usage diffs (143 lines): diff --git a/sql/backends/monet5/LSST/Tests/All b/sql/backends/monet5/LSST/Tests/All --- a/sql/backends/monet5/LSST/Tests/All +++ b/sql/backends/monet5/LSST/Tests/All @@ -1,1 +1,2 @@ +lsst lsst_htmxmatch diff --git a/sql/backends/monet5/LSST/Tests/lsst.sql.src b/sql/backends/monet5/LSST/Tests/lsst.sql.src new file mode 100644 --- /dev/null +++ b/sql/backends/monet5/LSST/Tests/lsst.sql.src @@ -0,0 +1,1 @@ +$RELSRCDIR/../lsst.sql diff --git a/sql/backends/monet5/LSST/Tests/lsst.stable.err b/sql/backends/monet5/LSST/Tests/lsst.stable.err new file mode 100644 --- /dev/null +++ b/sql/backends/monet5/LSST/Tests/lsst.stable.err @@ -0,0 +1,37 @@ +stderr of test 'lsst` in directory 'backends/monet5/LSST` itself: + + +# 19:55:25 > +# 19:55:25 > mserver5 --debug=10 --set gdk_nr_threads=4 --set "gdk_dbfarm=/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB" --set mapi_open=true --set mapi_port=37236 --set monet_prompt= --trace --forcemito --set mal_listing=2 "--dbname=mTests_backends_monet5_LSST" --set mal_listing=0 ; echo ; echo Over.. +# 19:55:25 > + +# builtin opt gdk_dbname = demo +# builtin opt gdk_dbfarm = /home/niels/scratch/monetdb/Linux-x86_64/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 = 4 +# cmdline opt gdk_dbfarm = /home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB +# cmdline opt mapi_open = true +# cmdline opt mapi_port = 37236 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbname = mTests_backends_monet5_LSST +# cmdline opt mal_listing = 0 + +# 19:55:25 > +# 19:55:25 > mclient -lsql -ftest -i -e --host=niels --port=37236 +# 19:55:25 > + + +# 19:55:26 > +# 19:55:26 > Done. +# 19:55:26 > + diff --git a/sql/backends/monet5/LSST/Tests/lsst.stable.out b/sql/backends/monet5/LSST/Tests/lsst.stable.out new file mode 100644 --- /dev/null +++ b/sql/backends/monet5/LSST/Tests/lsst.stable.out @@ -0,0 +1,64 @@ +stdout of test 'lsst` in directory 'backends/monet5/LSST` itself: + + +# 19:55:25 > +# 19:55:25 > mserver5 --debug=10 --set gdk_nr_threads=4 --set "gdk_dbfarm=/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB" --set mapi_open=true --set mapi_port=37236 --set monet_prompt= --trace --forcemito --set mal_listing=2 "--dbname=mTests_backends_monet5_LSST" --set mal_listing=0 ; echo ; echo Over.. +# 19:55:25 > + +# MonetDB 5 server v11.6.0 +# This is an unreleased version +# Serving database 'mTests_backends_monet5_LSST', using 4 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked +# Found 3.788 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://niels.nesco.mine.nu:37236/ +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded + +Ready. +# SQL catalog created, loading sql scripts once +# SQL loading sql scripts /home/niels/scratch/monetdb/Linux-x86_64/lib/monetdb5/createdb/09_like.sql +# SQL loading sql scripts /home/niels/scratch/monetdb/Linux-x86_64/lib/monetdb5/createdb/10_math.sql +# SQL loading sql scripts /home/niels/scratch/monetdb/Linux-x86_64/lib/monetdb5/createdb/11_times.sql +# SQL loading sql scripts /home/niels/scratch/monetdb/Linux-x86_64/lib/monetdb5/createdb/12_url.sql +# SQL loading sql scripts /home/niels/scratch/monetdb/Linux-x86_64/lib/monetdb5/createdb/13_date.sql +# SQL loading sql scripts /home/niels/scratch/monetdb/Linux-x86_64/lib/monetdb5/createdb/14_inet.sql +# SQL loading sql scripts /home/niels/scratch/monetdb/Linux-x86_64/lib/monetdb5/createdb/15_history.sql +# SQL loading sql scripts /home/niels/scratch/monetdb/Linux-x86_64/lib/monetdb5/createdb/16_tracelog.sql +# SQL loading sql scripts /home/niels/scratch/monetdb/Linux-x86_64/lib/monetdb5/createdb/17_compress.sql +# SQL loading sql scripts /home/niels/scratch/monetdb/Linux-x86_64/lib/monetdb5/createdb/18_dictionary.sql +# SQL loading sql scripts /home/niels/scratch/monetdb/Linux-x86_64/lib/monetdb5/createdb/19_cluster.sql +# SQL loading sql scripts /home/niels/scratch/monetdb/Linux-x86_64/lib/monetdb5/createdb/20_vacuum.sql +# SQL loading sql scripts /home/niels/scratch/monetdb/Linux-x86_64/lib/monetdb5/createdb/21_dependency_functions.sql +# SQL loading sql scripts /home/niels/scratch/monetdb/Linux-x86_64/lib/monetdb5/createdb/22_clients.sql +# SQL loading sql scripts /home/niels/scratch/monetdb/Linux-x86_64/lib/monetdb5/createdb/23_skyserver.sql +# SQL loading sql scripts /home/niels/scratch/monetdb/Linux-x86_64/lib/monetdb5/createdb/24_zorder.sql +# SQL loading sql scripts /home/niels/scratch/monetdb/Linux-x86_64/lib/monetdb5/createdb/25_debug.sql +# SQL loading sql scripts /home/niels/scratch/monetdb/Linux-x86_64/lib/monetdb5/createdb/40_geom.sql +# SQL loading sql scripts /home/niels/scratch/monetdb/Linux-x86_64/lib/monetdb5/createdb/80_udf.sql +# SQL loading sql scripts /home/niels/scratch/monetdb/Linux-x86_64/lib/monetdb5/createdb/99_system.sql + +Over.. + +# 19:55:25 > +# 19:55:25 > mclient -lsql -ftest -i -e --host=niels --port=37236 +# 19:55:25 > + +#create function angSep(ra1 double, dec1 double, ra2 double, dec2 double) +#returns double external name lsst.angsep; +#create function ptInSphBox(ra1 double, dec1 double, ra_min double, dec_min double, ra_max double, dec_max double) +#returns int external name lsst.ptinsphbox; +#create function ptInSphEllipse(ra1 double, dec1 double , ra_cen double, dec_cen double, smaa double, smia double, ang double) +#returns int external name lsst.ptinsphellipse; +#create function ptInSphCircle(ra1 double, dec1 double, ra_cen double, dec_cen double, radius double) +#returns int external name lsst.ptinsphcircle; +#create function ptInSphPoly(ra1 double, dec1 double, list double) +#returns int external name lsst.ptinsphpoly; +#create filter function xmatch(a bigint, b bigint, opt int) external name lsst.xmatch; + +# 19:55:26 > +# 19:55:26 > Done. +# 19:55:26 > + diff --git a/sql/backends/monet5/LSST/lsst.sql b/sql/backends/monet5/LSST/lsst.sql --- a/sql/backends/monet5/LSST/lsst.sql +++ b/sql/backends/monet5/LSST/lsst.sql @@ -32,3 +32,4 @@ returns int external name lsst.ptinsphci create function ptInSphPoly(ra1 double, dec1 double, list double) returns int external name lsst.ptinsphpoly; +create filter function xmatch(a bigint, b bigint, opt int) external name lsst.xmatch; diff --git a/sql/server/rel_bin.c b/sql/server/rel_bin.c --- a/sql/server/rel_bin.c +++ b/sql/server/rel_bin.c @@ -546,7 +546,7 @@ exp_bin(mvc *sql, sql_exp *e, stmt *left if (left && right && re->card > CARD_ATOM && !is_select) { /* find predicate function */ sql_subfunc *f = e->f; - stmt *j; + stmt *j = NULL; if (r2) f = sql_bind_func3(sql->sa, sql->session->schema, f->func->base.name, tail_type(l), tail_type(r), tail_type(r2), F_FUNC); _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
