Changeset: 45e644230b37 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=45e644230b37
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
monetdb5/ChangeLog
monetdb5/mal/Tests/tst202.malC
monetdb5/mal/Tests/tst210.malC
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
Branch: default
Log Message:
Removed bat.setColumn with two arguments and the identical bat.setRoles.
diffs (249 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
@@ -24024,18 +24024,10 @@ command bat.setTransient(b:bat[:any_1]):
address BKCsetTransient;
comment Make the BAT transient. Returns boolean which indicates if
theBAT administration has indeed changed.
-command bat.setColumn(b:bat[:any_1],h:str,t:str):void
-address BKCsetColumns;
-comment Give both columns of a BAT a new name.
-
command bat.setColumn(b:bat[:any_1],t:str):void
address BKCsetColumn;
comment Give a logical name to the tail column of a BAT.
-command bat.setRole(b:bat[:any_1],h:str,t:str):void
-address BKCsetRole;
-comment Give a logical name to the columns of a BAT.
-
command bat.setName(b:bat[:any_1],s:str):void
address BKCsetName;
comment Give a logical name to a BAT.
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
@@ -31883,18 +31883,10 @@ command bat.setTransient(b:bat[:any_1]):
address BKCsetTransient;
comment Make the BAT transient. Returns boolean which indicates if
theBAT administration has indeed changed.
-command bat.setColumn(b:bat[:any_1],h:str,t:str):void
-address BKCsetColumns;
-comment Give both columns of a BAT a new name.
-
command bat.setColumn(b:bat[:any_1],t:str):void
address BKCsetColumn;
comment Give a logical name to the tail column of a BAT.
-command bat.setRole(b:bat[:any_1],h:str,t:str):void
-address BKCsetRole;
-comment Give a logical name to the columns of a BAT.
-
command bat.setName(b:bat[:any_1],s:str):void
address BKCsetName;
comment Give a logical name to a BAT.
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
@@ -807,12 +807,10 @@ str BKCsave(bit *res, const char *const
str BKCsave2(void *r, const bat *bid);
str BKCsetAccess(bat *res, const bat *bid, const char *const *param);
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 BKCsetImprints(bit *ret, const bat *bid);
str BKCsetName(void *r, const bat *bid, const char *const *s);
str BKCsetPersistent(void *r, const bat *bid);
-char *BKCsetRole(void *r, const bat *bid, const char *const *hname, const char
*const *tname);
str BKCsetTransient(void *r, const bat *bid);
str BKCsetkey(bat *res, const bat *bid, const bit *param);
str BKCshrinkBAT(bat *ret, const bat *bid, const bat *did);
diff --git a/monetdb5/ChangeLog b/monetdb5/ChangeLog
--- a/monetdb5/ChangeLog
+++ b/monetdb5/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog file for MonetDB5
# This file is updated with Maddlog
+* Wed Jun 29 2016 Sjoerd Mullender <sjo...@acm.org>
+- Removed bat.setColumn with two arguments and bat.setRole. Use
+ bat.setColumn with one argument instead.
+
* Mon Jun 27 2016 Sjoerd Mullender <sjo...@acm.org>
- Removed function BKCappend_reverse_val_wrap: it was unused.
diff --git a/monetdb5/mal/Tests/tst202.malC b/monetdb5/mal/Tests/tst202.malC
--- a/monetdb5/mal/Tests/tst202.malC
+++ b/monetdb5/mal/Tests/tst202.malC
@@ -5,7 +5,7 @@
b:bat[:int]:= bat.new(:int);
bat.setName(b,"mybat");
#setPersistent(b);
- bat.setColumn(b,"first","second");
+ bat.setColumn(b,"second");
io.print(b);
c:= bat.new(:str);
bat.setName(c,"mybat");
diff --git a/monetdb5/mal/Tests/tst210.malC b/monetdb5/mal/Tests/tst210.malC
--- a/monetdb5/mal/Tests/tst210.malC
+++ b/monetdb5/mal/Tests/tst210.malC
@@ -4,5 +4,5 @@ b:= bat.new(:int);
bat.append(b,1);
io.print(b);
bat.setName(b,"myhome");
-bat.setColumn(b,"first","last");
+bat.setColumn(b,"last");
io.print(b);
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
@@ -925,28 +925,6 @@ BKCisSynced(bit *ret, const bat *bid1, c
/*
* Role Management
*/
-char *
-BKCsetRole(void *r, const bat *bid, const char * const *hname, const char *
const *tname)
-{
- BAT *b;
-
- (void) r;
- if ((b = BATdescriptor(*bid)) == NULL) {
- throw(MAL, "bat.setRole", RUNTIME_OBJECT_MISSING);
- }
- if (hname == 0 || *hname == 0 || **hname == 0){
- BBPunfix(b->batCacheid);
- throw(MAL, "bat.setRole", ILLEGAL_ARGUMENT " Head name
missing");
- }
- if (tname == 0 || *tname == 0 || **tname == 0){
- BBPunfix(b->batCacheid);
- throw(MAL, "bat.setRole", ILLEGAL_ARGUMENT " Tail name
missing");
- }
- BATroles(b, *hname, *tname);
- BBPunfix(b->batCacheid);
- return MAL_SUCCEED;
-}
-
str
BKCsetColumn(void *r, const bat *bid, const char * const *tname)
{
@@ -970,29 +948,6 @@ BKCsetColumn(void *r, const bat *bid, co
}
str
-BKCsetColumns(void *r, const bat *bid, const char * const *hname, const char *
const *tname)
-{
- BAT *b;
-
- (void) r;
- if ((b = BATdescriptor(*bid)) == NULL) {
- throw(MAL, "bat.setColumns", RUNTIME_OBJECT_MISSING);
- }
- if (hname == 0 || *hname == 0 || **hname == 0){
- BBPunfix(b->batCacheid);
- throw(MAL, "bat.setRole", ILLEGAL_ARGUMENT " Head name
missing");
- }
- if (tname == 0 || *tname == 0 || **tname == 0){
- BBPunfix(b->batCacheid);
- throw(MAL, "bat.setRole", ILLEGAL_ARGUMENT " Tail name
missing");
- }
- BATroles(b, *hname, *tname);
- BBPunfix(b->batCacheid);
- return MAL_SUCCEED;
-}
-
-
-str
BKCsetName(void *r, const bat *bid, const char * const *s)
{
BAT *b;
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
@@ -22,7 +22,6 @@
#define bat5_export extern
#endif
-bat5_export char *BKCsetRole(void *r, const bat *bid, const char * const
*hname, const char * const *tname);
bat5_export str BKCnewBAT(bat *res, 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 lng *size);
@@ -56,7 +55,6 @@ bat5_export str BKCinfo(bat *ret1, bat *
bat5_export str BKCgetSize(lng *tot, const bat *bid);
bat5_export str BKCisSynced(bit *ret, const bat *bid1, const bat *bid2);
bat5_export str BKCsetColumn(void *r, const bat *bid, const char * const
*tname);
-bat5_export str BKCsetColumns(void *r, const bat *bid, const char * const
*hname, const char * const *tname);
bat5_export str BKCsetName(void *r, const bat *bid, const char * const *s);
bat5_export str BKCgetBBPname(str *ret, const bat *bid);
bat5_export str BKCsave(bit *res, const char * const *input);
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
@@ -134,16 +134,9 @@ command getName ( b:bat[:oid,:any_1]) :s
address BKCgetBBPname
comment "Gives back the logical name of a BAT.";
-command setRole( b:bat[:oid,:any_1], h:str, t:str) :void
-address BKCsetRole
-comment "Give a logical name to the columns of a BAT.";
-
command setColumn( b:bat[:oid,:any_1], t:str) :void
address BKCsetColumn
comment "Give a logical name to the tail column of a BAT.";
-command setColumn( b:bat[:oid,:any_1], h:str, t:str) :void
-address BKCsetColumns
-comment "Give both columns of a BAT a new name.";
command isTransient( b:bat[:oid,:any_1]) :bit
diff --git a/monetdb5/modules/mal/Tests/inspect05.stable.out
b/monetdb5/modules/mal/Tests/inspect05.stable.out
--- a/monetdb5/modules/mal/Tests/inspect05.stable.out
+++ b/monetdb5/modules/mal/Tests/inspect05.stable.out
@@ -93,15 +93,13 @@ Ready.
[ 61@0, "save", "command", "bat", "(b:bat[:any_1]):bit ",
"BKCsetImprints;" ]
[ 62@0, "setAccess", "command", "bat", "(b:bat[:any_1]):bit ",
"BKCsetHash;" ]
[ 63@0, "setColumn", "command", "bat", "(nme:str):bit ",
"BKCsave;" ]
-[ 64@0, "setColumn", "command", "bat", "(nme:bat[:any_1]):void
", "BKCsave2;" ]
-[ 65@0, "setHash", "command", "bat", "(b:bat[:any_1]):void
", "BKCsetPersistent;" ]
-[ 66@0, "setImprints", "command", "bat", "(b:bat[:any_1]):void
", "BKCsetTransient;" ]
-[ 67@0, "setKey", "command", "bat",
"(b:bat[:any_1],h:str,t:str):void ", "BKCsetColumns;" ]
-[ 68@0, "setName", "command", "bat",
"(b:bat[:any_1],t:str):void ", "BKCsetColumn;" ]
-[ 69@0, "setPersistent", "command", "bat",
"(b:bat[:any_1],h:str,t:str):void ", "BKCsetRole;" ]
-[ 70@0, "setRole", "command", "bat",
"(b:bat[:any_1],s:str):void ", "BKCsetName;" ]
-[ 71@0, "setTransient", "command", "bat",
"(b:bat[:any_1],mode:str):bat[:any_1] ", "BKCsetAccess;" ]
-[ 72@0, "single", "command", "bat",
"(b:bat[:any_1],mode:bit):bat[:any_1] ", "BKCsetkey;" ]
+[ 64@0, "setHash", "command", "bat", "(nme:bat[:any_1]):void
", "BKCsave2;" ]
+[ 65@0, "setImprints", "command", "bat", "(b:bat[:any_1]):void
", "BKCsetPersistent;" ]
+[ 66@0, "setKey", "command", "bat", "(b:bat[:any_1]):void
", "BKCsetTransient;" ]
+[ 67@0, "setName", "command", "bat",
"(b:bat[:any_1],t:str):void ", "BKCsetColumn;" ]
+[ 68@0, "setPersistent", "command", "bat",
"(b:bat[:any_1],s:str):void ", "BKCsetName;" ]
+[ 69@0, "setTransient", "command", "bat",
"(b:bat[:any_1],mode:str):bat[:any_1] ", "BKCsetAccess;" ]
+[ 70@0, "single", "command", "bat",
"(b:bat[:any_1],mode:bit):bat[:any_1] ", "BKCsetkey;" ]
# 08:55:30 >
# 08:55:30 > Done.
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,15 +95,13 @@ Ready.
[ 63@0, "save", "command", "bat", "(b:bat[:any_1]):bit ",
"BKCsetImprints;" ]
[ 64@0, "setAccess", "command", "bat", "(b:bat[:any_1]):bit ",
"BKCsetHash;" ]
[ 65@0, "setColumn", "command", "bat", "(nme:str):bit ",
"BKCsave;" ]
-[ 66@0, "setColumn", "command", "bat", "(nme:bat[:any_1]):void
", "BKCsave2;" ]
-[ 67@0, "setHash", "command", "bat", "(b:bat[:any_1]):void
", "BKCsetPersistent;" ]
-[ 68@0, "setImprints", "command", "bat", "(b:bat[:any_1]):void
", "BKCsetTransient;" ]
-[ 69@0, "setKey", "command", "bat",
"(b:bat[:any_1],h:str,t:str):void ", "BKCsetColumns;" ]
-[ 70@0, "setName", "command", "bat",
"(b:bat[:any_1],t:str):void ", "BKCsetColumn;" ]
-[ 71@0, "setPersistent", "command", "bat",
"(b:bat[:any_1],h:str,t:str):void ", "BKCsetRole;" ]
-[ 72@0, "setRole", "command", "bat",
"(b:bat[:any_1],s:str):void ", "BKCsetName;" ]
-[ 73@0, "setTransient", "command", "bat",
"(b:bat[:any_1],mode:str):bat[:any_1] ", "BKCsetAccess;" ]
-[ 74@0, "single", "command", "bat",
"(b:bat[:any_1],mode:bit):bat[:any_1] ", "BKCsetkey;" ]
+[ 66@0, "setHash", "command", "bat", "(nme:bat[:any_1]):void
", "BKCsave2;" ]
+[ 67@0, "setImprints", "command", "bat", "(b:bat[:any_1]):void
", "BKCsetPersistent;" ]
+[ 68@0, "setKey", "command", "bat", "(b:bat[:any_1]):void
", "BKCsetTransient;" ]
+[ 69@0, "setName", "command", "bat",
"(b:bat[:any_1],t:str):void ", "BKCsetColumn;" ]
+[ 70@0, "setPersistent", "command", "bat",
"(b:bat[:any_1],s:str):void ", "BKCsetName;" ]
+[ 71@0, "setTransient", "command", "bat",
"(b:bat[:any_1],mode:str):bat[:any_1] ", "BKCsetAccess;" ]
+[ 72@0, "single", "command", "bat",
"(b:bat[:any_1],mode:bit):bat[:any_1] ", "BKCsetkey;" ]
# 08:55:30 >
# 08:55:30 > Done.
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
