Changeset: 566a7ce2fcb3 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=566a7ce2fcb3 Added Files: sql/scripts/51_sys_schema_extension.sql sql/test/BugTracker-2015/Tests/crash_on_alter_set_not_null.Bug-3715.stable.err sql/test/BugTracker-2015/Tests/crash_on_alter_set_not_null.Bug-3715.stable.out sql/test/BugTracker-2015/Tests/schema_view.Bug-3708.sql sql/test/BugTracker-2015/Tests/schema_view.Bug-3708.stable.err sql/test/BugTracker-2015/Tests/schema_view.Bug-3708.stable.out sql/test/mergetables/Tests/mergedrop1.sql sql/test/mergetables/Tests/mergedrop1.stable.err sql/test/mergetables/Tests/mergedrop1.stable.out sql/test/mergetables/Tests/mergedrop2.sql sql/test/mergetables/Tests/mergedrop2.stable.err sql/test/mergetables/Tests/mergedrop2.stable.out 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/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/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc clients/python2/setup.py clients/python3/setup.py common/stream/stream.c configure.ag debian/changelog gdk/gdk_group.c gdk/libbat.rc libversions monetdb5/modules/atoms/mtime.c monetdb5/modules/atoms/mtime.h monetdb5/modules/atoms/mtime.mal monetdb5/optimizer/opt_pushselect.c monetdb5/tools/libmonetdb5.rc sql/backends/monet5/sql.c sql/backends/monet5/sql.mal sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_optimizer.c sql/backends/monet5/sql_scenario.c sql/backends/monet5/sql_statistics.c sql/backends/monet5/sql_upgrades.c sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out.int128 sql/benchmarks/tpch/LOCKED/Tests/14.stable.out.int128 sql/benchmarks/tpch/Tests/01-22.stable.out.int128 sql/benchmarks/tpch/Tests/14-explain.stable.out.int128 sql/benchmarks/tpch/Tests/14-plan.stable.out.int128 sql/benchmarks/tpch/Tests/14.stable.out.int128 sql/jdbc/tests/Tests/Test_Dobjects.stable.out sql/scripts/10_math.sql sql/scripts/12_url.sql sql/scripts/13_date.sql sql/scripts/14_inet.sql sql/scripts/15_querylog.sql sql/scripts/16_tracelog.sql sql/scripts/21_dependency_functions.sql sql/scripts/22_clients.sql sql/scripts/25_debug.sql sql/scripts/39_analytics.sql sql/scripts/40_json.sql sql/scripts/75_storagemodel.sql sql/scripts/80_statistics.sql sql/scripts/Makefile.ag sql/server/rel_optimizer.c sql/server/rel_psm.c sql/server/rel_select.c sql/server/rel_semantic.c sql/server/rel_semantic.h sql/server/rel_updates.c sql/server/sql_mvc.c sql/server/sql_mvc.h sql/server/sql_parser.y sql/server/sql_scan.c sql/storage/bat/bat_logger.c sql/storage/store.c sql/test/BugDay_2005-11-09_2.8/Tests/ORDER_BY_evaluation_error.SF-1023658.stable.out sql/test/BugTracker-2009/Tests/join_topn.SF-2654133.stable.out sql/test/BugTracker-2010/Tests/offset_limited_32bit.SF-2950579.stable.out sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out sql/test/BugTracker-2013/Tests/alter_resets_readonly.Bug-3362.stable.out sql/test/BugTracker-2013/Tests/swapped_likejoin.Bug-3375.stable.out sql/test/BugTracker-2014/Tests/ifthenelse.Bug-3546.stable.out sql/test/BugTracker-2014/Tests/ifthenelse.Bug-3546.stable.out.int128 sql/test/BugTracker-2015/Tests/All sql/test/BugTracker-2015/Tests/is_null_limit.Bug-3684.stable.out sql/test/BugTracker-2015/Tests/reserved_keywords.Bug-3613.sql sql/test/BugTracker-2015/Tests/reserved_keywords.Bug-3613.stable.out sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit sql/test/BugTracker/Tests/like_exp.SF-1613949.stable.out sql/test/Dependencies/Tests/Dependencies.stable.err sql/test/Dependencies/Tests/Dependencies.stable.out sql/test/Dependencies/Tests/Dependencies.stable.out.int128 sql/test/DropCascade/Tests/drop_columns_cascade.stable.out sql/test/DropCascade/Tests/drop_pkey_cascade.stable.out sql/test/Tests/keys.stable.out sql/test/Tests/systemfunctions.stable.out sql/test/Tests/systemfunctions.stable.out.int128 sql/test/Tests/trace.sql sql/test/Tests/trace.stable.out.int128 sql/test/bugs/Tests/case_cast-bug-sf-1019506.stable.out sql/test/bugs/Tests/groupby_having-bug-sf-947600.stable.out sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566.stable.out sql/test/bugs/Tests/select_orderby_alias-bug-sf-1024615.stable.out 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/drop3.stable.out sql/test/leaks/Tests/drop3.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/leaks/Tests/temp1.stable.out sql/test/leaks/Tests/temp1.stable.out.int128 sql/test/leaks/Tests/temp2.stable.out sql/test/leaks/Tests/temp2.stable.out.int128 sql/test/leaks/Tests/temp3.stable.out sql/test/leaks/Tests/temp3.stable.out.int128 sql/test/mergetables/Tests/All sql/test/pg_regress/Tests/alter_table.sql sql/test/pg_regress/Tests/without_oid.sql sql/test/testdb-upgrade-chain/Tests/package.py sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/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-package.py vertoo.data Branch: HTM Log Message:
Merge with the default branch diffs (truncated from 16366 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -591,3 +591,5 @@ d98df578687e677ae3abbc0ba41e3bb0631ef08a c80c3439c5d7b2bddb710e584eb0936adc21d462 MonetDB.R-0.9.6 0529873485e7ec8e4c723f8bf7fc14020a7390b2 Oct2014_11 f59ba5dedd0122403ab175cd1d44a88ab6b3be02 Oct2014_SP3_release +027c8ada676bad1e7af0703ae48c27c6fb8433a0 Oct2014_13 +027c8ada676bad1e7af0703ae48c27c6fb8433a0 Oct2014_SP4_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -91,7 +91,7 @@ Vendor: MonetDB BV <i...@monetdb.org> Group: Applications/Databases License: MPL - http://www.monetdb.org/Legal/MonetDBLicense URL: http://www.monetdb.org/ -Source: http://dev.monetdb.org/downloads/sources/Oct2014-SP3/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Oct2014-SP4/%{name}-%{version}.tar.bz2 BuildRequires: bison BuildRequires: bzip2-devel @@ -970,6 +970,18 @@ mv %{buildroot}%{_datadir}/doc/MonetDB-S %postun -p /sbin/ldconfig %changelog +* Tue May 19 2015 Sjoerd Mullender <sjo...@acm.org> - 11.19.13-20150519 +- Rebuilt. +- BZ#3712: Concurrency issue on querying the SQL catalog +- BZ#3713: Long startup cost for simple session +- BZ#3715: Crash with two ALTER TABLE statements in a transaction +- BZ#3718: Adding and dropping a non existing tablename to/from a merge + table is accepted without an error +- BZ#3719: Assertion failure in /MonetDB-11.19.11/gdk/gdk_bat.c:2841: + BATassertHeadProps: Assertion `!b->H->key || cmp != 0' failed. +- BZ#3723: Assertion failure in rel_bin.c:2548: rel2bin_groupby: Assertion + `0' failed. + * Thu Apr 23 2015 Sjoerd Mullender <sjo...@acm.org> - 11.19.11-20150423 - Rebuilt. - BZ#3466: UPDATE statements fails with "GDKerror: MT_mremap() failed" 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 @@ -39477,7 +39477,7 @@ address MTIMEdaytime1; comment default time with zeroed components command mtime.date_to_str(d:date,format:str):str -address MTIMEstrftime; +address MTIMEdate_to_str; comment create a string from the date, using the specified format (see man strftime) command mtime.dayname(day:int):str @@ -39668,8 +39668,16 @@ command mtime.sql_seconds(t:timestamp):i address MTIMEtimestamp_sql_seconds; command mtime.seconds(t:timestamp):int address MTIMEtimestamp_seconds; +command mtime.str_to_timestamp(s:str,format:str):timestamp +address MTIMEstr_to_timestamp; +comment create a timestamp from the string, using the specified format (see man strptime) + +command mtime.str_to_time(s:str,format:str):daytime +address MTIMEstr_to_time; +comment create a time from the string, using the specified format (see man strptime) + command mtime.str_to_date(s:str,format:str):date -address MTIMEstrptime; +address MTIMEstr_to_date; comment create a date from the string, using the specified format (see man strptime) command mtime.start_dst(t:timezone):zrule @@ -39688,6 +39696,14 @@ command mtime.seconds(d:daytime):int address MTIMEdaytime_extract_seconds; comment extracts seconds from daytime +command mtime.timestamp_to_str(d:timestamp,format:str):str +address MTIMEtimestamp_to_str; +comment create a string from the time, using the specified format (see man strftime) + +command mtime.time_to_str(d:daytime,format:str):str +address MTIMEtime_to_str; +comment create a string from the time, using the specified format (see man strftime) + command mtime.time_synonyms(allow:bit):void address MTIMEsynonyms; comment Allow synonyms for the parse format of date/timestamp. @@ -40393,25 +40409,15 @@ command sql.alpha(dec:dbl,theta:dbl):dbl address SQLcst_alpha_cst; comment Implementation of astronomy alpha function: expands the radius theta depending on the declination -pattern sql.analyze(sch:str,tbl:str,col:str,sample:lng):void +pattern sql.analyze(minmax:int,sample:lng,sch:str,tbl:str,col:str):void address sql_analyze; comment Update the database statistics table -pattern sql.analyze(sch:str,tbl:str,sample:lng):void +pattern sql.analyze(minmax:int,sample:lng,sch:str,tbl:str):void address sql_analyze; -pattern sql.analyze(sch:str,sample:lng):void +pattern sql.analyze(minmax:int,sample:lng,sch:str):void address sql_analyze; -pattern sql.analyze(sample:lng):void -address sql_analyze; -pattern sql.analyze(sch:str,tbl:str,col:str):void -address sql_analyze; -comment Update the database statistics table - -pattern sql.analyze(sch:str,tbl:str):void -address sql_analyze; -pattern sql.analyze(sch:str):void -address sql_analyze; -pattern sql.analyze():void +pattern sql.analyze(minmax:int,sample:lng):void address sql_analyze; pattern sql.argRecord(a:any...):str address SQLargRecord; 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 @@ -50412,7 +50412,7 @@ address MTIMEdaytime1; comment default time with zeroed components command mtime.date_to_str(d:date,format:str):str -address MTIMEstrftime; +address MTIMEdate_to_str; comment create a string from the date, using the specified format (see man strftime) command mtime.dayname(day:int):str @@ -50603,8 +50603,16 @@ command mtime.sql_seconds(t:timestamp):i address MTIMEtimestamp_sql_seconds; command mtime.seconds(t:timestamp):int address MTIMEtimestamp_seconds; +command mtime.str_to_timestamp(s:str,format:str):timestamp +address MTIMEstr_to_timestamp; +comment create a timestamp from the string, using the specified format (see man strptime) + +command mtime.str_to_time(s:str,format:str):daytime +address MTIMEstr_to_time; +comment create a time from the string, using the specified format (see man strptime) + command mtime.str_to_date(s:str,format:str):date -address MTIMEstrptime; +address MTIMEstr_to_date; comment create a date from the string, using the specified format (see man strptime) command mtime.start_dst(t:timezone):zrule @@ -50623,6 +50631,14 @@ command mtime.seconds(d:daytime):int address MTIMEdaytime_extract_seconds; comment extracts seconds from daytime +command mtime.timestamp_to_str(d:timestamp,format:str):str +address MTIMEtimestamp_to_str; +comment create a string from the time, using the specified format (see man strftime) + +command mtime.time_to_str(d:daytime,format:str):str +address MTIMEtime_to_str; +comment create a string from the time, using the specified format (see man strftime) + command mtime.time_synonyms(allow:bit):void address MTIMEsynonyms; comment Allow synonyms for the parse format of date/timestamp. @@ -51328,25 +51344,15 @@ command sql.alpha(dec:dbl,theta:dbl):dbl address SQLcst_alpha_cst; comment Implementation of astronomy alpha function: expands the radius theta depending on the declination -pattern sql.analyze(sch:str,tbl:str,col:str,sample:lng):void +pattern sql.analyze(minmax:int,sample:lng,sch:str,tbl:str,col:str):void address sql_analyze; comment Update the database statistics table -pattern sql.analyze(sch:str,tbl:str,sample:lng):void +pattern sql.analyze(minmax:int,sample:lng,sch:str,tbl:str):void address sql_analyze; -pattern sql.analyze(sch:str,sample:lng):void +pattern sql.analyze(minmax:int,sample:lng,sch:str):void address sql_analyze; -pattern sql.analyze(sample:lng):void -address sql_analyze; -pattern sql.analyze(sch:str,tbl:str,col:str):void -address sql_analyze; -comment Update the database statistics table - -pattern sql.analyze(sch:str,tbl:str):void -address sql_analyze; -pattern sql.analyze(sch:str):void -address sql_analyze; -pattern sql.analyze():void +pattern sql.analyze(minmax:int,sample:lng):void address sql_analyze; pattern sql.argRecord(a:any...):str address SQLargRecord; diff --git a/clients/Tests/SQL-dump.stable.out b/clients/Tests/SQL-dump.stable.out --- a/clients/Tests/SQL-dump.stable.out +++ b/clients/Tests/SQL-dump.stable.out @@ -65,9 +65,11 @@ SYSTEM TABLE sys.auths SYSTEM TABLE sys.connections SYSTEM TABLE sys.db_user_info SYSTEM TABLE sys.dependencies +SYSTEM TABLE sys.dependency_types SYSTEM TABLE sys.functions SYSTEM TABLE sys.idxs SYSTEM TABLE sys.keys +SYSTEM TABLE sys.keywords SYSTEM TABLE sys.netcdf_attrs SYSTEM TABLE sys.netcdf_dims SYSTEM TABLE sys.netcdf_files @@ -80,6 +82,7 @@ SYSTEM TABLE sys.sequences SYSTEM TABLE sys.statistics SYSTEM TABLE sys.storagemodelinput SYSTEM TABLE sys.systemfunctions +SYSTEM TABLE sys.table_types SYSTEM TABLE sys.triggers SYSTEM TABLE sys.types SYSTEM TABLE sys.user_role @@ -111,7 +114,6 @@ SYSTEM FUNCTION sys.buffer SYSTEM FUNCTION sys.chi2prob SYSTEM FUNCTION sys.columnsize SYSTEM FUNCTION sys.contains -SYSTEM FUNCTION sys.convert SYSTEM FUNCTION sys.convexhull SYSTEM FUNCTION sys.corr SYSTEM FUNCTION sys.crosses @@ -241,9 +243,13 @@ SYSTEM FUNCTION sys.storage SYSTEM FUNCTION sys.storagemodel SYSTEM FUNCTION sys.storagemodelinit SYSTEM FUNCTION sys.str_to_date +SYSTEM FUNCTION sys.str_to_time +SYSTEM FUNCTION sys.str_to_timestamp SYSTEM FUNCTION sys.symdifference SYSTEM FUNCTION sys.text +SYSTEM FUNCTION sys.time_to_str SYSTEM FUNCTION sys.times +SYSTEM FUNCTION sys.timestamp_to_str SYSTEM FUNCTION sys.touches SYSTEM FUNCTION sys.tracelog SYSTEM FUNCTION sys.uuid @@ -442,7 +448,7 @@ create view sys.queue as select * from s create view sys.sessions as select * from sys.sessions(); create view sys."storage" as select * from sys."storage"(); create view sys.storagemodel as select * from sys.storagemodel(); -SELECT * FROM (SELECT p.*, 0 AS "temporary" FROM "sys"."_tables" AS p UNION ALL SELECT t.*, 1 AS "temporary" FROM "tmp"."_tables" AS t) AS tables where tables.type <> 2; +SELECT * FROM (SELECT p.*, 0 AS "temporary", CAST(CASE WHEN system THEN type + 10 /* system table/view */ ELSE (CASE WHEN commit_action = 0 THEN type /* table/view */ ELSE type + 20 /* global temp table */ END) END AS SMALLINT) AS table_type FROM "sys"."_tables" AS p UNION ALL SELECT t.*, 1 AS "temporary", CAST(type + 30 /* local temp table */ AS SMALLINT) AS table_type FROM "tmp"."_tables" AS t) AS tables where tables.type <> 2; -- A summary of the table storage requirement is is available as a table view. -- The auxiliary column denotes the maximum space if all non-sorted columns -- would be augmented with a hash (rare situation) @@ -460,22 +466,13 @@ create function "abbrev" (p inet) return external name inet."abbrev"; create function alpha(pdec double, pradius double) returns double external name sql.alpha; -create procedure analyze() +create procedure analyze(minmax int, "sample" bigint) external name sql.analyze; -create procedure analyze(tbl string) +create procedure analyze(minmax int, "sample" bigint, sch string) external name sql.analyze; -create procedure analyze(sch string, tbl string) +create procedure analyze(minmax int, "sample" bigint, sch string, tbl string) external name sql.analyze; -create procedure analyze(sch string, tbl string, col string) -external name sql.analyze; --- control the sample size -create procedure analyze("sample" bigint) -external name sql.analyze; -create procedure analyze(tbl string, "sample" bigint) -external name sql.analyze; -create procedure analyze(sch string, tbl string, "sample" bigint) -external name sql.analyze; -create procedure analyze(sch string, tbl string, col string, "sample" bigint) +create procedure analyze(minmax int, "sample" bigint, sch string, tbl string, col string) external name sql.analyze; -- ogc Spatial Analysis methods @@ -1337,7 +1334,7 @@ CREATE TABLE "sys"."_columns" ( "number" INTEGER, "storage" VARCHAR(2048) ); -COPY 352 RECORDS INTO "sys"."_columns" FROM stdin USING DELIMITERS '\t','\n','"'; +COPY 358 RECORDS INTO "sys"."_columns" FROM stdin USING DELIMITERS '\t','\n','"'; 2002 "id" "int" 32 0 2001 NULL true 0 NULL 2003 "name" "varchar" 1024 0 2001 NULL true 1 NULL 2004 "authorization" "int" 32 0 2001 NULL true 2 NULL @@ -1480,215 +1477,222 @@ 5207 "system" "boolean" 1 0 5201 NULL tr 5208 "commit_action" "smallint" 16 0 5201 NULL true 6 NULL 5209 "access" "smallint" 16 0 5201 NULL true 7 NULL 5210 "temporary" "smallint" 16 0 5201 NULL true 8 NULL -5212 "id" "int" 32 0 5211 NULL true 0 NULL -5213 "name" "varchar" 1024 0 5211 NULL true 1 NULL -5214 "type" "varchar" 1024 0 5211 NULL true 2 NULL -5215 "type_digits" "int" 32 0 5211 NULL true 3 NULL -5216 "type_scale" "int" 32 0 5211 NULL true 4 NULL -5217 "table_id" "int" 32 0 5211 NULL true 5 NULL -5218 "default" "varchar" 2048 0 5211 NULL true 6 NULL -5219 "null" "boolean" 1 0 5211 NULL true 7 NULL -5220 "number" "int" 32 0 5211 NULL true 8 NULL -5221 "storage" "varchar" 2048 0 5211 NULL true 9 NULL -5228 "name" "varchar" 1024 0 5227 NULL true 0 NULL -5229 "fullname" "varchar" 2048 0 5227 NULL true 1 NULL -5230 "default_schema" "int" 9 0 5227 NULL true 2 NULL -5234 "name" "varchar" 1024 0 5233 NULL true 0 NULL -5235 "fullname" "varchar" 2024 0 5233 NULL true 1 NULL -5236 "default_schema" "int" 9 0 5233 NULL true 2 NULL _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list