Changeset: 20a475ce1a3b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/20a475ce1a3b
Modified Files:
clients/Tests/exports.stable.out
gdk/gdk_strimps.c
gdk/gdk_strimps.h
Branch: string_imprints
Log Message:
Change signature for STRMPfilter
diffs (55 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
@@ -394,7 +394,7 @@ BUN SORTfnd(BAT *b, const void *v);
BUN SORTfndfirst(BAT *b, const void *v);
BUN SORTfndlast(BAT *b, const void *v);
gdk_return STRMPcreate(BAT *b, BAT *s);
-BAT *STRMPfilter(BAT *b, BAT *s, char *q);
+BAT *STRMPfilter(BAT *b, BAT *s, const str q);
MT_Id THRcreate(void (*f)(void *), void *arg, enum MT_thr_detach d, const char
*name);
void *THRdata[THREADDATA];
void THRdel(Thread t);
diff --git a/gdk/gdk_strimps.c b/gdk/gdk_strimps.c
--- a/gdk/gdk_strimps.c
+++ b/gdk/gdk_strimps.c
@@ -139,6 +139,9 @@ next_pair(PairIterator *pi) {
#endif // UTF8STRIMPS
+/* Look up a given pair in a strimp. Returns the index of the pair, or
+ * -1 if it is not found. Assumes that there no more than 128 pairs.
+ */
static int8_t
STRMPpairLookup(Strimps *s, CharPair *p) {
size_t idx = 0;
@@ -406,8 +409,8 @@ STRMPcreateStrimpHeap(BAT *b, BAT *s)
* is either 1 (i.e. it exists on disk) or the number of bitstrings
* computed is the same as the number of elements in the BAT.
*/
-#define STRIMP_COMPLETE(b) \
- b->tstrimps != NULL && \
+#define STRIMP_COMPLETE(b) \
+ b->tstrimps != NULL && \
(b->tstrimps == (Strimps *)1 || \
(b->tstrimps->strimps.free - ((char
*)b->tstrimps->bitstrings_base - b->tstrimps->strimps.base)) ==
b->batCount*sizeof(uint64_t))
@@ -508,7 +511,7 @@ BATcheckstrimps(BAT *b)
* list.
*/
BAT *
-STRMPfilter(BAT *b, BAT *s, char *q)
+STRMPfilter(BAT *b, BAT *s, const str q)
{
BAT *r = NULL;
BUN i, ncand;
diff --git a/gdk/gdk_strimps.h b/gdk/gdk_strimps.h
--- a/gdk/gdk_strimps.h
+++ b/gdk/gdk_strimps.h
@@ -44,5 +44,5 @@ typedef struct {
// 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, BAT *s);
-gdk_export BAT *STRMPfilter(BAT *b, BAT *s, char *q);
+gdk_export BAT *STRMPfilter(BAT *b, BAT *s, const str q);
#endif /* _GDK_STRIMPS_H_ */
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
