Changeset: f4f40667c48b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f4f40667c48b
Added Files:
sql/test/mergetables/Tests/mergedropcrash.sql
sql/test/mergetables/Tests/mergedropcrash.stable.err
sql/test/mergetables/Tests/mergedropcrash.stable.out
Modified Files:
sql/server/rel_schema.c
sql/test/mergetables/Tests/All
Branch: default
Log Message:
fixed crash in mergetable drop table
diffs (143 lines):
diff --git a/sql/server/rel_schema.c b/sql/server/rel_schema.c
--- a/sql/server/rel_schema.c
+++ b/sql/server/rel_schema.c
@@ -1196,12 +1196,13 @@ rel_alter_table(mvc *sql, dlist *qname,
char *ntname = te->data.lval->h->data.sval;
sql_table *ntt = mvc_bind_table(sql, s, ntname);
int drop_action = te->data.lval->h->next->data.i_val;
- node *n = cs_find_id(&nt->tables, ntt->base.id);
+ node *n = NULL;
+
+ if (!ntt || (n = cs_find_id(&nt->tables, ntt->base.id))
== NULL)
+ return sql_error(sql, 02, "42S02!ALTER TABLE:
table '%s' isn't part of the MERGE TABLE '%s.%s'", ntname, sname, tname);
- if (n) {
- ntt->drop_action = drop_action;
- cs_del(&nt->tables, n, ntt->base.flag);
- }
+ ntt->drop_action = drop_action;
+ cs_del(&nt->tables, n, ntt->base.flag);
}
if (!isTable(nt))
diff --git a/sql/test/mergetables/Tests/All b/sql/test/mergetables/Tests/All
--- a/sql/test/mergetables/Tests/All
+++ b/sql/test/mergetables/Tests/All
@@ -11,3 +11,4 @@ forex1
mergedrop
mergekey
crash0
+mergedropcrash
diff --git a/sql/test/mergetables/Tests/mergedropcrash.sql
b/sql/test/mergetables/Tests/mergedropcrash.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/mergetables/Tests/mergedropcrash.sql
@@ -0,0 +1,13 @@
+create table t1 (i int);
+create table t2 (i int);
+create merge table m (i int);
+alter table m add table t1;
+alter table m add table t2;
+alter table m drop table t1;
+alter table m drop table t1;
+DROP table t1;
+alter table m drop table t1;
+
+alter table m drop table t2;
+DROP table t2;
+DROP table m;
diff --git a/sql/test/mergetables/Tests/mergedropcrash.stable.err
b/sql/test/mergetables/Tests/mergedropcrash.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/mergetables/Tests/mergedropcrash.stable.err
@@ -0,0 +1,43 @@
+stderr of test 'mergedropcrash` in directory 'sql/test/mergetables` itself:
+
+
+# 12:42:18 >
+# 12:42:18 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31946" "--set"
"mapi_usock=/var/tmp/mtest-2966/.s.monetdb.31946" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_mergetables"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 12:42:18 >
+
+# builtin opt gdk_dbpath =
/home/niels/scratch/monetdb/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 = 31946
+# cmdline opt mapi_usock = /var/tmp/mtest-2966/.s.monetdb.31946
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_mergetables
+# cmdline opt mal_listing = 0
+# cmdline opt embedded_r = yes
+# cmdline opt gdk_debug = 536870922
+
+# 12:42:18 >
+# 12:42:18 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-2966" "--port=31946"
+# 12:42:18 >
+
+MAPI = (monetdb) /var/tmp/mtest-2966/.s.monetdb.31946
+QUERY = alter table m drop table t1;
+ERROR = !ALTER TABLE: table 't1' isn't part of the MERGE TABLE 'sys.m'
+MAPI = (monetdb) /var/tmp/mtest-2966/.s.monetdb.31946
+QUERY = alter table m drop table t1;
+ERROR = !ALTER TABLE: table 't1' isn't part of the MERGE TABLE 'sys.m'
+
+# 12:42:18 >
+# 12:42:18 > "Done."
+# 12:42:18 >
+
diff --git a/sql/test/mergetables/Tests/mergedropcrash.stable.out
b/sql/test/mergetables/Tests/mergedropcrash.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/mergetables/Tests/mergedropcrash.stable.out
@@ -0,0 +1,42 @@
+stdout of test 'mergedropcrash` in directory 'sql/test/mergetables` itself:
+
+
+# 12:42:18 >
+# 12:42:18 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31946" "--set"
"mapi_usock=/var/tmp/mtest-2966/.s.monetdb.31946" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/monetdb/Linux-x86_64/var/MonetDB/mTests_sql_test_mergetables"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 12:42:18 >
+
+# MonetDB 5 server v11.20.0
+# This is an unreleased version
+# Serving database 'mTests_sql_test_mergetables', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit
integers dynamically linked
+# Found 7.333 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://localhost.nes.nl:31946/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-2966/.s.monetdb.31946
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+# MonetDB/R module loaded
+
+Ready.
+
+# 12:42:18 >
+# 12:42:18 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-2966" "--port=31946"
+# 12:42:18 >
+
+#create table t1 (i int);
+#create table t2 (i int);
+#create merge table m (i int);
+#alter table m add table t1;
+#alter table m add table t2;
+#alter table m drop table t1;
+#DROP table t1;
+#alter table m drop table t2;
+#DROP table t2;
+#DROP table m;
+
+# 12:42:18 >
+# 12:42:18 > "Done."
+# 12:42:18 >
+
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
