Changeset: 6f4934e1ac02 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6f4934e1ac02
Modified Files:
MonetDB5/src/modules/kernel/status.mx
sql/src/test/BugTracker-2010/Tests/All
sql/src/test/BugTracker-2010/Tests/copy-into-too-long-string.Bug-2358.sql
sql/src/test/BugTracker-2010/Tests/copy-into-too-long-string.Bug-2358.stable.err
sql/src/test/BugTracker-2010/Tests/copy-into-too-long-string.Bug-2358.stable.out
Branch: Jun2010
Log Message:
Backed out changeset a3590f983661
It contained too much crap that was not supposed to be committed. (I'm
still not used to global commit iso local one.)
diffs (217 lines):
diff -r a3590f983661 -r 6f4934e1ac02 MonetDB5/src/modules/kernel/status.mx
--- a/MonetDB5/src/modules/kernel/status.mx Mon Jun 14 15:36:57 2010 +0200
+++ b/MonetDB5/src/modules/kernel/status.mx Mon Jun 14 15:39:20 2010 +0200
@@ -142,7 +142,7 @@
comment "The maximum usable amount of physical swapspace in KB (target only).";
command mem_maxsize(v:lng) :void
-address SYSsetmem_maxsize
+address set_mem_maxsize
comment "Set the maximum usable amount of physical swapspace in KB.";
command vm_cursize() :lng
@@ -179,6 +179,9 @@
#define status_export extern
#endif
+status_export str SYSgetDatabases(int *ret);
+status_export str SYSgetPorts(int *ret, str *lang);
+status_export int set_mem_maxsize(lng *num);
#endif
@-
@@ -220,19 +223,6 @@
return MAL_SUCCEED;
}
-status_export str SYSsetmem_maxsize(int *ret, lng *num);
-str
-SYSsetmem_maxsize(int *ret, lng *num)
-{
- size_t sze;
- if (*num < 0)
- throw(MAL, "status.mem_maxsize", "new size must not be < 0!");
- if (sze < GDK_mem_bigsize)
- set_mem_bigsize(num);
- GDK_mem_maxsize = MAX(GDK_mem_bigsize, sze);
- return MAL_SUCCEED;
-}
-
status_export str SYSgetvm_cursize(lng *num);
str
@@ -439,6 +429,16 @@
}
int
+set_mem_maxsize(lng *num)
+{
+ @:num2sze(mem_maxsize)@
+ if (sze < GDK_mem_bigsize)
+ set_mem_bigsize(num);
+ GDK_mem_maxsize = MAX(GDK_mem_bigsize, sze);
+ return GDK_SUCCEED;
+}
+
+int
get_vm_cursize(lng *num)
{
*num = GDKvm_cursize();
@@ -786,9 +786,6 @@
#ifndef F_OK
#define F_OK 0
#endif
-...@h
-status_export str SYSgetDatabases(int *ret);
-...@c
str SYSgetDatabases(int *ret)
{
BAT *b;
@@ -832,9 +829,6 @@
return MAL_SUCCEED;
}
-...@h
-status_export str SYSgetPorts(int *ret, str *lang);
-...@c
str SYSgetPorts(int *ret, str *lang)
{
BAT *b;
diff -r a3590f983661 -r 6f4934e1ac02 sql/src/test/BugTracker-2010/Tests/All
--- a/sql/src/test/BugTracker-2010/Tests/All Mon Jun 14 15:36:57 2010 +0200
+++ b/sql/src/test/BugTracker-2010/Tests/All Mon Jun 14 15:39:20 2010 +0200
@@ -8,4 +8,3 @@
embedded_record_seperator.SF-2991400
mat.slice_on_empty_BATs.SF-2994521
reorder.SF-2995671
-copy-into-too-long-string.Bug-2358
diff -r a3590f983661 -r 6f4934e1ac02
sql/src/test/BugTracker-2010/Tests/copy-into-too-long-string.Bug-2358.sql
--- a/sql/src/test/BugTracker-2010/Tests/copy-into-too-long-string.Bug-2358.sql
Mon Jun 14 15:36:57 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-create table t (c varchar(3));
-
-COPY 1 RECORDS INTO t FROM STDIN USING DELIMITERS '|','
-','"' NULL AS '';"abcd"
-
diff -r a3590f983661 -r 6f4934e1ac02
sql/src/test/BugTracker-2010/Tests/copy-into-too-long-string.Bug-2358.stable.err
---
a/sql/src/test/BugTracker-2010/Tests/copy-into-too-long-string.Bug-2358.stable.err
Mon Jun 14 15:36:57 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-stderr of test 'copy-into-too-long-string.Bug-2358` in directory
'src/test/BugTracker-2010` itself:
-
-
-# 15:34:26 >
-# 15:34:26 > mserver5
"--config=/ufs/fabian/scratch/monetdb/Jun2010/program-x86_64/etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/fabian/scratch/monetdb/Jun2010/program-x86_64/lib/MonetDB5:/ufs/fabian/scratch/monetdb/Jun2010/program-x86_64/lib/MonetDB5/lib:/ufs/fabian/scratch/monetdb/Jun2010/program-x86_64/lib/MonetDB5/bin"
--set
"gdk_dbfarm=/net/volund.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-Jun2010-volund.ins.cwi.nl/sql/dbfarm"
--set mapi_open=true --set xrpc_open=true --set mapi_port=32555 --set
xrpc_port=45116 --set monet_prompt= --set mal_listing=2 --trace
"--dbname=mTests_src_test_BugTracker-2010" --set mal_listing=0 ; echo ; echo
Over..
-# 15:34:26 >
-
-# builtin opt gdk_arch = 64bitx86_64-pc-linux-gnu
-# builtin opt gdk_version = 1.38.0
-# builtin opt prefix = /ufs/fabian/scratch/monetdb/Jun2010/program-x86_64
-# 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 =
/ufs/fabian/scratch/monetdb/Jun2010/program-x86_64/lib/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 sql_debug = 0
-# builtin opt standoff_ns =
-# builtin opt standoff_start = start
-# builtin opt standoff_end = end
-# config opt prefix = /ufs/fabian/scratch/monetdb/Jun2010/program-x86_64
-# config opt config = ${prefix}/etc/monetdb5.conf
-# config opt prefix = /ufs/fabian/scratch/monetdb/Jun2010/program-x86_64
-# config opt exec_prefix = ${prefix}
-# config opt gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm
-# config opt monet_mod_path =
/ufs/fabian/scratch/monetdb/Jun2010/program-x86_64/lib/MonetDB5:/ufs/fabian/scratch/monetdb/Jun2010/program-x86_64/lib/MonetDB5/lib:/ufs/fabian/scratch/monetdb/Jun2010/program-x86_64/lib/MonetDB5/bin
-# config opt mero_pidfile = ${prefix}/var/run/MonetDB/merovingian.pid
-# config opt mero_controlport = 50001
-# config opt sql_optimizer = default_pipe
-# config opt minimal_pipe = inline,remap,deadcode,multiplex,garbageCollector
-# config opt default_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,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 mapreduce_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mapreduce,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
-# config opt datacyclotron_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,datacyclotron,mergetable,deadcode,constants,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,replication,multiplex,garbageCollector
-# config opt derive_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,derivePath,joinPath,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/fabian/scratch/monetdb/Jun2010/program-x86_64/etc/monetdb5.conf
-# cmdline opt gdk_nr_threads = 0
-# cmdline opt monet_mod_path =
/ufs/fabian/scratch/monetdb/Jun2010/program-x86_64/lib/MonetDB5:/ufs/fabian/scratch/monetdb/Jun2010/program-x86_64/lib/MonetDB5/lib:/ufs/fabian/scratch/monetdb/Jun2010/program-x86_64/lib/MonetDB5/bin
-# cmdline opt gdk_dbfarm =
/net/volund.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-Jun2010-volund.ins.cwi.nl/sql/dbfarm
-# cmdline opt mapi_open = true
-# cmdline opt xrpc_open = true
-# cmdline opt mapi_port = 32555
-# cmdline opt xrpc_port = 45116
-# 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/fabian/scratch/monetdb/Jun2010/program-x86_64/etc/monetdb5.conf)
-
-# 15:34:26 >
-# 15:34:26 > mclient -lsql -ftest -i -e --host=volund --port=32555
-# 15:34:26 >
-
-MAPI = mone...@volund:32555
-QUERY = COPY 1 RECORDS INTO t FROM STDIN USING DELIMITERS '|','
-
- !failed to import table
-
-# 15:34:26 >
-# 15:34:26 > Done.
-# 15:34:26 >
-
diff -r a3590f983661 -r 6f4934e1ac02
sql/src/test/BugTracker-2010/Tests/copy-into-too-long-string.Bug-2358.stable.out
---
a/sql/src/test/BugTracker-2010/Tests/copy-into-too-long-string.Bug-2358.stable.out
Mon Jun 14 15:36:57 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-stdout of test 'copy-into-too-long-string.Bug-2358` in directory
'src/test/BugTracker-2010` itself:
-
-
-# 15:34:26 >
-# 15:34:26 > mserver5
"--config=/ufs/fabian/scratch/monetdb/Jun2010/program-x86_64/etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/fabian/scratch/monetdb/Jun2010/program-x86_64/lib/MonetDB5:/ufs/fabian/scratch/monetdb/Jun2010/program-x86_64/lib/MonetDB5/lib:/ufs/fabian/scratch/monetdb/Jun2010/program-x86_64/lib/MonetDB5/bin"
--set
"gdk_dbfarm=/net/volund.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-Jun2010-volund.ins.cwi.nl/sql/dbfarm"
--set mapi_open=true --set xrpc_open=true --set mapi_port=32555 --set
xrpc_port=45116 --set monet_prompt= --set mal_listing=2 --trace
"--dbname=mTests_src_test_BugTracker-2010" --set mal_listing=0 ; echo ; echo
Over..
-# 15:34:26 >
-
-# MonetDB server v5.20.0, based on kernel v1.38.0
-# Serving database 'mTests_src_test_BugTracker-2010', using 4 threads
-# Compiled for x86_64-pc-linux-gnu/64bit with 64bit OIDs dynamically linked
-# Found 7.751 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://volund.ins.cwi.nl:32555/
-# MonetDB/SQL module v2.38.0 loaded
-# MonetDB/GIS module v0.18.0 loaded
-
-Ready.
-
-Over..
-
-# 15:34:26 >
-# 15:34:26 > mclient -lsql -ftest -i -e --host=volund --port=32555
-# 15:34:26 >
-
-
-# 15:34:26 >
-# 15:34:26 > Done.
-# 15:34:26 >
-
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
