Changeset: 4c07bc6eafc8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4c07bc6eafc8
Added Files:
sql/test/BugTracker-2015/Tests/readonly.Bug-3709.sql
sql/test/BugTracker-2015/Tests/readonly.Bug-3709.stable.err
sql/test/BugTracker-2015/Tests/readonly.Bug-3709.stable.out
Modified Files:
sql/backends/monet5/sql.c
sql/test/BugTracker-2015/Tests/All
Branch: default
Log Message:
Merge with Oct2014 branch.
diffs (124 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
@@ -479,6 +479,9 @@ table_has_updates(sql_trans *tr, sql_tab
sql_column *c = n->data;
BAT *b = store_funcs.bind_col(tr, c, RD_UPD_ID);
cnt |= BATcount(b) > 0;
+ if (isTable(t) && t->access != TABLE_READONLY && (t->base.flag
!= TR_NEW /* alter */ ) &&
+ t->persistence == SQL_PERSIST && !t->commit_action)
+ cnt += store_funcs.count_col(tr, c, 0);
BBPunfix(b->batCacheid);
}
return cnt;
diff --git a/sql/test/BugTracker-2015/Tests/All
b/sql/test/BugTracker-2015/Tests/All
--- a/sql/test/BugTracker-2015/Tests/All
+++ b/sql/test/BugTracker-2015/Tests/All
@@ -24,3 +24,4 @@ alias.Bug-3704
case_aggr.Bug-3705
assertHead.Bug-3706
ifthenelse.Bug-3699
+readonly.Bug-3709
diff --git a/sql/test/BugTracker-2015/Tests/readonly.Bug-3709.sql
b/sql/test/BugTracker-2015/Tests/readonly.Bug-3709.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/readonly.Bug-3709.sql
@@ -0,0 +1,7 @@
+create table s10 (x int);
+start transaction;
+insert into s10 values (8);
+alter table s10 set read only;
+trace select * from s10;
+rollback;
+drop table s10;
diff --git a/sql/test/BugTracker-2015/Tests/readonly.Bug-3709.stable.err
b/sql/test/BugTracker-2015/Tests/readonly.Bug-3709.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/readonly.Bug-3709.stable.err
@@ -0,0 +1,43 @@
+stderr of test 'readonly.Bug-3709` in directory 'sql/test/BugTracker-2015`
itself:
+
+
+# 21:17:24 >
+# 21:17:24 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31025" "--set"
"mapi_usock=/var/tmp/mtest-5516/.s.monetdb.31025" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2015"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 21:17:24 >
+
+# 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 = 31025
+# cmdline opt mapi_usock = /var/tmp/mtest-5516/.s.monetdb.31025
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2015
+# cmdline opt mal_listing = 0
+# cmdline opt embedded_r = yes
+# cmdline opt gdk_debug = 536870922
+
+# 21:17:25 >
+# 21:17:25 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-5516" "--port=31025"
+# 21:17:25 >
+
+MAPI = (monetdb) /var/tmp/mtest-5516/.s.monetdb.31025
+QUERY = alter table s10 set read only;
+ERROR = !ALTER TABLE: set READONLY not possible with outstanding updates (wait
until updates are flushed)
+MAPI = (monetdb) /var/tmp/mtest-5516/.s.monetdb.31025
+QUERY = trace select * from s10;
+ERROR = !current transaction is aborted (please ROLLBACK)
+
+# 21:17:25 >
+# 21:17:25 > "Done."
+# 21:17:25 >
+
diff --git a/sql/test/BugTracker-2015/Tests/readonly.Bug-3709.stable.out
b/sql/test/BugTracker-2015/Tests/readonly.Bug-3709.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/readonly.Bug-3709.stable.out
@@ -0,0 +1,38 @@
+stdout of test 'readonly.Bug-3709` in directory 'sql/test/BugTracker-2015`
itself:
+
+
+# 21:17:24 >
+# 21:17:24 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31025" "--set"
"mapi_usock=/var/tmp/mtest-5516/.s.monetdb.31025" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2015"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 21:17:24 >
+
+# MonetDB 5 server v11.19.10
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2015', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs 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:31025/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-5516/.s.monetdb.31025
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+# MonetDB/R module loaded
+
+Ready.
+
+# 21:17:25 >
+# 21:17:25 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-5516" "--port=31025"
+# 21:17:25 >
+
+#create table s10 (x int);
+#start transaction;
+#insert into s10 values (8);
+[ 1 ]
+#rollback;
+#drop table s10;
+
+# 21:17:25 >
+# 21:17:25 > "Done."
+# 21:17:25 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
