Changeset: a4d7efa97172 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a4d7efa97172 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/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single monetdb5/modules/mal/Tests/remote03.stable.out monetdb5/modules/mal/clients.c monetdb5/optimizer/opt_emptybind.c monetdb5/optimizer/opt_pipes.c monetdb5/optimizer/opt_prelude.c monetdb5/optimizer/opt_prelude.h monetdb5/optimizer/opt_support.c monetdb5/optimizer/opt_volcano.c sql/backends/monet5/sql_execute.c sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_optimizer.c sql/backends/monet5/sql_optimizer.h sql/server/rel_optimizer.c sql/server/rel_rel.c sql/server/rel_select.c sql/storage/bat/bat_table.c sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out.single sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.stable.out 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/Tests/setoptimizer.stable.out sql/test/Tests/setoptimizer.stable.out.Windows sql/test/bugs/Tests/All sql/test/remote/Tests/partition_elim.stable.out Branch: jit Log Message:
Merge default an small code cleanups diffs (truncated from 2489 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/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out --- a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out +++ b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out @@ -56,7 +56,7 @@ Ready. % def # name % clob # type % 563 # length -[ "optimizer.inline();optimizer.candidates();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.garbageCollector();" ] +[ "optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.garbageCollector();" ] #explain copy into ttt from '/tmp/xyz'; % .explain # table_name % mal # name @@ -117,7 +117,7 @@ end user.s8_1; % def # name % clob # type % 586 # length -[ "optimizer.inline();optimizer.candidates();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.sql_append();optimizer.garbageCollector();" ] +[ "optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.sql_append();optimizer.garbageCollector();" ] #explain copy into ttt from '/tmp/xyz'; % .explain # table_name % mal # name diff --git a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single --- a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single +++ b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single @@ -56,7 +56,7 @@ Ready. % def # name % clob # type % 563 # length -[ "optimizer.inline();optimizer.candidates();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.garbageCollector();" ] +[ "optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.garbageCollector();" ] #explain copy into ttt from '/tmp/xyz'; % .explain # table_name % mal # name @@ -115,7 +115,7 @@ end user.s8_1; % def # name % clob # type % 586 # length -[ "optimizer.inline();optimizer.candidates();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.sql_append();optimizer.garbageCollector();" ] +[ "optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.sql_append();optimizer.garbageCollector();" ] #explain copy into ttt from '/tmp/xyz'; % .explain # table_name % mal # name 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/monetdb5/optimizer/opt_emptybind.c b/monetdb5/optimizer/opt_emptybind.c --- a/monetdb5/optimizer/opt_emptybind.c +++ b/monetdb5/optimizer/opt_emptybind.c @@ -120,6 +120,14 @@ OPTemptybindImplementation(Client cntxt, continue; } + if (getFunctionId(p) == emptybindidxRef) { + OPTDEBUGemptybind + mnstr_printf(cntxt->fdout, "#empty bindidx pc %d var %d\n",i , getArg(p,0) ); + setFunctionId(p,bindidxRef); + marked[getArg(p,0)] = i; + continue; + } + // delta operations without updates+ insert can be replaced by an assignment if (getModuleId(p)== sqlRef && getFunctionId(p) == deltaRef && p->argc ==5){ OPTDEBUGemptybind diff --git a/monetdb5/optimizer/opt_pipes.c b/monetdb5/optimizer/opt_pipes.c --- a/monetdb5/optimizer/opt_pipes.c +++ b/monetdb5/optimizer/opt_pipes.c @@ -44,12 +44,12 @@ static struct PIPELINES { */ {"minimal_pipe", "optimizer.inline();" - "optimizer.candidates();" "optimizer.remap();" "optimizer.deadcode();" "optimizer.multiplex();" "optimizer.generator();" "optimizer.profiler();" + "optimizer.candidates();" "optimizer.garbageCollector();", "stable", NULL, NULL, 1}, /* The default pipe line contains as of Feb2010 @@ -63,7 +63,6 @@ static struct PIPELINES { */ {"default_pipe", "optimizer.inline();" - "optimizer.candidates();" "optimizer.remap();" "optimizer.costModel();" "optimizer.coercions();" @@ -87,6 +86,7 @@ static struct PIPELINES { "optimizer.multiplex();" "optimizer.generator();" "optimizer.profiler();" + "optimizer.candidates();" "optimizer.garbageCollector();", "stable", NULL, NULL, 1}, /* @@ -94,7 +94,6 @@ static struct PIPELINES { */ {"volcano_pipe", "optimizer.inline();" - "optimizer.candidates();" "optimizer.remap();" "optimizer.costModel();" "optimizer.coercions();" @@ -119,6 +118,7 @@ static struct PIPELINES { "optimizer.generator();" "optimizer.volcano();" "optimizer.profiler();" + "optimizer.candidates();" "optimizer.garbageCollector();", "stable", NULL, NULL, 1}, /* The no_mitosis pipe line is (and should be kept!) identical to the @@ -134,7 +134,6 @@ static struct PIPELINES { {"no_mitosis_pipe", "optimizer.inline();" "optimizer.remap();" - "optimizer.candidates();" "optimizer.costModel();" "optimizer.coercions();" "optimizer.evaluate();" @@ -156,6 +155,7 @@ static struct PIPELINES { "optimizer.multiplex();" "optimizer.profiler();" "optimizer.generator();" + "optimizer.candidates();" "optimizer.garbageCollector();", "stable", NULL, NULL, 1}, /* The sequential pipe line is (and should be kept!) identical to the @@ -170,7 +170,6 @@ static struct PIPELINES { */ {"sequential_pipe", "optimizer.inline();" - "optimizer.candidates();" "optimizer.remap();" "optimizer.costModel();" "optimizer.coercions();" @@ -192,6 +191,7 @@ static struct PIPELINES { "optimizer.multiplex();" "optimizer.generator();" "optimizer.profiler();" + "optimizer.candidates();" "optimizer.garbageCollector();", "stable", NULL, NULL, 1}, /* Experimental pipelines stressing various components under diff --git a/monetdb5/optimizer/opt_prelude.c b/monetdb5/optimizer/opt_prelude.c --- a/monetdb5/optimizer/opt_prelude.c +++ b/monetdb5/optimizer/opt_prelude.c @@ -20,6 +20,7 @@ str affectedRowsRef; str aggrRef; str alarmRef; str algebraRef; _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
