Changeset: 5493fe034571 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/5493fe034571
Modified Files:
gdk/gdk_strimps.c
gdk/gdk_strimps.h
monetdb5/modules/mal/batExtensions.c
Branch: string_imprints
Log Message:
Make naming more consistent
diffs (131 lines):
diff --git a/gdk/gdk_strimps.c b/gdk/gdk_strimps.c
--- a/gdk/gdk_strimps.c
+++ b/gdk/gdk_strimps.c
@@ -65,7 +65,7 @@
* contains.
*/
static size_t
-GDKstrimp_strlen(const uint8_t *s)
+STRMP_strlen(const uint8_t *s)
{
size_t ret = 0;
size_t i;
@@ -102,7 +102,7 @@ GDKstrimp_strlen(const uint8_t *s)
* 1 digram starting at character n - 1
*/
gdk_return
-GDKstrimp_ndigrams(BAT *b, size_t *n)
+STRMPndigrams(BAT *b, size_t *n)
{
// lng t0;
BUN i;
@@ -119,7 +119,7 @@ GDKstrimp_ndigrams(BAT *b, size_t *n)
*n = 0;
for (i = 0; i < b->batCount; i++) {
s = (char *)BUNtail(bi, i);
- // *n += GDKstrimp_strlen(s) - 1;
+ // *n += STRMP_strlen(s) - 1;
*n += strlen(s) - 1;
// TRC_DEBUG(ALGO, "s["LLFMT"]=%s\n", i, s);
}
@@ -152,7 +152,7 @@ GDKstrimp_ndigrams(BAT *b, size_t *n)
* count.
*/
gdk_return
-GDKstrimp_make_histogram(BAT *b, uint64_t *hist, size_t hist_size, size_t
*nbins)
+STRMPmakehistogram(BAT *b, uint64_t *hist, size_t hist_size, size_t *nbins)
{
lng t0=0;
size_t hi;
@@ -269,7 +269,7 @@ create_header(BAT *b)
if ((header = (StrimpHeader*)GDKmalloc(sizeof(StrimpHeader))) == NULL)
return NULL;
- if(GDKstrimp_make_histogram(b, hist, STRIMP_HISTSIZE, &nbins) !=
GDK_SUCCEED) {
+ if(STRMPmakehistogram(b, hist, STRIMP_HISTSIZE, &nbins) != GDK_SUCCEED)
{
GDKfree(header);
return NULL;
}
@@ -307,7 +307,7 @@ lookup_index(StrimpHeader *h, DataPair n
* This should probably be inlined.
*/
static uint64_t
-GDKstrimp_make_bitstring(const str s, StrimpHeader *h)
+STRMPmakebitstring(const str s, StrimpHeader *h)
{
uint64_t ret = 0;
int8_t pair_idx;
@@ -379,7 +379,7 @@ create_strimp_heap(BAT *b, StrimpHeader
/* Create */
gdk_return
-GDKstrimp_create_strimp(BAT *b)
+STRMPcreate(BAT *b)
{
lng t0 = 0;
BATiter bi;
@@ -401,13 +401,13 @@ GDKstrimp_create_strimp(BAT *b)
GDKfree(head);
return GDK_FAIL;
}
- dh = (uint64_t *)h->base + h->free;
+ dh = (uint64_t *)h->base + h->free; // That's probably not
correct
bi = bat_iterator(b);
for (i = 0; i < b->batCount; i++) {
s = (str)BUNtvar(bi, i);
if (!strNil(s))
- *dh++ = GDKstrimp_make_bitstring(s, head);
+ *dh++ = STRMPmakebitstring(s, head);
else
*dh++ = 0; /* no pairs in nil values */
diff --git a/gdk/gdk_strimps.h b/gdk/gdk_strimps.h
--- a/gdk/gdk_strimps.h
+++ b/gdk/gdk_strimps.h
@@ -27,9 +27,10 @@ typedef struct {
DataPair bytepairs[STRIMP_HEADER_SIZE];
} StrimpHeader;
-gdk_export gdk_return GDKstrimp_ndigrams(BAT *b, size_t *n); // Remove?
-gdk_export gdk_return GDKstrimp_make_histogram(BAT *b, uint64_t *hist, size_t
hist_size, size_t *nbins); // make static
-// gdk_export gdk_return GDKstrimp_make_header(StrimpHeader *h, uint64_t
*hist, size_t hist_size); // make static
-//gdk_export gdk_return GDKstrimp_make_header(BAT *b);
-gdk_export gdk_return GDKstrimp_create_strimp(BAT *b);
+gdk_export gdk_return STRMPndigrams(BAT *b, size_t *n); // Remove?
+gdk_export gdk_return STRMPmakehistogram(BAT *b, uint64_t *hist, size_t
hist_size, size_t *nbins); // make static
+// gdk_export gdk_return STRMP_make_header(StrimpHeader *h, uint64_t *hist,
size_t hist_size); // make static
+//gdk_export gdk_return STRMP_make_header(BAT *b);
+gdk_export gdk_return STRMPcreate(BAT *b);
+gdk_export BAT *STRMPfilter(BAT *b, char *q);
#endif /* _GDK_STRIMPS_H_ */
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
@@ -284,7 +284,7 @@ PATstrimp_ndigrams(Client cntxt, MalBlkP
if ((b = BATdescriptor(bid)) == NULL)
throw(MAL, "bat.strimpDigrams", SQLSTATE(HY002)
RUNTIME_OBJECT_MISSING);
- if (!GDKstrimp_ndigrams(b, &n)) {
+ if (!STRMPndigrams(b, &n)) {
throw(MAL, "bat.strimpDigrams", SQLSTATE(HY002)
OPERATION_FAILED);
}
@@ -309,7 +309,7 @@ PATstrimp_makehist(Client cntxt, MalBlkP
if ((b = BATdescriptor(bid)) == NULL)
throw(MAL, "bat.strimpHistogram", SQLSTATE(HY002)
RUNTIME_OBJECT_MISSING);
- if (!GDKstrimp_make_histogram(b, hist, STRIMP_HISTSIZE, &count)) {
+ if (!STRMPmakehistogram(b, hist, STRIMP_HISTSIZE, &count)) {
throw(MAL, "bat.strimpHistogram", SQLSTATE(HY002)
OPERATION_FAILED);
}
@@ -342,7 +342,7 @@ PATstrimp(Client cntxt, MalBlkPtr mb, Ma
if ((b = BATdescriptor(bid)) == NULL)
throw(MAL, "bat.strimpHeader", SQLSTATE(HY002)
RUNTIME_OBJECT_MISSING);
- if(GDKstrimp_create_strimp(b) != GDK_SUCCEED)
+ if(STRMPcreate(b) != GDK_SUCCEED)
throw(MAL, "bat.strimpHistogram", SQLSTATE(HY002)
OPERATION_FAILED);
// *getArgReference_lng(stk, pci, 0) = 0;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
