Changeset: 9f3d9efe1379 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9f3d9efe1379 Added Files: clients/R/build-for-cran.sh debian/monetdb5-server-hugeint.install debian/monetdb5-sql-hugeint.install monetdb5/mal/Tests/tst062.stable.err monetdb5/mal/Tests/tst062.stable.out monetdb5/modules/mal/Tests/remote07.malC monetdb5/optimizer/Tests/joinchain.mal monetdb5/optimizer/Tests/joinchain.stable.err monetdb5/optimizer/Tests/joinchain.stable.out sql/benchmarks/ATIS/Tests/select_group.stable.out.int128 sql/benchmarks/tpch/15a.sql sql/benchmarks/tpch/Tests/05-explain.stable.out.32bit sql/benchmarks/tpch/c.sql-primary sql/benchmarks/tpch/c.sql-primary-foreign sql/test/BugTracker-2009/Tests/case_evaluates_all_branches.SF-2893484.stable.out.int128 sql/test/BugTracker-2012/Tests/currenttime.Bug-2781.SQL.py sql/test/BugTracker-2015/Tests/alias.Bug-3704.sql sql/test/BugTracker-2015/Tests/alias.Bug-3704.stable.err sql/test/BugTracker-2015/Tests/alias.Bug-3704.stable.out sql/test/BugTracker-2015/Tests/assertHead.Bug-3706.sql sql/test/BugTracker-2015/Tests/assertHead.Bug-3706.stable.err sql/test/BugTracker-2015/Tests/assertHead.Bug-3706.stable.out sql/test/BugTracker-2015/Tests/case_aggr.Bug-3705.sql sql/test/BugTracker-2015/Tests/case_aggr.Bug-3705.stable.err sql/test/BugTracker-2015/Tests/case_aggr.Bug-3705.stable.out sql/test/BugTracker-2015/Tests/find_fk.Bug-3690.sql sql/test/BugTracker-2015/Tests/find_fk.Bug-3690.stable.err sql/test/BugTracker-2015/Tests/find_fk.Bug-3690.stable.out sql/test/BugTracker-2015/Tests/float-space-parse.Bug-3691.sql sql/test/BugTracker-2015/Tests/float-space-parse.Bug-3691.stable.err sql/test/BugTracker-2015/Tests/float-space-parse.Bug-3691.stable.out sql/test/BugTracker-2015/Tests/ifthenelse.Bug-3699.sql sql/test/BugTracker-2015/Tests/ifthenelse.Bug-3699.stable.err sql/test/BugTracker-2015/Tests/ifthenelse.Bug-3699.stable.out sql/test/BugTracker-2015/Tests/incorrect_result_type.Bug-3687.sql sql/test/BugTracker-2015/Tests/incorrect_result_type.Bug-3687.stable.err sql/test/BugTracker-2015/Tests/incorrect_result_type.Bug-3687.stable.out sql/test/BugTracker-2015/Tests/incorrect_result_type.Bug-3687.stable.out.int128 sql/test/BugTracker-2015/Tests/inf-nan-handling.Bug-3696.sql sql/test/BugTracker-2015/Tests/inf-nan-handling.Bug-3696.stable.err sql/test/BugTracker-2015/Tests/inf-nan-handling.Bug-3696.stable.out sql/test/BugTracker-2015/Tests/insert_into_merge_table_crash.Bug-3703.sql sql/test/BugTracker-2015/Tests/insert_into_merge_table_crash.Bug-3703.stable.err sql/test/BugTracker-2015/Tests/insert_into_merge_table_crash.Bug-3703.stable.out sql/test/BugTracker-2015/Tests/is_null_limit.Bug-3684.sql sql/test/BugTracker-2015/Tests/is_null_limit.Bug-3684.stable.err sql/test/BugTracker-2015/Tests/is_null_limit.Bug-3684.stable.out sql/test/BugTracker-2015/Tests/operator-priority.Bug-3686.sql sql/test/BugTracker-2015/Tests/operator-priority.Bug-3686.stable.err sql/test/BugTracker-2015/Tests/operator-priority.Bug-3686.stable.out sql/test/BugTracker-2015/Tests/project_rewrite.Bug-3693.sql sql/test/BugTracker-2015/Tests/project_rewrite.Bug-3693.stable.err sql/test/BugTracker-2015/Tests/project_rewrite.Bug-3693.stable.out sql/test/BugTracker-2015/Tests/project_rewrite.Bug-3693_2.sql sql/test/BugTracker-2015/Tests/project_rewrite.Bug-3693_2.stable.err sql/test/BugTracker-2015/Tests/project_rewrite.Bug-3693_2.stable.out sql/test/BugTracker-2015/Tests/readonly.Bug-3709.sql sql/test/BugTracker-2015/Tests/readonly.Bug-3709.stable.err sql/test/BugTracker-2015/Tests/readonly.Bug-3709.stable.out sql/test/BugTracker-2015/Tests/with-columns-mismatch.Bug-3697.sql sql/test/BugTracker-2015/Tests/with-columns-mismatch.Bug-3697.stable.err sql/test/BugTracker-2015/Tests/with-columns-mismatch.Bug-3697.stable.out sql/test/pg_regress/Tests/float8.stable.err.Windows sql/test/pg_regress/Tests/float8.stable.out.Windows sql/test/pg_regress/Tests/oid.stable.err.Windows sql/test/pg_regress/Tests/oid.stable.err.oid32.Windows sql/test/pg_regress/Tests/without_oid.stable.out.oid32 sql/test/remote/Tests/ssbm.stable.err sql/test/remote/Tests/ssbm.stable.out Removed Files: monetdb5/modules/mal/Tests/remote07.mal monetdb5/tests/BugTracker/Tests/joinpath-loop.Bug-2965.mal monetdb5/tests/BugTracker/Tests/joinpath-loop.Bug-2965.stable.err monetdb5/tests/BugTracker/Tests/joinpath-loop.Bug-2965.stable.out sql/backends/monet5/rest/73_jsonstore.mal sql/backends/monet5/rest/Makefile.ag sql/backends/monet5/rest/Tests/All sql/backends/monet5/rest/Tests/jsonstore00.sql sql/backends/monet5/rest/Tests/jsonstore00.stable.err sql/backends/monet5/rest/Tests/jsonstore00.stable.out sql/backends/monet5/rest/Tests/jsonstore01.sql sql/backends/monet5/rest/Tests/jsonstore01.stable.err sql/backends/monet5/rest/Tests/jsonstore01.stable.out sql/backends/monet5/rest/jsonstore.mal sql/backends/monet5/rest/rest_jsonstore.c sql/backends/monet5/rest/rest_jsonstore.h sql/backends/monet5/rest/rest_jsonstore_handle_get.c sql/backends/monet5/rest/rest_jsonstore_handle_get.h sql/benchmarks/tpch/05a.sql sql/benchmarks/tpch/06a.sql sql/benchmarks/tpch/07a.sql sql/benchmarks/tpch/08a.sql sql/benchmarks/tpch/09a.sql sql/benchmarks/tpch/09b.sql sql/benchmarks/tpch/09c.sql sql/benchmarks/tpch/1.sql sql/benchmarks/tpch/13a.sql sql/benchmarks/tpch/c.sql-dec sql/benchmarks/tpch/c.sql-dec-primary sql/benchmarks/tpch/c.sql-dec-primary-foreign sql/benchmarks/tpch/h.sql sql/test/BugTracker-2012/Tests/currenttime.Bug-2781.py sql/test/pg_regress/Tests/oid.stable.out.oid64 Modified Files: .hgtags MonetDB.spec buildtools/autogen/setup.py clients/R/MonetDB.R/DESCRIPTION clients/R/MonetDB.R/NEWS clients/R/MonetDB.R/R/dbi.R clients/R/MonetDB.R/R/dplyr.R clients/R/MonetDB.R/man/monetdb.read.csv.Rd clients/R/MonetDB.R/src/mapisplit-r.c clients/R/Tests/dbi.R clients/Tests/MAL-signatures_all.stable.out clients/Tests/MAL-signatures_all.stable.out.int128 clients/Tests/SQL-dump_all.stable.out clients/Tests/SQL-dump_all.stable.out.int128 clients/Tests/SQL-dump_all.stable.out.oid32 clients/Tests/SQL-dump_all.stable.out.oid32.int128 clients/Tests/SQL-dump_geom.stable.out clients/Tests/SQL-dump_geom.stable.out.32bit clients/Tests/SQL-dump_geom.stable.out.64bit.oid32 clients/Tests/SQL-dump_none.stable.out clients/Tests/exports.stable.out clients/mapiclient/eventparser.c clients/mapiclient/eventparser.h clients/mapiclient/tachograph.c clients/mapiclient/tomograph.c clients/mapilib/mapi.c clients/odbc/driver/Copyright clients/odbc/driver/SQLBrowseConnect.c clients/odbc/driver/SQLGetDescField.c clients/odbc/driver/SQLGetInfo.c clients/odbc/driver/SQLGetStmtAttr.c configure.ag debian/control debian/monetdb5-server.install debian/monetdb5-sql.install gdk/gdk.h gdk/gdk_atoms.c gdk/gdk_bat.c gdk/gdk_batop.c gdk/gdk_bbp.c gdk/gdk_group.c gdk/gdk_heap.c gdk/gdk_imprints.c gdk/gdk_join.c gdk/gdk_logger.c gdk/gdk_logger.h gdk/gdk_private.h gdk/gdk_search.c gdk/gdk_select.c gdk/gdk_setop.c gdk/gdk_storage.c gdk/gdk_system.c gdk/gdk_system.h gdk/gdk_unique.c gdk/gdk_utils.c java/src/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java monetdb5/extras/mal_optimizer_template/opt_sql_append.c monetdb5/extras/rapi/Tests/All monetdb5/mal/Makefile.ag monetdb5/mal/Tests/All monetdb5/mal/Tests/tst019.stable.out monetdb5/mal/Tests/tst027.stable.out monetdb5/mal/Tests/tst038.stable.out monetdb5/mal/Tests/tst044.stable.out monetdb5/mal/Tests/tst070.stable.out monetdb5/mal/Tests/tst071.stable.out monetdb5/mal/Tests/tst102.stable.out monetdb5/mal/Tests/tst104.stable.out monetdb5/mal/Tests/tst105.stable.out monetdb5/mal/Tests/tst105a.stable.out monetdb5/mal/Tests/tst106.stable.out monetdb5/mal/Tests/tst115.stable.out monetdb5/mal/Tests/tst150.stable.out monetdb5/mal/Tests/tst161.stable.out monetdb5/mal/Tests/tst162.stable.out monetdb5/mal/Tests/tst163.stable.out monetdb5/mal/Tests/tst611.stable.out monetdb5/mal/Tests/tst755.stable.out monetdb5/mal/Tests/tst760.stable.out monetdb5/mal/Tests/tst804.stable.out monetdb5/mal/mal.c monetdb5/mal/mal.h monetdb5/mal/mal_client.h monetdb5/mal/mal_http_daemon.c monetdb5/mal/mal_interpreter.c monetdb5/mal/mal_listing.c monetdb5/mal/mal_listing.h monetdb5/mal/mal_parser.c monetdb5/mal/mal_private.h monetdb5/mal/mal_profiler.c monetdb5/mal/mal_resolve.c monetdb5/mal/mal_resolve.h monetdb5/mal/mal_runtime.c monetdb5/mal/mal_session.c monetdb5/modules/kernel/algebra.c monetdb5/modules/kernel/algebra.h monetdb5/modules/kernel/algebra.mal monetdb5/modules/kernel/bat5.c monetdb5/modules/kernel/bat5.h monetdb5/modules/kernel/bat5.mal monetdb5/modules/kernel/logger.c monetdb5/modules/mal/Tests/All monetdb5/modules/mal/Tests/inspect05.stable.out monetdb5/modules/mal/Tests/inspect05.stable.out.int128 monetdb5/modules/mal/Tests/remote07.stable.out monetdb5/modules/mal/Tests/remote88.mal monetdb5/modules/mal/cluster.c monetdb5/modules/mal/joinpath.c monetdb5/modules/mal/joinpath.h monetdb5/modules/mal/mal_mapi.c monetdb5/modules/mal/mat.c monetdb5/modules/mal/pcre.c monetdb5/modules/mal/remote.c monetdb5/optimizer/Tests/All monetdb5/optimizer/Tests/CMexample.stable.out monetdb5/optimizer/Tests/JPexample.stable.out monetdb5/optimizer/Tests/inline08.stable.out monetdb5/optimizer/Tests/inlineCst.stable.out monetdb5/optimizer/Tests/inlineIfthen.stable.out monetdb5/optimizer/Tests/joinpath.mal monetdb5/optimizer/Tests/leftjoinpath.stable.out monetdb5/optimizer/Tests/tst4300.mal monetdb5/optimizer/Tests/tst4300.stable.out monetdb5/optimizer/Tests/tst4630.stable.out monetdb5/optimizer/Tests/tst4700.stable.out monetdb5/optimizer/opt_coercion.c monetdb5/optimizer/opt_commonTerms.c monetdb5/optimizer/opt_costModel.c monetdb5/optimizer/opt_deadcode.c monetdb5/optimizer/opt_joinpath.c monetdb5/optimizer/opt_macro.c monetdb5/optimizer/opt_matpack.c monetdb5/optimizer/opt_mergetable.c monetdb5/optimizer/opt_mitosis.c monetdb5/optimizer/opt_multiplex.c monetdb5/optimizer/opt_prelude.c monetdb5/optimizer/opt_prelude.h monetdb5/optimizer/opt_support.c monetdb5/optimizer/opt_support.h monetdb5/optimizer/opt_wrapper.c monetdb5/optimizer/optimizer.mal monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/ADT_not_available.SF-850137.stable.out monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/split_inf_loop.SF-1161583.stable.out monetdb5/tests/BugReports/Tests/lngssaretruncated.stable.out monetdb5/tests/BugTracker/Tests/All monetdb5/tests/BugTracker/Tests/algebra_project.Bug-3045.mal monetdb5/tests/BugTracker/Tests/algebra_project.Bug-3045.stable.out monetdb5/tests/BugTracker/Tests/parser.SF-2051309.stable.out monetdb5/tools/Tests/mserver5--help.stable.err sql/backends/monet5/LSST/Tests/lsst_htmxmatch.sql sql/backends/monet5/LSST/Tests/lsst_htmxmatch.stable.out sql/backends/monet5/Makefile.ag sql/backends/monet5/rel_bin.c sql/backends/monet5/sql.c sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_optimizer.c sql/backends/monet5/sql_scenario.c sql/backends/monet5/sql_upgrades.c sql/benchmarks/ATIS/Tests/select_group.stable.out sql/benchmarks/ssbm/Tests/01-explain.stable.out sql/benchmarks/ssbm/Tests/01-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/02-explain.stable.out sql/benchmarks/ssbm/Tests/02-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/03-explain.stable.out sql/benchmarks/ssbm/Tests/03-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/04-explain.stable.out sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/05-explain.stable.out sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/06-explain.stable.out sql/benchmarks/ssbm/Tests/06-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/07-explain.stable.out sql/benchmarks/ssbm/Tests/07-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/08-explain.stable.out sql/benchmarks/ssbm/Tests/08-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/09-explain.stable.out sql/benchmarks/ssbm/Tests/09-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/10-explain.stable.out sql/benchmarks/ssbm/Tests/10-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/11-explain.stable.out sql/benchmarks/ssbm/Tests/11-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/12-explain.stable.out sql/benchmarks/ssbm/Tests/12-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/13-explain.stable.out sql/benchmarks/ssbm/Tests/13-explain.stable.out.int128 sql/benchmarks/tpch/01.sql sql/benchmarks/tpch/02.sql sql/benchmarks/tpch/03.sql sql/benchmarks/tpch/04.sql sql/benchmarks/tpch/05.sql sql/benchmarks/tpch/06.sql sql/benchmarks/tpch/07.sql sql/benchmarks/tpch/08.sql sql/benchmarks/tpch/09.sql sql/benchmarks/tpch/10.sql sql/benchmarks/tpch/11.sql sql/benchmarks/tpch/12.sql sql/benchmarks/tpch/13.sql sql/benchmarks/tpch/14.sql sql/benchmarks/tpch/15.sql sql/benchmarks/tpch/16.sql sql/benchmarks/tpch/17.sql sql/benchmarks/tpch/18.sql sql/benchmarks/tpch/19.sql sql/benchmarks/tpch/20.sql sql/benchmarks/tpch/21.sql sql/benchmarks/tpch/22.sql sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.err sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out.int128 sql/benchmarks/tpch/LOCKED/Tests/01.stable.out sql/benchmarks/tpch/LOCKED/Tests/01.stable.out.int128 sql/benchmarks/tpch/LOCKED/Tests/02.stable.out sql/benchmarks/tpch/LOCKED/Tests/03.stable.out.int128 sql/benchmarks/tpch/LOCKED/Tests/04.stable.out sql/benchmarks/tpch/LOCKED/Tests/05.stable.out sql/benchmarks/tpch/LOCKED/Tests/05.stable.out.int128 sql/benchmarks/tpch/LOCKED/Tests/06.stable.out.int128 sql/benchmarks/tpch/LOCKED/Tests/07.stable.out sql/benchmarks/tpch/LOCKED/Tests/07.stable.out.int128 sql/benchmarks/tpch/LOCKED/Tests/08.stable.out sql/benchmarks/tpch/LOCKED/Tests/08.stable.out.int128 sql/benchmarks/tpch/LOCKED/Tests/09.stable.out sql/benchmarks/tpch/LOCKED/Tests/09.stable.out.int128 sql/benchmarks/tpch/LOCKED/Tests/10.stable.out sql/benchmarks/tpch/LOCKED/Tests/10.stable.out.int128 sql/benchmarks/tpch/LOCKED/Tests/12.stable.out sql/benchmarks/tpch/LOCKED/Tests/12.stable.out.int128 sql/benchmarks/tpch/LOCKED/Tests/13.stable.out sql/benchmarks/tpch/LOCKED/Tests/14.stable.out sql/benchmarks/tpch/LOCKED/Tests/14.stable.out.int128 sql/benchmarks/tpch/LOCKED/Tests/15.stable.out sql/benchmarks/tpch/LOCKED/Tests/15.stable.out.int128 sql/benchmarks/tpch/LOCKED/Tests/16.stable.out sql/benchmarks/tpch/LOCKED/Tests/17.stable.out sql/benchmarks/tpch/LOCKED/Tests/18.stable.out sql/benchmarks/tpch/LOCKED/Tests/18.stable.out.int128 sql/benchmarks/tpch/LOCKED/Tests/19.stable.out sql/benchmarks/tpch/LOCKED/Tests/19.stable.out.int128 sql/benchmarks/tpch/LOCKED/Tests/20.stable.err sql/benchmarks/tpch/LOCKED/Tests/20.stable.out sql/benchmarks/tpch/LOCKED/Tests/21.stable.out sql/benchmarks/tpch/LOCKED/Tests/21.stable.out.int128 sql/benchmarks/tpch/LOCKED/Tests/22.stable.out sql/benchmarks/tpch/LOCKED/Tests/22.stable.out.int128 sql/benchmarks/tpch/LOCKED/Tests/check0.stable.out sql/benchmarks/tpch/LOCKED/Tests/check1.stable.out sql/benchmarks/tpch/LOCKED/Tests/check2.stable.out sql/benchmarks/tpch/LOCKED/Tests/create.sql.src sql/benchmarks/tpch/LOCKED/Tests/load.stable.out sql/benchmarks/tpch/SF-0.01/customer.tbl sql/benchmarks/tpch/SF-0.01/lineitem.tbl sql/benchmarks/tpch/SF-0.01/nation.tbl sql/benchmarks/tpch/SF-0.01/orders.tbl sql/benchmarks/tpch/SF-0.01/part.tbl sql/benchmarks/tpch/SF-0.01/partsupp.tbl sql/benchmarks/tpch/SF-0.01/region.tbl sql/benchmarks/tpch/SF-0.01/supplier.tbl sql/benchmarks/tpch/Tests/01-22.stable.out sql/benchmarks/tpch/Tests/01-22.stable.out.int128 sql/benchmarks/tpch/Tests/01-explain.stable.out sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit sql/benchmarks/tpch/Tests/01-explain.stable.out.int128 sql/benchmarks/tpch/Tests/01.stable.out sql/benchmarks/tpch/Tests/01.stable.out.int128 sql/benchmarks/tpch/Tests/02-explain.stable.out sql/benchmarks/tpch/Tests/02-plan.stable.out sql/benchmarks/tpch/Tests/02.stable.out sql/benchmarks/tpch/Tests/03-explain.stable.out sql/benchmarks/tpch/Tests/03-explain.stable.out.int128 sql/benchmarks/tpch/Tests/03-plan.stable.out sql/benchmarks/tpch/Tests/03-plan.stable.out.int128 sql/benchmarks/tpch/Tests/03.stable.out.int128 sql/benchmarks/tpch/Tests/04-explain.stable.out sql/benchmarks/tpch/Tests/04-explain.stable.out.32bit sql/benchmarks/tpch/Tests/04.stable.out sql/benchmarks/tpch/Tests/05-explain.stable.out sql/benchmarks/tpch/Tests/05-explain.stable.out.int128 sql/benchmarks/tpch/Tests/05-plan.stable.out sql/benchmarks/tpch/Tests/05-plan.stable.out.int128 sql/benchmarks/tpch/Tests/05.stable.out sql/benchmarks/tpch/Tests/05.stable.out.int128 sql/benchmarks/tpch/Tests/06-explain.stable.out sql/benchmarks/tpch/Tests/06-explain.stable.out.int128 sql/benchmarks/tpch/Tests/06-plan.stable.out sql/benchmarks/tpch/Tests/06-plan.stable.out.int128 sql/benchmarks/tpch/Tests/06.stable.out.int128 sql/benchmarks/tpch/Tests/07-explain.stable.out sql/benchmarks/tpch/Tests/07-explain.stable.out.int128 sql/benchmarks/tpch/Tests/07-plan.stable.out sql/benchmarks/tpch/Tests/07-plan.stable.out.int128 sql/benchmarks/tpch/Tests/07.stable.out sql/benchmarks/tpch/Tests/07.stable.out.int128 sql/benchmarks/tpch/Tests/08-explain.stable.out sql/benchmarks/tpch/Tests/08-explain.stable.out.int128 sql/benchmarks/tpch/Tests/08-plan.stable.out sql/benchmarks/tpch/Tests/08-plan.stable.out.int128 sql/benchmarks/tpch/Tests/08.stable.out sql/benchmarks/tpch/Tests/08.stable.out.int128 sql/benchmarks/tpch/Tests/09-explain.stable.out sql/benchmarks/tpch/Tests/09-explain.stable.out.int128 sql/benchmarks/tpch/Tests/09-plan.stable.out sql/benchmarks/tpch/Tests/09-plan.stable.out.int128 sql/benchmarks/tpch/Tests/09.stable.out sql/benchmarks/tpch/Tests/09.stable.out.int128 sql/benchmarks/tpch/Tests/10-explain.stable.out sql/benchmarks/tpch/Tests/10-explain.stable.out.int128 sql/benchmarks/tpch/Tests/10-plan.stable.out sql/benchmarks/tpch/Tests/10-plan.stable.out.int128 sql/benchmarks/tpch/Tests/10.stable.out sql/benchmarks/tpch/Tests/10.stable.out.int128 sql/benchmarks/tpch/Tests/11-explain.stable.out sql/benchmarks/tpch/Tests/11-explain.stable.out.int128 sql/benchmarks/tpch/Tests/11-plan.stable.out sql/benchmarks/tpch/Tests/11-plan.stable.out.int128 sql/benchmarks/tpch/Tests/12-explain.stable.out sql/benchmarks/tpch/Tests/12-explain.stable.out.int128 sql/benchmarks/tpch/Tests/12-plan.stable.out sql/benchmarks/tpch/Tests/12.stable.out sql/benchmarks/tpch/Tests/12.stable.out.int128 sql/benchmarks/tpch/Tests/13-explain.stable.out sql/benchmarks/tpch/Tests/13-explain.stable.out.32bit sql/benchmarks/tpch/Tests/13.stable.out sql/benchmarks/tpch/Tests/14-explain.stable.out sql/benchmarks/tpch/Tests/14-explain.stable.out.int128 sql/benchmarks/tpch/Tests/14-plan.stable.out sql/benchmarks/tpch/Tests/14-plan.stable.out.int128 sql/benchmarks/tpch/Tests/14.stable.out sql/benchmarks/tpch/Tests/14.stable.out.int128 sql/benchmarks/tpch/Tests/15-explain.stable.out sql/benchmarks/tpch/Tests/15-explain.stable.out.int128 sql/benchmarks/tpch/Tests/15.stable.out sql/benchmarks/tpch/Tests/15.stable.out.int128 sql/benchmarks/tpch/Tests/16-explain.stable.out sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit sql/benchmarks/tpch/Tests/16-plan.stable.out sql/benchmarks/tpch/Tests/16.stable.out sql/benchmarks/tpch/Tests/17-explain.stable.out sql/benchmarks/tpch/Tests/17-explain.stable.out.int128 sql/benchmarks/tpch/Tests/17-plan.stable.out sql/benchmarks/tpch/Tests/17-plan.stable.out.int128 sql/benchmarks/tpch/Tests/17.stable.out sql/benchmarks/tpch/Tests/18-explain.stable.out sql/benchmarks/tpch/Tests/18-explain.stable.out.int128 sql/benchmarks/tpch/Tests/18-plan.stable.out sql/benchmarks/tpch/Tests/18-plan.stable.out.int128 sql/benchmarks/tpch/Tests/18.stable.out sql/benchmarks/tpch/Tests/18.stable.out.int128 sql/benchmarks/tpch/Tests/19-explain.stable.out sql/benchmarks/tpch/Tests/19-explain.stable.out.int128 sql/benchmarks/tpch/Tests/19-plan.stable.out sql/benchmarks/tpch/Tests/19-plan.stable.out.int128 sql/benchmarks/tpch/Tests/19.stable.out sql/benchmarks/tpch/Tests/19.stable.out.int128 sql/benchmarks/tpch/Tests/20-explain.stable.out sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit sql/benchmarks/tpch/Tests/20-explain.stable.out.int128 sql/benchmarks/tpch/Tests/20-plan.stable.out sql/benchmarks/tpch/Tests/20-plan.stable.out.int128 sql/benchmarks/tpch/Tests/20.stable.out sql/benchmarks/tpch/Tests/21-explain.stable.out sql/benchmarks/tpch/Tests/21-explain.stable.out.32bit sql/benchmarks/tpch/Tests/21-plan.stable.out sql/benchmarks/tpch/Tests/21.stable.out sql/benchmarks/tpch/Tests/22-explain.stable.out sql/benchmarks/tpch/Tests/22-explain.stable.out.32bit sql/benchmarks/tpch/Tests/22-explain.stable.out.int128 sql/benchmarks/tpch/Tests/22-plan.stable.out sql/benchmarks/tpch/Tests/22.stable.out sql/benchmarks/tpch/Tests/check0.stable.out sql/benchmarks/tpch/Tests/check1.stable.out sql/benchmarks/tpch/Tests/create.sql.src sql/benchmarks/tpch/Tests/load.stable.out sql/benchmarks/tpch/all.sql sql/benchmarks/tpch/alter.sql sql/benchmarks/tpch/c.sql sql/benchmarks/tpch/fileleak/Tests/check0.stable.out sql/benchmarks/tpch/fileleak/Tests/check1.stable.out sql/benchmarks/tpch/fileleak/Tests/create.sql.src sql/benchmarks/tpch/fileleak/Tests/delete_all.stable.out sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out.Windows sql/benchmarks/tpch/fileleak/Tests/load.stable.out sql/benchmarks/tpch/load.sh sql/benchmarks/tpch/queries.sql sql/common/Makefile.ag sql/common/sql_types.c sql/include/sql_catalog.h sql/include/sql_relation.h sql/rel.txt sql/scripts/17_temporal.sql sql/server/rel_exp.c sql/server/rel_optimizer.c sql/server/rel_psm.c sql/server/rel_schema.c sql/server/rel_select.c sql/server/rel_updates.c sql/server/sql_parser.y sql/server/sql_scan.c sql/storage/bat/bat_storage.c sql/storage/bat/bat_storage.h sql/storage/bat/bat_table.c sql/test/BugTracker-2009/Tests/case_evaluates_all_branches.SF-2893484.stable.out sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err.Solaris sql/test/BugTracker-2010/Tests/crash-with-huge-query.Bug-2647.stable.out sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit sql/test/BugTracker-2010/Tests/offset_limited_32bit.SF-2950579.stable.out.oid32 sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128 sql/test/BugTracker-2011/Tests/subquery_in_from_clause.Bug-2812.stable.out sql/test/BugTracker-2012/Tests/aggregate_incorrect_precision_scale.Bug-3182.stable.out sql/test/BugTracker-2012/Tests/boolean_coersion.Bug-3012.stable.out sql/test/BugTracker-2012/Tests/currenttime.Bug-2781.stable.out sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out sql/test/BugTracker-2013/Tests/bogus_aggregation_casts.Bug-3342.stable.out sql/test/BugTracker-2013/Tests/median.Bug-3352.stable.out sql/test/BugTracker-2014/Tests/python-microseconds.Bug-3439.stable.out sql/test/BugTracker-2015/Tests/All sql/test/BugTracker-2015/Tests/reserved_keywords.Bug-3613.sql sql/test/BugTracker-2015/Tests/reserved_keywords.Bug-3613.stable.out sql/test/Dependencies/Tests/Dependencies_bam.stable.out sql/test/Dependencies/Tests/Dependencies_bam.stable.out.int128 sql/test/leaks/Tests/check0_bam.stable.out.int128 sql/test/leaks/Tests/check1_bam.stable.out sql/test/leaks/Tests/check1_bam.stable.out.int128 sql/test/leaks/Tests/check2_bam.stable.out sql/test/leaks/Tests/check2_bam.stable.out.int128 sql/test/leaks/Tests/check3_bam.stable.out sql/test/leaks/Tests/check3_bam.stable.out.int128 sql/test/leaks/Tests/check4_bam.stable.out sql/test/leaks/Tests/check4_bam.stable.out.int128 sql/test/leaks/Tests/check5_bam.stable.out sql/test/leaks/Tests/check5_bam.stable.out.int128 sql/test/leaks/Tests/drop3_bam.stable.out.int128 sql/test/leaks/Tests/select1_bam.stable.out.int128 sql/test/leaks/Tests/select2_bam.stable.out.int128 sql/test/leaks/Tests/temp1_bam.stable.out.int128 sql/test/leaks/Tests/temp2_bam.stable.out.int128 sql/test/leaks/Tests/temp3_bam.stable.out.int128 sql/test/mergetables/Tests/forex.stable.out sql/test/pg_regress/Tests/float4.stable.err sql/test/pg_regress/Tests/float4.stable.out sql/test/pg_regress/Tests/float8.sql sql/test/pg_regress/Tests/float8.stable.err sql/test/pg_regress/Tests/float8.stable.out sql/test/pg_regress/Tests/horology.stable.out sql/test/pg_regress/Tests/interval.stable.out sql/test/pg_regress/Tests/interval.stable.out.int128 sql/test/pg_regress/Tests/numeric.stable.out sql/test/pg_regress/Tests/oid.stable.err.oid32 sql/test/pg_regress/Tests/oid.stable.out sql/test/pg_regress/Tests/oid.stable.out.oid32 sql/test/pg_regress/Tests/timestamptz.stable.out sql/test/quantiles/Tests/quantiles.stable.out sql/test/remote/Tests/ssbm.SQL.py testing/malcheck.py tools/merovingian/daemon/client.c tools/merovingian/daemon/merovingian.c tools/mserver/mserver5.c Branch: transaction-replication Log Message:
Merge with default branch. Resolve merge conflicts in gdk_logger. diffs (truncated from 215755 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -588,3 +588,4 @@ 2da8cbcb65ed56690bad29f089d996eac347b48d 6607367487d91eb02c5eb7dfb9d96606f8f7c6f0 Oct2014_SP1_release e3d0eecdc35dc633fdd89157ba704f60f03756c1 Oct2014_9 d98df578687e677ae3abbc0ba41e3bb0631ef08a Oct2014_SP2_release +c80c3439c5d7b2bddb710e584eb0936adc21d462 MonetDB.R-0.9.6 diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -636,7 +636,8 @@ fi %if %{?with_rintegration:1}%{!?with_rintegration:0} %exclude %{_libdir}/monetdb5/rapi.mal %endif -%exclude %{_libdir}/monetdb5/sql.mal +%exclude %{_libdir}/monetdb5/sql*.mal +%exclude %{_libdir}/monetdb5/*_hge.mal %{_libdir}/monetdb5/*.mal %if %{?with_geos:1}%{!?with_geos:0} %exclude %{_libdir}/monetdb5/autoload/*_geom.mal @@ -645,7 +646,7 @@ fi %if %{?with_rintegration:1}%{!?with_rintegration:0} %exclude %{_libdir}/monetdb5/autoload/*_rapi.mal %endif -%exclude %{_libdir}/monetdb5/autoload/*_sql.mal +%exclude %{_libdir}/monetdb5/autoload/??_sql*.mal %{_libdir}/monetdb5/autoload/*.mal %if %{?with_geos:1}%{!?with_geos:0} %exclude %{_libdir}/monetdb5/lib_geom.so @@ -663,6 +664,26 @@ fi %{_libdir}/monetdb5/*.so %doc %{_mandir}/man1/mserver5.1.gz +%package -n MonetDB5-server-hugeint +Summary: MonetDB - 128-bit integer support for MonetDB5-server +Group: Application/Databases +Requires: MonetDB5-server + +%description -n MonetDB5-server-hugeint +MonetDB is a database management system that is developed from a +main-memory perspective with use of a fully decomposed storage model, +automatic index management, extensibility of data types and search +accelerators. It also has an SQL frontend. + +This package provides HUGEINT (128-bit integer) support for the +MonetDB5-server component. + +%files -n MonetDB5-server-hugeint +%exclude %{_libdir}/monetdb5/sql*_hge.mal +%{_libdir}/monetdb5/*_hge.mal +%exclude %{_libdir}/monetdb5/autoload/??_sql_hge.mal +%{_libdir}/monetdb5/autoload/*_hge.mal + %package -n MonetDB5-server-devel Summary: MonetDB development files Group: Applications/Databases @@ -723,7 +744,7 @@ systemd-tmpfiles --create %{_sysconfdir} %exclude %{_sysconfdir}/tmpfiles.d/monetdbd.conf %endif %config(noreplace) %{_localstatedir}/monetdb5/dbfarm/.merovingian_properties -%{_libdir}/monetdb5/autoload/*_sql*.mal +%{_libdir}/monetdb5/autoload/??_sql.mal %{_libdir}/monetdb5/lib_sql.so %{_libdir}/monetdb5/*.sql %dir %{_libdir}/monetdb5/createdb @@ -734,7 +755,9 @@ systemd-tmpfiles --create %{_sysconfdir} %if %{?with_samtools:1}%{!?with_samtools:0} %exclude %{_libdir}/monetdb5/createdb/*_bam.sql %endif -%{_libdir}/monetdb5/createdb/* +%exclude %{_libdir}/monetdb5/createdb/*_hge.sql +%{_libdir}/monetdb5/createdb/*.sql +%exclude %{_libdir}/monetdb5/sql*_hge.mal %{_libdir}/monetdb5/sql*.mal %doc %{_mandir}/man1/monetdb.1.gz %doc %{_mandir}/man1/monetdbd.1.gz @@ -748,6 +771,27 @@ systemd-tmpfiles --create %{_sysconfdir} %{_datadir}/doc/MonetDB-SQL-%{version}/* %endif +%package SQL-server5-hugeint +Summary: MonetDB5 128 bit integer (hugeint) support for SQL +Group: Applications/Databases +Requires: MonetDB5-server-hugeint = %{version}-%{release} +Requires: MonetDB-SQL-server5 = %{version}-%{release} + +%description SQL-server5-hugeint +MonetDB is a database management system that is developed from a +main-memory perspective with use of a fully decomposed storage model, +automatic index management, extensibility of data types and search +accelerators. It also has an SQL frontend. + +This package provides HUGEINT (128-bit integer) support for the SQL +frontend of MonetDB. + +%files SQL-server5-hugeint +%defattr(-,root,root) +%{_libdir}/monetdb5/autoload/??_sql_hge.mal +%{_libdir}/monetdb5/createdb/*_hge.sql +%{_libdir}/monetdb5/sql*_hge.mal + %package -n python-monetdb Summary: Native MonetDB client Python API Group: Applications/Databases diff --git a/buildtools/autogen/setup.py b/buildtools/autogen/setup.py --- a/buildtools/autogen/setup.py +++ b/buildtools/autogen/setup.py @@ -16,6 +16,6 @@ setup(name = "autogen", url = "http://www.monetdb.org/", maintainer = "Sjoerd Mullender", maintainer_email = "i...@monetdb.org", - license = "MonetDB Public License", + license = "Mozilla Public License, v. 2.0", packages = ['autogen'], scripts = ['autogen.py']) diff --git a/clients/R/MonetDB.R/DESCRIPTION b/clients/R/MonetDB.R/DESCRIPTION --- a/clients/R/MonetDB.R/DESCRIPTION +++ b/clients/R/MonetDB.R/DESCRIPTION @@ -1,5 +1,5 @@ Package: MonetDB.R -Version: 0.9.7 +Version: 0.9.8 Title: Connect MonetDB to R Authors@R: c(person("Hannes Muehleisen", role = c("aut", "cre"),email = "han...@cwi.nl"), person("Thomas Lumley", role = "ctb"), diff --git a/clients/R/MonetDB.R/NEWS b/clients/R/MonetDB.R/NEWS --- a/clients/R/MonetDB.R/NEWS +++ b/clients/R/MonetDB.R/NEWS @@ -1,11 +1,15 @@ +0.9.8 +- Added support for esoteric data types such as MONTH_INTERVAL (Thanks, Roman) +- Cleaned up SQL to R type mapping (we had this twice) +- Now creating actual R integers if data fits + 0.9.7 -- monetdb.read.csv TODO (thanks, Duncan) -- dbWriteTable encoding checks TODO (thanks, Anthony) -- deprecated nrows parameter to monetdb.read.csv, not neccessary any more because of upgrades to MonetDB -- added query progress bar (counting MAL statements) for MonetDB releases following Oct2014, enable with options(monetdb.profile=T) +- Fixed crash on Windows (Sorry, everyone) 0.9.6 -- Fixed non-ASCII character handling (thanks, Roman!) +- monetdb.read.csv new create= parameter (Thanks, Duncan) +- deprecated nrows parameter to monetdb.read.csv, not neccessary any more because of changes to MonetDB +- Fixed non-ASCII character handling (Thanks, Roman) - Fully removed C-based socket code - support for dplyr verbs sample_n() and sample_frac() diff --git a/clients/R/MonetDB.R/R/dbi.R b/clients/R/MonetDB.R/R/dbi.R --- a/clients/R/MonetDB.R/R/dbi.R +++ b/clients/R/MonetDB.R/R/dbi.R @@ -126,12 +126,8 @@ setMethod("dbConnect", "MonetDBDriver", dbSendQuery(conn, "set optimizer='sequential_pipe'") } - if (getOption("monetdb.profile", T)) { - .profiler_enable(conn) - } - + # if (getOption("monetdb.profile", T)) .profiler_enable(conn) return(conn) - }, valueClass="MonetDBConnection") @@ -234,7 +230,7 @@ setMethod("dbSendQuery", signature(conn= env <- NULL if (getOption("monetdb.debug.query", F)) message("QQ: '", statement, "'") # make the progress bar wait for querylog.define - if (getOption("monetdb.profile", T)) .profiler_arm() + # if (getOption("monetdb.profile", T)) .profiler_arm() # the actual request mresp <- .mapiRequest(conn, paste0("s", statement, "\n;"), async=async) @@ -436,31 +432,29 @@ setMethod("dbSendUpdateAsync", signature ### MonetDBResult setClass("MonetDBResult", representation("DBIResult", env="environment")) +.CT_INT <- 0L .CT_NUM <- 1L .CT_CHR <- 2L .CT_CHRR <- 3L .CT_BOOL <- 4L .CT_RAW <- 5L +# type mapping matrix +monetTypes <- rep(c("integer", "numeric", "character", "character", "logical", "raw"), c(6, 5, 4, 6, 1, 1)) +names(monetTypes) <- c(c("WRD", "TINYINT", "SMALLINT", "INT", "MONTH_INTERVAL"), # month_interval is the diff between date cols, int + c("BIGINT", "HUGEINT", "REAL", "DOUBLE", "DECIMAL", "SEC_INTERVAL"), # sec_interval is the difference between timestamps, float + c("CHAR", "VARCHAR", "CLOB", "STR"), + c("INTERVAL", "DATE", "TIME", "TIMETZ", "TIMESTAMP", "TIMESTAMPTZ"), + c("BOOLEAN"), + c("BLOB")) + monetdbRtype <- function(dbType) { dbType <- toupper(dbType) - - if (dbType %in% c("TINYINT", "SMALLINT", "INT", "BIGINT", "REAL", "DOUBLE", "DECIMAL", "WRD")) { - return("numeric") + rtype <- monetTypes[dbType] + if (is.na(rtype)) { + stop("Unknown DB type ", dbType) } - if (dbType %in% c("CHAR", "VARCHAR", "CLOB", "STR")) { - return("character") - } - if (dbType %in% c("INTERVAL", "DATE", "TIME", "TIMESTAMP")) { - return("date") - } - if (dbType == "BOOLEAN") { - return("logical") - } - if (dbType == "BLOB") { - return("raw") - } - stop("Unknown DB type ", dbType) + rtype } setMethod("fetch", signature(res="MonetDBResult", n="numeric"), def=function(res, n, ...) { @@ -495,6 +489,10 @@ setMethod("dbFetch", signature(res="Mone for (i in seq.int(info$cols)) { rtype <- monetdbRtype(info$types[i]) + if (rtype=="integer") { + df[[i]] <- integer() + ct[i] <- .CT_INT + } if (rtype=="numeric") { df[[i]] <- numeric() ct[i] <- .CT_NUM @@ -503,10 +501,6 @@ setMethod("dbFetch", signature(res="Mone df[[i]] <- character() ct[i] <- .CT_CHR } - if (rtype=="date") { - df[[i]] <- character() - ct[i] <- .CT_CHRR - } if (rtype=="logical") { df[[i]] <- logical() ct[i] <- .CT_BOOL @@ -526,13 +520,12 @@ setMethod("dbFetch", signature(res="Mone # if our tuple cache in res@env$data does not contain n rows, we fetch from server until it does while (length(res@env$data) < n) { cresp <- .mapiParseResponse(.mapiRequest(res@env$conn, paste0("Xexport ", .mapiLongInt(info$id), - " ", .mapiLongInt(info$index), " ", .mapiLongInt(min(10000,n-length(res@env$data)))))) + " ", .mapiLongInt(info$index), " ", .mapiLongInt(n-length(res@env$data))))) stopifnot(cresp$type == Q_BLOCK && cresp$rows > 0) res@env$data <- c(res@env$data, cresp$tuples) info$index <- info$index + cresp$rows - #print(paste0(length(res@env$data), " of ", info$rows)); - if (getOption("monetdb.profile", T)) .profiler_progress(length(res@env$data), n) + # if (getOption("monetdb.profile", T)) .profiler_progress(length(res@env$data), n) } # convert tuple string vector into matrix so we can access a single column efficiently @@ -542,6 +535,8 @@ setMethod("dbFetch", signature(res="Mone # convert values column by column for (j in seq.int(info$cols)) { col <- ct[[j]] + if (col == .CT_INT) + df[[j]] <- as.integer(parts[[j]]) if (col == .CT_NUM) df[[j]] <- as.numeric(parts[[j]]) if (col == .CT_CHRR) { @@ -571,7 +566,7 @@ setMethod("dbFetch", signature(res="Mone attr(df, "row.names") <- c(NA_integer_, length(df[[1]])) class(df) <- "data.frame" - if (getOption("monetdb.profile", T)) .profiler_clear() + # if (getOption("monetdb.profile", T)) .profiler_clear() return(df) }) @@ -602,17 +597,10 @@ setMethod("dbIsValid", signature(dbObj=" return(invisible(TRUE)) }) -monetTypes <- rep(c("numeric", "character", "character", "logical", "raw"), c(9, 3, 4, 1, 1)) -names(monetTypes) <- c(c("TINYINT", "SMALLINT", "INT", "BIGINT", "HUGEINT", "REAL", "DOUBLE", "DECIMAL", "WRD"), - c("CHAR", "VARCHAR", "CLOB"), - c("INTERVAL", "DATE", "TIME", "TIMESTAMP"), - "BOOLEAN", - "BLOB") - - setMethod("dbColumnInfo", "MonetDBResult", def = function(res, ...) { return(data.frame(field.name=res@env$info$names, field.type=res@env$info$types, - data.type=monetTypes[res@env$info$types])) + data.type=monetTypes[res@env$info$types], r.data.type=monetTypes[res@env$info$types], + monetdb.data.type=res@env$info$types)) }, valueClass = "data.frame") @@ -623,7 +611,8 @@ setMethod("dbGetInfo", "MonetDBResult", _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list