whistlepig 0.6 → 0.7

data/README

@@ -8,7 +8,7 @@ the frills, Whistlepig may be for you.
 Whistlepig is written in ANSI C99. It currently provides a C API and Ruby
 bindings.
 
-Latest version: 0.6, released 2011-04-28.
+Latest version: 0.7, released 2011-07-19.
         Status: alpha
           News: http://all-thing.net/label/whistlepig/
       Homepage: http://masanjin.net/whistlepig/
@@ -16,7 +16,7 @@ Latest version: 0.6, released 2011-04-28.
 
 = Getting it
 
-       Tarball:  http://masanjin.net/whistlepig/whistlepig-0.6.tar.gz
+       Tarball:  http://masanjin.net/whistlepig/whistlepig-0.7.tar.gz
        Rubygem:  gem install whistlepig
            Git:  git clone git://github.com/wmorgan/whistlepig.git
 

data/ext/whistlepig/query-parser.lex.c

@@ -389,7 +389,7 @@ static yyconst struct yy_trans_info yy_transition[1808] =
  {  27, 516 }, {  28, 516 }, {  29, 516 }, {  30, 516 }, {  31, 516 },
  {  32, 526 }, {  33, 516 }, {  34, 774 }, {  35, 516 }, {  36, 516 },
  {  37, 516 }, {  38, 516 }, {  39, 516 }, {  40, 774 }, {  41, 774 },
- {  42, 516 }, {  43, 516 }, {  44, 516 }, {  45, 774 }, {  46, 516 },
+ {  42, 774 }, {  43, 516 }, {  44, 516 }, {  45, 774 }, {  46, 516 },
 
  {  47, 516 }, {  48, 516 }, {  49, 516 }, {  50, 516 }, {  51, 516 },
  {  52, 516 }, {  53, 516 }, {  54, 516 }, {  55, 516 }, {  56, 516 },
@@ -446,7 +446,7 @@ static yyconst struct yy_trans_info yy_transition[1808] =
  {  29, 258 }, {  30, 258 }, {  31, 258 }, {  32, 268 }, {  33, 258 },
  {  34, 516 }, {  35, 258 }, {  36, 258 }, {  37, 258 }, {  38, 258 },
 
- {  39, 258 }, {  40, 516 }, {  41, 516 }, {  42, 258 }, {  43, 258 },
+ {  39, 258 }, {  40, 516 }, {  41, 516 }, {  42, 516 }, {  43, 258 },
  {  44, 258 }, {  45, 516 }, {  46, 258 }, {  47, 258 }, {  48, 258 },
  {  49, 258 }, {  50, 258 }, {  51, 258 }, {  52, 258 }, {  53, 258 },
  {  54, 258 }, {  55, 258 }, {  56, 258 }, {  57, 258 }, {  58, 516 },
@@ -764,7 +764,7 @@ static yyconst flex_int32_t yy_rule_can_match_eol[6] =
   }                                   \
 }
 
-/* for the first char, everything is allowed except ()"-~: */
+/* for the first char, everything is allowed except ()"-~:* */
 /* inside a word, everything is allowed except ()": */
 #line 770 "query-parser.lex.c"
 

data/ext/whistlepig/query-parser.tab.c

@@ -384,16 +384,16 @@ union yyalloc
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  3
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   29
+#define YYLAST   31
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  11
+#define YYNTOKENS  12
 /* YYNNTS -- Number of nonterminals.  */
 #define YYNNTS  8
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  19
+#define YYNRULES  20
 /* YYNRULES -- Number of states.  */
