Changeset: aae99f9b2880 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=aae99f9b2880 Added Files: debian/libmonetdb-stream7.install debian/libmonetdb12.install sql/backends/monet5/sql_rank.c sql/backends/monet5/sql_rank.h Removed Files: buildtools/ChangeLog.Oct2014 clients/ChangeLog.Oct2014 clients/mapilib/ChangeLog.Oct2014 clients/python2/ChangeLog.Oct2014 clients/python3/ChangeLog.Oct2014 common/stream/ChangeLog.Oct2014 debian/libmonetdb-stream6.install debian/libmonetdb11.install gdk/ChangeLog.Oct2014 geom/ChangeLog.Oct2014 java/ChangeLog.Oct2014 monetdb5/ChangeLog.Oct2014 sql/ChangeLog.Oct2014 testing/ChangeLog.Oct2014 tools/merovingian/ChangeLog.Oct2014 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 buildtools/ChangeLog-Archive buildtools/ChangeLog.Jul2015 clients/ChangeLog-Archive clients/ChangeLog.Jul2015 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/SQLTables.c 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-Archive gdk/ChangeLog.Jul2015 gdk/gdk_batop.c gdk/libbat.rc java/ChangeLog-Archive java/ChangeLog.Jul2015 java/Makefile.ag java/build.properties java/pom.xml java/release.txt java/src/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java java/src/nl/cwi/monetdb/jdbc/MonetResultSet.java libversions monetdb5/ChangeLog-Archive monetdb5/ChangeLog.Jul2015 monetdb5/modules/kernel/algebra.c monetdb5/modules/kernel/algebra.h monetdb5/modules/kernel/algebra.mal monetdb5/optimizer/opt_prelude.c monetdb5/optimizer/opt_prelude.h monetdb5/optimizer/opt_support.c monetdb5/tools/libmonetdb5.rc sql/ChangeLog-Archive sql/ChangeLog.Jul2015 sql/backends/monet5/Makefile.ag sql/backends/monet5/rel_bin.c sql/backends/monet5/sql.c sql/backends/monet5/sql.h sql/backends/monet5/sql.mal sql/backends/monet5/sql_rank.mal sql/common/sql_types.c sql/include/sql_catalog.h sql/scripts/25_debug.sql sql/server/rel_exp.c sql/server/rel_optimizer.c sql/server/rel_select.c sql/server/rel_sequence.c sql/server/sql_parser.h sql/server/sql_parser.y sql/storage/bat/bat_storage.c sql/storage/sql_storage.h sql/storage/store.c sql/test/BugTracker-2009/Tests/orderby_with_row_number.SF-2895791.stable.out sql/test/BugTracker-2010/Tests/crash_on_complex_join_exp.Bug-2353.stable.out sql/test/BugTracker-2010/Tests/rank-over-crash.SF-2926454.stable.out.int128 sql/test/BugTracker-2010/Tests/with_row_number_crash.Bug-2631.stable.out sql/test/BugTracker-2012/Tests/row_number_does_not_work_in_complex_query.Bug-2805.stable.out sql/test/BugTracker-2013/Tests/sort_void_crash.Bug-3341.stable.out sql/test/BugTracker/Tests/with_row_number.SF-1898089.stable.out sql/test/Tests/rank.stable.out sql/test/bugs/Tests/crash_order_by.stable.out sql/test/leaks/Tests/check1.stable.out.int128 sql/test/leaks/Tests/check2.stable.out.int128 sql/test/leaks/Tests/check3.stable.out.int128 sql/test/leaks/Tests/check4.stable.out.int128 sql/test/leaks/Tests/check5.stable.out.int128 vertoo.data Branch: profiler Log Message:
Merge with default diffs (truncated from 16583 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -597,3 +597,5 @@ a1a48562a4651b1beb3168290777cbeb91f474d8 027c8ada676bad1e7af0703ae48c27c6fb8433a0 Oct2014_SP4_release a1a48562a4651b1beb3168290777cbeb91f474d8 Oct2014_SP4_release 71a9c48c90348eab78069f2ecc616e3f73bbba95 Jul2015_root +77c8f3354e948ccd094ab3e53631b9fe272da8ea Jul2015_1 +77c8f3354e948ccd094ab3e53631b9fe272da8ea Jul2015_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -91,7 +91,7 @@ Vendor: MonetDB BV <[email protected]> Group: Applications/Databases License: MPL - http://www.monetdb.org/Legal/MonetDBLicense URL: http://www.monetdb.org/ -Source: http://dev.monetdb.org/downloads/sources/Oct2014-SP4/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Jul2015/%{name}-%{version}.tar.bz2 BuildRequires: bison BuildRequires: bzip2-devel @@ -995,6 +995,118 @@ rm -f %{buildroot}%{_bindir}/Maddlog %postun -p /sbin/ldconfig %changelog +* Fri Aug 07 2015 Sjoerd Mullender <[email protected]> - 11.21.1-20150807 +- Rebuilt. +- BZ#3364: Cannot set role back to a user's default role +- BZ#3365: Unable to grant object privileges while having a non-default + current_role +- BZ#3476: Cannot revoke object access +- BZ#3556: when 2 multiplexed functions in MAL plan, only one is mapped + correctly to bat<mod>.function primitive +- BZ#3564: Request: add support for postgresql specific scalar function: + split_part(string text, delimiter text, field int) +- BZ#3625: SIGSEGV because mat array can overrun in opt_mergetable.c +- BZ#3627: SQRT in CASE does not work as of Oct2014 +- BZ#3654: configure --enable-fits requires extra commands after creating + a database instance +- BZ#3673: mclient 'expanded' row formatter +- BZ#3674: Obfuscate event tracing +- BZ#3679: No error is given when incorrect timezone value is specified + for a timetz column +- BZ#3686: Wrong associativity of multiply/divide +- BZ#3702: Filter function not found if created in a user schema +- BZ#3708: wrong scoping for cross-schema view references +- BZ#3716: alter table my_merge_table drop table t1; crashes mserver5 + with Segmentation fault +- BZ#3724: Wrong size calculation in BATsubjoin +- BZ#3732: memory leak (of InstrRecord) in opt_mergetable +- BZ#3733: "(TRUE OR <Exp>) AND <Exp>" is evaluated incorrectly +- BZ#3735: python connection with unix_socket +- BZ#3736: crash if mclient disconnects abruptly during a query +- BZ#3738: Database inconsistency when using savepoint +- BZ#3739: CASE statements do not handle NULLs in the IN () operator + properly +- BZ#3740: select epoch(now()); types timestamptz(7,0) and bigint(64,0) + are not equal +- BZ#3742: Division By Zero +- BZ#3744: cast to int gives different results for decimal than double +- BZ#3747: joins fail in the presence of nulls +- BZ#3748: Missing META-INF/services/java.sql.Driver in JDBC package +- BZ#3753: Hang on json field parsing +- BZ#3754: select from a REMOTE TABLE referring local table crashes + mserver5 +- BZ#3756: column type conversion sticks to subsequent queries +- BZ#3759: select data from "sys"."rejects" returns unexpected error and + when next select data from "sys"."sessions" causes an assertion failure + in mal_interpreter.c:646. +- BZ#3760: SQL parser has problem with (position of) a scalar subquery + in a SELECT-list +- BZ#3761: SQL executor has problem with (position of) a subquery in a + SELECT-list. Inconsistent behavior. +- BZ#3764: DROPping multiple users causes a crash +- BZ#3765: Re-granting a revoked privilege does not work +- BZ#3766: VIEW not visible if created under a different schema +- BZ#3767: CREATE TEMP TABLE using "LIKE" incorrectly handled +- BZ#3769: SIGSEGV when combining a cast/column alias with a UNION + ALL view +- BZ#3770: combined conditions on declared table in User Defined Function + definition crashes monetdb +- BZ#3771: Owner of the schema loses rights if assumes the monetdb role. +- BZ#3772: Any user can grant a role. +- BZ#3773: quantile(col, 0) and quantile(col, 1) fail +- BZ#3774: mclient is unaware of merge tables and remote tables +- BZ#3775: COPY INTO: Backslash preceding field separator kills import +- BZ#3778: Crash on remote table schema mismatch +- BZ#3779: server crashes on MAX() on SELECT DISTINCT something combo + +* Thu Aug 6 2015 Martin van Dinther <[email protected]> - 11.21.1-20150807 +- java: Improved JDBC driver to not throw NullPointerException anymore + when calling isNullable() or getPrecision() or getScale() or + getColumnDisplaySize() or getSchemaName() or getTableName() or + getColumnClassName() on a ResultSet object. + +* Tue Jul 28 2015 Sjoerd Mullender <[email protected]> - 11.21.1-20150807 +- sql: Added support for 128-bit integers (called HUGEINT) on platforms that + support this. + +* Thu Jul 16 2015 Sjoerd Mullender <[email protected]> - 11.21.1-20150807 +- java: We now compile the Java classes using the latest Java 1.8 version, and + we tell it to compile for Java 1.7. + +* Wed Jun 3 2015 Sjoerd Mullender <[email protected]> - 11.21.1-20150807 +- buildtools: Upgraded the license to the Mozilla Public License Version 2.0. + +* Wed Jun 3 2015 Sjoerd Mullender <[email protected]> - 11.21.1-20150807 +- clients: Added a new output format to mclient: --format=expanded (or -fx). + In this format, column values are shown in full and below each other. + +* Wed Jun 3 2015 Sjoerd Mullender <[email protected]> - 11.21.1-20150807 +- sql: Removed support for the mseed library. + +* Wed Jun 3 2015 Sjoerd Mullender <[email protected]> - 11.21.1-20150807 +- sql: Removed support for RDF. +- sql: Removed DataCell. It was experimental code that was never enabled. + +* Wed Jun 3 2015 Sjoerd Mullender <[email protected]> - 11.21.1-20150807 +- gdk: BUNtvar and BUNhvar macros no longer work for TYPE_void columns. + +* Wed Jun 3 2015 Sjoerd Mullender <[email protected]> - 11.21.1-20150807 +- gdk: Changed interfaces of a lot of GDK-level functions. When they modify a + BAT, don't return the same BAT or NULL, but instead return GDK_SUCCEED + or GDK_FAIL. + +* Wed Jun 3 2015 Sjoerd Mullender <[email protected]> - 11.21.1-20150807 +- monetdb5: Implemented batcalc.min and batcalc.max. Made calc.min and calc.max + generic so that no other implementations are needed. + +* Wed Jun 3 2015 Sjoerd Mullender <[email protected]> - 11.21.1-20150807 +- monetdb5: Removed function batcalc.ifthen. + +* Wed Jun 3 2015 Sjoerd Mullender <[email protected]> - 11.21.1-20150807 +- gdk: Changed a bunch of hash-related functions to work on the tail column. + The functions that have been changed to work on the tail column are: + BAThash, BATprepareHash, HASHgonebad, HASHins, and HASHremove. + * Wed Jun 03 2015 Sjoerd Mullender <[email protected]> - 11.19.15-20150603 - Rebuilt. - BZ#3707: var() possibly not working in debug builds diff --git a/buildtools/ChangeLog-Archive b/buildtools/ChangeLog-Archive --- a/buildtools/ChangeLog-Archive +++ b/buildtools/ChangeLog-Archive @@ -1,6 +1,9 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Wed Mar 4 2015 Sjoerd Mullender <[email protected]> - 11.21.1-20150807 +- Upgraded the license to the Mozilla Public License Version 2.0. + * Tue Feb 3 2015 Sjoerd Mullender <[email protected]> - 11.19.11-20150423 - We now also create debug packages for Debian and Ubuntu. diff --git a/buildtools/ChangeLog.Jul2015 b/buildtools/ChangeLog.Jul2015 --- a/buildtools/ChangeLog.Jul2015 +++ b/buildtools/ChangeLog.Jul2015 @@ -1,6 +1,3 @@ # ChangeLog file for buildtools # This file is updated with Maddlog -* Wed Mar 4 2015 Sjoerd Mullender <[email protected]> -- Upgraded the license to the Mozilla Public License Version 2.0. - diff --git a/buildtools/ChangeLog.Oct2014 b/buildtools/ChangeLog.Oct2014 deleted file mode 100644 --- a/buildtools/ChangeLog.Oct2014 +++ /dev/null @@ -1,3 +0,0 @@ -# ChangeLog file for buildtools -# This file is updated with Maddlog - diff --git a/clients/ChangeLog-Archive b/clients/ChangeLog-Archive --- a/clients/ChangeLog-Archive +++ b/clients/ChangeLog-Archive @@ -1,6 +1,10 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Thu Feb 19 2015 Sjoerd Mullender <[email protected]> - 11.21.1-20150807 +- Added a new output format to mclient: --format=expanded (or -fx). + In this format, column values are shown in full and below each other. + * Tue Jan 13 2015 Sjoerd Mullender <[email protected]> - 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 diff --git a/clients/ChangeLog.Jul2015 b/clients/ChangeLog.Jul2015 --- a/clients/ChangeLog.Jul2015 +++ b/clients/ChangeLog.Jul2015 @@ -1,7 +1,3 @@ # ChangeLog file for clients # This file is updated with Maddlog -* Thu Feb 19 2015 Sjoerd Mullender <[email protected]> -- Added a new output format to mclient: --format=expanded (or -fx). - In this format, column values are shown in full and below each other. - diff --git a/clients/ChangeLog.Oct2014 b/clients/ChangeLog.Oct2014 deleted file mode 100644 --- a/clients/ChangeLog.Oct2014 +++ /dev/null @@ -1,3 +0,0 @@ -# ChangeLog file for clients -# This file is updated with Maddlog - 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 @@ -2364,14 +2364,6 @@ command algebra.leftjoin(left:bat[:oid,: address ALGleftjoinestimate; command algebra.leftjoin(left:bat[:oid,:any_2],right:bat[:any_2,:any_3]):bat[:oid,:any_3] address ALGleftjoin; -command algebra.mark_grp(b:bat[:any_1,:oid],g:bat[:oid,:any_2],s:oid):bat[:any_1,:oid] -address ALGmark_grp_2; -comment "grouped mark": Produces a new BAT with per group a locally unique dense ascending sequense of OIDs in the tail. The tail of the first BAT (b) identifies the group that each BUN of b belongs to. The second BAT (g) represents the group extent, i.e., the head is the unique list of group IDs from b's tail. The third argument (s) gives the base value for the new OID sequence of each group. - -command algebra.mark_grp(b:bat[:any_1,:oid],g:bat[:oid,:oid]):bat[:any_1,:oid] -address ALGmark_grp_1; -comment "grouped mark": Produces a new BAT with per group a locally unique dense ascending sequence of OIDs in the tail. The tail of the first BAT (b) identifies the group that each BUN of b belongs to. The second BAT (g) represents the group extent, i.e., the head is the unique list of group IDs from b's tail. The tail of g gives for each group the base value for the new OID sequence. - command algebra.mark(b:bat[:any_1,:any_2],nr_parts:int,part_nr:int):bat[:any_1,:oid] address ALGtmarkp; comment Produces a BAT with fresh unique dense sequense of OIDs in the tail that starts at base (i.e. [base,..base+b.count()-1] ). The base is uniquely defined by the part_nr (ie we set the highest bits based on the part_nr/nr_parts) @@ -2675,6 +2667,18 @@ command batsql.alpha(dec:bat[:oid,:dbl], address SQLbat_alpha_cst; comment BAT implementation of astronomy alpha function +pattern batsql.dense_rank{orderdependend}(b:bat[:oid,:any_1],p:any_2,o:any_3):bat[:oid,:int] +address SQLdense_rank; +comment return the densely ranked groups + +pattern batsql.diff{orderdependend}(p:bat[:oid,:bit],b:bat[:oid,:any_1]):bat[:oid,:bit] +address SQLdiff; +comment return true if cur != prev row + +pattern batsql.diff{orderdependend}(b:bat[:oid,:any_1]):bat[:oid,:bit] +address SQLdiff; +comment return true if cur != prev row + command batsql.dec_round(v:bat[:oid,:dbl],r:dbl):bat[:oid,:dbl] address dbl_bat_dec_round_wrap; comment round off the value v to nearests multiple of r @@ -2707,6 +2711,14 @@ pattern batsql.next_value(sname:bat[:oid address mvc_bat_next_value; comment return the next value of the sequence +pattern batsql.rank{orderdependend}(b:bat[:oid,:any_1],p:any_2,o:any_3):bat[:oid,:int] +address SQLrank; +comment return the ranked groups + +pattern batsql.row_number{orderdependend}(b:bat[:oid,:any_1],p:any_2,o:any_3):bat[:oid,:int] +address SQLrow_number; +comment return the row_numer-ed groups + command batsql.round(v:bat[:oid,:dbl],r:bte):bat[:oid,:dbl] address dbl_bat_round_wrap; comment round off the floating point v to r digits behind the dot (if r < 0, before the dot) @@ -22841,9 +22853,6 @@ pattern batcalc.cmp(b1:bat[:oid,:bit],b2 address CMDbatCMP; comment Return -1/0/1 if B1 </==/> B2 -function batcalc.dense_rank_grp{inline}(b:bat[:oid,:any_1]):bat[:oid,:int]; -function batcalc.dense_rank_grp{inline}(b:bat[:oid,:any_1],ord:bat[:oid,:oid],orig:bat[:oid,:any_2]):bat[:oid,:int]; -function batcalc.dense_rank_grp{inline}(b:bat[:oid,:any_1],ord:bat[:oid,:oid],grp:bat[:oid,:oid],ext:bat[:oid,:oid]):bat[:oid,:int]; command batcalc.dbl(s1:int,v:bat[:oid,:lng],d2:int,s2:int):bat[:oid,:dbl] address batlng_dec2dec_dbl; comment cast decimal(lng) to decimal(dbl) and check for overflow @@ -25712,9 +25721,6 @@ pattern batcalc.lsh_noerror(b1:bat[:oid, address CMDbatLSH; comment Return B1 << B2, out of range second operand causes NIL value -function batcalc.mark_grp{inline}(b:bat[:oid,:any_1]):bat[:oid,:int]; -function batcalc.mark_grp{inline}(b:bat[:oid,:any_1],ord:bat[:oid,:oid],orig:bat[:oid,:any_2]):bat[:oid,:int]; -function batcalc.mark_grp{inline}(b:bat[:oid,:any_1],ord:bat[:oid,:oid],grp:bat[:oid,:oid],ext:bat[:oid,:oid]):bat[:oid,:int]; pattern batcalc.mod_noerror(v:dbl,b:bat[:oid,:dbl],s:bat[:oid,:oid]):bat[:oid,:dbl] address CMDbatMOD; comment Return V % B with candidates list, divide by zero causes NIL value @@ -28451,9 +28457,6 @@ pattern batcalc.or(b1:bat[:oid,:bit],b2: address CMDbatOR; comment Return B1 OR B2 -function batcalc.rank_grp{inline}(b:bat[:oid,:any_1]):bat[:oid,:int]; -function batcalc.rank_grp{inline}(b:bat[:oid,:any_1],ord:bat[:oid,:oid],orig:bat[:oid,:any_2]):bat[:oid,:int]; -function batcalc.rank_grp{inline}(b:bat[:oid,:any_1],ord:bat[:oid,:oid],grp:bat[:oid,:oid],ext:bat[:oid,:oid]):bat[:oid,:int]; command batcalc.rotate_xor_hash(h:bat[:oid,:wrd],nbits:int,b:bat[:oid,:any_1]):bat[:oid,:int] address MKEYbulk_rotate_xor_hash; pattern batcalc.rsh_noerror(v:lng,b:bat[:oid,:lng],s:bat[:oid,:oid]):bat[:oid,:lng] @@ -40579,14 +40582,18 @@ pattern sql.commit():void address SQLcommit; comment Trigger the commit operation for a MAL block -command sql.dense_rank(b:bat[:oid,:any_1]):bat[:oid,:int] -address sql_dense_rank; -comment return the densely ranked bat - -command sql.dense_rank_grp(b:bat[:oid,:any_1],gp:bat[:oid,:oid],gpe:bat[:oid,:oid]):bat[:oid,:int] -address sql_dense_rank_grp; +pattern sql.dense_rank(b:any_1,p:bit,o:bit):int +address SQLdense_rank; comment return the densely ranked groups _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
