Changeset: 015108c4128c for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=015108c4128c 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/mapiclient/tomograph.c 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_select.c gdk/libbat.rc java/ChangeLog-Archive java/ChangeLog.Oct2012 libversions monetdb5/optimizer/Tests/mat00.stable.out monetdb5/optimizer/Tests/mat01.stable.out monetdb5/optimizer/opt_dataflow.c monetdb5/optimizer/opt_matpack.c monetdb5/optimizer/opt_pipes.c monetdb5/tools/libmonetdb5.rc sql/ChangeLog-Archive sql/ChangeLog.Oct2012 vertoo.data Branch: default Log Message:
Merge with Feb2013 branch. diffs (truncated from 1016 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -509,3 +509,5 @@ 3c157ea4be5369d5718c7d578f10c0b934fbf2e6 55c1892e82a764a7a6003dded13a6228de3d1661 Oct2012_5 5ba19bc11f7691610501c95ba8d0f1d9e5083a94 Oct2012_SP1_release c341b78e1c2e38445f43bd3ec89fdf40792bed01 Feb2013_root +0ef42179e99bbd8450d9993cf419fcbed96cf61c Oct2012_7 +14b7be52b2212bf3aeb51edecbaee020554b3158 Oct2012_SP2_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -27,7 +27,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/Oct2012-SP1/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Oct2012-SP2/%{name}-%{version}.tar.bz2 BuildRequires: bison BuildRequires: bzip2-devel @@ -692,6 +692,25 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet rm -fr $RPM_BUILD_ROOT %changelog +* Wed Dec 12 2012 Sjoerd Mullender <sjo...@acm.org> - 11.13.7-20121212 +- Rebuilt. + +* Fri Nov 23 2012 Fabian Groffen <fab...@monetdb.org> - 11.13.7-20121212 +- java: Implemented type map support of Connection to allow custom mapping + of UDTs to Java classes. By default the INET and URL UDTs are + now mapped to nl.cwi.monetdb.jdbc.types.{INET,URL}. Most notably, + ResultSet.getObject() and PreparedStatement.setObject() deal with the + type map. + +* Thu Nov 22 2012 Fabian Groffen <fab...@monetdb.org> - 11.13.7-20121212 +- java: Fixed a problem in PreparedStatement where the prepared statement's + ResultSetMetaData (on its columns to be produced) incorrectly threw + exceptions about non existing columns. Bug #3192 + +* Wed Nov 21 2012 Fabian Groffen <fab...@monetdb.org> - 11.13.7-20121212 +- sql: Fixed crash when performing an INSERT on a table with string-like column + defaulting to NULL and omitting that column from VALUES, bug #3168 + * Fri Nov 16 2012 Sjoerd Mullender <sjo...@acm.org> - 11.13.5-20121116 - Rebuilt. diff --git a/clients/mapiclient/tomograph.c b/clients/mapiclient/tomograph.c --- a/clients/mapiclient/tomograph.c +++ b/clients/mapiclient/tomograph.c @@ -786,12 +786,12 @@ static void showcolormap(char *filename, scale = "sec"; } - fprintf(f, "set object %d rectangle from %d, %d to %d, %d fillcolor rgb \"%s\" fillstyle solid 0.6\n", - object++, (k % 3) * w, h - 40, (int) ((k % 3) * w + 0.15 * w), h - 5, colors[i].col); + fprintf(f, "set object %d rectangle from %f, %f to %f, %f fillcolor rgb \"%s\" fillstyle solid 0.6\n", + object++, (double) (k % 3) * w, (double) h - 40, (double) ((k % 3) * w + 0.15 * w), (double) h - 5, colors[i].col); fprintf(f, "set label %d \"%s.%s \" at %d,%d\n", object++, colors[i].mod, colors[i].fcn, (int) ((k % 3) * w + 0.2 * w), h - 15); - fprintf(f, "set label %d \"%d calls %3.2f %s\" at %d,%d\n", - object++, colors[i].freq, tu, scale, (int) ((k % 3) * w + 0.2 * w), h - 35); + fprintf(f, "set label %d \"%d calls %3.2f %s\" at %f,%f\n", + object++, colors[i].freq, tu, scale, (double) ((k % 3) * w + 0.2 * w), (double) h - 35); if (k % 3 == 2) h -= 45; k++; @@ -967,7 +967,7 @@ static void createTomogram(void) fprintf(gnudata, "set rmarg 10\n"); fprintf(gnudata, "set size 1,0.4\n"); fprintf(gnudata, "set origin 0.0,0.4\n"); - fprintf(gnudata, "set xrange [%ld:%ld]\n", startrange, lastclktick - starttime); + fprintf(gnudata, "set xrange [%f:%f]\n", (double) startrange, (double) lastclktick - starttime); /* detect all different threads and assign them a row */ for (i = 0; i < topbox; i++) diff --git a/configure.ag b/configure.ag --- a/configure.ag +++ b/configure.ag @@ -1158,8 +1158,9 @@ if test "x$have_python2" != xno; then have_python2=yes elif test "x$have_python2" != xauto; then AC_MSG_ERROR([Python 2 executable not found]) + else + have_python2=no fi - have_python2=no fi fi fi @@ -1219,8 +1220,9 @@ if test "x$have_python3" != xno; then have_python3=yes elif test "x$have_python3" != xauto; then AC_MSG_ERROR([Python3 executable not found]) + else + have_python3=no fi - have_python3=no fi fi fi diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,34 @@ +monetdb (11.13.7-20121212) unstable; urgency=low + + * Rebuilt. + + -- Sjoerd Mullender <sjo...@acm.org> Wed, 12 Dec 2012 13:00:49 +0100 + +monetdb (11.13.7-20121212) unstable; urgency=low + + * java: Implemented type map support of Connection to allow custom mapping + of UDTs to Java classes. By default the INET and URL UDTs are + now mapped to nl.cwi.monetdb.jdbc.types.{INET,URL}. Most notably, + ResultSet.getObject() and PreparedStatement.setObject() deal with the + type map. + + -- Fabian Groffen <fab...@monetdb.org> Fri, 23 Nov 2012 13:00:48 +0100 + +monetdb (11.13.7-20121212) unstable; urgency=low + + * java: Fixed a problem in PreparedStatement where the prepared statement's + ResultSetMetaData (on its columns to be produced) incorrectly threw + exceptions about non existing columns. Bug #3192 + + -- Fabian Groffen <fab...@monetdb.org> Thu, 22 Nov 2012 13:00:48 +0100 + +monetdb (11.13.7-20121212) unstable; urgency=low + + * sql: Fixed crash when performing an INSERT on a table with string-like column + defaulting to NULL and omitting that column from VALUES, bug #3168 + + -- Fabian Groffen <fab...@monetdb.org> Wed, 21 Nov 2012 13:00:48 +0100 + monetdb (11.13.5-20121116) unstable; urgency=low * Rebuilt. diff --git a/gdk/gdk_select.c b/gdk/gdk_select.c --- a/gdk/gdk_select.c +++ b/gdk/gdk_select.c @@ -20,6 +20,12 @@ #include "monetdb_config.h" #include "gdk.h" #include "gdk_private.h" +#include <math.h> + +#ifdef _MSC_VER +#define nextafter _nextafter +#define nextafterf _nextafterf +#endif #define buninsfix(B,C,A,I,T,V,G,M,R) \ do { \ @@ -199,172 +205,244 @@ do { \ } \ } while (0) -/* scan select predicate switch */ -#define scantest(CAND,READ,COMP,NIL1,NIL2) \ -do { \ - if (equi ) { \ - scanloop(CAND,READ, COMP(v,==,vl) ); \ - } else \ - if ( anti && b->T->nonil && lval && !li && hval && !hi) { \ - scanloop(CAND,READ,(COMP(v,<=,vl) || COMP(v,>=,vh)) ); \ - } else \ - if ( anti && b->T->nonil && lval && !li && hval && hi) { \ - scanloop(CAND,READ,(COMP(v,<=,vl) || COMP(v,> ,vh)) ); \ - } else \ - if ( anti && b->T->nonil && lval && li && hval && !hi) { \ - scanloop(CAND,READ,(COMP(v,< ,vl) || COMP(v,>=,vh)) ); \ - } else \ - if ( anti && b->T->nonil && lval && li && hval && hi) { \ - scanloop(CAND,READ,(COMP(v,< ,vl) || COMP(v,> ,vh)) ); \ - } else \ - if ( anti && b->T->nonil && lval && !li && !hval ) { \ - scanloop(CAND,READ,(COMP(v,<=,vl) ) ); \ - } else \ - if ( anti && b->T->nonil && lval && li && !hval ) { \ - scanloop(CAND,READ,(COMP(v,< ,vl) ) ); \ - } else \ - if ( anti && b->T->nonil && !lval && hval && !hi) { \ - scanloop(CAND,READ,( COMP(v,>=,vh)) ); \ - } else \ - if ( anti && b->T->nonil && !lval && hval && hi) { \ - scanloop(CAND,READ,( COMP(v,> ,vh)) ); \ - } else \ - if ( anti && !b->T->nonil && lval && !li && hval && !hi) { \ - scanloop(CAND,READ,(COMP(v,<=,vl) || COMP(v,>=,vh)) NIL1(v)); \ - } else \ - if ( anti && !b->T->nonil && lval && !li && hval && hi) { \ - scanloop(CAND,READ,(COMP(v,<=,vl) || COMP(v,> ,vh)) NIL1(v)); \ - } else \ - if ( anti && !b->T->nonil && lval && li && hval && !hi) { \ - scanloop(CAND,READ,(COMP(v,< ,vl) || COMP(v,>=,vh)) NIL1(v)); \ - } else \ - if ( anti && !b->T->nonil && lval && li && hval && hi) { \ - scanloop(CAND,READ,(COMP(v,< ,vl) || COMP(v,> ,vh)) NIL1(v)); \ - } else \ - if ( anti && !b->T->nonil && lval && !li && !hval ) { \ - scanloop(CAND,READ,(COMP(v,<=,vl) ) NIL1(v)); \ - } else \ - if ( anti && !b->T->nonil && lval && li && !hval ) { \ - scanloop(CAND,READ,(COMP(v,< ,vl) ) NIL1(v)); \ - } else \ - if ( anti && !b->T->nonil && !lval && hval && !hi) { \ - scanloop(CAND,READ,( COMP(v,>=,vh)) NIL2(v)); \ - } else \ - if ( anti && !b->T->nonil && !lval && hval && hi) { \ - scanloop(CAND,READ,( COMP(v,> ,vh)) NIL2(v)); \ - } else \ - if (!anti && b->T->nonil && lval && !li && hval && !hi) { \ - scanloop(CAND,READ,(COMP(v,> ,vl) && COMP(v,< ,vh)) ); \ - } else \ - if (!anti && b->T->nonil && lval && !li && hval && hi) { \ - scanloop(CAND,READ,(COMP(v,> ,vl) && COMP(v,<=,vh)) ); \ - } else \ - if (!anti && b->T->nonil && lval && li && hval && !hi) { \ - scanloop(CAND,READ,(COMP(v,>=,vl) && COMP(v,< ,vh)) ); \ - } else \ - if (!anti && b->T->nonil && lval && li && hval && hi) { \ - scanloop(CAND,READ,(COMP(v,>=,vl) && COMP(v,<=,vh)) ); \ - } else \ - if (!anti && b->T->nonil && lval && !li && !hval ) { \ - scanloop(CAND,READ,(COMP(v,> ,vl) ) ); \ - } else \ - if (!anti && b->T->nonil && lval && li && !hval ) { \ - scanloop(CAND,READ,(COMP(v,>=,vl) ) ); \ - } else \ - if (!anti && b->T->nonil && !lval && hval && !hi) { \ - scanloop(CAND,READ,( COMP(v,< ,vh)) ); \ - } else \ - if (!anti && b->T->nonil && !lval && hval && hi) { \ - scanloop(CAND,READ,( COMP(v,<=,vh)) ); \ - } else \ - if (!anti && !b->T->nonil && lval && !li && hval && !hi) { \ - scanloop(CAND,READ,(COMP(v,> ,vl) && COMP(v,< ,vh)) NIL2(v)); \ - } else \ - if (!anti && !b->T->nonil && lval && !li && hval && hi) { \ - scanloop(CAND,READ,(COMP(v,> ,vl) && COMP(v,<=,vh)) NIL2(v)); \ - } else \ - if (!anti && !b->T->nonil && lval && li && hval && !hi) { \ - scanloop(CAND,READ,(COMP(v,>=,vl) && COMP(v,< ,vh)) NIL2(v)); \ - } else \ - if (!anti && !b->T->nonil && lval && li && hval && hi) { \ - scanloop(CAND,READ,(COMP(v,>=,vl) && COMP(v,<=,vh)) NIL2(v)); \ - } else \ - if (!anti && !b->T->nonil && lval && !li && !hval ) { \ - scanloop(CAND,READ,(COMP(v,> ,vl) ) NIL2(v)); \ - } else \ - if (!anti && !b->T->nonil && lval && li && !hval ) { \ - scanloop(CAND,READ,(COMP(v,>=,vl) ) NIL2(v)); \ - } else \ - if (!anti && !b->T->nonil && !lval && hval && !hi) { \ - scanloop(CAND,READ,( COMP(v,< ,vh)) NIL1(v)); \ - } else \ - if (!anti && !b->T->nonil && !lval && hval && hi) { \ - scanloop(CAND,READ,( COMP(v,<=,vh)) NIL1(v)); \ - } else \ - if (!anti && !b->T->nonil && !lval && !hval ) { \ - scanloop(CAND,READ, COMP(v,!=,nil) ); \ - } else \ - assert(0); \ -} while (0) - -/* local variables for known fixed-width types */ -#define scaninit_fix(TYPE) \ - TYPE vl = *(TYPE *) tl; \ - TYPE vh = *(TYPE *) th; \ - TYPE v; \ - TYPE nil = TYPE##_nil; \ - const TYPE *src = (const TYPE *) Tloc(b, 0); - -/* local variables for generic types */ -#define scaninit_var(TYPE) \ - const void *vl = tl; \ - const void *vh = th; \ - const void *v; \ - const void *nil = ATOMnilptr(b->ttype); \ - int (*cmp)(const void *, const void *) = BATatoms[b->ttype].atomCmp;\ - BATiter bi = bat_iterator(b); \ - -/* various comparison calls for known fixed-width types */ -#define scancomp_fix(l,o,r) (l) o (r) -#define scannil1_fix(v) && scancomp_fix(v,!=,nil) -#define scannil2_fix(v) - -/* various comparison calls for generic types */ -#define scancomp_var(l,o,r) (*cmp)((l),(r)) o 0 -#define scannil1_var(v) && scancomp_var(v,!=,nil) -#define scannil2_var(v) scannil1_var(v) - /* argument list for type-specific core scan select function call */ #define scanargs \ b, s, bn, tl, th, li, hi, equi, anti, lval, hval, \ p, q, cnt, off, dst, candlist, maximum +#define PREVVALUEbte(x) ((x) - 1) _______________________________________________ checkin-list mailing list checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
