Changeset: d651cbc76e77 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d651cbc76e77
Removed Files:
monetdb5/mal/Tests/tst267.mal
monetdb5/mal/Tests/tst267.stable.err
monetdb5/mal/Tests/tst267.stable.out
monetdb5/modules/mal/Tests/array01.mal
monetdb5/modules/mal/Tests/array01.stable.err
monetdb5/modules/mal/Tests/array01.stable.out
monetdb5/modules/mal/Tests/array02.mal
monetdb5/modules/mal/Tests/array02.stable.err
monetdb5/modules/mal/Tests/array02.stable.out
monetdb5/modules/mal/Tests/array03.mal
monetdb5/modules/mal/Tests/array03.stable.err
monetdb5/modules/mal/Tests/array03.stable.out
monetdb5/modules/mal/Tests/array04.mal
monetdb5/modules/mal/Tests/array04.stable.err
monetdb5/modules/mal/Tests/array04.stable.out
Modified Files:
clients/Tests/exports.stable.out
monetdb5/mal/Tests/All
monetdb5/modules/mal/Tests/All
monetdb5/modules/mal/array.mx
Branch: sciql
Log Message:
array.mx clean-up: removed (yet?) unused
array.{map,unmap,tiles,replace,product}()
dead code remains available in the HG attic
diffs (truncated from 1411 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
@@ -785,17 +785,12 @@ str ALGuselect1(int *result, int *bid, p
str ALGuselectInclusive(int *result, int *bid, ptr low, ptr high, bit *lin,
bit *rin);
str ARRAYfiller(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str ARRAYfiller_bat(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str ARRAYmap(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str ARRAYproduct(int *ret, int *bid, int *rid);
-str ARRAYreplace(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str ARRAYreplaceScalar(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str ARRAYseries_bte(int *ret, bte *start, bte *step, bte *stop, int *grp, int
*series);
str ARRAYseries_dbl(int *ret, dbl *start, dbl *step, dbl *stop, int *grp, int
*series);
str ARRAYseries_flt(int *ret, flt *start, flt *step, flt *stop, int *grp, int
*series);
str ARRAYseries_int(int *ret, int *start, int *step, int *stop, int *grp, int
*series);
str ARRAYseries_lng(int *ret, lng *start, lng *step, lng *stop, int *grp, int
*series);
str ARRAYseries_sht(int *ret, sht *start, sht *step, sht *stop, int *grp, int
*series);
-str ARRAYtiles(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str ARRAYtilesAvg_bte(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str ARRAYtilesAvg_dbl(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str ARRAYtilesAvg_flt(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
@@ -820,7 +815,6 @@ str ARRAYtilesSum_flt(Client cntxt, MalB
str ARRAYtilesSum_int(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str ARRAYtilesSum_lng(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str ARRAYtilesSum_sht(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str ARRAYumap(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str ATTbind(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str ATTbindPartition(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str ATTlocation(str *fnme, int *bid);
diff --git a/monetdb5/mal/Tests/All b/monetdb5/mal/Tests/All
--- a/monetdb5/mal/Tests/All
+++ b/monetdb5/mal/Tests/All
@@ -139,7 +139,6 @@ tst2560
tst260
tst2570
tst265
-tst267
tst270
tst272
tst273
diff --git a/monetdb5/mal/Tests/tst267.mal b/monetdb5/mal/Tests/tst267.mal
deleted file mode 100644
--- a/monetdb5/mal/Tests/tst267.mal
+++ /dev/null
@@ -1,14 +0,0 @@
-# Grouped sums
-a:= bat.new(:oid,:int);
-b:= bat.new(:oid,:int);
-bat.append(a,1);
-bat.append(a,2);
-bat.append(b,5);
-bat.append(b,6);
-bat.append(b,7);
-bat.append(b,8);
-io.print(a);
-io.print(b);
-
-g:= array.product(a,b);
-io.print(g);
diff --git a/monetdb5/mal/Tests/tst267.stable.err
b/monetdb5/mal/Tests/tst267.stable.err
deleted file mode 100644
--- a/monetdb5/mal/Tests/tst267.stable.err
+++ /dev/null
@@ -1,12 +0,0 @@
-stderr of test 'tst267` in directory 'mal` itself:
-
-
-# 20:55:59 >
-# 20:55:59 > Mtimeout -timeout 60 Mserver
"--config=/ufs/mk/monet5/src/mal/Tests/All.conf" --debug=10 --set
"monet_mod_path=/ufs/mk/monet5/Linux/lib/MonetDB5:/ufs/mk/opensource/MonetDB/Linux/lib/MonetDB"
--set "gdk_dbfarm=/ufs/mk/opensource/MonetDB/Linux/var/MonetDB5/dbfarm" --set
"sql_logdir=/ufs/mk/opensource/MonetDB/Linux/var/MonetDB5/log" --set
mapi_port=40036 --set sql_port=52173 --set monet_prompt= --trace
"--config=/ufs/mk/monet5/src/mal/Tests/All.conf" --dbname=mTests_src_mal
tst267.mal </dev/null
-# 20:55:59 >
-
-
-# 20:55:59 >
-# 20:55:59 > Done.
-# 20:55:59 >
-
diff --git a/monetdb5/mal/Tests/tst267.stable.out
b/monetdb5/mal/Tests/tst267.stable.out
deleted file mode 100644
--- a/monetdb5/mal/Tests/tst267.stable.out
+++ /dev/null
@@ -1,72 +0,0 @@
-stdout of test 'tst267` in directory 'mal` itself:
-
-
-# 20:55:59 >
-# 20:55:59 > Mtimeout -timeout 60 Mserver
"--config=/ufs/mk/monet5/src/mal/Tests/All.conf" --debug=10 --set
"monet_mod_path=/ufs/mk/monet5/Linux/lib/MonetDB5:/ufs/mk/opensource/MonetDB/Linux/lib/MonetDB"
--set "gdk_dbfarm=/ufs/mk/opensource/MonetDB/Linux/var/MonetDB5/dbfarm" --set
"sql_logdir=/ufs/mk/opensource/MonetDB/Linux/var/MonetDB5/log" --set
mapi_port=40036 --set sql_port=52173 --set monet_prompt= --trace
"--config=/ufs/mk/monet5/src/mal/Tests/All.conf" --dbname=mTests_src_mal
tst267.mal </dev/null
-# 20:55:59 >
-
-# Monet Database Server V4.7.0
-# Copyright (c) 1993-2005, CWI. All rights reserved.
-# Compiled for i686-redhat-linux-gnu/32bit; dynamically linked.
-# config:/ufs/mk/monet5/src/mal/Tests/All.conf
-# dbfarm:/ufs/mk/opensource/MonetDB/Linux/var/MonetDB5/dbfarm
-# dbname:mTests_src_mal
-# Visit http://monetdb.cwi.nl/ for further information.
-## Grouped sums
-#a:= new(:void,:int);
-#setSequenceBase(a,0:oid);
-#b:= new(:void,:int);
-#setSequenceBase(b,0:oid);
-#insert(a,1);
-#insert(a,2);
-#insert(b,3);
-#insert(b,4);
-#insert(b,5);
-#print(a);
-#print(b);
-#
-#g:= array.*(a,b);
-#print(g);
-#
-function user.main():void;
-# Grouped sums
- a := bat.new(:oid,:int);
- b := bat.new(:oid,:int);
- bat.append(a,1);
- bat.append(a,2);
- bat.append(b,5);
- bat.append(b,6);
- bat.append(b,7);
- bat.append(b,8);
- io.print(a);
- io.print(b);
- g := array.product(a,b);
- io.print(g);
-end main;
-#-----------------#
-# h tmp_13 # name
-# void int # type
-#-----------------#
-[ 0@0, 1 ]
-[ 1@0, 2 ]
-#-----------------#
-# h tmp_14 # name
-# void int # type
-#-----------------#
-[ 0@0, 5 ]
-[ 1@0, 6 ]
-[ 2@0, 7 ]
-[ 3@0, 8 ]
-#-----------------#
-# h tmp_15 # name
-# void int # type
-#-----------------#
-[ 1, 5 ]
-[ 2, 6 ]
-[ 1, 7 ]
-[ 2, 8 ]
-
-# 20:55:59 >
-# 20:55:59 > Done.
-# 20:55:59 >
-
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
@@ -64,10 +64,6 @@ tokenizer00
zorder
array00
-array01
-array02
-array03
-array04
#HAVE_RAPTOR?rdf
diff --git a/monetdb5/modules/mal/Tests/array01.mal
b/monetdb5/modules/mal/Tests/array01.mal
deleted file mode 100644
--- a/monetdb5/modules/mal/Tests/array01.mal
+++ /dev/null
@@ -1,49 +0,0 @@
-#extraction of cell positions from arrays
-
-#create array v(i int dimension[0:1:4], payload:int)
-v:= array.series(0,1,4,1,1);
-vv:= array.series(0,3,12,1,1);
-io.print(v,vv);
-
-#create array M(x int dimension[0:2:6], y int dimension[0:1:4], int default
333);
-mx:= array.series(0,2,6,4,1);
-my:= array.series(0,1,4,1,3);
-mv:= array.series(0,1,12,1,1);
-io.print(mx,my,mv);
-
-#extract the indices from both
-#do a point select
-x:= bat.new(:oid,:int);
-bat.insert(x, 0@0,1);
-io.print(x);
-y:= bat.new(:oid,:int);
-bat.insert(y, 0@0,2);
-io.print(y);
-
-#fetch the position of an element in a vector
-z1:= array.map(v,x);
-io.print(z1,vv);
-z1:= array.map(v,y);
-io.print(z1,vv);
-
-#get the original cell oids
-x1:= array.map(v,v);
-io.print(x1);
-
-x2:= array.map(mx,my,mx,my);
-io.print(x2);
-
-# select a slice M[2][0:1:3]
-x3:= array.map(mx,my,y,v);
-io.print(x3);
-# select a slice M[0:1:3][2]
-x3:= array.map(mx,my,v,y);
-io.print(x3);
-
-# select a slice A[0:1:3][0:2:6]
-x4:= array.map(v,mx);
-io.print(x4);
-
-# select a slice [0:1:3][0:2:6]
-x5:= array.map(v,v,mx,my);
-io.print(x5);
diff --git a/monetdb5/modules/mal/Tests/array01.stable.err
b/monetdb5/modules/mal/Tests/array01.stable.err
deleted file mode 100644
--- a/monetdb5/modules/mal/Tests/array01.stable.err
+++ /dev/null
@@ -1,31 +0,0 @@
-stderr of test 'array01` in directory 'modules/mal` itself:
-
-
-# 20:40:09 >
-# 20:40:09 > mserver5 --debug=10 --set gdk_nr_threads=0 --set
"gdk_dbfarm=/ufs/mk/sciql//Linux/var/MonetDB" --set mapi_open=true --set
mapi_port=37449 --set monet_prompt= --trace --forcemito --set mal_listing=2
--dbname=mTests_modules_mal array01.mal
-# 20:40:09 >
-
-# builtin opt gdk_dbname = demo
-# builtin opt gdk_dbfarm = /ufs/mk/sciql//Linux/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 = /ufs/mk/sciql//Linux/var/MonetDB
-# cmdline opt mapi_open = true
-# cmdline opt mapi_port = 37449
-# cmdline opt monet_prompt =
-# cmdline opt mal_listing = 2
-# cmdline opt gdk_dbname = mTests_modules_mal
-
-# 20:40:09 >
-# 20:40:09 > Done.
-# 20:40:09 >
-
diff --git a/monetdb5/modules/mal/Tests/array01.stable.out
b/monetdb5/modules/mal/Tests/array01.stable.out
deleted file mode 100644
--- a/monetdb5/modules/mal/Tests/array01.stable.out
+++ /dev/null
@@ -1,159 +0,0 @@
-stdout of test 'array01` in directory 'modules/mal` itself:
-
-
-# 20:40:09 >
-# 20:40:09 > mserver5 --debug=10 --set gdk_nr_threads=0 --set
"gdk_dbfarm=/ufs/mk/sciql//Linux/var/MonetDB" --set mapi_open=true --set
mapi_port=37449 --set monet_prompt= --trace --forcemito --set mal_listing=2
--dbname=mTests_modules_mal array01.mal
-# 20:40:09 >
-
-# MonetDB 5 server v11.4.0
-# This is an unreleased version
-# Serving database 'mTests_modules_mal', using 4 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
-# Found 7.749 GiB available main-memory.
-# Copyright (c) 1993-July 2008 CWI.
-# Copyright (c) August 2008-2012 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:37449/
-# MonetDB/GIS module loaded
-# MonetDB/SQL module loaded
-function user.main():void;
-#extraction of cell positions from arrays
-#create array v(i int dimension[0:1:4])
- v := array.series(0,1,4,1,1);
- vv := array.series(0,3,12,1,1);
- io.print(v,vv);
-#create array M(x int dimension[0:2:6], y int dimension[0:1:4], int default
333);
- mx := array.series(0,2,6,4,1);
- my := array.series(0,1,4,1,3);
- mv := array.series(0,1,12,1,1);
- io.print(mx,my,mv);
-#extract the indices from both
-#do a point select
- x := bat.new(:oid,:int);
- bat.insert(x,0@0,1);
- io.print(x);
- y := bat.new(:oid,:int);
- bat.insert(y,0@0,2);
- io.print(y);
-#fetch the position of an element in a vector
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
