ferret 0.10.0 → 0.10.1

data/ext/index.c

@@ -575,7 +575,7 @@ void sis_del_at(SegmentInfos *sis, int at)
     }
 }
 
-void sis_del_from_to(SegmentInfos *sis, int from, const int to)
+void sis_del_from_to(SegmentInfos *sis, int from, int to)
 {
     int i, num_to_del = to - from;
     const int sis_size = sis->size -= num_to_del;
@@ -1138,9 +1138,9 @@ void fw_write_tv_index(FieldsWriter *fw)
 void fw_add_postings(FieldsWriter *fw,
                      int field_num,
                      PostingList **plists,
-                     const int posting_count,
+                     int posting_count,
                      Offset *offsets,
-                     const int offset_count)
+                     int offset_count)
 {
     int i, delta_start, delta_length;
     const char *last_term = EMPTY_STRING;
@@ -1184,8 +1184,8 @@ void fw_add_postings(FieldsWriter *fw,
 
     if (fi_store_offsets(fi)) {
         /* use delta encoding for offsets */
+        int last_end = 0;
         os_write_vint(fdt_out, offset_count);  /* write shared prefix length */
-        int last_end = 0;
         for (i = 0; i < offset_count; i++) {
             int start = offsets[i].start;
             int end = offsets[i].end;
@@ -1852,6 +1852,10 @@ void tir_close(TermInfosReader *tir)
 {
     ary_destroy(tir->te_bucket, (free_ft)&ste_close);
     ste_close(tir->orig_te);
+
+    /* fix for some dodgy old versions of pthread */
+    thread_setspecific(tir->thread_te, NULL);
+
     thread_key_delete(tir->thread_te);
     free(tir);
 }
@@ -3335,6 +3339,7 @@ static void sr_close_i(IndexReader *ir)
     h_destroy(sr->norms);
 
     if (sr->fr_bucket) {
+        thread_setspecific(sr->thread_fr, NULL);
         thread_key_delete(sr->thread_fr);
         ary_destroy(sr->fr_bucket, (free_ft)&fr_close);
     }
@@ -3489,10 +3494,11 @@ static void sr_open_norms(IndexReader *ir, Store *cfs_store)
     char file_name[SEGMENT_NAME_MAX_LENGTH];
     FieldInfos *fis = ir->fis;
     char *ext_ptr;
+    const int field_cnt = fis->size;
+
     sprintf(file_name, "%s.", SR(ir)->segment);
     ext_ptr = file_name + strlen(file_name);
 
-    const int field_cnt = fis->size;
     for (i = 0; i < field_cnt; i++) {
         Store *store = ir->store;
         if (fi_has_norms(fis->fields[i])) {
@@ -3931,9 +3937,10 @@ IndexReader *mr_open(IndexReader **sub_readers, const int r_cnt)
     if (need_field_map) {
         mr->field_num_map = ALLOC_N(int *, r_cnt);
         for (i = 0; i < r_cnt; i++) {
-            mr->field_num_map[i] = ALLOC_N(int, fis->size);
             FieldInfos *sub_fis = sub_readers[i]->fis;
             const int fis_size = fis->size;
+
+            mr->field_num_map[i] = ALLOC_N(int, fis_size);
             for (j = 0; j < fis_size; j++) {
                 FieldInfo *fi = fis->fields[j];
                 FieldInfo *fi_sub = fis_get_field(sub_fis, fi->name);
@@ -4438,13 +4445,14 @@ HashTable *dw_invert_field(DocWriter *dw,
         fld_inv->length = num_terms;
     }
     else {
+        char buf[MAX_WORD_SIZE];
+        buf[MAX_WORD_SIZE - 1] = '\0';
         for (i = 0; i < df_size; i++) {
             int len = df->lengths[i];
-            char buf[MAX_WORD_SIZE];
             char *data_ptr = df->data[i];
             if (len > MAX_WORD_SIZE) {
                 len = MAX_WORD_SIZE - 1;
-                data_ptr = memcpy(buf, df->data[i], MAX_WORD_SIZE);
+                data_ptr = memcpy(buf, df->data[i], len);
             }
             dw_add_posting(mp, curr_plists, fld_plists, doc_num, data_ptr,
                            len, i);
@@ -5448,9 +5456,9 @@ static void iw_cp_fields(IndexWriter *iw, SegmentReader *sr,
             /* Write TermVectors */
             /* write TVs up to TV index */
             is2os_copy_bytes(fdt_in, fdt_out,
-                             is_read_u64(fdx_in)
-                             + is_read_u32(fdx_in)
-                             - is_pos(fdt_in));
+                             (int)(is_read_u64(fdx_in)
+                                   + (f_u64)is_read_u32(fdx_in)
+                                   - (f_u64)is_pos(fdt_in)));
 
             /* Write TV index pos */
             os_write_u32(fdx_out, (f_u32)(os_pos(fdt_out) - doc_start_ptr));

data/ext/priorityqueue.c

@@ -3,7 +3,7 @@
 
 #define START_CAPA 127
 
-PriorityQueue *pq_new(const int capa,
+PriorityQueue *pq_new(int capa,
                       bool (*less_than)(const void *p1, const void *p2),
                       void (*free_elem)(void *elem))
 {

data/ext/q_parser.c

@@ -133,7 +133,7 @@ typedef union YYSTYPE {
     char *str;
 } YYSTYPE;
 /* Line 196 of yacc.c.  */
-#line 137 "y.tab.c"
+#line 137 "src/q_parser.c"
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1
@@ -188,12 +188,16 @@ static Query *get_range_q(const char *field, const char *from, const char *to,
             sq = func;\
             if (sq) bq_add_query_nr(q, sq, BC_SHOULD);\
         }\
+        if (((BooleanQuery *)q)->clause_cnt == 0) {\
+            q_deref(q);\
+            q = NULL;\
+        }\
     }\
 } while (0)
 
 
 /* Line 219 of yacc.c.  */
-#line 197 "y.tab.c"
+#line 201 "src/q_parser.c"
 
 #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
 # define YYSIZE_T __SIZE_TYPE__
@@ -432,12 +436,12 @@ static const yysigned_char yyrhs[] =
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const unsigned char yyrline[] =
 {
-       0,    95,    95,    96,    98,    99,   100,   101,   103,   104,
-     105,   107,   108,   110,   111,   112,   113,   114,   115,   117,
-     118,   119,   121,   123,   123,   125,   125,   125,   128,   129,
-     131,   132,   133,   134,   136,   137,   138,   139,   140,   142,
-     143,   144,   145,   146,   147,   148,   149,   150,   151,   152,
-     153
+       0,    99,    99,   100,   102,   103,   104,   105,   107,   108,
+     109,   111,   112,   114,   115,   116,   117,   118,   119,   121,
+     122,   123,   125,   127,   127,   129,   129,   129,   132,   133,
+     135,   136,   137,   138,   140,   141,   142,   143,   144,   146,
+     147,   148,   149,   150,   151,   152,   153,   154,   155,   156,
+     157
 };
 #endif
 
@@ -1245,218 +1249,218 @@ yyreduce:
   switch (yyn)
     {
         case 2:
-#line 95 "src/q_parser.y"
-    { qp->result = (yyval.query) = NULL; }
+#line 99 "src/q_parser.y"
+    { qp->result = (yyval.query) = NULL; ;}
     break;
 
   case 3:
-#line 96 "src/q_parser.y"
-    { qp->result = (yyval.query) = get_bool_q((yyvsp[0].bclss)); }
+#line 100 "src/q_parser.y"
+    { qp->result = (yyval.query) = get_bool_q((yyvsp[0].bclss)); ;}
     break;
 
   case 4:
-#line 98 "src/q_parser.y"
-    { (yyval.bclss) = first_cls((yyvsp[0].bcls)); }
+#line 102 "src/q_parser.y"
+    { (yyval.bclss) = first_cls((yyvsp[0].bcls)); ;}
     break;
 
   case 5:
-#line 99 "src/q_parser.y"
-    { (yyval.bclss) = add_and_cls((yyvsp[-2].bclss), (yyvsp[0].bcls)); }
+#line 103 "src/q_parser.y"
+    { (yyval.bclss) = add_and_cls((yyvsp[-2].bclss), (yyvsp[0].bcls)); ;}
     break;
 
   case 6:
-#line 100 "src/q_parser.y"
-    { (yyval.bclss) = add_or_cls((yyvsp[-2].bclss), (yyvsp[0].bcls)); }
+#line 104 "src/q_parser.y"
+    { (yyval.bclss) = add_or_cls((yyvsp[-2].bclss), (yyvsp[0].bcls)); ;}
     break;
 
   case 7:
-#line 101 "src/q_parser.y"
-    { (yyval.bclss) = add_default_cls(qp, (yyvsp[-1].bclss), (yyvsp[0].bcls)); }
+#line 105 "src/q_parser.y"
+    { (yyval.bclss) = add_default_cls(qp, (yyvsp[-1].bclss), (yyvsp[0].bcls)); ;}
     break;
 
   case 8:
-#line 103 "src/q_parser.y"
-    { (yyval.bcls) = get_bool_cls((yyvsp[0].query), BC_MUST); }
+#line 107 "src/q_parser.y"
+    { (yyval.bcls) = get_bool_cls((yyvsp[0].query), BC_MUST); ;}
     break;
 
   case 9:
-#line 104 "src/q_parser.y"
-    { (yyval.bcls) = get_bool_cls((yyvsp[0].query), BC_MUST_NOT); }
+#line 108 "src/q_parser.y"
+    { (yyval.bcls) = get_bool_cls((yyvsp[0].query), BC_MUST_NOT); ;}
     break;
 
   case 10:
-#line 105 "src/q_parser.y"
-    { (yyval.bcls) = get_bool_cls((yyvsp[0].query), BC_SHOULD); }
+#line 109 "src/q_parser.y"
+    { (yyval.bcls) = get_bool_cls((yyvsp[0].query), BC_SHOULD); ;}
     break;
 
   case 12:
-#line 108 "src/q_parser.y"
-    { if ((yyvsp[-2].query)) sscanf((yyvsp[0].str),"%f",&((yyvsp[-2].query)->boost)); (yyval.query)=(yyvsp[-2].query); }
+#line 112 "src/q_parser.y"
+    { if ((yyvsp[-2].query)) sscanf((yyvsp[0].str),"%f",&((yyvsp[-2].query)->boost)); (yyval.query)=(yyvsp[-2].query); ;}
     break;
 
   case 14:
-#line 111 "src/q_parser.y"
-    { (yyval.query) = get_bool_q((yyvsp[-1].bclss)); }
+#line 115 "src/q_parser.y"
+    { (yyval.query) = get_bool_q((yyvsp[-1].bclss)); ;}
     break;
 
   case 19:
-#line 117 "src/q_parser.y"
-    { FLDS((yyval.query), get_term_q(qp, field, (yyvsp[0].str))); }
+#line 121 "src/q_parser.y"
+    { FLDS((yyval.query), get_term_q(qp, field, (yyvsp[0].str))); ;}
     break;
 
   case 20:
-#line 118 "src/q_parser.y"
-    { FLDS((yyval.query), get_fuzzy_q(qp, field, (yyvsp[-2].str), (yyvsp[0].str))); }
+#line 122 "src/q_parser.y"
+    { FLDS((yyval.query), get_fuzzy_q(qp, field, (yyvsp[-2].str), (yyvsp[0].str))); ;}
     break;
 
   case 21:
-#line 119 "src/q_parser.y"
-    { FLDS((yyval.query), get_fuzzy_q(qp, field, (yyvsp[-1].str), NULL)); }
+#line 123 "src/q_parser.y"
+    { FLDS((yyval.query), get_fuzzy_q(qp, field, (yyvsp[-1].str), NULL)); ;}
     break;
 
   case 22:
-#line 121 "src/q_parser.y"
-    { FLDS((yyval.query), get_wild_q(qp, field, (yyvsp[0].str))); }
+#line 125 "src/q_parser.y"
+    { FLDS((yyval.query), get_wild_q(qp, field, (yyvsp[0].str))); ;}
     break;
 
   case 23:
-#line 123 "src/q_parser.y"
-    { qp->fields = qp->def_fields; }
+#line 127 "src/q_parser.y"
+    { qp->fields = qp->def_fields; ;}
     break;
 
   case 24:
-#line 124 "src/q_parser.y"
-    { (yyval.query) = (yyvsp[-1].query); }
+#line 128 "src/q_parser.y"
+    { (yyval.query) = (yyvsp[-1].query); ;}
     break;
 
   case 25:
-#line 125 "src/q_parser.y"
-    { qp->fields = qp->all_fields; }
+#line 129 "src/q_parser.y"
+    { qp->fields = qp->all_fields; ;}
     break;
 
   case 26:
-#line 125 "src/q_parser.y"
-    {qp->fields = qp->def_fields;}
+#line 129 "src/q_parser.y"
+    {qp->fields = qp->def_fields;;}
     break;
 
   case 27:
-#line 126 "src/q_parser.y"
-    { (yyval.query) = (yyvsp[-1].query); }
+#line 130 "src/q_parser.y"
+    { (yyval.query) = (yyvsp[-1].query); ;}
     break;
 
   case 28:
-#line 128 "src/q_parser.y"
-    { (yyval.hashset) = first_field(qp, (yyvsp[0].str)); }
+#line 132 "src/q_parser.y"
+    { (yyval.hashset) = first_field(qp, (yyvsp[0].str)); ;}
     break;
 
   case 29:
-#line 129 "src/q_parser.y"
-    { (yyval.hashset) = add_field(qp, (yyvsp[0].str));}
+#line 133 "src/q_parser.y"
+    { (yyval.hashset) = add_field(qp, (yyvsp[0].str));;}
     break;
 
   case 30:
-#line 131 "src/q_parser.y"
-    { (yyval.query) = get_phrase_q(qp, (yyvsp[-1].phrase), NULL); }
+#line 135 "src/q_parser.y"
+    { (yyval.query) = get_phrase_q(qp, (yyvsp[-1].phrase), NULL); ;}
     break;
 
   case 31:
-#line 132 "src/q_parser.y"
-    { (yyval.query) = get_phrase_q(qp, (yyvsp[-3].phrase), (yyvsp[0].str)); }
+#line 136 "src/q_parser.y"
+    { (yyval.query) = get_phrase_q(qp, (yyvsp[-3].phrase), (yyvsp[0].str)); ;}
     break;
 
   case 32:
-#line 133 "src/q_parser.y"
-    { (yyval.query) = NULL; }
+#line 137 "src/q_parser.y"
+    { (yyval.query) = NULL; ;}
     break;
 
   case 33:
-#line 134 "src/q_parser.y"
-    { (yyval.query) = NULL; }
+#line 138 "src/q_parser.y"
+    { (yyval.query) = NULL; ;}
     break;
 
   case 34:
-#line 136 "src/q_parser.y"
-    { (yyval.phrase) = ph_first_word((yyvsp[0].str)); }
+#line 140 "src/q_parser.y"
+    { (yyval.phrase) = ph_first_word((yyvsp[0].str)); ;}
     break;
 
   case 35:
-#line 137 "src/q_parser.y"
-    { (yyval.phrase) = ph_first_word(NULL); }
+#line 141 "src/q_parser.y"
+    { (yyval.phrase) = ph_first_word(NULL); ;}
     break;
 
   case 36:
-#line 138 "src/q_parser.y"
-    { (yyval.phrase) = ph_add_word((yyvsp[-1].phrase), (yyvsp[0].str)); }
+#line 142 "src/q_parser.y"
+    { (yyval.phrase) = ph_add_word((yyvsp[-1].phrase), (yyvsp[0].str)); ;}
     break;
 
   case 37:
-#line 139 "src/q_parser.y"
-    { (yyval.phrase) = ph_add_word((yyvsp[-2].phrase), NULL); }
+#line 143 "src/q_parser.y"
+    { (yyval.phrase) = ph_add_word((yyvsp[-2].phrase), NULL); ;}
     break;
 
   case 38:
-#line 140 "src/q_parser.y"
-    { (yyval.phrase) = ph_add_multi_word((yyvsp[-2].phrase), (yyvsp[0].str));  }
+#line 144 "src/q_parser.y"
+    { (yyval.phrase) = ph_add_multi_word((yyvsp[-2].phrase), (yyvsp[0].str));  ;}
     break;
 
   case 39:
-#line 142 "src/q_parser.y"
-    { FLDS((yyval.query), get_range_q(field, (yyvsp[-2].str),  (yyvsp[-1].str),  true,  true)); }
+#line 146 "src/q_parser.y"
+    { FLDS((yyval.query), get_range_q(field, (yyvsp[-2].str),  (yyvsp[-1].str),  true,  true)); ;}
     break;
 
   case 40:
-#line 143 "src/q_parser.y"
-    { FLDS((yyval.query), get_range_q(field, (yyvsp[-2].str),  (yyvsp[-1].str),  true,  false)); }
+#line 147 "src/q_parser.y"
+    { FLDS((yyval.query), get_range_q(field, (yyvsp[-2].str),  (yyvsp[-1].str),  true,  false)); ;}
     break;
 
   case 41:
-#line 144 "src/q_parser.y"
-    { FLDS((yyval.query), get_range_q(field, (yyvsp[-2].str),  (yyvsp[-1].str),  false, true)); }
+#line 148 "src/q_parser.y"
+    { FLDS((yyval.query), get_range_q(field, (yyvsp[-2].str),  (yyvsp[-1].str),  false, true)); ;}
     break;
 
   case 42:
-#line 145 "src/q_parser.y"
-    { FLDS((yyval.query), get_range_q(field, (yyvsp[-2].str),  (yyvsp[-1].str),  false, false)); }
+#line 149 "src/q_parser.y"
+    { FLDS((yyval.query), get_range_q(field, (yyvsp[-2].str),  (yyvsp[-1].str),  false, false)); ;}
     break;
 
   case 43:
-#line 146 "src/q_parser.y"
-    { FLDS((yyval.query), get_range_q(field, NULL,(yyvsp[-1].str),  false, false)); }
+#line 150 "src/q_parser.y"
+    { FLDS((yyval.query), get_range_q(field, NULL,(yyvsp[-1].str),  false, false)); ;}
     break;
 
   case 44:
-#line 147 "src/q_parser.y"
-    { FLDS((yyval.query), get_range_q(field, NULL,(yyvsp[-1].str),  false, true)); }
+#line 151 "src/q_parser.y"
+    { FLDS((yyval.query), get_range_q(field, NULL,(yyvsp[-1].str),  false, true)); ;}
     break;
 
   case 45:
-#line 148 "src/q_parser.y"
-    { FLDS((yyval.query), get_range_q(field, (yyvsp[-1].str),  NULL,true,  false)); }
+#line 152 "src/q_parser.y"
+    { FLDS((yyval.query), get_range_q(field, (yyvsp[-1].str),  NULL,true,  false)); ;}
     break;
 
   case 46:
-#line 149 "src/q_parser.y"
-    { FLDS((yyval.query), get_range_q(field, (yyvsp[-1].str),  NULL,false, false)); }
+#line 153 "src/q_parser.y"
+    { FLDS((yyval.query), get_range_q(field, (yyvsp[-1].str),  NULL,false, false)); ;}
     break;
 
   case 47:
-#line 150 "src/q_parser.y"
-    { FLDS((yyval.query), get_range_q(field, NULL,(yyvsp[0].str),  false, false)); }
+#line 154 "src/q_parser.y"
+    { FLDS((yyval.query), get_range_q(field, NULL,(yyvsp[0].str),  false, false)); ;}
     break;
 
   case 48:
-#line 151 "src/q_parser.y"
-    { FLDS((yyval.query), get_range_q(field, NULL,(yyvsp[0].str),  false, true)); }
+#line 155 "src/q_parser.y"
+    { FLDS((yyval.query), get_range_q(field, NULL,(yyvsp[0].str),  false, true)); ;}
     break;
 
   case 49:
-#line 152 "src/q_parser.y"
-    { FLDS((yyval.query), get_range_q(field, (yyvsp[0].str),  NULL,true,  false)); }
+#line 156 "src/q_parser.y"
+    { FLDS((yyval.query), get_range_q(field, (yyvsp[0].str),  NULL,true,  false)); ;}
     break;
 
   case 50:
-#line 153 "src/q_parser.y"
-    { FLDS((yyval.query), get_range_q(field, (yyvsp[0].str),  NULL,false, false)); }
+#line 157 "src/q_parser.y"
+    { FLDS((yyval.query), get_range_q(field, (yyvsp[0].str),  NULL,false, false)); ;}
     break;
 
 
@@ -1464,7 +1468,7 @@ yyreduce:
     }
 
 /* Line 1126 of yacc.c.  */
-#line 1468 "y.tab.c"
+#line 1472 "src/q_parser.c"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -1732,11 +1736,11 @@ yyreturn:
 }
 
 
-#line 155 "src/q_parser.y"
+#line 159 "src/q_parser.y"
 
 
-const char *special_char = "&:()[]{}!+\"~^-|<>=*?";
-const char *not_word =  " \t&:()[]{}!+\"~^-|<>=";
+const char *special_char = "&:()[]{}!\"~^|<>=*?+-";
+const char *not_word =   " \t:()[]{}!\"~^|<>=";
 
 static int get_word(YYSTYPE *lvalp, QParser *qp)
 {