Changeset: c23392d518b5 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c23392d518b5 Added Files: common/utils/math_private.h common/utils/s_nextafterf.c monetdb5/tests/gdkTests/Tests/selecttst.mal monetdb5/tests/gdkTests/Tests/selecttst.stable.err monetdb5/tests/gdkTests/Tests/selecttst.stable.out 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/Tests/exports.stable.out 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 common/utils/Makefile.ag common/utils/mutils.c configure.ag debian/changelog debian/rules gdk/gdk.h gdk/gdk_bat.c gdk/gdk_group.c gdk/gdk_posix.c gdk/gdk_posix.h gdk/gdk_select.c gdk/gdk_storage.c gdk/gdk_utils.c gdk/libbat.rc java/ChangeLog-Archive java/ChangeLog.Oct2012 libversions monetdb5/modules/mal/mal_io.c 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/tests/gdkTests/Tests/All monetdb5/tools/libmonetdb5.rc sql/ChangeLog-Archive sql/ChangeLog.Oct2012 testing/Mtest.py.in vertoo.data Branch: default Log Message:
merge with master diffs (truncated from 2672 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 @@ -632,7 +632,6 @@ developer, but if you do want to test, t --enable-jdbc=no \ --enable-merocontrol=no \ --enable-monetdb5=yes \ - --enable-noexpand=no \ --enable-odbc=yes \ --enable-oid32=%{?oid32:yes}%{!?oid32:no} \ --enable-optimize=yes \ @@ -693,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/Tests/exports.stable.out b/clients/Tests/exports.stable.out --- a/clients/Tests/exports.stable.out +++ b/clients/Tests/exports.stable.out @@ -263,7 +263,7 @@ BAT *GDKkey; void *GDKmalloc(size_t size); size_t GDKmem_cursize(void); size_t GDKmem_inuse(void); -void *GDKmmap(const char *path, int mode, off_t off, size_t len); +void *GDKmmap(const char *path, int mode, size_t len); int GDKms(void); int GDKnr_threads; void GDKqsort(void *h, void *t, const void *base, size_t n, int hs, int ts, int tpe); @@ -311,7 +311,7 @@ void MT_locktrace_end(void); char *MT_locktrace_nme[65536]; void MT_locktrace_start(void); struct Mallinfo MT_mallinfo(void); -void *MT_mmap(const char *path, int mode, off_t off, size_t len); +void *MT_mmap(const char *path, int mode, size_t len); int MT_munmap(void *p, size_t len); int MT_path_absolute(const char *path); void MT_sleep_ms(unsigned int ms); @@ -1584,6 +1584,7 @@ int MALkeyword(Client cntxt, str kw, int int MALlookahead(Client cntxt, str kw, int length); str MALoptimizer(Client c); str MALparser(Client c); +str MALpass(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str MALpipeline(Client c); str MALreader(Client c); void MALresourceFairness(Client cntxt, MalBlkPtr mb, lng usec); @@ -2943,6 +2944,7 @@ str packRef; str parseError(Client cntxt, str msg); int parseMAL(Client cntxt, Symbol curPrg); str partitionRef; +str passRef; str pcreRef; void pcre_del(Heap *h, var_t *index); int pcre_fromstr(str instr, int *l, pcre **val); 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/common/utils/Makefile.ag b/common/utils/Makefile.ag --- a/common/utils/Makefile.ag +++ b/common/utils/Makefile.ag @@ -40,3 +40,5 @@ lib_msabaoth = { NOINST SOURCES = msabaoth.h msabaoth.c } + +EXTRA_DIST = s_nextafterf.c math_private.h diff --git a/common/utils/math_private.h b/common/utils/math_private.h new file mode 100644 --- /dev/null +++ b/common/utils/math_private.h @@ -0,0 +1,224 @@ +/* + * ==================================================== + * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. + * + * Developed at SunPro, a Sun Microsystems, Inc. business. + * Permission to use, copy, modify, and distribute this + * software is freely granted, provided that this notice + * is preserved. + * ==================================================== + */ + +#ifndef _MATH_PRIVATE_H_ +#define _MATH_PRIVATE_H_ + +#include <sys/types.h> + +/* The original fdlibm code used statements like: + n0 = ((*(int*)&one)>>29)^1; * index of high word * + ix0 = *(n0+(int*)&x); * high word of x * + ix1 = *((1-n0)+(int*)&x); * low word of x * + to dig two 32 bit words out of the 64 bit IEEE floating point + value. That is non-ANSI, and, moreover, the gcc instruction + scheduler gets it wrong. We instead use the following macros. + Unlike the original code, we determine the endianness at compile + time, not at run time; I don't see much benefit to selecting + endianness at run time. */ + +/* A union which permits us to convert between a double and two 32 bit + ints. */ + +/* + * The ARM ports are little endian except for the FPA word order which is + * big endian. + */ + +#if (BYTE_ORDER == BIG_ENDIAN) || (defined(__arm__) && !defined(__VFP_FP__)) + +typedef union +{ + double value; + struct + { + u_int32_t msw; + u_int32_t lsw; + } parts; +} ieee_double_shape_type; + +#endif + +#if (BYTE_ORDER == LITTLE_ENDIAN) && \ + !(defined(__arm__) && !defined(__VFP_FP__)) + +typedef union +{ + double value; + struct + { + u_int32_t lsw; + u_int32_t msw; + } parts; +} ieee_double_shape_type; + +#endif + +/* Get two 32 bit ints from a double. */ + +#define EXTRACT_WORDS(ix0,ix1,d) \ +do { \ + ieee_double_shape_type ew_u; \ + ew_u.value = (d); \ + (ix0) = ew_u.parts.msw; \ + (ix1) = ew_u.parts.lsw; \ +} while (/*CONSTCOND*/0) + +/* Get the more significant 32 bit int from a double. */ + +#define GET_HIGH_WORD(i,d) \ +do { \ + ieee_double_shape_type gh_u; \ + gh_u.value = (d); \ + (i) = gh_u.parts.msw; \ +} while (/*CONSTCOND*/0) + +/* Get the less significant 32 bit int from a double. */ + +#define GET_LOW_WORD(i,d) \ +do { \ + ieee_double_shape_type gl_u; \ + gl_u.value = (d); \ + (i) = gl_u.parts.lsw; \ +} while (/*CONSTCOND*/0) + +/* Set a double from two 32 bit ints. */ + +#define INSERT_WORDS(d,ix0,ix1) \ +do { \ + ieee_double_shape_type iw_u; \ + iw_u.parts.msw = (ix0); \ + iw_u.parts.lsw = (ix1); \ + (d) = iw_u.value; \ +} while (/*CONSTCOND*/0) + +/* Set the more significant 32 bits of a double from an int. */ + +#define SET_HIGH_WORD(d,v) \ +do { \ + ieee_double_shape_type sh_u; \ + sh_u.value = (d); \ + sh_u.parts.msw = (v); \ + (d) = sh_u.value; \ +} while (/*CONSTCOND*/0) + +/* Set the less significant 32 bits of a double from an int. */ + +#define SET_LOW_WORD(d,v) \ +do { \ + ieee_double_shape_type sl_u; \ + sl_u.value = (d); \ + sl_u.parts.lsw = (v); \ + (d) = sl_u.value; \ +} while (/*CONSTCOND*/0) + +/* A union which permits us to convert between a float and a 32 bit + int. */ + +typedef union +{ + float value; + u_int32_t word; +} ieee_float_shape_type; + +/* Get a 32 bit int from a float. */ + +#define GET_FLOAT_WORD(i,d) \ +do { \ + ieee_float_shape_type gf_u; \ + gf_u.value = (d); \ + (i) = gf_u.word; \ +} while (/*CONSTCOND*/0) + +/* Set a float from a 32 bit int. */ + +#define SET_FLOAT_WORD(d,i) \ +do { \ + ieee_float_shape_type sf_u; \ + sf_u.word = (i); \ + (d) = sf_u.value; \ +} while (/*CONSTCOND*/0) + +/* ieee style elementary functions */ +extern double __ieee754_sqrt(double); +extern double __ieee754_acos(double); +extern double __ieee754_acosh(double); +extern double __ieee754_log(double); +extern double __ieee754_atanh(double); +extern double __ieee754_asin(double); +extern double __ieee754_atan2(double,double); +extern double __ieee754_exp(double); +extern double __ieee754_cosh(double); +extern double __ieee754_fmod(double,double); +extern double __ieee754_pow(double,double); +extern double __ieee754_lgamma_r(double,int *); +extern double __ieee754_gamma_r(double,int *); +extern double __ieee754_lgamma(double); +extern double __ieee754_gamma(double); _______________________________________________ checkin-list mailing list checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
