Changeset: 031ea0b598ef for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=031ea0b598ef Added Files: sql/test/BugTracker-2019/Tests/orderby-alias-expr.Bug-6799.sql sql/test/BugTracker-2019/Tests/orderby-alias-expr.Bug-6799.stable.err sql/test/BugTracker-2019/Tests/orderby-alias-expr.Bug-6799.stable.out sql/test/BugTracker-2019/Tests/prepared-select-with-error-causes-hang.Bug-6761.sql sql/test/BugTracker-2019/Tests/prepared-select-with-error-causes-hang.Bug-6761.stable.err sql/test/BugTracker-2019/Tests/prepared-select-with-error-causes-hang.Bug-6761.stable.out Modified Files: .hgtags MonetDB.spec NT/monetdb_config.h.in NT/rules.msc clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc configure.ag debian/changelog gdk/libbat.rc libversions monetdb5/mal/mal_instruction.h monetdb5/mal/mal_parser.c monetdb5/modules/mal/orderidx.c monetdb5/optimizer/opt_mergetable.c monetdb5/optimizer/opt_projectionpath.c monetdb5/optimizer/opt_querylog.c monetdb5/optimizer/opt_remap.c monetdb5/tools/libmonetdb5.rc sql/backends/monet5/sql_scenario.c sql/include/sql_relation.h sql/test/BugTracker-2019/Tests/All sql/test/BugTracker-2019/Tests/date_trunc.sql sql/test/BugTracker-2019/Tests/date_trunc.stable.out sql/test/BugTracker-2019/Tests/date_trunc_bulk.sql sql/test/BugTracker-2019/Tests/date_trunc_bulk.stable.out vertoo.data Branch: default Log Message:
merged diffs (truncated from 976 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -742,3 +742,5 @@ 90486f8f87ff0602f3ab143c629ba0aed2153d64 13efc12c95a279d41dbc4440369defc1d7c21d0f Nov2019_3 90486f8f87ff0602f3ab143c629ba0aed2153d64 Nov2019_release 13efc12c95a279d41dbc4440369defc1d7c21d0f Nov2019_release +fffd3aabeae5e2c5b535179471e5730742962a76 Nov2019_5 +fffd3aabeae5e2c5b535179471e5730742962a76 Nov2019_SP1_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -114,7 +114,7 @@ Group: Applications/Databases License: MPLv2.0 URL: https://www.monetdb.org/ BugURL: https://bugs.monetdb.org/ -Source: https://www.monetdb.org/downloads/sources/Nov2019/%{name}-%{version}.tar.bz2 +Source: https://www.monetdb.org/downloads/sources/Nov2019-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 @@ -1061,6 +1061,27 @@ fi %postun -p /sbin/ldconfig %changelog +* Thu Dec 12 2019 Sjoerd Mullender <sjo...@acm.org> - 11.35.5-20191212 +- Rebuilt. +- BZ#6723: columns aliases duplicates should not be allowed. automatic + aliasing required. +- BZ#6724: Prepare confuses types when more than one argument is used +- BZ#6726: Python aggregation does not create aggr_group when aggregating + over all rows +- BZ#6765: GRANT SELECT privilege on a subset of table columns results + in access denied error when selecting the same columns from the table +- BZ#6790: Count distinct giving wrong results +- BZ#6791: str_to_time('11:40', '%H:%M') creates wrong time value +- BZ#6792: JSON path compiler accepts invalid input +- BZ#6793: cast(interval second value to int or decimal) is wrong (by + a factor of 1000), cast(interval month value to decimal or floating + point) fails +- BZ#6794: external name fits.listdir not bound (sys.listdir) Fatal + error during initialization: +- BZ#6796: Incorrect crash time reported by monetdb tool after crash + of mserver5 +- BZ#6798: json.text off by one error + * Mon Nov 25 2019 Sjoerd Mullender <sjo...@acm.org> - 11.35.3-20191125 - Rebuilt. - BZ#3533: SQL aggregate functions avg(), sum() and median() return an diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,27 @@ +monetdb (11.35.5) unstable; urgency=low + + * Rebuilt. + * BZ#6723: columns aliases duplicates should not be allowed. automatic + aliasing required. + * BZ#6724: Prepare confuses types when more than one argument is used + * BZ#6726: Python aggregation does not create aggr_group when aggregating + over all rows + * BZ#6765: GRANT SELECT privilege on a subset of table columns results + in access denied error when selecting the same columns from the table + * BZ#6790: Count distinct giving wrong results + * BZ#6791: str_to_time('11:40', '%H:%M') creates wrong time value + * BZ#6792: JSON path compiler accepts invalid input + * BZ#6793: cast(interval second value to int or decimal) is wrong (by + a factor of 1000), cast(interval month value to decimal or floating + point) fails + * BZ#6794: external name fits.listdir not bound (sys.listdir) Fatal + error during initialization: + * BZ#6796: Incorrect crash time reported by monetdb tool after crash + of mserver5 + * BZ#6798: json.text off by one error + + -- Sjoerd Mullender <sjo...@acm.org> Thu, 12 Dec 2019 09:24:08 +0100 + monetdb (11.35.3) unstable; urgency=low * Rebuilt. diff --git a/libversions b/libversions --- a/libversions +++ b/libversions @@ -36,13 +36,13 @@ # version of the GDK library (subdirectory gdk; also includes # common/options and common/utils) -GDK_VERSION=19:1:0 +GDK_VERSION=19:2:0 # version of the MAPI library (subdirectory clients/mapilib) MAPI_VERSION=12:2:0 # version of the MONETDB5 library (subdirectory monetdb5, not including extras or sql) -MONETDB5_VERSION=28:1:0 +MONETDB5_VERSION=28:2:0 # version of the STREAM library (subdirectory common/stream) STREAM_VERSION=13:3:0 diff --git a/monetdb5/mal/mal_instruction.h b/monetdb5/mal/mal_instruction.h --- a/monetdb5/mal/mal_instruction.h +++ b/monetdb5/mal/mal_instruction.h @@ -38,6 +38,7 @@ #define garbageControl(P) ((P)->gc & GARBAGECONTROL) #define getInstrPtr(M,I) (M)->stmt[I] +#define putInstrPtr(M,I,P) (M)->stmt[I] = P #define getSignature(S) getInstrPtr((S)->def,0) #define isMain(M) ((getInstrPtr(M,0))->fcnname== putName("main",4)) #define getFcnName(M) getFunctionId(getInstrPtr(M,0)) diff --git a/monetdb5/mal/mal_parser.c b/monetdb5/mal/mal_parser.c --- a/monetdb5/mal/mal_parser.c +++ b/monetdb5/mal/mal_parser.c @@ -1261,7 +1261,7 @@ fcnHeader(Client cntxt, int kind) } if (curInstr != getInstrPtr(curBlk, 0)) { freeInstruction(getInstrPtr(curBlk, 0)); - getInstrPtr(curBlk, 0) = curInstr; + putInstrPtr(curBlk, 0, curInstr); } return curBlk; } diff --git a/monetdb5/modules/mal/orderidx.c b/monetdb5/modules/mal/orderidx.c --- a/monetdb5/modules/mal/orderidx.c +++ b/monetdb5/modules/mal/orderidx.c @@ -107,7 +107,7 @@ OIDXcreateImplementation(Client cntxt, i smb = snew->def; q = getInstrPtr(smb, 0); arg = newTmpVariable(smb, tpe); - q= pushArgument(smb, q, arg); + q= addArgument(smb, q, arg); getArg(q,0) = newTmpVariable(smb, TYPE_void); resizeMalBlk(smb, 2*pieces+10); // large enough @@ -119,7 +119,7 @@ OIDXcreateImplementation(Client cntxt, i goto bailout; } pack->argv[0] = newTmpVariable(smb, TYPE_void); - pack = pushArgument(smb, pack, arg); + pack = addArgument(smb, pack, arg); setVarFixed(smb, getArg(pack, 0)); /* the costly part executed as a parallel block */ @@ -133,11 +133,11 @@ OIDXcreateImplementation(Client cntxt, i o = 0; for (i = 0; i < pieces; i++) { /* add slice instruction */ - q = newStmt(smb, putName("algebra"),putName("slice")); + q = newInstruction(smb, putName("algebra"),putName("slice")); setVarType(smb, getArg(q,0), tpe); setVarFixed(smb, getArg(q,0)); - q = pushArgument(smb, q, arg); - pack = pushArgument(smb, pack, getArg(q,0)); + q = addArgument(smb, q, arg); + pack = addArgument(smb, pack, getArg(q,0)); q = pushOid(smb, q, o); if (i == pieces-1) { o = cnt; @@ -145,15 +145,17 @@ OIDXcreateImplementation(Client cntxt, i o += step; } q = pushOid(smb, q, o - 1); + pushInstruction(smb, q); } for (i = 0; i < pieces; i++) { /* add sort instruction */ - q = newStmt(smb, putName("algebra"), putName("orderidx")); + q = newInstruction(smb, putName("algebra"), putName("orderidx")); setVarType(smb, getArg(q, 0), tpe); setVarFixed(smb, getArg(q, 0)); - q = pushArgument(smb, q, pack->argv[2+i]); + q = addArgument(smb, q, pack->argv[2+i]); q = pushBit(smb, q, 1); pack->argv[2+i] = getArg(q, 0); + pushInstruction(smb, q); } /* finalize OID packing, check, and evaluate */ pushInstruction(smb,pack); diff --git a/monetdb5/optimizer/opt_mergetable.c b/monetdb5/optimizer/opt_mergetable.c --- a/monetdb5/optimizer/opt_mergetable.c +++ b/monetdb5/optimizer/opt_mergetable.c @@ -331,7 +331,7 @@ mat_delta(matlist_t *ml, MalBlkPtr mb, I freeInstruction(r); return NULL; } - r = pushArgument(mb, r, getArg(q, 0)); + r = addArgument(mb, r, getArg(q, 0)); nr++; break; @@ -364,7 +364,7 @@ mat_delta(matlist_t *ml, MalBlkPtr mb, I freeInstruction(r); return NULL; } - r = pushArgument(mb, r, getArg(q, 0)); + r = addArgument(mb, r, getArg(q, 0)); } if (evar == 1 && e >= 0 && mat[e].type == mat_slc && is_projectdelta) { InstrPtr q = newInstruction(mb, algebraRef, projectionRef); @@ -456,7 +456,7 @@ mat_apply1(MalBlkPtr mb, InstrPtr p, mat freeInstruction(r); return NULL; } - r = pushArgument(mb, r, getArg(q, 0)); + r = addArgument(mb, r, getArg(q, 0)); } return r; } @@ -506,7 +506,7 @@ mat_apply2(matlist_t *ml, MalBlkPtr mb, GDKfree(r); return -1; } - r[l] = pushArgument(mb, r[l], getArg(q, l)); + r[l] = addArgument(mb, r[l], getArg(q, l)); } } @@ -563,7 +563,7 @@ mat_apply3(MalBlkPtr mb, InstrPtr p, mat GDKfree(r); return -1; } - r[l] = pushArgument(mb, r[l], getArg(q, l)); + r[l] = addArgument(mb, r[l], getArg(q, l)); } } for(k=0; k < p->retc; k++) { @@ -637,7 +637,7 @@ mat_setop(MalBlkPtr mb, InstrPtr p, matl } pushInstruction(mb,q); - r = pushArgument(mb,r,getArg(q,0)); + r = addArgument(mb,r,getArg(q,0)); nr++; } } else { @@ -657,7 +657,7 @@ mat_setop(MalBlkPtr mb, InstrPtr p, matl freeInstruction(r); return -1; } - r = pushArgument(mb, r, getArg(q,0)); + r = addArgument(mb, r, getArg(q,0)); } } @@ -701,7 +701,7 @@ mat_projection(MalBlkPtr mb, InstrPtr p, freeInstruction(r); return -1; } - r = pushArgument(mb,r,getArg(q,0)); + r = addArgument(mb,r,getArg(q,0)); nr++; break; @@ -728,7 +728,7 @@ mat_projection(MalBlkPtr mb, InstrPtr p, freeInstruction(r); return -1; } - r = pushArgument(mb, r, getArg(q,0)); + r = addArgument(mb, r, getArg(q,0)); } } @@ -781,8 +781,8 @@ mat_join2(MalBlkPtr mb, InstrPtr p, matl } /* add result to mat */ - l = pushArgument(mb,l,getArg(q,0)); - r = pushArgument(mb,r,getArg(q,1)); + l = addArgument(mb,l,getArg(q,0)); + r = addArgument(mb,r,getArg(q,1)); nr++; } } @@ -813,8 +813,8 @@ mat_join2(MalBlkPtr mb, InstrPtr p, matl } /* add result to mat */ - l = pushArgument(mb, l, getArg(q,0)); - r = pushArgument(mb, r, getArg(q,1)); + l = addArgument(mb, l, getArg(q,0)); + r = addArgument(mb, r, getArg(q,1)); } } return mat_add(ml, l, mat_none, getFunctionId(p)) || mat_add(ml, r, mat_none, getFunctionId(p)); @@ -929,8 +929,8 @@ mat_joinNxM(Client cntxt, MalBlkPtr mb, } /* add result to mat */ - l = pushArgument(mb,l,getArg(q,0)); - r = pushArgument(mb,r,getArg(q,1)); + l = addArgument(mb,l,getArg(q,0)); + r = addArgument(mb,r,getArg(q,1)); nr++; } } @@ -966,8 +966,8 @@ mat_joinNxM(Client cntxt, MalBlkPtr mb, pushInstruction(mb,q); /* add result to mat */ - l = pushArgument(mb, l, getArg(q,0)); _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
