Changeset 7b606608302021d361c250f0cb83e6c92a50d294

Timestamp:

04/28/08 13:06:54 (8 months ago)

Author:

David Balmain <dbalmain@…>

Parents:

2f5dc9c8dce95e8e8ac5d32256e9c9ff16052fc8

Children:

88af924cc987bc50098df966cc16b84e4213a7fe

git-committer:

David Balmain <dbalmain@gmail.com> / 2008-04-28T13:06:54Z+1000

Message:

Fixed a bug in Searcher#get_weight

* also improved test coverage for PhraseQuery

Location:

c

Files:

• .rake/gcov.history (modified) (previous)
• include/internal.h (modified) (1 diff)
• include/similarity.h (modified) (1 diff)
• src/q_phrase.c (modified) (1 diff)
• src/search.c (modified) (3 diffs)
• test/test_search.c (modified) (2 diffs)

c/include/internal.h

@@ -908 +908 @@
 #define term_hash                               frt_term_hash
 #define term_new                                frt_term_new
-#define term_set_new                            frt_term_set_new
 #define tf_new_i                                frt_tf_new_i
 #define thread_exit                             frt_thread_exit

c/include/similarity.h

@@ -11 +11 @@
  *
  ****************************************************************************/
-
-#define frt_term_set_new() \
-    frt_hs_new((hash_ft)&frt_term_hash, (eq_ft)&frt_term_eq, (free_ft)&frt_term_destroy)
 
 typedef struct FrtTerm

c/src/q_phrase.c

@@ -565 +565 @@
             tps[i] = mtdpe_new(ir, field_num, terms, t_cnt);
         }
-        if (tps[i] == NULL) {
-            /* free everything we just created and return NULL */
-            int j;
-            for (j = 0; j < i; j++) {
-                tps[i]->close(tps[i]);
-            }
-            free(tps);
-            return NULL;
-        }
+        /* neither mtdpe_new nor ir->term_positions should return NULL */
+        assert(NULL != tps[i]);
     }
 

c/src/search.c

@@ -1398 +1398 @@
 static Similarity *cdfsea_get_similarity(Searcher *self)
 {
-    (void)self;
-    RAISE(UNSUPPORTED_ERROR, UNSUPPORTED_ERROR_MSG);
-    return NULL;
+    return self->similarity;
 }
 
@@ -1416 +1414 @@
     CDFSEA(self)->max_doc   = max_doc;
 
+    self->similarity        = sim_create_default();
     self->doc_freq          = &cdfsea_doc_freq;
     self->get_doc           = &cdfsea_get_doc;
@@ -1515 +1514 @@
 static Weight *msea_create_weight(Searcher *self, Query *query)
 {
-    Jx
     int i, *doc_freqs;
     Searcher *cdfsea;
     Weight *w;
-    Hash *df_map = h_new((hash_ft)&term_hash, (eq_ft)&term_eq,
-                             (free_ft)NULL, free);
+    Hash *df_map = h_new((hash_ft)&term_hash,
+                         (eq_ft)&term_eq,
+                         (free_ft)term_destroy,
+                         free);
     Query *rewritten_query = self->rewrite(self, query);
-    HashSet *terms = term_set_new();
+    /* terms get copied directly to df_map so no need to free here */
+    HashSet *terms = frt_hs_new((hash_ft)&frt_term_hash,
+                                (eq_ft)&frt_term_eq,
+                                (free_ft)NULL);
     HashSetEntry *hse;
 

c/test/test_search.c

@@ -517 +517 @@
     Query *q;
     Query *phq = phq_new(field);
+    Weight *w;
+    char *t, e[100];
     check_to_s(tc, phq, field, "\"\"");
     check_to_s(tc, phq, NULL, "field:\"\"");
 
+    
     phq_add_term(phq, "quick", 1);
     phq_add_term(phq, "brown", 1);
@@ -529 +532 @@
     phq_set_slop(phq, 4);
     check_hits(tc, searcher, phq, "1, 16, 17", 17);
+
+    /* test PhraseWeight.to_s */
+    w = searcher->create_weight(searcher, phq);
+    sprintf(e, "PhraseWeight(%f)", w->value);
+    t = w->to_s(w); Asnequal(e, t, 17); free(t);
+    phq->boost = 10.5f;
+    sprintf(e, "PhraseWeight(%f)", w->value);
+    t = w->to_s(w); Asnequal(e, t, 17); free(t);
+    w->destroy(w);
+
     q_deref(phq);