Changeset: 063cb8dc1fca for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=063cb8dc1fca
Modified Files:
sql/storage/bat/bat_storage.c
sql/test/BugTracker-2011/Tests/All
sql/test/BugTracker-2011/Tests/alter_table_add_column.Bug-2919.sql
sql/test/BugTracker-2011/Tests/alter_table_add_column.Bug-2919.stable.err
sql/test/BugTracker-2011/Tests/alter_table_add_column.Bug-2919.stable.out
Branch: Dec2011
Log Message:
fixed bug 2919. We create all required bats for persistent tables again.
diffs (143 lines):
diff --git a/sql/storage/bat/bat_storage.c b/sql/storage/bat/bat_storage.c
--- a/sql/storage/bat/bat_storage.c
+++ b/sql/storage/bat/bat_storage.c
@@ -611,16 +611,18 @@ create_col(sql_trans *tr, sql_column *c)
/* alter ? */
if (c->t->columns.set && (fc = c->t->columns.set->h->data) !=
NULL) {
sql_delta *d = fc->data;
- cnt = d->cnt;
+ cnt = d->cnt + 1;
}
- if (cnt) {
+ if (cnt && fc != c) {
sql_delta *d = fc->data;
bat->bid = copyBat(d->bid, type, 0);
- bat->ibid = copyBat(d->ibid, type, d->ibase);
+ if (d->ibid)
+ bat->ibid = copyBat(d->ibid, type, d->ibase);
bat->ibase = d->ibase;
bat->cnt = d->cnt;
- bat->ubid = e_ubat(type);
+ if (d->ubid)
+ bat->ubid = e_ubat(type);
} else {
BAT *b = bat_new(TYPE_void, type, c->t->sz);
if (!b)
diff --git a/sql/test/BugTracker-2011/Tests/All
b/sql/test/BugTracker-2011/Tests/All
--- a/sql/test/BugTracker-2011/Tests/All
+++ b/sql/test/BugTracker-2011/Tests/All
@@ -57,3 +57,4 @@ interrupted-initialization.Bug-2875
case-overflow.Bug-2239
sqltables.Bug-2921
Multiplication_and_cast.Bug-2923
+alter_table_add_column.Bug-2919
diff --git a/sql/test/BugTracker-2011/Tests/alter_table_add_column.Bug-2919.sql
b/sql/test/BugTracker-2011/Tests/alter_table_add_column.Bug-2919.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2011/Tests/alter_table_add_column.Bug-2919.sql
@@ -0,0 +1,12 @@
+
+START TRANSACTION;
+CREATE TABLE a2919(b INTEGER);
+COMMIT;
+
+START TRANSACTION;
+ALTER TABLE a2919 ADD COLUMN c INTEGER;
+INSERT INTO a2919(b) VALUES(1);
+SELECT c FROM a2919;
+ROLLBACK;
+
+DROP TABLE a2919;
diff --git
a/sql/test/BugTracker-2011/Tests/alter_table_add_column.Bug-2919.stable.err
b/sql/test/BugTracker-2011/Tests/alter_table_add_column.Bug-2919.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2011/Tests/alter_table_add_column.Bug-2919.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'alter_table_add_column.Bug-2919` in directory
'test/BugTracker-2011` itself:
+
+
+# 10:41:51 >
+# 10:41:51 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB" "--set"
"mapi_open=true" "--set" "mapi_port=32715" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2011"
"--set" "mal_listing=0"
+# 10:41:51 >
+
+# builtin opt gdk_dbname = demo
+# builtin opt gdk_dbfarm =
/home/niels/scratch/rc-monetdb/Linux-x86_64/var/monetdb5/dbfarm
+# builtin opt gdk_debug = 0
+# builtin opt gdk_alloc_map = no
+# builtin opt gdk_vmtrim = yes
+# 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 gdk_dbfarm =
/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 32715
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbname = mTests_test_BugTracker-2011
+# cmdline opt mal_listing = 0
+
+# 10:41:52 >
+# 10:41:52 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=niels"
"--port=32715"
+# 10:41:52 >
+
+
+# 10:41:52 >
+# 10:41:52 > "Done."
+# 10:41:52 >
+
diff --git
a/sql/test/BugTracker-2011/Tests/alter_table_add_column.Bug-2919.stable.out
b/sql/test/BugTracker-2011/Tests/alter_table_add_column.Bug-2919.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2011/Tests/alter_table_add_column.Bug-2919.stable.out
@@ -0,0 +1,45 @@
+stdout of test 'alter_table_add_column.Bug-2919` in directory
'test/BugTracker-2011` itself:
+
+
+# 10:41:51 >
+# 10:41:51 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/home/niels/scratch/rc-monetdb/Linux-x86_64/var/MonetDB" "--set"
"mapi_open=true" "--set" "mapi_port=32715" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2011"
"--set" "mal_listing=0"
+# 10:41:51 >
+
+# MonetDB 5 server v11.7.0
+# This is an unreleased version
+# Serving database 'mTests_test_BugTracker-2011', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 3.788 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2011 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on
mapi:monetdb://niels.nesco.mine.nu:32715/
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 10:41:52 >
+# 10:41:52 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=niels"
"--port=32715"
+# 10:41:52 >
+
+#START TRANSACTION;
+#CREATE TABLE a2919(b INTEGER);
+#COMMIT;
+#START TRANSACTION;
+#ALTER TABLE a2919 ADD COLUMN c INTEGER;
+#INSERT INTO a2919(b) VALUES(1);
+[ 1 ]
+#SELECT c FROM a2919;
+% sys.a2919 # table_name
+% c # name
+% int # type
+% 1 # length
+[ NULL ]
+#ROLLBACK;
+#DROP TABLE a2919;
+
+# 10:41:52 >
+# 10:41:52 > "Done."
+# 10:41:52 >
+
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
