Changeset: eb8e9f5151e5 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=eb8e9f5151e5 Added Files: clients/Tests/SQL-dump.SQL.py sql/test/emptydb-upgrade-chain-hge/Tests/All sql/test/emptydb-upgrade-chain-hge/Tests/check.SQL.py.src sql/test/emptydb-upgrade-chain-hge/Tests/check.reqtests sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.err.int128 sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/dump.SQL.py sql/test/emptydb-upgrade-chain-hge/Tests/dump.reqtests sql/test/emptydb-upgrade-chain-hge/Tests/dump.stable.err.int128 sql/test/emptydb-upgrade-chain-hge/Tests/dump.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/package.py sql/test/emptydb-upgrade-chain-hge/Tests/package.reqtests sql/test/emptydb-upgrade-chain-hge/Tests/package.stable.err.int128 sql/test/emptydb-upgrade-chain-hge/Tests/package.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/unpackage.py sql/test/emptydb-upgrade-chain-hge/Tests/unpackage.stable.err.int128 sql/test/emptydb-upgrade-chain-hge/Tests/unpackage.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.sql sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.err.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/All sql/test/emptydb-upgrade-chain/Tests/check.SQL.py.src sql/test/emptydb-upgrade-chain/Tests/check.reqtests sql/test/emptydb-upgrade-chain/Tests/check.stable.err sql/test/emptydb-upgrade-chain/Tests/check.stable.out sql/test/emptydb-upgrade-chain/Tests/check.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/dump.SQL.py sql/test/emptydb-upgrade-chain/Tests/dump.reqtests sql/test/emptydb-upgrade-chain/Tests/dump.stable.err sql/test/emptydb-upgrade-chain/Tests/dump.stable.out sql/test/emptydb-upgrade-chain/Tests/package.py sql/test/emptydb-upgrade-chain/Tests/package.reqtests sql/test/emptydb-upgrade-chain/Tests/package.stable.err sql/test/emptydb-upgrade-chain/Tests/package.stable.out sql/test/emptydb-upgrade-chain/Tests/unpackage.py sql/test/emptydb-upgrade-chain/Tests/unpackage.stable.err sql/test/emptydb-upgrade-chain/Tests/unpackage.stable.out sql/test/emptydb-upgrade-chain/Tests/upgrade.sql sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.err 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/All sql/test/emptydb-upgrade-hge/Tests/check.SQL.py.src sql/test/emptydb-upgrade-hge/Tests/check.reqtests sql/test/emptydb-upgrade-hge/Tests/check.stable.err.int128 sql/test/emptydb-upgrade-hge/Tests/check.stable.out.int128 sql/test/emptydb-upgrade-hge/Tests/dump.SQL.py sql/test/emptydb-upgrade-hge/Tests/dump.reqtests sql/test/emptydb-upgrade-hge/Tests/dump.stable.err.int128 sql/test/emptydb-upgrade-hge/Tests/dump.stable.out.int128 sql/test/emptydb-upgrade-hge/Tests/unpackage.py sql/test/emptydb-upgrade-hge/Tests/unpackage.stable.err.int128 sql/test/emptydb-upgrade-hge/Tests/unpackage.stable.out.int128 sql/test/emptydb-upgrade-hge/Tests/upgrade.sql sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.err.int128 sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade/Tests/All sql/test/emptydb-upgrade/Tests/check.SQL.py.src sql/test/emptydb-upgrade/Tests/check.reqtests sql/test/emptydb-upgrade/Tests/check.stable.err sql/test/emptydb-upgrade/Tests/check.stable.out sql/test/emptydb-upgrade/Tests/check.stable.out.int128 sql/test/emptydb-upgrade/Tests/dump.SQL.py sql/test/emptydb-upgrade/Tests/dump.reqtests sql/test/emptydb-upgrade/Tests/dump.stable.err sql/test/emptydb-upgrade/Tests/dump.stable.out sql/test/emptydb-upgrade/Tests/unpackage.py sql/test/emptydb-upgrade/Tests/unpackage.stable.err sql/test/emptydb-upgrade/Tests/unpackage.stable.out sql/test/emptydb-upgrade/Tests/upgrade.sql sql/test/emptydb-upgrade/Tests/upgrade.stable.err sql/test/emptydb-upgrade/Tests/upgrade.stable.out sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128 sql/test/emptydb/Tests/All sql/test/emptydb/Tests/check.SQL.py.src sql/test/emptydb/Tests/check.reqtests sql/test/emptydb/Tests/check.stable.err sql/test/emptydb/Tests/check.stable.out sql/test/emptydb/Tests/check.stable.out.int128 sql/test/emptydb/Tests/dump.SQL.py sql/test/emptydb/Tests/dump.reqtests sql/test/emptydb/Tests/dump.stable.err sql/test/emptydb/Tests/dump.stable.out sql/test/emptydb/Tests/load.sql sql/test/emptydb/Tests/load.stable.err sql/test/emptydb/Tests/load.stable.out sql/test/emptydb/Tests/package-hge.py sql/test/emptydb/Tests/package-hge.stable.err.int128 sql/test/emptydb/Tests/package-hge.stable.out.int128 sql/test/emptydb/Tests/package.py sql/test/emptydb/Tests/package.reqtests sql/test/emptydb/Tests/package.stable.err sql/test/emptydb/Tests/package.stable.out sql/test/emptydb/updatetests tools/embedded/rcheck.sh Removed Files: clients/Tests/SQL-dump.sql Modified Files: .hgtags MonetDB.spec NT/installer32/MonetDB-ODBC-Installer.vdproj NT/installer32/MonetDB5-Geom-Module.vdproj NT/installer32/MonetDB5-SQL-Installer.vdproj NT/installer64/MonetDB-ODBC-Installer.vdproj NT/installer64/MonetDB5-Geom-Module.vdproj NT/installer64/MonetDB5-SQL-Installer.vdproj NT/monetdb_config.h.in NT/rules.msc clients/R/Tests/deps-install.R clients/Tests/All clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/SQL-dump.stable.out clients/Tests/SQL-dump.stable.out.int128 clients/Tests/exports.stable.out clients/mapiclient/dump.c clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc clients/python2/setup.py clients/python3/setup.py configure.ag debian/changelog debian/control gdk/ChangeLog.Jun2016 gdk/gdk.h gdk/gdk_aggr.c gdk/gdk_atoms.c gdk/gdk_bat.c gdk/gdk_batop.c gdk/gdk_bbp.c gdk/gdk_calc.c gdk/gdk_calc_compare.h gdk/gdk_group.c gdk/gdk_heap.c gdk/gdk_logger.c gdk/gdk_logger.h gdk/gdk_project.c gdk/gdk_system.c gdk/gdk_tm.c gdk/libbat.rc geom/monetdb5/geom.c geom/monetdb5/geom.h geom/monetdb5/geom_upgrade.c java/ChangeLog.Jun2016 java/build.properties java/pom.xml java/release.txt java/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java libversions monetdb5/modules/atoms/batxml.c monetdb5/modules/atoms/blob.c monetdb5/modules/atoms/json.c monetdb5/modules/kernel/algebra.c monetdb5/modules/mal/batcalc.c monetdb5/modules/mal/bbp.c monetdb5/modules/mal/bbp.h monetdb5/modules/mal/bbp.mal monetdb5/tools/libmonetdb5.rc sql/backends/monet5/sql_upgrades.c sql/jdbc/tests/Tests/BugDatabaseMetaData_Bug_3356.stable.out sql/jdbc/tests/Tests/Test_Dobjects.stable.out sql/storage/bat/bat_logger.c sql/storage/bat/bat_storage.c sql/storage/bat/bat_utils.c sql/storage/store.c sql/test/leaks/Tests/check0.stable.out sql/test/leaks/Tests/check0.stable.out.int128 sql/test/leaks/Tests/check1.stable.out sql/test/leaks/Tests/check1.stable.out.int128 sql/test/leaks/Tests/check2.stable.out sql/test/leaks/Tests/check2.stable.out.int128 sql/test/leaks/Tests/check3.stable.out sql/test/leaks/Tests/check3.stable.out.int128 sql/test/leaks/Tests/check4.stable.out sql/test/leaks/Tests/check4.stable.out.int128 sql/test/leaks/Tests/check5.stable.out sql/test/leaks/Tests/check5.stable.out.int128 sql/test/leaks/Tests/select1.stable.out sql/test/leaks/Tests/select1.stable.out.int128 sql/test/leaks/Tests/select2.stable.out sql/test/leaks/Tests/select2.stable.out.int128 sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out 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 sql/test/testdb-upgrade/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 sql/test/testdb/Tests/testdb-dump.stable.out sql/test/testdb/Tests/testdb-dump.stable.out.Windows sql/test/testdb/Tests/testdb-load.sql testing/Mtest.py.in testing/process.py tools/embedded/build-rpkg.sh vertoo.data Branch: pythonudf Log Message:
Merge with Jun2016. diffs (truncated from 224467 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -618,3 +618,5 @@ 25c9f569add9c341d40920f30936890ae6ea68a8 feec2e4020548d3137a0e946b7a4e29db5b9e14a Jul2015_15 feec2e4020548d3137a0e946b7a4e29db5b9e14a Jul2015_SP3_release ee2d8c8d65c35ed022ca0785f30fcf4b051a542e Jun2016_root +ee54e50fccb17db48bbfd983882e8491a869131c Jul2015_17 +ee54e50fccb17db48bbfd983882e8491a869131c Jul2015_SP3_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -119,7 +119,7 @@ BuildRequires: geos-devel >= 3.0.0 BuildRequires: gsl-devel %if %{?with_lidar:1}%{!?with_lidar:0} BuildRequires: liblas-devel gdal-devel libgeotiff-devel -# Fedora 22 libas-devel does not depend on liblas: +# Fedora 22 liblas-devel does not depend on liblas: BuildRequires: liblas %endif BuildRequires: libatomic_ops-devel @@ -986,6 +986,29 @@ rm -f %{buildroot}%{_bindir}/Maddlog %postun -p /sbin/ldconfig %changelog +* Thu Mar 24 2016 Sjoerd Mullender <sjo...@acm.org> - 11.21.17-20160324 +- Rebuilt. +- BZ#2972: SQL URL functionality contains errors +- BZ#3881: Server crashes on bulk load +- BZ#3890: Window function + group by in subselect, rel2bin_project: + Assertion `0' failed +- BZ#3891: MonetDB crashes when executing SQL with window function +- BZ#3900: null handling in some sql statements is incorrect +- BZ#3906: Multi-column 1-N table-function with mitosis produces different + column counts +- BZ#3917: Date difference returns month_interval instead of day_interval +- BZ#3938: Wrong error message on violating foreign key constraint +- BZ#3941: Wrong coercion priority +- BZ#3948: SQL: select * from sys.sys.table_name; is accepted but should + return an error +- BZ#3951: extern table_funcs not visible from Windows DLL for extensions + like vaults (crashes) +- BZ#3952: Stream table gives segfault +- BZ#3953: MIN/MAX of a UUID column produces wrong results +- BZ#3954: Consolidate table assertion error +- BZ#3955: (incorrect) MAL loop instead of manifold triggered by simple + change in target list + * Thu Mar 10 2016 Sjoerd Mullender <sjo...@acm.org> - 11.21.15-20160310 - Rebuilt. - BZ#3549: bulk string operations very slow diff --git a/NT/rules.msc b/NT/rules.msc --- a/NT/rules.msc +++ b/NT/rules.msc @@ -281,13 +281,20 @@ create_winconfig_conds_new_py: $(ECHO) # > "$(TOPDIR)\winconfig_conds_new.py" !IFDEF BITS32 $(ECHO) BITS32_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py" + $(ECHO) BITS64OID32_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py" !ELSE $(ECHO) BITS32_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py" -!ENDIF !IFDEF BITS64 $(ECHO) BITS64_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py" +!IFDEF MONET_OID32 + $(ECHO) BITS64OID32_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py" +!ELSE + $(ECHO) BITS64OID32_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py" +!ENDIF !ELSE $(ECHO) BITS64_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py" + $(ECHO) BITS64OID32_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py" +!ENDIF !ENDIF !IFDEF CROSS_COMPILING $(ECHO) CROSS_COMPILING_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py" 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 @@ -3,11 +3,6 @@ dir.create(unlist(strsplit(Sys.getenv("R # autoinstall DBI and digest, we need those to install MonetDB.R dd <- capture.output(suppressMessages(suppressWarnings({ - (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) - x <- lapply(lp,function(x){library(x,character.only=TRUE,quietly=T)}) - })(c("DBI", "digest")) + install.packages(c("devtools", "digest"), repos="http://cran.rstudio.com/", quiet=T) + devtools::install_github("rstats-db/DBI", quiet=T) }))) diff --git a/clients/Tests/All b/clients/Tests/All --- a/clients/Tests/All +++ b/clients/Tests/All @@ -1,4 +1,4 @@ exports -HAVE_FITS&HAVE_GEOM&HAVE_GSL&HAVE_LIBR&!HAVE_LIDAR&!HAVE_SHP&HAVE_NETCDF&HAVE_SAMTOOLS&HAVE_SPHINXCLIENT?MAL-signatures -!BITS32&!BITS64OID32&HAVE_FITS&HAVE_GEOM&HAVE_GSL&!HAVE_LIDAR&!HAVE_SHP&HAVE_NETCDF&HAVE_SAMTOOLS?SQL-dump +HAVE_FITS&HAVE_GEOM&HAVE_GSL&HAVE_LIBR&!HAVE_LIDAR&HAVE_NETCDF&HAVE_SAMTOOLS&!HAVE_SHP&HAVE_SPHINXCLIENT?MAL-signatures +!BITS32&!BITS64OID32&HAVE_FITS&HAVE_GEOM&HAVE_GSL&!HAVE_LIDAR&HAVE_NETCDF&HAVE_PCRE&!HAVE_SHP&HAVE_SAMTOOLS?SQL-dump MERCURIAL?malcheck diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out --- a/clients/Tests/MAL-signatures.stable.out +++ b/clients/Tests/MAL-signatures.stable.out @@ -31256,6 +31256,10 @@ command bbp.getIndex(b:bat[:any_2]):int address CMDbbpgetIndex; comment Retrieve the index in the BBP +command bbp.setName(b:bat[:any_1],n:str):str +address CMDsetName; +comment Rename a BAT + command blob.blob(s:str):blob address BLOBblob_fromstr; command blob.blob(s:blob):blob diff --git a/clients/Tests/MAL-signatures.stable.out.int128 b/clients/Tests/MAL-signatures.stable.out.int128 --- a/clients/Tests/MAL-signatures.stable.out.int128 +++ b/clients/Tests/MAL-signatures.stable.out.int128 @@ -40229,6 +40229,10 @@ command bbp.getIndex(b:bat[:any_2]):int address CMDbbpgetIndex; comment Retrieve the index in the BBP +command bbp.setName(b:bat[:any_1],n:str):str +address CMDsetName; +comment Rename a BAT + command blob.blob(s:str):blob address BLOBblob_fromstr; command blob.blob(s:blob):blob diff --git a/clients/Tests/SQL-dump.sql b/clients/Tests/SQL-dump.SQL.py rename from clients/Tests/SQL-dump.sql rename to clients/Tests/SQL-dump.SQL.py --- a/clients/Tests/SQL-dump.sql +++ b/clients/Tests/SQL-dump.SQL.py @@ -1,241 +1,138 @@ -\dn -\dt -\dv -\ds -\df +import os, sys, re +try: + from MonetDBtesting import process +except ImportError: + import process -\dSn -\dSt -\dSv -\dSs -\dSf +clt = process.client('sql', format = 'csv', echo = False, + stdin = process.PIPE, stdout = process.PIPE, stderr = process.PIPE) -\dn bam -\dn json -\dn tmp +for c in 'ntvsf': + clt.stdin.write("select '\\\\d%s';\n" % c) -\dSn sys +for c in 'ntvsf': + clt.stdin.write("select '\\\\dS%s';\n" % c) -\dSt sys._columns -\dSt sys._tables -\dSt sys.args -\dSt sys.auths -\dSt sys.connections -\dSt sys.db_user_info -\dSt sys.dependencies -\dSt sys.functions -\dSt sys.idxs -\dSt sys.keys -\dSt sys.objects -\dSt sys.privileges -\dSt sys.schemas -\dSt sys.sequences -\dSt sys.statistics -\dSt sys.storagemodelinput -\dSt sys.systemfunctions -\dSt sys.triggers -\dSt sys.types -\dSt sys.user_role +clt.stdin.write("select '\\\\dn ' || name from sys.schemas order by name;\n") -\dSv sys.columns -\dSv sys.environment -\dSv sys.optimizers -\dSv sys.querylog_calls -\dSv sys.querylog_catalog -\dSv sys.querylog_history -\dSv sys.queue -\dSv sys.sessions -\dSv sys.storage -\dSv sys.storagemodel -\dSv sys.tables -\dSv sys.tablestoragemodel -\dSv sys.tracelog -\dSv sys.users +clt.stdin.write("select '\\\\dSt ' || s.name || '.' || t.name from sys._tables t, sys.schemas s where t.schema_id = s.id and t.query is null order by s.name, t.name;\n") --- select distinct '\\dSf ' || s.name || '.' || f.name from sys.functions f, sys.schemas s where f.language between 1 and 2 and f.schema_id = s.id order and s.name = 'sys' by s.name, f.name; -\dSf sys.Intersect -\dSf sys.Union -\dSf sys.abbrev -\dSf sys.alpha -\dSf sys.analyze -\dSf sys.area -\dSf sys.astext -\dSf sys.bbp -\dSf sys.boundary -\dSf sys.broadcast -\dSf sys.buffer -\dSf sys.chi2prob -\dSf sys.clearrejects -\dSf sys.columnsize -\dSf sys.contains -\dSf sys.convexhull -\dSf sys.corr -\dSf sys.crosses -\dSf sys.date_to_str -\dSf sys.db_users -\dSf sys.degrees -\dSf sys.dependencies_columns_on_functions -\dSf sys.dependencies_columns_on_indexes -\dSf sys.dependencies_columns_on_keys -\dSf sys.dependencies_columns_on_triggers -\dSf sys.dependencies_columns_on_views -\dSf sys.dependencies_functions_on_functions -\dSf sys.dependencies_functions_os_triggers -\dSf sys.dependencies_keys_on_foreignkeys -\dSf sys.dependencies_owners_on_schemas -\dSf sys.dependencies_schemas_on_users -\dSf sys.dependencies_tables_on_foreignkeys -\dSf sys.dependencies_tables_on_functions -\dSf sys.dependencies_tables_on_indexes -\dSf sys.dependencies_tables_on_triggers -\dSf sys.dependencies_tables_on_views -\dSf sys.dependencies_views_on_functions -\dSf sys.dependencies_views_on_triggers -\dSf sys.difference -\dSf sys.dimension -\dSf sys.disjoint -\dSf sys.distance -\dSf sys.env -\dSf sys.envelope -\dSf sys.environment -\dSf sys.epoch -\dSf sys.equals -\dSf sys.evalalgebra -\dSf sys.fitsattach -\dSf sys.fitsload -\dSf sys.fuse -\dSf sys.generate_series -\dSf sys.geomcollectionfromtext -\dSf sys.geometrytypeid -\dSf sys.geomfromtext -\dSf sys.getanchor -\dSf sys.getbasename -\dSf sys.getcontent -\dSf sys.getcontext -\dSf sys.getdomain -\dSf sys.getextension -\dSf sys.getfile -\dSf sys.gethost -\dSf sys.getport -\dSf sys.getprotocol -\dSf sys.getquery -\dSf sys.getroboturl -\dSf sys.getuser -\dSf sys.hashsize -\dSf sys.heapsize -\dSf sys.host -\dSf sys.hostmask -\dSf sys.ilike -\dSf sys.imprintsize -\dSf sys.intersection -\dSf sys.isaurl -\dSf sys.isauuid -\dSf sys.isempty -\dSf sys.issimple -\dSf sys.left_shift -\dSf sys.left_shift_assign -\dSf sys.length -\dSf sys.like -\dSf sys.linefromtext -\dSf sys.listdir -\dSf sys.listdirpat -\dSf sys.masklen -\dSf sys.mbr -\dSf sys.mbroverlaps -\dSf sys.md5 -\dSf sys.median -\dSf sys.mlinefromtext -\dSf sys.mpointfromtext -\dSf sys.mpolyfromtext -\dSf sys.ms_round _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list