Changeset: f633127500eb for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f633127500eb
Added Files:
sql/test/BugTracker-2014/Tests/fk-property-assert.Bug-3612.sql
sql/test/BugTracker-2014/Tests/fk-property-assert.Bug-3612.stable.err
sql/test/BugTracker-2014/Tests/fk-property-assert.Bug-3612.stable.out
Modified Files:
monetdb5/modules/mal/mkey.c
sql/test/BugTracker-2014/Tests/All
Branch: Oct2014
Log Message:
Fix for bug 3612: nil property was incorrectly set.
In fact, if the input bat has a nil value, then the output bat doesn't
necessarily have a nil value. If the value gets sign extended (in
this bug from int to lng and on to oid), the nil becomes something
totally different.
diffs (205 lines):
diff --git a/monetdb5/modules/mal/mkey.c b/monetdb5/modules/mal/mkey.c
--- a/monetdb5/modules/mal/mkey.c
+++ b/monetdb5/modules/mal/mkey.c
@@ -174,8 +174,8 @@ MKEYbathash(bat *res, const bat *bid)
BATkey(BATmirror(dst), 0);
dst->tsorted = dst->trevsorted = 0;
}
- dst->T->nonil = b->T->nonil;
- dst->T->nil = b->T->nil;
+ dst->T->nonil = 0;
+ dst->T->nil = 0;
if (dst->htype != b->htype) {
BAT *x = VIEWcreate(b, dst);
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
@@ -48,3 +48,4 @@ duplicate_primary_keys.Bug-3474
copy_decimal_into.Bug-3596
queueError.Bug-3604
querylog.Bug-3607
+fk-property-assert.Bug-3612
diff --git a/sql/test/BugTracker-2014/Tests/fk-property-assert.Bug-3612.sql
b/sql/test/BugTracker-2014/Tests/fk-property-assert.Bug-3612.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/fk-property-assert.Bug-3612.sql
@@ -0,0 +1,28 @@
+START TRANSACTION;
+
+CREATE TABLE PKTABLE ( ptest1 int, ptest2 int, ptest3 text, PRIMARY
KEY(ptest1, ptest2) );
+CREATE TABLE FKTABLE ( ftest1 int, ftest2 int, ftest3 int, CONSTRAINT
constrname FOREIGN KEY(ftest1, ftest2) REFERENCES PKTABLE MATCH FULL ON DELETE
SET NULL ON UPDATE SET NULL);
+
+-- Insert test data into PKTABLE
+INSERT INTO PKTABLE VALUES (1, 2, 'Test1');
+INSERT INTO PKTABLE VALUES (1, 3, 'Test1-2');
+INSERT INTO PKTABLE VALUES (2, 4, 'Test2');
+INSERT INTO PKTABLE VALUES (5, 10, 'Test5');
+
+SELECT * FROM PKTABLE;
+
+-- Insert successful rows into FK TABLE
+INSERT INTO FKTABLE VALUES (1, 2, 4);
+INSERT INTO FKTABLE VALUES (1, 3, 5);
+INSERT INTO FKTABLE VALUES (2, 4, 8);
+INSERT INTO FKTABLE VALUES (NULL, NULL, 0);
+
+-- Check FKTABLE
+SELECT * FROM FKTABLE;
+
+-- Delete a row from PK TABLE
+DELETE FROM PKTABLE WHERE ptest1=1 and ptest2=2;
+
+DELETE FROM PKTABLE WHERE ptest1=5 and ptest2=10;
+
+ROLLBACK;
diff --git
a/sql/test/BugTracker-2014/Tests/fk-property-assert.Bug-3612.stable.err
b/sql/test/BugTracker-2014/Tests/fk-property-assert.Bug-3612.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/fk-property-assert.Bug-3612.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'fk-property-assert.Bug-3612` in directory
'sql/test/BugTracker-2014` itself:
+
+
+# 14:49:52 >
+# 14:49:52 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31650" "--set"
"mapi_usock=/var/tmp/mtest-12778/.s.monetdb.31650" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_sql_test_BugTracker-2014"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 14:49:52 >
+
+# builtin opt gdk_dbpath =
/ufs/sjoerd/Monet-candidate/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 = 31650
+# cmdline opt mapi_usock = /var/tmp/mtest-12778/.s.monetdb.31650
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_sql_test_BugTracker-2014
+# cmdline opt mal_listing = 0
+# cmdline opt embedded_r = yes
+# cmdline opt gdk_debug = 536870922
+
+# 14:49:52 >
+# 14:49:52 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-12778" "--port=31650"
+# 14:49:52 >
+
+
+# 14:49:52 >
+# 14:49:52 > "Done."
+# 14:49:52 >
+
diff --git
a/sql/test/BugTracker-2014/Tests/fk-property-assert.Bug-3612.stable.out
b/sql/test/BugTracker-2014/Tests/fk-property-assert.Bug-3612.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/fk-property-assert.Bug-3612.stable.out
@@ -0,0 +1,103 @@
+stdout of test 'fk-property-assert.Bug-3612` in directory
'sql/test/BugTracker-2014` itself:
+
+
+# 14:49:52 >
+# 14:49:52 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=31650" "--set"
"mapi_usock=/var/tmp/mtest-12778/.s.monetdb.31650" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_sql_test_BugTracker-2014"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 14:49:52 >
+
+# MonetDB 5 server v11.19.4 (hg id: 103d748e8ceb+)
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2014', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 15.590 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://madrid.ins.cwi.nl:31650/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-12778/.s.monetdb.31650
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+# MonetDB/R module loaded
+
+Ready.
+# SQL catalog created, loading sql scripts once
+# loading sql script: 09_like.sql
+# loading sql script: 10_math.sql
+# loading sql script: 11_times.sql
+# loading sql script: 12_url.sql
+# loading sql script: 13_date.sql
+# loading sql script: 14_inet.sql
+# loading sql script: 15_querylog.sql
+# loading sql script: 16_tracelog.sql
+# loading sql script: 19_cluster.sql
+# loading sql script: 20_vacuum.sql
+# loading sql script: 21_dependency_functions.sql
+# loading sql script: 22_clients.sql
+# loading sql script: 23_skyserver.sql
+# loading sql script: 24_zorder.sql
+# loading sql script: 25_debug.sql
+# loading sql script: 26_sysmon.sql
+# loading sql script: 39_analytics.sql
+# loading sql script: 40_geom.sql
+# loading sql script: 40_json.sql
+# loading sql script: 41_jsonstore.sql
+# loading sql script: 45_uuid.sql
+# loading sql script: 46_gsl.sql
+# loading sql script: 75_storagemodel.sql
+# loading sql script: 80_statistics.sql
+# loading sql script: 80_udf.sql
+# loading sql script: 85_bam.sql
+# loading sql script: 90_generator.sql
+# loading sql script: 99_system.sql
+
+# 14:49:52 >
+# 14:49:52 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-12778" "--port=31650"
+# 14:49:52 >
+
+#START TRANSACTION;
+#CREATE TABLE PKTABLE ( ptest1 int, ptest2 int, ptest3 text, PRIMARY
KEY(ptest1, ptest2) );
+#CREATE TABLE FKTABLE ( ftest1 int, ftest2 int, ftest3 int, CONSTRAINT
constrname FOREIGN KEY(ftest1, ftest2) REFERENCES PKTABLE MATCH FULL ON DELETE
SET NULL ON UPDATE SET NULL);
+#INSERT INTO PKTABLE VALUES (1, 2, 'Test1');
+[ 1 ]
+#INSERT INTO PKTABLE VALUES (1, 3, 'Test1-2');
+[ 1 ]
+#INSERT INTO PKTABLE VALUES (2, 4, 'Test2');
+[ 1 ]
+#INSERT INTO PKTABLE VALUES (5, 10, 'Test5');
+[ 1 ]
+#SELECT * FROM PKTABLE;
+% sys.pktable, sys.pktable, sys.pktable # table_name
+% ptest1, ptest2, ptest3 # name
+% int, int, clob # type
+% 1, 2, 7 # length
+[ 1, 2, "Test1" ]
+[ 1, 3, "Test1-2" ]
+[ 2, 4, "Test2" ]
+[ 5, 10, "Test5" ]
+#INSERT INTO FKTABLE VALUES (1, 2, 4);
+[ 1 ]
+#INSERT INTO FKTABLE VALUES (1, 3, 5);
+[ 1 ]
+#INSERT INTO FKTABLE VALUES (2, 4, 8);
+[ 1 ]
+#INSERT INTO FKTABLE VALUES (NULL, NULL, 0);
+[ 1 ]
+#SELECT * FROM FKTABLE;
+% sys.fktable, sys.fktable, sys.fktable # table_name
+% ftest1, ftest2, ftest3 # name
+% int, int, int # type
+% 1, 1, 1 # length
+[ 1, 2, 4 ]
+[ 1, 3, 5 ]
+[ 2, 4, 8 ]
+[ NULL, NULL, 0 ]
+#DELETE FROM PKTABLE WHERE ptest1=1 and ptest2=2;
+[ 1 ]
+#DELETE FROM PKTABLE WHERE ptest1=5 and ptest2=10;
+[ 1 ]
+#ROLLBACK;
+
+# 14:49:52 >
+# 14:49:52 > "Done."
+# 14:49:52 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
