Changeset: 7dfb867f4731 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7dfb867f4731 Added Files: debian/libmonetdb9.install monetdb5/modules/kernel/group.c monetdb5/modules/kernel/group.h monetdb5/modules/kernel/group.mal sql/test/Users/Tests/privs.sql.src sql/test/Users/Tests/privs.stable.err sql/test/Users/Tests/privs.stable.out sql/test/Users/Tests/privs2.sql.src sql/test/Users/Tests/privs2.stable.err sql/test/Users/Tests/privs2.stable.out sql/test/Users/Tests/test_privs2_p1.SQL.py sql/test/Users/Tests/test_privs2_p1.stable.err sql/test/Users/Tests/test_privs2_p1.stable.out sql/test/Users/Tests/test_privs2_p2.SQL.py sql/test/Users/Tests/test_privs2_p2.stable.err sql/test/Users/Tests/test_privs2_p2.stable.out sql/test/Users/Tests/test_privs_p1.SQL.py sql/test/Users/Tests/test_privs_p1.stable.err sql/test/Users/Tests/test_privs_p1.stable.out sql/test/Users/Tests/test_privs_p2.SQL.py sql/test/Users/Tests/test_privs_p2.stable.err sql/test/Users/Tests/test_privs_p2.stable.out sql/test/Users/privs.sql sql/test/Users/privs2.sql sql/test/Users/test_privs.sql sql/test/Users/test_privs2.sql Removed Files: buildtools/ChangeLog.Oct2012 clients/ChangeLog.Oct2012 debian/libmonetdb8.install gdk/ChangeLog.Oct2012 geom/ChangeLog.Oct2012 java/ChangeLog.Oct2012 monetdb5/ChangeLog.Oct2012 monetdb5/modules/kernel/group.mx sql/ChangeLog.Oct2012 testing/ChangeLog.Oct2012 tools/merovingian/ChangeLog.Oct2012 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.Feb2013 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 debian/control debian/monetdb5-sql.default debian/monetdb5-sql.init.d gdk/gdk.h gdk/gdk_aggr.c gdk/gdk_imprints.c gdk/gdk_join.c gdk/gdk_select.c gdk/gdk_system.c gdk/gdk_system.h gdk/gdk_utils.c gdk/libbat.rc java/ChangeLog-Archive java/ChangeLog.Feb2013 libversions monetdb5/ChangeLog-Archive monetdb5/ChangeLog.Feb2013 monetdb5/mal/Tests/All monetdb5/mal/Tests/tst1500.mal monetdb5/mal/Tests/tst1500.stable.out monetdb5/mal/Tests/tst1503.mal monetdb5/mal/Tests/tst1503.stable.out monetdb5/mal/Tests/tst870.mal monetdb5/mal/Tests/tst870.stable.out monetdb5/mal/mal.c monetdb5/mal/mal_dataflow.c monetdb5/mal/mal_dataflow.h monetdb5/mal/mal_interpreter.c monetdb5/mal/mal_profiler.c monetdb5/mal/mal_profiler.h monetdb5/mal/mal_resource.c monetdb5/mal/mal_session.c monetdb5/modules/kernel/Makefile.ag monetdb5/modules/mal/mat.c monetdb5/modules/mal/mat.h monetdb5/modules/mal/mat.mal monetdb5/modules/mal/pcre.c monetdb5/modules/mal/pcre.mal monetdb5/optimizer/Tests/All monetdb5/optimizer/opt_centipede.c monetdb5/optimizer/opt_dictionary.c monetdb5/optimizer/opt_mergetable.c monetdb5/optimizer/opt_origin.c monetdb5/optimizer/opt_pipes.c monetdb5/optimizer/opt_prelude.c monetdb5/optimizer/opt_prelude.h monetdb5/optimizer/opt_support.c monetdb5/tests/BugDay_2005-10-06_4.8/Tests/print_CTgroup.SF-1315791.mal monetdb5/tests/BugDay_2005-10-06_4.8/Tests/print_CTgroup.SF-1315791.stable.out monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/All monetdb5/tools/libmonetdb5.rc sql/backends/monet5/datacell/opt_datacell.h sql/backends/monet5/rel_bin.c sql/backends/monet5/sql.mx sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_gencode.h sql/backends/monet5/sql_scenario.c sql/common/sql_backend.c sql/common/sql_backend.h sql/scripts/30_rdf.sql sql/server/rel_dump.c sql/server/rel_dump.h sql/server/rel_optimizer.c sql/server/rel_updates.c sql/storage/bat/bat_storage.c sql/test/BugTracker-2009/Tests/AVG_ReturnsNoLines.SF-2596084.stable.out sql/test/BugTracker-2011/Tests/aggregate-in-subquery.Bug-2739.stable.out sql/test/BugTracker-2011/Tests/view_avg_incorrect_result.Bug-2790.stable.out sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit sql/test/Tests/setoptimizer.stable.out sql/test/Users/Tests/All testing/ChangeLog-Archive testing/ChangeLog.Feb2013 tools/merovingian/ChangeLog-Archive tools/merovingian/ChangeLog.Feb2013 vertoo.data Branch: rdf Log Message:
Merge with default branch diffs (truncated from 7475 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -514,3 +514,5 @@ 0ef42179e99bbd8450d9993cf419fcbed96cf61c 14b7be52b2212bf3aeb51edecbaee020554b3158 Oct2012_SP2_release 0d23123db0a3fd8564564c46789e8e549320c77b Oct2012_9 1f74df406780bccca94e6128c6c62a0b101fc847 Oct2012_SP3_release +693187b90b57a610779caa942efe7514372125ee Feb2013_1 +23894afae1679eb37e6866a793ba00782c4b0804 Feb2013_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -27,7 +27,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/Oct2012-SP3/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Feb2013/%{name}-%{version}.tar.bz2 BuildRequires: bison BuildRequires: bzip2-devel @@ -722,6 +722,68 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet rm -fr $RPM_BUILD_ROOT %changelog +* Tue Feb 12 2013 Sjoerd Mullender <[email protected]> - 11.15.1-20130212 +- Rebuilt. + +* Thu Jan 17 2013 Stefan Manegold <[email protected]> - 11.15.1-20130212 +- testing: +enabled "top-level" Mtest.py +So far, while Mtest.py could be called in any subdirectory of the MonetDB +source tree (and could then run all tests in the entire sub-tree), +it was not possible to call Mtest.py in the top-level MonetDB source +directory to run all tests. Instead, to run all tests, Mtest.py had to +be called at least 4 times, once in each of these directories: "clients", +"monetdb5", "sql", "geom". +Now, it is possible to call Mtest.py once in the top-level MonetDB source +directory to run all tests in one go. +The behaviour of calling Mtest.py in any subdirectory, including the +four mentioned above, did not changed, other than that now obsolete +command line options "-p / --package <package>" and "-5 / --monetdb5" +have been removed. + +* Tue Jan 15 2013 Fabian Groffen <[email protected]> - 11.15.1-20130212 +- clients: Mapi protocol v8 support was removed from all client drivers. Protocol + v8 has not been used by the servers any more since Apr2012 release +- clients: The tool mnc was removed from installations + +* Tue Jan 15 2013 Fabian Groffen <[email protected]> - 11.15.1-20130212 +- java: merocontrol was changed to return server URIs, and lastStop time. + Connections and dbpath were removed. +- java: Mapi protocol v8 support was removed from MapiSocket. Protocol + v8 has not been used by the servers any more since Apr2012 release + +* Tue Jan 15 2013 Fabian Groffen <[email protected]> - 11.15.1-20130212 +- merovingian: Upgrade support for dbfarms from Mar2011 and Aug2011 was dropped + +* Tue Jan 15 2013 Fabian Groffen <[email protected]> - 11.15.1-20130212 +- merovingian: monetdb status now uses a more condensed output, to cater for the uris + being shown, and prints how long a database is stopped, or how long + ago it crashed + +* Tue Jan 15 2013 Fabian Groffen <[email protected]> - 11.15.1-20130212 +- merovingian: monetdb status now prints the connection uri for each database, + when available. The connections and database path properties have + been dropped. + +* Tue Jan 15 2013 Fabian Groffen <[email protected]> - 11.15.1-20130212 +- merovingian: monetdb status now prints last crash date only if the database has + not been started since. + +* Tue Jan 15 2013 Sjoerd Mullender <[email protected]> - 11.15.1-20130212 +- monetdb5: mserver5: The --dbname and --dbfarm options have been replaced by the + single --dbpath option. + +* Tue Jan 15 2013 Sjoerd Mullender <[email protected]> - 11.15.1-20130212 +- clients: msqldump: Implmented an option (--table/-t) to dump a single table. +- clients: Changed msqdump's trace option to be in line with mclient. In both + cases, the long option is --Xdebug and the short option is -X. + +* Tue Jan 15 2013 Martin Kersten <[email protected]> - 11.15.1-20130212 +- monetdb5: The scheduler of mserver5 was changed to use a fixed set of workers to + perform the work for all connected clients. Previously, each client + connection had its own set of workers, easily causing resource problems + upon multiple connections to the server. + * Tue Jan 15 2013 Sjoerd Mullender <[email protected]> - 11.13.9-20130115 - Rebuilt. diff --git a/buildtools/ChangeLog.Oct2012 b/buildtools/ChangeLog.Oct2012 deleted file mode 100644 --- a/buildtools/ChangeLog.Oct2012 +++ /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,16 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Sat Dec 1 2012 Fabian Groffen <[email protected]> - 11.15.1-20130212 +- Mapi protocol v8 support was removed from all client drivers. Protocol + v8 has not been used by the servers any more since Apr2012 release +- The tool mnc was removed from installations + +* Wed Nov 7 2012 Sjoerd Mullender <[email protected]> - 11.15.1-20130212 +- msqldump: Implmented an option (--table/-t) to dump a single table. +- Changed msqdump's trace option to be in line with mclient. In both + cases, the long option is --Xdebug and the short option is -X. + * Tue Sep 4 2012 Fabian Groffen <[email protected]> - 11.13.1-20121010 - mclient now accepts URIs as database to connect to. diff --git a/clients/ChangeLog.Feb2013 b/clients/ChangeLog.Feb2013 --- a/clients/ChangeLog.Feb2013 +++ b/clients/ChangeLog.Feb2013 @@ -1,13 +1,3 @@ # ChangeLog file for clients # This file is updated with Maddlog -* Sat Dec 1 2012 Fabian Groffen <[email protected]> -- Mapi protocol v8 support was removed from all client drivers. Protocol - v8 has not been used by the servers any more since Apr2012 release -- The tool mnc was removed from installations - -* Wed Nov 7 2012 Sjoerd Mullender <[email protected]> -- msqldump: Implmented an option (--table/-t) to dump a single table. -- Changed msqdump's trace option to be in line with mclient. In both - cases, the long option is --Xdebug and the short option is -X. - diff --git a/clients/ChangeLog.Oct2012 b/clients/ChangeLog.Oct2012 deleted file mode 100644 --- a/clients/ChangeLog.Oct2012 +++ /dev/null @@ -1,3 +0,0 @@ -# ChangeLog file for clients -# This file is updated with Maddlog - 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 @@ -307,6 +307,7 @@ int MT_check_nr_cores(void); unsigned long long MT_clock(void); int MT_create_thread(MT_Id *t, void( *function)(void *), void *arg, enum MT_thr_detach d); void MT_exit_thread(int status) __attribute__((__noreturn__)); +void MT_exiting_thread(void); MT_Id MT_getpid(void); size_t MT_getrss(void); void MT_global_exit(int status) __attribute__((__noreturn__)); @@ -1392,8 +1393,6 @@ str CSTrelease(Client cntxt, MalBlkPtr m str CSTreleaseAll(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CSTtake(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CSTtoString(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -int CTrefine(BAT **res, BAT *b, BAT *a); -int CTrefine_rev(BAT **res, BAT *b, BAT *a); str CemptySet(int *k, int *bid); str DICTbind(int *idx, int *val, str *nme); str DICTcompress(int *idx, str *nme, int *bid); @@ -1410,88 +1409,10 @@ str FCTgetOwners(int *ret); str FCTgetPlants(int *ret, int *ret2); str FCTsetLocation(int *ret, str *loc); str FCTshutdown(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str GRPaggr_count(int *retval, int *bid, int *eid, bit *ignore_nils); -str GRPavg_bte(int *ret, int *bid, int *eid); -str GRPavg_dbl(int *ret, int *bid, int *eid); -str GRPavg_flt(int *ret, int *bid, int *eid); -str GRPavg_int(int *ret, int *bid, int *eid); -str GRPavg_lng(int *ret, int *bid, int *eid); -str GRPavg_oid(int *ret, int *bid, int *eid); -str GRPavg_sht(int *ret, int *bid, int *eid); -str GRPavg_wrd(int *ret, int *bid, int *eid); -str GRPderive(int *hid, int *mid, int *ct_histoid, int *ct_mapid, int *bid); -str GRPgroup(int *rethisto, int *retbid, int *bid); -str GRPmax(int *retval, int *bid, int *eid); -str GRPmin(int *retval, int *bid, int *eid); str GRPmulticolumngroup(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str GRPprod_bte_bte(int *retval, int *bid, int *eid, bit *ignore_nils); -str GRPprod_bte_int(int *retval, int *bid, int *eid, bit *ignore_nils); -str GRPprod_bte_lng(int *retval, int *bid, int *eid, bit *ignore_nils); -str GRPprod_bte_sht(int *retval, int *bid, int *eid, bit *ignore_nils); -str GRPprod_bte_wrd(int *retval, int *bid, int *eid, bit *ignore_nils); -str GRPprod_dbl_dbl(int *retval, int *bid, int *eid, bit *ignore_nils); -str GRPprod_flt_dbl(int *retval, int *bid, int *eid, bit *ignore_nils); -str GRPprod_flt_flt(int *retval, int *bid, int *eid, bit *ignore_nils); -str GRPprod_int_int(int *retval, int *bid, int *eid, bit *ignore_nils); -str GRPprod_int_lng(int *retval, int *bid, int *eid, bit *ignore_nils); -str GRPprod_int_wrd(int *retval, int *bid, int *eid, bit *ignore_nils); -str GRPprod_lng_lng(int *retval, int *bid, int *eid, bit *ignore_nils); -str GRPprod_oid_oid(int *retval, int *bid, int *eid, bit *ignore_nils); -str GRPprod_sht_int(int *retval, int *bid, int *eid, bit *ignore_nils); -str GRPprod_sht_lng(int *retval, int *bid, int *eid, bit *ignore_nils); -str GRPprod_sht_sht(int *retval, int *bid, int *eid, bit *ignore_nils); -str GRPprod_sht_wrd(int *retval, int *bid, int *eid, bit *ignore_nils); -str GRPprod_wrd_lng(int *retval, int *bid, int *eid, bit *ignore_nils); -str GRPprod_wrd_wrd(int *retval, int *bid, int *eid, bit *ignore_nils); -str GRPrefine(int *retid, int *bid, int *aid); -str GRPrefine_rev(int *retid, int *bid, int *aid); -str GRPsize(int *retval, int *bid, int *eid); -str GRPslidingsum_bte(int *retval, int *bid, int *size, int *shift); -str GRPslidingsum_dbl(int *retval, int *bid, int *size, int *shift); -str GRPslidingsum_flt(int *retval, int *bid, int *size, int *shift); -str GRPslidingsum_int(int *retval, int *bid, int *size, int *shift); -str GRPslidingsum_lng(int *retval, int *bid, int *size, int *shift); -str GRPslidingsum_oid(int *retval, int *bid, int *size, int *shift); -str GRPslidingsum_sht(int *retval, int *bid, int *size, int *shift); -str GRPslidingsum_wrd(int *retval, int *bid, int *size, int *shift); str GRPsubgroup1(bat *ngid, bat *next, bat *nhis, bat *bid); str GRPsubgroup2(bat *ngid, bat *next, bat *nhis, bat *bid, bat *gid); str GRPsubgroup4(bat *ngid, bat *next, bat *nhis, bat *bid, bat *gid, bat *eid, bat *hid); -str GRPsum_bte_bte(int *retval, int *bid, int *eid, bit *ignore_nils); -str GRPsum_bte_int(int *retval, int *bid, int *eid, bit *ignore_nils); -str GRPsum_bte_lng(int *retval, int *bid, int *eid, bit *ignore_nils); -str GRPsum_bte_sht(int *retval, int *bid, int *eid, bit *ignore_nils); -str GRPsum_bte_wrd(int *retval, int *bid, int *eid, bit *ignore_nils); -str GRPsum_dbl_dbl(int *retval, int *bid, int *eid, bit *ignore_nils); -str GRPsum_flt_dbl(int *retval, int *bid, int *eid, bit *ignore_nils); -str GRPsum_flt_flt(int *retval, int *bid, int *eid, bit *ignore_nils); -str GRPsum_int_int(int *retval, int *bid, int *eid, bit *ignore_nils); -str GRPsum_int_lng(int *retval, int *bid, int *eid, bit *ignore_nils); -str GRPsum_int_wrd(int *retval, int *bid, int *eid, bit *ignore_nils); -str GRPsum_lng_lng(int *retval, int *bid, int *eid, bit *ignore_nils); -str GRPsum_oid_oid(int *retval, int *bid, int *eid, bit *ignore_nils); -str GRPsum_sht_int(int *retval, int *bid, int *eid, bit *ignore_nils); -str GRPsum_sht_lng(int *retval, int *bid, int *eid, bit *ignore_nils); -str GRPsum_sht_sht(int *retval, int *bid, int *eid, bit *ignore_nils); -str GRPsum_sht_wrd(int *retval, int *bid, int *eid, bit *ignore_nils); -str GRPsum_wrd_lng(int *retval, int *bid, int *eid, bit *ignore_nils); -str GRPsum_wrd_wrd(int *retval, int *bid, int *eid, bit *ignore_nils); -str GRPvar_bte(int *ret, int *bid, int *eid); -str GRPvar_dbl(int *ret, int *bid, int *eid); -str GRPvar_flt(int *ret, int *bid, int *eid); -str GRPvar_int(int *ret, int *bid, int *eid); -str GRPvar_lng(int *ret, int *bid, int *eid); -str GRPvar_oid(int *ret, int *bid, int *eid); -str GRPvar_sht(int *ret, int *bid, int *eid); -str GRPvar_wrd(int *ret, int *bid, int *eid); -str GRPwindowsum_bte(int *retval, int *bid, int *size); -str GRPwindowsum_dbl(int *retval, int *bid, int *size); -str GRPwindowsum_flt(int *retval, int *bid, int *size); -str GRPwindowsum_int(int *retval, int *bid, int *size); -str GRPwindowsum_lng(int *retval, int *bid, int *size); -str GRPwindowsum_oid(int *retval, int *bid, int *size); -str GRPwindowsum_sht(int *retval, int *bid, int *size); -str GRPwindowsum_wrd(int *retval, int *bid, int *size); str IDentifier(str *retval, str *in); int IDfromString(str src, int *len, str *retval); str IDprelude(void); @@ -1634,8 +1555,6 @@ str MATpackSlice(Client cntxt, MalBlkPtr str MATpackValues(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); str MATprint(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); str MATproject(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str MATrefine(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str MATrefineReverse(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str MATsortReverseTail(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str MATsortTail(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str MBMmix(int *ret, int *batid); @@ -1929,6 +1848,7 @@ str PCRElike_select_pcre(int *ret, int * str PCRElike_uselect_pcre(int *ret, int *b, str *pat, str *esc); str PCRElikesubselect1(bat *ret, bat *bid, str *pat, str *esc, bit *caseignore, bit *anti); str PCRElikesubselect2(bat *ret, bat *bid, bat *sid, str *pat, str *esc, bit *caseignore, bit *anti); +str PCRElikesubselect3(bat *ret, bat *bid, str *pat, str *esc, bit *anti); str PCREmatch(bit *ret, str *val, str *pat); str PCREnotilike2(bit *ret, str *s, str *pat); str PCREnotilike3(bit *ret, str *s, str *pat, str *esc); @@ -2579,7 +2499,6 @@ str dense_rank_grpRef; int depositBox(Box box, str name, int type, ValPtr val); str depositRef; void deriveModule(Module scope, str nme); -str deriveRef; malType destinationType(MalBlkPtr mb, InstrPtr p); void destroyBox(str name); str differenceRef; @@ -2597,6 +2516,7 @@ void dumpManualOverview(stream *f, Modul void dumpManualSection(stream *f, Module v); void dumpSearchTable(stream *f, str text); void echoInput(Client cntxt); +str eqRef; str escape_str(str *retval, str s); str evalFile(Client c, str fname, int listing); str evalRef; @@ -2898,6 +2818,7 @@ void moveInstruction(MalBlkPtr mb, int p lng msComputeTime; lng msFindTime; str mtimeRef; +str mulRef; str multicolumnsRef; str multiplexRef; str mvcRef; @@ -3148,6 +3069,8 @@ str srvpoolRef; int stableProp; str startProfiling(void); str startRef; +void stopHeartbeat(void); +void stopMALdataflow(void); str stopProfiling(void); _______________________________________________ checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
