Changeset: e7ee07fd1877 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e7ee07fd1877
Added Files:
sql/test/BugTracker-2018/Tests/All
sql/test/BugTracker-2018/Tests/pyUDF-crash.Bug-6508.sql
sql/test/BugTracker-2018/Tests/pyUDF-crash.Bug-6508.stable.err
sql/test/BugTracker-2018/Tests/pyUDF-crash.Bug-6508.stable.out
Modified Files:
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
gdk/libbat.rc
monetdb5/modules/kernel/algebra.c
monetdb5/tools/libmonetdb5.rc
sql/backends/monet5/UDF/pyapi/conversion.c
sql/server/rel_optimizer.c
Branch: default
Log Message:
Merge with Jul2017 branch.
diffs (truncated from 330 to 300 lines):
diff --git a/clients/mapilib/mapi.rc b/clients/mapilib/mapi.rc
--- a/clients/mapilib/mapi.rc
+++ b/clients/mapilib/mapi.rc
@@ -23,7 +23,7 @@ BEGIN
// Maintained via vertoo. Please don't modify by hand!
// Contact monetdb-develop...@lists.sourceforge.net for details and/or
assistance.
VALUE "InternalName", "Mapi\0"
- VALUE "LegalCopyright", "Copyright © MonetDB B.V. 2008-2017\0"
+ VALUE "LegalCopyright", "Copyright © MonetDB B.V. 2008-2018\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "Mapi.dll\0"
VALUE "PrivateBuild", "\0"
diff --git a/clients/odbc/driver/driver.rc b/clients/odbc/driver/driver.rc
--- a/clients/odbc/driver/driver.rc
+++ b/clients/odbc/driver/driver.rc
@@ -23,7 +23,7 @@ BEGIN
// Maintained via vertoo. Please don't modify by hand!
// Contact monetdb-develop...@lists.sourceforge.net for details and/or
assistance.
VALUE "InternalName", "libMonetODBC\0"
- VALUE "LegalCopyright", "Copyright © MonetDB B.V. 2008-2017\0"
+ VALUE "LegalCopyright", "Copyright © MonetDB B.V. 2008-2018\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "libMonetODBC.dll\0"
VALUE "PrivateBuild", "\0"
diff --git a/clients/odbc/winsetup/setup.rc b/clients/odbc/winsetup/setup.rc
--- a/clients/odbc/winsetup/setup.rc
+++ b/clients/odbc/winsetup/setup.rc
@@ -82,7 +82,7 @@ BEGIN
VALUE "FileDescription", "MonetDB ODBC Setup DLL"
VALUE "FileVersion", "11.28.0"
VALUE "InternalName", "libMonetODBCs.dll"
- VALUE "LegalCopyright", "Copyright © MonetDB B.V. 2008-2017"
+ VALUE "LegalCopyright", "Copyright © MonetDB B.V. 2008-2018"
VALUE "OriginalFilename", "libMonetODBCs.dll"
VALUE "ProductName", "MonetDB SQL Server"
VALUE "ProductVersion", "11.28.0"
diff --git a/gdk/libbat.rc b/gdk/libbat.rc
--- a/gdk/libbat.rc
+++ b/gdk/libbat.rc
@@ -23,7 +23,7 @@ BEGIN
// Maintained via vertoo. Please don't modify by hand!
// Contact monetdb-develop...@lists.sourceforge.net for details and/or
assistance.
VALUE "InternalName", "libbat\0"
- VALUE "LegalCopyright", "Copyright © MonetDB B.V. 2008-2017\0"
+ VALUE "LegalCopyright", "Copyright © MonetDB B.V. 2008-2018\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "libbat.dll\0"
VALUE "PrivateBuild", "\0"
diff --git a/monetdb5/modules/kernel/algebra.c
b/monetdb5/modules/kernel/algebra.c
--- a/monetdb5/modules/kernel/algebra.c
+++ b/monetdb5/modules/kernel/algebra.c
@@ -508,7 +508,7 @@ ALGintersect(bat *r1, const bat *lid, co
{
return do_join(r1, NULL, lid, rid, NULL, slid, srid, 0, NULL, NULL, 0,
0,
nil_matches, estimate,
- BATsemijoin, NULL, NULL, NULL, NULL,
"algebra.difference");
+ BATsemijoin, NULL, NULL, NULL, NULL,
"algebra.intersect");
}
/* algebra.firstn(b:bat[:any],
diff --git a/monetdb5/tools/libmonetdb5.rc b/monetdb5/tools/libmonetdb5.rc
--- a/monetdb5/tools/libmonetdb5.rc
+++ b/monetdb5/tools/libmonetdb5.rc
@@ -23,7 +23,7 @@ BEGIN
// Maintained via vertoo. Please don't modify by hand!
// Contact monetdb-develop...@lists.sourceforge.net for details and/or
assistance.
VALUE "InternalName", "libmonetdb5\0"
- VALUE "LegalCopyright", "Copyright © MonetDB B.V. 2008-2017\0"
+ VALUE "LegalCopyright", "Copyright © MonetDB B.V. 2008-2018\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "libmonetdb5.dll\0"
VALUE "PrivateBuild", "\0"
diff --git a/sql/backends/monet5/UDF/pyapi/conversion.c
b/sql/backends/monet5/UDF/pyapi/conversion.c
--- a/sql/backends/monet5/UDF/pyapi/conversion.c
+++ b/sql/backends/monet5/UDF/pyapi/conversion.c
@@ -92,7 +92,7 @@ wrapup:
PyObject *PyMaskedArray_FromBAT(PyInput *inp, size_t t_start, size_t t_end,
char
**return_message, bool copy)
{
- BAT *b = inp->bat;
+ BAT *b;
char *msg;
PyObject *vararray;
@@ -100,6 +100,7 @@ PyObject *PyMaskedArray_FromBAT(PyInput
if (vararray == NULL) {
return NULL;
}
+ b = inp->bat;
// To deal with null values, we use the numpy masked array structure
// The masked array structure is an object with two arrays of equal
size, a
// data array and a mask array
@@ -183,13 +184,10 @@ PyObject *PyArrayObject_FromBAT(PyInput
SQLSTATE(PY000) "Failed to convert BAT.");
goto wrapup;
}
- BBPunfix(inp->bat->batCacheid);
- inp->bat = ret_bat;
+ b = ret_bat;
}
}
- b = inp->bat;
-
if (IsBlobType(inp->bat_type)) {
PyObject **data;
li = bat_iterator(b);
@@ -396,9 +394,13 @@ PyObject *PyArrayObject_FromBAT(PyInput
SQLSTATE(PY000)
"Failed to convert BAT to Numpy array.");
goto wrapup;
}
+ if (b != inp->bat)
+ BBPunfix(b->batCacheid);
return vararray;
wrapup:
*return_message = msg;
+ if (b != inp->bat)
+ BBPunfix(b->batCacheid);
return NULL;
}
@@ -407,7 +409,7 @@ wrapup:
tpe *bat_ptr = (tpe *)b->theap.base;
\
for (j = 0; j < count; j++) {
\
mask_data[j] = is_##tpe##_nil(bat_ptr[j]);
\
- found_nil = found_nil || mask_data[j];
\
+ found_nil |= mask_data[j];
\
}
\
}
@@ -425,7 +427,7 @@ PyObject *PyNullMask_FromBAT(BAT *b, siz
BATiter bi = bat_iterator(b);
bool *mask_data = (bool *)PyArray_DATA(nullmask);
- switch (ATOMstorage(getBatType(b->ttype))) {
+ switch (ATOMbasetype(getBatType(b->ttype))) {
case TYPE_bit:
CreateNullMask(bit);
break;
@@ -456,7 +458,7 @@ PyObject *PyNullMask_FromBAT(BAT *b, siz
int (*atomcmp)(const void *, const void *) =
ATOMcompare(b->ttype);
for (j = 0; j < count; j++) {
mask_data[j] = (*atomcmp)(BUNtail(bi,
(BUN)(j)), nil) == 0;
- found_nil = found_nil || mask_data[j];
+ found_nil |= mask_data[j];
}
}
}
diff --git a/sql/server/rel_optimizer.c b/sql/server/rel_optimizer.c
--- a/sql/server/rel_optimizer.c
+++ b/sql/server/rel_optimizer.c
@@ -8862,13 +8862,6 @@ rel_apply_rewrite(int *changes, mvc *sql
exp_label(sql->sa, col,
++sql->label);
append(r->exps, col);
}
- /*
- } else if (is_semi(rl->op)) {
- sql_rel *l = rl->l;
- if (!is_project(l->op))
- rl->l = l =
rel_project(sql->sa, l, rel_projections(sql, l, NULL, 1, 1));
- col = l->exps->t->data;
- */
} else if (!is_project(rl->op)) {
rl = rel_project(sql->sa, rl,
rel_projections(sql, rl, NULL, 1, 1));
r->l = rl;
diff --git a/sql/test/BugTracker-2018/Tests/All
b/sql/test/BugTracker-2018/Tests/All
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2018/Tests/All
@@ -0,0 +1,1 @@
+HAVE_LIBPY?pyUDF-crash.Bug-6508
diff --git a/sql/test/BugTracker-2018/Tests/pyUDF-crash.Bug-6508.sql
b/sql/test/BugTracker-2018/Tests/pyUDF-crash.Bug-6508.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2018/Tests/pyUDF-crash.Bug-6508.sql
@@ -0,0 +1,18 @@
+CREATE FUNCTION test_timestamp_with_nulls(actual_takeoff_datetime timestamp)
+RETURNS STRING LANGUAGE PYTHON {
+ import json
+ return json.dumps(actual_takeoff_datetime.tolist());
+};
+
+
+CREATE TABLE example (
+ "column1" timestamp
+);
+
+insert into example ("column1") values ('2017-01-01 00:00:01');
+insert into example ("column1") values (NULL);
+
+select test_timestamp_with_nulls("column1") from example;
+
+drop table example;
+drop function test_timestamp_with_nulls(timestamp);
diff --git a/sql/test/BugTracker-2018/Tests/pyUDF-crash.Bug-6508.stable.err
b/sql/test/BugTracker-2018/Tests/pyUDF-crash.Bug-6508.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2018/Tests/pyUDF-crash.Bug-6508.stable.err
@@ -0,0 +1,35 @@
+stderr of test 'pyUDF-crash.Bug-6508` in directory 'sql/test/BugTracker-2018`
itself:
+
+
+# 10:14:58 >
+# 10:14:58 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=34466" "--set"
"mapi_usock=/var/tmp/mtest-10982/.s.monetdb.34466" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/ufs/sjoerd/@Monet-stable/var/MonetDB/mTests_sql_test_BugTracker-2018"
"--set" "embedded_py=true"
+# 10:14:58 >
+
+# builtin opt gdk_dbpath = /ufs/sjoerd/@Monet-stable/var/monetdb5/dbfarm/demo
+# builtin opt gdk_debug = 0
+# builtin opt gdk_vmtrim = no
+# builtin opt monet_prompt = >
+# builtin opt monet_daemon = no
+# builtin opt mapi_port = 50000
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 34466
+# cmdline opt mapi_usock = /var/tmp/mtest-10982/.s.monetdb.34466
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/ufs/sjoerd/@Monet-stable/var/MonetDB/mTests_sql_test_BugTracker-2018
+# cmdline opt embedded_py = true
+# cmdline opt gdk_debug = 553648138
+
+# 10:14:58 >
+# 10:14:58 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-10982" "--port=34466"
+# 10:14:58 >
+
+
+# 10:14:59 >
+# 10:14:59 > "Done."
+# 10:14:59 >
+
diff --git a/sql/test/BugTracker-2018/Tests/pyUDF-crash.Bug-6508.stable.out
b/sql/test/BugTracker-2018/Tests/pyUDF-crash.Bug-6508.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2018/Tests/pyUDF-crash.Bug-6508.stable.out
@@ -0,0 +1,91 @@
+stdout of test 'pyUDF-crash.Bug-6508` in directory 'sql/test/BugTracker-2018`
itself:
+
+
+# 10:14:58 >
+# 10:14:58 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=34466" "--set"
"mapi_usock=/var/tmp/mtest-10982/.s.monetdb.34466" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/ufs/sjoerd/@Monet-stable/var/MonetDB/mTests_sql_test_BugTracker-2018"
"--set" "embedded_py=true"
+# 10:14:58 >
+
+# MonetDB 5 server v11.27.12 (hg id: 9d718c8b4e00)
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2018', using 8 threads
+# Compiled for x86_64-pc-linux-gnu/64bit with 128bit integers
+# Found 62.700 GiB available main-memory.
+# Copyright (c) 1993 - July 2008 CWI.
+# Copyright (c) August 2008 - 2018 MonetDB B.V., all rights reserved
+# Visit https://www.monetdb.org/ for further information
+# Listening for connection requests on
mapi:monetdb://methuselah.da.cwi.nl:34466/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-10982/.s.monetdb.34466
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+# MonetDB/Python2 module loaded
+
+Ready.
+# SQL catalog created, loading sql scripts once
+# loading sql script: 09_like.sql
+# loading sql script: 10_math.sql
+# loading sql script: 11_times.sql
+# loading sql script: 12_url.sql
+# loading sql script: 13_date.sql
+# loading sql script: 14_inet.sql
+# loading sql script: 15_querylog.sql
+# loading sql script: 16_tracelog.sql
+# loading sql script: 17_temporal.sql
+# loading sql script: 18_index.sql
+# loading sql script: 20_vacuum.sql
+# loading sql script: 21_dependency_functions.sql
+# loading sql script: 22_clients.sql
+# loading sql script: 23_skyserver.sql
+# loading sql script: 25_debug.sql
+# loading sql script: 26_sysmon.sql
+# loading sql script: 27_rejects.sql
+# loading sql script: 39_analytics.sql
+# loading sql script: 39_analytics_hge.sql
+# loading sql script: 40_geom.sql
+# loading sql script: 40_json.sql
+# loading sql script: 40_json_hge.sql
+# loading sql script: 41_md5sum.sql
+# loading sql script: 45_uuid.sql
+# loading sql script: 46_profiler.sql
+# loading sql script: 51_sys_schema_extension.sql
+# loading sql script: 72_fits.sql
+# loading sql script: 74_netcdf.sql
+# loading sql script: 75_lidar.sql
+# loading sql script: 75_shp.sql
+# loading sql script: 75_storagemodel.sql
+# loading sql script: 80_statistics.sql
+# loading sql script: 80_udf.sql
+# loading sql script: 80_udf_hge.sql
+# loading sql script: 85_bam.sql
+# loading sql script: 90_generator.sql
+# loading sql script: 90_generator_hge.sql
+# loading sql script: 99_system.sql
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
