Changeset: 60e6f41097d4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=60e6f41097d4
Added Files:
sql/test/mergetables/Tests/mergedropcascade.sql
sql/test/mergetables/Tests/mergedropcascade.stable.err
sql/test/mergetables/Tests/mergedropcascade.stable.out
Modified Files:
sql/storage/store.c
sql/test/mergetables/Tests/All
Branch: default
Log Message:
merged with jun2016
diffs (142 lines):
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -4447,6 +4447,10 @@ sql_trans_drop_table(sql_trans *tr, sql_
node *n = find_sql_table_node(s, id);
sql_table *t = n->data;
+ if ((drop_action == DROP_CASCADE_START || drop_action == DROP_CASCADE)
&&
+ tr->dropped && list_find_id(tr->dropped, t->base.id))
+ return;
+
if (drop_action == DROP_CASCADE_START || drop_action == DROP_CASCADE) {
int *local_id = MNEW(int);
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
@@ -17,3 +17,4 @@ mergedrop2
mergemergeload
singlekeyconstraint
part-elim
+mergedropcascade
diff --git a/sql/test/mergetables/Tests/mergedropcascade.sql
b/sql/test/mergetables/Tests/mergedropcascade.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/mergetables/Tests/mergedropcascade.sql
@@ -0,0 +1,20 @@
+CREATE TABLE part1 ( x double, y double, z double);
+COPY 4 RECORDS INTO part1 FROM stdin USING DELIMITERS ' ','\n';
+0.0 0.0 0.0
+1.0 0.0 0.0
+0.0 1.0 0.0
+1.0 1.0 0.0
+
+CREATE TABLE part2 ( x double, y double, z double);
+COPY 4 RECORDS INTO part2 FROM stdin USING DELIMITERS ' ','\n';
+2.0 0.0 0.0
+3.0 0.0 0.0
+2.0 1.0 0.0
+3.0 1.0 0.0
+
+CREATE MERGE TABLE complete ( x double, y double, z double);
+
+ALTER TABLE complete ADD TABLE part1;
+ALTER TABLE complete ADD TABLE part2;
+
+DROP TABLE part1 cascade;
diff --git a/sql/test/mergetables/Tests/mergedropcascade.stable.err
b/sql/test/mergetables/Tests/mergedropcascade.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/mergetables/Tests/mergedropcascade.stable.err
@@ -0,0 +1,35 @@
+stderr of test 'mergedropcascade` in directory 'sql/test/mergetables` itself:
+
+
+# 19:13:06 >
+# 19:13:06 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=39880" "--set"
"mapi_usock=/var/tmp/mtest-21574/.s.monetdb.39880" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_mergetables"
"--set" "embedded_r=yes"
+# 19:13:06 >
+
+# 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 = 39880
+# cmdline opt mapi_usock = /var/tmp/mtest-21574/.s.monetdb.39880
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_mergetables
+# cmdline opt embedded_r = yes
+# cmdline opt gdk_debug = 536870922
+
+# 19:13:06 >
+# 19:13:06 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-21574" "--port=39880"
+# 19:13:06 >
+
+
+# 19:13:07 >
+# 19:13:07 > "Done."
+# 19:13:07 >
+
diff --git a/sql/test/mergetables/Tests/mergedropcascade.stable.out
b/sql/test/mergetables/Tests/mergedropcascade.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/mergetables/Tests/mergedropcascade.stable.out
@@ -0,0 +1,50 @@
+stdout of test 'mergedropcascade` in directory 'sql/test/mergetables` itself:
+
+
+# 19:13:06 >
+# 19:13:06 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=39880" "--set"
"mapi_usock=/var/tmp/mtest-21574/.s.monetdb.39880" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_mergetables"
"--set" "embedded_r=yes"
+# 19:13:06 >
+
+# MonetDB 5 server v11.23.4
+# 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.332 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2016 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://localhost.nes.nl:39880/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-21574/.s.monetdb.39880
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+# MonetDB/R module loaded
+
+Ready.
+
+# 19:13:06 >
+# 19:13:06 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-21574" "--port=39880"
+# 19:13:06 >
+
+#CREATE TABLE part1 ( x double, y double, z double);
+#COPY 4 RECORDS INTO part1 FROM stdin USING DELIMITERS ' ','\n';
+#0.0 0.0 0.0
+#1.0 0.0 0.0
+#0.0 1.0 0.0
+#1.0 1.0 0.0
+[ 4 ]
+#CREATE TABLE part2 ( x double, y double, z double);
+#COPY 4 RECORDS INTO part2 FROM stdin USING DELIMITERS ' ','\n';
+#2.0 0.0 0.0
+#3.0 0.0 0.0
+#2.0 1.0 0.0
+#3.0 1.0 0.0
+[ 4 ]
+#CREATE MERGE TABLE complete ( x double, y double, z double);
+#ALTER TABLE complete ADD TABLE part1;
+#ALTER TABLE complete ADD TABLE part2;
+#DROP TABLE part1 cascade;
+
+# 19:13:07 >
+# 19:13:07 > "Done."
+# 19:13:07 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
