isomorfeus-ferret 0.12.5 → 0.13.0

data/ext/isomorfeus_ferret_ext/frt_q_filtered_query.c

@@ -10,21 +10,18 @@
 #define FQSc(scorer) ((FilteredQueryScorer *)(scorer))
 #define FQQ(query) ((FrtFilteredQuery *)(query))
 
-typedef struct FilteredQueryScorer
-{
-    FrtScorer      super;
-    FrtScorer     *sub_scorer;
-    FrtBitVector  *bv;
+typedef struct FilteredQueryScorer {
+    FrtScorer    super;
+    FrtScorer    *sub_scorer;
+    FrtBitVector *bv;
 } FilteredQueryScorer;
 
-static float fqsc_score(FrtScorer *self)
-{
+static float fqsc_score(FrtScorer *self) {
     FrtScorer *sub_sc = FQSc(self)->sub_scorer;
     return sub_sc->score(sub_sc);
 }
 
-static bool fqsc_next(FrtScorer *self)
-{
+static bool fqsc_next(FrtScorer *self) {
     FrtScorer *sub_sc = FQSc(self)->sub_scorer;
     FrtBitVector *bv = FQSc(self)->bv;
     while (sub_sc->next(sub_sc)) {
@@ -34,8 +31,7 @@ static bool fqsc_next(FrtScorer *self)
     return false;
 }
 
-static bool fqsc_skip_to(FrtScorer *self, int doc_num)
-{
+static bool fqsc_skip_to(FrtScorer *self, int doc_num) {
     FrtScorer *sub_sc = FQSc(self)->sub_scorer;
     FrtBitVector *bv = FQSc(self)->bv;
     if (sub_sc->skip_to(sub_sc, doc_num)) {
@@ -49,26 +45,21 @@ static bool fqsc_skip_to(FrtScorer *self, int doc_num)
     return false;
 }
 
-static FrtExplanation *fqsc_explain(FrtScorer *self, int doc_num)
-{
+static FrtExplanation *fqsc_explain(FrtScorer *self, int doc_num) {
     FrtScorer *sub_sc = FQSc(self)->sub_scorer;
     return sub_sc->explain(sub_sc, doc_num);
 }
 
-static void fqsc_destroy(FrtScorer *self)
-{
+static void fqsc_destroy(FrtScorer *self) {
     FilteredQueryScorer *fqsc = FQSc(self);
     fqsc->sub_scorer->destroy(fqsc->sub_scorer);
     frt_scorer_destroy_i(self);
 }
 
-static FrtScorer *fqsc_new(FrtScorer *scorer, FrtBitVector *bv, FrtSimilarity *sim)
-{
-    FrtScorer *self            = frt_scorer_new(FilteredQueryScorer, sim);
-
-    FQSc(self)->sub_scorer  = scorer;
-    FQSc(self)->bv          = bv;
-
+static FrtScorer *fqsc_new(FrtScorer *scorer, FrtBitVector *bv, FrtSimilarity *sim) {
+    FrtScorer *self        = frt_scorer_new(FilteredQueryScorer, sim);
+    FQSc(self)->sub_scorer = scorer;
+    FQSc(self)->bv         = bv;
     self->score   = &fqsc_score;
     self->next    = &fqsc_next;
     self->skip_to = &fqsc_skip_to;
@@ -85,43 +76,37 @@ static FrtScorer *fqsc_new(FrtScorer *scorer, FrtBitVector *bv, FrtSimilarity *s
  ***************************************************************************/
 
 #define FQW(weight) ((FilteredQueryWeight *)(weight))
-typedef struct FilteredQueryWeight
-{
+
+typedef struct FilteredQueryWeight {
     FrtWeight  super;
     FrtWeight *sub_weight;
 } FilteredQueryWeight;
 
-static char *fqw_to_s(FrtWeight *self)
-{
+static char *fqw_to_s(FrtWeight *self) {
     return frt_strfmt("FilteredQueryWeight(%f)", self->value);
 }
 
-static float fqw_sum_of_squared_weights(FrtWeight *self)
-{
+static float fqw_sum_of_squared_weights(FrtWeight *self) {
     FrtWeight *sub_weight = FQW(self)->sub_weight;
     return sub_weight->sum_of_squared_weights(sub_weight);
 }
 
-static void fqw_normalize(FrtWeight *self, float normalization_factor)
-{
+static void fqw_normalize(FrtWeight *self, float normalization_factor) {
     FrtWeight *sub_weight = FQW(self)->sub_weight;
     sub_weight->normalize(sub_weight, normalization_factor);
 }
 
-static float fqw_get_value(FrtWeight *self)
-{
+static float fqw_get_value(FrtWeight *self) {
     FrtWeight *sub_weight = FQW(self)->sub_weight;
     return sub_weight->get_value(sub_weight);
 }
 
-static FrtExplanation *fqw_explain(FrtWeight *self, FrtIndexReader *ir, int doc_num)
-{
+static FrtExplanation *fqw_explain(FrtWeight *self, FrtIndexReader *ir, int doc_num) {
     FrtWeight *sub_weight = FQW(self)->sub_weight;
     return sub_weight->explain(sub_weight, ir, doc_num);
 }
 
-static FrtScorer *fqw_scorer(FrtWeight *self, FrtIndexReader *ir)
-{
+static FrtScorer *fqw_scorer(FrtWeight *self, FrtIndexReader *ir) {
     FrtWeight *sub_weight = FQW(self)->sub_weight;
     FrtScorer *scorer = sub_weight->scorer(sub_weight, ir);
     FrtFilter *filter = FQQ(self->query)->filter;
@@ -129,30 +114,25 @@ static FrtScorer *fqw_scorer(FrtWeight *self, FrtIndexReader *ir)
     return fqsc_new(scorer, frt_filt_get_bv(filter, ir), self->similarity);
 }
 
-static void fqw_destroy(FrtWeight *self)
-{
+static void fqw_destroy(FrtWeight *self) {
     FrtWeight *sub_weight = FQW(self)->sub_weight;
     sub_weight->destroy(sub_weight);
     frt_w_destroy(self);
 }
 
-static FrtWeight *fqw_new(FrtQuery *query, FrtWeight *sub_weight, FrtSimilarity *sim)
-{
+static FrtWeight *fqw_new(FrtQuery *query, FrtWeight *sub_weight, FrtSimilarity *sim) {
     FrtWeight *self = w_new(FilteredQueryWeight, query);
-
-    FQW(self)->sub_weight           = sub_weight;
-
-    self->get_value                 = &fqw_get_value;
-    self->normalize                 = &fqw_normalize;
-    self->scorer                    = &fqw_scorer;
-    self->explain                   = &fqw_explain;
-    self->to_s                      = &fqw_to_s;
-    self->destroy                   = &fqw_destroy;
-    self->sum_of_squared_weights    = &fqw_sum_of_squared_weights;
-
-    self->similarity                = sim;
-    self->idf                       = 1.0f;
-    self->value                     = sub_weight->value;
+    FQW(self)->sub_weight        = sub_weight;
+    self->get_value              = &fqw_get_value;
+    self->normalize              = &fqw_normalize;
+    self->scorer                 = &fqw_scorer;
+    self->explain                = &fqw_explain;
+    self->to_s                   = &fqw_to_s;
+    self->destroy                = &fqw_destroy;
+    self->sum_of_squared_weights = &fqw_sum_of_squared_weights;
+    self->similarity             = sim;
+    self->idf                    = 1.0f;
+    self->value                  = sub_weight->value;
 
     return self;
 }
@@ -163,8 +143,7 @@ static FrtWeight *fqw_new(FrtQuery *query, FrtWeight *sub_weight, FrtSimilarity
  *
  ***************************************************************************/
 
-static char *fq_to_s(FrtQuery *self, FrtSymbol default_field)
-{
+static char *fq_to_s(FrtQuery *self, ID default_field) {
     FrtFilteredQuery *fq = FQQ(self);
     char *filter_str = fq->filter->to_s(fq->filter);
     char *query_str = fq->query->to_s(fq->query, default_field);
@@ -179,31 +158,33 @@ static char *fq_to_s(FrtQuery *self, FrtSymbol default_field)
     return buffer;;
 }
 
-static void fq_destroy(FrtQuery *self)
-{
+static void fq_destroy(FrtQuery *self) {
     frt_filt_deref(FQQ(self)->filter);
     frt_q_deref(FQQ(self)->query);
     frt_q_destroy_i(self);
 }
 
-static FrtWeight *fq_new_weight(FrtQuery *self, FrtSearcher *searcher)
-{
+static FrtWeight *fq_new_weight(FrtQuery *self, FrtSearcher *searcher) {
     FrtQuery *sub_query = FQQ(self)->query;
-    return fqw_new(self, frt_q_weight(sub_query, searcher),
-                      searcher->similarity);
+    return fqw_new(self, frt_q_weight(sub_query, searcher), searcher->similarity);
 }
 
-FrtQuery *frt_fq_new(FrtQuery *query, FrtFilter *filter)
-{
-    FrtQuery *self = frt_q_new(FrtFilteredQuery);
-
-    FQQ(self)->query        = query;
-    FQQ(self)->filter       = filter;
+FrtQuery *frt_fq_alloc(void) {
+    return frt_q_new(FrtFilteredQuery);
+}
 
-    self->type              = FILTERED_QUERY;
-    self->to_s              = &fq_to_s;
-    self->destroy_i         = &fq_destroy;
-    self->create_weight_i   = &fq_new_weight;
+FrtQuery *frt_fq_init(FrtQuery *self, FrtQuery *query, FrtFilter *filter) {
+    FQQ(self)->query      = query;
+    FQQ(self)->filter     = filter;
+    self->type            = FILTERED_QUERY;
+    self->to_s            = &fq_to_s;
+    self->destroy_i       = &fq_destroy;
+    self->create_weight_i = &fq_new_weight;
 
     return self;
 }
+
+FrtQuery *frt_fq_new(FrtQuery *query, FrtFilter *filter) {
+    FrtQuery *self = frt_fq_alloc();
+    return frt_fq_init(self, query, filter);
+}

data/ext/isomorfeus_ferret_ext/frt_q_fuzzy.c

@@ -2,6 +2,8 @@
 #include "frt_search.h"
 #include "frt_helper.h"
 
+#undef close
+
 /****************************************************************************
  *
  * FuzzyStuff
@@ -24,8 +26,7 @@
  * of the shorter string out of the query string and the index term being
  * compared.
  */
-static int fuzq_calculate_max_distance(FrtFuzzyQuery *fuzq, int m)
-{
+static int fuzq_calculate_max_distance(FrtFuzzyQuery *fuzq, int m) {
     return (int)((1.0 - fuzq->min_sim) * (FRT_MIN(fuzq->text_len, m) + fuzq->pre_len));
 }
 
@@ -35,8 +36,7 @@ static int fuzq_calculate_max_distance(FrtFuzzyQuery *fuzq, int m)
  * lengths up to the FRT_TYPICAL_LONGEST_WORD limit. For words longer than this we
  * calculate the value live.
  */
-static void fuzq_initialize_max_distances(FrtFuzzyQuery *fuzq)
-{
+static void fuzq_initialize_max_distances(FrtFuzzyQuery *fuzq) {
     int i;
     for (i = 0; i < FRT_TYPICAL_LONGEST_WORD; i++) {
         fuzq->max_distances[i] = fuzq_calculate_max_distance(fuzq, i);
@@ -47,8 +47,7 @@ static void fuzq_initialize_max_distances(FrtFuzzyQuery *fuzq)
  * Return the cached max-distance value if the word is within the
  * FRT_TYPICAL_LONGEST_WORD limit.
  */
-static int fuzq_get_max_distance(FrtFuzzyQuery *fuzq, int m)
-{
+static int fuzq_get_max_distance(FrtFuzzyQuery *fuzq, int m) {
     if (m < FRT_TYPICAL_LONGEST_WORD)
         return fuzq->max_distances[m];
     return fuzq_calculate_max_distance(fuzq, m);
@@ -62,10 +61,7 @@ static int fuzq_get_max_distance(FrtFuzzyQuery *fuzq, int m)
  * @params m the string length of +target+
  * @params n the string length of the query string minus length of the prefix
  */
-static float fuzq_score_mn(FrtFuzzyQuery *fuzq,
-                                  const char *target,
-                                  const int m, const int n)
-{
+static float fuzq_score_mn(FrtFuzzyQuery *fuzq, const char *target, const int m, const int n) {
     int i, j, prune;
     int *d_curr, *d_prev;
     const char *text = fuzq->text;
@@ -124,8 +120,7 @@ static float fuzq_score_mn(FrtFuzzyQuery *fuzq,
  *
  * http://mail-archives.apache.org/mod_mbox/lucene-java-dev/200606.mbox/%3c448F0E8C.3050901@alias-i.com%3e
  */
-float frt_fuzq_score(FrtFuzzyQuery *fuzq, const char *target)
-{
+float frt_fuzq_score(FrtFuzzyQuery *fuzq, const char *target) {
     const int m = (int)strlen(target);
     const int n = fuzq->text_len;
 
@@ -148,11 +143,10 @@ float frt_fuzq_score(FrtFuzzyQuery *fuzq, const char *target)
 
 #define FzQ(query) ((FrtFuzzyQuery *)(query))
 
-static char *fuzq_to_s(FrtQuery *self, FrtSymbol curr_field)
-{
+static char *fuzq_to_s(FrtQuery *self, ID curr_field) {
     char *buffer, *bptr;
     char *term = FzQ(self)->term;
-    FrtSymbol field = FzQ(self)->field;
+    ID field = FzQ(self)->field;
     const char *field_name = rb_id2name(field);
     bptr = buffer = FRT_ALLOC_N(char, strlen(term) + strlen(field_name) + 70);
 
@@ -174,8 +168,7 @@ static char *fuzq_to_s(FrtQuery *self, FrtSymbol curr_field)
     return buffer;
 }
 
-static FrtQuery *fuzq_rewrite(FrtQuery *self, FrtIndexReader *ir)
-{
+static FrtQuery *fuzq_rewrite(FrtQuery *self, FrtIndexReader *ir) {
     FrtQuery *q;
     FrtFuzzyQuery *fuzq = FzQ(self);
 
@@ -198,8 +191,7 @@ static FrtQuery *fuzq_rewrite(FrtQuery *self, FrtIndexReader *ir)
         strncpy(prefix, term, pre_len);
         prefix[pre_len] = '\0';
         te = ir->terms_from(ir, field_num, prefix);
-    }
-    else {
+    } else {
         te = ir->terms(ir, field_num);
     }
 
@@ -228,21 +220,18 @@ static FrtQuery *fuzq_rewrite(FrtQuery *self, FrtIndexReader *ir)
     return q;
 }
 
-static void fuzq_destroy(FrtQuery *self)
-{
+static void fuzq_destroy(FrtQuery *self) {
     free(FzQ(self)->term);
     free(FzQ(self)->da);
     frt_q_destroy_i(self);
 }
 
-static unsigned long long fuzq_hash(FrtQuery *self)
-{
+static unsigned long long fuzq_hash(FrtQuery *self) {
     return frt_str_hash(FzQ(self)->term) ^ frt_str_hash(rb_id2name(FzQ(self)->field))
         ^ frt_float2int(FzQ(self)->min_sim) ^ FzQ(self)->pre_len;
 }
 
-static int fuzq_eq(FrtQuery *self, FrtQuery *o)
-{
+static int fuzq_eq(FrtQuery *self, FrtQuery *o) {
     FrtFuzzyQuery *fq1 = FzQ(self);
     FrtFuzzyQuery *fq2 = FzQ(o);
 
@@ -252,17 +241,17 @@ static int fuzq_eq(FrtQuery *self, FrtQuery *o)
         && (fq1->min_sim == fq2->min_sim);
 }
 
-FrtQuery *frt_fuzq_new_conf(FrtSymbol field, const char *term,
-                     float min_sim, int pre_len, int max_terms)
-{
-    FrtQuery *self = frt_q_new(FrtFuzzyQuery);
+FrtQuery *frt_fuzq_alloc(void) {
+    return frt_q_new(FrtFuzzyQuery);
+}
 
+FrtQuery *frt_fuzq_init_conf(FrtQuery *self, ID field, const char *term, float min_sim, int pre_len, int max_terms) {
     FzQ(self)->field      = field;
     FzQ(self)->term       = frt_estrdup(term);
     FzQ(self)->pre_len    = pre_len ? pre_len : FRT_DEF_PRE_LEN;
     FzQ(self)->min_sim    = min_sim ? min_sim : FRT_DEF_MIN_SIM;
     FzQ(self)->da         = NULL;
-    FrtMTQMaxTerms(self)     = max_terms ? max_terms : FRT_DEF_MAX_TERMS;
+    FrtMTQMaxTerms(self)  = max_terms ? max_terms : FRT_DEF_MAX_TERMS;
 
     self->type            = FUZZY_QUERY;
     self->to_s            = &fuzq_to_s;
@@ -275,7 +264,11 @@ FrtQuery *frt_fuzq_new_conf(FrtSymbol field, const char *term,
     return self;
 }
 
-FrtQuery *frt_fuzq_new(FrtSymbol field, const char *term)
-{
+FrtQuery *frt_fuzq_new_conf(ID field, const char *term, float min_sim, int pre_len, int max_terms) {
+    FrtQuery *self = frt_fuzq_alloc();
+    return frt_fuzq_init_conf(self, field, term, min_sim, pre_len, max_terms);
+}
+
+FrtQuery *frt_fuzq_new(ID field, const char *term) {
     return frt_fuzq_new_conf(field, term, 0.0f, 0, 0);
 }

data/ext/isomorfeus_ferret_ext/frt_q_match_all.c

@@ -9,10 +9,9 @@
 
 #define MASc(scorer) ((MatchAllScorer *)(scorer))
 
-typedef struct MatchAllScorer
-{
-    FrtScorer          super;
-    FrtIndexReader    *ir;
+typedef struct MatchAllScorer {
+    FrtScorer       super;
+    FrtIndexReader  *ir;
     int             max_doc;
     float           score;
 } MatchAllScorer;
@@ -46,14 +45,11 @@ static FrtExplanation *masc_explain(FrtScorer *self, int doc_num)
     return frt_expl_new(1.0, "MatchAllScorer");
 }
 
-static FrtScorer *masc_new(FrtWeight *weight, FrtIndexReader *ir)
-{
+static FrtScorer *masc_new(FrtWeight *weight, FrtIndexReader *ir) {
     FrtScorer *self        = frt_scorer_new(MatchAllScorer, weight->similarity);
-
     MASc(self)->ir      = ir;
     MASc(self)->max_doc = ir->max_doc(ir);
     MASc(self)->score   = weight->value;
-
     self->doc           = -1;
     self->score         = &masc_score;
     self->next          = &masc_next;
@@ -89,16 +85,13 @@ static FrtExplanation *maw_explain(FrtWeight *self, FrtIndexReader *ir, int doc_
     return expl;
 }
 
-static FrtWeight *maw_new(FrtQuery *query, FrtSearcher *searcher)
-{
-    FrtWeight *self        = w_new(FrtWeight, query);
-
-    self->scorer        = &masc_new;
-    self->explain       = &maw_explain;
-    self->to_s          = &maw_to_s;
-
-    self->similarity    = query->get_similarity(query, searcher);
-    self->idf           = 1.0f;
+static FrtWeight *maw_new(FrtQuery *query, FrtSearcher *searcher) {
+    FrtWeight *self  = w_new(FrtWeight, query);
+    self->scorer     = &masc_new;
+    self->explain    = &maw_explain;
+    self->to_s       = &maw_to_s;
+    self->similarity = query->get_similarity(query, searcher);
+    self->idf        = 1.0f;
 
     return self;
 }
@@ -109,8 +102,7 @@ static FrtWeight *maw_new(FrtQuery *query, FrtSearcher *searcher)
  *
  ***************************************************************************/
 
-static char *maq_to_s(FrtQuery *self, FrtSymbol default_field)
-{
+static char *maq_to_s(FrtQuery *self, ID default_field) {
     (void)default_field;
     if (self->boost == 1.0) {
         return frt_estrdup("*");
@@ -131,10 +123,11 @@ static int maq_eq(FrtQuery *self, FrtQuery *o)
     return true;
 }
 
-FrtQuery *frt_maq_new()
-{
-    FrtQuery *self = frt_q_new(FrtQuery);
+FrtQuery *frt_maq_alloc(void) {
+    return frt_q_new(FrtQuery);
+}
 
+FrtQuery *frt_maq_init(FrtQuery *self) {
     self->type = MATCH_ALL_QUERY;
     self->to_s = &maq_to_s;
     self->hash = &maq_hash;
@@ -145,3 +138,8 @@ FrtQuery *frt_maq_new()
     return self;
 }
 
+FrtQuery *frt_maq_new(void) {
+    FrtQuery *self = frt_maq_alloc();
+    return frt_maq_init(self);
+}
+