Changeset: 266c3d6bbb66 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=266c3d6bbb66 Added Files: sql/backends/monet5/Tests/sample04.sql sql/backends/monet5/Tests/sample04.stable.err sql/backends/monet5/Tests/sample04.stable.out Modified Files: sql/server/rel_rel.c Branch: stratified_sampling Log Message:
Properly apply aliasing through samples. diffs (161 lines): diff --git a/sql/backends/monet5/Tests/sample04.sql b/sql/backends/monet5/Tests/sample04.sql new file mode 100644 --- /dev/null +++ b/sql/backends/monet5/Tests/sample04.sql @@ -0,0 +1,14 @@ + +START TRANSACTION; + + +CREATE TABLE vals(joinkey INTEGER, id DOUBLE, type INTEGER); +INSERT INTO vals VALUES (1, 1, 100), (0, 0, 50); + +# alias tables over weighted sample +SELECT v1.id FROM vals AS v1 SAMPLE 1 USING WEIGHTS 1-v1.id; + +SELECT * FROM vals AS v1 INNER JOIN vals AS v2 ON v1.id=1-v2.id SAMPLE 1 USING WEIGHTS v1.id; + + +ROLLBACK; diff --git a/sql/backends/monet5/Tests/sample04.stable.err b/sql/backends/monet5/Tests/sample04.stable.err new file mode 100644 --- /dev/null +++ b/sql/backends/monet5/Tests/sample04.stable.err @@ -0,0 +1,35 @@ +stderr of test 'sample04` in directory 'sql/backends/monet5` itself: + + +# 10:58:36 > +# 10:58:36 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=35153" "--set" "mapi_usock=/var/tmp/mtest-37485/.s.monetdb.35153" "--set" "monet_prompt=" "--forcemito" "--dbpath=/Users/myth/opt/var/MonetDB/mTests_sql_backends_monet5" "--set" "embedded_py=true" +# 10:58:36 > + +# builtin opt gdk_dbpath = /Users/myth/opt/var/monetdb5/dbfarm/demo +# builtin opt gdk_debug = 0 +# builtin opt gdk_vmtrim = no +# 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 mapi_open = true +# cmdline opt mapi_port = 35153 +# cmdline opt mapi_usock = /var/tmp/mtest-37485/.s.monetdb.35153 +# cmdline opt monet_prompt = +# cmdline opt gdk_dbpath = /Users/myth/opt/var/MonetDB/mTests_sql_backends_monet5 +# cmdline opt embedded_py = true +# cmdline opt gdk_debug = 536870922 + +# 10:58:36 > +# 10:58:36 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-37485" "--port=35153" +# 10:58:36 > + + +# 10:58:37 > +# 10:58:37 > "Done." +# 10:58:37 > + diff --git a/sql/backends/monet5/Tests/sample04.stable.out b/sql/backends/monet5/Tests/sample04.stable.out new file mode 100644 --- /dev/null +++ b/sql/backends/monet5/Tests/sample04.stable.out @@ -0,0 +1,84 @@ +stdout of test 'sample04` in directory 'sql/backends/monet5` itself: + + +# 10:58:36 > +# 10:58:36 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=35153" "--set" "mapi_usock=/var/tmp/mtest-37485/.s.monetdb.35153" "--set" "monet_prompt=" "--forcemito" "--dbpath=/Users/myth/opt/var/MonetDB/mTests_sql_backends_monet5" "--set" "embedded_py=true" +# 10:58:36 > + +# MonetDB 5 server v11.28.0 +# This is an unreleased version +# Serving database 'mTests_sql_backends_monet5', using 4 threads +# Compiled for x86_64-apple-darwin15.6.0/64bit with 128bit integers +# Found 8.000 GiB available main-memory. +# Copyright (c) 1993-July 2008 CWI. +# Copyright (c) August 2008-2017 MonetDB B.V., all rights reserved +# Visit https://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://dhcp-21.eduroam.cwi.nl:35153/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-37485/.s.monetdb.35153 +# MonetDB/SQL module loaded +# MonetDB/Python2 module loaded + +Ready. +# SQL catalog created, loading sql scripts once +# loading sql script: 09_like.sql +# 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_querylog.sql +# loading sql script: 16_tracelog.sql +# loading sql script: 17_temporal.sql +# loading sql script: 18_index.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: 25_debug.sql +# loading sql script: 26_sysmon.sql +# loading sql script: 27_rejects.sql +# loading sql script: 39_analytics.sql +# loading sql script: 39_analytics_hge.sql +# loading sql script: 40_json.sql +# loading sql script: 40_json_hge.sql +# loading sql script: 41_md5sum.sql +# loading sql script: 45_uuid.sql +# loading sql script: 46_profiler.sql +# loading sql script: 51_sys_schema_extension.sql +# loading sql script: 60_wlcr.sql +# loading sql script: 72_fits.sql +# loading sql script: 74_netcdf.sql +# loading sql script: 75_storagemodel.sql +# loading sql script: 80_statistics.sql +# loading sql script: 80_udf.sql +# loading sql script: 80_udf_hge.sql +# loading sql script: 90_generator.sql +# loading sql script: 90_generator_hge.sql +# loading sql script: 99_system.sql + +# 10:58:36 > +# 10:58:36 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-37485" "--port=35153" +# 10:58:36 > + +#START TRANSACTION; +#CREATE TABLE vals(joinkey INTEGER, id DOUBLE, type INTEGER); +#INSERT INTO vals VALUES (1, 1, 100), (0, 0, 50); +[ 2 ] +#SELECT v1.id FROM vals AS v1 SAMPLE 1 USING WEIGHTS 1-v1.id; +% sys.v1 # table_name +% id # name +% double # type +% 24 # length +[ 0 ] +#SELECT * FROM vals AS v1 INNER JOIN vals AS v2 ON v1.id=1-v2.id SAMPLE 1 USING WEIGHTS v1.id; +% sys.v1, sys.v1, sys.v1, sys.v2, sys.v2, sys.v2 # table_name +% joinkey, id, type, joinkey, id, type # name +% int, double, int, int, double, int # type +% 1, 24, 3, 1, 24, 2 # length +[ 1, 1, 100, 0, 0, 50 ] +#ROLLBACK; + +# 10:58:37 > +# 10:58:37 > "Done." +# 10:58:37 > + diff --git a/sql/server/rel_rel.c b/sql/server/rel_rel.c --- a/sql/server/rel_rel.c +++ b/sql/server/rel_rel.c @@ -276,7 +276,8 @@ rel_bind_column2( mvc *sql, sql_rel *rel is_semi(rel->op) || is_apply(rel->op) || is_select(rel->op) || - is_topn(rel->op)) { + is_topn(rel->op) || + is_sample(rel->op)) { if (rel->l) return rel_bind_column2(sql, rel->l, tname, cname, f); } _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
