MonetDB: subjoin - merge with default
Changeset: 8ac56c9beaff for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8ac56c9beaff Added Files: clients/R/Tests/deps-install.timeout Modified Files: clients/R/Tests/dbapply.R clients/R/Tests/deps-install.R clients/R/Tests/deps-test.R clients/R/Tests/deps-test.timeout clients/R/Tests/dplyr-flights.R clients/R/Tests/dplyr-flights.stable.err clients/R/Tests/install.R monetdb5/mal/mal_linker.c monetdb5/optimizer/opt_candidates.c monetdb5/optimizer/opt_macro.c monetdb5/optimizer/opt_profiler.c monetdb5/optimizer/opt_querylog.c sql/backends/monet5/UDF/pyapi/type_conversion.c sql/backends/monet5/UDF/pyapi/type_conversion.h sql/backends/monet5/rel_bin.c sql/backends/monet5/sql_scenario.c sql/backends/monet5/vaults/shp/shp.c sql/common/sql_types.c sql/server/rel_updates.c sql/storage/store.c sql/test/Tests/seq-default.stable.out sql/test/seq-default.sql sql/test/testdb-upgrade/Tests/upgrade.stable.out.powerpc64.int128 testing/exportutils.py Branch: subjoin Log Message: merge with default diffs (truncated from 542 to 300 lines): diff --git a/clients/R/Tests/dbapply.R b/clients/R/Tests/dbapply.R --- a/clients/R/Tests/dbapply.R +++ b/clients/R/Tests/dbapply.R @@ -1,3 +1,5 @@ +cat("#~BeginProfilingOutput~#\n", file=stderr()) + if (Sys.getenv("TSTTRGDIR") != "") { .libPaths(c(.libPaths(), paste0(Sys.getenv("TSTTRGDIR"),"/rlibdir"))) } @@ -81,4 +83,6 @@ print(res) dbRemoveTable(con,tname) stopifnot(identical(FALSE, dbExistsTable(con,tname))) +cat("#~EndProfilingOutput~#\n", file=stderr()) + print("SUCCESS") diff --git a/clients/R/Tests/deps-install.R b/clients/R/Tests/deps-install.R --- a/clients/R/Tests/deps-install.R +++ b/clients/R/Tests/deps-install.R @@ -1,6 +1,6 @@ # autoinstall DBI and digest, we need those to install MonetDB.R options(warn = -1) -packages_required <- c("digest", "DBI") +packages_required <- c("digest", "DBI", "devtools") cat("#~BeginProfilingOutput~#\n", file=stderr()) cat("#~BeginProfilingOutput~#\n", file=stdout()) diff --git a/clients/R/Tests/deps-install.timeout b/clients/R/Tests/deps-install.timeout new file mode 100644 --- /dev/null +++ b/clients/R/Tests/deps-install.timeout @@ -0,0 +1,1 @@ +2 diff --git a/clients/R/Tests/deps-test.R b/clients/R/Tests/deps-test.R --- a/clients/R/Tests/deps-test.R +++ b/clients/R/Tests/deps-test.R @@ -1,4 +1,4 @@ -packages_required <- c("assertthat","testthat","survey","nycflights13","RSQLite","dbplyr","dplyr","gdata","callr","devtools","DBItest") +packages_required <- c("assertthat","testthat","survey","nycflights13","RSQLite","dbplyr","dplyr","gdata","callr","DBItest") install_or_upgrade_packages <- function(lp) { np <- lp[!(lp %in% installed.packages()[,"Package"])] diff --git a/clients/R/Tests/deps-test.timeout b/clients/R/Tests/deps-test.timeout --- a/clients/R/Tests/deps-test.timeout +++ b/clients/R/Tests/deps-test.timeout @@ -1,1 +1,1 @@ -5 +20 diff --git a/clients/R/Tests/dplyr-flights.R b/clients/R/Tests/dplyr-flights.R --- a/clients/R/Tests/dplyr-flights.R +++ b/clients/R/Tests/dplyr-flights.R @@ -1,3 +1,5 @@ +cat("#~BeginProfilingOutput~#\n", file=stderr()) + 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 @@ -118,5 +120,6 @@ so(flights %>% ) %>% filter(arr > 30 | dep > 30)) +cat("#~EndProfilingOutput~#\n", file=stderr()) print("SUCCESS") diff --git a/clients/R/Tests/dplyr-flights.stable.err b/clients/R/Tests/dplyr-flights.stable.err --- a/clients/R/Tests/dplyr-flights.stable.err +++ b/clients/R/Tests/dplyr-flights.stable.err @@ -30,7 +30,6 @@ stderr of test 'dplyr-flights` in direct # 11:44:05 > "R" "--vanilla" "--slave" "--args" "30588" # 11:44:05 > -Identifier(s) "year", "month", "day", "hour", "minute" are reserved SQL keywords and need(s) to be quoted in queries. # 11:44:15 > # 11:44:15 > "Done." diff --git a/clients/R/Tests/install.R b/clients/R/Tests/install.R --- a/clients/R/Tests/install.R +++ b/clients/R/Tests/install.R @@ -2,13 +2,7 @@ options(warn = -1) cat("#~BeginProfilingOutput~#\n", file=stderr()) cat("#~BeginProfilingOutput~#\n", file=stdout()) -install_submodule_git <- function(x, ...) { - install_dir <- tempfile() - system(paste("git clone --recursive --depth 1", shQuote(x), -shQuote(install_dir))) - devtools::install(install_dir, ...) -} -install_submodule_git("https://github.com/hannesmuehleisen/MonetDBLite-R;) +devtools::install_github("hannesmuehleisen/MonetDBLite-R") cat("#~EndProfilingOutput~#\n", file=stderr()) cat("#~EndProfilingOutput~#\n", file=stdout()) diff --git a/monetdb5/mal/mal_linker.c b/monetdb5/mal/mal_linker.c --- a/monetdb5/mal/mal_linker.c +++ b/monetdb5/mal/mal_linker.c @@ -233,6 +233,7 @@
MonetDB: subjoin - merge with default
Changeset: 971e1b8fd7bc for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=971e1b8fd7bc Added Files: ChangeLog.Aug2018 buildtools/ChangeLog.Aug2018 clients/ChangeLog.Aug2018 clients/mapilib/ChangeLog.Aug2018 clients/odbc/samples/testStmtAttr.c common/stream/ChangeLog.Aug2018 common/utils/strptime.cpp debian/libmonetdb17.install debian/libmonetdb5-server-cfitsio.install debian/monetdb-python3.install gdk/ChangeLog.Aug2018 geom/ChangeLog.Aug2018 monetdb5/ChangeLog.Aug2018 sql/ChangeLog.Aug2018 sql/backends/monet5/UDF/capi/Tests/capi14.sql sql/backends/monet5/UDF/capi/Tests/capi14.stable.err sql/backends/monet5/UDF/capi/Tests/capi14.stable.out sql/backends/monet5/UDF/capi/Tests/capi15.sql sql/backends/monet5/UDF/capi/Tests/capi15.stable.err sql/backends/monet5/UDF/capi/Tests/capi15.stable.out sql/backends/monet5/UDF/capi/Tests/capi16.sql sql/backends/monet5/UDF/capi/Tests/capi16.stable.err sql/backends/monet5/UDF/capi/Tests/capi16.stable.out sql/backends/monet5/UDF/capi/Tests/capi17.sql sql/backends/monet5/UDF/capi/Tests/capi17.stable.err sql/backends/monet5/UDF/capi/Tests/capi17.stable.out sql/backends/monet5/UDF/capi/Tests/capi18.sql sql/backends/monet5/UDF/capi/Tests/capi18.stable.err sql/backends/monet5/UDF/capi/Tests/capi18.stable.out sql/jdbc/tests/Tests/SQLcopyinto.SQL.bat sql/jdbc/tests/Tests/SQLcopyinto.SQL.sh sql/jdbc/tests/Tests/SQLcopyinto.stable.err sql/jdbc/tests/Tests/SQLcopyinto.stable.out sql/server/rel_propagate.c sql/server/rel_propagate.h sql/server/sql_partition.c sql/server/sql_partition.h sql/test/BugTracker-2018/Tests/comment-on-table-is-null.Bug-6639.sql sql/test/BugTracker-2018/Tests/comment-on-table-is-null.Bug-6639.stable.err sql/test/BugTracker-2018/Tests/comment-on-table-is-null.Bug-6639.stable.out sql/test/BugTracker-2018/Tests/crash-after-call-non-existing-loader.sql sql/test/BugTracker-2018/Tests/crash-after-call-non-existing-loader.stable.err sql/test/BugTracker-2018/Tests/crash-after-call-non-existing-loader.stable.out sql/test/BugTracker-2018/Tests/create_table_if_not_exists_returns_42000.Bug-6629.sql sql/test/BugTracker-2018/Tests/create_table_if_not_exists_returns_42000.Bug-6629.stable.err sql/test/BugTracker-2018/Tests/create_table_if_not_exists_returns_42000.Bug-6629.stable.out sql/test/BugTracker-2018/Tests/dependency_column_on_sequence.Bug-6618.SQL.py sql/test/BugTracker-2018/Tests/dependency_column_on_sequence.Bug-6618.stable.err sql/test/BugTracker-2018/Tests/dependency_column_on_sequence.Bug-6618.stable.out sql/test/BugTracker-2018/Tests/groupby_having_orderby_count.Bug-6624.sql sql/test/BugTracker-2018/Tests/groupby_having_orderby_count.Bug-6624.stable.err sql/test/BugTracker-2018/Tests/groupby_having_orderby_count.Bug-6624.stable.out sql/test/BugTracker-2018/Tests/ilike-foreign-characters.Bug-6633.sql sql/test/BugTracker-2018/Tests/ilike-foreign-characters.Bug-6633.stable.err sql/test/BugTracker-2018/Tests/ilike-foreign-characters.Bug-6633.stable.out sql/test/BugTracker-2018/Tests/local_replica_table_not_detected.Bug-6620.py sql/test/BugTracker-2018/Tests/local_replica_table_not_detected.Bug-6620.stable.err sql/test/BugTracker-2018/Tests/local_replica_table_not_detected.Bug-6620.stable.out sql/test/BugTracker-2018/Tests/multi-column-hash-wrongly-NIL.Bug-6638.sql sql/test/BugTracker-2018/Tests/multi-column-hash-wrongly-NIL.Bug-6638.stable.err sql/test/BugTracker-2018/Tests/multi-column-hash-wrongly-NIL.Bug-6638.stable.out sql/test/BugTracker-2018/Tests/multiple-count.Bug-6599.sql sql/test/BugTracker-2018/Tests/multiple-count.Bug-6599.stable.err sql/test/BugTracker-2018/Tests/multiple-count.Bug-6599.stable.out sql/test/BugTracker-2018/Tests/or_in_subselect.Bug-6625.sql sql/test/BugTracker-2018/Tests/or_in_subselect.Bug-6625.stable.err sql/test/BugTracker-2018/Tests/or_in_subselect.Bug-6625.stable.out sql/test/BugTracker-2018/Tests/procedure-create-table.Bug-6604.sql sql/test/BugTracker-2018/Tests/remote-table-where-is-null.Bug-6601.py sql/test/BugTracker-2018/Tests/remote-table-where-is-null.Bug-6601.stable.err sql/test/BugTracker-2018/Tests/remote-table-where-is-null.Bug-6601.stable.out sql/test/BugTracker-2018/Tests/remote-table-where-not-equal.Bug-6621.py sql/test/BugTracker-2018/Tests/remote-table-where-not-equal.Bug-6621.stable.err sql/test/BugTracker-2018/Tests/remote-table-where-not-equal.Bug-6621.stable.out
MonetDB: subjoin - merge with default
Changeset: 09ecfc046559 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=09ecfc046559 Added Files: sql/test/BugTracker-2018/Tests/concat-str-int.Bug-6583.sql sql/test/BugTracker-2018/Tests/concat-str-int.Bug-6583.stable.err sql/test/BugTracker-2018/Tests/concat-str-int.Bug-6583.stable.out sql/test/BugTracker-2018/Tests/create-temp-table-ordered-index-error.Bug-6574.sql sql/test/BugTracker-2018/Tests/create-temp-table-ordered-index-error.Bug-6574.stable.err sql/test/BugTracker-2018/Tests/create-temp-table-ordered-index-error.Bug-6574.stable.out sql/test/BugTracker-2018/Tests/multiple-insertinto-table-Bug-6578.sql sql/test/BugTracker-2018/Tests/multiple-insertinto-table-Bug-6578.stable.err sql/test/BugTracker-2018/Tests/multiple-insertinto-table-Bug-6578.stable.out sql/test/BugTracker-2018/Tests/nested-merge-tables.Bug-6585.sql sql/test/BugTracker-2018/Tests/nested-merge-tables.Bug-6585.stable.err sql/test/BugTracker-2018/Tests/nested-merge-tables.Bug-6585.stable.out sql/test/BugTracker-2018/Tests/ordered-index-error.Bug-6572.stable.err sql/test/BugTracker-2018/Tests/ordered-index-error.Bug-6572.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-aritmetic-expressions-handling.Bug-6576.sql sql/test/BugTracker-2018/Tests/sqlitelogictest-aritmetic-expressions-handling.Bug-6576.stable.err sql/test/BugTracker-2018/Tests/sqlitelogictest-aritmetic-expressions-handling.Bug-6576.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-aritmetic-expressions-handling.Bug-6576.stable.out.int128 sql/test/BugTracker-2018/Tests/sqlitelogictest-case-not-in-count.Bug-6587.sql sql/test/BugTracker-2018/Tests/sqlitelogictest-case-not-in-count.Bug-6587.stable.err sql/test/BugTracker-2018/Tests/sqlitelogictest-case-not-in-count.Bug-6587.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-coalesce-division-by-zero.Bug-6556.stable.out.int128 sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-case.Bug-6573.stable.err sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-case.Bug-6573.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-expression.Bug-6589.sql sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-expression.Bug-6589.stable.err sql/test/BugTracker-2018/Tests/sqlitelogictest-complex-expression.Bug-6589.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-count-coalesce-nullif.Bug-6586.sql sql/test/BugTracker-2018/Tests/sqlitelogictest-count-coalesce-nullif.Bug-6586.stable.err sql/test/BugTracker-2018/Tests/sqlitelogictest-count-coalesce-nullif.Bug-6586.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-count-coalesce-nullif.Bug-6586.stable.out.int128 sql/test/BugTracker-2018/Tests/sqlitelogictest-missing-bulk-implementation.Bug-6575.sql sql/test/BugTracker-2018/Tests/sqlitelogictest-missing-bulk-implementation.Bug-6575.stable.err sql/test/BugTracker-2018/Tests/sqlitelogictest-missing-bulk-implementation.Bug-6575.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-not-between-wrong.Bug-6569.stable.err sql/test/BugTracker-2018/Tests/sqlitelogictest-not-between-wrong.Bug-6569.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-select-nullif-case.Bug-6579.sql sql/test/BugTracker-2018/Tests/sqlitelogictest-select-nullif-case.Bug-6579.stable.err sql/test/BugTracker-2018/Tests/sqlitelogictest-select-nullif-case.Bug-6579.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-select-nullif-case.Bug-6579.stable.out.int128 Removed Files: sql/test/BugTracker-2008/Tests/auto_coersion_bug.SF-2075157.stable.out.int128 Modified Files: NT/mkodbcwxs.py NT/mksqlwxs.py NT/monetdb_config.h.in NT/rules.msc buildtools/doc/windowsbuild.rst clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out clients/mapiclient/dump.c gdk/gdk_batop.c gdk/gdk_project.c gdk/gdk_select.c monetdb5/modules/kernel/Tests/select.malC monetdb5/modules/kernel/Tests/select.stable.out monetdb5/modules/kernel/aggr.c monetdb5/modules/kernel/aggr.mal monetdb5/modules/kernel/aggr.mal.sh monetdb5/optimizer/opt_candidates.c monetdb5/optimizer/opt_mergetable.c sql/backends/monet5/rel_bin.c sql/backends/monet5/sql_cat.c sql/backends/monet5/sql_result.c sql/common/sql_types.c sql/common/sql_types.h sql/server/rel_dump.c sql/server/rel_optimizer.c sql/server/rel_schema.c sql/server/rel_select.c sql/server/sql_mvc.c sql/server/sql_mvc.h
MonetDB: subjoin - Merge with default branch, undoing changes to...
Changeset: e83ff9dd6253 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e83ff9dd6253 Modified Files: NT/mkgeomwxs.py NT/mkodbcwxs.py NT/mksqlwxs.py buildtools/conf/monetdb.ico clients/mapiclient/mclient.c clients/mapiclient/mhelp.c clients/mapiclient/mhelp.h gdk/gdk_bbp.c gdk/gdk_join.c gdk/gdk_private.h gdk/gdk_search.c monetdb5/optimizer/opt_costModel.c monetdb5/optimizer/opt_evaluate.c sql/backends/monet5/UDF/pyapi/pyapi.c sql/backends/monet5/sql_execute.c Branch: subjoin Log Message: Merge with default branch, undoing changes to gdk_join.c. diffs (truncated from 2936 to 300 lines): diff --git a/NT/mkgeomwxs.py b/NT/mkgeomwxs.py --- a/NT/mkgeomwxs.py +++ b/NT/mkgeomwxs.py @@ -46,7 +46,11 @@ def main(): print(r' ') print(r'') print(r'') +print(r'') print(r'') +print(r'') +print(r' INSTALLDIR') +print(r'') print(r'') print(r' ' % (vs, arch)) print(r' ' % folder) @@ -82,8 +86,46 @@ def main(): print(r' ' % f) print(r' ') print(r'') -print(r'') +# the section was lifted from +# ...\SDK\wixui\WixUI_InstallDir.wxs and modified to remove the +# InstallDirDlg subsection +# see http://wixtoolset.org/documentation/manual/v3/wixui/wixui_customizations.html +print(r'') +print(r' ') +print(r' ') +print(r' ') +print(r' ') +print(r' ') +print(r' ') +print(r' ') +print(r' ') +print(r' ') +print(r' ') +print(r' ') +print(r' ') +print(r' ') +print(r' ') +print(r' ') +print(r' 1') +print(r' ') +print(r' 1') +print(r' NOT Installed') +print(r' Installed AND PATCH') +print(r' 1') +print(r' LicenseAccepted = "1"') +print(r' NOT Installed') +print(r' Installed AND NOT PATCH') +print(r' Installed AND PATCH') +print(r' 1') +print(r' 1') +print(r' 1') +print(r' 1') +print(r' ') +print(r'') +print(r'') +print(r'') print(r'') +print(r'') print(r' ') print(r'') diff --git a/NT/mkodbcwxs.py b/NT/mkodbcwxs.py --- a/NT/mkodbcwxs.py +++ b/NT/mkodbcwxs.py @@ -46,6 +46,7 @@ def main(): print(r'') # print(r'') print(r'') +print(r'') print(r'') print(r'') print(r'') diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py --- a/NT/mksqlwxs.py +++ b/NT/mksqlwxs.py @@ -49,6 +49,7 @@ def main(): print(r' ') print(r'') print(r'') +print(r'') print(r'') print(r'') print(r' ' % (vs, arch)) diff --git a/buildtools/conf/monetdb.ico b/buildtools/conf/monetdb.ico index fad690d3c111db967da3cf2e65cb6df338355064..1cd666db49c02edb3012cae55f0c257c359a9359 GIT binary patch literal 16958 zc%1E8ZD?C%6n?TUO_QNj{1`H|L#7sC>MT~BN=s3h4z+EXqRjcj!G8IHqPBBwbGuE{ zsXsRM!~Kvsrh=6Tej%c=R5w{P*p7O5W_qK!Idx}|x2>GFCQF)|w7GAm_bI0* zP44@i^PKm*=lw{50Ds!s!QYF~+yR^ppqawAV8D9chYuev z#^P?>{^&1RE(zgmqy+w?AIvdf-IPfnRemh&5ofZlAmc`EQ!y&-oAy<1*boc?nqq zIR7UdG5C^s5z_6KmmvSWIsRr0A{f@~lb7I__dEGB9)EL#bcSxfyaH=~dmevT55jm< zw_jf2M&!{+t5`V?dp5-#kLVSpyyGVViEpyn?KKMfeZt_R9+}&%=e>?K=2^Zr{8> ztR72C@E_Ifn-^f7uPMf#bK+fPV3e{=4PvQoKWhcn`d3Tve_6$`gZz~(Y0Bq(Zwuqm zqTBD;068vVo*yZ}f3sSPAo)%>V`lyCU?(`r3hb#ti( G =gR)~Xa*eCbHrTS3) zSVDeBUBqBa)(*?`4z$H2J9yknb>SO_b~ZEQO3^l^We_3vTRf^~kCt6E?nnTx?n z;AGa6*JQ8J9mFNIXKaDImyp-Uw7jix|1LM@rPh_}m$l$Ym-X yT}2N!|d}Khi_*)YS00`-VzPr z2C0`-^JN^n!?>LN8FGhNma{eH8M)_S+j^UO2j%Tb?DF|HT*e^Fc;&6B(IA%5hnJ@A z9;lfYpVFsY!lSnVw=qYq<=@Mr^|+9)`rdo#%;i5+!<&;Ra*vvbV5Be-;m zhc%~vbL46zF?hvg46OMuh^w9L C)A6s6ZI-p9m+M8=sj>vi!igt`}D`ZGwszOG>`GR(P8Xh++b%MBFQ zd?kBs10$4g>GNMz)M;u%I#|8`2FtAymK8yi^;>lCfPSrKWm;h;^v+7i~Rc; zxohHccNE!2`S9VxhYue 3ftXc?U- z)V2Ym$YMj+8-Ytv#jkPMmr)g?pXS~`@f+e4iSr33q^lZ_etEX|uTSjWfFmc>https://www.monetdb.org/Documentation/SQLreference/Alter; - }, - { "ALTER MERGE TABLE", - "", - "ALTER TABLE qname ADD TABLE qname\n" - "ALTER TABLE qname DROP TABLE qname [RESTRICT | CASCADE]\n", - "", - "See also https://www.monetdb.org/Documentation/Cookbooks/SQLrecipes/DataPartitioning; - }, - { "ALTER SEQUENCE", - "", -