Changeset: 2010b19f287b for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2010b19f287b Added Files: debian/fix-deb.sh sql/test/BugTracker-2016/Tests/storagemodel.stable.out.32bit sql/test/bugs/Tests/WHERE_IN_subquery_incorrect_results-JIRA-44.sql sql/test/bugs/Tests/WHERE_IN_subquery_incorrect_results-JIRA-44.stable.err sql/test/bugs/Tests/WHERE_IN_subquery_incorrect_results-JIRA-44.stable.out Removed Files: monetdb5/modules/mal/Tests/remote03.stable.out.int128 Modified Files: NT/rules.msc debian/control debian/rules monetdb5/modules/mal/Tests/remote03.stable.out monetdb5/modules/mal/clients.c sql/server/rel_optimizer.c sql/server/rel_rel.c sql/server/rel_select.c sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit sql/test/bugs/Tests/All Branch: default Log Message:
merged with Jun2016 diffs (truncated from 472 to 300 lines): diff --git a/debian/control b/debian/control --- a/debian/control +++ b/debian/control @@ -8,11 +8,10 @@ Vcs-Hg: http://dev.monetdb.org/hg/MonetD # for Build-Depends and Depends syntax, see # http://www.debian.org/doc/debian-policy/ch-relationships.html Build-Depends: debhelper (>= 5), autotools-dev, bison, libatomic-ops-dev, - libbam-dev, libbz2-dev, libcurl4-gnutls-dev, libgeos-dev (>= 3.0.0), + libbam-dev, libbz2-dev, libcurl4-gnutls-dev, libgeos-dev (>= 3.4.0), libgsl0-dev, libpcre3-dev, libreadline-dev, libssl-dev, libxml2-dev, perl, pkg-config, python, python3, - unixodbc-dev, uuid-dev, zlib1g-dev, - liblas-c-dev + unixodbc-dev, uuid-dev, zlib1g-dev, liblas-c-dev (>= 1.8.0) Standards-Version: 3.8.0 X-Python-Version: >= 2.6 X-Python3-Version: >= 3.0 diff --git a/debian/fix-deb.sh b/debian/fix-deb.sh new file mode 100755 --- /dev/null +++ b/debian/fix-deb.sh @@ -0,0 +1,21 @@ +#!/bin/sh +if [ -f /etc/lsb-release ]; then + source /etc/lsb-release + ID=${DISTRIB_ID,,} + VERSION_ID=$DISTRIB_RELEASE +elif [ -f /etc/os-release ]; then + source /etc/os-release +else + echo "don't know what distro this is" + exit 1 +fi + +if [[ ( $ID == debian && $VERSION_ID -lt 8 ) || ( $ID == ubuntu && $VERSION_ID < 15.10 ) ]]; then + # fix control file because these systems don't have liblas and a + # too old version of libgeos + sed -i 's/, libgeos-dev[^,]*//;s/, liblas-c-dev[^,]*//' debian/control + sed -i '/^Package:.*lidar/,/^$/d' debian/control + sed -i '/^Package:.*geom/,/^$/d' debian/control + rm debian/libmonetdb5-server-lidar.install debian/libmonetdb5-server-geom.install + sed -i '/geo[ms]=yes/s/yes/no/;/lidar=yes/s/yes/no/;/liblas=yes/s/yes/no/' debian/rules +fi diff --git a/debian/rules b/debian/rules --- a/debian/rules +++ b/debian/rules @@ -23,6 +23,7 @@ override_dh_auto_configure: --enable-gsl=yes \ --enable-instrument=no \ --enable-jdbc=no \ + --enable-lidar=yes \ --enable-merocontrol=no \ --enable-microhttpd=no \ --enable-monetdb5=yes \ @@ -38,14 +39,13 @@ override_dh_auto_configure: --with-bz2=yes \ --with-geos=yes \ --with-java=no \ + --with-liblas=yes \ --with-perl=yes \ --with-perl-libdir=lib/perl5 \ --with-pthread=yes \ --with-python2=yes \ --with-python3=yes \ --with-readline=yes \ - --with-rubygem=yes \ - --with-rubygem-dir=lib/ruby/gems/1.8 \ --with-samtools=yes \ --with-sphinxclient=no \ --with-unixodbc=yes \ diff --git a/monetdb5/modules/mal/Tests/remote03.stable.out b/monetdb5/modules/mal/Tests/remote03.stable.out --- a/monetdb5/modules/mal/Tests/remote03.stable.out +++ b/monetdb5/modules/mal/Tests/remote03.stable.out @@ -19,15 +19,14 @@ stdout of test 'remote03` in directory ' # MonetDB/JAQL module loaded # MonetDB/SQL module loaded # MonetDB/R module loaded -!SyntaxException:remote.exec:(mapi:monetdb://mone...@athens.da.cwi.nl/mTests_monetdb5_modules_mal) rmt0_X_9_void := io.print.bla(); + Ready. -# 11:26:09 > -# 11:26:09 > "mclient" "-lmal" "-ftest" "-Eutf-8" "--host=/var/tmp/mtest-23931" "--port=33516" -# 11:26:09 > +# 23:12:08 > +# 23:12:08 > "mclient" "-lmal" "-ftest" "-Eutf-8" "--host=/var/tmp/mtest-23626" "--port=30565" +# 23:12:08 > [ "Received first error from the remote site" ] -[ 32@0, "wkba" ] # 22:17:31 > # 22:17:31 > "Done." diff --git a/monetdb5/modules/mal/Tests/remote03.stable.out.int128 b/monetdb5/modules/mal/Tests/remote03.stable.out.int128 deleted file mode 100644 --- a/monetdb5/modules/mal/Tests/remote03.stable.out.int128 +++ /dev/null @@ -1,34 +0,0 @@ -stdout of test 'remote03` in directory 'monetdb5/modules/mal` itself: - - -# 22:17:31 > -# 22:17:31 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=30468" "--set" "mapi_usock=/var/tmp/mtest-3813/.s.monetdb.30468" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch1/mk/current//Linux/var/MonetDB/mTests_monetdb5_modules_mal" "remote03.mal" -# 22:17:31 > - -# MonetDB 5 server v11.18.0 -# This is an unreleased version -# Serving database 'mTests_monetdb5_modules_mal', using 8 threads -# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked -# Found 15.591 GiB available main-memory. -# 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://vienna.ins.cwi.nl:30468/ -# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-3813/.s.monetdb.30468 -# MonetDB/GIS module loaded -# MonetDB/JAQL module loaded -# MonetDB/SQL module loaded -# MonetDB/R module loaded - -Ready. - -# 23:12:08 > -# 23:12:08 > "mclient" "-lmal" "-ftest" "-Eutf-8" "--host=/var/tmp/mtest-23626" "--port=30565" -# 23:12:08 > - -[ "Received first error from the remote site" ] - -# 22:17:31 > -# 22:17:31 > "Done." -# 22:17:31 > - diff --git a/monetdb5/modules/mal/clients.c b/monetdb5/modules/mal/clients.c --- a/monetdb5/modules/mal/clients.c +++ b/monetdb5/modules/mal/clients.c @@ -584,7 +584,6 @@ CLTsessions(Client cntxt, MalBlkPtr mb, bat *qtimeoutId = getArgReference_bat(stk,pci,4); bat *activeId = getArgReference_bat(stk,pci,5); Client c; - char usrname[256]= {"monetdb"}; timestamp ts, ret; lng clk,timeout; str msg; @@ -618,7 +617,7 @@ CLTsessions(Client cntxt, MalBlkPtr mb, for (c = mal_clients + (GDKgetenv_isyes("monet_daemon") != 0); c < mal_clients + MAL_MAXCLIENTS; c++) if (c->mode == RUNCLIENT) { - BUNappend(user, &usrname, FALSE); + BUNappend(user, c->username, FALSE); msg = MTIMEunix_epoch(&ts); if (msg) goto bailout; 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 @@ -966,7 +966,7 @@ rel_push_join(mvc *sql, sql_rel *rel, sq rrel = rn->data; rrel2 = rn2->data; - if (rel_is_ref(lrel) || rel_is_ref(rrel) || rel_is_ref(rrel2)) + if (rel_is_ref(lrel) || rel_is_ref(rrel) || rel_is_ref(rrel2) || is_processed(lrel) || is_processed(rrel)) break; /* push down as long as the operators allow this @@ -988,7 +988,7 @@ rel_push_join(mvc *sql, sql_rel *rel, sq lrel = ln->data; rrel = rn->data; - if (rel_is_ref(lrel) || rel_is_ref(rrel)) + if (rel_is_ref(lrel) || rel_is_ref(rrel) || is_processed(lrel) || is_processed(rrel)) break; /* push down as long as the operators allow this diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c --- a/sql/server/rel_select.c +++ b/sql/server/rel_select.c @@ -1483,7 +1483,7 @@ rel_compare_exp_(mvc *sql, sql_rel *rel, /* push select into the given relation */ return rel_push_select(sql, rel, L, e); } else { /* join */ - if (is_semi(rel->op) || is_outerjoin(rel->op)) { + if (is_semi(rel->op) || (is_outerjoin(rel->op) && !is_processed((rel)))) { rel_join_add_exp(sql->sa, rel, e); return rel; } @@ -4908,9 +4908,6 @@ rel_joinquery_(mvc *sql, sql_rel *rel, s if (js && js->token != SQL_USING) { /* On sql_logical_exp */ rel = rel_logical_exp(sql, rel, js, sql_where); - - if (!rel) - return rel; } else if (js) { /* using */ char rname[16], *rnme; dnode *n = js->data.lval->h; diff --git a/sql/test/BugTracker-2016/Tests/storagemodel.stable.out.32bit b/sql/test/BugTracker-2016/Tests/storagemodel.stable.out.32bit new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2016/Tests/storagemodel.stable.out.32bit @@ -0,0 +1,122 @@ +stdout of test 'storagemodel` in directory 'sql/test/BugTracker-2016` itself: + + +# 23:38:43 > +# 23:38:43 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=30783" "--set" "mapi_usock=/var/tmp/mtest-21747/.s.monetdb.30783" "--set" "monet_prompt=" "--forcemito" "--dbpath=/export/scratch1/mk/default//Linux/var/MonetDB/mTests_sql_test_BugTracker-2016" "--set" "embedded_r=yes" +# 23:38:43 > + +# MonetDB 5 server v11.22.0 +# This is an unreleased version +# Serving database 'mTests_sql_test_BugTracker-2016', using 8 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit integers dynamically linked +# Found 15.589 GiB available main-memory. +# 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://vienna.da.cwi.nl:30783/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-21747/.s.monetdb.30783 +# MonetDB/GIS module loaded +# Start processing logs sql/sql_logs version 52200 +# Finished processing logs sql/sql_logs +# MonetDB/SQL module loaded +# MonetDB/R 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: 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: 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_geom.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_gsl.sql +# loading sql script: 46_profiler.sql +# loading sql script: 51_sys_schema_extension.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: 85_bam.sql +# loading sql script: 90_generator.sql +# loading sql script: 90_generator_hge.sql +# loading sql script: 99_system.sql + +# 23:38:44 > +# 23:38:44 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-21747" "--port=30783" +# 23:38:44 > + +#create table bug3923(i integer); +#select "schema", "table", "column", "type", "mode", typewidth, hashes, phash, imprints, sorted from storage('sys','_tables'); +% .L2, .L2, .L2, .L2, .L2, .L2, .L2, .L2, .L2, .L2 # table_name +% schema, table, column, type, mode, typewidth, hashes, phash, imprints, sorted # name +% clob, clob, clob, clob, clob, int, bigint, boolean, bigint, boolean # type +% 3, 7, 13, 8, 8, 2, 1, 5, 1, 5 # length +[ "sys", "_tables", "id", "int", "writable", 4, 0, false, 0, true ] +[ "sys", "_tables", "name", "varchar", "writable", 8, 0, false, 0, false ] +[ "sys", "_tables", "schema_id", "int", "writable", 4, 0, false, 0, false ] +[ "sys", "_tables", "query", "varchar", "writable", 45, 0, false, 0, false ] +[ "sys", "_tables", "type", "smallint", "writable", 2, 0, false, 0, false ] +[ "sys", "_tables", "system", "boolean", "writable", 1, 0, false, 0, false ] +[ "sys", "_tables", "commit_action", "smallint", "writable", 2, 0, false, 0, false ] +[ "sys", "_tables", "access", "smallint", "writable", 2, 0, false, 0, true ] +#update storagemodelinput set "count" =10000 where "table" ='bug3923'; +[ 1 ] +#update storagemodelinput set "distinct" =10 where "table" ='bug3923' and "column" ='i'; +[ 1 ] +#select * from storagemodel() where "table" = 'bug3923'; +% ., ., ., ., ., ., ., ., ., . # table_name +% schema, table, column, type, count, columnsize, heapsize, hashes, imprints, sorted # name +% clob, clob, clob, clob, bigint, bigint, bigint, bigint, bigint, boolean # type +% 3, 7, 1, 3, 5, 5, 1, 1, 4, 5 # length +[ "sys", "bug3923", "i", "int", 10000, 40000, 0, 0, 1200, true ] +#drop table bug3923; +#create table bug3923(i integer); +#select "schema", "table", "column", "type", "mode", typewidth, hashes, phash, imprints, sorted from storage('sys','_tables'); +% .L2, .L2, .L2, .L2, .L2, .L2, .L2, .L2, .L2, .L2 # table_name +% schema, table, column, type, mode, typewidth, hashes, phash, imprints, sorted # name +% clob, clob, clob, clob, clob, int, bigint, boolean, bigint, boolean # type +% 3, 7, 13, 8, 8, 2, 4, 5, 1, 5 # length +[ "sys", "_tables", "id", "int", "writable", 4, 2580, false, 0, false ] +[ "sys", "_tables", "name", "varchar", "writable", 8, 0, false, 0, false ] _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
