MonetDB: Mar2018 - Visual Studio wants casts.
Changeset: 8f3d3dabfaa4 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8f3d3dabfaa4 Modified Files: clients/mapiclient/dump.c Branch: Mar2018 Log Message: Visual Studio wants casts. diffs (27 lines): diff --git a/clients/mapiclient/dump.c b/clients/mapiclient/dump.c --- a/clients/mapiclient/dump.c +++ b/clients/mapiclient/dump.c @@ -320,17 +320,17 @@ dump_foreign_keys(Mapi mid, const char * while ((cnt = mapi_fetch_row(hdl)) != 0 && strcmp(mapi_fetch_field(hdl, 4), "0") != 0) { const char **tkeys; nkeys++; - tkeys = realloc(pkeys, nkeys * sizeof(*pkeys)); + tkeys = realloc((void *) pkeys, nkeys * sizeof(*pkeys)); if (tkeys == NULL) { - free(pkeys); - free(fkeys); + free((void *) pkeys); + free((void *) fkeys); goto bailout; } pkeys = tkeys; - tkeys = realloc(fkeys, nkeys * sizeof(*fkeys)); + tkeys = realloc((void *) fkeys, nkeys * sizeof(*fkeys)); if (tkeys == NULL) { - free(pkeys); - free(fkeys); + free((void *) pkeys); + free((void *) fkeys); goto bailout; } fkeys = tkeys; ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Mar2018 - Remove bugfixes that happened on default from...
Changeset: 7ab94e24805d for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7ab94e24805d Modified Files: MonetDB.spec debian/changelog Branch: Mar2018 Log Message: Remove bugfixes that happened on default from changelogs diffs (34 lines): diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -1051,13 +1051,11 @@ done statement - BZ#6574: server crashed could not find ordered index while creating a table -- BZ#6575: Sqlitelogictest crash on groupby query with coalesce call - BZ#6576: Sqlitelogictest aritmetic expressions with negative numbers handling - BZ#6577: creating temp table kills performance of the original query - BZ#6578: One two-tuple insert gives different results than two single inserts -- BZ#6579: Sqlitelogic test infinite loop while compiling SQL query - BZ#6581: Join condition errors. - BZ#6583: Fixed size string concatenation with integer results in fixed size string of size 0 diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -14,13 +14,11 @@ monetdb (11.29.5) unstable; urgency=low statement * BZ#6574: server crashed could not find ordered index while creating a table - * BZ#6575: Sqlitelogictest crash on groupby query with coalesce call * BZ#6576: Sqlitelogictest aritmetic expressions with negative numbers handling * BZ#6577: creating temp table kills performance of the original query * BZ#6578: One two-tuple insert gives different results than two single inserts - * BZ#6579: Sqlitelogic test infinite loop while compiling SQL query * BZ#6581: Join condition errors. * BZ#6583: Fixed size string concatenation with integer results in fixed size string of size 0 ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Mar2018 - Added missing .so file.
Changeset: 02e1eb62442b for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=02e1eb62442b Modified Files: debian/monetdb5-server.install Branch: Mar2018 Log Message: Added missing .so file. diffs (11 lines): diff --git a/debian/monetdb5-server.install b/debian/monetdb5-server.install --- a/debian/monetdb5-server.install +++ b/debian/monetdb5-server.install @@ -2,6 +2,7 @@ debian/tmp/usr/bin/mserver5 usr/bin debian/tmp/usr/lib/libmonetdb5.so.* usr/lib # usr/lib/monetdb5/lib_*.so EXCEPT: lib_{bam,geom,gsl,lidar,pyapi,rapi,sql}.so +debian/tmp/usr/lib/monetdb5/lib_capi.so usr/lib/monetdb5 debian/tmp/usr/lib/monetdb5/lib_generator.so usr/lib/monetdb5 debian/tmp/usr/lib/monetdb5/lib_lsst.so usr/lib/monetdb5 debian/tmp/usr/lib/monetdb5/lib_opt_sql_append.so usr/lib/monetdb5 ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Mar2018 - Code deduplication.
Changeset: 21bae4582fbc for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=21bae4582fbc Modified Files: sql/common/sql_list.c Branch: Mar2018 Log Message: Code deduplication. diffs (80 lines): diff --git a/sql/common/sql_list.c b/sql/common/sql_list.c --- a/sql/common/sql_list.c +++ b/sql/common/sql_list.c @@ -22,56 +22,39 @@ node_create(sql_allocator *sa, void *dat return n; } +static list * +list_init(list *l, sql_allocator *sa, fdestroy destroy) +{ + if (l) { + l->sa = sa; + l->destroy = destroy; + l->h = l->t = NULL; + l->cnt = 0; + l->expected_cnt = 0; + l->ht = NULL; + MT_lock_init(>ht_lock, "sa_ht_lock"); + } + return l; +} + list * list_create(fdestroy destroy) { - list *l = MNEW(list); - if (!l) { - return NULL; - } - - l->sa = NULL; - l->destroy = destroy; - l->h = l->t = NULL; - l->cnt = 0; - l->expected_cnt = 0; - l->ht = NULL; - MT_lock_init(>ht_lock, "sa_ht_lock"); - return l; + return list_init(MNEW(list), NULL, destroy); } list * sa_list(sql_allocator *sa) { - list *l = (sa)?SA_ZNEW(sa, list):ZNEW(list); - if (!l) { - return NULL; - } - - l->sa = sa; - l->destroy = NULL; - l->h = l->t = NULL; - l->cnt = 0; - l->ht = NULL; - MT_lock_init(>ht_lock, "sa_ht_lock"); - return l; + list *l = (sa)?SA_NEW(sa, list):MNEW(list); + return list_init(l, sa, NULL); } list * list_new(sql_allocator *sa, fdestroy destroy) { - list *l = (sa)?SA_ZNEW(sa, list):ZNEW(list); - if (!l) { - return NULL; - } - - l->sa = sa; - l->destroy = destroy; - l->h = l->t = NULL; - l->cnt = 0; - l->ht = NULL; - MT_lock_init(>ht_lock, "sa_ht_lock"); - return l; + list *l = (sa)?SA_NEW(sa, list):MNEW(list); + return list_init(l, sa, destroy); } static list * ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Mar2018 - Add some error checking.
Changeset: 8d7528f13496 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8d7528f13496 Modified Files: clients/mapiclient/dump.c Branch: Mar2018 Log Message: Add some error checking. diffs (183 lines): diff --git a/clients/mapiclient/dump.c b/clients/mapiclient/dump.c --- a/clients/mapiclient/dump.c +++ b/clients/mapiclient/dump.c @@ -25,56 +25,72 @@ get_compat_clause(Mapi mid) return compat_clause; } -static void +static int quoted_print(stream *f, const char *s, bool singleq) { - mnstr_write(f, singleq ? "'" : "\"", 1, 1); + if (mnstr_write(f, singleq ? "'" : "\"", 1, 1) < 0) + return -1; while (*s) { switch (*s) { case '\\': - mnstr_write(f, "", 1, 2); + if (mnstr_write(f, "", 1, 2) < 0) + return -1; break; case '"': - mnstr_write(f, "\"\"", 1, singleq ? 1 : 2); + if (mnstr_write(f, "\"\"", 1, singleq ? 1 : 2) < 0) + return -1; break; case '\'': - mnstr_write(f, "''", 1, singleq ? 2 : 1); + if (mnstr_write(f, "''", 1, singleq ? 2 : 1) < 0) + return -1; break; case '\n': - mnstr_write(f, "\\n", 1, 2); + if (mnstr_write(f, "\\n", 1, 2) < 0) + return -1; break; case '\t': - mnstr_write(f, "\\t", 1, 2); + if (mnstr_write(f, "\\t", 1, 2) < 0) + return -1; break; default: - if ((0 < *s && *s < 32) || *s == '\177') - mnstr_printf(f, "\\%03o", (uint8_t) *s); - else - mnstr_write(f, s, 1, 1); + if ((0 < *s && *s < 32) || *s == '\177') { + if (mnstr_printf(f, "\\%03o", (uint8_t) *s) < 0) + return -1; + } else { + if (mnstr_write(f, s, 1, 1) < 0) + return -1; + } break; } s++; } - mnstr_write(f, singleq ? "'" : "\"", 1, 1); + if (mnstr_write(f, singleq ? "'" : "\"", 1, 1) < 0) + return -1; + return 0; } -static void +static int comment_on(stream *toConsole, const char *object, const char *ident1, const char *ident2, const char *ident3, const char *remark) { if (remark) { - mnstr_printf(toConsole, "COMMENT ON %s \"%s\"", object, ident1); + if (mnstr_printf(toConsole, "COMMENT ON %s \"%s\"", object, ident1) < 0) + return -1; if (ident2) { - mnstr_printf(toConsole, ".\"%s\"", ident2); + if (mnstr_printf(toConsole, ".\"%s\"", ident2) < 0) + return -1; if (ident3) { - mnstr_printf(toConsole, ".\"%s\"", ident3); + if (mnstr_printf(toConsole, ".\"%s\"", ident3) < 0) + return -1; } } - mnstr_write(toConsole, " IS ", 1, 4); - quoted_print(toConsole, remark, true); - mnstr_write(toConsole, ";\n", 1, 2); + if (mnstr_write(toConsole, " IS ", 1, 4) < 0 || + quoted_print(toConsole, remark, true) < 0 || + mnstr_write(toConsole, ";\n", 1, 2) < 0) + return -1; } + return 0; } static char *actions[] = { @@ -92,7 +108,8 @@ get_schema(Mapi mid) char *sname = NULL; MapiHdl hdl; - if ((hdl = mapi_query(mid, "SELECT current_schema")) == NULL || mapi_error(mid)) + if ((hdl = mapi_query(mid, "SELECT current_schema")) == NULL || + mapi_error(mid)) goto bailout; while ((mapi_fetch_row(hdl)) != 0) { sname = mapi_fetch_field(hdl, 0); @@ -171,6 +188,8 @@ dump_foreign_keys(Mapi mid, const char * if (tname != NULL) { maxquerylen = 1024 + strlen(tname) + strlen(schema); query = malloc(maxquerylen); + if (query == NULL) + goto bailout; snprintf(query, maxquerylen, "SELECT ps.name, " /* 0 */ "pkt.name, "/* 1 */ @@ -203,6 +222,8 @@ dump_foreign_keys(Mapi mid, const
MonetDB: Mar2018 - Coverity doesn't like "q += snprintf(q, end_q...
Changeset: fe29646aea38 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fe29646aea38 Modified Files: clients/mapiclient/dump.c Branch: Mar2018 Log Message: Coverity doesn't like "q += snprintf(q, end_q - q, ...". diffs (195 lines): diff --git a/clients/mapiclient/dump.c b/clients/mapiclient/dump.c --- a/clients/mapiclient/dump.c +++ b/clients/mapiclient/dump.c @@ -1370,20 +1370,18 @@ static int dump_function(Mapi mid, stream *toConsole, const char *fid, bool hashge) { MapiHdl hdl; - size_t qlen = 5120 + strlen(fid); - char *query = malloc(qlen); - char *q, *end_q; + size_t query_size = 5120 + strlen(fid); + int query_len; + char *query = malloc(query_size); const char *sep; char *ffunc = NULL, *flkey = NULL, *remark = NULL; char *sname, *fname, *ftkey; int flang, ftype; - if (!query) + if (query == NULL) return 1; - q = query; - end_q = query + qlen; - q += snprintf(q, end_q - q, + query_len = snprintf(query, query_size, "%s " "SELECT f.id, " "f.func, " @@ -1401,7 +1399,9 @@ dump_function(Mapi mid, stream *toConsol "LEFT OUTER JOIN comments c ON f.id = c.id " "WHERE f.id = %s", get_compat_clause(mid), fid); - if ((hdl = mapi_query(mid, query)) == NULL || mapi_error(mid)) { + assert(query_len < (int) query_size); + if (query_len < 0 || query_len >= (int) query_size || + (hdl = mapi_query(mid, query)) == NULL || mapi_error(mid)) { free(query); return 1; } @@ -1452,7 +1452,16 @@ dump_function(Mapi mid, stream *toConsol ffunc = strdup(ffunc); if (flkey) flkey = strdup(flkey); - snprintf(query, qlen, "SELECT a.name, a.type, a.type_digits, a.type_scale, a.inout FROM sys.args a, sys.functions f WHERE a.func_id = f.id AND f.id = %s ORDER BY a.inout DESC, a.number", fid); + query_len = snprintf(query, query_size, "SELECT a.name, a.type, a.type_digits, a.type_scale, a.inout FROM sys.args a, sys.functions f WHERE a.func_id = f.id AND f.id = %s ORDER BY a.inout DESC, a.number", fid); + assert(query_len < (int) query_size); + if (query_len < 0 || query_len >= (int) query_size) { + free(ffunc); + free(flkey); + if (remark) + free(remark); + free(query); + return 1; + } mapi_close_handle(hdl); hdl = mapi_query(mid, query); free(query); @@ -1547,9 +1556,10 @@ dump_function(Mapi mid, stream *toConsol int dump_functions(Mapi mid, stream *toConsole, char set_schema, const char *sname, const char *fname, const char *id) { - MapiHdl hdl; - char *query, *q, *end_q; - size_t len; + MapiHdl hdl = NULL; + char *query; + size_t query_size; + int query_len; bool hashge; char *to_free = NULL; bool wantSystem; @@ -1580,32 +1590,42 @@ dump_functions(Mapi mid, stream *toConso hashge = has_hugeint(mid); - len = 5120 + (sname ? strlen(sname) : 0) + (fname ? strlen(fname) : 0); - query = malloc(len); + query_size = 5120 + (sname ? strlen(sname) : 0) + (fname ? strlen(fname) : 0); + query = malloc(query_size); if (query == NULL) { if (to_free) free(to_free); return 1; } - q = query; - end_q = query + len; - q += snprintf(q, end_q - q, + query_len = snprintf(query, query_size, "SELECT s.id, s.name, f.id " "FROM sys.schemas s " "JOIN sys.functions f ON s.id = f.schema_id " "WHERE f.language > 0 "); if (id) { - q += snprintf(q, end_q - q, "AND f.id = %s ", id); + query_len += snprintf(query + query_len, + query_size - query_len, + "AND f.id = %s ", id); } else { if (sname) - q += snprintf(q, end_q - q, "AND s.name = '%s' ", sname); + query_len += snprintf(query + query_len, + query_size - query_len, + "AND s.name = '%s' ", sname); if (fname) - q += snprintf(q, end_q - q, "AND f.name = '%s' ", fname); + query_len += snprintf(query + query_len, + query_size - query_len, + "AND f.name = '%s' ", fname); if (!wantSystem) - q += snprintf(q, end_q - q, "AND f.id
MonetDB: default - Remove lsst from .rpm and .deb after changese...
Changeset: 0001562c57c1 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0001562c57c1 Modified Files: MonetDB.spec debian/monetdb5-server.install Branch: default Log Message: Remove lsst from .rpm and .deb after changeset b0c87db02c02. diffs (30 lines): diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -679,7 +679,6 @@ fi %endif %{_libdir}/monetdb5/lib_capi.so %{_libdir}/monetdb5/lib_generator.so -%{_libdir}/monetdb5/lib_lsst.so %{_libdir}/monetdb5/lib_opt_sql_append.so %{_libdir}/monetdb5/lib_udf.so %{_libdir}/monetdb5/lib_vault.so diff --git a/debian/monetdb5-server.install b/debian/monetdb5-server.install --- a/debian/monetdb5-server.install +++ b/debian/monetdb5-server.install @@ -3,7 +3,6 @@ debian/tmp/usr/lib/libmonetdb5.so.* usr/ # usr/lib/monetdb5/lib_*.so EXCEPT: lib_{bam,geom,gsl,lidar,pyapi,rapi,sql}.so debian/tmp/usr/lib/monetdb5/lib_generator.so usr/lib/monetdb5 -debian/tmp/usr/lib/monetdb5/lib_lsst.so usr/lib/monetdb5 debian/tmp/usr/lib/monetdb5/lib_opt_sql_append.so usr/lib/monetdb5 debian/tmp/usr/lib/monetdb5/lib_udf.so usr/lib/monetdb5 debian/tmp/usr/lib/monetdb5/lib_vault.so usr/lib/monetdb5 @@ -25,7 +24,6 @@ debian/tmp/usr/lib/monetdb5/u[!d]*.mal u debian/tmp/usr/lib/monetdb5/autoload/??_batcalc.mal usr/lib/monetdb5/autoload debian/tmp/usr/lib/monetdb5/autoload/??_calc.mal usr/lib/monetdb5/autoload debian/tmp/usr/lib/monetdb5/autoload/??_generator.mal usr/lib/monetdb5/autoload -debian/tmp/usr/lib/monetdb5/autoload/??_lsst.mal usr/lib/monetdb5/autoload debian/tmp/usr/lib/monetdb5/autoload/??_opt_sql_append.mal usr/lib/monetdb5/autoload debian/tmp/usr/lib/monetdb5/autoload/??_udf.mal usr/lib/monetdb5/autoload debian/tmp/usr/lib/monetdb5/autoload/??_vault.mal usr/lib/monetdb5/autoload ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: remote_auth - Merge with default
Changeset: d6e73d6b9447 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d6e73d6b9447 Removed Files: sql/backends/monet5/LSST/80_lsst.mal sql/backends/monet5/LSST/Makefile.ag sql/backends/monet5/LSST/Tests/All sql/backends/monet5/LSST/Tests/lsst.sql.src sql/backends/monet5/LSST/Tests/lsst.stable.err sql/backends/monet5/LSST/Tests/lsst.stable.out sql/backends/monet5/LSST/Tests/lsst_htmxmatch.reqtests sql/backends/monet5/LSST/Tests/lsst_htmxmatch.sql sql/backends/monet5/LSST/Tests/lsst_htmxmatch.stable.err sql/backends/monet5/LSST/Tests/lsst_htmxmatch.stable.out sql/backends/monet5/LSST/lsst.c sql/backends/monet5/LSST/lsst.h sql/backends/monet5/LSST/lsst.mal sql/backends/monet5/LSST/lsst.sql Modified Files: .hgtags ChangeLog MonetDB.spec buildtools/ChangeLog-Archive buildtools/ChangeLog.Mar2018 clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/mapiclient/Tests/mclient--help.stable.err clients/mapiclient/Tests/mclient--help.stable.err.Windows clients/mapiclient/mclient.c debian/changelog libversions monetdb5/ChangeLog sql/ChangeLog-Archive sql/ChangeLog.Mar2018 sql/backends/monet5/Makefile.ag testing/README Branch: remote_auth Log Message: Merge with default diffs (truncated from 1643 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -695,3 +695,5 @@ 28edc063ceb6a3726af887911a3e4ac4a33c504f f34a57f73307a09909b3669ce5cfd9aad490f317 Mar2018_3 28edc063ceb6a3726af887911a3e4ac4a33c504f Mar2018_release f34a57f73307a09909b3669ce5cfd9aad490f317 Mar2018_release +ee3d17d6f39930280f5aa914b42b87cda09008ca Mar2018_5 +ee3d17d6f39930280f5aa914b42b87cda09008ca Mar2018_SP1_release diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ # ChangeLog file for devel # This file is updated with Maddlog +* Fri May 25 2018 Ying Zhang+- Added a '-f rowcount' option in mclient to repress printing the actual + data of a resultset, but only print the number of returned tuples + * Tue Feb 13 2018 Pedro Ferreira - Added support for lz4 compressed files on stream library diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -132,7 +132,7 @@ Vendor: MonetDB BV Group: Applications/Databases License: MPLv2.0 URL: https://www.monetdb.org/ -Source: https://www.monetdb.org/downloads/sources/Mar2018/%{name}-%{version}.tar.bz2 +Source: https://www.monetdb.org/downloads/sources/Mar2018-SP1/%{name}-%{version}.tar.bz2 # we need systemd for the _unitdir macro to exist # we need checkpolicy and selinux-policy-devel for the SELinux policy @@ -1034,6 +1034,59 @@ done %postun -p /sbin/ldconfig %changelog +* Fri May 25 2018 Panagiotis Koutsourakis - 11.29.5-20180525 +- Rebuilt. +- BZ#6562: Sqlitelogictest crash on group by query with not in operator +- BZ#6565: Sqlitelogictest crash on complex select query with coalesce + call +- BZ#6566: Sqlitelogictest unavailable calc.- MAL operations +- BZ#6568: Sqlitelogictest crash on complex case query +- BZ#6569: Sqlitelogictest select query with not between cause with + wrong results +- BZ#6570: Sqlitelogictest select coalesce undefined calc +- BZ#6572: ordered index Error in optimizer garbageCollector +- BZ#6573: Sqlitelogictest crash on complex select query with case + statement +- BZ#6574: server crashed could not find ordered index while creating + a table +- BZ#6575: Sqlitelogictest crash on groupby query with coalesce call +- BZ#6576: Sqlitelogictest aritmetic expressions with negative numbers + handling +- BZ#6577: creating temp table kills performance of the original query +- BZ#6578: One two-tuple insert gives different results than two single + inserts +- BZ#6579: Sqlitelogic test infinite loop while compiling SQL query +- BZ#6581: Join condition errors. +- BZ#6583: Fixed size string concatenation with integer results in fixed + size string of size 0 +- BZ#6584: SELECT FROM REMOTE TABLE WHERE IS NOT NULL produces wrong + result +- BZ#6585: Nested Merge tables cause an infinite loop in rel_optimizer +- BZ#6587: Sqlitelogictest crash on complex case statement +- BZ#6589: Sqlitelogictest crash on complex on complex expression +- BZ#6594: Sqlitelogictest crash on complex case statement +- BZ#6595: Remote decimal division triggers assertion / returns wrong + answer +- BZ#6598: Python 3.4 not supported (due to usage of Py_DecodeLocale) +- BZ#6600: Sqlitelogictest queries fail to execute +- BZ#6601: "where is null" clause on remote table causes problem with + next query +- BZ#6602: Sqlitelogictest wrong results in IN query +- BZ#6603: Sqlitelogictest: Aggregation query with