Changeset: 5a5523b8375d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5a5523b8375d
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
monetdb5/modules/mal/bbp.c
monetdb5/modules/mal/bbp.h
monetdb5/modules/mal/bbp.mal
Branch: Jul2015
Log Message:
Partially revert changeset fa590305c5a3: remove bbp.setName again.
diffs (81 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
@@ -31533,10 +31533,6 @@ command bbp.getIndex(b:bat[:oid,:any_2])
address CMDbbpgetIndex;
comment Retrieve the index in the BBP
-command bbp.setName(b:bat[:oid,:any_1],n:str):str
-address CMDsetName;
-comment Rename a BAT
-
command blob.blob(s:str):blob
address BLOBblob_fromstr;
command blob.blob(s:blob):blob
diff --git a/clients/Tests/MAL-signatures.stable.out.int128
b/clients/Tests/MAL-signatures.stable.out.int128
--- a/clients/Tests/MAL-signatures.stable.out.int128
+++ b/clients/Tests/MAL-signatures.stable.out.int128
@@ -40578,10 +40578,6 @@ command bbp.getIndex(b:bat[:oid,:any_2])
address CMDbbpgetIndex;
comment Retrieve the index in the BBP
-command bbp.setName(b:bat[:oid,:any_1],n:str):str
-address CMDsetName;
-comment Rename a BAT
-
command blob.blob(s:str):blob
address BLOBblob_fromstr;
command blob.blob(s:blob):blob
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
@@ -1178,7 +1178,6 @@ str CMDscience_bat_flt_sqrt(bat *ret, co
str CMDscience_bat_flt_tan(bat *ret, const bat *bid);
str CMDscience_bat_flt_tanh(bat *ret, const bat *bid);
str CMDsetHeartbeat(void *res, int *ev);
-str CMDsetName(str *rname, const bat *b, str *name);
str CMDsetProfilerFile(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
str CMDsetProfilerStream(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
str CMDsetoid(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
diff --git a/monetdb5/modules/mal/bbp.c b/monetdb5/modules/mal/bbp.c
--- a/monetdb5/modules/mal/bbp.c
+++ b/monetdb5/modules/mal/bbp.c
@@ -481,16 +481,3 @@ str CMDbbp(bat *ID, bat *NS, bat *HT, ba
BBPkeepref(*KIND = kind->batCacheid);
return MAL_SUCCEED;
}
-
-str
-CMDsetName(str *rname, const bat *bid, str *name)
-{
- BAT *b;
- if ((b = BATdescriptor(*bid)) == NULL) {
- throw(MAL, "bbp.setName", INTERNAL_BAT_ACCESS);
- }
- BBPrename(b->batCacheid, *name);
- *rname = GDKstrdup(*name);
- BBPunfix(b->batCacheid);
- return MAL_SUCCEED;
-}
diff --git a/monetdb5/modules/mal/bbp.h b/monetdb5/modules/mal/bbp.h
--- a/monetdb5/modules/mal/bbp.h
+++ b/monetdb5/modules/mal/bbp.h
@@ -54,5 +54,4 @@ bbp_export str CMDbbpgetIndex(int *res,
bbp_export str CMDgetBATrefcnt(int *res, bat *bid);
bbp_export str CMDgetBATlrefcnt(int *res, bat *bid);
bbp_export str CMDbbp(bat *ID, bat *NS, bat *HT, bat *TT, bat *CNT, bat
*REFCNT, bat *LREFCNT, bat *LOCATION, bat *HEAT, bat *DIRTY, bat *STATUS, bat
*KIND);
-bbp_export str CMDsetName(str *rname, const bat *b, str *name);
#endif /* _BBP_H_*/
diff --git a/monetdb5/modules/mal/bbp.mal b/monetdb5/modules/mal/bbp.mal
--- a/monetdb5/modules/mal/bbp.mal
+++ b/monetdb5/modules/mal/bbp.mal
@@ -30,9 +30,6 @@ comment "bpp";
command getName( b:bat[:oid,:any_1]):str
address CMDbbpName
comment "Map a BAT into its internal name";
-command setName( b:bat[:oid,:any_1], n:str):str
-address CMDsetName
-comment "Rename a BAT";
command getCount() :bat[:oid,:lng]
address CMDbbpCount
comment "Create a BAT with the cardinalities of all known BATs";
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