-#define YYNSTATES  29
+#define YYNSTATES  30
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
@@ -408,8 +408,8 @@ static const yytype_uint8 yytranslate[] =
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     8,     2,     2,     2,     2,     2,
-       9,    10,     2,     2,     2,     6,     2,     2,     2,     2,
+       2,     2,     2,     2,     9,     2,     2,     2,     2,     2,
+      10,    11,     8,     2,     2,     6,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     5,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -439,25 +439,27 @@ static const yytype_uint8 yytranslate[] =
 static const yytype_uint8 yyprhs[] =
 {
        0,     0,     3,     5,     6,     9,    12,    16,    20,    22,
-      24,    26,    30,    34,    38,    41,    44,    48,    50,    53
+      24,    26,    30,    34,    38,    41,    44,    46,    50,    52,
+      55
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
 static const yytype_int8 yyrhs[] =
 {
-      12,     0,    -1,    13,    -1,    -1,    13,    15,    -1,    13,
-      14,    -1,    15,     4,    15,    -1,    14,     4,    15,    -1,
-       3,    -1,    18,    -1,    16,    -1,     3,     5,     3,    -1,
-       3,     5,    18,    -1,     3,     5,    16,    -1,     6,    15,
-      -1,     7,     3,    -1,     8,    17,     8,    -1,     3,    -1,
-      17,     3,    -1,     9,    13,    10,    -1
+      13,     0,    -1,    14,    -1,    -1,    14,    16,    -1,    14,
+      15,    -1,    16,     4,    16,    -1,    15,     4,    16,    -1,
+       3,    -1,    19,    -1,    17,    -1,     3,     5,     3,    -1,
+       3,     5,    19,    -1,     3,     5,    17,    -1,     6,    16,
+      -1,     7,     3,    -1,     8,    -1,     9,    18,     9,    -1,
+       3,    -1,    18,     3,    -1,    10,    14,    11,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint8 yyrline[] =
 {
        0,    41,    41,    44,    45,    53,    64,    65,    68,    69,
-      70,    71,    72,    73,    74,    75,    78,    81,    82,    85
+      70,    71,    72,    73,    74,    75,    76,    79,    82,    83,
+      86
 };
 #endif
 
@@ -466,7 +468,7 @@ static const yytype_uint8 yyrline[] =
    First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
 static const char *const yytname[] =
 {
-  "$end", "error", "$undefined", "WORD", "OR", "':'", "'-'", "'~'",
+  "$end", "error", "$undefined", "WORD", "OR", "':'", "'-'", "'~'", "'*'",
   "'\"'", "'('", "')'", "$accept", "result", "query", "disj", "atom",
   "phrase", "words", "parens", 0
 };
@@ -477,23 +479,25 @@ static const char *const yytname[] =
    token YYLEX-NUM.  */
 static const yytype_uint16 yytoknum[] =
 {
-       0,   256,   257,   258,   259,    58,    45,   126,    34,    40,
-      41
+       0,   256,   257,   258,   259,    58,    45,   126,    42,    34,
+      40,    41
 };
 # endif
 
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const yytype_uint8 yyr1[] =
 {
-       0,    11,    12,    13,    13,    13,    14,    14,    15,    15,
-      15,    15,    15,    15,    15,    15,    16,    17,    17,    18
+       0,    12,    13,    14,    14,    14,    15,    15,    16,    16,
+      16,    16,    16,    16,    16,    16,    16,    17,    18,    18,
+      19
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
 static const yytype_uint8 yyr2[] =
 {
        0,     2,     1,     0,     2,     2,     3,     3,     1,     1,
-       1,     3,     3,     3,     2,     2,     3,     1,     2,     3
+       1,     3,     3,     3,     2,     2,     1,     3,     1,     2,
+       3
 };
 
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -501,15 +505,15 @@ static const yytype_uint8 yyr2[] =
    means the default is an error.  */
 static const yytype_uint8 yydefact[] =
 {
-       3,     0,     2,     1,     8,     0,     0,     0,     3,     5,
-       4,    10,     9,     0,    14,    15,    17,     0,     0,     0,
-       0,    11,    13,    12,    18,    16,    19,     7,     6
+       3,     0,     2,     1,     8,     0,     0,    16,     0,     3,
+       5,     4,    10,     9,     0,    14,    15,    18,     0,     0,
+       0,     0,    11,    13,    12,    19,    17,    20,     7,     6
 };
 
 /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int8 yydefgoto[] =
 {
-      -1,     1,     2,     9,    10,    11,    17,    12
+      -1,     1,     2,    10,    11,    12,    18,    13
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
@@ -517,15 +521,15 @@ static const yytype_int8 yydefgoto[] =
 #define YYPACT_NINF -6
 static const yytype_int8 yypact[] =
 {
-      -6,     2,    10,    -6,     4,    10,     0,     7,    -6,     8,
-      20,    -6,    -6,    17,    -6,    -6,    -6,    19,    -2,    10,
-      10,    -6,    -6,    -6,    -6,    -6,    -6,    -6,    -6
+      -6,     2,    11,    -6,     5,    11,     0,    -6,     8,    -6,
+       9,    22,    -6,    -6,    19,    -6,    -6,    -6,    21,    -2,
+      11,    11,    -6,    -6,    -6,    -6,    -6,    -6,    -6,    -6
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int8 yypgoto[] =
 {
-      -6,    -6,     3,    -6,    -5,    15,    -6,    16
+      -6,    -6,     3,    -6,    -5,    13,    -6,    17
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
@@ -535,25 +539,27 @@ static const yytype_int8 yypgoto[] =
 #define YYTABLE_NINF -1
 static const yytype_uint8 yytable[] =
 {
-      14,     4,     3,    15,     5,     6,     7,     8,    26,    13,
-      16,    18,    19,     4,    27,    28,     5,     6,     7,     8,
-      21,     0,    24,     0,    20,     7,     8,    25,    22,    23
+      15,     4,     3,    16,     5,     6,     7,     8,     9,    27,
+      14,    17,    19,    20,     4,    28,    29,     5,     6,     7,
+       8,     9,    22,     0,    25,     0,    21,    23,     8,     9,
+      26,    24
 };
 
 static const yytype_int8 yycheck[] =
 {
-       5,     3,     0,     3,     6,     7,     8,     9,    10,     5,
-       3,     8,     4,     3,    19,    20,     6,     7,     8,     9,
-       3,    -1,     3,    -1,     4,     8,     9,     8,    13,    13
+       5,     3,     0,     3,     6,     7,     8,     9,    10,    11,
+       5,     3,     9,     4,     3,    20,    21,     6,     7,     8,
+       9,    10,     3,    -1,     3,    -1,     4,    14,     9,    10,
+       9,    14
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
    symbol of state STATE-NUM.  */
 static const yytype_uint8 yystos[] =
 {
-       0,    12,    13,     0,     3,     6,     7,     8,     9,    14,
-      15,    16,    18,     5,    15,     3,     3,    17,    13,     4,
-       4,     3,    16,    18,     3,     8,    10,    15,    15
+       0,    13,    14,     0,     3,     6,     7,     8,     9,    10,
+      15,    16,    17,    19,     5,    16,     3,     3,    18,    14,
+       4,     4,     3,    17,    19,     3,     9,    11,    16,    16
 };
 
 #define yyerrok		(yyerrstatus = 0)
@@ -1505,35 +1511,42 @@ yyreduce:
   case 16:
 
 /* Line 1455 of yacc.c  */
-#line 78 "query-parser.y"
-    { (yyval.query) = (yyvsp[(2) - (3)].query); ;}
+#line 76 "query-parser.y"
+    { (yyval.query) = wp_query_new_every(); ;}
     break;
 
   case 17:
 
 /* Line 1455 of yacc.c  */
-#line 81 "query-parser.y"
-    { (yyval.query) = wp_query_new_phrase(); (yyval.query) = wp_query_add((yyval.query), wp_query_new_term(strdup(context->default_field), (yyvsp[(1) - (1)].string))); ;}
+#line 79 "query-parser.y"
+    { (yyval.query) = (yyvsp[(2) - (3)].query); ;}
     break;
 
   case 18:
 
 /* Line 1455 of yacc.c  */
 #line 82 "query-parser.y"
-    { (yyval.query) = wp_query_add((yyvsp[(1) - (2)].query), wp_query_new_term(strdup(context->default_field), (yyvsp[(2) - (2)].string))); ;}
+    { (yyval.query) = wp_query_new_phrase(); (yyval.query) = wp_query_add((yyval.query), wp_query_new_term(strdup(context->default_field), (yyvsp[(1) - (1)].string))); ;}
     break;
 
   case 19:
 
 /* Line 1455 of yacc.c  */
-#line 85 "query-parser.y"
+#line 83 "query-parser.y"
+    { (yyval.query) = wp_query_add((yyvsp[(1) - (2)].query), wp_query_new_term(strdup(context->default_field), (yyvsp[(2) - (2)].string))); ;}
+    break;
+
+  case 20:
+
+/* Line 1455 of yacc.c  */
+#line 86 "query-parser.y"
     { (yyval.query) = (yyvsp[(2) - (3)].query); ;}
     break;
 
 
 
 /* Line 1455 of yacc.c  */
-#line 1537 "query-parser.tab.c"
+#line 1550 "query-parser.tab.c"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -1752,6 +1765,6 @@ yyreturn:
 
 
 /* Line 1675 of yacc.c  */
-#line 88 "query-parser.y"
+#line 89 "query-parser.y"
 
 

data/ext/whistlepig/query.c

@@ -53,35 +53,19 @@ wp_query* wp_query_new_label(const char* label) {
   return ret;
 }
 
-wp_query* wp_query_new_conjunction() {
-  wp_query* ret = wp_query_new();
-  ret->type = WP_QUERY_CONJ;
-  return ret;
-}
-
-wp_query* wp_query_new_disjunction() {
-  wp_query* ret = wp_query_new();
-  ret->type = WP_QUERY_DISJ;
-  return ret;
-}
-
-wp_query* wp_query_new_phrase() {
-  wp_query* ret = wp_query_new();
-  ret->type = WP_QUERY_PHRASE;
-  return ret;
-}
-
-wp_query* wp_query_new_negation() {
-  wp_query* ret = wp_query_new();
-  ret->type = WP_QUERY_NEG;
-  return ret;
-}
+#define SIMPLE_QUERY_CONSTRUCTOR(name, type_name) \
+  wp_query* wp_query_new_##name() { \
+    wp_query* ret = wp_query_new(); \
+    ret->type = type_name; \
+    return ret; \
+  }
 
-wp_query* wp_query_new_empty() {
-  wp_query* ret = wp_query_new();
-  ret->type = WP_QUERY_EMPTY;
-  return ret;
-}
+SIMPLE_QUERY_CONSTRUCTOR(conjunction, WP_QUERY_CONJ);
+SIMPLE_QUERY_CONSTRUCTOR(disjunction, WP_QUERY_DISJ);
+SIMPLE_QUERY_CONSTRUCTOR(phrase, WP_QUERY_PHRASE);
+SIMPLE_QUERY_CONSTRUCTOR(negation, WP_QUERY_NEG);
+SIMPLE_QUERY_CONSTRUCTOR(empty, WP_QUERY_EMPTY);
+SIMPLE_QUERY_CONSTRUCTOR(every, WP_QUERY_EVERY);
 
 wp_query* wp_query_add(wp_query* a, wp_query* b) {
   if(a->type == WP_QUERY_EMPTY) {
@@ -129,22 +113,30 @@ static int subquery_to_s(wp_query* q, size_t n, char* buf) {
 #define min(a, b) (a < b ? a : b)
 
 size_t wp_query_to_s(wp_query* q, size_t n, char* buf) {
-  size_t ret;
+  size_t ret, term_n;
   char* orig_buf = buf;
 
-  if(q->type == WP_QUERY_EMPTY) {
-    buf[0] = '\0';
-    ret = n;
-  }
-  else if(q->type == WP_QUERY_TERM) {
-    size_t term_n = (size_t)snprintf(buf, n, "%s:\"%s\"", q->field, q->word);
+  /* nodes without children */
+  switch(q->type) {
+  case WP_QUERY_TERM:
+    term_n = (size_t)snprintf(buf, n, "%s:\"%s\"", q->field, q->word);
     ret = min(term_n, n);
-  }
-  else if(q->type == WP_QUERY_LABEL) {
-    size_t term_n = (size_t)snprintf(buf, n, "~%s", q->word);
+    break;
+  case WP_QUERY_LABEL:
+    term_n = (size_t)snprintf(buf, n, "~%s", q->word);
     ret = min(term_n, n);
-  }
-  else {
+    break;
+  case WP_QUERY_EMPTY:
+    term_n = (size_t)snprintf(buf, n, "<EMPTY>");
+    ret = min(term_n, n);
+    break;
+  case WP_QUERY_EVERY:
+    term_n = (size_t)snprintf(buf, n, "<EVERY>");
+    ret = min(term_n, n);
+    break;
+
+  /* nodes with children */
+  default:
     switch(q->type) {
     case WP_QUERY_CONJ:
       if(n >= 4) { // "(AND"

data/ext/whistlepig/query.h

@@ -21,6 +21,7 @@
 #define WP_QUERY_NEG 5
 #define WP_QUERY_LABEL 6
 #define WP_QUERY_EMPTY 7
+#define WP_QUERY_EVERY 8
 
 // a node in the query tree
 typedef struct wp_query {
@@ -60,6 +61,9 @@ wp_query* wp_query_new_negation();
 // public: make an empty query node.
 wp_query* wp_query_new_empty();
 
+// public: make an every-document query node.
+wp_query* wp_query_new_every();
+
 // public: deep clone of a query, but dropping all search state.
 wp_query* wp_query_clone(wp_query* other);
 

data/ext/whistlepig/search.c

@@ -74,8 +74,8 @@ RAISING_STATIC(search_result_combine_into(search_result* result, search_result*
  * call to next() will give you the next result (or set done = true).
  *
  * advance() is given a docid and advances the stream to just *after* that
- * document, and tells you whether it saw the docid on the way(and set a result
- * if so for your convenience).
+ * document, and tells you whether it saw the docid on the way (and sets the
+ * result if so for your convenience).
  *
  * a next() followed by one or more advance() calls with the returned docid
  * will set found = true and will not advance the stream beyond where it
@@ -96,21 +96,25 @@ static wp_error* conj_init_search_state(wp_query* q, wp_segment* s) RAISES_ERROR
 static wp_error* disj_init_search_state(wp_query* q, wp_segment* s) RAISES_ERROR;
 static wp_error* phrase_init_search_state(wp_query* q, wp_segment* s) RAISES_ERROR;
 static wp_error* neg_init_search_state(wp_query* q, wp_segment* s) RAISES_ERROR;
+static wp_error* every_init_search_state(wp_query* q, wp_segment* s) RAISES_ERROR;
 static wp_error* term_release_search_state(wp_query* q) RAISES_ERROR;
 static wp_error* conj_release_search_state(wp_query* q) RAISES_ERROR;
 static wp_error* disj_release_search_state(wp_query* q) RAISES_ERROR;
 static wp_error* phrase_release_search_state(wp_query* q) RAISES_ERROR;
 static wp_error* neg_release_search_state(wp_query* q) RAISES_ERROR;
+static wp_error* every_release_search_state(wp_query* q) RAISES_ERROR;
 static wp_error* term_next_doc(wp_query* q, wp_segment* s, search_result* result, int* done) RAISES_ERROR;
 static wp_error* conj_next_doc(wp_query* q, wp_segment* s, search_result* result, int* done) RAISES_ERROR;
 static wp_error* disj_next_doc(wp_query* q, wp_segment* s, search_result* result, int* done) RAISES_ERROR;
 static wp_error* phrase_next_doc(wp_query* q, wp_segment* s, search_result* result, int* done) RAISES_ERROR;
 static wp_error* neg_next_doc(wp_query* q, wp_segment* s, search_result* result, int* done) RAISES_ERROR;
+static wp_error* every_next_doc(wp_query* q, wp_segment* s, search_result* result, int* done) RAISES_ERROR;
 static wp_error* term_advance_to_doc(wp_query* q, wp_segment* s, docid_t doc_id, search_result* result, int* found, int* done) RAISES_ERROR;
 static wp_error* conj_advance_to_doc(wp_query* q, wp_segment* s, docid_t doc_id, search_result* result, int* found, int* done) RAISES_ERROR;
 static wp_error* disj_advance_to_doc(wp_query* q, wp_segment* s, docid_t doc_id, search_result* result, int* found, int* done) RAISES_ERROR;
 static wp_error* phrase_advance_to_doc(wp_query* q, wp_segment* s, docid_t doc_id, search_result* result, int* found, int* done) RAISES_ERROR;
 static wp_error* neg_advance_to_doc(wp_query* q, wp_segment* s, docid_t doc_id, search_result* result, int* found, int* done) RAISES_ERROR;
+static wp_error* every_advance_to_doc(wp_query* q, wp_segment* s, docid_t doc_id, search_result* result, int* found, int* done) RAISES_ERROR;
 
 // the term_* functions also handle labels
 // we use conj for empty queries as well (why not)
@@ -123,6 +127,7 @@ static wp_error* neg_advance_to_doc(wp_query* q, wp_segment* s, docid_t doc_id,
     case WP_QUERY_DISJ: RELAY_ERROR(disj_##suffix(__VA_ARGS__)); break; \
     case WP_QUERY_PHRASE: RELAY_ERROR(phrase_##suffix(__VA_ARGS__)); break; \
     case WP_QUERY_NEG: RELAY_ERROR(neg_##suffix(__VA_ARGS__)); break; \
+    case WP_QUERY_EVERY: RELAY_ERROR(every_##suffix(__VA_ARGS__)); break; \
     default: RAISE_ERROR("unknown query node type %d", type); \
   } \
 
@@ -286,6 +291,20 @@ static wp_error* neg_release_search_state(wp_query* q) {
   return NO_ERROR;
 }
 
+static wp_error* every_init_search_state(wp_query* q, wp_segment* seg) {
+  q->search_data = malloc(sizeof(docid_t));
+
+  postings_region* pr = MMAP_OBJ(seg->postings, postings_region);
+  *(docid_t*)q->search_data = pr->num_docs;
+
+  return NO_ERROR;
+}
+
+static wp_error* every_release_search_state(wp_query* q) {
+  free(q->search_data);
+  return NO_ERROR;
+}
+
 /********** search functions **********/
 
 static wp_error* term_next_doc(wp_query* q, wp_segment* s, search_result* result, int* done) {
@@ -722,6 +741,46 @@ static wp_error* neg_advance_to_doc(wp_query* q, wp_segment* seg, docid_t doc_id
   return NO_ERROR;
 }
 
+static wp_error* every_next_doc(wp_query* q, wp_segment* seg, search_result* result, int* done) {
+  (void)seg; // don't actually need to look in here!
+  docid_t* state_doc_id = (docid_t*)q->search_data;
+
+  DEBUG("called with cur %u", *state_doc_id);
+
+  if(*state_doc_id == DOCID_NONE) {
+    *done = 1;
+  }
+  else {
+    result->doc_id = *state_doc_id;
+    result->num_doc_matches = 0;
+    result->doc_matches = NULL;
+    (*state_doc_id)--;
+    *done = 0;
+  }
+  return NO_ERROR;
+}
+
+static wp_error* every_advance_to_doc(wp_query* q, wp_segment* seg, docid_t doc_id, search_result* result, int* found, int* done) {
+  (void)seg; // don't actually need to look in here!
+  docid_t* state_doc_id = q->search_data;
+
+  DEBUG("called with cur %u", *state_doc_id);
+
+  if(*state_doc_id == DOCID_NONE) {
+    *found = 0;
+  }
+  else {
+    *state_doc_id = doc_id - 1; // just after that doc
+    *found = 1; // we find everyhing
+    result->doc_id = doc_id;
+    result->num_doc_matches = 0;
+    result->doc_matches = NULL;
+  }
+
+  *done = (*state_doc_id == DOCID_NONE ? 1 : 0);
+  return NO_ERROR;
+}
+
 wp_error* wp_search_run_query_on_segment(struct wp_query* q, struct wp_segment* s, uint32_t max_num_results, uint32_t* num_results, search_result* results) {
   int done;
 

data/ext/whistlepig/tokenizer.lex.c

@@ -506,8 +506,8 @@ static yyconst struct yy_trans_info yy_transition[3537] =
  {  41, 839 }, {  42, 839 }, {  43, 839 }, {  44, 839 }, {  45, 839 },
  {  46, 839 }, {  47, 839 }, {  48, 581 }, {  49, 581 }, {  50, 581 },
  {  51, 581 }, {  52, 581 }, {  53, 581 }, {  54, 581 }, {  55, 581 },
- {  56, 581 }, {  57, 581 }, {  58, 839 }, {  59, 839 }, {  60, 839 },
- {  61, 839 }, {  62, 839 }, {  63, 839 }, {  64, 839 }, {  65, 581 },
+ {  56, 581 }, {  57, 581 }, {  58, 839 }, {  59, 839 }, {   0,   0 },
+ {  61, 839 }, {   0,   0 }, {  63, 839 }, {  64, 839 }, {  65, 581 },
  {  66, 581 }, {  67, 581 }, {  68, 581 }, {  69, 581 }, {  70, 581 },
  {  71, 581 }, {  72, 581 }, {  73, 581 }, {  74, 581 }, {  75, 581 },
  {  76, 581 }, {  77, 581 }, {  78, 581 }, {  79, 581 }, {  80, 581 },
@@ -578,7 +578,7 @@ static yyconst struct yy_trans_info yy_transition[3537] =
  {  48,1091 }, {  49,1091 }, {  50,1091 }, {  51,1091 }, {  52,1091 },
  {  53,1091 }, {  54,1091 }, {  55,1091 }, {  56,1091 }, {  57,1091 },
 
- {  58, 516 }, {  59, 516 }, {  60, 516 }, {  61, 516 }, {  62, 516 },
+ {  58, 516 }, {  59, 516 }, {   0,   0 }, {  61, 516 }, {   0,   0 },
  {  63, 516 }, {  64, 516 }, {  65, 258 }, {  66, 258 }, {  67, 258 },
  {  68, 258 }, {  69, 258 }, {  70, 258 }, {  71, 258 }, {  72, 258 },
  {  73, 258 }, {  74, 258 }, {  75, 258 }, {  76, 258 }, {  77, 258 },
@@ -635,7 +635,7 @@ static yyconst struct yy_trans_info yy_transition[3537] =
 
  {  50,1091 }, {  51,1091 }, {  52,1091 }, {  53,1091 }, {  54,1091 },
  {  55,1091 }, {  56,1091 }, {  57,1091 }, {  58, 258 }, {  59, 258 },
- {  60, 258 }, {  61, 258 }, {  62, 258 }, {  63, 258 }, {  64, 258 },
+ {   0,   0 }, {  61, 258 }, {   0,   0 }, {  63, 258 }, {  64, 258 },
  {  65,1091 }, {  66,1091 }, {  67,1091 }, {  68,1091 }, {  69,1091 },
  {  70,1091 }, {  71,1091 }, {  72,1091 }, {  73,1091 }, {  74,1091 },
  {  75,1091 }, {  76,1091 }, {  77,1091 }, {  78,1091 }, {  79,1091 },
@@ -691,8 +691,8 @@ static yyconst struct yy_trans_info yy_transition[3537] =
  {  42,   0 }, {  43,   0 }, {  44,   0 }, {  45,   0 }, {  46,   0 },
  {  47,   0 }, {  48, 833 }, {  49, 833 }, {  50, 833 }, {  51, 833 },
  {  52, 833 }, {  53, 833 }, {  54, 833 }, {  55, 833 }, {  56, 833 },
- {  57, 833 }, {  58,   0 }, {  59,   0 }, {  60,   0 }, {  61,   0 },
- {  62,   0 }, {  63,   0 }, {  64,   0 }, {  65, 833 }, {  66, 833 },
+ {  57, 833 }, {  58,   0 }, {  59,   0 }, {   0,   0 }, {  61,   0 },
+ {   0,   0 }, {  63,   0 }, {  64,   0 }, {  65, 833 }, {  66, 833 },
  {  67, 833 }, {  68, 833 }, {  69, 833 }, {  70, 833 }, {  71, 833 },
  {  72, 833 }, {  73, 833 }, {  74, 833 }, {  75, 833 }, {  76, 833 },
  {  77, 833 }, {  78, 833 }, {  79, 833 }, {  80, 833 }, {  81, 833 },
@@ -761,7 +761,7 @@ static yyconst struct yy_trans_info yy_transition[3537] =
  {  45,-317 }, {  46,-317 }, {  47,-317 }, {  48, 833 }, {  49, 833 },
  {  50, 833 }, {  51, 833 }, {  52, 833 }, {  53, 833 }, {  54, 833 },
  {  55, 833 }, {  56, 833 }, {  57, 833 }, {  58,-317 }, {  59,-317 },
- {  60,-317 }, {  61,-317 }, {  62,-317 }, {  63,-317 }, {  64,-317 },
+ {   0,   0 }, {  61,-317 }, {   0,   0 }, {  63,-317 }, {  64,-317 },
  {  65, 516 }, {  66, 516 }, {  67, 516 }, {  68, 516 }, {  69, 516 },
  {  70, 516 }, {  71, 516 }, {  72, 516 }, {  73, 516 }, {  74, 516 },
 
@@ -817,8 +817,8 @@ static yyconst struct yy_trans_info yy_transition[3537] =
  {  42,-575 }, {  43,-575 }, {  44,-575 }, {  45,-575 }, {  46,-258 },
  {  47,-575 }, {  48, 833 }, {  49, 833 }, {  50, 833 }, {  51, 833 },
  {  52, 833 }, {  53, 833 }, {  54, 833 }, {  55, 833 }, {  56, 833 },
- {  57, 833 }, {  58,-575 }, {  59,-575 }, {  60,-575 }, {  61,-575 },
- {  62,-575 }, {  63,-575 }, {  64,-575 }, {  65, 258 }, {  66, 258 },
+ {  57, 833 }, {  58,-575 }, {  59,-575 }, {   0,   0 }, {  61,-575 },
+ {   0,   0 }, {  63,-575 }, {  64,-575 }, {  65, 258 }, {  66, 258 },
 
  {  67, 258 }, {  68, 258 }, {  69, 258 }, {  70, 258 }, {  71, 258 },
  {  72, 258 }, {  73, 258 }, {  74, 258 }, {  75, 258 }, {  76, 258 },
@@ -875,7 +875,7 @@ static yyconst struct yy_trans_info yy_transition[3537] =
  {  49,   0 }, {  50,   0 }, {  51,   0 }, {  52,   0 }, {  53,   0 },
  {  54,   0 }, {  55,   0 }, {  56,   0 }, {  57,   0 }, {  58,-833 },
 
- {  59,-833 }, {  60,-833 }, {  61,-833 }, {  62,-833 }, {  63,-833 },
+ {  59,-833 }, {   0,   0 }, {  61,-833 }, {   0,   0 }, {  63,-833 },
  {  64,-833 }, {  65,   0 }, {  66,   0 }, {  67,   0 }, {  68,   0 },
  {  69,   0 }, {  70,   0 }, {  71,   0 }, {  72,   0 }, {  73,   0 },
  {  74,   0 }, {  75,   0 }, {  76,   0 }, {  77,   0 }, {  78,   0 },
@@ -944,8 +944,8 @@ static yyconst struct yy_trans_info yy_transition[3537] =
  {  42,-1150 }, {  43,-1150 }, {  44,-1150 }, {  45,-1150 }, {  46,-1150 },
  {  47,-1150 }, {  48,   0 }, {  49,   0 }, {  50,   0 }, {  51,   0 },
  {  52,   0 }, {  53,   0 }, {  54,   0 }, {  55,   0 }, {  56,   0 },
- {  57,   0 }, {  58,-1150 }, {  59,-1150 }, {  60,-1150 }, {  61,-1150 },
- {  62,-1150 }, {  63,-1150 }, {  64,-1150 }, {  65,-317 }, {  66,-317 },
+ {  57,   0 }, {  58,-1150 }, {  59,-1150 }, {   0,   0 }, {  61,-1150 },
+ {   0,   0 }, {  63,-1150 }, {  64,-1150 }, {  65,-317 }, {  66,-317 },
  {  67,-317 }, {  68,-317 }, {  69,-317 }, {  70,-317 }, {  71,-317 },
  {  72,-317 }, {  73,-317 }, {  74,-317 }, {  75,-317 }, {  76,-317 },
  {  77,-317 }, {  78,-317 }, {  79,-317 }, {  80,-317 }, {  81,-317 },
@@ -1001,7 +1001,7 @@ static yyconst struct yy_trans_info yy_transition[3537] =
  {  44,-1408 }, {  45,-1408 }, {  46,-1091 }, {  47,-1408 }, {  48,   0 },
  {  49,   0 }, {  50,   0 }, {  51,   0 }, {  52,   0 }, {  53,   0 },
  {  54,   0 }, {  55,   0 }, {  56,   0 }, {  57,   0 }, {  58,-1408 },
- {  59,-1408 }, {  60,-1408 }, {  61,-1408 }, {  62,-1408 }, {  63,-1408 },
+ {  59,-1408 }, {   0,   0 }, {  61,-1408 }, {   0,   0 }, {  63,-1408 },
  {  64,-1408 }, {  65,-575 }, {  66,-575 }, {  67,-575 }, {  68,-575 },
  {  69,-575 }, {  70,-575 }, {  71,-575 }, {  72,-575 }, {  73,-575 },
  {  74,-575 }, {  75,-575 }, {  76,-575 }, {  77,-575 }, {  78,-575 },

metadata

@@ -1,33 +1,29 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: whistlepig
-version: !ruby/object:Gem::Version 
-  hash: 7
+version: !ruby/object:Gem::Version
+  version: '0.7'
   prerelease: 
-  segments: 
-  - 0
-  - 6
-  version: "0.6"
 platform: ruby
-authors: 
+authors:
 - William Morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-28 21:39:58 -07:00
+date: 2011-06-19 13:10:35.000000000 -07:00
 default_executable: 
 dependencies: []
-
-description: Whistlepig is a minimalist realtime full-text search index. Its goal is to be as small and minimally-featured as possible, while still remaining useful, performant and scalable to large corpora. If you want realtime full-text search without the frills, Whistlepig may be for you.
+description: Whistlepig is a minimalist realtime full-text search index. Its goal
+  is to be as small and minimally-featured as possible, while still remaining useful,
+  performant and scalable to large corpora. If you want realtime full-text search
+  without the frills, Whistlepig may be for you.
 email: wmorgan-whistlepig-gemspec@masanjin.net
 executables: []
-
-extensions: 
+extensions:
 - ext/whistlepig/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - README
 - ext/whistlepig/whistlepigc.c
-files: 
+files:
 - README
 - ext/whistlepig/extconf.rb
 - lib/whistlepig.rb
@@ -67,41 +63,32 @@ files:
 has_rdoc: true
 homepage: http://masanjin.net/whistlepig
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - -c
 - utf8
 - --main
 - README
 - --title
 - Whistlepig
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: a minimalist realtime full-text search index
 test_files: []
-