Changeset: 67224c43085a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=67224c43085a
Modified Files:
monetdb5/modules/mal/mat.mx
monetdb5/optimizer/opt_mergetable.mx
sql/test/BugTracker-2011/Tests/All
sql/test/BugTracker-2011/Tests/missing_refine_reverse.Bug-2898.sql
sql/test/BugTracker-2011/Tests/missing_refine_reverse.Bug-2898.stable.err
sql/test/BugTracker-2011/Tests/missing_refine_reverse.Bug-2898.stable.out
Branch: Aug2011
Log Message:
fix bug 2898 (by renaming refine_rev into refine_reverse)
diffs (140 lines):
diff --git a/monetdb5/modules/mal/mat.mx b/monetdb5/modules/mal/mat.mx
--- a/monetdb5/modules/mal/mat.mx
+++ b/monetdb5/modules/mal/mat.mx
@@ -96,7 +96,7 @@ pattern refine(sorted:bat[:void,:any_2],
address MATrefine
comment "refine map.";
-pattern refine_rev(sorted:bat[:void,:any_2], map:bat[:void,:bte],
b:bat[:any_1,:any_3]...)
+pattern refine_reverse(sorted:bat[:void,:any_2], map:bat[:void,:bte],
b:bat[:any_1,:any_3]...)
(rsorted:bat[:void,:oid], rmap:bat[:void,:bte])
address MATrefineReverse
comment "refine map.";
diff --git a/monetdb5/optimizer/opt_mergetable.mx
b/monetdb5/optimizer/opt_mergetable.mx
--- a/monetdb5/optimizer/opt_mergetable.mx
+++ b/monetdb5/optimizer/opt_mergetable.mx
@@ -1362,7 +1362,7 @@ mat_pack_sort(MalBlkPtr mb, InstrPtr p,
if (s->argc == 2) /* sort */
stpe = tpe;
- /* mat sortTail/sortTailReverse and refine/refine_rev */
+ /* mat sortTail/sortTailReverse and refine/refine_reverse */
setModuleId(pck,matRef);
setFunctionId(pck,getFunctionId(s));
/* double outputs (sorted values and map) */
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
@@ -47,3 +47,4 @@ non-stable-select-bug.Bug-2894
HAVE_PERL?perl-short-read-bug.Bug-2897
device-self-ref-fk
rand-with-seed.Bug-2900
+missing_refine_reverse.Bug-2898
diff --git a/sql/test/BugTracker-2011/Tests/missing_refine_reverse.Bug-2898.sql
b/sql/test/BugTracker-2011/Tests/missing_refine_reverse.Bug-2898.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2011/Tests/missing_refine_reverse.Bug-2898.sql
@@ -0,0 +1,5 @@
+create table t ( i int, j int );
+insert into t values (1,2),(2,3),(3,4),(4,1), (5,3);
+insert into t values (1,2),(2,3),(3,4),(4,1), (5,3);
+select * from t where i < 10 order by i asc, j desc;
+drop table t;
diff --git
a/sql/test/BugTracker-2011/Tests/missing_refine_reverse.Bug-2898.stable.err
b/sql/test/BugTracker-2011/Tests/missing_refine_reverse.Bug-2898.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2011/Tests/missing_refine_reverse.Bug-2898.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'missing_refine_reverse.Bug-2898` in directory
'test/BugTracker-2011` itself:
+
+
+# 09:31:41 >
+# 09:31:41 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB" "--set"
"mapi_open=true" "--set" "mapi_port=33800" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2011"
"--set" "mal_listing=0"
+# 09:31:41 >
+
+# builtin opt gdk_dbname = demo
+# builtin opt gdk_dbfarm =
/home/niels/scratch/rc-clean/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-clean/Linux-x86_64/var/MonetDB
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 33800
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbname = mTests_test_BugTracker-2011
+# cmdline opt mal_listing = 0
+
+# 09:31:41 >
+# 09:31:41 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=niels"
"--port=33800"
+# 09:31:41 >
+
+
+# 09:31:41 >
+# 09:31:41 > "Done."
+# 09:31:41 >
+
diff --git
a/sql/test/BugTracker-2011/Tests/missing_refine_reverse.Bug-2898.stable.out
b/sql/test/BugTracker-2011/Tests/missing_refine_reverse.Bug-2898.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2011/Tests/missing_refine_reverse.Bug-2898.stable.out
@@ -0,0 +1,51 @@
+stdout of test 'missing_refine_reverse.Bug-2898` in directory
'test/BugTracker-2011` itself:
+
+
+# 09:31:41 >
+# 09:31:41 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB" "--set"
"mapi_open=true" "--set" "mapi_port=33800" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2011"
"--set" "mal_listing=0"
+# 09:31:41 >
+
+# MonetDB 5 server v11.5.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 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:33800/
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 09:31:41 >
+# 09:31:41 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=niels"
"--port=33800"
+# 09:31:41 >
+
+#create table t ( i int, j int );
+#insert into t values (1,2),(2,3),(3,4),(4,1), (5,3);
+[ 5 ]
+#insert into t values (1,2),(2,3),(3,4),(4,1), (5,3);
+[ 5 ]
+#select * from t where i < 10 order by i asc, j desc;
+% sys.t, sys.t # table_name
+% i, j # name
+% int, int # type
+% 1, 1 # length
+[ 1, 2 ]
+[ 1, 2 ]
+[ 2, 3 ]
+[ 2, 3 ]
+[ 3, 4 ]
+[ 3, 4 ]
+[ 4, 1 ]
+[ 4, 1 ]
+[ 5, 3 ]
+[ 5, 3 ]
+#drop table t;
+
+# 09:31:41 >
+# 09:31:41 > "Done."
+# 09:31:41 >
+
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
