Changeset: c48e884e7f6d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c48e884e7f6d
Added Files:
sql/test/mergetables/Tests/addtable.sql
sql/test/mergetables/Tests/addtable.stable.err
sql/test/mergetables/Tests/addtable.stable.out
Modified Files:
sql/backends/monet5/sql.c
sql/test/mergetables/Tests/All
Branch: Dec2016
Log Message:
check if a table is a merge table before adding a partition table
diffs (128 lines):
diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -1199,6 +1199,8 @@ alter_table_add_table(mvc *sql, char *ms
mt = mvc_bind_table(sql, ms, mtname);
if (ps)
pt = mvc_bind_table(sql, ps, ptname);
+ if (mt && mt->type != tt_merge_table)
+ return sql_message("42S02!ALTER TABLE: cannot add table '%s.%s'
to table '%s.%s' (not a merge table)", psname, ptname, msname, mtname);
if (mt && pt) {
char *msg;
node *n = cs_find_id(&mt->tables, pt->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
@@ -18,3 +18,4 @@ mergemergeload
singlekeyconstraint
part-elim
mergedropcascade
+addtable
diff --git a/sql/test/mergetables/Tests/addtable.sql
b/sql/test/mergetables/Tests/addtable.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/mergetables/Tests/addtable.sql
@@ -0,0 +1,11 @@
+create table tmp1(i int);
+insert into tmp1 values(1);
+create table tmp2(i int);
+insert into tmp2 values(2);
+
+alter table tmp1 add table tmp2;
+
+select * from tmp1;
+
+drop table tmp1;
+drop table tmp2;
diff --git a/sql/test/mergetables/Tests/addtable.stable.err
b/sql/test/mergetables/Tests/addtable.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/mergetables/Tests/addtable.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'addtable` in directory 'sql/test/mergetables` itself:
+
+
+# 13:47:16 >
+# 13:47:16 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=38251" "--set"
"mapi_usock=/var/tmp/mtest-19670/.s.monetdb.38251" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_mergetables"
+# 13:47:16 >
+
+# 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 = 38251
+# cmdline opt mapi_usock = /var/tmp/mtest-19670/.s.monetdb.38251
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_mergetables
+# cmdline opt gdk_debug = 536870922
+
+# 13:47:16 >
+# 13:47:16 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-19670" "--port=38251"
+# 13:47:16 >
+
+MAPI = (monetdb) /var/tmp/mtest-19670/.s.monetdb.38251
+QUERY = alter table tmp1 add table tmp2;
+ERROR = !ALTER TABLE: cannot add table 'sys.tmp2' to table 'sys.tmp1' (not a
merge table)
+
+# 13:47:16 >
+# 13:47:16 > "Done."
+# 13:47:16 >
+
diff --git a/sql/test/mergetables/Tests/addtable.stable.out
b/sql/test/mergetables/Tests/addtable.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/mergetables/Tests/addtable.stable.out
@@ -0,0 +1,45 @@
+stdout of test 'addtable` in directory 'sql/test/mergetables` itself:
+
+
+# 13:47:16 >
+# 13:47:16 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=38251" "--set"
"mapi_usock=/var/tmp/mtest-19670/.s.monetdb.38251" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_mergetables"
+# 13:47:16 >
+
+# MonetDB 5 server v11.25.6
+# This is an unreleased version
+# Serving database 'mTests_sql_test_mergetables', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers
+# Found 7.332 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2017 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://localhost.nes.nl:38251/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-19670/.s.monetdb.38251
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 13:47:16 >
+# 13:47:16 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-19670" "--port=38251"
+# 13:47:16 >
+
+#create table tmp1(i int);
+#insert into tmp1 values(1);
+[ 1 ]
+#create table tmp2(i int);
+#insert into tmp2 values(2);
+[ 1 ]
+#select * from tmp1;
+% sys.tmp1 # table_name
+% i # name
+% int # type
+% 1 # length
+[ 1 ]
+#drop table tmp1;
+#drop table tmp2;
+
+# 13:47:16 >
+# 13:47:16 > "Done."
+# 13:47:16 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
