Changeset: 803b95c05ab3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=803b95c05ab3
Added Files:
sql/jdbc/tests/Tests/BugSetQueryTimeout_Bug_3357.SQL.bat
sql/jdbc/tests/Tests/BugSetQueryTimeout_Bug_3357.SQL.sh
sql/jdbc/tests/Tests/BugSetQueryTimeout_Bug_3357.stable.err
sql/jdbc/tests/Tests/BugSetQueryTimeout_Bug_3357.stable.out
sql/test/BugTracker-2016/Tests/set-negative-querytimeout.Bug-6070.sql
sql/test/BugTracker-2016/Tests/set-negative-querytimeout.Bug-6070.stable.err
sql/test/BugTracker-2016/Tests/set-negative-querytimeout.Bug-6070.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/mapilib/Makefile.ag
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
configure.ag
debian/changelog
gdk/gdk_atoms.c
gdk/gdk_join.c
gdk/gdk_select.c
gdk/gdk_utils.c
gdk/libbat.rc
libversions
monetdb5/modules/atoms/json.c
monetdb5/modules/mal/clients.c
monetdb5/tools/libmonetdb5.rc
sql/backends/monet5/sql_gencode.c
sql/benchmarks/tpch/Tests/01-explain.stable.out
sql/benchmarks/tpch/Tests/01-explain.stable.out.int128
sql/benchmarks/tpch/Tests/01-plan.stable.out
sql/benchmarks/tpch/Tests/02-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/03-explain.stable.out
sql/benchmarks/tpch/Tests/05-explain.stable.out
sql/benchmarks/tpch/Tests/05-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/06-explain.stable.out
sql/benchmarks/tpch/Tests/07-explain.stable.out
sql/benchmarks/tpch/Tests/08-explain.stable.out
sql/benchmarks/tpch/Tests/09-explain.stable.out
sql/benchmarks/tpch/Tests/10-explain.stable.out
sql/benchmarks/tpch/Tests/11-explain.stable.out
sql/benchmarks/tpch/Tests/12-explain.stable.out
sql/benchmarks/tpch/Tests/14-explain.stable.out
sql/benchmarks/tpch/Tests/14-explain.stable.out.int128
sql/benchmarks/tpch/Tests/14-plan.stable.out
sql/benchmarks/tpch/Tests/15-explain.stable.out
sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/17-explain.stable.out
sql/benchmarks/tpch/Tests/17-explain.stable.out.int128
sql/benchmarks/tpch/Tests/18-explain.stable.out
sql/benchmarks/tpch/Tests/19-explain.stable.out
sql/benchmarks/tpch/Tests/20-explain.stable.out
sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/20-explain.stable.out.int128
sql/benchmarks/tpch/Tests/20-plan.stable.out
sql/benchmarks/tpch/Tests/22-explain.stable.out
sql/jdbc/tests/Tests/All
sql/test/BugTracker-2016/Tests/All
vertoo.data
Branch: oltp
Log Message:
Merge with default
diffs (truncated from 5979 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -637,3 +637,6 @@ 731a25ce40993c0d73ee4fcefb286b9a0a2e0981
f16cdfed96bdc0f3324f8ced85a8b74c67f4dc9b Jun2016_11
731a25ce40993c0d73ee4fcefb286b9a0a2e0981 Jun2016_SP2_release
f16cdfed96bdc0f3324f8ced85a8b74c67f4dc9b Jun2016_SP2_release
+293b452cd1e5964d820f7d6c538e06507e575d88 Jun2016_13
+f16cdfed96bdc0f3324f8ced85a8b74c67f4dc9b Jun2016_SP2_release
+293b452cd1e5964d820f7d6c538e06507e575d88 Jun2016_SP2_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -899,6 +899,17 @@ rm -f %{buildroot}%{_bindir}/Maddlog
%postun -p /sbin/ldconfig
%changelog
+* Fri Oct 07 2016 Sjoerd Mullender <sjo...@acm.org> - 11.23.13-20161007
+- Rebuilt.
+- BZ#4058: Server crashes with a particular conditional query
+- BZ#4064: Assertion: column not found
+- BZ#4067: Relevant column name not printed when a CSV parsing error
+ occurs
+- BZ#4070: Extra condition in join predicate of explicit join produces
+ wrong MAL code
+- BZ#4074: Cannot use prepared statements when caching disabled
+- BZ#6065: CTE with row number and union fails within MAL
+
* Wed Sep 28 2016 Sjoerd Mullender <sjo...@acm.org> - 11.23.11-20160928
- Rebuilt.
diff --git a/clients/mapilib/Makefile.ag b/clients/mapilib/Makefile.ag
--- a/clients/mapilib/Makefile.ag
+++ b/clients/mapilib/Makefile.ag
@@ -7,7 +7,7 @@
MTSAFE
INCLUDES = ../../common/options ../../common/stream ../../common/utils \
- $(MSGCONTROL_FLAGS)
+ $(MSGCONTROL_FLAGS) $(openssl_CFLAGS)
lib_mapi = {
VERSION = $(MAPI_VERSION)
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -1847,16 +1847,20 @@ AS_VAR_IF([enable_pyintegration], [no],
enable_pyintegration=yes],
[AC_MSG_ERROR([--enable-pyintegration value must be
yes|no|auto|absolute path of python-config])])
AS_VAR_IF([have_pyconfig], [], [
- AC_PATH_PROG([PYCMD], [python-config], [no], [$PATH])
- AS_VAR_IF([PYCMD], [],
- [AS_VAR_IF([enable_pyintegration], [yes],
+ AC_PATH_PROG([PYCMD], [python2-config], [no], [$PATH])
+ AS_VAR_IF([PYCMD], [no], [
+ AC_PATH_PROG([PYCMD2], [python-config], [no], [$PATH])
+ AS_VAR_IF([PYCMD2], [no], [
+ AS_VAR_IF([enable_pyintegration], [yes],
[AC_MSG_ERROR([python-config library required
for Python integration support])],
[have_libpy="no"
why_have_libpy="(python-config command not
found)"
- enable_pyintegration=no
- disable_pyintegration="(python-config command
not found)"])])],
- [PYCMD="$have_pyconfig"])
-
+ enable_pyintegration="no"
+ disable_pyintegration="(python-config command
not found)"
+ ])
+ ], [PYCMD="$PYCMD2"])
+ ], [])
+ ], [PYCMD="$have_pyconfig"])
AS_VAR_IF([have_pyversion], [],
[PYTHON_CMD=$PYTHON2],
[PYTHON_CMD=$have_pyversion])
@@ -1872,14 +1876,14 @@ AS_VAR_IF([enable_pyintegration], [no],
[AC_MSG_ERROR([numpy version >= 1.7.0 required for
Python integration support])],
[have_libpy="no"
why_have_libpy="(numpy version >= 1.7.0 not found)"
- enable_pyintegration=no
+ enable_pyintegration="no"
disable_pyintegration="(numpy version >= 1.7.0 not
found)"])],
[test "x$NUMPYHEADERS" = xFalse ],
[AS_VAR_IF([enable_pyintegration], [yes],
[AC_MSG_ERROR([numpy/arrayobject.h not found])],
[have_libpy="no"
why_have_libpy="(numpy/arrayobject.h not found)"
- enable_pyintegration=no
+ enable_pyintegration="no"
disable_pyintegration="(numpy/arrayobject.h not
found)"])],
[libpy_CFLAGS=`$PYTHON_CMD -c "from distutils.sysconfig import
get_python_inc; import numpy; print(' -I' + get_python_inc() + ' -I' +
numpy.get_include());"`
libpy_LIBS=`$PYCMD --ldflags`
@@ -1893,7 +1897,7 @@ AS_VAR_IF([enable_pyintegration], [no],
[AC_MSG_ERROR([Python.h not found])],
[have_libpy="no"
why_have_libpy="Python.h not found"
- enable_pyintegration=no
+ enable_pyintegration="no"
disable_pyintegration="Python.h not
found"])])])])
AM_CONDITIONAL([HAVE_LIBPY], [test x"$have_libpy" != xno])
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+monetdb (11.23.13) unstable; urgency=low
+
+ * Rebuilt.
+ * BZ#4058: Server crashes with a particular conditional query
+ * BZ#4064: Assertion: column not found
+ * BZ#4067: Relevant column name not printed when a CSV parsing error
+ occurs
+ * BZ#4070: Extra condition in join predicate of explicit join produces
+ wrong MAL code
+ * BZ#4074: Cannot use prepared statements when caching disabled
+ * BZ#6065: CTE with row number and union fails within MAL
+
+ -- Sjoerd Mullender <sjo...@acm.org> Fri, 07 Oct 2016 11:01:07 +0200
+
monetdb (11.23.11) unstable; urgency=low
* Rebuilt.
diff --git a/gdk/gdk_atoms.c b/gdk/gdk_atoms.c
--- a/gdk/gdk_atoms.c
+++ b/gdk/gdk_atoms.c
@@ -499,7 +499,8 @@ bitToStr(char **dst, int *len, const bit
static bit *
bitRead(bit *a, stream *s, size_t cnt)
{
- mnstr_read(s, (char *) a, 1, cnt);
+ if (mnstr_read(s, (char *) a, 1, cnt) < 0)
+ return NULL;
return mnstr_errnr(s) ? NULL : a;
}
diff --git a/gdk/gdk_join.c b/gdk/gdk_join.c
--- a/gdk/gdk_join.c
+++ b/gdk/gdk_join.c
@@ -136,9 +136,9 @@ joininitresults(BAT **r1p, BAT **r2p, BU
if (lcnt == 0 || rcnt == 0)
maxsize = nil_on_miss ? lcnt : 0;
else if (BUN_MAX / lcnt >= rcnt)
+ maxsize = lcnt * rcnt;
+ else
maxsize = BUN_MAX;
- else
- maxsize = lcnt * rcnt;
}
size = estimate == BUN_NONE ? lcnt : estimate;
if (size > maxsize)
diff --git a/gdk/gdk_select.c b/gdk/gdk_select.c
--- a/gdk/gdk_select.c
+++ b/gdk/gdk_select.c
@@ -374,7 +374,7 @@ do {
\
if (BATcapacity(bn) < maximum) { \
impsloop(CAND, TEST, \
buninsfix(bn, dst, cnt, o, \
- (BUN) ((dbl) cnt / (dbl) (p-r) \
+ (BUN) ((dbl) cnt / (dbl) (p == r ? 1 : p -
r) \
* (dbl) (q-p) * 1.1 + 1024), \
BATcapacity(bn) + q - p, BUN_NONE)); \
} else { \
@@ -439,7 +439,7 @@ do {
\
v = src[o-off]; \
if (TEST) { \
buninsfix(bn, dst, cnt, o, \
- (BUN) ((dbl) cnt / (dbl) (p-r) \
+ (BUN) ((dbl) cnt / (dbl) (p == r ? 1
: p - r) \
* (dbl) (q-p) * 1.1 + 1024), \
BATcapacity(bn) + q - p, BUN_NONE); \
cnt++; \
@@ -606,7 +606,7 @@ candscan_any (BAT *b, BAT *s, BAT *bn, c
v = BUNtail(bi,(BUN)(o-off));
if ((*cmp)(tl, v) == 0) {
buninsfix(bn, dst, cnt, o,
- (BUN) ((dbl) cnt / (dbl) (p-r)
+ (BUN) ((dbl) cnt / (dbl) (p == r ? 1
: p - r)
* (dbl) (q-p) * 1.1 + 1024),
BATcapacity(bn) + q - p, BUN_NONE);
cnt++;
@@ -630,7 +630,7 @@ candscan_any (BAT *b, BAT *s, BAT *bn, c
((c = (*cmp)(th, v)) < 0 ||
(!hi && c == 0))))) {
buninsfix(bn, dst, cnt, o,
- (BUN) ((dbl) cnt / (dbl) (p-r)
+ (BUN) ((dbl) cnt / (dbl) (p == r ? 1
: p - r)
* (dbl) (q-p) * 1.1 + 1024),
BATcapacity(bn) + q - p, BUN_NONE);
cnt++;
@@ -654,7 +654,7 @@ candscan_any (BAT *b, BAT *s, BAT *bn, c
(c = cmp(th, v)) > 0 ||
(hi && c == 0)))) {
buninsfix(bn, dst, cnt, o,
- (BUN) ((dbl) cnt / (dbl) (p-r)
+ (BUN) ((dbl) cnt / (dbl) (p == r ? 1
: p - r)
* (dbl) (q-p) * 1.1 + 1024),
BATcapacity(bn) + q - p, BUN_NONE);
cnt++;
@@ -694,7 +694,7 @@ fullscan_any(BAT *b, BAT *s, BAT *bn, co
v = BUNtail(bi,(BUN)(o-off));
if ((*cmp)(tl, v) == 0) {
buninsfix(bn, dst, cnt, o,
- (BUN) ((dbl) cnt / (dbl) (p-r)
+ (BUN) ((dbl) cnt / (dbl) (p == r ? 1
: p - r)
* (dbl) (q-p) * 1.1 + 1024),
BATcapacity(bn) + q - p, BUN_NONE);
cnt++;
@@ -718,7 +718,7 @@ fullscan_any(BAT *b, BAT *s, BAT *bn, co
((c = (*cmp)(th, v)) < 0 ||
(!hi && c == 0))))) {
buninsfix(bn, dst, cnt, o,
- (BUN) ((dbl) cnt / (dbl) (p-r)
+ (BUN) ((dbl) cnt / (dbl) (p == r ? 1
: p - r)
* (dbl) (q-p) * 1.1 + 1024),
BATcapacity(bn) + q - p, BUN_NONE);
cnt++;
@@ -742,7 +742,7 @@ fullscan_any(BAT *b, BAT *s, BAT *bn, co
(c = cmp(th, v)) > 0 ||
(hi && c == 0)))) {
buninsfix(bn, dst, cnt, o,
- (BUN) ((dbl) cnt / (dbl) (p-r)
+ (BUN) ((dbl) cnt / (dbl) (p == r ? 1
: p - r)
* (dbl) (q-p) * 1.1 + 1024),
BATcapacity(bn) + q - p, BUN_NONE);
cnt++;
@@ -783,7 +783,7 @@ fullscan_str(BAT *b, BAT *s, BAT *bn, co
while (p < q) {
if (ptr[p] == pos) {
buninsfix(bn, dst, cnt, o,
- (BUN) ((dbl) cnt / (dbl) (p-r)
+ (BUN) ((dbl) cnt / (dbl) (p == r ? 1
: p - r)
* (dbl) (q-p) * 1.1 + 1024),
BATcapacity(bn) + q - p, BUN_NONE);
cnt++;
@@ -799,7 +799,7 @@ fullscan_str(BAT *b, BAT *s, BAT *bn, co
while (p < q) {
if (ptr[p] == pos) {
buninsfix(bn, dst, cnt, o,
- (BUN) ((dbl) cnt / (dbl) (p-r)
+ (BUN) ((dbl) cnt / (dbl) (p == r ? 1
: p - r)
* (dbl) (q-p) * 1.1 + 1024),
BATcapacity(bn) + q - p, BUN_NONE);
cnt++;
@@ -815,7 +815,7 @@ fullscan_str(BAT *b, BAT *s, BAT *bn, co
while (p < q) {
if (ptr[p] == pos) {
buninsfix(bn, dst, cnt, o,
- (BUN) ((dbl) cnt / (dbl) (p-r)
+ (BUN) ((dbl) cnt / (dbl) (p == r ? 1
: p - r)
* (dbl) (q-p) * 1.1 + 1024),
BATcapacity(bn) + q - p, BUN_NONE);
cnt++;
@@ -831,7 +831,7 @@ fullscan_str(BAT *b, BAT *s, BAT *bn, co
while (p < q) {
if (ptr[p] == pos) {
buninsfix(bn, dst, cnt, o,
- (BUN) ((dbl) cnt / (dbl) (p-r)
+ (BUN) ((dbl) cnt / (dbl) (p == r ? 1
: p - r)
* (dbl) (q-p) * 1.1 + 1024),
BATcapacity(bn) + q - p, BUN_NONE);
cnt++;
@@ -2292,7 +2292,11 @@ rangejoin(BAT *r1, BAT *r2, BAT *l, BAT
cnt + maximum, 1);
break;
}
- case TYPE_int: {
+ case TYPE_int:
+#if SIZEOF_OID == SIZEOF_INT
+ case TYPE_oid:
+#endif
+ {
int vl, vh;
if ((vl = *(int *) vrl) == int_nil)
continue;
@@ -2304,9 +2308,18 @@ rangejoin(BAT *r1, BAT *r2, BAT *l, BAT
vl = NEXTVALUEint(vl);
}
if (!hi) {
- if (vh == MINVALUEint)
- continue;
- vh = PREVVALUEint(vh);
+#if SIZEOF_OID == SIZEOF_INT
+ if (t == TYPE_oid) {
+ if (vh == MINVALUEoid)
+ continue;
+ vh = PREVVALUEoid(vh);
+ } else
+#endif
+ {
+ if (vh == MINVALUEint)
+ continue;
+ vh = PREVVALUEint(vh);
+ }
}
if (vl > vh)
continue;
@@ -2324,62 +2337,11 @@ rangejoin(BAT *r1, BAT *r2, BAT *l, BAT
cnt + maximum, 1);
break;
}
- case TYPE_oid: {
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
