Changeset: 15f6abfbff85 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=15f6abfbff85
Added Files:
sql/test/BugTracker-2017/Tests/crash_in_in_handling.Bug-6260.sql
sql/test/BugTracker-2017/Tests/crash_in_in_handling.Bug-6260.stable.err
sql/test/BugTracker-2017/Tests/crash_in_in_handling.Bug-6260.stable.out
sql/test/BugTracker-2017/Tests/function_and_mergetable.Bug-6288.sql
sql/test/BugTracker-2017/Tests/function_and_mergetable.Bug-6288.stable.err
sql/test/BugTracker-2017/Tests/function_and_mergetable.Bug-6288.stable.out
sql/test/leaks/Tests/check1.reqtests
sql/test/leaks/Tests/check1.sql
sql/test/leaks/Tests/check2.reqtests
sql/test/leaks/Tests/check3.reqtests
sql/test/leaks/Tests/check4.reqtests
sql/test/leaks/Tests/check5.reqtests
sql/test/leaks/Tests/drop3.reqtests
sql/test/leaks/Tests/initialize.sql
sql/test/leaks/Tests/initialize.stable.err
sql/test/leaks/Tests/initialize.stable.out
sql/test/leaks/Tests/select1.reqtests
sql/test/leaks/Tests/select2.reqtests
sql/test/leaks/Tests/temp1.reqtests
sql/test/leaks/Tests/temp2.reqtests
sql/test/leaks/Tests/temp3.reqtests
Removed Files:
sql/test/leaks/Tests/check0.sql
sql/test/leaks/Tests/check0.stable.err
sql/test/leaks/Tests/check0.stable.out
sql/test/leaks/Tests/check0.stable.out.int128
sql/test/leaks/Tests/check1.sql.src
Modified Files:
configure.ag
monetdb5/ChangeLog.Dec2016
monetdb5/mal/mal_parser.c
monetdb5/mal/mal_stack.c
sql/backends/monet5/rel_bin.c
sql/server/rel_optimizer.c
sql/server/rel_select.c
sql/server/sql_atom.c
sql/test/BugTracker-2016/Tests/storagemodel.stable.out
sql/test/BugTracker-2017/Tests/All
sql/test/leaks/Tests/All
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check2.sql.src
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check3.sql.src
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check4.sql.src
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check5.sql.src
sql/test/leaks/Tests/check5.stable.out
sql/test/leaks/Tests/drop3.stable.out
sql/test/leaks/Tests/drop3.stable.out.int128
sql/test/leaks/Tests/select1.stable.out
sql/test/leaks/Tests/select2.stable.out
sql/test/leaks/Tests/temp1.stable.out
sql/test/leaks/Tests/temp1.stable.out.int128
testing/Mtest.py.in
Branch: default
Log Message:
Merge with Dec2016 branch.
diffs (truncated from 1445 to 300 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -2382,6 +2382,21 @@ AS_CASE([$have_lidar],
AS_VAR_IF([have_liblas], [no], [], [
LIBLAS_INCS=`$LIBLAS_CONFIG --includes`
LIBLAS_LIBS=`$LIBLAS_CONFIG --libs`])
+ # liblas-config and liblas/capi/liblas.h could be in different
+ # packages (think Ubuntu) so we need to test for them both
+ AS_VAR_IF([have_liblas], [no], [], [
+ save_CPPFLAGS="$CPPFLAGS"
+ save_LDFLAGS="$LDFLAGS"
+ save_LIBS="$LIBS"
+ CPPFLAGS="$CPPFLAGS $LIBLAS_INCS"
+ LDFLAGS="$LDFLAGS $LIBLAS_LIBS"
+ LIBS=""
+ AC_CHECK_HEADER([liblas/capi/liblas.h], [],
+ [have_liblas=no
+ why_have_liblas="(liblas/capi/liblas.h header file not
found)"])
+ CPPFLAGS="$save_CPPFLAGS"
+ LDFLAGS="$save_LDFLAGS"
+ LIBS="$save_LIBS"])
# if lidar is enabled and liblas was not found abort
AS_VAR_IF([have_liblas], [no], [
AS_VAR_IF([have_lidar], [yes],
@@ -2402,12 +2417,9 @@ AC_SUBST([LIBLAS_RPM])
AC_SUBST([LIBLAS_INCS])
AC_SUBST([LIBLAS_LIBS])
-AC_MSG_CHECKING([enable lidar: $have_lidar])
AM_CONDITIONAL([HAVE_LIDAR], [test "x$have_lidar" = xyes -o "x$have_lidar" =
xauto])
-AC_MSG_CHECKING(['enable lidar: $have_lidar'])
-
# gdal
org_have_gdal="auto"
have_gdal=$org_have_gdal
diff --git a/monetdb5/ChangeLog.Dec2016 b/monetdb5/ChangeLog.Dec2016
--- a/monetdb5/ChangeLog.Dec2016
+++ b/monetdb5/ChangeLog.Dec2016
@@ -1,3 +1,7 @@
# ChangeLog file for MonetDB5
# This file is updated with Maddlog
+* Wed Apr 19 2017 Sjoerd Mullender <[email protected]>
+- Fixed a bug causing a crash during cleanup when mserver5 is stopped
+ with monetdb stop database.
+
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
@@ -1129,6 +1129,7 @@ fcnHeader(Client cntxt, int kind)
freeSymbol(cntxt->curprg);
cntxt->curprg = cntxt->backup;
cntxt->backup = 0;
+ curBlk = NULL;
}
parseError(cntxt, "',' expected\n");
skipToEnd(cntxt);
@@ -1144,6 +1145,7 @@ fcnHeader(Client cntxt, int kind)
freeSymbol(cntxt->curprg);
cntxt->curprg = cntxt->backup;
cntxt->backup = 0;
+ curBlk = NULL;
}
parseError(cntxt, "')' expected\n");
skipToEnd(cntxt);
@@ -1186,6 +1188,7 @@ fcnHeader(Client cntxt, int kind)
freeSymbol(cntxt->curprg);
cntxt->curprg = cntxt->backup;
cntxt->backup = 0;
+ curBlk = NULL;
}
parseError(cntxt, "',' expected\n");
skipToEnd(cntxt);
@@ -1205,6 +1208,7 @@ fcnHeader(Client cntxt, int kind)
freeSymbol(cntxt->curprg);
cntxt->curprg = cntxt->backup;
cntxt->backup = 0;
+ curBlk = NULL;
}
skipToEnd(cntxt);
return curBlk;
@@ -1226,6 +1230,7 @@ fcnHeader(Client cntxt, int kind)
freeSymbol(cntxt->curprg);
cntxt->curprg = cntxt->backup;
cntxt->backup = 0;
+ curBlk = NULL;
}
parseError(cntxt, "')' expected\n");
skipToEnd(cntxt);
diff --git a/monetdb5/mal/mal_stack.c b/monetdb5/mal/mal_stack.c
--- a/monetdb5/mal/mal_stack.c
+++ b/monetdb5/mal/mal_stack.c
@@ -96,8 +96,10 @@ reallocGlobalStack(MalStkPtr old, int cn
void
freeStack(MalStkPtr stk)
{
- clearStack(stk);
- GDKfree(stk);
+ if (stk != NULL) {
+ clearStack(stk);
+ GDKfree(stk);
+ }
}
void
diff --git a/sql/backends/monet5/rel_bin.c b/sql/backends/monet5/rel_bin.c
--- a/sql/backends/monet5/rel_bin.c
+++ b/sql/backends/monet5/rel_bin.c
@@ -4708,7 +4708,7 @@ rel2bin_ddl(backend *be, sql_rel *rel, l
sql->type = Q_TABLE;
} else if (rel->flag <= DDL_LIST) {
s = rel2bin_list(be, rel, refs);
- } else if (rel->flag <= DDL_PSM) {
+ } else if (rel->flag == DDL_PSM) {
s = rel2bin_psm(be, rel);
} else if (rel->flag <= DDL_ALTER_SEQ) {
s = rel2bin_seq(be, rel, refs);
@@ -5045,7 +5045,7 @@ rel_deps(sql_allocator *sa, sql_rel *r,
return rel_deps(sa, r->l, refs, l);
if (r->r)
return rel_deps(sa, r->r, refs, l);
- } else if (r->flag <= DDL_PSM) {
+ } else if (r->flag == DDL_PSM) {
exps_deps(sa, r->exps, refs, l);
} else if (r->flag <= DDL_ALTER_SEQ) {
if (r->l)
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
@@ -29,6 +29,7 @@ typedef struct global_props {
} global_props;
typedef sql_rel *(*rewrite_fptr)(int *changes, mvc *sql, sql_rel *rel);
+typedef sql_rel *(*rewrite_rel_fptr)(mvc *sql, sql_rel *rel, rewrite_fptr
rewriter, int *has_changes);
typedef int (*find_prop_fptr)(mvc *sql, sql_rel *rel);
static sql_rel * rewrite_topdown(mvc *sql, sql_rel *rel, rewrite_fptr
rewriter, int *has_changes);
@@ -8555,6 +8556,36 @@ rel_apply_rewrite(int *changes, mvc *sql
return rel;
}
+static sql_exp *
+rewrite_exp(mvc *sql, sql_exp *e, rewrite_rel_fptr rewrite_rel, rewrite_fptr
rewriter, int *has_changes)
+{
+ if (e->type != e_psm)
+ return e;
+ if (e->flag & PSM_SET || e->flag & PSM_VAR)
+ return e;
+ if (e->flag & PSM_RETURN) {
+ e->l = rewrite_exp(sql, e->l, rewrite_rel, rewriter,
has_changes);
+ }
+ if (e->flag & PSM_WHILE || e->flag & PSM_IF)
+ return e;
+ if (e->flag & PSM_REL)
+ e->l = rewrite_rel(sql, e->l, rewriter, has_changes);
+ return e;
+}
+
+static list *
+rewrite_exps(mvc *sql, list *l, rewrite_rel_fptr rewrite_rel, rewrite_fptr
rewriter, int *has_changes)
+{
+ node *n;
+
+ if (!l)
+ return l;
+ for(n = l->h; n; n = n->next)
+ n->data = rewrite_exp(sql, n->data, rewrite_rel, rewriter,
has_changes);
+ return l;
+}
+
+
static sql_rel *
rewrite(mvc *sql, sql_rel *rel, rewrite_fptr rewriter, int *has_changes)
{
@@ -8590,6 +8621,8 @@ rewrite(mvc *sql, sql_rel *rel, rewrite_
rel->l = rewrite(sql, rel->l, rewriter, has_changes);
break;
case op_ddl:
+ if (rel->flag == DDL_PSM && rel->exps)
+ rel->exps = rewrite_exps(sql, rel->exps, &rewrite,
rewriter, has_changes);
rel->l = rewrite(sql, rel->l, rewriter, has_changes);
if (rel->r)
rel->r = rewrite(sql, rel->r, rewriter, has_changes);
@@ -8647,6 +8680,8 @@ rewrite_topdown(mvc *sql, sql_rel *rel,
rel->l = rewrite_topdown(sql, rel->l, rewriter, has_changes);
break;
case op_ddl:
+ if (rel->flag == DDL_PSM && rel->exps)
+ rewrite_exps(sql, rel->exps, &rewrite_topdown,
rewriter, has_changes);
rel->l = rewrite_topdown(sql, rel->l, rewriter, has_changes);
if (rel->r)
rel->r = rewrite_topdown(sql, rel->r, rewriter,
has_changes);
diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c
--- a/sql/server/rel_select.c
+++ b/sql/server/rel_select.c
@@ -2066,7 +2066,7 @@ rel_logical_value_exp(mvc *sql, sql_rel
sql_rel *z = NULL, *rl;
r = rel_value_exp(sql, &z, sval, f, ek);
- if (l && IS_ANY(st->type->eclass)){
+ if (l && r && IS_ANY(st->type->eclass)){
l = rel_check_type(sql, exp_subtype(r),
l, type_equal);
if (l)
st = exp_subtype(l);
diff --git a/sql/server/sql_atom.c b/sql/server/sql_atom.c
--- a/sql/server/sql_atom.c
+++ b/sql/server/sql_atom.c
@@ -1211,12 +1211,13 @@ atom *
atom_mul(atom *a1, atom *a2)
{
ValRecord dst;
+
if (!EC_COMPUTE(a1->tpe.type->eclass))
return NULL;
if (a1->tpe.type->localtype == TYPE_dbl ||
a2->tpe.type->localtype == TYPE_dbl) {
ValRecord v1, v2;
- v1.vtype = v2.vtype = TYPE_dbl;
+ dst.vtype = v1.vtype = v2.vtype = TYPE_dbl;
v1.val.dval = a1->d;
v2.val.dval = a2->d;
if (VARcalcmul(&dst, &v1, &v2, 1) != GDK_SUCCEED)
diff --git a/sql/test/BugTracker-2017/Tests/All
b/sql/test/BugTracker-2017/Tests/All
--- a/sql/test/BugTracker-2017/Tests/All
+++ b/sql/test/BugTracker-2017/Tests/All
@@ -43,3 +43,5 @@ crash_correlated_subqueries_in_select.Bu
fullouterjoinfilter.Bug-6256
wrong_aggregation_count.Bug-6257
select.Bug-6259
+function_and_mergetable.Bug-6288
+crash_in_in_handling.Bug-6260
diff --git a/sql/test/BugTracker-2017/Tests/crash_in_in_handling.Bug-6260.sql
b/sql/test/BugTracker-2017/Tests/crash_in_in_handling.Bug-6260.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2017/Tests/crash_in_in_handling.Bug-6260.sql
@@ -0,0 +1,16 @@
+CREATE TABLE tab0(pk INTEGER PRIMARY KEY, col0 INTEGER, col1 FLOAT, col2 TEXT,
col3 INTEGER, col4 FLOAT, col5 TEXT);
+
+INSERT INTO tab0 VALUES(0,698,169.42,'apdbu',431,316.15,'sqvis');
+INSERT INTO tab0 VALUES(1,538,676.36,'fuqeu',514,685.97,'bgwrq');
+INSERT INTO tab0 VALUES(2,90,205.26,'yrrzx',123,836.88,'kpuhc');
+INSERT INTO tab0 VALUES(3,620,864.8,'myrdv',877,820.98,'oxkuv');
+INSERT INTO tab0 VALUES(4,754,677.3,'iofrg',67,665.49,'bzqba');
+INSERT INTO tab0 VALUES(5,107,710.19,'lhfro',286,504.28,'kwwsg');
+INSERT INTO tab0 VALUES(6,904,193.16,'eozui',48,698.55,'ejyzs');
+INSERT INTO tab0 VALUES(7,606,650.64,'ovmce',417,962.43,'dvkbh');
+INSERT INTO tab0 VALUES(8,535,18.11,'ijika',630,489.63,'hpnyu');
+INSERT INTO tab0 VALUES(9,501,776.40,'cvygg',725,75.5,'etlyv');
+
+SELECT * FROM tab0 AS cor0 WHERE NOT NULL IN ( col3 );
+
+drop table tab0;
diff --git
a/sql/test/BugTracker-2017/Tests/crash_in_in_handling.Bug-6260.stable.err
b/sql/test/BugTracker-2017/Tests/crash_in_in_handling.Bug-6260.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2017/Tests/crash_in_in_handling.Bug-6260.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'crash_in_in_handling.Bug-6260` in directory
'sql/test/BugTracker-2017` itself:
+
+
+# 14:07:27 >
+# 14:07:27 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=39677" "--set"
"mapi_usock=/var/tmp/mtest-29945/.s.monetdb.39677" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2017"
+# 14:07:27 >
+
+# builtin opt gdk_dbpath =
/home/niels/scratch/rc-clean/Linux-x86_64/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 = 39677
+# cmdline opt mapi_usock = /var/tmp/mtest-29945/.s.monetdb.39677
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2017
+# cmdline opt gdk_debug = 536870922
+
+# 14:07:27 >
+# 14:07:27 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-29945" "--port=39677"
+# 14:07:27 >
+
+MAPI = (monetdb) /var/tmp/mtest-29945/.s.monetdb.39677
+QUERY = SELECT * FROM tab0 AS cor0 WHERE NOT NULL IN ( col3 );
+ERROR = !SELECT: identifier 'col3' unknown
+
+# 14:07:27 >
+# 14:07:27 > "Done."
+# 14:07:27 >
+
diff --git
a/sql/test/BugTracker-2017/Tests/crash_in_in_handling.Bug-6260.stable.out
b/sql/test/BugTracker-2017/Tests/crash_in_in_handling.Bug-6260.stable.out
new file mode 100644
--- /dev/null
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
