Changeset: 36a6e639d442 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=36a6e639d442
Added Files:
sql/test/mergetables/Tests/mergedrop1.sql
sql/test/mergetables/Tests/mergedrop1.stable.err
sql/test/mergetables/Tests/mergedrop1.stable.out
sql/test/mergetables/Tests/mergedrop2.sql
sql/test/mergetables/Tests/mergedrop2.stable.err
sql/test/mergetables/Tests/mergedrop2.stable.out
Modified Files:
sql/storage/store.c
sql/test/mergetables/Tests/All
Branch: default
Log Message:
added test for a crash (not all merge table opjects were correctly removed)
diffs (truncated from 312 to 300 lines):
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -3637,6 +3637,22 @@ sys_drop_columns(sql_trans *tr, sql_tabl
}
static void
+sys_table_del_tables(sql_trans *tr, sql_table *t, int drop_action)
+{
+ node *n;
+
+ if (cs_size(&t->tables)) {
+ for (n = t->tables.set->h; n; ) {
+ sql_table *pt = n->data;
+
+ n = n->next;
+ sql_trans_del_table(tr, t, pt, drop_action);
+ }
+ }
+}
+
+
+static void
sys_drop_table(sql_trans *tr, sql_table *t, int drop_action)
{
sql_schema *syss = find_sql_schema(tr, isGlobal(t)?"sys":"tmp");
@@ -3648,6 +3664,8 @@ sys_drop_table(sql_trans *tr, sql_table
table_funcs.table_delete(tr, systable, rid);
sys_drop_keys(tr, t, drop_action);
sys_drop_idxs(tr, t, drop_action);
+ if (isMergeTable(t) || isReplicaTable(t))
+ sys_table_del_tables(tr, t, drop_action);
sql_trans_drop_dependencies(tr, t->base.id);
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
@@ -12,3 +12,5 @@ mergedrop
mergekey
crash0
mergedropcrash
+mergedrop1
+mergedrop2
diff --git a/sql/test/mergetables/Tests/mergedrop1.sql
b/sql/test/mergetables/Tests/mergedrop1.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/mergetables/Tests/mergedrop1.sql
@@ -0,0 +1,24 @@
+drop table t;
+drop table t1;
+drop table t2;
+drop table t3;
+
+create merge table t(x double);
+create table t1(x double);
+create table t2(x double);
+create table t3(x double);
+
+insert into t1 values(1);
+insert into t2 values(1);
+insert into t3 values(1);
+
+alter table t1 set read only;
+alter table t2 set read only;
+alter table t3 set read only;
+
+alter table t add table t1;
+alter table t add table t2;
+alter table t add table t3;
+
+alter table t drop table t1;
+alter table t add table t1;
diff --git a/sql/test/mergetables/Tests/mergedrop1.stable.err
b/sql/test/mergetables/Tests/mergedrop1.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/mergetables/Tests/mergedrop1.stable.err
@@ -0,0 +1,49 @@
+stderr of test 'mergedrop1` in directory 'sql/test/mergetables` itself:
+
+
+# 16:18:35 >
+# 16:18:35 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=33833" "--set"
"mapi_usock=/var/tmp/mtest-26503/.s.monetdb.33833" "--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"
+# 16:18:35 >
+
+# 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 = 33833
+# cmdline opt mapi_usock = /var/tmp/mtest-26503/.s.monetdb.33833
+# 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
+
+# 16:18:35 >
+# 16:18:35 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-26503" "--port=33833"
+# 16:18:35 >
+
+MAPI = (monetdb) /var/tmp/mtest-26503/.s.monetdb.33833
+QUERY = drop table t;
+ERROR = !DROP TABLE: no such table 't'
+MAPI = (monetdb) /var/tmp/mtest-26503/.s.monetdb.33833
+QUERY = drop table t1;
+ERROR = !DROP TABLE: no such table 't1'
+MAPI = (monetdb) /var/tmp/mtest-26503/.s.monetdb.33833
+QUERY = drop table t2;
+ERROR = !DROP TABLE: no such table 't2'
+MAPI = (monetdb) /var/tmp/mtest-26503/.s.monetdb.33833
+QUERY = drop table t3;
+ERROR = !DROP TABLE: no such table 't3'
+
+# 16:18:35 >
+# 16:18:35 > "Done."
+# 16:18:35 >
+
diff --git a/sql/test/mergetables/Tests/mergedrop1.stable.out
b/sql/test/mergetables/Tests/mergedrop1.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/mergetables/Tests/mergedrop1.stable.out
@@ -0,0 +1,50 @@
+stdout of test 'mergedrop1` in directory 'sql/test/mergetables` itself:
+
+
+# 16:18:35 >
+# 16:18:35 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=33833" "--set"
"mapi_usock=/var/tmp/mtest-26503/.s.monetdb.33833" "--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"
+# 16:18:35 >
+
+# 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:33833/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-26503/.s.monetdb.33833
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+# MonetDB/R module loaded
+
+Ready.
+
+# 16:18:35 >
+# 16:18:35 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-26503" "--port=33833"
+# 16:18:35 >
+
+#create merge table t(x double);
+#create table t1(x double);
+#create table t2(x double);
+#create table t3(x double);
+#insert into t1 values(1);
+[ 1 ]
+#insert into t2 values(1);
+[ 1 ]
+#insert into t3 values(1);
+[ 1 ]
+#alter table t1 set read only;
+#alter table t2 set read only;
+#alter table t3 set read only;
+#alter table t add table t1;
+#alter table t add table t2;
+#alter table t add table t3;
+#alter table t drop table t1;
+#alter table t add table t1;
+
+# 16:18:35 >
+# 16:18:35 > "Done."
+# 16:18:35 >
+
diff --git a/sql/test/mergetables/Tests/mergedrop2.sql
b/sql/test/mergetables/Tests/mergedrop2.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/mergetables/Tests/mergedrop2.sql
@@ -0,0 +1,24 @@
+drop table t;
+drop table t1;
+drop table t2;
+drop table t3;
+
+create merge table t(x double);
+create table t1(x double);
+create table t2(x double);
+create table t3(x double);
+
+insert into t1 values(1);
+insert into t2 values(1);
+insert into t3 values(1);
+
+alter table t1 set read only;
+alter table t2 set read only;
+alter table t3 set read only;
+
+alter table t add table t1;
+alter table t add table t2;
+alter table t add table t3;
+
+alter table t drop table t1;
+alter table t add table t1;
diff --git a/sql/test/mergetables/Tests/mergedrop2.stable.err
b/sql/test/mergetables/Tests/mergedrop2.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/mergetables/Tests/mergedrop2.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'mergedrop2` in directory 'sql/test/mergetables` itself:
+
+
+# 16:18:35 >
+# 16:18:35 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=33833" "--set"
"mapi_usock=/var/tmp/mtest-26503/.s.monetdb.33833" "--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"
+# 16:18:35 >
+
+# 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 = 33833
+# cmdline opt mapi_usock = /var/tmp/mtest-26503/.s.monetdb.33833
+# 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
+
+# 16:18:36 >
+# 16:18:36 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-26503" "--port=33833"
+# 16:18:36 >
+
+
+# 16:18:36 >
+# 16:18:36 > "Done."
+# 16:18:36 >
+
diff --git a/sql/test/mergetables/Tests/mergedrop2.stable.out
b/sql/test/mergetables/Tests/mergedrop2.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/mergetables/Tests/mergedrop2.stable.out
@@ -0,0 +1,54 @@
+stdout of test 'mergedrop2` in directory 'sql/test/mergetables` itself:
+
+
+# 16:18:35 >
+# 16:18:35 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=33833" "--set"
"mapi_usock=/var/tmp/mtest-26503/.s.monetdb.33833" "--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"
+# 16:18:35 >
+
+# 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:33833/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-26503/.s.monetdb.33833
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+# MonetDB/R module loaded
+
+Ready.
+
+# 16:18:36 >
+# 16:18:36 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-26503" "--port=33833"
+# 16:18:36 >
+
+#drop table t;
+#drop table t1;
+#drop table t2;
+#drop table t3;
+#create merge table t(x double);
+#create table t1(x double);
+#create table t2(x double);
+#create table t3(x double);
+#insert into t1 values(1);
+[ 1 ]
+#insert into t2 values(1);
+[ 1 ]
+#insert into t3 values(1);
+[ 1 ]
+#alter table t1 set read only;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
