Changeset: 2d3c0a540e64 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2d3c0a540e64 Added Files: monetdb5/modules/atoms/Tests/strappend.malC monetdb5/modules/atoms/Tests/strappend.stable.err monetdb5/modules/atoms/Tests/strappend.stable.out monetdb5/optimizer/Tests/tst4006.malC monetdb5/optimizer/Tests/tst4006.stable.err monetdb5/optimizer/Tests/tst4006.stable.out sql/backends/monet5/Tests/pyloader06.stable.out.Windows sql/backends/monet5/Tests/pyloader07.stable.out.Windows sql/jdbc/tests/Tests/BugResultSetMetaData_Bug_6183.SQL.bat sql/jdbc/tests/Tests/BugResultSetMetaData_Bug_6183.SQL.sh sql/jdbc/tests/Tests/BugResultSetMetaData_Bug_6183.stable.err sql/jdbc/tests/Tests/BugResultSetMetaData_Bug_6183.stable.out sql/test/BugTracker-2016/Tests/groupby_on_column_expression.Bug-3832.sql sql/test/BugTracker-2016/Tests/groupby_on_column_expression.Bug-3832.stable.err sql/test/BugTracker-2016/Tests/groupby_on_column_expression.Bug-3832.stable.out sql/test/BugTracker-2017/Tests/cast_boolean_to_string.Bug-6110.sql sql/test/BugTracker-2017/Tests/cast_boolean_to_string.Bug-6110.stable.err sql/test/BugTracker-2017/Tests/cast_boolean_to_string.Bug-6110.stable.out sql/test/BugTracker-2017/Tests/create_view_order_by.Bug-3465.sql sql/test/BugTracker-2017/Tests/create_view_order_by.Bug-3465.stable.err sql/test/BugTracker-2017/Tests/create_view_order_by.Bug-3465.stable.out sql/test/BugTracker-2017/Tests/insert_self_ref_FK.Bug-6131.sql sql/test/BugTracker-2017/Tests/insert_self_ref_FK.Bug-6131.stable.err sql/test/BugTracker-2017/Tests/insert_self_ref_FK.Bug-6131.stable.out sql/test/BugTracker-2017/Tests/modulo.Bug-6225.sql sql/test/BugTracker-2017/Tests/modulo.Bug-6225.stable.err sql/test/BugTracker-2017/Tests/modulo.Bug-6225.stable.out sql/test/BugTracker-2017/Tests/real-power.Bug-6228.sql sql/test/BugTracker-2017/Tests/real-power.Bug-6228.stable.err sql/test/BugTracker-2017/Tests/real-power.Bug-6228.stable.out sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6219.sql sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6219.stable.err sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6219.stable.out sql/test/BugTracker-2017/Tests/unknown_col_in_order_by.Bug-3535.sql sql/test/BugTracker-2017/Tests/unknown_col_in_order_by.Bug-3535.stable.err sql/test/BugTracker-2017/Tests/unknown_col_in_order_by.Bug-3535.stable.out sql/test/testdb-upgrade-chain-hge/Tests/dump.SQL.py.src sql/test/testdb-upgrade-chain-hge/Tests/upgrade.SQL.py.src sql/test/testdb-upgrade-chain/Tests/dump.SQL.py.src sql/test/testdb-upgrade-chain/Tests/upgrade.SQL.py.src sql/test/testdb-upgrade-hge/Tests/dump.SQL.py.src sql/test/testdb-upgrade-hge/Tests/upgrade.SQL.py.src sql/test/testdb-upgrade/Tests/dump.SQL.py.src Removed Files: monetdb5/mal/Tests/tst273.stable.err monetdb5/mal/Tests/tst273.stable.out sql/test/testdb-upgrade-chain-hge/Tests/dump.SQL.py sql/test/testdb-upgrade-chain-hge/Tests/upgrade.SQL.py sql/test/testdb-upgrade-chain/Tests/dump.SQL.py sql/test/testdb-upgrade-chain/Tests/upgrade.SQL.py sql/test/testdb-upgrade-hge/Tests/dump.SQL.py sql/test/testdb-upgrade-hge/Tests/upgrade.SQL.py sql/test/testdb-upgrade/Tests/dump.SQL.py Modified Files: .hgtags MonetDB.spec clients/R/Tests/copy_into_fwf.stable.out clients/R/Tests/dbapply.stable.out clients/R/Tests/dbi.R clients/R/Tests/dbi.stable.out clients/R/Tests/deps-test.R clients/R/Tests/dplyr-flights.R clients/R/Tests/dplyr-flights.stable.out clients/R/Tests/dplyr.R clients/R/Tests/dplyr.stable.err clients/R/Tests/dplyr.stable.out clients/Tests/exports.stable.out clients/mapiclient/mclient.c configure.ag debian/changelog gdk/ChangeLog-Archive gdk/gdk.h gdk/gdk_aggr.c gdk/gdk_atoms.c gdk/gdk_atoms.h gdk/gdk_batop.c gdk/gdk_bbp.c gdk/gdk_heap.c gdk/gdk_join.c gdk/gdk_orderidx.c gdk/gdk_private.h gdk/gdk_search.c gdk/gdk_utils.c geom/monetdb5/geom.c geom/sql/functions/Tests/ST_NumInteriorRings.stable.out libversions monetdb5/mal/Tests/performanceTests/performanceLog monetdb5/mal/mal.h monetdb5/mal/mal_builder.c monetdb5/mal/mal_debugger.c monetdb5/mal/mal_function.c monetdb5/mal/mal_import.c monetdb5/mal/mal_instruction.c monetdb5/mal/mal_instruction.h monetdb5/mal/mal_runtime.c monetdb5/mal/mal_runtime.h monetdb5/modules/atoms/Tests/All monetdb5/modules/atoms/blob.c monetdb5/modules/atoms/str.c monetdb5/modules/mal/mal_io.c monetdb5/modules/mal/manifold.c monetdb5/modules/mal/querylog.c monetdb5/modules/mal/sysmon.c monetdb5/optimizer/Tests/All monetdb5/optimizer/Tests/GCexample01.stable.out monetdb5/optimizer/Tests/dataflow.stable.out monetdb5/optimizer/Tests/dataflow4.stable.out monetdb5/optimizer/opt_dataflow.c monetdb5/optimizer/opt_deadcode.c monetdb5/optimizer/opt_emptybind.c monetdb5/optimizer/opt_evaluate.c monetdb5/optimizer/opt_garbageCollector.c monetdb5/optimizer/opt_pipes.c monetdb5/optimizer/opt_support.c monetdb5/optimizer/opt_wrapper.c sql/ChangeLog sql/backends/monet5/Tests/All sql/backends/monet5/Tests/pyloader06.stable.out sql/backends/monet5/Tests/pyloader07.stable.out sql/backends/monet5/UDF/pyapi/emit.c sql/backends/monet5/sql_execute.c sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_scenario.c sql/backends/monet5/sql_statement.c sql/backends/monet5/sql_statistics.c sql/backends/monet5/sql_upgrades.c sql/backends/monet5/vaults/bam/Tests/sam_export.stable.out sql/backends/monet5/vaults/shp/75_shp.sql sql/jdbc/tests/Tests/All sql/jdbc/tests/Tests/BugDecimalRound_Bug_3561.stable.out sql/scripts/46_profiler.sql sql/server/rel_exp.c sql/server/rel_rel.c sql/server/rel_schema.c sql/server/rel_select.c sql/server/sql_parser.y sql/test/BugTracker-2010/Tests/ORDER_BY_over_UNION_EXCEPT_INTERSECT.Bug-2606.stable.out sql/test/BugTracker-2016/Tests/All sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out sql/test/BugTracker-2016/Tests/rename_exps.Bug-3974.stable.out sql/test/BugTracker-2017/Tests/All sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/check.stable.out sql/test/emptydb-upgrade-chain/Tests/check.stable.out.32bit sql/test/emptydb-upgrade-chain/Tests/check.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-hge/Tests/check.stable.out.int128 sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade/Tests/check.stable.out sql/test/emptydb-upgrade/Tests/check.stable.out.32bit sql/test/emptydb-upgrade/Tests/check.stable.out.int128 sql/test/emptydb-upgrade/Tests/upgrade.stable.out sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128 sql/test/emptydb/Tests/check.stable.out sql/test/emptydb/Tests/check.stable.out.32bit sql/test/emptydb/Tests/check.stable.out.int128 sql/test/malloc_fail/Tests/All sql/test/malloc_fail/Tests/mallocs.SQL.py sql/test/mergetables/Tests/mergequery.stable.out sql/test/pg_regress/Tests/create_view.sql sql/test/pg_regress/Tests/create_view.stable.err sql/test/pg_regress/Tests/create_view.stable.out sql/test/quantiles/Tests/quantiles.stable.out sql/test/remote/Tests/partition_elim.stable.out sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 sql/test/testdb/Tests/testdb-dump.SQL.py Branch: data-vaults Log Message:
Merge with default diffs (truncated from 9428 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -651,3 +651,8 @@ bf4b58d202645774b75c7f508c84b30e3be78a49 bf4b58d202645774b75c7f508c84b30e3be78a49 Dec2016_SP1_release 3968ed7fb6dab04a2530c6c3e1a5ffd6d649298b Dec2016_7 3968ed7fb6dab04a2530c6c3e1a5ffd6d649298b Dec2016_SP2_release +615229dc6f3c7dc89bbd9cc5923ad307b4c93cb1 Dec2016_9 +3968ed7fb6dab04a2530c6c3e1a5ffd6d649298b Dec2016_SP2_release +615229dc6f3c7dc89bbd9cc5923ad307b4c93cb1 Dec2016_SP2_release +566c4291d2c2547a2360097c9a1038c2d2064ec3 Dec2016_11 +566c4291d2c2547a2360097c9a1038c2d2064ec3 Dec2016_SP3_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -132,7 +132,7 @@ Vendor: MonetDB BV <i...@monetdb.org> Group: Applications/Databases License: MPLv2.0 URL: http://www.monetdb.org/ -Source: http://dev.monetdb.org/downloads/sources/Dec2016-SP2/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Dec2016-SP3/%{name}-%{version}.tar.bz2 # we need systemd for the _unitdir macro to exist %if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7 @@ -944,6 +944,33 @@ rm -f %{buildroot}%{_bindir}/Maddlog %postun -p /sbin/ldconfig %changelog +* Mon Mar 13 2017 Sjoerd Mullender <sjo...@acm.org> - 11.25.11-20170313 +- Rebuilt. +- BZ#6138: Weak duplicate elimination in string heaps > 64KB +- BZ#6183: ResultSet returns double quoted column name if name contains + space characters +- BZ#6219: Crash in rel_optimizer (sqlsmith) +- BZ#6228: mclient crashes if real column is multiplied by it itself +- BZ#6229: ANALYZE, unexpected end of input +- BZ#6230: ANALYZE, syntax error +- BZ#6237: semijoin with empty right bat does not return immediately + +* Tue Feb 28 2017 Sjoerd Mullender <sjo...@acm.org> - 11.25.11-20170313 +- gdk: Fixed a bug when appending string bats that are fully duplicate + eliminated. It could happend that the to-be-appended bat had an empty + string at an offset and at that same offset in the to-be-appended-to bat + there happened to be a (sequence of) NULL(s). Then this offset would be + used, even though it might nog be the right offset for the empty string + in the to-be-appended-to bat. This would result in multiple offsets for + the empty string, breaking the promise of being duplicate eliminated. + +* Mon Feb 27 2017 Panagiotis Koutsourakis <kutsu...@monetdbsolutions.com> - 11.25.9-20170227 +- Rebuilt. +- BZ#6217: Segfault in rel_optimizer (sqlsmith) +- BZ#6218: grouped quantiles with all null group causes following groups + to return null +- BZ#6224: mal_parser: cannot refer to types containing an underscore + * Thu Feb 16 2017 Panagiotis Koutsourakis <kutsu...@monetdbsolutions.com> - 11.25.7-20170216 - Rebuilt. - BZ#4034: argnames array in rapi.c has fixed length (that was too short) diff --git a/clients/R/Tests/copy_into_fwf.stable.out b/clients/R/Tests/copy_into_fwf.stable.out --- a/clients/R/Tests/copy_into_fwf.stable.out +++ b/clients/R/Tests/copy_into_fwf.stable.out @@ -24,11 +24,8 @@ Ready. # 16:40:23 > "R" "--vanilla" "--slave" "--args" "30658" # 16:40:23 > -[1] TRUE <MonetDBResult> SQL CREATE TABLE mtcars (mpg DOUBLE PRECISION, cyl DOUBLE PRECISION, disp DOUBLE PRECISION, hp DOUBLE PRECISION, drat DOUBLE PRECISION, wt DOUBLE PRECISION, qsec DOUBLE PRECISION, vs DOUBLE PRECISION, am DOUBLE PRECISION, gear DOUBLE PRECISION, carb DOUBLE PRECISION) - ROWS Fetched: 0 [complete] - Changed: NA mpg cyl disp hp drat wt qsec vs am gear carb 1 21.0 6 160.0 110 3.90 2.620 16.46 0 1 4 4 2 21.0 6 160.0 110 3.90 2.875 17.02 0 1 4 4 @@ -62,7 +59,6 @@ 29 15.8 8 351.0 264 4.22 3.170 14.50 30 19.7 6 145.0 175 3.62 2.770 15.50 0 1 5 6 31 15.0 8 301.0 335 3.54 3.570 14.60 0 1 5 8 32 21.4 4 121.0 109 4.11 2.780 18.60 1 1 4 2 -[1] TRUE [1] "SUCCESS" # 16:40:23 > diff --git a/clients/R/Tests/dbapply.stable.out b/clients/R/Tests/dbapply.stable.out --- a/clients/R/Tests/dbapply.stable.out +++ b/clients/R/Tests/dbapply.stable.out @@ -29,14 +29,10 @@ Ready. # 11:43:14 > "R" "--vanilla" "--slave" "--args" "35780" # 11:43:14 > -[1] TRUE -[1] TRUE -[1] TRUE [1] 32 [1] TRUE [1] 32 [1] 42 -[1] TRUE [1] "SUCCESS" # 11:43:21 > 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 @@ -43,6 +43,7 @@ dbRemoveTable(con,tname) stopifnot(identical(dbExistsTable(con,tname),FALSE)) # write test table iris +# iris is one of the built-in datasets in R data(iris) dbWriteTable(con,tname,iris) @@ -65,16 +66,22 @@ stopifnot(identical(res@env$success,TRUE stopifnot(dbColumnInfo(res)[[1,1]] == "Species") stopifnot(dbColumnInfo(res)[[2,1]] == "Sepal.Width") -stopifnot(dbGetRowCount(res) == 150 && res@env$info$rows == 150) +stopifnot(dbGetRowCount(res) == 0) data <- dbFetch(res,10) +stopifnot(dbGetRowCount(res) == 10) + + stopifnot(dim(data)[[1]] == 10) stopifnot(dim(data)[[2]] == 2) stopifnot(res@env$delivered == 10) stopifnot(dbHasCompleted(res) == FALSE) data2 <- dbFetch(res,-1) + +stopifnot(dbGetRowCount(res) == 150) + stopifnot(dim(data2)[[1]] == 140) stopifnot(dbHasCompleted(res) == TRUE) diff --git a/clients/R/Tests/dbi.stable.out b/clients/R/Tests/dbi.stable.out --- a/clients/R/Tests/dbi.stable.out +++ b/clients/R/Tests/dbi.stable.out @@ -44,42 +44,12 @@ Ready. # loading sql script: 90_generator.sql # loading sql script: 99_system.sql -# 12:26:31 > -# 12:26:31 > "R" "--vanilla" "--slave" "--args" "31372" -# 12:26:31 > +# 15:00:13 > +# 15:00:13 > "R" "--vanilla" "--slave" "--args" "34632" +# 15:00:13 > -[1] TRUE -[1] TRUE -[1] TRUE -[1] TRUE -[1] TRUE [1] "\"Need to quote this table name\"" "monetdbtest" [3] "othermethod" -[1] TRUE -[1] TRUE -[1] TRUE -[1] TRUE -[1] TRUE -[1] TRUE -[1] TRUE -[1] TRUE -[1] TRUE -[1] TRUE -[1] TRUE -[1] TRUE -[1] TRUE -[1] TRUE -[1] TRUE -[1] TRUE -[1] TRUE -[1] TRUE -[1] TRUE -[1] TRUE -[1] TRUE -[1] TRUE -[1] TRUE -[1] TRUE -[1] TRUE [1] "SUCCESS" # 12:26:33 > 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,10 +1,18 @@ -packages_required <- c('Rcpp', 'dplyr', 'Lahman', 'nycflights13') +packages_required <- c('Rcpp', 'dplyr', 'Lahman', 'nycflights13', 'gdata', 'survey') install_or_upgrade_packages <- function(lp) { np <- lp[!(lp %in% installed.packages()[,"Package"])] repos <- 'http://cran.rstudio.com/' if(length(np)) install.packages(np, repos=repos, quiet=T) update.packages(repos=repos, ask=F, oldPkgs=lp, quiet=T) + + # dev dplyr + if (packageVersion("devtools") < 1.6) { + install.packages("devtools") + } + devtools::install_github("hadley/lazyeval") + devtools::install_github("hadley/dplyr") + } 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 @@ -20,7 +20,7 @@ so <- function(x) { } my_db <- MonetDBLite::src_monetdb(dbname=dbname, port=dbport, wait=T) -if (!DBI::dbExistsTable(my_db$con , 'flights')) DBI::dbWriteTable( my_db$con , 'flights' , nycflights13::flights , csvdump=T, overwrite=T) +if (!DBI::dbExistsTable(con_acquire(my_db) , 'flights')) DBI::dbWriteTable( con_acquire(my_db) , 'flights' , nycflights13::flights , csvdump=T, overwrite=T) flights <- tbl( my_db , 'flights') dim(flights) @@ -28,8 +28,9 @@ so(flights) so(filter(flights, month == 1, day == 1)) so(filter(flights, month == 1 | month == 2)) -so(arrange(flights, year, month, day)) -so(arrange(flights, desc(arr_delay))) +# MonetDBLite has ORDER BY in subqueries, but standalone MonetDB does not. +# so(arrange(flights, year, month, day)) +# so(arrange(flights, desc(arr_delay))) so(select(flights, year, month, day)) so(select(flights, year:day)) so(select(flights, -(year:day))) @@ -117,4 +118,5 @@ so(flights %>% ) %>% filter(arr > 30 | dep > 30)) + print("SUCCESS") diff --git a/clients/R/Tests/dplyr-flights.stable.out b/clients/R/Tests/dplyr-flights.stable.out --- a/clients/R/Tests/dplyr-flights.stable.out +++ b/clients/R/Tests/dplyr-flights.stable.out @@ -29,10 +29,7 @@ Ready. # 11:44:05 > "R" "--vanilla" "--slave" "--args" "30588" # 11:44:05 > -[1] TRUE -[1] 336776 19 -[1] 42 19 -[1] 42 19 +[1] NA 19 [1] 42 19 [1] 42 19 [1] 42 19 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 @@ -15,38 +15,47 @@ if (length(args) > 1) dbname <- args[[2]] dps <- MonetDBLite::src_monetdb(dbname=dbname, port=dbport) -copy_lahman(dps) +if (!DBI::dbExistsTable(con_acquire(dps), "AllstarFull")) copy_lahman(dps) })) +printn <- 10 +printsth <- function(s) { + print(nrow(collect(head(s, printn)))) + printn <<- printn+1 +} + # the remainder is pretty much the example from the manpage. # Methods ------------------------------------------------------------------- batting <- tbl(dps, "Batting") length(dim(batting)) == 2 +length(colnames(batting)) > 1 -length(colnames(batting)) > 1 -nrow(head(batting, n=10L)) +printsth(batting) # co* verbs -cc <- collapse(batting) -cc <- collect(batting) -# cc <- compute(batting) -# head(cc) +c1 <- collapse(batting) +c2 <- collect(batting) +c3 <- compute(batting) + +printsth(c1) +printsth(c2) +printsth(c3) # Data manipulation verbs --------------------------------------------------- -nrow(head(filter(batting, yearID > 2005, G > 130), n=11L)) -nrow(head(select(batting, playerID:lgID), n=12L)) -nrow(head(arrange(batting, playerID, desc(yearID)), n=13L)) +printsth(filter(batting, yearID > 2005, G > 130)) _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
