Changeset: b69c9f900572 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b69c9f900572
Modified Files:
monetdb5/modules/mal/mkey.mx
sql/test/BugTracker-2011/Tests/All
sql/test/BugTracker-2011/Tests/mkey-bulk_rotate_xor_hash.Bug-2825.sql
sql/test/BugTracker-2011/Tests/mkey-bulk_rotate_xor_hash.Bug-2825.stable.err
sql/test/BugTracker-2011/Tests/mkey-bulk_rotate_xor_hash.Bug-2825.stable.out
Branch: Apr2011
Log Message:
fixed bug 2825:
since changeset 1c689400661e bulk_rotate_xor_hash() has side-effect free, i.e.,
produces a new result BAT instead of modifying its first input in place;
thus, the first (left) operand may well be read-only (or a view).
Removed the obsolete check that raised a false exception.
Added test in
sql/test/BugTracker-2011/Tests/mkey-bulk_rotate_xor_hash.Bug-2825.*
diffs (156 lines):
diff --git a/monetdb5/modules/mal/mkey.mx b/monetdb5/modules/mal/mkey.mx
--- a/monetdb5/modules/mal/mkey.mx
+++ b/monetdb5/modules/mal/mkey.mx
@@ -692,11 +692,6 @@
mnstr_printf(GDKout,"#CMDbulk_rotate_xor_hash: (%s,%d,%s): not
synced on head.\n", BATgetId(bn), *rotate, BATgetId(b));
#endif
return " Operands not synced on head";
- } else if (isVIEW(bn) || bn->batRestricted) {
-#ifdef _DEBUG_MKEY_
- mnstr_printf(GDKout,"#CMDbulk_rotate_xor_hash: (%s,%d,%s): left
operand not writeable.\n", BATgetId(bn), *rotate, BATgetId(b));
-#endif
- return " Left operand not writeable";
} else if (*rotate < 0 || *rotate >= (int)(sizeof(wrd)*8)) {
#ifdef _DEBUG_MKEY_
mnstr_printf(GDKout,"CMDbulk_rotate_xor_hash: (%s,%d,%s):
illegal number of rotate bits.\n", BATgetId(bn), *rotate, BATgetId(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
@@ -15,3 +15,4 @@
count-count-distinct.Bug-2808
crash_in_push_exp_down.Bug-2811
subquery_in_from_clause.Bug-2812
+mkey-bulk_rotate_xor_hash.Bug-2825
diff --git
a/sql/test/BugTracker-2011/Tests/mkey-bulk_rotate_xor_hash.Bug-2825.sql
b/sql/test/BugTracker-2011/Tests/mkey-bulk_rotate_xor_hash.Bug-2825.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2011/Tests/mkey-bulk_rotate_xor_hash.Bug-2825.sql
@@ -0,0 +1,21 @@
+create table table1 (user_id integer, item_id integer);
+create table table2 (user_id integer, item_id integer, primary key(user_id,
item_id));
+
+insert into table1 values (1,1);
+
+INSERT INTO table2(user_id,item_id)
+SELECT DISTINCT USER_ID, ITEM_ID
+FROM table1;
+
+delete from table2;
+insert into table1 values (1,1);
+
+SELECT DISTINCT USER_ID, ITEM_ID
+FROM table1;
+
+INSERT INTO table2(user_id,item_id)
+SELECT DISTINCT USER_ID, ITEM_ID
+FROM table1;
+
+drop table table1;
+drop table table2;
diff --git
a/sql/test/BugTracker-2011/Tests/mkey-bulk_rotate_xor_hash.Bug-2825.stable.err
b/sql/test/BugTracker-2011/Tests/mkey-bulk_rotate_xor_hash.Bug-2825.stable.err
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2011/Tests/mkey-bulk_rotate_xor_hash.Bug-2825.stable.err
@@ -0,0 +1,39 @@
+stderr of test 'mkey-bulk_rotate_xor_hash.Bug-2825` in directory
'test/BugTracker-2011` itself:
+
+
+# 18:51:40 >
+# 18:51:40 > mserver5 --debug=10 --set gdk_nr_threads=0 --set
"gdk_dbfarm=/ufs/manegold/_/scratch0/Monet/HG/Apr2011/prefix/--disable-debug_--enable-optimize_--disable-assert/var/MonetDB"
--set mapi_open=true --set mapi_port=32579 --set monet_prompt= --trace
--forcemito --set mal_listing=2 "--dbname=mTests_test_BugTracker-2011" --set
mal_listing=0 ; echo ; echo Over..
+# 18:51:40 >
+
+# builtin opt gdk_dbname = demo
+# builtin opt gdk_dbfarm =
/ufs/manegold/_/scratch0/Monet/HG/Apr2011/prefix/--disable-debug_--enable-optimize_--disable-assert/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 default_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# builtin opt minimal_pipe = inline,remap,deadcode,multiplex,garbageCollector
+# builtin opt sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt gdk_dbfarm =
/ufs/manegold/_/scratch0/Monet/HG/Apr2011/prefix/--disable-debug_--enable-optimize_--disable-assert/var/MonetDB
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 32579
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbname = mTests_test_BugTracker-2011
+# cmdline opt mal_listing = 0
+
+# 18:51:40 >
+# 18:51:40 > mclient -lsql -ftest -i -e --host=rig --port=32579
+# 18:51:40 >
+
+
+# 18:51:40 >
+# 18:51:40 > Done.
+# 18:51:40 >
+
diff --git
a/sql/test/BugTracker-2011/Tests/mkey-bulk_rotate_xor_hash.Bug-2825.stable.out
b/sql/test/BugTracker-2011/Tests/mkey-bulk_rotate_xor_hash.Bug-2825.stable.out
new file mode 100644
--- /dev/null
+++
b/sql/test/BugTracker-2011/Tests/mkey-bulk_rotate_xor_hash.Bug-2825.stable.out
@@ -0,0 +1,58 @@
+stdout of test 'mkey-bulk_rotate_xor_hash.Bug-2825` in directory
'test/BugTracker-2011` itself:
+
+
+# 18:51:40 >
+# 18:51:40 > mserver5 --debug=10 --set gdk_nr_threads=0 --set
"gdk_dbfarm=/ufs/manegold/_/scratch0/Monet/HG/Apr2011/prefix/--disable-debug_--enable-optimize_--disable-assert/var/MonetDB"
--set mapi_open=true --set mapi_port=32579 --set monet_prompt= --trace
--forcemito --set mal_listing=2 "--dbname=mTests_test_BugTracker-2011" --set
mal_listing=0 ; echo ; echo Over..
+# 18:51:40 >
+
+# MonetDB 5 server v11.3.4
+# 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 7.749 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2011 MonetDB B.V., all rights reserved
+# Visit http://monetdb.cwi.nl/ for further information
+# Listening for connection requests on mapi:monetdb://rig.ins.cwi.nl:32579/
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+# SQL catalog created, loading sql scripts once
+
+Over..
+
+# 18:51:40 >
+# 18:51:40 > mclient -lsql -ftest -i -e --host=rig --port=32579
+# 18:51:40 >
+
+#create table table1 (user_id integer, item_id integer);
+#create table table2 (user_id integer, item_id integer, primary key(user_id,
item_id));
+#insert into table1 values (1,1);
+[ 1 ]
+#INSERT INTO table2(user_id,item_id)
+#SELECT DISTINCT USER_ID, ITEM_ID
+#FROM table1;
+[ 1 ]
+#delete from table2;
+[ 1 ]
+#insert into table1 values (1,1);
+[ 1 ]
+#SELECT DISTINCT USER_ID, ITEM_ID
+#FROM table1;
+% sys.table1, sys.table1 # table_name
+% user_id, item_id # name
+% int, int # type
+% 1, 1 # length
+[ 1, 1 ]
+#INSERT INTO table2(user_id,item_id)
+#SELECT DISTINCT USER_ID, ITEM_ID
+#FROM table1;
+[ 1 ]
+#drop table table1;
+#drop table table2;
+
+# 18:51:40 >
+# 18:51:40 > Done.
+# 18:51:40 >
+
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
