Changeset: c4286290ca5d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c4286290ca5d
Removed Files:
monetdb5/mal/Tests/saveload.mal
monetdb5/mal/Tests/saveload.stable.err
monetdb5/mal/Tests/saveload.stable.out
monetdb5/tests/gdkTests/Tests/str_heap.mal
monetdb5/tests/gdkTests/Tests/str_heap.stable.err
monetdb5/tests/gdkTests/Tests/str_heap.stable.out
Modified Files:
clients/Tests/exports.stable.out
monetdb5/mal/Tests/All
monetdb5/modules/kernel/bat5.c
monetdb5/modules/kernel/bat5.h
monetdb5/modules/kernel/bat5.mal
monetdb5/modules/mal/Tests/inspect05.stable.out
monetdb5/modules/mal/Tests/inspect05.stable.out.int128
monetdb5/modules/mal/transaction.c
monetdb5/modules/mal/transaction.mal
monetdb5/tests/gdkTests/Tests/All
Branch: default
Log Message:
Cleanup of the code
- load commands dropped
- drop insert code
- replace -> inplace switch
- drop implementations of ditched signatures
diffs (truncated from 957 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
@@ -872,11 +872,9 @@ str BKCdelete_bat_bun(bat *r, const bat
char *BKCdelete_bun(bat *r, const bat *bid, const oid *h, const void *t);
str BKCdensebat(bat *ret, const wrd *size);
str BKCgetAccess(str *res, const bat *bid);
-char *BKCgetAlpha(bat *r, const bat *bid);
str BKCgetBBPname(str *ret, const bat *bid);
str BKCgetCapacity(lng *res, const bat *bid);
str BKCgetColumnType(str *res, const bat *bid);
-char *BKCgetDelta(bat *r, const bat *bid);
str BKCgetHeadType(str *res, const bat *bid);
str BKCgetKey(bit *ret, const bat *bid);
str BKCgetRole(str *res, const bat *bid);
@@ -885,27 +883,18 @@ str BKCgetSize(lng *tot, const bat *bid)
str BKCinfo(bat *ret1, bat *ret2, const bat *bid);
str BKCinsert_bat(bat *r, const bat *bid, const bat *sid);
str BKCinsert_bat_force(bat *r, const bat *bid, const bat *sid, const bit
*force);
-char *BKCinsert_bun(bat *r, const bat *bid, const oid *h, const void *t);
-char *BKCinsert_bun_force(bat *r, const bat *bid, const oid *h, const void *t,
const bit *force);
str BKCintersectcand(bat *ret, const bat *aid, const bat *bid);
str BKCisPersistent(bit *res, const bat *bid);
str BKCisSorted(bit *res, const bat *bid);
str BKCisSortedReverse(bit *res, const bat *bid);
str BKCisSynced(bit *ret, const bat *bid1, const bat *bid2);
str BKCisTransient(bit *res, const bat *bid);
-str BKCload(bat *res, const char *const *input);
str BKCmergecand(bat *ret, const bat *aid, const bat *bid);
str BKCmirror(bat *ret, const bat *bid);
-str BKCmmap(bit *res, const bat *bid, const int *hbns, const int *tbns, const
int *hhp, const int *thp);
-str BKCmmap2(bit *res, const bat *bid, const int *bns);
str BKCnewBAT(bat *res, const int *ht, const int *tt, const BUN *cap, int
role);
str BKCorder(bat *ret, const bat *bid);
str BKCorder_rev(bat *ret, const bat *bid);
str BKCpersists(void *r, const bat *bid, const bit *flg);
-str BKCreplace_bat(bat *r, const bat *bid, const bat *sid);
-str BKCreplace_bat_force(bat *r, const bat *bid, const bat *sid, const bit
*force);
-str BKCreplace_bun(bat *r, const bat *bid, const oid *h, const void *t);
-str BKCreplace_bun_force(bat *r, const bat *bid, const oid *h, const void *t,
const bit *force);
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);
@@ -913,11 +902,9 @@ str BKCrevert(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);
-str BKCsetColdBAT(void *res, const bat *bid);
str BKCsetColumn(void *r, const bat *bid, const char *const *tname);
str BKCsetColumns(void *r, const bat *bid, const char *const *hname, const
char *const *tname);
str BKCsetHash(bit *ret, const bat *bid);
-str BKCsetHotBAT(void *res, const bat *bid);
str BKCsetImprints(bit *ret, const bat *bid);
str BKCsetName(void *r, const bat *bid, const char *const *s);
str BKCsetPersistent(void *r, const bat *bid);
@@ -926,7 +913,6 @@ str BKCsetTransient(void *r, const bat *
str BKCsetkey(bat *res, const bat *bid, const bit *param);
str BKCshrinkBAT(bat *ret, const bat *bid, const bat *did);
str BKCshrinkBATmap(bat *ret, const bat *bid, const bat *did);
-str BKCunload(bit *res, const char *const *input);
str BLOBblob_blob(blob **d, blob **s);
str BLOBblob_fromstr(blob **b, str *d);
void BLOBdel(Heap *h, var_t *index);
@@ -1998,10 +1984,8 @@ str TRNglobal_commit(bit *ret);
str TRNglobal_sync(bit *ret);
str TRNsubcommit(bit *ret, bat *bid);
str TRNtrans_abort(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str TRNtrans_alpha(bat *ret, bat *bid);
str TRNtrans_clean(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str TRNtrans_commit(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str TRNtrans_delta(bat *ret, bat *bid);
str TRNtrans_prev(bat *ret, bat *bid);
int TYPE_blob;
int TYPE_date;
diff --git a/monetdb5/mal/Tests/All b/monetdb5/mal/Tests/All
--- a/monetdb5/mal/Tests/All
+++ b/monetdb5/mal/Tests/All
@@ -220,7 +220,6 @@ recycle10
recycle11
recycle12
-saveload
parseErrors
dataflow01
diff --git a/monetdb5/mal/Tests/saveload.mal b/monetdb5/mal/Tests/saveload.mal
deleted file mode 100644
--- a/monetdb5/mal/Tests/saveload.mal
+++ /dev/null
@@ -1,26 +0,0 @@
-# save/load tests
-
-a:= bat.new(:oid,:int);
-bat.append(a,123);
-bat.append(a,321);
-bat.setName(a,"aaa");
-io.print(a);
-
-b:= bat.new(:oid,:str);
-bat.append(b,"hello");
-bat.append(b,"world");
-bat.setName(b,"bbb");
-io.print(b);
-
-bat.save(a);
-bat.save(b);
-
-ar:bat[:oid,:int]:= bat.load("aaa");
-io.print(ar);
-br:bat[:oid,:str]:= bat.load("bbb");
-io.print(br);
-
-
-#and an error
-er:bat[:oid,:int]:= bbp.bind("bbb");
-io.print(er);
diff --git a/monetdb5/mal/Tests/saveload.stable.err
b/monetdb5/mal/Tests/saveload.stable.err
deleted file mode 100644
--- a/monetdb5/mal/Tests/saveload.stable.err
+++ /dev/null
@@ -1,14 +0,0 @@
-stderr of test 'saveload` in directory 'monetdb5/mal` itself:
-
-
-# 20:31:51 >
-# 20:31:51 > mserver5 "--config=/ufs/mk/monet5/Linux/etc/monetdb5.conf"
--debug=10 --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=35708 --set xrpc_port=42614 --set
monet_prompt= --trace --dbname=mTests_src_mal saveload.mal
-# 20:31:51 >
-
-#warning: please don't forget to set your vault key!
-#(see /ufs/mk/monet5/Linux/etc/monetdb5.conf)
-
-# 20:31:51 >
-# 20:31:51 > Done.
-# 20:31:51 >
-
diff --git a/monetdb5/mal/Tests/saveload.stable.out
b/monetdb5/mal/Tests/saveload.stable.out
deleted file mode 100644
--- a/monetdb5/mal/Tests/saveload.stable.out
+++ /dev/null
@@ -1,96 +0,0 @@
-stdout of test 'saveload` in directory 'monetdb5/mal` itself:
-
-
-# 20:31:51 >
-# 20:31:51 > mserver5 "--config=/ufs/mk/monet5/Linux/etc/monetdb5.conf"
--debug=10 --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=35708 --set xrpc_port=42614 --set
monet_prompt= --trace --dbname=mTests_src_mal saveload.mal
-# 20:31:51 >
-
-# MonetDB server v5.5.0, based on kernel v1.23.0
-# Serving database 'mTests_src_mal'
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
-# Copyright (c) 1993-2008 CWI, all rights reserved
-# Visit http://monetdb.cwi.nl/ for further information
-# Listening for connection requests on mapi:monetdb://gio.ins.cwi.nl:35708/
-## save/load tests
-#
-#a:= bat.new(:int,:int);
-#bat.insert(a,0,123);
-#bat.insert(a,0,321);
-#bat.setName(a,"aaa");
-#io.print(a);
-#
-#b:= bat.new(:oid,:str);
-#bat.insert(b,0@0,"hello");
-#bat.insert(b,1@0,"world");
-#bat.setName(b,"bbb");
-#io.print(b);
-#
-#bat.save(a);
-#bat.save(b);
-#
-#ar:bat[:int,:int]:= bat.load("aaa");
-#io.print(ar);
-#br:bat[:oid,:str]:= bat.load("bbb");
-#io.print(br);
-#
-#
-##and an error
-#er:bat[:int,:int]:= bbp.bind("bbb");
-#io.print(er);
-#
-function user.main():void;
-# save/load tests
- a := bat.new(:oid,:int);
- bat.append(a,123);
- bat.append(a,321);
- bat.setName(a,"aaa");
- io.print(a);
- b := bat.new(:oid,:str);
- bat.append(b,"hello");
- bat.append(b,"world");
- bat.setName(b,"bbb");
- io.print(b);
- bat.save(a);
- bat.save(b);
- ar:bat[:oid,:int] := bat.load("aaa");
- io.print(ar);
- br:bat[:oid,:str] := bat.load("bbb");
- io.print(br);
-#and an error
- er:bat[:oid,:int] := bbp.bind("bbb");
- io.print(er);
-end user.main;
-#--------------------------#
-# h t # name
-# int int # type
-#-----------------#
-[ 0@0, 123 ]
-[ 1@0, 321 ]
-#-------------------------#
-# h t # name
-# void str # type
-#-------------------------#
-[ 0@0, "hello" ]
-[ 1@0, "world" ]
-#-----------------#
-# h t # name
-# int int # type
-#-----------------#
-[ 0@0, 123 ]
-[ 1@0, 321 ]
-#-------------------------#
-# h t # name
-# void str # type
-#-------------------------#
-[ 0@0, "hello" ]
-[ 1@0, "world" ]
-!MALException:bbp.bind:Type mismatch
-
-
-
-
-
-# 20:31:51 >
-# 20:31:51 > Done.
-# 20:31:51 >
-
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
@@ -43,23 +43,6 @@
#include "bat5.h"
#include "mal_exception.h"
-/*
- * The next collection of operators fill a hole in the MonetDB kernel
libraries.
- * It provide handy operations on void-BATs.
- */
-static BAT *
-lock_desc(bat bid)
-{
- BBPfix(bid);
- return BBPquickdesc(abs(bid), 0);
-}
-
-static void
-unlock_desc(bat bid)
-{
- BBPunfix(bid);
-}
-
/* set access mode to bat, replacing input with output */
static BAT *
setaccess(BAT *b, int mode)
@@ -385,25 +368,6 @@ CMDrename(bit *retval, BAT *b, const cha
}
static int
-CMDunload(bit *res, const char *input)
-{
- bat bid = abs(BBPindex(input));
-
- *res = FALSE;
- if (bid > 0) {
- BAT *b;
-
- BBPfix(bid);
- b = BBP_cache(bid);
- if (b) {
- BBPcold(bid); /* will trigger unload of also
persistent bats */
- }
- *res = BBPunfix(bid) == 0;
- }
- return GDK_SUCCEED;
-}
-
-static int
CMDsave(bit *res, const char *input)
{
bat bid = BBPindex(input);
@@ -424,8 +388,7 @@ CMDsave(bit *res, const char *input)
/*
- * Wrapping
- * The remainder contains the wrapper code over the version 4
+ * The remainder contains the wrapper code over the mserver version 4
* InformationFunctions
* In most cases we pass a BAT identifier, which should be unified
* with a BAT descriptor. Upon failure we can simply abort the function.
@@ -579,52 +542,6 @@ BKCorder_rev(bat *r, const bat *bid)
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
