Changeset: db26e772b7a3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=db26e772b7a3
Removed Files:
monetdb5/optimizer/Tests/tst4610.mal
monetdb5/optimizer/Tests/tst4610.stable.err
monetdb5/optimizer/Tests/tst4610.stable.out
Modified Files:
clients/Tests/exports.stable.out
monetdb5/modules/kernel/bat5.c
monetdb5/modules/kernel/bat5.h
monetdb5/modules/kernel/bat5.mal
monetdb5/modules/mal/Tests/inspect05.stable.out.int128
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
Branch: default
Log Message:
Remove old-fashioned MAL instruction 'reverse'
diffs (267 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
@@ -847,7 +847,6 @@ str BKCnewBAT(bat *res, const int *ht, c
str BKCpersists(void *r, const bat *bid, const bit *flg);
str BKCreuseBAT(bat *ret, const bat *bid, const bat *did);
str BKCreuseBATmap(bat *ret, const bat *bid, const bat *did);
-str BKCreverse(bat *ret, const bat *bid);
str BKCsave(bit *res, const char *const *input);
str BKCsave2(void *r, const bat *bid);
str BKCsetAccess(bat *res, const bat *bid, const char *const *param);
@@ -2517,7 +2516,6 @@ int recycleCacheLimit;
str recycleRef;
str reenterMAL(Client cntxt, MalBlkPtr mb, int startpc, int stoppc, MalStkPtr
stk);
str refineRef;
-str refine_reverseRef;
str registerRef;
void register_http_handler(http_request_handler handler);
void releaseBAT(MalBlkPtr mb, MalStkPtr stk, int bid);
@@ -2539,7 +2537,6 @@ int resolveType(int dsttype, int srctype
str resultSetRef;
str reuseRef;
malType reverseBatType(malType v);
-str reverseRef;
int rowsProp;
str rpcRef;
str rsColumnRef;
diff --git a/monetdb5/modules/kernel/bat5.c b/monetdb5/modules/kernel/bat5.c
--- a/monetdb5/modules/kernel/bat5.c
+++ b/monetdb5/modules/kernel/bat5.c
@@ -439,22 +439,6 @@ BKCdensebat(bat *ret, const wrd *size)
}
str
-BKCreverse(bat *ret, const bat *bid)
-{
- BAT *b, *bn = NULL;
-
- if ((b = BATdescriptor(*bid)) == NULL) {
- throw(MAL, "bat.reverse", RUNTIME_OBJECT_MISSING);
- }
-
- bn = BATmirror(b); /* bn inherits ref from b */
- assert(bn != NULL);
- *ret = bn->batCacheid;
- BBPkeepref(bn->batCacheid);
- return MAL_SUCCEED;
-}
-
-str
BKCmirror(bat *ret, const bat *bid)
{
BAT *b, *bn;
diff --git a/monetdb5/modules/kernel/bat5.h b/monetdb5/modules/kernel/bat5.h
--- a/monetdb5/modules/kernel/bat5.h
+++ b/monetdb5/modules/kernel/bat5.h
@@ -28,7 +28,6 @@ bat5_export char *BKCdelete_bun(bat *r,
bat5_export str BKCnewBAT(bat *res, const int *ht, const int *tt, const BUN
*cap, int role);
bat5_export str BKCattach(bat *ret, const int *tt, const char * const
*heapfile);
bat5_export str BKCdensebat(bat *ret, const wrd *size);
-bat5_export str BKCreverse(bat *ret, const bat *bid);
bat5_export str BKCmirror(bat *ret, const bat *bid);
bat5_export str BKCinsert_bat(bat *r, const bat *bid, const bat *sid);
bat5_export str BKCinsert_bat_force(bat *r, const bat *bid, const bat *sid,
const bit *force);
diff --git a/monetdb5/modules/kernel/bat5.mal b/monetdb5/modules/kernel/bat5.mal
--- a/monetdb5/modules/kernel/bat5.mal
+++ b/monetdb5/modules/kernel/bat5.mal
@@ -8,12 +8,6 @@ module bat;
#TO BE MADE HEADLESS PLAN
-command reverse(b:bat[:any_1,:any_2]) :bat[:any_2,:any_1]
-address BKCreverse
-comment "Returns the reverse view of a BAT (head is tail and tail is head).
- BEWARE no copying is involved; input and output refer to the
- same object!";
-
command mirror(b:bat[:any_1,:any_2]) :bat[:any_1,:any_1]
address BKCmirror
comment "Returns the head-mirror image of a BAT (two head columns).";
diff --git a/monetdb5/modules/mal/Tests/inspect05.stable.out.int128
b/monetdb5/modules/mal/Tests/inspect05.stable.out.int128
--- a/monetdb5/modules/mal/Tests/inspect05.stable.out.int128
+++ b/monetdb5/modules/mal/Tests/inspect05.stable.out.int128
@@ -95,20 +95,19 @@ end user.main;
[ 54@0, "replace", "command", "bat",
"(b:bat[:oid,:any_1],rid:bat[:oid,:oid],val:bat[:oid,:any_1]):bat[:oid,:any_1]
", "BKCbat_inplace;" ]
[ 55@0, "reuse", "command", "bat",
"(b:bat[:oid,:any_1],h:oid,t:any_1,force:bit):bat[:oid,:any_1] ",
"BKCbun_inplace_force;" ]
[ 56@0, "reuseMap", "command", "bat",
"(b:bat[:oid,:any_1],h:oid,t:any_1):bat[:oid,:any_1] ", "BKCbun_inplace;" ]
-[ 57@0, "reverse", "command", "bat",
"(b:bat[:any_1,:any_2]):bat[:any_2,:any_1] ", "BKCreverse;" ]
-[ 58@0, "save", "pattern", "bat", "(val:any_1):bat[:oid,:any_1]
", "CMDBATsingle;" ]
-[ 59@0, "save", "command", "bat", "(b:bat[:oid,:any_1]):bit ",
"BKCsetImprints;" ]
-[ 60@0, "setAccess", "command", "bat",
"(b:bat[:oid,:any_1]):bit ", "BKCsetHash;" ]
-[ 61@0, "setColumn", "command", "bat", "(nme:str):bit ",
"BKCsave;" ]
-[ 62@0, "setColumn", "command", "bat",
"(nme:bat[:oid,:any_1]):void ", "BKCsave2;" ]
-[ 63@0, "setHash", "command", "bat",
"(b:bat[:oid,:any_1]):void ", "BKCsetPersistent;" ]
-[ 64@0, "setImprints", "command", "bat",
"(b:bat[:oid,:any_1]):void ", "BKCsetTransient;" ]
-[ 65@0, "setKey", "command", "bat",
"(b:bat[:oid,:any_1],h:str,t:str):void ", "BKCsetColumns;" ]
-[ 66@0, "setName", "command", "bat",
"(b:bat[:oid,:any_1],t:str):void ", "BKCsetColumn;" ]
-[ 67@0, "setPersistent", "command", "bat",
"(b:bat[:oid,:any_1],h:str,t:str):void ", "BKCsetRole;" ]
-[ 68@0, "setRole", "command", "bat",
"(b:bat[:oid,:any_1],s:str):void ", "BKCsetName;" ]
-[ 69@0, "setTransient", "command", "bat",
"(b:bat[:oid,:any_1],mode:str):bat[:oid,:any_1] ", "BKCsetAccess;" ]
-[ 70@0, "single", "command", "bat",
"(b:bat[:oid,:any_1],mode:bit):bat[:oid,:any_1] ", "BKCsetkey;" ]
+[ 57@0, "save", "pattern", "bat", "(val:any_1):bat[:oid,:any_1]
", "CMDBATsingle;" ]
+[ 58@0, "save", "command", "bat", "(b:bat[:oid,:any_1]):bit ",
"BKCsetImprints;" ]
+[ 59@0, "setAccess", "command", "bat",
"(b:bat[:oid,:any_1]):bit ", "BKCsetHash;" ]
+[ 60@0, "setColumn", "command", "bat", "(nme:str):bit ",
"BKCsave;" ]
+[ 61@0, "setColumn", "command", "bat",
"(nme:bat[:oid,:any_1]):void ", "BKCsave2;" ]
+[ 62@0, "setHash", "command", "bat",
"(b:bat[:oid,:any_1]):void ", "BKCsetPersistent;" ]
+[ 63@0, "setImprints", "command", "bat",
"(b:bat[:oid,:any_1]):void ", "BKCsetTransient;" ]
+[ 64@0, "setKey", "command", "bat",
"(b:bat[:oid,:any_1],h:str,t:str):void ", "BKCsetColumns;" ]
+[ 65@0, "setName", "command", "bat",
"(b:bat[:oid,:any_1],t:str):void ", "BKCsetColumn;" ]
+[ 66@0, "setPersistent", "command", "bat",
"(b:bat[:oid,:any_1],h:str,t:str):void ", "BKCsetRole;" ]
+[ 67@0, "setRole", "command", "bat",
"(b:bat[:oid,:any_1],s:str):void ", "BKCsetName;" ]
+[ 68@0, "setTransient", "command", "bat",
"(b:bat[:oid,:any_1],mode:str):bat[:oid,:any_1] ", "BKCsetAccess;" ]
+[ 69@0, "single", "command", "bat",
"(b:bat[:oid,:any_1],mode:bit):bat[:oid,:any_1] ", "BKCsetkey;" ]
# 08:55:30 >
# 08:55:30 > Done.
diff --git a/monetdb5/optimizer/Tests/tst4610.mal
b/monetdb5/optimizer/Tests/tst4610.mal
deleted file mode 100644
--- a/monetdb5/optimizer/Tests/tst4610.mal
+++ /dev/null
@@ -1,20 +0,0 @@
-# the first test for macro expansions and inversions
-
-function joinPath( a:bat[:any_1,:any_2], b:bat[:any_2,:any_3],
c:bat[:any_3,:any_4]):bat[:any_1,:any_4];
- z:= algebra.join(a,b);
- zz:= algebra.join(z,c);
- return zz;
-end joinPath;
-
-optimizer.orcam("user","joinPath");
-
-a:= bat.new(:oid,:int);
-b:= bat.new(:oid,:int);
-c:= bat.new(:oid,:int);
-(g1,g2):= algebra.join(a,b);
-(h1,h2):= algebra.join(g,c);
-
-ao := batcalc.oid(a);
-bo := batcalc.oid(b);
-(r1,r2):= algebra.joinPath(ao,bo,c);
-mdb.List();
diff --git a/monetdb5/optimizer/Tests/tst4610.stable.err
b/monetdb5/optimizer/Tests/tst4610.stable.err
deleted file mode 100644
--- a/monetdb5/optimizer/Tests/tst4610.stable.err
+++ /dev/null
@@ -1,12 +0,0 @@
-stderr of test 'tst4610` in directory 'monetdb5/optimizer` itself:
-
-
-# 19:36:05 >
-# 19:36:05 > Mtimeout -timeout 60 mserver5
"--config=/ufs/mk/monet5/Linux/etc/MonetDB5.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/monet5/Linux/var/MonetDB5/dbfarm" --set
"sql_logdir=/ufs/mk/monet5/Linux/var/MonetDB5/dblogs" --set mapi_port=31892
--set monet_prompt= --trace --dbname=mTests_src_optimizer tst4610.mal <
/dev/null
-# 19:36:05 >
-
-
-# 19:36:05 >
-# 19:36:05 > Done.
-# 19:36:05 >
-
diff --git a/monetdb5/optimizer/Tests/tst4610.stable.out
b/monetdb5/optimizer/Tests/tst4610.stable.out
deleted file mode 100644
--- a/monetdb5/optimizer/Tests/tst4610.stable.out
+++ /dev/null
@@ -1,49 +0,0 @@
-stdout of test 'tst4610` in directory 'monetdb5/optimizer` itself:
-
-
-# 19:36:05 >
-# 19:36:05 > Mtimeout -timeout 60 mserver5
"--config=/ufs/mk/monet5/Linux/etc/MonetDB5.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/monet5/Linux/var/MonetDB5/dbfarm" --set
"sql_logdir=/ufs/mk/monet5/Linux/var/MonetDB5/dblogs" --set mapi_port=31892
--set monet_prompt= --trace --dbname=mTests_src_optimizer tst4610.mal <
/dev/null
-# 19:36:05 >
-
-# MonetDB Server v4.99.19
-# Copyright (c) 1993-2006 CWI, all rights reserved
-# Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs dynamically linked
-# config:/ufs/mk/monet5/Linux/etc/MonetDB5.conf
-# dbfarm:/ufs/mk/monet5/Linux/var/MonetDB5/dbfarm
-# dbname:mTests_src_optimizer
-# Visit http://monetdb.cwi.nl/ for further information
-# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:32348/
-function
user.joinPath(a:bat[:any_1,:any_2],b:bat[:any_2,:any_3],c:bat[:any_3,:any_4]):bat[:any_1,:any_4];
- z := algebra.join(a,b);
- zz := algebra.join(z,c);
- return joinPath := zz;
-end joinPath;
-function user.main():void;
-# the first test for macro expansions and inversions
- a := bat.new(:oid,:int);
- b := bat.new(:oid,:int);
- br := bat.reverse(b);
- c := bat.new(:oid,:int);
- h := user.joinPath(a,br,c);
- ao := batcalc.oid(a);
- bo := batcalc.oid(b);
- bor := bat.reverse(bo);
- r := algebra.joinPath(ao,bor,c);
- mdb.List();
-function user.main():void; # 0 main:void := user.main() {G}
-# the first test for macro expansions and inversions
- a := bat.new(:oid,:int); # 2 a:bat[:oid,:int] :=
CMDBATnew(_6:oid, _7:int) {G}
- b := bat.new(:oid,:int); # 3 b:bat[:oid,:int] :=
CMDBATnew(_6:oid, _7:int) {G}
- br := bat.reverse(b); # 4 br:bat[:int,:oid] :=
BKCreverse(b:bat[:oid,:int]) {G}
- c := bat.new(:oid,:int); # 5 c:bat[:oid,:int] :=
CMDBATnew(_6:oid, _7:int) {G}
- h := user.joinPath(a,br,c); # 6 h:bat[:oid,:int] :=
user.joinPath(a:bat[:oid,:int], br:bat[:int,:oid], c:bat[:oid,:int]) {PG}
- ao := batcalc.oid(a); # 7 ao:bat[:oid,:oid] :=
CMDconvertsignal_oid(a:bat[:oid,:int]) {G}
- bo := batcalc.oid(b); # 8 bo:bat[:oid,:oid] :=
CMDconvertsignal_oid(b:bat[:oid,:int]) {G}
- bor := bat.reverse(bo); # 9 bor:bat[:oid,:oid] :=
BKCreverse(bo:bat[:oid,:oid]) {G}
- r := algebra.joinPath(ao,bor,c); # 10 r:bat[:oid,:any] :=
ALGjoinPath(ao:bat[:oid,:oid], bor:bat[:oid,:oid], c:bat[:oid,:int]) {G}
- mdb.List(); # 11 _17:void := MDBlistDetail()
-
-# 19:36:05 >
-# 19:36:05 > Done.
-# 19:36:05 >
-
diff --git a/monetdb5/optimizer/opt_prelude.c b/monetdb5/optimizer/opt_prelude.c
--- a/monetdb5/optimizer/opt_prelude.c
+++ b/monetdb5/optimizer/opt_prelude.c
@@ -187,7 +187,6 @@ str rapiRef;
str reconnectRef;
str recycleRef;
str refineRef;
-str refine_reverseRef;
str registerRef;
str remapRef;
str remoteRef;
@@ -195,7 +194,6 @@ str replaceRef;
str replicatorRef;
str resultSetRef;
str reuseRef;
-str reverseRef;
str rpcRef;
str rsColumnRef;
str schedulerRef;
@@ -439,7 +437,6 @@ void optimizerInit(void)
reconnectRef = putName("reconnect",9);
recycleRef = putName("recycle",7);
refineRef = putName("refine",6);
- refine_reverseRef = putName("refine_reverse",14);
registerRef = putName("register",8);
remapRef = putName("remap",5);
remoteRef = putName("remote",6);
@@ -447,7 +444,6 @@ void optimizerInit(void)
replicatorRef = putName("replicator",10);
resultSetRef = putName("resultSet",9);
reuseRef = putName("reuse",5);
- reverseRef = putName("reverse",7);
rpcRef = putName("rpc",3);
rsColumnRef = putName("rsColumn",8);
schedulerRef = putName("scheduler",9);
diff --git a/monetdb5/optimizer/opt_prelude.h b/monetdb5/optimizer/opt_prelude.h
--- a/monetdb5/optimizer/opt_prelude.h
+++ b/monetdb5/optimizer/opt_prelude.h
@@ -184,7 +184,6 @@ opt_export str rapiRef;
opt_export str reconnectRef;
opt_export str recycleRef;
opt_export str refineRef;
-opt_export str refine_reverseRef;
opt_export str registerRef;
opt_export str remapRef;
opt_export str remoteRef;
@@ -192,7 +191,6 @@ opt_export str replaceRef;
opt_export str replicatorRef;
opt_export str resultSetRef;
opt_export str reuseRef;
-opt_export str reverseRef;
opt_export str rpcRef;
opt_export str rsColumnRef;
opt_export str schedulerRef;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
