Changeset: ec0b87cac84f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ec0b87cac84f
Modified Files:
MonetDB5/conf/monetdb5.conf.in
MonetDB5/src/mal/Tests/tst036.stable.err
MonetDB5/src/mal/Tests/tst054.stable.err
MonetDB5/src/mal/Tests/tst274.stable.err
MonetDB5/src/mal/Tests/tst450.stable.out
MonetDB5/src/mal/Tests/tst450.stable.out.Windows
MonetDB5/src/mal/Tests/tst866.stable.err
MonetDB5/src/mal/Tests/tst867.stable.err
MonetDB5/src/modules/mal/Makefile.ag
MonetDB5/src/modules/mal/Tests/All
MonetDB5/src/modules/mal/Tests/attach00.mal
MonetDB5/src/modules/mal/Tests/attach00.stable.err
MonetDB5/src/modules/mal/Tests/attach00.stable.out
MonetDB5/src/modules/mal/Tests/inspect05.stable.out
MonetDB5/src/modules/mal/Tests/sabaoth01.stable.err
MonetDB5/src/modules/mal/Tests/zorder.stable.err
MonetDB5/src/modules/mal/attach.mx
MonetDB5/src/modules/mal/mal_init.mx
MonetDB5/src/optimizer/Makefile.ag
MonetDB5/src/optimizer/Tests/All
MonetDB5/src/optimizer/Tests/cst02.stable.err
MonetDB5/src/optimizer/Tests/garbage1.stable.err
MonetDB5/src/optimizer/Tests/mapreduce00.mal
MonetDB5/src/optimizer/opt_mapreduce.mx
MonetDB5/src/optimizer/opt_prelude.mx
MonetDB5/src/optimizer/opt_support.mx
Branch: Oct2010
Log Message:
Removed attach module and mapreduce optimizer.
This will not be propagated to the default branch.
diffs (truncated from 1887 to 300 lines):
diff -r 6c6aa1837ef5 -r ec0b87cac84f MonetDB5/conf/monetdb5.conf.in
--- a/MonetDB5/conf/monetdb5.conf.in Fri Sep 10 15:04:43 2010 +0200
+++ b/MonetDB5/conf/monetdb5.conf.in Fri Sep 10 16:11:09 2010 +0200
@@ -241,10 +241,6 @@
# platforms only)
octopus_pipe=inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,constants,commonTerms,joinPath,octopus,deadcode,reduce,dataflow,history,multiplex,garbageCollector
#
-# The MapReduce pipeline for a different flavour of distributed
-# processing on Merovingian enabled platforms
-mapreduce_pipe=inline,remap,evaluate,costModel,coercions,emptySet,aliases,mapreduce,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
-#
# The default + datacyclotron
datacyclotron_pipe=inline,remap,evaluate,costModel,coercions,emptySet,aliases,datacyclotron,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,replication,multiplex,garbageCollector
#
diff -r 6c6aa1837ef5 -r ec0b87cac84f MonetDB5/src/mal/Tests/tst036.stable.err
--- a/MonetDB5/src/mal/Tests/tst036.stable.err Fri Sep 10 15:04:43 2010 +0200
+++ b/MonetDB5/src/mal/Tests/tst036.stable.err Fri Sep 10 16:11:09 2010 +0200
@@ -49,7 +49,6 @@
# 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,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
diff -r 6c6aa1837ef5 -r ec0b87cac84f MonetDB5/src/mal/Tests/tst054.stable.err
--- a/MonetDB5/src/mal/Tests/tst054.stable.err Fri Sep 10 15:04:43 2010 +0200
+++ b/MonetDB5/src/mal/Tests/tst054.stable.err Fri Sep 10 16:11:09 2010 +0200
@@ -47,7 +47,6 @@
# 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,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
diff -r 6c6aa1837ef5 -r ec0b87cac84f MonetDB5/src/mal/Tests/tst274.stable.err
--- a/MonetDB5/src/mal/Tests/tst274.stable.err Fri Sep 10 15:04:43 2010 +0200
+++ b/MonetDB5/src/mal/Tests/tst274.stable.err Fri Sep 10 16:11:09 2010 +0200
@@ -47,7 +47,6 @@
# 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,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
diff -r 6c6aa1837ef5 -r ec0b87cac84f MonetDB5/src/mal/Tests/tst450.stable.out
--- a/MonetDB5/src/mal/Tests/tst450.stable.out Fri Sep 10 15:04:43 2010 +0200
+++ b/MonetDB5/src/mal/Tests/tst450.stable.out Fri Sep 10 16:11:09 2010 +0200
@@ -115,7 +115,6 @@
[ "mal", nil ]
[ "manual", nil ]
[ "mapi", nil ]
-[ "mapreduce", nil ]
[ "master", nil ]
[ "mat", nil ]
[ "mdb", nil ]
diff -r 6c6aa1837ef5 -r ec0b87cac84f
MonetDB5/src/mal/Tests/tst450.stable.out.Windows
--- a/MonetDB5/src/mal/Tests/tst450.stable.out.Windows Fri Sep 10 15:04:43
2010 +0200
+++ b/MonetDB5/src/mal/Tests/tst450.stable.out.Windows Fri Sep 10 16:11:09
2010 +0200
@@ -115,7 +115,6 @@
[ "mal", nil ]
[ "manual", nil ]
[ "mapi", nil ]
-[ "mapreduce", nil ]
[ "master", nil ]
[ "mat", nil ]
[ "mdb", nil ]
diff -r 6c6aa1837ef5 -r ec0b87cac84f MonetDB5/src/mal/Tests/tst866.stable.err
--- a/MonetDB5/src/mal/Tests/tst866.stable.err Fri Sep 10 15:04:43 2010 +0200
+++ b/MonetDB5/src/mal/Tests/tst866.stable.err Fri Sep 10 16:11:09 2010 +0200
@@ -47,7 +47,6 @@
# 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,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
diff -r 6c6aa1837ef5 -r ec0b87cac84f MonetDB5/src/mal/Tests/tst867.stable.err
--- a/MonetDB5/src/mal/Tests/tst867.stable.err Fri Sep 10 15:04:43 2010 +0200
+++ b/MonetDB5/src/mal/Tests/tst867.stable.err Fri Sep 10 16:11:09 2010 +0200
@@ -47,7 +47,6 @@
# 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,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
diff -r 6c6aa1837ef5 -r ec0b87cac84f MonetDB5/src/modules/mal/Makefile.ag
--- a/MonetDB5/src/modules/mal/Makefile.ag Fri Sep 10 15:04:43 2010 +0200
+++ b/MonetDB5/src/modules/mal/Makefile.ag Fri Sep 10 16:11:09 2010 +0200
@@ -28,7 +28,7 @@
SEP = _
SOURCES = \
chopper.mx constraints.mx language.mx box.mx \
- profiler.mx const.mx attach.mx algebraExtensions.mx \
+ profiler.mx const.mx algebraExtensions.mx \
inspect.mx manual.mx pqueue.mx mkey.mx \
factories.mx groupby.mx mdb.mx \
urlbox.mx mat.mx histogram.mx \
@@ -170,7 +170,7 @@
SOURCES = batExtensions.mx bpm.mx mal_mapi.mx mal_io.mx clients.mx \
pcre.mx bbp.mx tablet.mx transaction.mx statistics.mx \
chopper.mx constraints.mx language.mx box.mx \
- profiler.mx const.mx attach.mx algebraExtensions.mx \
+ profiler.mx const.mx algebraExtensions.mx \
inspect.mx manual.mx pqueue.mx mkey.mx \
factories.mx groupby.mx mdb.mx \
urlbox.mx mat.mx histogram.mx \
@@ -186,7 +186,7 @@
HEADERS = mal
DIR = libdir/MonetDB5
SOURCES = language.mx constraints.mx mal_init.mx box.mx bbp.mx \
- profiler.mx const.mx attach.mx batExtensions.mx
algebraExtensions.mx \
+ profiler.mx const.mx batExtensions.mx algebraExtensions.mx \
inspect.mx manual.mx mal_io.mx pqueue.mx mkey.mx \
chopper.mx clients.mx \
factories.mx groupby.mx mdb.mx pcre.mx tablet.mx mat.mx
histogram.mx \
diff -r 6c6aa1837ef5 -r ec0b87cac84f MonetDB5/src/modules/mal/Tests/All
--- a/MonetDB5/src/modules/mal/Tests/All Fri Sep 10 15:04:43 2010 +0200
+++ b/MonetDB5/src/modules/mal/Tests/All Fri Sep 10 16:11:09 2010 +0200
@@ -39,8 +39,6 @@
remote10
-attach00
-
# this will always return something else
#sabaoth00
sabaoth01
diff -r 6c6aa1837ef5 -r ec0b87cac84f MonetDB5/src/modules/mal/Tests/attach00.mal
--- a/MonetDB5/src/modules/mal/Tests/attach00.mal Fri Sep 10 15:04:43
2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-#testing the attach functionality
-
-b:= bat.new(:oid,:int);
-bat.append(b,1);
-bat.append(b,2);
-bat.save(b); #essential to flush to disk
-
-s:= attach.location(b);
-io.print(s);
-
-c:bat[:oid,:int]:= attach.bind(s,2:lng);
-io.print(c);
-io.print(b);
-
-#z:= bat.info(b); io.print(z);
-#z:= bat.info(c); io.print(z);
diff -r 6c6aa1837ef5 -r ec0b87cac84f
MonetDB5/src/modules/mal/Tests/attach00.stable.err
--- a/MonetDB5/src/modules/mal/Tests/attach00.stable.err Fri Sep 10
15:04:43 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
-stderr of test 'attach00` in directory 'src/modules/mal` itself:
-
-
-# 11:25:03 >
-# 11:25:03 > mserver5 "--config=/ufs/mk/current//Linux/etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/mk/current//Linux/lib/MonetDB5:/ufs/mk/current//Linux/lib/MonetDB5/lib:/ufs/mk/current//Linux/lib/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/mk/current//Linux/var/MonetDB5/dbfarm" --set
mapi_open=true --set xrpc_open=true --set mapi_port=30996 --set xrpc_port=40785
--set monet_prompt= --set mal_listing=2 --trace
--dbname=mTests_src_modules_mal attach00.mal
-# 11:25:03 >
-
-# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
-# builtin opt gdk_version = 1.39.0
-# builtin opt prefix = /ufs/mk/current//Linux
-# 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}/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/mk/current//Linux
-# config opt config = ${prefix}/etc/monetdb5.conf
-# config opt prefix = /ufs/mk/current//Linux
-# config opt exec_prefix = ${prefix}
-# config opt gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm
-# config opt monet_mod_path =
${exec_prefix}/lib/MonetDB5:${exec_prefix}/lib/MonetDB5/lib:${exec_prefix}/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 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 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,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
-# config opt opt_debug =
-# cmdline opt config = /ufs/mk/current//Linux/etc/monetdb5.conf
-# cmdline opt gdk_nr_threads = 0
-# cmdline opt monet_mod_path =
/ufs/mk/current//Linux/lib/MonetDB5:/ufs/mk/current//Linux/lib/MonetDB5/lib:/ufs/mk/current//Linux/lib/MonetDB5/bin
-# cmdline opt gdk_dbfarm = /ufs/mk/current//Linux/var/MonetDB5/dbfarm
-# cmdline opt mapi_open = true
-# cmdline opt xrpc_open = true
-# cmdline opt mapi_port = 30996
-# cmdline opt xrpc_port = 40785
-# cmdline opt monet_prompt =
-# cmdline opt mal_listing = 2
-# cmdline opt gdk_dbname = mTests_src_modules_mal
-#warning: please don't forget to set your vault key!
-#(see /ufs/mk/current//Linux/etc/monetdb5.conf)
-
-# 11:25:03 >
-# 11:25:03 > Done.
-# 11:25:03 >
-
diff -r 6c6aa1837ef5 -r ec0b87cac84f
MonetDB5/src/modules/mal/Tests/attach00.stable.out
--- a/MonetDB5/src/modules/mal/Tests/attach00.stable.out Fri Sep 10
15:04:43 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-stdout of test 'attach00` in directory 'src/modules/mal` itself:
-
-
-# 11:25:03 >
-# 11:25:03 > mserver5 "--config=/ufs/mk/current//Linux/etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/mk/current//Linux/lib/MonetDB5:/ufs/mk/current//Linux/lib/MonetDB5/lib:/ufs/mk/current//Linux/lib/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/mk/current//Linux/var/MonetDB5/dbfarm" --set
mapi_open=true --set xrpc_open=true --set mapi_port=30996 --set xrpc_port=40785
--set monet_prompt= --set mal_listing=2 --trace
--dbname=mTests_src_modules_mal attach00.mal
-# 11:25:03 >
-
-# MonetDB server v5.21.0, based on kernel v1.39.0
-# Serving database 'mTests_src_modules_mal', using 4 threads
-# Compiled for x86_64-unknown-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
-#WARNING: LoaderException:loadLibrary:Loading error 'libmseed.so.2: cannot
open shared object file: No such file or directory' from within file 'vault'
-# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:30996/
-# MonetDB/SQL module v2.39.0 loaded
-# MonetDB/GIS module v0.19.0 loaded
-function user.main():void;
-#testing the attach functionality
- b := bat.new(:oid,:int);
- bat.append(b,1);
- bat.append(b,2);
- bat.save(b);
-#essential to flush to disk
- s := attach.location(b);
- io.print(s);
- c:bat[:oid,:int] := attach.bind(s,2:lng);
- io.print(c);
- io.print(b);
-#z:= bat.info(b); io.print(z);
-#z:= bat.info(c); io.print(z);
-end main;
-[
"/ufs/mk/current//Linux/var/MonetDB5/dbfarm/mTests_src_modules_mal/bat/10/1061"
]
-symlink
/ufs/mk/current//Linux/var/MonetDB5/dbfarm/mTests_src_modules_mal/bat/10/1061.tail
->bat/10/1062.tail
-#-----------------#
-# h t # name
-# void int # type
-#-----------------#
-[ 0...@0, 1 ]
-[ 1...@0, 2 ]
-#-----------------#
-# h t # name
-# void int # type
-#-----------------#
-[ 0...@0, 1 ]
-[ 1...@0, 2 ]
-
-# 11:25:03 >
-# 11:25:03 > Done.
-# 11:25:03 >
-
diff -r 6c6aa1837ef5 -r ec0b87cac84f
MonetDB5/src/modules/mal/Tests/inspect05.stable.out
--- a/MonetDB5/src/modules/mal/Tests/inspect05.stable.out Fri Sep 10
15:04:43 2010 +0200
+++ b/MonetDB5/src/modules/mal/Tests/inspect05.stable.out Fri Sep 10
16:11:09 2010 +0200
@@ -940,7 +940,6 @@
[ "new", "command", "cluster",
"(b:bat[:oid,:bte],bits:int,offset:int)
(psum:bat[:oid,:wrd],map:bat[:oid,:wrd]) ",
"CLS_create_bte;" ]
[ "split", "pattern", "cluster",
"(clustered:bat[:oid,:any_1],psum:bat[:oid,:wrd]):bat[:oid,:any_1]... ",
"CLS_split;" ]
[ "table", "pattern", "cluster",
"(b:bat[:oid,:any]...):bat[:oid,:oid] ",
"CLUSTER_table;"
]
-[ "getCloud", "command", "mapreduce",
"(nme:str):bat[:oid,:str] ",
"MRgetCloud;"
]
[ "multiplex", "pattern", "mal",
"(a:any...):any ",
"OPTremapMultiplex;"
]
[ "forgetPrevious", "pattern", "sql",
"():void ",
"OPTforgetPrevious;"
]
[ "keepquery", "function", "sql",
"(qid:int,qry:str,parse:lng,optimize:lng):void;",
"nil"
]
@@ -1008,8 +1007,6 @@
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
