Changeset: b62643655146 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b62643655146
Removed Files:
monetdb5/mal/Tests/tst267.mal
monetdb5/mal/Tests/tst267.stable.err
monetdb5/mal/Tests/tst267.stable.out
monetdb5/modules/kernel/array.c
monetdb5/modules/kernel/array.h
monetdb5/modules/kernel/array.mal
monetdb5/optimizer/Tests/AEexample.mal
monetdb5/optimizer/Tests/AEexample.stable.err
monetdb5/optimizer/Tests/AEexample.stable.out
monetdb5/optimizer/Tests/GCexample.mal
monetdb5/optimizer/Tests/GCexample.stable.err
monetdb5/optimizer/Tests/GCexample.stable.out
monetdb5/optimizer/Tests/tst4800.mal
monetdb5/optimizer/Tests/tst4800.stable.err
monetdb5/optimizer/Tests/tst4800.stable.out
monetdb5/optimizer/Tests/tst4801.mal
monetdb5/optimizer/Tests/tst4801.stable.err
monetdb5/optimizer/Tests/tst4801.stable.out
monetdb5/optimizer/Tests/tst4810.mal
monetdb5/optimizer/Tests/tst4810.stable.err
monetdb5/optimizer/Tests/tst4810.stable.out
monetdb5/optimizer/Tests/tst4900.mal
monetdb5/optimizer/Tests/tst4900.stable.err
monetdb5/optimizer/Tests/tst4900.stable.out
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures_gsl.stable.out
clients/Tests/MAL-signatures_nocfitsio.stable.out
clients/Tests/MAL-signatures_sphinxclient.stable.out
clients/Tests/exports.stable.out
monetdb5/modules/kernel/Makefile.ag
Branch: default
Log Message:
Removed Alex's array implementation
diffs (truncated from 2760 to 300 lines):
diff --git a/clients/Tests/MAL-signatures.stable.out
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -2849,46 +2849,6 @@ command alarm.usec{unsafe}():lng
address ALARMusec;
comment return cpu microseconds info
-command
array.grid(b:bat[:oid,:lng],i:lng,j:lng,k:lng,l:lng,s:lng):bat[:oid,:lng]
-address ARRAYgridBATshift_lng;
-comment Fills an index BAT, (grpcount,grpsize,clustersize,offset)and shift all
elemenets with a factor s
-
-command array.grid(b:bat[:oid,:lng],i:lng,j:lng,k:lng,l:lng):bat[:oid,:lng]
-address ARRAYgridBAT_lng;
-comment Fills an index BAT, (grpcount,grpsize,clustersize,offset)
-
-command array.grid(i:lng,j:lng,k:lng,l:lng,s:lng):bat[:oid,:lng]
-address ARRAYgridShift_lng;
-comment Generates an index BAT, (grpcount,grpsize,clustersize,offset)and shift
all elements with a factor s
-
-command array.grid(i:lng,j:lng,k:lng,l:lng):bat[:oid,:lng]
-address ARRAYgrid_lng;
-comment Generates an index BAT, (grpcount,grpsize,clustersize,offset)
-
-command
array.grid(b:bat[:oid,:int],i:int,j:int,k:int,l:int,s:int):bat[:oid,:int]
-address ARRAYgridBATshift_int;
-comment Fills an index BAT, (grpcount,grpsize,clustersize,offset)and shift all
elemenets with a factor s
-
-command array.grid(b:bat[:oid,:int],i:int,j:int,k:int,l:int):bat[:oid,:int]
-address ARRAYgridBAT_int;
-comment Fills an index BAT, (grpcount,grpsize,clustersize,offset)
-
-command array.grid(i:int,j:int,k:int,l:int,s:int):bat[:oid,:int]
-address ARRAYgridShift_int;
-comment Generates an index BAT, (grpcount,grpsize,clustersize,offset)and shift
all elements with a factor s
-
-command array.grid(i:int,j:int,k:int,l:int):bat[:oid,:int]
-address ARRAYgrid_int;
-comment Generates an index BAT, (grpcount,grpsize,clustersize,offset)
-
-command array.project(b:bat[:oid,:any_1],i:int):bat[:oid,:int]
-address ARRAYproject;
-comment Fill an array representation with constants
-
-command array.product(b:bat[:oid,:any_1],c:bat[:oid,:any_2])
(X_3:bat[:oid,:any_1],c:bat[:oid,:any_2])
-address ARRAYproduct;
-comment Produce an array product
-
command batudf.fuse(one:bat[:oid,:int],two:bat[:oid,:int]):bat[:oid,:lng]
address UDFBATfuse;
comment fuse two (4-byte) int values into one (8-byte) lng value
diff --git a/clients/Tests/MAL-signatures_gsl.stable.out
b/clients/Tests/MAL-signatures_gsl.stable.out
--- a/clients/Tests/MAL-signatures_gsl.stable.out
+++ b/clients/Tests/MAL-signatures_gsl.stable.out
@@ -2849,46 +2849,6 @@ command alarm.usec{unsafe}():lng
address ALARMusec;
comment return cpu microseconds info
-command
array.grid(b:bat[:oid,:lng],i:lng,j:lng,k:lng,l:lng,s:lng):bat[:oid,:lng]
-address ARRAYgridBATshift_lng;
-comment Fills an index BAT, (grpcount,grpsize,clustersize,offset)and shift all
elemenets with a factor s
-
-command array.grid(b:bat[:oid,:lng],i:lng,j:lng,k:lng,l:lng):bat[:oid,:lng]
-address ARRAYgridBAT_lng;
-comment Fills an index BAT, (grpcount,grpsize,clustersize,offset)
-
-command array.grid(i:lng,j:lng,k:lng,l:lng,s:lng):bat[:oid,:lng]
-address ARRAYgridShift_lng;
-comment Generates an index BAT, (grpcount,grpsize,clustersize,offset)and shift
all elements with a factor s
-
-command array.grid(i:lng,j:lng,k:lng,l:lng):bat[:oid,:lng]
-address ARRAYgrid_lng;
-comment Generates an index BAT, (grpcount,grpsize,clustersize,offset)
-
-command
array.grid(b:bat[:oid,:int],i:int,j:int,k:int,l:int,s:int):bat[:oid,:int]
-address ARRAYgridBATshift_int;
-comment Fills an index BAT, (grpcount,grpsize,clustersize,offset)and shift all
elemenets with a factor s
-
-command array.grid(b:bat[:oid,:int],i:int,j:int,k:int,l:int):bat[:oid,:int]
-address ARRAYgridBAT_int;
-comment Fills an index BAT, (grpcount,grpsize,clustersize,offset)
-
-command array.grid(i:int,j:int,k:int,l:int,s:int):bat[:oid,:int]
-address ARRAYgridShift_int;
-comment Generates an index BAT, (grpcount,grpsize,clustersize,offset)and shift
all elements with a factor s
-
-command array.grid(i:int,j:int,k:int,l:int):bat[:oid,:int]
-address ARRAYgrid_int;
-comment Generates an index BAT, (grpcount,grpsize,clustersize,offset)
-
-command array.project(b:bat[:oid,:any_1],i:int):bat[:oid,:int]
-address ARRAYproject;
-comment Fill an array representation with constants
-
-command array.product(b:bat[:oid,:any_1],c:bat[:oid,:any_2])
(X_3:bat[:oid,:any_1],c:bat[:oid,:any_2])
-address ARRAYproduct;
-comment Produce an array product
-
command batudf.fuse(one:bat[:oid,:int],two:bat[:oid,:int]):bat[:oid,:lng]
address UDFBATfuse;
comment fuse two (4-byte) int values into one (8-byte) lng value
diff --git a/clients/Tests/MAL-signatures_nocfitsio.stable.out
b/clients/Tests/MAL-signatures_nocfitsio.stable.out
--- a/clients/Tests/MAL-signatures_nocfitsio.stable.out
+++ b/clients/Tests/MAL-signatures_nocfitsio.stable.out
@@ -2849,46 +2849,6 @@ command alarm.usec{unsafe}():lng
address ALARMusec;
comment return cpu microseconds info
-command
array.grid(b:bat[:oid,:lng],i:lng,j:lng,k:lng,l:lng,s:lng):bat[:oid,:lng]
-address ARRAYgridBATshift_lng;
-comment Fills an index BAT, (grpcount,grpsize,clustersize,offset)and shift all
elemenets with a factor s
-
-command array.grid(b:bat[:oid,:lng],i:lng,j:lng,k:lng,l:lng):bat[:oid,:lng]
-address ARRAYgridBAT_lng;
-comment Fills an index BAT, (grpcount,grpsize,clustersize,offset)
-
-command array.grid(i:lng,j:lng,k:lng,l:lng,s:lng):bat[:oid,:lng]
-address ARRAYgridShift_lng;
-comment Generates an index BAT, (grpcount,grpsize,clustersize,offset)and shift
all elements with a factor s
-
-command array.grid(i:lng,j:lng,k:lng,l:lng):bat[:oid,:lng]
-address ARRAYgrid_lng;
-comment Generates an index BAT, (grpcount,grpsize,clustersize,offset)
-
-command
array.grid(b:bat[:oid,:int],i:int,j:int,k:int,l:int,s:int):bat[:oid,:int]
-address ARRAYgridBATshift_int;
-comment Fills an index BAT, (grpcount,grpsize,clustersize,offset)and shift all
elemenets with a factor s
-
-command array.grid(b:bat[:oid,:int],i:int,j:int,k:int,l:int):bat[:oid,:int]
-address ARRAYgridBAT_int;
-comment Fills an index BAT, (grpcount,grpsize,clustersize,offset)
-
-command array.grid(i:int,j:int,k:int,l:int,s:int):bat[:oid,:int]
-address ARRAYgridShift_int;
-comment Generates an index BAT, (grpcount,grpsize,clustersize,offset)and shift
all elements with a factor s
-
-command array.grid(i:int,j:int,k:int,l:int):bat[:oid,:int]
-address ARRAYgrid_int;
-comment Generates an index BAT, (grpcount,grpsize,clustersize,offset)
-
-command array.project(b:bat[:oid,:any_1],i:int):bat[:oid,:int]
-address ARRAYproject;
-comment Fill an array representation with constants
-
-command array.product(b:bat[:oid,:any_1],c:bat[:oid,:any_2])
(X_3:bat[:oid,:any_1],c:bat[:oid,:any_2])
-address ARRAYproduct;
-comment Produce an array product
-
command batudf.fuse(one:bat[:oid,:int],two:bat[:oid,:int]):bat[:oid,:lng]
address UDFBATfuse;
comment fuse two (4-byte) int values into one (8-byte) lng value
diff --git a/clients/Tests/MAL-signatures_sphinxclient.stable.out
b/clients/Tests/MAL-signatures_sphinxclient.stable.out
--- a/clients/Tests/MAL-signatures_sphinxclient.stable.out
+++ b/clients/Tests/MAL-signatures_sphinxclient.stable.out
@@ -2849,46 +2849,6 @@ command alarm.usec{unsafe}():lng
address ALARMusec;
comment return cpu microseconds info
-command
array.grid(b:bat[:oid,:lng],i:lng,j:lng,k:lng,l:lng,s:lng):bat[:oid,:lng]
-address ARRAYgridBATshift_lng;
-comment Fills an index BAT, (grpcount,grpsize,clustersize,offset)and shift all
elemenets with a factor s
-
-command array.grid(b:bat[:oid,:lng],i:lng,j:lng,k:lng,l:lng):bat[:oid,:lng]
-address ARRAYgridBAT_lng;
-comment Fills an index BAT, (grpcount,grpsize,clustersize,offset)
-
-command array.grid(i:lng,j:lng,k:lng,l:lng,s:lng):bat[:oid,:lng]
-address ARRAYgridShift_lng;
-comment Generates an index BAT, (grpcount,grpsize,clustersize,offset)and shift
all elements with a factor s
-
-command array.grid(i:lng,j:lng,k:lng,l:lng):bat[:oid,:lng]
-address ARRAYgrid_lng;
-comment Generates an index BAT, (grpcount,grpsize,clustersize,offset)
-
-command
array.grid(b:bat[:oid,:int],i:int,j:int,k:int,l:int,s:int):bat[:oid,:int]
-address ARRAYgridBATshift_int;
-comment Fills an index BAT, (grpcount,grpsize,clustersize,offset)and shift all
elemenets with a factor s
-
-command array.grid(b:bat[:oid,:int],i:int,j:int,k:int,l:int):bat[:oid,:int]
-address ARRAYgridBAT_int;
-comment Fills an index BAT, (grpcount,grpsize,clustersize,offset)
-
-command array.grid(i:int,j:int,k:int,l:int,s:int):bat[:oid,:int]
-address ARRAYgridShift_int;
-comment Generates an index BAT, (grpcount,grpsize,clustersize,offset)and shift
all elements with a factor s
-
-command array.grid(i:int,j:int,k:int,l:int):bat[:oid,:int]
-address ARRAYgrid_int;
-comment Generates an index BAT, (grpcount,grpsize,clustersize,offset)
-
-command array.project(b:bat[:oid,:any_1],i:int):bat[:oid,:int]
-address ARRAYproject;
-comment Fill an array representation with constants
-
-command array.product(b:bat[:oid,:any_1],c:bat[:oid,:any_2])
(X_3:bat[:oid,:any_1],c:bat[:oid,:any_2])
-address ARRAYproduct;
-comment Produce an array product
-
command batudf.fuse(one:bat[:oid,:int],two:bat[:oid,:int]):bat[:oid,:lng]
address UDFBATfuse;
comment fuse two (4-byte) int values into one (8-byte) lng value
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
@@ -838,21 +838,6 @@ str ALGuselect1(int *result, int *bid, p
str ALGuselectInclusive(int *result, int *bid, ptr low, ptr high, bit *lin,
bit *rin);
str ALGvariance(dbl *res, int *bid);
str ALGvariancep(dbl *res, int *bid);
-str ARRAYgridBAT_int(int *ret, int *bid, int *groups, int *groupsize, int
*clustersize, int *offset);
-str ARRAYgridBAT_lng(lng *ret, lng *bid, lng *groups, lng *groupsize, lng
*clustersize, lng *offset);
-str ARRAYgridBATshift_int(int *ret, int *bid, int *groups, int *groupsize, int
*clustersize, int *offset, int *shift);
-str ARRAYgridBATshift_lng(lng *ret, lng *bid, lng *groups, lng *groupsize, lng
*clustersize, lng *offset, lng *shift);
-str ARRAYgridShift_int(int *ret, int *groups, int *groupsize, int
*clustersize, int *offset, int *shift);
-str ARRAYgridShift_lng(lng *ret, lng *groups, lng *groupsize, lng
*clustersize, lng *offset, lng *shift);
-str ARRAYgrid_int(int *ret, int *groups, int *groupsize, int *clustersize, int
*offset);
-str ARRAYgrid_lng(lng *ret, lng *groups, lng *groupsize, lng *clustersize, lng
*offset);
-str ARRAYmultiply_int_int(int *ret, int *bid, int *rid);
-str ARRAYmultiply_int_lng(int *ret, int *bid, int *rid);
-str ARRAYmultiply_lng_lng(int *ret, int *bid, int *rid);
-str ARRAYmultiply_sht_int(int *ret, int *bid, int *rid);
-str ARRAYmultiply_sht_lng(int *ret, int *bid, int *rid);
-str ARRAYproduct(int *ret, int *ret2, int *bid, int *rid);
-str ARRAYproject(int *ret, int *bid, int *cst);
str AUTHaddUser(oid *ret, Client *c, str *user, str *pass);
str AUTHchangePassword(Client *c, str *oldpass, str *passwd);
str AUTHchangeUsername(Client *c, str *olduser, str *newuser);
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,h):= array.product(a,b);
-io.print(g,h);
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 'monetdb5/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 'monetdb5/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);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
