Changeset: 08588d2ce405 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=08588d2ce405
Modified Files:
Branch: default
Log Message:
Merge heads.
diffs (200 lines):
diff -r caa078247501 -r 08588d2ce405
sql/src/backends/monet5/merovingian/ChangeLog.Oct2010
--- a/sql/src/backends/monet5/merovingian/ChangeLog.Oct2010 Wed Nov 17
18:16:37 2010 +0100
+++ b/sql/src/backends/monet5/merovingian/ChangeLog.Oct2010 Thu Nov 18
10:31:41 2010 +0100
@@ -1,3 +1,7 @@
# ChangeLog file for sql/src/backends/monet5/merovingian
# This file is updated with mchangelog
+* Wed Nov 17 2010 Sjoerd Mullender <sjo...@acm.org>
+- Fixed off-by-one error when abbreviating long database names in the
+ monetdb status command.
+
diff -r caa078247501 -r 08588d2ce405
sql/src/backends/monet5/merovingian/utils/utils.c
--- a/sql/src/backends/monet5/merovingian/utils/utils.c Wed Nov 17 18:16:37
2010 +0100
+++ b/sql/src/backends/monet5/merovingian/utils/utils.c Thu Nov 18 10:31:41
2010 +0100
@@ -266,8 +266,8 @@
if ((len = strlen(in)) > width) {
/* position abbreviation dots in the middle (Mac style, iso
- * Windos style) */
- memcpy(ret, in, (width / 2) - 3);
+ * Windows style) */
+ memcpy(ret, in, (width / 2) - 2);
memcpy(ret + (width / 2) - 2, "...", 3);
off = len - (width - ((width / 2) - 2) - 3);
memcpy(ret + (width / 2) + 1, in + off, (len - off) + 1);
diff -r caa078247501 -r 08588d2ce405 sql/src/test/BugTracker-2010/Tests/All
--- a/sql/src/test/BugTracker-2010/Tests/All Wed Nov 17 18:16:37 2010 +0100
+++ b/sql/src/test/BugTracker-2010/Tests/All Thu Nov 18 10:31:41 2010 +0100
@@ -72,3 +72,4 @@
join_problem.Bug-2694
TypeException_with_missing_function.Bug-2674
join-and-like.Bug-2715
+between-timestamp.Bug-2718
diff -r caa078247501 -r 08588d2ce405
sql/src/test/BugTracker-2010/Tests/between-timestamp.Bug-2718.sql
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/src/test/BugTracker-2010/Tests/between-timestamp.Bug-2718.sql Thu Nov
18 10:31:41 2010 +0100
@@ -0,0 +1,14 @@
+start transaction;
+
+create table bug2718 (time timestamp, val int);
+insert into bug2718 values (timestamp '2010-11-17 13:37:55', 1);
+insert into bug2718 values (timestamp '2010-11-17 13:37:56', 2);
+insert into bug2718 values (timestamp '2010-11-17 13:37:57', 3);
+select * from bug2718;
+select t1.time, count(t2.val)
+from bug2718 t1, bug2718 t2
+where t2.time between (t1.time - interval '1' second) and (t1.time + interval
'1' second)
+group by t1.time
+order by t1.time;
+
+rollback;
diff -r caa078247501 -r 08588d2ce405
sql/src/test/BugTracker-2010/Tests/between-timestamp.Bug-2718.stable.err
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/src/test/BugTracker-2010/Tests/between-timestamp.Bug-2718.stable.err
Thu Nov 18 10:31:41 2010 +0100
@@ -0,0 +1,79 @@
+stderr of test 'between-timestamp.Bug-2718` in directory
'src/test/BugTracker-2010` itself:
+
+
+# 14:43:35 >
+# 14:43:35 > mserver5 "--config=/ufs/sjoerd/Monet-stable/etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/sjoerd/Monet-stable/lib64/MonetDB5:/ufs/sjoerd/Monet-stable/lib64/MonetDB5/lib:/ufs/sjoerd/Monet-stable/lib64/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/sjoerd/Monet-stable/var/MonetDB5/dbfarm" --set
mapi_open=true --set xrpc_open=true --set mapi_port=33285 --set xrpc_port=48650
--set monet_prompt= --trace --forcemito --set mal_listing=2
"--dbname=mTests_src_test_BugTracker-2010" --set mal_listing=0 ; echo ; echo
Over..
+# 14:43:35 >
+
+# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
+# builtin opt gdk_version = 1.40.2
+# builtin opt prefix = /ufs/sjoerd/Monet-stable
+# builtin opt exec_prefix = ${prefix}
+# builtin opt gdk_dbname = demo
+# builtin opt gdk_dbfarm = ${prefix}/var/MonetDB/dbfarm
+# builtin opt gdk_debug = 0
+# builtin opt gdk_alloc_map = no
+# builtin opt gdk_vmtrim = yes
+# builtin opt monet_admin = adm
+# builtin opt monet_prompt = >
+# builtin opt monet_welcome = yes
+# builtin opt monet_mod_path = ${exec_prefix}/lib64/MonetDB
+# builtin opt monet_daemon = no
+# builtin opt host = localhost
+# builtin opt mapi_port = 50000
+# builtin opt mapi_clients = 2
+# 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
+# builtin opt standoff_ns =
+# builtin opt standoff_start = start
+# builtin opt standoff_end = end
+# config opt prefix = /ufs/sjoerd/Monet-stable
+# config opt config = ${prefix}/etc/monetdb5.conf
+# config opt prefix = /ufs/sjoerd/Monet-stable
+# config opt exec_prefix = ${prefix}
+# config opt gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm
+# config opt monet_mod_path =
${exec_prefix}/lib64/MonetDB5:${exec_prefix}/lib64/MonetDB5/lib:${exec_prefix}/lib64/MonetDB5/bin
+# config opt mero_pidfile = ${prefix}/var/run/MonetDB/merovingian.pid
+# config opt mero_controlport = 50001
+# config opt no_mitosis_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt sequential_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,history,multiplex,garbageCollector
+# config opt nov2009_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt replication_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,replication,multiplex,garbageCollector
+# config opt accumulator_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,accumulators,dataflow,history,multiplex,garbageCollector
+# config opt recycler_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,deadcode,constants,commonTerms,joinPath,deadcode,recycle,reduce,dataflow,history,multiplex,garbageCollector
+# config opt cracker_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,selcrack,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt sidcrack_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,sidcrack,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt datacell_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,deadcode,constants,commonTerms,joinPath,datacell,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt octopus_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,constants,commonTerms,joinPath,octopus,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt datacyclotron_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,datacyclotron,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,replication,multiplex,garbageCollector
+# config opt derive_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,derivePath,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt dictionary_pipe =
inline,remap,dictionary,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt compression_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,compression,dataflow,history,multiplex,garbageCollector
+# cmdline opt config = /ufs/sjoerd/Monet-stable/etc/monetdb5.conf
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt monet_mod_path =
/ufs/sjoerd/Monet-stable/lib64/MonetDB5:/ufs/sjoerd/Monet-stable/lib64/MonetDB5/lib:/ufs/sjoerd/Monet-stable/lib64/MonetDB5/bin
+# cmdline opt gdk_dbfarm = /ufs/sjoerd/Monet-stable/var/MonetDB5/dbfarm
+# cmdline opt mapi_open = true
+# cmdline opt xrpc_open = true
+# cmdline opt mapi_port = 33285
+# cmdline opt xrpc_port = 48650
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbname = mTests_src_test_BugTracker-2010
+# cmdline opt mal_listing = 0
+#warning: please don't forget to set your vault key!
+#(see /ufs/sjoerd/Monet-stable/etc/monetdb5.conf)
+
+# 14:43:35 >
+# 14:43:35 > mclient -lsql -ftest -i -e --host=ottar --port=33285
+# 14:43:35 >
+
+
+# 14:43:36 >
+# 14:43:36 > Done.
+# 14:43:36 >
+
diff -r caa078247501 -r 08588d2ce405
sql/src/test/BugTracker-2010/Tests/between-timestamp.Bug-2718.stable.out
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/src/test/BugTracker-2010/Tests/between-timestamp.Bug-2718.stable.out
Thu Nov 18 10:31:41 2010 +0100
@@ -0,0 +1,62 @@
+stdout of test 'between-timestamp.Bug-2718` in directory
'src/test/BugTracker-2010` itself:
+
+
+# 14:43:35 >
+# 14:43:35 > mserver5 "--config=/ufs/sjoerd/Monet-stable/etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/sjoerd/Monet-stable/lib64/MonetDB5:/ufs/sjoerd/Monet-stable/lib64/MonetDB5/lib:/ufs/sjoerd/Monet-stable/lib64/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/sjoerd/Monet-stable/var/MonetDB5/dbfarm" --set
mapi_open=true --set xrpc_open=true --set mapi_port=33285 --set xrpc_port=48650
--set monet_prompt= --trace --forcemito --set mal_listing=2
"--dbname=mTests_src_test_BugTracker-2010" --set mal_listing=0 ; echo ; echo
Over..
+# 14:43:35 >
+
+# MonetDB server v5.22.2, based on kernel v1.40.2
+# Not released
+# Serving database 'mTests_src_test_BugTracker-2010', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 7.750 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2010 MonetDB B.V., all rights reserved
+# Visit http://monetdb.cwi.nl/ for further information
+# Listening for connection requests on mapi:monetdb://ottar.ins.cwi.nl:33285/
+# MonetDB/SQL module v2.40.2 loaded
+# MonetDB/GIS module v0.20.2 loaded
+
+Ready.
+# SQL catalog created, loading sql scripts once
+
+Over..
+
+# 14:43:35 >
+# 14:43:35 > mclient -lsql -ftest -i -e --host=ottar --port=33285
+# 14:43:35 >
+
+#start transaction;
+#create table bug2718 (time timestamp, val int);
+#insert into bug2718 values (timestamp '2010-11-17 13:37:55', 1);
+[ 1 ]
+#insert into bug2718 values (timestamp '2010-11-17 13:37:56', 2);
+[ 1 ]
+#insert into bug2718 values (timestamp '2010-11-17 13:37:57', 3);
+[ 1 ]
+#select * from bug2718;
+% sys.bug2718, sys.bug2718 # table_name
+% time, val # name
+% timestamp, int # type
+% 26, 1 # length
+[ 2010-11-17 13:37:55.000000, 1 ]
+[ 2010-11-17 13:37:56.000000, 2 ]
+[ 2010-11-17 13:37:57.000000, 3 ]
+#select t1.time, count(t2.val)
+#from bug2718 t1, bug2718 t2
+#where t2.time between (t1.time - interval '1' second) and (t1.time + interval
'1' second)
+#group by t1.time
+#order by t1.time;
+% sys.bug2718, sys.bug2718 # table_name
+% time, val # name
+% timestamp, int # type
+% 26, 1 # length
+[ 2010-11-17 13:37:55.000000, 2 ]
+[ 2010-11-17 13:37:56.000000, 3 ]
+[ 2010-11-17 13:37:57.000000, 2 ]
+#rollback;
+
+# 14:43:36 >
+# 14:43:36 > Done.
+# 14:43:36 >
+
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
