isomorfeus-ferret 0.12.7 → 0.13.0

data/ext/isomorfeus_ferret_ext/frt_mempool.c

@@ -16,8 +16,7 @@ FrtMemoryPool *frt_mp_new_capa(int chuck_size, int init_buf_capa)
     return mp;
 }
 
-FrtMemoryPool *frt_mp_new()
-{
+FrtMemoryPool *frt_mp_new(void) {
     return frt_mp_new_capa(FRT_MP_BUF_SIZE, FRT_MP_INIT_CAPA);
 }
 

data/ext/isomorfeus_ferret_ext/frt_multimapper.c

@@ -18,8 +18,8 @@ typedef struct LetterState
     int val;
     char *mapping;
 } LetterState;
-#define LSt(state) ((LetterState *)(state))
 
+#define LSt(state) ((LetterState *)(state))
 
 static int lstate_next(LetterState *self, int c, int *states)
 {
@@ -84,8 +84,7 @@ static void ndstate_add(NonDeterministicState *self, int c, int state)
     self->states[c][self->size[c]++] = state;
 }
 
-static void ndstate_destroy_i(NonDeterministicState *self)
-{
+static void ndstate_destroy_i(NonDeterministicState *self) {
     int i;
     for (i = 0; i < 256; i++) {
         free(self->states[i]);
@@ -99,8 +98,7 @@ static int ndstate_is_match(FrtState *self, char **mapping)
     return 0;
 }
 
-static NonDeterministicState *ndstate_new()
-{
+static NonDeterministicState *ndstate_new(void) {
     NonDeterministicState *self = FRT_ALLOC_AND_ZERO(NonDeterministicState);
     St(self)->next              = (int (*)(FrtState *, int, int *))&ndstate_next;
     St(self)->destroy_i         = (void (*)(FrtState *))&ndstate_destroy_i;
@@ -108,8 +106,7 @@ static NonDeterministicState *ndstate_new()
     return self;
 }
 
-FrtMultiMapper *frt_mulmap_new()
-{
+FrtMultiMapper *frt_mulmap_new(void) {
     FrtMultiMapper *self = FRT_ALLOC_AND_ZERO(FrtMultiMapper);
     self->capa = 128;
     self->mappings = FRT_ALLOC_N(FrtMapping *, 128);

data/ext/isomorfeus_ferret_ext/frt_q_boolean.c

@@ -15,23 +15,20 @@
  * Coordinator
  ***************************************************************************/
 
-typedef struct Coordinator
-{
+typedef struct Coordinator {
     int max_coord;
     float *coord_factors;
     FrtSimilarity *similarity;
     int num_matches;
 } Coordinator;
 
-static Coordinator *coord_new(FrtSimilarity *similarity)
-{
+static Coordinator *coord_new(FrtSimilarity *similarity) {
     Coordinator *self = FRT_ALLOC_AND_ZERO(Coordinator);
     self->similarity = similarity;
     return self;
 }
 
-static Coordinator *coord_init(Coordinator *self)
-{
+static Coordinator *coord_init(Coordinator *self) {
     int i;
     self->coord_factors = FRT_ALLOC_N(float, self->max_coord + 1);
 
@@ -49,8 +46,7 @@ static Coordinator *coord_init(Coordinator *self)
 
 #define DSSc(scorer) ((DisjunctionSumScorer *)(scorer))
 
-typedef struct DisjunctionSumScorer
-{
+typedef struct DisjunctionSumScorer {
     FrtScorer          super;
     float           cum_score;
     int             num_matches;
@@ -61,13 +57,11 @@ typedef struct DisjunctionSumScorer
     Coordinator    *coordinator;
 } DisjunctionSumScorer;
 
-static float dssc_score(FrtScorer *self)
-{
+static float dssc_score(FrtScorer *self) {
     return DSSc(self)->cum_score;
 }
 
-static void dssc_init_scorer_queue(DisjunctionSumScorer *dssc)
-{
+static void dssc_init_scorer_queue(DisjunctionSumScorer *dssc) {
     int i;
     FrtScorer *sub_scorer;
     FrtPriorityQueue *pq = dssc->scorer_queue
@@ -81,8 +75,7 @@ static void dssc_init_scorer_queue(DisjunctionSumScorer *dssc)
     }
 }
 
-static bool dssc_advance_after_current(FrtScorer *self)
-{
+static bool dssc_advance_after_current(FrtScorer *self) {
     DisjunctionSumScorer *dssc = DSSc(self);
     FrtPriorityQueue *scorer_queue = dssc->scorer_queue;
 
@@ -130,8 +123,7 @@ static bool dssc_advance_after_current(FrtScorer *self)
     }
 }
 
-static bool dssc_next(FrtScorer *self)
-{
+static bool dssc_next(FrtScorer *self) {
     if (DSSc(self)->scorer_queue == NULL) {
         dssc_init_scorer_queue(DSSc(self));
     }
@@ -144,8 +136,7 @@ static bool dssc_next(FrtScorer *self)
     }
 }
 
-static bool dssc_skip_to(FrtScorer *self, int doc_num)
-{
+static bool dssc_skip_to(FrtScorer *self, int doc_num) {
     DisjunctionSumScorer *dssc = DSSc(self);
     FrtPriorityQueue *scorer_queue = dssc->scorer_queue;
 
@@ -820,9 +811,8 @@ static FrtExplanation *nmsc_explain(FrtScorer *self, int doc_num)
     return frt_expl_new(0.0, "No documents matched");
 }
 
-static FrtScorer *non_matching_scorer_new()
-{
-    FrtScorer *self    = frt_scorer_new(FrtScorer, NULL);
+static FrtScorer *non_matching_scorer_new(void) {
+    FrtScorer *self = frt_scorer_new(FrtScorer, NULL);
     self->score     = &nmsc_score;
     self->next      = &nmsc_next;
     self->skip_to   = &nmsc_skip_to;
@@ -836,26 +826,22 @@ static FrtScorer *non_matching_scorer_new()
  ***************************************************************************/
 
 #define BSc(scorer) ((BooleanScorer *)(scorer))
-typedef struct BooleanScorer
-{
-    FrtScorer          super;
-    FrtScorer        **required_scorers;
-    int             rs_cnt;
-    int             rs_capa;
-    FrtScorer        **optional_scorers;
-    int             os_cnt;
-    int             os_capa;
-    FrtScorer        **prohibited_scorers;
-    int             ps_cnt;
-    int             ps_capa;
-    FrtScorer         *counting_sum_scorer;
-    Coordinator    *coordinator;
+typedef struct BooleanScorer {
+    FrtScorer   super;
+    FrtScorer   **required_scorers;
+    int         rs_cnt;
+    int         rs_capa;
+    FrtScorer   **optional_scorers;
+    int         os_cnt;
+    int         os_capa;
+    FrtScorer   **prohibited_scorers;
+    int         ps_cnt;
+    int         ps_capa;
+    FrtScorer   *counting_sum_scorer;
+    Coordinator *coordinator;
 } BooleanScorer;
 
-static FrtScorer *counting_sum_scorer_create3(BooleanScorer *bsc,
-                                           FrtScorer *req_scorer,
-                                           FrtScorer *opt_scorer)
-{
+static FrtScorer *counting_sum_scorer_create3(BooleanScorer *bsc, FrtScorer *req_scorer, FrtScorer *opt_scorer) {
     if (bsc->ps_cnt == 0) {
         /* no prohibited */
         return req_opt_sum_scorer_new(req_scorer, opt_scorer);
@@ -1175,8 +1161,7 @@ static void bw_destroy(FrtWeight *self)
     frt_w_destroy(self);
 }
 
-static FrtExplanation *bw_explain(FrtWeight *self, FrtIndexReader *ir, int doc_num)
-{
+static FrtExplanation *bw_explain(FrtWeight *self, FrtIndexReader *ir, int doc_num) {
     FrtBooleanQuery *bq = BQ(self->query);
     FrtExplanation *sum_expl = frt_expl_new(0.0f, "sum of:");
     FrtExplanation *explanation;
@@ -1229,8 +1214,7 @@ static FrtExplanation *bw_explain(FrtWeight *self, FrtIndexReader *ir, int doc_n
     }
 }
 
-static FrtWeight *bw_new(FrtQuery *query, FrtSearcher *searcher)
-{
+static FrtWeight *bw_new(FrtQuery *query, FrtSearcher *searcher) {
     int i;
     FrtWeight *self = w_new(BooleanWeight, query);
 
@@ -1259,8 +1243,7 @@ static FrtWeight *bw_new(FrtQuery *query, FrtSearcher *searcher)
  *
  ***************************************************************************/
 
-void frt_bc_set_occur(FrtBooleanClause *self, FrtBCType occur)
-{
+void frt_bc_set_occur(FrtBooleanClause *self, FrtBCType occur) {
     self->occur = occur;
     switch (occur) {
         case FRT_BC_SHOULD:
@@ -1281,42 +1264,44 @@ void frt_bc_set_occur(FrtBooleanClause *self, FrtBCType occur)
     }
 }
 
-void frt_bc_deref(FrtBooleanClause *self)
-{
+void frt_bc_deref(FrtBooleanClause *self) {
     if (--self->ref_cnt <= 0) {
         frt_q_deref(self->query);
         free(self);
     }
 }
 
-static unsigned long long bc_hash(FrtBooleanClause *self)
-{
+static unsigned long long bc_hash(FrtBooleanClause *self) {
     return ((frt_q_hash(self->query) << 2) | self->occur);
 }
 
-static int  bc_eq(FrtBooleanClause *self, FrtBooleanClause *o)
-{
+static int  bc_eq(FrtBooleanClause *self, FrtBooleanClause *o) {
     return ((self->occur == o->occur) && frt_q_eq(self->query, o->query));
 }
 
-FrtBooleanClause *frt_bc_new(FrtQuery *query, FrtBCType occur)
-{
-    FrtBooleanClause *self = FRT_ALLOC(FrtBooleanClause);
+FrtBooleanClause *frt_bc_alloc(void) {
+    return FRT_ALLOC(FrtBooleanClause);
+}
+
+FrtBooleanClause *frt_bc_init(FrtBooleanClause *self, FrtQuery *query, FrtBCType occur) {
     self->ref_cnt = 1;
     self->query = query;
     frt_bc_set_occur(self, occur);
     return self;
 }
 
+FrtBooleanClause *frt_bc_new(FrtQuery *query, FrtBCType occur) {
+    FrtBooleanClause *self = frt_bc_alloc();
+    return frt_bc_init(self, query, occur);
+}
+
 /***************************************************************************
  *
  * BooleanQuery
  *
  ***************************************************************************/
 
-static FrtMatchVector *bq_get_matchv_i(FrtQuery *self, FrtMatchVector *mv,
-                                    FrtTermVector *tv)
-{
+static FrtMatchVector *bq_get_matchv_i(FrtQuery *self, FrtMatchVector *mv, FrtTermVector *tv) {
     int i;
     for (i = BQ(self)->clause_cnt - 1; i >= 0; i--) {
         if (BQ(self)->clauses[i]->occur != FRT_BC_MUST_NOT) {
@@ -1327,8 +1312,7 @@ static FrtMatchVector *bq_get_matchv_i(FrtQuery *self, FrtMatchVector *mv,
     return mv;
 }
 
-static FrtQuery *bq_rewrite(FrtQuery *self, FrtIndexReader *ir)
-{
+static FrtQuery *bq_rewrite(FrtQuery *self, FrtIndexReader *ir) {
     int i;
     const int clause_cnt = BQ(self)->clause_cnt;
     bool rewritten = false;
@@ -1397,8 +1381,7 @@ static FrtQuery *bq_rewrite(FrtQuery *self, FrtIndexReader *ir)
     return self;
 }
 
-static void bq_extract_terms(FrtQuery *self, FrtHashSet *terms)
-{
+static void bq_extract_terms(FrtQuery *self, FrtHashSet *terms) {
     int i;
     for (i = 0; i < BQ(self)->clause_cnt; i++) {
         FrtBooleanClause *clause = BQ(self)->clauses[i];
@@ -1406,8 +1389,7 @@ static void bq_extract_terms(FrtQuery *self, FrtHashSet *terms)
     }
 }
 
-static char *bq_to_s(FrtQuery *self, FrtSymbol field)
-{
+static char *bq_to_s(FrtQuery *self, ID field) {
     int i;
     FrtBooleanClause *clause;
     FrtQuery *sub_query;
@@ -1439,8 +1421,7 @@ static char *bq_to_s(FrtQuery *self, FrtSymbol field)
         }
         if (clause->is_prohibited) {
             buffer[bp++] = '-';
-        }
-        else if (clause->is_required) {
+        } else if (clause->is_required) {
             buffer[bp++] = '+';
         }
 
@@ -1451,8 +1432,7 @@ static char *bq_to_s(FrtQuery *self, FrtSymbol field)
             memcpy(buffer + bp, clause_str, sizeof(char) * clause_len);
             bp += clause_len;
             buffer[bp++] = ')';
-        }
-        else {
+        } else {
             memcpy(buffer + bp, clause_str, sizeof(char) * clause_len);
             bp += clause_len;
         }
@@ -1471,8 +1451,7 @@ static char *bq_to_s(FrtQuery *self, FrtSymbol field)
     return buffer;
 }
 
-static void bq_destroy(FrtQuery *self)
-{
+static void bq_destroy(FrtQuery *self) {
     int i;
     for (i = 0; i < BQ(self)->clause_cnt; i++) {
         frt_bc_deref(BQ(self)->clauses[i]);
@@ -1484,14 +1463,12 @@ static void bq_destroy(FrtQuery *self)
     frt_q_destroy_i(self);
 }
 
-static float bq_coord_disabled(FrtSimilarity *sim, int overlap, int max_overlap)
-{
+static float bq_coord_disabled(FrtSimilarity *sim, int overlap, int max_overlap) {
     (void)sim; (void)overlap; (void)max_overlap;
     return 1.0;
 }
 
-static FrtSimilarity *bq_get_similarity(FrtQuery *self, FrtSearcher *searcher)
-{
+static FrtSimilarity *bq_get_similarity(FrtQuery *self, FrtSearcher *searcher) {
     if (!BQ(self)->similarity) {
         FrtSimilarity *sim = frt_q_get_similarity_i(self, searcher);
         BQ(self)->similarity = FRT_ALLOC(FrtSimilarity);
@@ -1503,8 +1480,7 @@ static FrtSimilarity *bq_get_similarity(FrtQuery *self, FrtSearcher *searcher)
     return BQ(self)->similarity;
 }
 
-static unsigned long long bq_hash(FrtQuery *self)
-{
+static unsigned long long bq_hash(FrtQuery *self) {
     int i;
     unsigned long long hash = 0;
     for (i = 0; i < BQ(self)->clause_cnt; i++) {
@@ -1513,8 +1489,7 @@ static unsigned long long bq_hash(FrtQuery *self)
     return (hash << 1) | BQ(self)->coord_disabled;
 }
 
-static int  bq_eq(FrtQuery *self, FrtQuery *o)
-{
+static int  bq_eq(FrtQuery *self, FrtQuery *o) {
     int i;
     FrtBooleanQuery *bq1 = BQ(self);
     FrtBooleanQuery *bq2 = BQ(o);
@@ -1532,9 +1507,11 @@ static int  bq_eq(FrtQuery *self, FrtQuery *o)
     return true;
 }
 
-FrtQuery *frt_bq_new(bool coord_disabled)
-{
-    FrtQuery *self = frt_q_new(FrtBooleanQuery);
+FrtQuery *frt_bq_alloc(void) {
+    return frt_q_new(FrtBooleanQuery);
+}
+
+FrtQuery *frt_bq_init(FrtQuery *self, bool coord_disabled) {
     BQ(self)->coord_disabled = coord_disabled;
     if (coord_disabled) {
         self->get_similarity = &bq_get_similarity;
@@ -1559,15 +1536,18 @@ FrtQuery *frt_bq_new(bool coord_disabled)
     return self;
 }
 
-FrtQuery *frt_bq_new_max(bool coord_disabled, int max)
-{
+FrtQuery *frt_bq_new(bool coord_disabled) {
+    FrtQuery *self = frt_bq_alloc();
+    return frt_bq_init(self, coord_disabled);
+}
+
+FrtQuery *frt_bq_new_max(bool coord_disabled, int max) {
     FrtQuery *q = frt_bq_new(coord_disabled);
     BQ(q)->max_clause_cnt = max;
     return q;
 }
 
-FrtBooleanClause *frt_bq_add_clause_nr(FrtQuery *self, FrtBooleanClause *bc)
-{
+FrtBooleanClause *frt_bq_add_clause_nr(FrtQuery *self, FrtBooleanClause *bc) {
     if (BQ(self)->clause_cnt >= BQ(self)->max_clause_cnt) {
         FRT_RAISE(FRT_STATE_ERROR, "Two many clauses. The max clause limit is set to "
               "<%d> but your query has <%d> clauses. You can try increasing "
@@ -1583,14 +1563,12 @@ FrtBooleanClause *frt_bq_add_clause_nr(FrtQuery *self, FrtBooleanClause *bc)
     return bc;
 }
 
-FrtBooleanClause *frt_bq_add_clause(FrtQuery *self, FrtBooleanClause *bc)
-{
+FrtBooleanClause *frt_bq_add_clause(FrtQuery *self, FrtBooleanClause *bc) {
     FRT_REF(bc);
     return frt_bq_add_clause_nr(self, bc);
 }
 
-FrtBooleanClause *frt_bq_add_query_nr(FrtQuery *self, FrtQuery *sub_query, FrtBCType occur)
-{
+FrtBooleanClause *frt_bq_add_query_nr(FrtQuery *self, FrtQuery *sub_query, FrtBCType occur) {
     FrtBooleanClause *bc;
     if (BQ(self)->clause_cnt >= BQ(self)->max_clause_cnt) {
         FRT_RAISE(FRT_STATE_ERROR, "Two many clauses. The max clause limit is set to "
@@ -1604,9 +1582,7 @@ FrtBooleanClause *frt_bq_add_query_nr(FrtQuery *self, FrtQuery *sub_query, FrtBC
     return bc;
 }
 
-FrtBooleanClause *frt_bq_add_query(FrtQuery *self, FrtQuery *sub_query, FrtBCType occur)
-{
+FrtBooleanClause *frt_bq_add_query(FrtQuery *self, FrtQuery *sub_query, FrtBCType occur) {
     FRT_REF(sub_query);
     return frt_bq_add_query_nr(self, sub_query, occur);
 }
-

data/ext/isomorfeus_ferret_ext/frt_q_const_score.c

@@ -10,36 +10,30 @@
 #define CScQ(query) ((FrtConstantScoreQuery *)(query))
 #define CScSc(scorer) ((ConstantScoreScorer *)(scorer))
 
-typedef struct ConstantScoreScorer
-{
-    FrtScorer      super;
-    FrtBitVector  *bv;
-    float       score;
+typedef struct ConstantScoreScorer {
+    FrtScorer    super;
+    FrtBitVector *bv;
+    float        score;
 } ConstantScoreScorer;
 
-static float cssc_score(FrtScorer *self)
-{
+static float cssc_score(FrtScorer *self) {
     return CScSc(self)->score;
 }
 
-static bool cssc_next(FrtScorer *self)
-{
+static bool cssc_next(FrtScorer *self) {
     return ((self->doc = frt_bv_scan_next(CScSc(self)->bv)) >= 0);
 }
 
-static bool cssc_skip_to(FrtScorer *self, int doc_num)
-{
+static bool cssc_skip_to(FrtScorer *self, int doc_num) {
     return ((self->doc = frt_bv_scan_next_from(CScSc(self)->bv, doc_num)) >= 0);
 }
 
-static FrtExplanation *cssc_explain(FrtScorer *self, int doc_num)
-{
+static FrtExplanation *cssc_explain(FrtScorer *self, int doc_num) {
     (void)self; (void)doc_num;
     return frt_expl_new(1.0, "ConstantScoreScorer");
 }
 
-static FrtScorer *cssc_new(FrtWeight *weight, FrtIndexReader *ir)
-{
+static FrtScorer *cssc_new(FrtWeight *weight, FrtIndexReader *ir) {
     FrtScorer *self    = frt_scorer_new(ConstantScoreScorer, weight->similarity);
     FrtFilter *filter  = CScQ(weight->query)->filter;
 
@@ -60,13 +54,11 @@ static FrtScorer *cssc_new(FrtWeight *weight, FrtIndexReader *ir)
  *
  ***************************************************************************/
 
-static char *csw_to_s(FrtWeight *self)
-{
+static char *csw_to_s(FrtWeight *self) {
     return frt_strfmt("ConstantScoreWeight(%f)", self->value);
 }
 
-static FrtExplanation *csw_explain(FrtWeight *self, FrtIndexReader *ir, int doc_num)
-{
+static FrtExplanation *csw_explain(FrtWeight *self, FrtIndexReader *ir, int doc_num) {
     FrtFilter *filter = CScQ(self->query)->filter;
     FrtExplanation *expl;
     char *filter_str = filter->to_s(filter);
@@ -83,9 +75,8 @@ static FrtExplanation *csw_explain(FrtWeight *self, FrtIndexReader *ir, int doc_
     return expl;
 }
 
-static FrtWeight *csw_new(FrtQuery *query, FrtSearcher *searcher)
-{
-    FrtWeight *self        = w_new(FrtWeight, query);
+static FrtWeight *csw_new(FrtQuery *query, FrtSearcher *searcher) {
+    FrtWeight *self     = w_new(FrtWeight, query);
 
     self->scorer        = &cssc_new;
     self->explain       = &csw_explain;
@@ -103,42 +94,39 @@ static FrtWeight *csw_new(FrtQuery *query, FrtSearcher *searcher)
  *
  ***************************************************************************/
 
-static char *csq_to_s(FrtQuery *self, FrtSymbol default_field)
-{
+static char *csq_to_s(FrtQuery *self, ID default_field) {
     FrtFilter *filter = CScQ(self)->filter;
     char *filter_str = filter->to_s(filter);
     char *buffer;
     (void)default_field;
     if (self->boost == 1.0) {
         buffer = frt_strfmt("ConstantScore(%s)", filter_str);
-    }
-    else {
+    } else {
         buffer = frt_strfmt("ConstantScore(%s)^%f", filter_str, self->boost);
     }
     free(filter_str);
     return buffer;;
 }
 
-static void csq_destroy(FrtQuery *self)
-{
+static void csq_destroy(FrtQuery *self) {
     frt_filt_deref(CScQ(self)->filter);
     frt_q_destroy_i(self);
 }
 
-static unsigned long long csq_hash(FrtQuery *self)
-{
+static unsigned long long csq_hash(FrtQuery *self) {
     return frt_filt_hash(CScQ(self)->filter);
 }
 
-static int csq_eq(FrtQuery *self, FrtQuery *o)
-{
+static int csq_eq(FrtQuery *self, FrtQuery *o) {
     return frt_filt_eq(CScQ(self)->filter, CScQ(o)->filter);
 }
 
-FrtQuery *frt_csq_new_nr(FrtFilter *filter)
-{
-    FrtQuery *self = frt_q_new(FrtConstantScoreQuery);
-    CScQ(self)->filter = filter;
+FrtQuery *frt_csq_alloc(void) {
+    return frt_q_new(FrtConstantScoreQuery);
+}
+
+FrtQuery *frt_csq_init_nr(FrtQuery *self, FrtFilter *filter) {
+    CScQ(self)->filter      = filter;
 
     self->type              = CONSTANT_QUERY;
     self->to_s              = &csq_to_s;
@@ -150,8 +138,17 @@ FrtQuery *frt_csq_new_nr(FrtFilter *filter)
     return self;
 }
 
-FrtQuery *frt_csq_new(FrtFilter *filter)
-{
+FrtQuery *frt_csq_new_nr(FrtFilter *filter) {
+    FrtQuery *self = frt_csq_alloc();
+    return frt_csq_init_nr(self, filter);
+}
+
+FrtQuery *frt_csq_init(FrtQuery *self, FrtFilter *filter) {
+    FRT_REF(filter);
+    return frt_csq_init_nr(self, filter);
+}
+
+FrtQuery *frt_csq_new(FrtFilter *filter) {
     FRT_REF(filter);
     return frt_csq_new_nr(filter);
 }