Changeset: f686c3ba196f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f686c3ba196f
Modified Files:
monetdb5/modules/mal/batExtensions.c
Branch: string_imprints
Log Message:
Rename functions for consistency
diffs (81 lines):
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
@@ -338,7 +338,7 @@ CMDBATappend_bulk(Client cntxt, MalBlkPt
}
/*
- * String imprints dev/testing. TODO: remove.
+ * String imprints.
*/
static str
CMDstrimp_ndigrams(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
@@ -353,10 +353,10 @@ CMDstrimp_ndigrams(Client cntxt, MalBlkP
// return mythrow(MAL, "batcalc.striter", OPERATION_FAILED);
bid = *getArgReference_bat(stk, pci, 1);
if ((b = BATdescriptor(bid)) == NULL)
- throw(MAL, "batcalc.ndigrams", SQLSTATE(HY002)
RUNTIME_OBJECT_MISSING);
+ throw(MAL, "bat.strimpDigrams", SQLSTATE(HY002)
RUNTIME_OBJECT_MISSING);
if (!GDKstrimp_ndigrams(b, &n)) {
- throw(MAL, "batcalc.ndigrams", SQLSTATE(HY002)
OPERATION_FAILED);
+ throw(MAL, "bat.strimpDigrams", SQLSTATE(HY002)
OPERATION_FAILED);
}
*getArgReference_lng(stk, pci, 0) = n;
@@ -378,20 +378,20 @@ CMDstrimp_makehist(Client cntxt, MalBlkP
bid = *getArgReference_bat(stk, pci, 2);
if ((b = BATdescriptor(bid)) == NULL)
- throw(MAL, "batcalc.ndigrams", SQLSTATE(HY002)
RUNTIME_OBJECT_MISSING);
+ throw(MAL, "bat.strimpHistogram", SQLSTATE(HY002)
RUNTIME_OBJECT_MISSING);
if (!GDKstrimp_makehistogram(b, hist, STRIMP_HISTSIZE, &count)) {
- throw(MAL, "batcalc.ndigrams", SQLSTATE(HY002)
OPERATION_FAILED);
+ throw(MAL, "bat.strimpHistogram", SQLSTATE(HY002)
OPERATION_FAILED);
}
ob = COLnew(0, TYPE_lng, STRIMP_HISTSIZE, TRANSIENT);
if (ob == NULL) {
- throw(MAL, "strimp.makehist", SQLSTATE(HY013) MAL_MALLOC_FAIL);
+ throw(MAL, "bat.strimpHistogram", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
}
for (i=0; i < STRIMP_HISTSIZE; i++) {
if (BUNappend(ob, hist + i, false) != GDK_SUCCEED)
- throw(MAL, "strimp.makehist", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
+ throw(MAL, "bat.strimpHistogram", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
}
*getArgReference_bat(stk, pci, 0) = count;
@@ -401,10 +401,6 @@ CMDstrimp_makehist(Client cntxt, MalBlkP
return MAL_SUCCEED;
}
-/*
- * String imprints dev/testing. TODO: end remove.
- */
-
#include "mel.h"
mel_func batExtensions_init_funcs[] = {
@@ -435,16 +431,10 @@ mel_func batExtensions_init_funcs[] = {
pattern("bat", "appendBulk", CMDBATappend_bulk, false, "append the arguments
ins to i", args(1,4, batargany("",1),
batargany("i",1),arg("force",bit),varargany("ins",1))),
pattern("bat", "appendBulk", CMDBATappend_bulk, false, "append the arguments
ins to i", args(1,4, batargany("",1),
batargany("i",1),arg("force",bit),batvarargany("ins",1))),
- /*
- * String imprints dev/testing. TODO: remove.
- */
- pattern("bat", "count_digrams", CMDstrimp_ndigrams, false, "count digrams in
a string bat", args(1, 2, arg("",lng), batarg("b", str))),
+ /* String imprints */
+ pattern("bat", "strimpNDigrams", CMDstrimp_ndigrams, false, "count digrams in
a string bat", args(1,2,arg("",lng),batarg("b",str))),
+ pattern("bat", "strimpHistogam", CMDstrimp_makehist, false, "make a histogram
of all the byte pairs in a BAT", args(1,2,arg("",lng), batarg("b",str))),
//pattern("batcalc", "make_histogam", CMDstrimp_makehist, false, "make a
histogram of all the byte pairs in a BAT", args(2, 3, arg("", sht), batarg("",
lng), batarg("b", str))),
- pattern("bat", "make_histogam", CMDstrimp_makehist, false, "make a histogram
of all the byte pairs in a BAT", args(1, 2, arg("", sht), batarg("b", str))),
- /*
- * String imprints dev/testing. TODO: end remove.
- */
-
{ .imp=NULL }
};
#include "mal_import.h"
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
