Changeset: 16320f65a3c4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=16320f65a3c4
Removed Files:
monetdb5/mal/Tests/tst601.mal
monetdb5/mal/Tests/tst601.stable.err
monetdb5/mal/Tests/tst601.stable.out
monetdb5/mal/Tests/tst605.mal
monetdb5/mal/Tests/tst605.stable.err
monetdb5/mal/Tests/tst605.stable.out
monetdb5/mal/Tests/tst606.mal
monetdb5/mal/Tests/tst606.stable.err
monetdb5/mal/Tests/tst606.stable.out
monetdb5/mal/Tests/tst607.mal
monetdb5/mal/Tests/tst607.stable.err
monetdb5/mal/Tests/tst607.stable.out
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/exports.stable.out
monetdb5/mal/Makefile.ag
monetdb5/mal/Tests/All
monetdb5/modules/atoms/mtime.c
monetdb5/modules/mal/Makefile.ag
monetdb5/modules/mal/Tests/remote99.mal
monetdb5/modules/mal/Tests/remote99.stable.out
monetdb5/modules/mal/bbp.c
monetdb5/modules/mal/bbp.mal
Branch: default
Log Message:
Final wrapup of ditching the boxes.
diffs (truncated from 728 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
@@ -32236,50 +32236,6 @@ command blob.#tostr():void
address BLOBtostr;
command blob.#write():void
address BLOBwrite;
-pattern box.close(bname:str):void
-address BOXclose;
-comment Close the box.
-
-pattern box.discard(bname:str,name:str):void
-address BOXdiscard;
-comment Release the BAT from the client pool.
-
-pattern box.deposit(bname:str,name:str,v:any_1):void
-address BOXdeposit;
-comment Enter a new value into the box.
-
-pattern box.destroy(bname:str):void
-address BOXdestroy;
-comment Destroy the box.
-
-command box.getBoxNames():bat[:int,:str]
-address BOXgetBoxNames;
-comment Retrieve the names of all boxes.
-
-pattern box.iterator(nme:str):lng
-address BOXiterator;
-comment Locates the next element in the box.
-
-pattern box.open(nme:str):any_1
-address BOXopen;
-comment Locate the box and open it.
-
-pattern box.release(bname:str,nme:str,val:any_1):void
-address BOXrelease;
-comment Release the BAT from the client pool.
-
-pattern box.releaseAll(bname:str):void
-address BOXreleaseAll;
-comment Release all objects for this client.
-
-pattern box.toString(bname:str,name:str):str
-address BOXtoString;
-comment Get the string representation of the i-th element in the box.
-
-pattern box.take(bnme:str,vnme:str):any_1
-address BOXtake;
-comment Locate the typed value in the box.
-
command bstream.create{unsafe}(s:streams,bufsize:int):bstream
address bstream_create_wrapwrap;
comment create a buffered stream
@@ -38800,62 +38756,6 @@ command constraints.emptySet(b:bat[:oid,
address CemptySet;
comment Check if the BAT is empty.
-pattern const.close():void
-address CSTclose;
-comment Close the constant box.
-
-pattern const.discard(name:any_1):void
-address CSTdiscard;
-comment Release the const from the box.
-
-pattern const.deposit(name:str,val:any_1):void
-address CSTdeposit;
-comment Add a variable to the box.
-
-pattern const.destroy():void
-address CSTdestroy;
-comment Destroy the box.
-
-command const.epiloque():void
-address CSTepilogue;
-comment Cleanup the const box
-
-pattern const.hasMoreElements() (X_1:oid,X_2:str)
-address CSThasMoreElements;
-comment Locate next element in the box.
-
-pattern const.newIterator() (X_1:oid,X_2:str)
-address CSTnewIterator;
-comment Locate next element in the box.
-
-pattern const.open():void
-address CSTopen;
-comment Locate and open the constant box.
-
-pattern const.prelude():void
-address CSTprelude;
-comment Initialize the const box
-
-pattern const.release(name:any_1):void
-address CSTrelease;
-comment Release a constant value.
-
-pattern const.release(name:str):void
-address CSTrelease;
-comment Release a constant value.
-
-pattern const.releaseAll():void
-address CSTreleaseAll;
-comment Release all variables in the box.
-
-pattern const.toString(name:any_1):str
-address CSTtoString;
-comment Get the string representation of an element in the box.
-
-pattern const.take(name:str):any_1
-address CSTtake;
-comment Take a variable out of the box.
-
command color.blue(c:color):int
address CLRblue;
comment Extracts blue component from a color atom
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
@@ -1028,17 +1028,6 @@ str BLOBsqlblob_fromstr(sqlblob **b, str
str BLOBtoblob(blob **retval, str *s);
int BLOBtostr(str *tostr, int *l, blob *pin);
int BLOBwrite(blob *a, stream *s, size_t cnt);
-str BOXclose(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str BOXdeposit(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str BOXdestroy(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str BOXdiscard(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str BOXgetBoxNames(int *bid);
-str BOXiterator(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str BOXopen(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str BOXrelease(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str BOXreleaseAll(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str BOXtake(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str BOXtoString(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CALCmax(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str CALCmax_no_nil(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str CALCmin(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
@@ -1330,19 +1319,6 @@ str CNTRSreset(int *ret, int *idx, int *
str CNTRSstart(int *ret, int *ev1, int *ev2);
str CNTRSstop(int *ret, int *idx);
str CNTRSunifiedEvents(int *ret);
-str CSTclose(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str CSTdeposit(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str CSTdestroy(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str CSTdiscard(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str CSTepilogue(int *ret);
-str CSThasMoreElements(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
-str CSTnewIterator(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str CSTopen(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str CSTprelude(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str CSTrelease(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str CSTreleaseAll(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str CSTtake(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str CSTtoString(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CURLdeleteRequest(str *retval, str *url);
str CURLgetRequest(str *retval, str *url);
str CURLpostRequest(str *retval, str *url);
@@ -2251,27 +2227,6 @@ str UNIXgetRSS(lng *res);
str UNIXgetenv(str *res, str *varname);
str UNIXsetenv(bit *res, str *name, str *value);
str UNIXsync(int *res);
-str URLBOXclose(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str URLBOXdeposit(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str URLBOXdepositFile(int *r, str *fnme);
-str URLBOXdestroy(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str URLBOXdiscard(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str URLBOXdiscardAll(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str URLBOXdiscardOid(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str URLBOXgetCardinality(int *r);
-str URLBOXgetCount(int *r);
-str URLBOXgetLevel(int *r, int *level);
-str URLBOXgetNames(int *r);
-str URLBOXgetSize(int *r);
-str URLBOXhasMoreElements(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
-str URLBOXnewIterator(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str URLBOXopen(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str URLBOXprelude(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str URLBOXrelease(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str URLBOXreleaseAll(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str URLBOXreleaseOid(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str URLBOXtake(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str URLBOXtoString(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
int URLfromString(str src, int *len, str *url);
str URLgetAnchor(str *retval, str *val);
str URLgetBasename(str *retval, str *t);
diff --git a/monetdb5/mal/Makefile.ag b/monetdb5/mal/Makefile.ag
--- a/monetdb5/mal/Makefile.ag
+++ b/monetdb5/mal/Makefile.ag
@@ -30,7 +30,6 @@ lib_mal = {
mal.c mal.h \
mal_atom.c mal_atom.h \
mal_authorize.c mal_authorize.h \
- mal_box.c mal_box.h \
mal_builder.c mal_builder.h \
mal_client.c mal_client.h \
mal_debugger.c mal_debugger.h \
diff --git a/monetdb5/mal/Tests/All b/monetdb5/mal/Tests/All
--- a/monetdb5/mal/Tests/All
+++ b/monetdb5/mal/Tests/All
@@ -163,10 +163,6 @@ tst500
tst501
tst550
tst560
-tst601
-tst605
-tst606
-tst607
tst611
tst612
tst620
diff --git a/monetdb5/mal/Tests/tst601.mal b/monetdb5/mal/Tests/tst601.mal
deleted file mode 100644
--- a/monetdb5/mal/Tests/tst601.mal
+++ /dev/null
@@ -1,15 +0,0 @@
-# Testing the box interfaces
-# open de const box and store a constant
-# This operation should actually be limited to the system administrator
-# who can open any box.
-
-const.open();
-pi := 3.147:flt;
-const.deposit("pi",pi);
-p2:flt := const.take("pi");
-io.print(p2);
-const.close(); # save the content on persistent store
-io.print(p2);
-
-# don't leave any residues
-const.destroy();
diff --git a/monetdb5/mal/Tests/tst601.stable.err
b/monetdb5/mal/Tests/tst601.stable.err
deleted file mode 100644
--- a/monetdb5/mal/Tests/tst601.stable.err
+++ /dev/null
@@ -1,1 +0,0 @@
-stderr of test 'tst601` in directory 'monetdb5/mal` itself:
diff --git a/monetdb5/mal/Tests/tst601.stable.out
b/monetdb5/mal/Tests/tst601.stable.out
deleted file mode 100644
--- a/monetdb5/mal/Tests/tst601.stable.out
+++ /dev/null
@@ -1,50 +0,0 @@
-stdout of test 'tst601` in directory 'monetdb5/mal` itself:
-
-
-# 08:01:23 >
-# 08:01:23 > Mtimeout -timeout 60 Mserver
"--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/log" --set mapi_port=42158 --set
sql_port=55708 --set monet_prompt= --trace
"--config=/ufs/mk/monet5/src/mal/Tests/All.conf" --dbname=mTests_src_mal
tst601.mal </dev/null
-# 08:01:23 >
-
-# Monet Database Server V4.99.19
-# Copyright (c) 1993-2004, CWI. All rights reserved.
-# Compiled for i686-redhat-linux-gnu/32bit; dynamically linked.
-# config:/ufs/mk/monet5/Linux/etc/MonetDB5.conf
-# dbfarm:/ufs/mk/monet5/Linux/var/MonetDB5/dbfarm
-# dbname:mTests_src_mal
-# Visit http://monetdb.cwi.nl/ for further information.
-## Testing the box interfaces
-## open de const box and store a constant
-## This operation should actually be limited to the system administrator
-## who can open any box.
-#
-#const.open();
-#pi := 3.147:flt;
-#const.deposit(pi);
-#p2:flt := const.take(pi);
-#print(p2);
-#const.close(); # save the content on persistent store
-#print(p2);
-#
-function user.main():void;
-# Testing the box interfaces
-# open de const box and store a constant
-# This operation should actually be limited to the system administrator
-# who can open any box.
- const.open();
- pi := 3.14700007:flt;
- const.deposit("pi",pi);
- p2:flt := const.take("pi");
- io.print(p2);
- const.close();
-# save the content on persistent store
- io.print(p2);
-# don't leave any residues
- const.destroy();
-end main;
-[ 3.14700007 ]
-[ 3.14700007 ]
-
-# 08:01:23 >
-# 08:01:23 > Done.
-# 08:01:23 >
-
diff --git a/monetdb5/mal/Tests/tst605.mal b/monetdb5/mal/Tests/tst605.mal
deleted file mode 100644
--- a/monetdb5/mal/Tests/tst605.mal
+++ /dev/null
@@ -1,7 +0,0 @@
-io.print("Contents of the 'const' box");
-barrier (b,nme):= const.newIterator();
- io.printf("[ %s ]\n",nme);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
