Changeset: 7a984e65052e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7a984e65052e
Removed Files:
monetdb5/modules/mal/Tests/cluster00.mal
monetdb5/modules/mal/Tests/cluster00.stable.err
monetdb5/modules/mal/Tests/cluster00.stable.out
monetdb5/optimizer/opt_cluster.c
monetdb5/optimizer/opt_cluster.h
Modified Files:
clients/Tests/exports.stable.out
monetdb5/modules/mal/Tests/All
monetdb5/modules/mal/mal_init.mal
monetdb5/optimizer/Makefile.ag
monetdb5/optimizer/opt_joinpath.c
monetdb5/optimizer/opt_support.c
monetdb5/optimizer/opt_support.h
monetdb5/optimizer/opt_wrapper.c
monetdb5/optimizer/optimizer.mal
Branch: default
Log Message:
Move the cluster optimizer to the attic.
Experimental code not used anymore.
diffs (truncated from 1102 to 300 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -1676,7 +1676,6 @@ str MTIMEunix_epoch(timestamp *ret);
int OPTaccumulatorsImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
void OPTaliasRemap(InstrPtr p, int *alias);
int OPTaliasesImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr p);
-int OPTclusterImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr p);
int OPTcoercionImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
int OPTcommonTermsImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
int OPTconstantsImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr p);
diff --git a/monetdb5/modules/mal/Tests/All b/monetdb5/modules/mal/Tests/All
--- a/monetdb5/modules/mal/Tests/All
+++ b/monetdb5/modules/mal/Tests/All
@@ -61,7 +61,6 @@ mapi06
mapi07
mapi01
-cluster00
tokenizer00
zorder
diff --git a/monetdb5/modules/mal/Tests/cluster00.mal
b/monetdb5/modules/mal/Tests/cluster00.mal
deleted file mode 100644
--- a/monetdb5/modules/mal/Tests/cluster00.mal
+++ /dev/null
@@ -1,32 +0,0 @@
-#test clustering a small table
-b:= bat.new(:oid,:int);
-c:= bat.new(:oid,:int);
-d:= bat.new(:oid,:int);
-barrier i:= 0:int;
- j:= i % 5;
- bat.append(b,j);
- j:= i % 3;
- bat.append(c,j);
- j:= i % 2;
- bat.append(d,j);
- redo i:= iterator.next(1:int,10:int);
-exit i;
-#bat.append(b,b);
-io.print(b,c,d);
-
-keys := cluster.key(b);
-io.print(keys);
-
-map:=cluster.map(keys);
-io.print(map);
-
-b1:= cluster.column(map,b);
-c1:= cluster.column(map,c);
-d1:= cluster.column(map,d);
-io.print(b1,c1,d1);
-
-# reshuffle
-map:= cluster.table(c,d,b);
-io.print(c,d,b);
-io.print(map);
-
diff --git a/monetdb5/modules/mal/Tests/cluster00.stable.err
b/monetdb5/modules/mal/Tests/cluster00.stable.err
deleted file mode 100644
--- a/monetdb5/modules/mal/Tests/cluster00.stable.err
+++ /dev/null
@@ -1,81 +0,0 @@
-stderr of test 'cluster00` in directory 'monetdb5/modules/mal` itself:
-
-
-# 14:20:04 >
-# 14:20:04 > mserver5 "--config=/ufs/mk/monet5//Linux/etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/mk/monet5//Linux/lib/MonetDB5:/ufs/mk/monet5//Linux/lib/MonetDB5/lib:/ufs/mk/monet5//Linux/lib/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/mk/monet5//Linux/var/MonetDB5/dbfarm" --set
"sql_logdir=/ufs/mk/monet5//Linux/var/MonetDB5/sql_logs" --set mapi_open=true
--set xrpc_open=true --set mapi_port=39938 --set xrpc_port=49692 --set
monet_prompt= --trace --dbname=mTests_src_modules_mal cluster00.mal
-# 14:20:04 >
-
-# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
-# builtin opt gdk_version = 1.25.0
-# builtin opt monet_pid = 4775
-# builtin opt prefix = /ufs/mk/monet5//Linux
-# builtin opt exec_prefix = ${prefix}
-# builtin opt gdk_dbname = tst
-# builtin opt gdk_dbfarm = ${prefix}/var/MonetDB
-# builtin opt gdk_debug = 8
-# builtin opt gdk_mem_bigsize = 262144
-# builtin opt gdk_alloc_map = yes
-# builtin opt gdk_mem_pagebits = 14
-# 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:${exec_prefix}/lib/bin
-# builtin opt monet_daemon = yes
-# builtin opt host = localhost
-# builtin opt mapi_port = 50000
-# builtin opt mapi_noheaders = no
-# builtin opt mapi_debug = 0
-# builtin opt mapi_clients = 2
-# builtin opt sql_debug = 0
-# builtin opt sql_logdir = ${prefix}/var/MonetDB
-# builtin opt xquery_logdir = ${prefix}/var/MonetDB
-# builtin opt standoff_ns = http://monetdb.cwi.nl/standoff
-# builtin opt standoff_start = start
-# builtin opt standoff_end = end
-# config opt prefix = /ufs/mk/monet5//Linux
-# config opt config = ${prefix}/etc/monetdb5.conf
-# config opt prefix = /ufs/mk/monet5//Linux
-# config opt exec_prefix = ${prefix}
-# config opt gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm
-# config opt gdk_dbname = demo
-# config opt gdk_alloc_map = no
-# config opt gdk_embedded = no
-# config opt gdk_debug = 0
-# config opt monet_mod_path =
${exec_prefix}/lib/MonetDB5:${exec_prefix}/lib/MonetDB5/lib:${exec_prefix}/lib/MonetDB5/bin
-# config opt monet_daemon = no
-# config opt monet_welcome = yes
-# config opt mero_msglog = ${prefix}/var/log/merovingian.log
-# config opt mero_errlog = ${prefix}/var/log/merovingian.log
-# config opt mero_timeinterval = 600
-# config opt mero_pidfile = ${prefix}/var/run/merovingian.pid
-# config opt mero_exittimeout = 7
-# config opt mero_doproxy = yes
-# config opt mero_discoveryttl = 600
-# config opt mal_init = ${exec_prefix}/lib/MonetDB5/mal_init.mal
-# config opt mal_listing = 50
-# config opt checkpoint_dir = ${prefix}/var/MonetDB5/chkpnt
-# config opt mapi_port = 50000
-# config opt mapi_open = false
-# config opt sql_debug = 0
-# config opt sql_logdir = ${prefix}/var/MonetDB5/sql_logs
-# config opt sql_init = ${exec_prefix}/lib/MonetDB5/sql_init.sql
-# cmdline opt config = /ufs/mk/monet5//Linux/etc/monetdb5.conf
-# cmdline opt gdk_nr_threads = 0
-# cmdline opt monet_mod_path =
/ufs/mk/monet5//Linux/lib/MonetDB5:/ufs/mk/monet5//Linux/lib/MonetDB5/lib:/ufs/mk/monet5//Linux/lib/MonetDB5/bin
-# cmdline opt gdk_dbfarm = /ufs/mk/monet5//Linux/var/MonetDB5/dbfarm
-# cmdline opt sql_logdir = /ufs/mk/monet5//Linux/var/MonetDB5/sql_logs
-# cmdline opt mapi_open = true
-# cmdline opt xrpc_open = true
-# cmdline opt mapi_port = 39938
-# cmdline opt xrpc_port = 49692
-# cmdline opt monet_prompt =
-# cmdline opt gdk_dbname = mTests_src_modules_mal
-# cmdline opt gdk_debug = 10
-#warning: please don't forget to set your vault key!
-#(see /ufs/mk/monet5//Linux/etc/monetdb5.conf)
-
-# 14:20:04 >
-# 14:20:04 > Done.
-# 14:20:04 >
-
diff --git a/monetdb5/modules/mal/Tests/cluster00.stable.out
b/monetdb5/modules/mal/Tests/cluster00.stable.out
deleted file mode 100644
--- a/monetdb5/modules/mal/Tests/cluster00.stable.out
+++ /dev/null
@@ -1,132 +0,0 @@
-stdout of test 'cluster00` in directory 'monetdb5/modules/mal` itself:
-
-
-# 14:20:04 >
-# 14:20:04 > mserver5 "--config=/ufs/mk/monet5//Linux/etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/mk/monet5//Linux/lib/MonetDB5:/ufs/mk/monet5//Linux/lib/MonetDB5/lib:/ufs/mk/monet5//Linux/lib/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/mk/monet5//Linux/var/MonetDB5/dbfarm" --set
"sql_logdir=/ufs/mk/monet5//Linux/var/MonetDB5/sql_logs" --set mapi_open=true
--set xrpc_open=true --set mapi_port=39938 --set xrpc_port=49692 --set
monet_prompt= --trace --dbname=mTests_src_modules_mal cluster00.mal
-# 14:20:04 >
-
-# MonetDB server v5.7.0, based on kernel v1.25.0
-# Serving database 'mTests_src_modules_mal', using 4 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
-# Copyright (c) 1993-July 2008 CWI.
-# Copyright (c) August 2008- MonetDB B.V., all rights reserved
-# Visit http://monetdb.cwi.nl/ for further information
-# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:37931/
-function user.main():void;
-#test clustering a small table
- b := bat.new(:oid,:int);
- c := bat.new(:oid,:int);
- d := bat.new(:oid,:int);
-barrier i := 0:int;
- j := calc.%(i,5);
- bat.append(b,j);
- j := calc.%(i,3);
- bat.append(c,j);
- j := calc.%(i,2);
- bat.append(d,j);
- redo i := iterator.next(1:int,10:int);
-exit i;
-#bat.append(b,b);
- io.print(b,c,d);
- keys := cluster.key(b);
- io.print(keys);
- map := cluster.map(keys);
- io.print(map);
- b1 := cluster.column(map,b);
- c1 := cluster.column(map,c);
- d1 := cluster.column(map,d);
- io.print(b1,c1,d1);
-# reshuffle
- map := cluster.table(c,d,b);
- io.print(c,d,b);
- io.print(map);
-end user.main;
-#--------------------------#
-# h t t t # name
-# void int int int # type
-#---------------------------------#
-[ 0@0, 0, 0, 0 ]
-[ 1@0, 1, 1, 1 ]
-[ 2@0, 2, 2, 0 ]
-[ 3@0, 3, 0, 1 ]
-[ 4@0, 4, 1, 0 ]
-[ 5@0, 0, 2, 1 ]
-[ 6@0, 1, 0, 0 ]
-[ 7@0, 2, 1, 1 ]
-[ 8@0, 3, 2, 0 ]
-[ 9@0, 4, 0, 1 ]
-#-----------------#
-# h t # name
-# void oid # type
-#-----------------#
-[ 0@0, 0@0 ]
-[ 1@0, 1@0 ]
-[ 2@0, 2@0 ]
-[ 3@0, 3@0 ]
-[ 4@0, 4@0 ]
-[ 5@0, 0@0 ]
-[ 6@0, 1@0 ]
-[ 7@0, 2@0 ]
-[ 8@0, 3@0 ]
-[ 9@0, 4@0 ]
-#-----------------#
-# h t # name
-# void oid # type
-#-----------------#
-[ 0@0, 0@0 ]
-[ 1@0, 1@0 ]
-[ 2@0, 2@0 ]
-[ 3@0, 3@0 ]
-[ 4@0, 4@0 ]
-[ 5@0, 5@0 ]
-[ 6@0, 6@0 ]
-[ 7@0, 7@0 ]
-[ 8@0, 8@0 ]
-[ 9@0, 9@0 ]
-#---------------------------------#
-# h t t t # name
-# void int int int # type
-#---------------------------------#
-[ 0@0, 0, 0, 0 ]
-[ 1@0, 1, 1, 1 ]
-[ 2@0, 2, 2, 0 ]
-[ 3@0, 3, 0, 1 ]
-[ 4@0, 4, 1, 0 ]
-[ 5@0, 0, 2, 1 ]
-[ 6@0, 1, 0, 0 ]
-[ 7@0, 2, 1, 1 ]
-[ 8@0, 3, 2, 0 ]
-[ 9@0, 4, 0, 1 ]
-#---------------------------------#
-# h t t t # name
-# void int int int # type
-#---------------------------------#
-[ 0@0, 0, 0, 0 ]
-[ 1@0, 1, 1, 1 ]
-[ 2@0, 2, 0, 2 ]
-[ 3@0, 0, 1, 3 ]
-[ 4@0, 1, 0, 4 ]
-[ 5@0, 2, 1, 0 ]
-[ 6@0, 0, 0, 1 ]
-[ 7@0, 1, 1, 2 ]
-[ 8@0, 2, 0, 3 ]
-[ 9@0, 0, 1, 4 ]
-#-----------------#
-# h t # name
-# void oid # type
-#-----------------#
-[ 0@0, 0@0 ]
-[ 1@0, 1@0 ]
-[ 2@0, 2@0 ]
-[ 3@0, 3@0 ]
-[ 4@0, 4@0 ]
-[ 5@0, 5@0 ]
-[ 6@0, 6@0 ]
-[ 7@0, 7@0 ]
-[ 8@0, 8@0 ]
-[ 9@0, 9@0 ]
-
-# 14:20:04 >
-# 14:20:04 > Done.
-# 14:20:04 >
-
diff --git a/monetdb5/modules/mal/mal_init.mal
b/monetdb5/modules/mal/mal_init.mal
--- a/monetdb5/modules/mal/mal_init.mal
+++ b/monetdb5/modules/mal/mal_init.mal
@@ -97,7 +97,6 @@ include sample;
include optimizer;
include iterator;
-include cluster;
include txtsim;
include tokenizer;
include zorder;
diff --git a/monetdb5/optimizer/Makefile.ag b/monetdb5/optimizer/Makefile.ag
--- a/monetdb5/optimizer/Makefile.ag
+++ b/monetdb5/optimizer/Makefile.ag
@@ -31,7 +31,6 @@ lib_optimizer = {
optimizer.c optimizer.h optimizer_private.h \
opt_accumulators.c opt_accumulators.h \
opt_aliases.c opt_aliases.h \
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
