Changeset: 4c465155e61c for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4c465155e61c Modified Files: clients/Tests/exports.stable.out monetdb5/modules/mal/batExtensions.c monetdb5/modules/mal/batExtensions.h Branch: Jun2016 Log Message:
Removed function CMDBATnewDerived since it's unused. diffs (75 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 @@ -913,7 +913,6 @@ str CMDBATimprints(void *ret, bat *bid); str CMDBATimprintsize(lng *ret, bat *bid); str CMDBATnew(Client cntxt, MalBlkPtr m, MalStkPtr s, InstrPtr p); str CMDBATnewColumn(Client cntxt, MalBlkPtr m, MalStkPtr s, InstrPtr p); -str CMDBATnewDerived(Client cntxt, MalBlkPtr m, MalStkPtr s, InstrPtr p); str CMDBATnew_persistent(Client cntxt, MalBlkPtr m, MalStkPtr s, InstrPtr p); str CMDBATpartition(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDBATpartition2(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); diff --git a/monetdb5/modules/mal/batExtensions.c b/monetdb5/modules/mal/batExtensions.c --- a/monetdb5/modules/mal/batExtensions.c +++ b/monetdb5/modules/mal/batExtensions.c @@ -128,49 +128,6 @@ CMDBATnew_persistent(Client cntxt, MalBl } str -CMDBATnewDerived(Client cntxt, MalBlkPtr mb, MalStkPtr s, InstrPtr p) -{ - bat bid; - int tt; - BUN cap = 0; - int *res; - BAT *b; - str msg; - oid o; - - (void) mb; - (void) cntxt; - bid = *getArgReference_bat(s, p, 1); - if ((b = BATdescriptor(bid)) == NULL) { - throw(MAL, "bat.new", INTERNAL_BAT_ACCESS); - } - - if (p->argc > 2) { - lng lcap = *getArgReference_lng(s, p, 2); - if (lcap < 0) - throw(MAL, "bat.new", POSITIVE_EXPECTED); - if (lcap > (lng) BUN_MAX) - throw(MAL, "bat.new", ILLEGAL_ARGUMENT " Capacity too large"); - cap = (BUN) lcap; - } - else - cap = BATcount(b); - o = b->hseqbase; - BBPunfix(b->batCacheid); - - res = getArgReference_int(s, p, 0); - msg = (str) BKCnewBAT(res, &tt, &cap, TRANSIENT); - if (msg == MAL_SUCCEED ){ - b = BATdescriptor(*res); - if ( b == NULL ) - throw(MAL, "bat.new", RUNTIME_OBJECT_MISSING); - BATseqbase(b, o); - BBPunfix(b->batCacheid); - } - return msg; -} - -str CMDBATsingle(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci) { BAT *b; diff --git a/monetdb5/modules/mal/batExtensions.h b/monetdb5/modules/mal/batExtensions.h --- a/monetdb5/modules/mal/batExtensions.h +++ b/monetdb5/modules/mal/batExtensions.h @@ -27,7 +27,6 @@ be_export str CMDBATnewColumn(Client cntxt, MalBlkPtr m, MalStkPtr s, InstrPtr p); be_export str CMDBATnew(Client cntxt, MalBlkPtr m, MalStkPtr s, InstrPtr p); be_export str CMDBATnew_persistent(Client cntxt, MalBlkPtr m, MalStkPtr s, InstrPtr p); -be_export str CMDBATnewDerived(Client cntxt, MalBlkPtr m, MalStkPtr s, InstrPtr p); be_export str CMDBATsingle(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); be_export str CMDBATpartition(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); be_export str CMDBATpartition2(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list