Changeset: 0e56cbca2b0b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0e56cbca2b0b
Added Files:
sql/test/mergetables/Tests/All
sql/test/mergetables/Tests/crash0.sql
sql/test/mergetables/Tests/forex.sql
sql/test/mergetables/Tests/forex.stable.err
sql/test/mergetables/Tests/forex.stable.out
sql/test/mergetables/Tests/mergedrop.sql
sql/test/mergetables/Tests/mergeinit.sql
sql/test/mergetables/Tests/mergeinit.stable.err
sql/test/mergetables/Tests/mergeinit.stable.out
sql/test/mergetables/Tests/mergeload.sql
sql/test/mergetables/Tests/mergeload.stable.err
sql/test/mergetables/Tests/mergeload.stable.out
sql/test/mergetables/Tests/mergequery.sql
sql/test/mergetables/Tests/mergequery.stable.err
sql/test/mergetables/Tests/mergequery.stable.out
Removed Files:
monetdb5/modules/mal/Tests/radix.mal
monetdb5/modules/mal/Tests/radix.stable.err
monetdb5/modules/mal/Tests/radix.stable.out
monetdb5/tests/BugDay_2005-10-06_4.8/Tests/erroneous_multiplex.SF-899586.stable.err
monetdb5/tests/BugDay_2005-10-06_4.8/Tests/erroneous_multiplex.SF-899586.stable.out
monetdb5/tests/BugDay_2005-10-06_4.8/Tests/kill_0.SF-1314982.stable.err
monetdb5/tests/BugDay_2005-10-06_4.8/Tests/kill_0.SF-1314982.stable.out
monetdb5/tests/BugDay_2005-10-06_4.8/Tests/multiple_servers.SF-914113.MIL.bat
monetdb5/tests/BugDay_2005-10-06_4.8/Tests/multiple_servers.SF-914113.MIL.sh
monetdb5/tests/BugDay_2005-10-06_4.8/Tests/multiple_servers.SF-914113.stable.err
monetdb5/tests/BugDay_2005-10-06_4.8/Tests/multiple_servers.SF-914113.stable.out
monetdb5/tests/BugDay_2005-10-06_4.8/Tests/return_in_while.SF-905116.stable.err
monetdb5/tests/BugDay_2005-10-06_4.8/Tests/return_in_while.SF-905116.stable.out
monetdb5/tests/BugDay_2005-10-06_4.8/Tests/table_type.SF-916648.stable.err
monetdb5/tests/BugDay_2005-10-06_4.8/Tests/table_type.SF-916648.stable.out
monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/BATpropcheck_after_outerjoin.SF-936469.mal
monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/BATpropcheck_after_outerjoin.SF-936469.stable.err
monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/BATpropcheck_after_outerjoin.SF-936469.stable.out
monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/CTrefine_not_sorted.981374.mal
monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/CTrefine_not_sorted.981374.stable.err
monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/CTrefine_not_sorted.981374.stable.out
monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/Confusing_error.SF-852659.stable.err
monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/Confusing_error.SF-852659.stable.out
monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/Recursive_module_load.SF-853867.stable.err
monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/Recursive_module_load.SF-853867.stable.out
monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/crash_destroy_commit.SF-1154552.stable.err
monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/crash_destroy_commit.SF-1154552.stable.out
monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/leftfetchjoin_void_oid.990857.mal
monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/leftfetchjoin_void_oid.990857.stable.err
monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/leftfetchjoin_void_oid.990857.stable.out
monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/radix_normal_segfault.SF-1120748.mal
monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/radix_normal_segfault.SF-1120748.stable.err
monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/radix_normal_segfault.SF-1120748.stable.out
monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/shutdown.994842.mal
monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/shutdown.994842.stable.err
monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/shutdown.994842.stable.out
monetdb5/tests/BugReports/Tests/no.011.mal
monetdb5/tests/BugReports/Tests/no.011.stable.err
monetdb5/tests/BugReports/Tests/no.011.stable.out
monetdb5/tests/BugReports/Tests/no.024.mal
monetdb5/tests/BugReports/Tests/no.024.stable.err
monetdb5/tests/BugReports/Tests/no.024.stable.out
monetdb5/tests/BugReports/Tests/no.027.mal
monetdb5/tests/BugReports/Tests/no.027.stable.err
monetdb5/tests/BugReports/Tests/no.027.stable.out
monetdb5/tests/BugReports/Tests/no.035.mal
monetdb5/tests/BugReports/Tests/no.035.stable.err
monetdb5/tests/BugReports/Tests/no.035.stable.out
monetdb5/tests/BugReports/Tests/no.037.mal
monetdb5/tests/BugReports/Tests/no.037.stable.err
monetdb5/tests/BugReports/Tests/no.037.stable.out
monetdb5/tests/BugReports/Tests/no.070.mal
monetdb5/tests/BugReports/Tests/no.070.modules
monetdb5/tests/BugReports/Tests/no.070.stable.err
monetdb5/tests/BugReports/Tests/no.070.stable.out
monetdb5/tests/BugReports/Tests/no.073.stable.err
monetdb5/tests/BugReports/Tests/no.073.stable.out
monetdb5/tests/BugReports/Tests/no.073_s00.mal
monetdb5/tests/BugReports/Tests/no.073_s01.mal
monetdb5/tests/BugReports/Tests/no.089.modules
monetdb5/tests/BugReports/Tests/no.089.stable.err
monetdb5/tests/BugReports/Tests/no.089.stable.out
monetdb5/tests/BugReports/Tests/no.089_s00.mal
monetdb5/tests/BugReports/Tests/no.089_s01.mal
monetdb5/tests/BugReports/Tests/no.099.mal
monetdb5/tests/BugReports/Tests/no.099.stable.err
monetdb5/tests/BugReports/Tests/no.099.stable.out
monetdb5/tests/BugReports/Tests/no.106.mal
monetdb5/tests/BugReports/Tests/no.106.modules
monetdb5/tests/BugReports/Tests/no.106.prelude
monetdb5/tests/BugReports/Tests/no.106.stable.err
monetdb5/tests/BugReports/Tests/no.106.stable.out
monetdb5/tests/BugReports/Tests/no.106.w.bat
monetdb5/tests/BugReports/Tests/no.107.mal
monetdb5/tests/BugReports/Tests/no.107.modules
monetdb5/tests/BugReports/Tests/no.107.prelude
monetdb5/tests/BugReports/Tests/no.107.stable.err
monetdb5/tests/BugReports/Tests/no.107.stable.out
monetdb5/tests/BugReports/Tests/no.107.w.bat
monetdb5/tests/BugReports/Tests/no.117.mal
monetdb5/tests/BugReports/Tests/no.117.stable.err
monetdb5/tests/BugReports/Tests/no.117.stable.out
monetdb5/tests/BugReports/Tests/no.120.mal
monetdb5/tests/BugReports/Tests/no.120.stable.err
monetdb5/tests/BugReports/Tests/no.120.stable.out
monetdb5/tests/BugReports/Tests/no.125.mal
monetdb5/tests/BugReports/Tests/no.125.modules
monetdb5/tests/BugReports/Tests/no.125.stable.err
monetdb5/tests/BugReports/Tests/no.125.stable.out
monetdb5/tests/BugReports/Tests/no.125.stable.out.Windows
monetdb5/tests/BugReports/Tests/no.145.k100_unique1
monetdb5/tests/BugReports/Tests/no.145.k10_unique1
monetdb5/tests/BugReports/Tests/no.145.k10_unique2
monetdb5/tests/BugReports/Tests/no.145.mal
monetdb5/tests/BugReports/Tests/no.145.modules
monetdb5/tests/BugReports/Tests/no.145.prelude
monetdb5/tests/BugReports/Tests/no.145.stable.err
monetdb5/tests/BugReports/Tests/no.145.stable.out
monetdb5/tests/BugReports/Tests/no.146.mal
monetdb5/tests/BugReports/Tests/no.146.modules
monetdb5/tests/BugReports/Tests/no.146.stable.err
monetdb5/tests/BugReports/Tests/no.146.stable.out
monetdb5/tests/BugReports/Tests/no.147.mal
monetdb5/tests/BugReports/Tests/no.147.modules
monetdb5/tests/BugReports/Tests/no.147.stable.err
monetdb5/tests/BugReports/Tests/no.147.stable.out
monetdb5/tests/BugReports/Tests/no.148.mal
monetdb5/tests/BugReports/Tests/no.148.modules
monetdb5/tests/BugReports/Tests/no.148.stable.err
monetdb5/tests/BugReports/Tests/no.148.stable.out
monetdb5/tests/BugReports/Tests/no.151.mal
monetdb5/tests/BugReports/Tests/no.151.stable.err
monetdb5/tests/BugReports/Tests/no.151.stable.out
monetdb5/tests/BugReports/Tests/no.156.mal
monetdb5/tests/BugReports/Tests/no.156.stable.err
monetdb5/tests/BugReports/Tests/no.156.stable.out
monetdb5/tests/BugReports/Tests/no.158.mal
monetdb5/tests/BugReports/Tests/no.158.modules
monetdb5/tests/BugReports/Tests/no.158.prelude
monetdb5/tests/BugReports/Tests/no.158.source.mal
monetdb5/tests/BugReports/Tests/no.158.stable.err
monetdb5/tests/BugReports/Tests/no.158.stable.out
monetdb5/tests/BugReports/Tests/no.160.mal
monetdb5/tests/BugReports/Tests/no.160.stable.err
monetdb5/tests/BugReports/Tests/no.160.stable.out
monetdb5/tests/BugReports/Tests/no.164.mal
monetdb5/tests/BugReports/Tests/no.164.modules
monetdb5/tests/BugReports/Tests/no.164.stable.err
monetdb5/tests/BugReports/Tests/no.164.stable.out
monetdb5/tests/BugReports/Tests/no.166.mal
monetdb5/tests/BugReports/Tests/no.166.modules
monetdb5/tests/BugReports/Tests/no.166.stable.err
monetdb5/tests/BugReports/Tests/no.166.stable.out
monetdb5/tests/BugReports/Tests/no.168.mal
monetdb5/tests/BugReports/Tests/no.168.modules
monetdb5/tests/BugReports/Tests/no.168.stable.err
monetdb5/tests/BugReports/Tests/no.168.stable.out
monetdb5/tests/BugReports/Tests/no.172.mal
monetdb5/tests/BugReports/Tests/no.172.stable.err
monetdb5/tests/BugReports/Tests/no.172.stable.out
monetdb5/tests/BugTracker/Tests/batcalc-convert_on_void_view.SF-1573060.mal
monetdb5/tests/BugTracker/Tests/batcalc-convert_on_void_view.SF-1573060.stable.err
monetdb5/tests/BugTracker/Tests/batcalc-convert_on_void_view.SF-1573060.stable.out
monetdb5/tests/BugTracker/Tests/merge-join_properties.SF-2952191.malC
monetdb5/tests/BugTracker/Tests/merge-join_properties.SF-2952191.stable.err
monetdb5/tests/BugTracker/Tests/merge-join_properties.SF-2952191.stable.out
monetdb5/tests/BugsViaSourgeforce/Tests/ID.1010729.mal
monetdb5/tests/BugsViaSourgeforce/Tests/ID.1010729.stable.err
monetdb5/tests/BugsViaSourgeforce/Tests/ID.1010729.stable.out
monetdb5/tests/BugsViaSourgeforce/Tests/ID.602271.mal
monetdb5/tests/BugsViaSourgeforce/Tests/ID.602271.stable.err
monetdb5/tests/BugsViaSourgeforce/Tests/ID.602271.stable.out
monetdb5/tests/BugsViaSourgeforce/Tests/ID.602463.mal
monetdb5/tests/BugsViaSourgeforce/Tests/ID.602463.stable.err
monetdb5/tests/BugsViaSourgeforce/Tests/ID.602463.stable.out
monetdb5/tests/BugsViaSourgeforce/Tests/ID.632575.mal
monetdb5/tests/BugsViaSourgeforce/Tests/ID.632575.stable.err
monetdb5/tests/BugsViaSourgeforce/Tests/ID.632575.stable.out
monetdb5/tests/BugsViaSourgeforce/Tests/ID.642351.b.txt
monetdb5/tests/BugsViaSourgeforce/Tests/ID.642351.c.txt
monetdb5/tests/BugsViaSourgeforce/Tests/ID.642351.mal
monetdb5/tests/BugsViaSourgeforce/Tests/ID.642351.modules
monetdb5/tests/BugsViaSourgeforce/Tests/ID.642351.stable.err
monetdb5/tests/BugsViaSourgeforce/Tests/ID.642351.stable.out
monetdb5/tests/BugsViaSourgeforce/Tests/ID.823516.mal
monetdb5/tests/BugsViaSourgeforce/Tests/ID.823516.stable.err
monetdb5/tests/BugsViaSourgeforce/Tests/ID.823516.stable.out
monetdb5/tests/BugsViaSourgeforce/Tests/ID.823516.stable.out.64bit
monetdb5/tests/BugsViaSourgeforce/Tests/ID.853867.MIL.bat
monetdb5/tests/BugsViaSourgeforce/Tests/ID.853867.MIL.sh
monetdb5/tests/BugsViaSourgeforce/Tests/ID.853867.stable.err
monetdb5/tests/BugsViaSourgeforce/Tests/ID.853867.stable.out
monetdb5/tests/BugsViaSourgeforce/Tests/ID.866700.stable.err
monetdb5/tests/BugsViaSourgeforce/Tests/ID.866700.stable.out
monetdb5/tests/BugsViaSourgeforce/Tests/ID.905495c.MIL.bat
monetdb5/tests/BugsViaSourgeforce/Tests/ID.905495c.MIL.sh
monetdb5/tests/BugsViaSourgeforce/Tests/ID.905495c.stable.err
monetdb5/tests/BugsViaSourgeforce/Tests/ID.905495c.stable.out
monetdb5/tests/BugsViaSourgeforce/Tests/ID.914155.mal
monetdb5/tests/BugsViaSourgeforce/Tests/ID.914155.stable.err
monetdb5/tests/BugsViaSourgeforce/Tests/ID.914155.stable.out
monetdb5/tests/BugsViaSourgeforce/Tests/ID.914935.mal
monetdb5/tests/BugsViaSourgeforce/Tests/ID.914935.stable.err
monetdb5/tests/BugsViaSourgeforce/Tests/ID.914935.stable.out
monetdb5/tests/BugsViaSourgeforce/Tests/ID.914935.stable.out.64bit
monetdb5/tests/BugsViaSourgeforce/Tests/ID.916699.mal
monetdb5/tests/BugsViaSourgeforce/Tests/ID.916699.modules
monetdb5/tests/BugsViaSourgeforce/Tests/ID.916699.stable.err
monetdb5/tests/BugsViaSourgeforce/Tests/ID.916699.stable.out
monetdb5/tests/BugsViaSourgeforce/Tests/ID.921814.mal
monetdb5/tests/BugsViaSourgeforce/Tests/ID.921814.stable.err
monetdb5/tests/BugsViaSourgeforce/Tests/ID.921814.stable.out
monetdb5/tests/BugsViaSourgeforce/Tests/ID.928253.mal
monetdb5/tests/BugsViaSourgeforce/Tests/ID.928253.stable.err
monetdb5/tests/BugsViaSourgeforce/Tests/ID.928253.stable.out
monetdb5/tests/BugsViaSourgeforce/Tests/ID.979809.mal
monetdb5/tests/BugsViaSourgeforce/Tests/ID.979809.stable.err
monetdb5/tests/BugsViaSourgeforce/Tests/ID.979809.stable.out
monetdb5/tests/BugsViaSourgeforce/Tests/ID.979809.txt
monetdb5/tests/BugsViaSourgeforce/Tests/ID.986551.mal
monetdb5/tests/BugsViaSourgeforce/Tests/ID.986551.stable.err
monetdb5/tests/BugsViaSourgeforce/Tests/ID.986551.stable.out
monetdb5/tests/BugsViaSourgeforce/Tests/ID.987455.mal
monetdb5/tests/BugsViaSourgeforce/Tests/ID.987455.stable.err
monetdb5/tests/BugsViaSourgeforce/Tests/ID.987455.stable.out
monetdb5/tests/BugsViaSourgeforce/Tests/ID.991053.mal
monetdb5/tests/BugsViaSourgeforce/Tests/ID.991053.stable.err
monetdb5/tests/BugsViaSourgeforce/Tests/ID.991053.stable.out
monetdb5/tests/BugsViaSourgeforce/Tests/ID.994842.stable.err
monetdb5/tests/BugsViaSourgeforce/Tests/ID.994842.stable.out
monetdb5/tests/BugsViaSourgeforce/Tests/ID.996570.mal
monetdb5/tests/BugsViaSourgeforce/Tests/ID.996570.stable.err
monetdb5/tests/BugsViaSourgeforce/Tests/ID.996570.stable.out
monetdb5/tests/gdkTests/Tests/subgroup.mal
monetdb5/tests/gdkTests/Tests/subgroup.stable.err
monetdb5/tests/gdkTests/Tests/subgroup.stable.out
monetdb5/tests/suite_01/Tests/test_00.mal
monetdb5/tests/suite_01/Tests/test_00.stable.err
monetdb5/tests/suite_01/Tests/test_00.stable.out
monetdb5/tests/suite_01/Tests/test_00.stable.out.64bit
monetdb5/tests/suite_01/Tests/test_00.stable.out.Darwin
monetdb5/tests/suite_01/Tests/test_00.stable.out.Linux
monetdb5/tests/suite_01/Tests/test_00.stable.out.Linux.64bit
monetdb5/tests/suite_01/Tests/test_20.mal
monetdb5/tests/suite_01/Tests/test_20.stable.err
monetdb5/tests/suite_01/Tests/test_20.stable.out
monetdb5/tests/suite_01/Tests/test_30.mal
monetdb5/tests/suite_01/Tests/test_30.stable.err
monetdb5/tests/suite_01/Tests/test_30.stable.out
monetdb5/tests/suite_01/Tests/test_30.stable.out.64bit
monetdb5/tests/suite_01/Tests/test_30.stable.out.Darwin
monetdb5/tests/suite_01/Tests/test_30.stable.out.Linux
monetdb5/tests/suite_01/Tests/test_30.stable.out.Linux.64bit
monetdb5/tests/suite_01/Tests/test_50.mal
monetdb5/tests/suite_01/Tests/test_50.stable.err
monetdb5/tests/suite_01/Tests/test_50.stable.out
monetdb5/tests/suite_01/Tests/test_60.mal
monetdb5/tests/suite_01/Tests/test_60.stable.err
monetdb5/tests/suite_01/Tests/test_60.stable.out
monetdb5/tests/suite_01/Tests/test_60.stable.out.64bit
monetdb5/tests/suite_01/Tests/test_60.stable.out.Darwin
monetdb5/tests/suite_01/Tests/test_60.stable.out.Linux
monetdb5/tests/suite_01/Tests/test_60.stable.out.Linux.64bit
monetdb5/tests/suite_01/Tests/test_90.mal
monetdb5/tests/suite_01/Tests/test_90.modules
monetdb5/tests/suite_01/Tests/test_90.stable.err
monetdb5/tests/suite_01/Tests/test_90.stable.out
monetdb5/tests/suite_06/Tests/test_00.mal
monetdb5/tests/suite_06/Tests/test_00.modules
monetdb5/tests/suite_06/Tests/test_00.stable.err
monetdb5/tests/suite_06/Tests/test_00.stable.out
monetdb5/tests/suite_06/Tests/test_02.mal
monetdb5/tests/suite_06/Tests/test_02.stable.err
monetdb5/tests/suite_06/Tests/test_02.stable.out
Modified Files:
clients/R/MonetDB.R/DESCRIPTION
clients/R/MonetDB.R/R/control.R
clients/R/MonetDB.R/src/mapi.c
clients/R/Tests/dbi.R
clients/R/Tests/dplyr.R
clients/R/Tests/dplyr.stable.err
clients/R/Tests/dplyr.stable.out
clients/Tests/MAL-signatures_all.stable.out
clients/Tests/MAL-signatures_all.stable.out.int128
clients/Tests/MAL-signatures_fits_geom.stable.out
clients/Tests/MAL-signatures_fits_geom.stable.out.int128
clients/Tests/MAL-signatures_geom.stable.out
clients/Tests/MAL-signatures_geom.stable.out.int128
clients/Tests/MAL-signatures_none.stable.out
clients/Tests/MAL-signatures_none.stable.out.int128
clients/Tests/exports.stable.out
clients/mapiclient/dump.c
common/stream/stream.c
debian/monetdb5-sql.init.d
gdk/gdk_bbp.c
gdk/gdk_imprints.c
gdk/gdk_private.h
gdk/gdk_select.c
gdk/gdk_system.c
geom/lib/libgeom.h
geom/monetdb5/geom.c
monetdb5/mal/Tests/performanceTests/performanceLog
monetdb5/mal/Tests/recycle05.stable.out
monetdb5/mal/Tests/recycle07.stable.out
monetdb5/mal/Tests/tst029.mal
monetdb5/mal/Tests/tst029.stable.out
monetdb5/mal/Tests/tst237.mal
monetdb5/mal/Tests/tst253.mal
monetdb5/mal/Tests/tst253.stable.out
monetdb5/mal/Tests/tst280.mal
monetdb5/mal/Tests/tst280.stable.out
monetdb5/mal/Tests/tst400bHuge.mal
monetdb5/mal/mal.h
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_debugger.h
monetdb5/mal/mal_type.h
monetdb5/modules/atoms/blob.h
monetdb5/modules/atoms/mtime.c
monetdb5/modules/atoms/mtime.h
monetdb5/modules/atoms/mtime.mal
monetdb5/modules/atoms/str.c
monetdb5/modules/kernel/Tests/TriBool.malC
monetdb5/modules/kernel/aggr.mal
monetdb5/modules/kernel/aggr.mal.sh
monetdb5/modules/kernel/alarm.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/batmmath.c
monetdb5/modules/kernel/mmath.c
monetdb5/modules/mal/Tests/ascii_io2.mal
monetdb5/modules/mal/Tests/ascii_io2.stable.out
monetdb5/modules/mal/Tests/inspect05.stable.out
monetdb5/modules/mal/Tests/manifold.mal
monetdb5/modules/mal/Tests/manifold.stable.out
monetdb5/modules/mal/Tests/manifoldstr.mal
monetdb5/modules/mal/Tests/manifoldstr.stable.out
monetdb5/modules/mal/Tests/mapi03.mal
monetdb5/modules/mal/Tests/remote08.mal
monetdb5/modules/mal/Tests/remote08.stable.out
monetdb5/modules/mal/Tests/remote09.mal
monetdb5/modules/mal/Tests/remote09.stable.out
monetdb5/modules/mal/mkey.c
monetdb5/modules/mal/mkey.h
monetdb5/modules/mal/mkey.mal
monetdb5/modules/mal/remote.c
monetdb5/modules/mal/tablet.h
monetdb5/optimizer/Tests/DCexample.mal
monetdb5/optimizer/Tests/ESexample.mal
monetdb5/optimizer/Tests/ESexample.stable.out
monetdb5/optimizer/Tests/common.mal
monetdb5/optimizer/Tests/common.stable.out
monetdb5/optimizer/Tests/dataflow3.mal
monetdb5/optimizer/Tests/dataflow3.stable.out
monetdb5/optimizer/Tests/emptyset01.mal
monetdb5/optimizer/Tests/emptyset01.stable.out
monetdb5/optimizer/Tests/inliners.mal
monetdb5/optimizer/Tests/mapreduce00.mal
monetdb5/optimizer/Tests/reorder01.mal
monetdb5/optimizer/Tests/reorder01.stable.out
monetdb5/optimizer/Tests/tst4631.mal
monetdb5/optimizer/Tests/tst4631.stable.out
monetdb5/optimizer/Tests/tst4730.mal
monetdb5/optimizer/Tests/tst4730.stable.out
monetdb5/optimizer/opt_aliases.h
monetdb5/optimizer/opt_cluster.c
monetdb5/optimizer/opt_commonTerms.h
monetdb5/optimizer/opt_constants.h
monetdb5/optimizer/opt_costModel.h
monetdb5/optimizer/opt_dataflow.h
monetdb5/optimizer/opt_deadcode.h
monetdb5/optimizer/opt_emptySet.h
monetdb5/optimizer/opt_evaluate.h
monetdb5/optimizer/opt_factorize.h
monetdb5/optimizer/opt_garbageCollector.h
monetdb5/optimizer/opt_generator.h
monetdb5/optimizer/opt_inline.h
monetdb5/optimizer/opt_json.h
monetdb5/optimizer/opt_macro.h
monetdb5/optimizer/opt_mapreduce.c
monetdb5/optimizer/opt_matpack.h
monetdb5/optimizer/opt_mergetable.h
monetdb5/optimizer/opt_octopus.c
monetdb5/optimizer/opt_octopus.h
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
monetdb5/optimizer/opt_pushranges.h
monetdb5/optimizer/opt_qep.h
monetdb5/optimizer/opt_recycler.h
monetdb5/tests/BugDay_2005-10-06_4.8/Tests/All
monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/All
monetdb5/tests/BugReports/Tests/All
monetdb5/tests/BugReports/Tests/no.100.mal
monetdb5/tests/BugReports/Tests/no.100.stable.out
monetdb5/tests/BugReports/Tests/no.119.mal
monetdb5/tests/BugTracker/Tests/All
monetdb5/tests/BugsViaSourgeforce/Tests/All
monetdb5/tests/BugsViaSourgeforce/Tests/ID.1023816.mal
monetdb5/tests/BugsViaSourgeforce/Tests/ID.1023816.stable.out
monetdb5/tests/BugsViaSourgeforce/Tests/ID.605953.mal
monetdb5/tests/BugsViaSourgeforce/Tests/ID.605953.stable.out
monetdb5/tests/gdkTests/Tests/All
monetdb5/tests/gdkTests/Tests/cross.mal
monetdb5/tests/gdkTests/Tests/cross.stable.out
monetdb5/tests/gdkTests/Tests/scanselect.mal
monetdb5/tests/gdkTests/Tests/scanselect.stable.out
monetdb5/tests/gdkTests/Tests/void.mal
monetdb5/tests/gdkTests/Tests/void.stable.out
monetdb5/tests/suite_00/Tests/test_40.mal
monetdb5/tests/suite_00/Tests/test_40.stable.out
monetdb5/tests/suite_01/Tests/All
monetdb5/tests/suite_06/Tests/All
sql/backends/monet5/datacell/opt_datacell.h
sql/backends/monet5/sql_cast.h
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_rank.mal
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_sort.mal
sql/backends/monet5/sql_statistics.c
sql/benchmarks/ssbm/Tests/01-explain.stable.out
sql/benchmarks/ssbm/Tests/02-explain.stable.out
sql/benchmarks/ssbm/Tests/03-explain.stable.out
sql/benchmarks/ssbm/Tests/04-explain.stable.out
sql/benchmarks/ssbm/Tests/05-explain.stable.out
sql/benchmarks/ssbm/Tests/06-explain.stable.out
sql/benchmarks/ssbm/Tests/07-explain.stable.out
sql/benchmarks/ssbm/Tests/08-explain.stable.out
sql/benchmarks/ssbm/Tests/09-explain.stable.out
sql/benchmarks/ssbm/Tests/10-explain.stable.out
sql/benchmarks/ssbm/Tests/11-explain.stable.out
sql/benchmarks/ssbm/Tests/12-explain.stable.out
sql/benchmarks/ssbm/Tests/13-explain.stable.out
sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/02-explain.stable.out
sql/benchmarks/tpch/Tests/03-explain.stable.out
sql/benchmarks/tpch/Tests/03-explain.stable.out.int128
sql/benchmarks/tpch/Tests/04-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/05-explain.stable.out
sql/benchmarks/tpch/Tests/05-explain.stable.out.int128
sql/benchmarks/tpch/Tests/07-explain.stable.out
sql/benchmarks/tpch/Tests/07-explain.stable.out.int128
sql/benchmarks/tpch/Tests/08-explain.stable.out
sql/benchmarks/tpch/Tests/08-explain.stable.out.int128
sql/benchmarks/tpch/Tests/09-explain.stable.out
sql/benchmarks/tpch/Tests/09-explain.stable.out.int128
sql/benchmarks/tpch/Tests/10-explain.stable.out
sql/benchmarks/tpch/Tests/10-explain.stable.out.int128
sql/benchmarks/tpch/Tests/11-explain.stable.out
sql/benchmarks/tpch/Tests/11-explain.stable.out.int128
sql/benchmarks/tpch/Tests/12-explain.stable.out
sql/benchmarks/tpch/Tests/12-explain.stable.out.int128
sql/benchmarks/tpch/Tests/13-explain.stable.out
sql/benchmarks/tpch/Tests/13-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/14-explain.stable.out
sql/benchmarks/tpch/Tests/14-explain.stable.out.int128
sql/benchmarks/tpch/Tests/16-explain.stable.out
sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/17-explain.stable.out
sql/benchmarks/tpch/Tests/17-explain.stable.out.int128
sql/benchmarks/tpch/Tests/18-explain.stable.out
sql/benchmarks/tpch/Tests/18-explain.stable.out.int128
sql/benchmarks/tpch/Tests/19-explain.stable.out
sql/benchmarks/tpch/Tests/19-explain.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/21-explain.stable.out
sql/benchmarks/tpch/Tests/21-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/22-explain.stable.out.32bit
sql/include/sql_catalog.h
sql/include/sql_relation.h
sql/scripts/mtime.sql
sql/server/rel_optimizer.c
sql/server/rel_optimizer.h
sql/server/rel_planner.c
sql/server/rel_planner.h
sql/storage/bat/bat_storage.c
sql/storage/sql_storage.h
sql/storage/store.c
sql/test/BugTracker-2014/Tests/insert_into_temp_table.Bug-3600.stable.out
sql/test/leaks/Tests/check0_bam.stable.out
sql/test/leaks/Tests/temp2_bam.stable.out
sql/test/leaks/Tests/temp3_bam.stable.out
testing/exportutils.py
testing/listexports.py.in
testing/malcheck.py
tools/merovingian/client/monetdb.c
tools/merovingian/daemon/controlrunner.c
tools/merovingian/daemon/handlers.c
Branch: HTM
Log Message:
Merge with default branch
diffs (truncated from 171992 to 300 lines):
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.5
+Version: 0.9.6
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/R/control.R b/clients/R/MonetDB.R/R/control.R
--- a/clients/R/MonetDB.R/R/control.R
+++ b/clients/R/MonetDB.R/R/control.R
@@ -10,7 +10,7 @@ monetdb.server.start <-
# run script
system(bat.file,wait=T)
-
+
# read pid from file
pid <- scan(pidfile,what=integer(),n=1)
return(pid)
@@ -75,7 +75,7 @@ monetdb.server.stop <-
system(paste0("kill ",correct.pid))
waittime <- 2
if (!wait) return(TRUE)
- Sys.sleep(1)
+ Sys.sleep(.5)
repeat {
psout <- system(paste0("ps ax | grep \"^", correct.pid,
".*mserver5\""), ignore.stdout=T)
if (psout != 0) break
diff --git a/clients/R/MonetDB.R/src/mapi.c b/clients/R/MonetDB.R/src/mapi.c
--- a/clients/R/MonetDB.R/src/mapi.c
+++ b/clients/R/MonetDB.R/src/mapi.c
@@ -35,6 +35,11 @@
#include <fcntl.h>
#include <errno.h>
+#ifndef SOCKET_ERROR
+#define INVALID_SOCKET -1
+#define SOCKET_ERROR -1
+#endif
+
// R headers
#include <R.h>
#include <Rdefines.h>
diff --git a/clients/R/Tests/dbi.R b/clients/R/Tests/dbi.R
--- a/clients/R/Tests/dbi.R
+++ b/clients/R/Tests/dbi.R
@@ -11,6 +11,7 @@ if (length(args) > 0)
dbport <- args[[1]]
options(monetdb.insert.splitsize=10)
+
tname <- "monetdbtest"
diff --git a/clients/R/Tests/dplyr.R b/clients/R/Tests/dplyr.R
--- a/clients/R/Tests/dplyr.R
+++ b/clients/R/Tests/dplyr.R
@@ -2,6 +2,12 @@ ll <- NULL
if (Sys.getenv("TSTTRGDIR") != "") {
ll <- paste0(Sys.getenv("TSTTRGDIR"),"/rlibdir")
}
+ff <- textConnection("asdf", open="w")
+# hide output from connect and attach since it would blow up the test output
+# dangerous since it might hide useful warnings
+# so if things go south it might be a good idea to uncomment the cat(dd) below
+dd <- capture.output( suppressMessages ( {
+
library(MonetDB.R,quietly=T,lib.loc=ll)
library(dplyr,quietly=T)
library(Lahman,quietly=T)
@@ -12,6 +18,7 @@ dbname <- "mTests_clients_R"
if (length(args) > 0)
dbport <- args[[1]]
+
# old way
if (exists("lahman_monetdb")) {
# overwrite all args because lahman_monetdb sets a default arg in the
first pos.
@@ -19,18 +26,22 @@ if (exists("lahman_monetdb")) {
user="monetdb",password="monetdb",timeout=100,wait=T,language="sql")
# new way
} else {
- dps <- src_monetdb(dbname=dbname, port=dbport)
+ dps <- src_monetdb(dbname=dbname, port=dbport)
copy_lahman(dps)
}
+}))
+
+#cat(dd)
# the remainder is pretty much the example from the manpage.
-
# Methods -------------------------------------------------------------------
batting <- tbl(dps, "Batting")
-dim(batting)
-colnames(batting)
-head(batting)
+
+length(dim(batting)) == 2
+
+length(colnames(batting)) > 1
+nrow(head(batting, n=10L))
# co* verbs
cc <- collapse(batting)
@@ -40,32 +51,28 @@ cc <- collect(batting)
# Data manipulation verbs ---------------------------------------------------
-filter(batting, yearID > 2005, G > 130)
-select(batting, playerID:lgID)
-arrange(batting, playerID, desc(yearID))
-summarise(batting, G = mean(G), n = n())
-mutate(batting, rbi2 = if(!is.null(AB) & AB > 0) 1.0 * R / AB else 0)
+nrow(head(filter(batting, yearID > 2005, G > 130), n=10L))
+nrow(head(select(batting, playerID:lgID), n=10L))
+nrow(head(arrange(batting, playerID, desc(yearID)), n=10L))
+length(summarise(batting, G = mean(G), n = n())) > 1
+nrow(head(mutate(batting, rbi2 = if(!is.null(AB) & AB > 0) 1.0 * R / AB else
0), n=10L))
# note that all operations are lazy: they don't do anything until you
# request the data, either by `print()`ing it (which shows the first ten
# rows), by looking at the `head()`, or `collect()` the results locally.
-
-cat("#~BeginVariableOutput~#\n")
-system.time(recent <- filter(batting, yearID > 2010))
-system.time(collect(recent))
-cat("#~EndVariableOutput~#\n")
+nrow(head(collect(filter(batting, yearID > 2010)), n=10L))
# Group by operations -------------------------------------------------------
# To perform operations by group, create a grouped object with group_by
players <- group_by(batting, playerID)
-group_size(players)
-summarise(players, mean_g = mean(G), best_ab = max(AB))
+length(group_size(players)) > 1
+nrow(head(summarise(players, mean_g = mean(G), best_ab = max(AB)), n=10L))
# When you group by multiple level, each summarise peels off one level
per_year <- group_by(batting, playerID, yearID)
stints <- summarise(per_year, stints = max(stint))
-filter(stints, stints > 3)
-summarise(stints, max(stints))
+nrow(head(filter(stints, stints > 3), n=10L))
+nrow(head(summarise(stints, max(stints)), n=10L))
# Joins ---------------------------------------------------------------------
player_info <- select(tbl(dps, "Master"), playerID,
@@ -73,21 +80,24 @@ player_info <- select(tbl(dps, "Master")
hof <- select(filter(tbl(dps, "HallOfFame"), inducted == "Y"),
playerID, votedBy, category)
+invisible(suppressMessages( {
+
# Match players and their hall of fame data
-inner_join(player_info, hof)
+print(nrow(head(inner_join(player_info, hof), n=10L)))
# Keep all players, match hof data where available
-left_join(player_info, hof)
+print(nrow(head(left_join(player_info, hof), n=10L)))
# Find only players in hof
-semi_join(player_info, hof)
+print(nrow(head(semi_join(player_info, hof), n=10L)))
# Find players not in hof
-anti_join(player_info, hof)
+print(nrow(head(anti_join(player_info, hof), n=10L)))
+}))
# TODO: set ops
# Arbitrary SQL -------------------------------------------------------------
# You can also provide sql as is, using the sql function:
batting2008 <- tbl(dps,
sql('SELECT * FROM "Batting" WHERE "yearID" = 2008'))
-batting2008
+nrow(head(batting2008, n=10L))
print("SUCCESS")
diff --git a/clients/R/Tests/dplyr.stable.err b/clients/R/Tests/dplyr.stable.err
--- a/clients/R/Tests/dplyr.stable.err
+++ b/clients/R/Tests/dplyr.stable.err
@@ -31,51 +31,7 @@ stderr of test 'dplyr` in directory 'cli
# 14:31:12 >
-Attaching package: ‘dplyr’
+# 17:39:45 >
+# 17:39:45 > "Done."
+# 17:39:45 >
-The following object is masked from ‘package:MonetDB.R’:
-
- src_monetdb
-
-The following objects are masked from ‘package:stats’:
-
- filter, lag
-
-The following objects are masked from ‘package:base’:
-
- intersect, setdiff, setequal, union
-
-Creating table: AllstarFull
-Creating table: Appearances
-Creating table: AwardsManagers
-Creating table: AwardsPlayers
-Creating table: AwardsShareManagers
-Creating table: AwardsSharePlayers
-Creating table: Batting
-Creating table: BattingPost
-Creating table: Fielding
-Creating table: FieldingOF
-Creating table: FieldingPost
-Creating table: HallOfFame
-Creating table: LahmanData
-Creating table: Managers
-Creating table: ManagersHalf
-Creating table: Master
-Creating table: Pitching
-Creating table: PitchingPost
-Creating table: Salaries
-Creating table: Schools
-Creating table: SchoolsPlayers
-Creating table: SeriesPost
-Creating table: Teams
-Creating table: TeamsFranchises
-Creating table: TeamsHalf
-Joining by: "playerID"
-Joining by: "playerID"
-Joining by: "playerID"
-Joining by: "playerID"
-
-# 15:33:59 >
-# 15:33:59 > "Done."
-# 15:33:59 >
-
diff --git a/clients/R/Tests/dplyr.stable.out b/clients/R/Tests/dplyr.stable.out
--- a/clients/R/Tests/dplyr.stable.out
+++ b/clients/R/Tests/dplyr.stable.out
@@ -20,988 +20,28 @@ stdout of test 'dplyr` in directory 'cli
Ready.
-# 16:01:03 >
-# 16:01:03 > "R" "--vanilla" "--slave" "--args" "36798"
-# 16:01:03 >
+# 17:39:27 >
+# 17:39:27 > "R" "--vanilla" "--slave" "--args" "34068"
+# 17:39:27 >
-[1] 97889 24
- [1] "playerID" "yearID" "stint" "teamID" "lgID" "G"
- [7] "G_batting" "AB" "R" "H" "X2B" "X3B"
-[13] "HR" "RBI" "SB" "CS" "BB" "SO"
-[19] "IBB" "HBP" "SH" "SF" "GIDP" "G_old"
- playerID yearID stint teamID lgID G G_batting AB R H X2B X3B HR RBI SB CS
-1 aardsda01 2004 1 SFN NL 11 11 0 0 0 0 0 0 0 0 0
-2 aardsda01 2006 1 CHN NL 45 43 2 0 0 0 0 0 0 0 0
-3 aardsda01 2007 1 CHA AL 25 2 0 0 0 0 0 0 0 0 0
-4 aardsda01 2008 1 BOS AL 47 5 1 0 0 0 0 0 0 0 0
-5 aardsda01 2009 1 SEA AL 73 3 0 0 0 0 0 0 0 0 0
-6 aardsda01 2010 1 SEA AL 53 4 0 0 0 0 0 0 0 0 0
- BB SO IBB HBP SH SF GIDP G_old
-1 0 0 0 0 0 0 0 11
-2 0 0 0 0 1 0 0 45
-3 0 0 0 0 0 0 0 2
-4 0 1 0 0 0 0 0 5
-5 0 0 0 0 0 0 0 NA
-6 0 0 0 0 0 0 0 NA
-Source: MonetDB 11.19.0 (unreleased) []
-From: Batting [1,126 x 24]
-Filter: yearID > 2005, G > 130
-
- playerID yearID stint teamID lgID G G_batting AB R H X2B X3B HR RBI
-1 abreubo01 2007 1 NYA AL 158 158 605 123 171 40 5 16 101
-2 abreubo01 2008 1 NYA AL 156 156 609 100 180 39 4 20 100
-3 abreubo01 2009 1 LAA AL 152 152 563 96 165 29 3 15 103
-4 abreubo01 2010 1 LAA AL 154 154 573 88 146 41 1 20 78
-5 abreubo01 2011 1 LAA AL 142 142 502 54 127 30 1 8 60
-6 ackledu01 2012 1 SEA AL 153 NA 607 84 137 22 2 12 50
-7 alonsyo01 2012 1 SDN NL 155 NA 549 47 150 39 0 9 62
-8 altuvjo01 2012 1 HOU NL 147 NA 576 80 167 34 4 7 37
-9 alvarpe01 2012 1 PIT NL 149 NA 525 64 128 25 1 30 85
-10 amezaal01 2006 1 FLO NL 132 132 334 42 87 9 3 3 19
-.. ... ... ... ... ... ... ... ... ... ... ... ... .. ...
-Variables not shown: SB (dbl), CS (dbl), BB (dbl), SO (dbl), IBB (dbl), HBP
- (dbl), SH (dbl), SF (dbl), GIDP (dbl), G_old (dbl)
-Source: MonetDB 11.19.0 (unreleased) []
-From: Batting [97,889 x 5]
-
- playerID yearID stint teamID lgID
-1 aardsda01 2004 1 SFN NL
-2 aardsda01 2006 1 CHN NL
-3 aardsda01 2007 1 CHA AL
-4 aardsda01 2008 1 BOS AL
-5 aardsda01 2009 1 SEA AL
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
