Changeset: 20699d55143c for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=20699d55143c Removed Files: sql/backends/monet5/sql_sort.mal 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/ChangeLog-Archive clients/ChangeLog.Oct2014 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 configure.ag debian/changelog gdk/gdk.h gdk/gdk_aggr.c gdk/gdk_atoms.c gdk/gdk_bbp.c gdk/gdk_bbp.h gdk/libbat.rc java/Makefile.ag java/build.properties java/pom.xml java/release.txt libversions monetdb5/modules/kernel/algebra.c monetdb5/modules/kernel/algebra.mal monetdb5/modules/kernel/bat5.mal monetdb5/modules/mal/Tests/inspect05.stable.out.int128 monetdb5/optimizer/opt_emptySet.c monetdb5/optimizer/opt_groups.c monetdb5/optimizer/opt_prelude.c monetdb5/optimizer/opt_prelude.h monetdb5/optimizer/opt_support.c monetdb5/tests/gdkTests/Tests/TMsubcommit.mal monetdb5/tests/gdkTests/Tests/TMsubcommit.stable.out monetdb5/tests/suite_00/Tests/test_10.mal monetdb5/tests/suite_00/Tests/test_10.stable.out monetdb5/tools/libmonetdb5.rc sql/ChangeLog-Archive sql/ChangeLog.Oct2014 sql/backends/monet5/Makefile.ag sql/backends/monet5/bam/bam_globals.c sql/backends/monet5/sql.mal sql/backends/monet5/sql_statistics.c sql/test/pg_regress/Tests/All 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/pg_regress/Tests/drop.sql sql/test/pg_regress/Tests/drop.stable.err sql/test/pg_regress/Tests/select_views.sql sql/test/pg_regress/Tests/select_views.stable.out sql/test/pg_regress/postgresql2sql99.sh vertoo.data Branch: resultset Log Message:
Merger with default diffs (truncated from 4076 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -586,3 +586,5 @@ 2da8cbcb65ed56690bad29f089d996eac347b48d ee3d8e3af6aae6be6cfaa876a379a0751f164e97 Oct2014_7 2da8cbcb65ed56690bad29f089d996eac347b48d Oct2014_SP1_release 6607367487d91eb02c5eb7dfb9d96606f8f7c6f0 Oct2014_SP1_release +e3d0eecdc35dc633fdd89157ba704f60f03756c1 Oct2014_9 +d98df578687e677ae3abbc0ba41e3bb0631ef08a Oct2014_SP2_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-SP1/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Oct2014-SP2/%{name}-%{version}.tar.bz2 BuildRequires: bison BuildRequires: bzip2-devel @@ -960,6 +960,68 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/MonetD rm -fr $RPM_BUILD_ROOT %changelog +* Fri Jan 23 2015 Sjoerd Mullender <sjo...@acm.org> - 11.19.9-20150123 +- Rebuilt. +- BZ#3467: Field aliases with '#' character excise field names in + result set. +- BZ#3605: relational query without result +- BZ#3619: Missing dll on MonetDB Start +- BZ#3622: Type resolution error +- BZ#3624: insert of incomplete or invalid ip address values in + inet column is silently accepted but the values are not stored (they + become/show nil) +- BZ#3626: casting a type without alias results in program contains errors +- BZ#3628: mclient and ODBC driver report 'type mismatch' when stddev_pop + used in a select which returns 0 rows +- BZ#3629: IF THEN ELSEIF always evaluates the first test as true +- BZ#3630: segv on rel_order_by_column_exp +- BZ#3632: running make clean twice gives an error in clients/ruby/adapter +- BZ#3633: Wrong result for HAVING with floating-point constant +- BZ#3640: Missing implementation of scalar function: sql_sub(<date>, + <month interval>) +- BZ#3641: SQL lexer fails to detect string end if it the last character + is U+FEFF ZERO WIDTH NO-BREAK SPACE +- BZ#3642: Combined WHERE conditions less-than plus equals-to produce + incorrect results +- BZ#3643: Missing implementations of scalar function: sql_sub(<timetz>, + arg2) +- BZ#3644: COPY INTO fails to import "inet" data type when value has + prefix length in CIDR notation +- BZ#3646: ORDER BY clause does not produce proper results on 'inet' + datatype +- BZ#3649: recycler crashes with concurrent transactions + +* Mon Jan 19 2015 Sjoerd Mullender <sjo...@acm.org> - 11.19.9-20150123 +- sql: Fixed a typo in a column name of the sys.tablestoragemodel view + (auxillary changed to auxiliary). + +* Tue Jan 13 2015 Sjoerd Mullender <sjo...@acm.org> - 11.19.9-20150123 +- clients: Changes to the Perl interface, thanks to Stefan O'Rear: + 1. removes "use sigtrap", because this has global effects and should + not be used by modules, only by the application. + 2. allows Perl 5.8.1+ Unicode strings to be passed to quote() and + included in statements (UTF-8 encoded, as expected by Monet's str + module) + 3. quote and unquote now use the same quoting rules as the MonetDB + server, allowing for all characters except NUL to be round-tripped + 4. several character loops have been reimplemented in regex for much + greater performance + 5. micro-optimizations to the result fetch loop + 6. block boundaries are preserved in piggyback data so that Xclose is + not appended or prepended to a SQL command + 7. diagnostic messages #foo before a result header are ignored, this + is necessary to use recycler_pipe + 8. fail quickly and loudly if we receive a continuation prompt (or any + other response that starts with a non-ASCII character) + 9. header lines must start with %, not merely contain %, fixing a bug + when querying a table where string values contain % + 10. after closing a large resultset, account for the fact that a reply + will come and do not lose sync + 11. allow a MAPI_TRACE environment variable to dump wire protocol + frames to standard output + 12. fixes maximum MAPI block size to match the server limit of 16k. + previously would crash on blocks larger than 16k + * Fri Nov 21 2014 Sjoerd Mullender <sjo...@acm.org> - 11.19.7-20141121 - Rebuilt. diff --git a/clients/ChangeLog-Archive b/clients/ChangeLog-Archive --- a/clients/ChangeLog-Archive +++ b/clients/ChangeLog-Archive @@ -1,6 +1,33 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Tue Jan 13 2015 Sjoerd Mullender <sjo...@acm.org> - 11.19.9-20150123 +- Changes to the Perl interface, thanks to Stefan O'Rear: + 1. removes "use sigtrap", because this has global effects and should + not be used by modules, only by the application. + 2. allows Perl 5.8.1+ Unicode strings to be passed to quote() and + included in statements (UTF-8 encoded, as expected by Monet's str + module) + 3. quote and unquote now use the same quoting rules as the MonetDB + server, allowing for all characters except NUL to be round-tripped + 4. several character loops have been reimplemented in regex for much + greater performance + 5. micro-optimizations to the result fetch loop + 6. block boundaries are preserved in piggyback data so that Xclose is + not appended or prepended to a SQL command + 7. diagnostic messages #foo before a result header are ignored, this + is necessary to use recycler_pipe + 8. fail quickly and loudly if we receive a continuation prompt (or any + other response that starts with a non-ASCII character) + 9. header lines must start with %, not merely contain %, fixing a bug + when querying a table where string values contain % + 10. after closing a large resultset, account for the fact that a reply + will come and do not lose sync + 11. allow a MAPI_TRACE environment variable to dump wire protocol + frames to standard output + 12. fixes maximum MAPI block size to match the server limit of 16k. + previously would crash on blocks larger than 16k + * Tue Apr 1 2014 Sjoerd Mullender <sjo...@acm.org> - 11.17.15-20140508 - ODBC: Implemented {call procedure-name(...)} escape. The version {?=call ...} is not implemented. diff --git a/clients/ChangeLog.Oct2014 b/clients/ChangeLog.Oct2014 --- a/clients/ChangeLog.Oct2014 +++ b/clients/ChangeLog.Oct2014 @@ -1,30 +1,3 @@ # ChangeLog file for clients # This file is updated with Maddlog -* Tue Jan 13 2015 Sjoerd Mullender <sjo...@acm.org> -- Changes to the Perl interface, thanks to Stefan O'Rear: - 1. removes "use sigtrap", because this has global effects and should - not be used by modules, only by the application. - 2. allows Perl 5.8.1+ Unicode strings to be passed to quote() and - included in statements (UTF-8 encoded, as expected by Monet's str - module) - 3. quote and unquote now use the same quoting rules as the MonetDB - server, allowing for all characters except NUL to be round-tripped - 4. several character loops have been reimplemented in regex for much - greater performance - 5. micro-optimizations to the result fetch loop - 6. block boundaries are preserved in piggyback data so that Xclose is - not appended or prepended to a SQL command - 7. diagnostic messages #foo before a result header are ignored, this - is necessary to use recycler_pipe - 8. fail quickly and loudly if we receive a continuation prompt (or any - other response that starts with a non-ASCII character) - 9. header lines must start with %, not merely contain %, fixing a bug - when querying a table where string values contain % - 10. after closing a large resultset, account for the fact that a reply - will come and do not lose sync - 11. allow a MAPI_TRACE environment variable to dump wire protocol - frames to standard output - 12. fixes maximum MAPI block size to match the server limit of 16k. - previously would crash on blocks larger than 16k - diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out --- a/clients/Tests/exports.stable.out +++ b/clients/Tests/exports.stable.out @@ -223,7 +223,6 @@ int BBPout; str BBPphysical(bat b, str buf); BAT *BBPquickdesc(bat b, int delaccess); int BBPreclaim(BAT *b); -void BBPreleaseref(bat i); int BBPrename(bat bid, const char *nme); int BBPsave(BAT *b); void BBPshare(bat b); diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,74 @@ +monetdb (11.19.9-20150123) unstable; urgency=low + + * Rebuilt. + * BZ#3467: Field aliases with '#' character excise field names in + result set. + * BZ#3605: relational query without result + * BZ#3619: Missing dll on MonetDB Start + * BZ#3622: Type resolution error + * BZ#3624: insert of incomplete or invalid ip address values in + inet column is silently accepted but the values are not stored (they + become/show nil) + * BZ#3626: casting a type without alias results in program contains errors + * BZ#3628: mclient and ODBC driver report 'type mismatch' when stddev_pop + used in a select which returns 0 rows + * BZ#3629: IF THEN ELSEIF always evaluates the first test as true + * BZ#3630: segv on rel_order_by_column_exp + * BZ#3632: running make clean twice gives an error in clients/ruby/adapter + * BZ#3633: Wrong result for HAVING with floating-point constant + * BZ#3640: Missing implementation of scalar function: sql_sub(<date>, + <month interval>) + * BZ#3641: SQL lexer fails to detect string end if it the last character + is U+FEFF ZERO WIDTH NO-BREAK SPACE + * BZ#3642: Combined WHERE conditions less-than plus equals-to produce + incorrect results + * BZ#3643: Missing implementations of scalar function: sql_sub(<timetz>, + arg2) + * BZ#3644: COPY INTO fails to import "inet" data type when value has + prefix length in CIDR notation + * BZ#3646: ORDER BY clause does not produce proper results on 'inet' + datatype + * BZ#3649: recycler crashes with concurrent transactions + + -- Sjoerd Mullender <sjo...@acm.org> Fri, 23 Jan 2015 13:21:50 +0100 + +monetdb (11.19.9-20150123) unstable; urgency=low + + * sql: Fixed a typo in a column name of the sys.tablestoragemodel view + (auxillary changed to auxiliary). + + -- Sjoerd Mullender <sjo...@acm.org> Mon, 19 Jan 2015 13:21:50 +0100 + +monetdb (11.19.9-20150123) unstable; urgency=low + + * clients: Changes to the Perl interface, thanks to Stefan O'Rear: + 1. removes "use sigtrap", because this has global effects and should + not be used by modules, only by the application. + 2. allows Perl 5.8.1+ Unicode strings to be passed to quote() and + included in statements (UTF-8 encoded, as expected by Monet's str + module) + 3. quote and unquote now use the same quoting rules as the MonetDB + server, allowing for all characters except NUL to be round-tripped + 4. several character loops have been reimplemented in regex for much + greater performance + 5. micro-optimizations to the result fetch loop + 6. block boundaries are preserved in piggyback data so that Xclose is + not appended or prepended to a SQL command + 7. diagnostic messages #foo before a result header are ignored, this + is necessary to use recycler_pipe + 8. fail quickly and loudly if we receive a continuation prompt (or any + other response that starts with a non-ASCII character) + 9. header lines must start with %, not merely contain %, fixing a bug + when querying a table where string values contain % + 10. after closing a large resultset, account for the fact that a reply + will come and do not lose sync + 11. allow a MAPI_TRACE environment variable to dump wire protocol + frames to standard output + 12. fixes maximum MAPI block size to match the server limit of 16k. + previously would crash on blocks larger than 16k + + -- Sjoerd Mullender <sjo...@acm.org> Tue, 13 Jan 2015 13:21:50 +0100 + monetdb (11.19.7-20141121) unstable; urgency=low * Rebuilt. diff --git a/gdk/gdk.h b/gdk/gdk.h --- a/gdk/gdk.h +++ b/gdk/gdk.h @@ -820,9 +820,6 @@ typedef struct { int len, vtype; } *ValPtr, ValRecord; -/* definition of VALptr lower down in file after include of gdk_atoms.h */ -#define VALnil(v,t) VALset(v,t,ATOMextern(t)?ATOMnil(t):ATOMnilptr(t)) - /* interface definitions */ gdk_export ptr VALconvert(int typ, ValPtr t); gdk_export int VALformat(char **buf, const ValRecord *res); @@ -937,29 +934,29 @@ typedef struct PROPrec PROPrec; /* see also comment near BATassertProps() for more information about * the properties */ typedef struct { - str id; /* label for head/tail column */ + str id; /* label for head/tail column */ unsigned short width; /* byte-width of the atom array */ - bte type; /* type id. */ - bte shift; /* log2 of bunwidth */ + bte type; /* type id. */ + bte shift; /* log2 of bunwidth */ unsigned int varsized:1, /* varsized (1) or fixedsized (0) */ - key:2, /* duplicates allowed? */ - dense:1, /* OID only: only consecutive values */ - nonil:1, /* nonil isn't propchecked yet */ - nil:1, /* there is a nil in the column */ - sorted:1, /* column is sorted in ascending order */ + key:2, /* duplicates allowed? */ + dense:1, /* OID only: only consecutive values */ + nonil:1, /* nonil isn't propchecked yet */ + nil:1, /* there is a nil in the column */ + sorted:1, /* column is sorted in ascending order */ revsorted:1; /* column is sorted in descending order */ - oid align; /* OID for sync alignment */ + oid align; /* OID for sync alignment */ BUN nokey[2]; /* positions that prove key ==FALSE */ BUN nosorted; /* position that proves sorted==FALSE */ BUN norevsorted; /* position that proves revsorted==FALSE */ BUN nodense; /* position that proves dense==FALSE */ - oid seq; /* start of dense head sequence */ + oid seq; /* start of dense head sequence */ - Heap heap; /* space for the column. */ + Heap heap; /* space for the column. */ Heap *vheap; /* space for the varsized data. */ _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
