Changeset: 5e7f1c747884 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5e7f1c747884
Added Files:
sql/test/BugTracker-2014/Tests/setreadonly_forgets_changes.Bug-3446.sql
sql/test/BugTracker-2014/Tests/setreadonly_forgets_changes.Bug-3446.stable.err
sql/test/BugTracker-2014/Tests/setreadonly_forgets_changes.Bug-3446.stable.out
Modified Files:
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql.c
sql/test/BugTracker-2014/Tests/All
Branch: Jan2014
Log Message:
fixed bug 3446, ie readonly needs to use the 'tid' column and only
set to read only when there are no (unflushed) updates.
diffs (201 lines):
diff --git a/sql/backends/monet5/rel_bin.c b/sql/backends/monet5/rel_bin.c
--- a/sql/backends/monet5/rel_bin.c
+++ b/sql/backends/monet5/rel_bin.c
@@ -757,9 +757,9 @@ stmt_idx( mvc *sql, sql_idx *i, stmt *de
static stmt *
stmt_dels( mvc *sql, sql_table *t)
{
- if (!t->readonly)
+// if (!t->readonly)
return stmt_tid(sql->sa, t);
- return NULL;
+// return NULL;
}
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
@@ -480,6 +480,21 @@ create_table_or_view(mvc *sql, char *sna
return MAL_SUCCEED;
}
+static int
+table_has_updates(sql_trans *tr, sql_table *t)
+{
+ node *n;
+ int cnt = 0;
+
+ for ( n = t->columns.set->h; !cnt && n; n = n->next) {
+ sql_column *c = n->data;
+ BAT *b = store_funcs.bind_col(tr, c, RD_UPD);
+ cnt += BATcount(b);
+ BBPunfix(b->batCacheid);
+ }
+ return cnt;
+}
+
static str
alter_table(mvc *sql, char *sname, sql_table *t)
{
@@ -509,8 +524,11 @@ alter_table(mvc *sql, char *sname, sql_t
}
}
- if (t->readonly != nt->readonly)
+ if (t->readonly != nt->readonly) {
+ if (t->readonly && table_has_updates(sql->session->tr, nt))
+ return sql_message("40000!ALTER TABLE: set READONLY not
possible with outstanding updates (wait until updates are flushed)\n");
mvc_readonly(sql, nt, t->readonly);
+ }
/* check for changes */
if (t->tables.dset)
diff --git a/sql/test/BugTracker-2014/Tests/All
b/sql/test/BugTracker-2014/Tests/All
--- a/sql/test/BugTracker-2014/Tests/All
+++ b/sql/test/BugTracker-2014/Tests/All
@@ -9,3 +9,4 @@ sample-crash.Bug-3429
indices.Bug-3435
utf8bom.Bug-3436
left-outer-join-with-and.Bug-3444
+setreadonly_forgets_changes.Bug-3446
diff --git
a/sql/test/BugTracker-2014/Tests/setreadonly_forgets_changes.Bug-3446.sql
b/sql/test/BugTracker-2014/Tests/setreadonly_forgets_changes.Bug-3446.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/setreadonly_forgets_changes.Bug-3446.sql
@@ -0,0 +1,18 @@
+create table t3446(a int);
+insert into t3446 values (1),(3),(2),(3),(3),(3);
+
+select * from t3446;
+
+-- remove the 3s
+delete from t3446 where a = 3;
+select * from t3446;
+
+-- Oops, the 3s are back when the table is set read-only
+alter table t3446 set read only;
+select * from t3446;
+
+-- Oops, the 3s are gone again when the table is read/write again
+alter table t3446 set read write;
+select * from t3446;
+
+drop table t3446;
diff --git
a/sql/test/BugTracker-2014/Tests/setreadonly_forgets_changes.Bug-3446.stable.err
b/sql/test/BugTracker-2014/Tests/setreadonly_forgets_changes.Bug-3446.stable.err
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2014/Tests/setreadonly_forgets_changes.Bug-3446.stable.err
@@ -0,0 +1,35 @@
+stderr of test 'setreadonly_forgets_changes.Bug-3446` in directory
'sql/test/BugTracker-2014` itself:
+
+
+# 11:47:14 >
+# 11:47:14 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=37218" "--set"
"mapi_usock=/var/tmp/mtest-9874/.s.monetdb.37218" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2014"
"--set" "mal_listing=0"
+# 11:47:14 >
+
+# 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 = 37218
+# cmdline opt mapi_usock = /var/tmp/mtest-9874/.s.monetdb.37218
+# 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-2014
+# cmdline opt mal_listing = 0
+
+# 11:47:14 >
+# 11:47:14 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-9874" "--port=37218"
+# 11:47:14 >
+
+
+# 11:47:14 >
+# 11:47:14 > "Done."
+# 11:47:14 >
+
diff --git
a/sql/test/BugTracker-2014/Tests/setreadonly_forgets_changes.Bug-3446.stable.out
b/sql/test/BugTracker-2014/Tests/setreadonly_forgets_changes.Bug-3446.stable.out
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2014/Tests/setreadonly_forgets_changes.Bug-3446.stable.out
@@ -0,0 +1,72 @@
+stdout of test 'setreadonly_forgets_changes.Bug-3446` in directory
'sql/test/BugTracker-2014` itself:
+
+
+# 11:47:14 >
+# 11:47:14 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=37218" "--set"
"mapi_usock=/var/tmp/mtest-9874/.s.monetdb.37218" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2014"
"--set" "mal_listing=0"
+# 11:47:14 >
+
+# MonetDB 5 server v11.17.14
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2014', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 7.334 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2014 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://localhost.nes.nl:37218/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-9874/.s.monetdb.37218
+# MonetDB/GIS module loaded
+# MonetDB/JAQL module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 11:47:14 >
+# 11:47:14 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-9874" "--port=37218"
+# 11:47:14 >
+
+#create table t3446(a int);
+#insert into t3446 values (1),(3),(2),(3),(3),(3);
+[ 6 ]
+#select * from t3446;
+% sys.t3446 # table_name
+% a # name
+% int # type
+% 1 # length
+[ 1 ]
+[ 3 ]
+[ 2 ]
+[ 3 ]
+[ 3 ]
+[ 3 ]
+#delete from t3446 where a = 3;
+[ 4 ]
+#select * from t3446;
+% sys.t3446 # table_name
+% a # name
+% int # type
+% 1 # length
+[ 1 ]
+[ 2 ]
+#alter table t3446 set read only;
+#select * from t3446;
+% sys.t3446 # table_name
+% a # name
+% int # type
+% 1 # length
+[ 1 ]
+[ 2 ]
+#alter table t3446 set read write;
+#select * from t3446;
+% sys.t3446 # table_name
+% a # name
+% int # type
+% 1 # length
+[ 1 ]
+[ 2 ]
+#drop table t3446;
+
+# 11:47:14 >
+# 11:47:14 > "Done."
+# 11:47:14 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
