store less data in the Xapian document

Since we only query the SQLite over DB for OVER/XOVER; do not
need to waste space storing fields To/Cc/:bytes/:lines or the
XNUM term.  We only use From/Subject/References/Message-ID/:blob
in various places of the PSGI code.

For reindexing, we will take advantage of docid stability
in "xapian-compact --no-renumber" to ensure duplicates do not
show up in search results.  Since the PSGI interface is the
only consumer of Xapian at the moment, it has no need to
search based on NNTP article number.

2 files changed, 17 insertions, 14 deletions

diff --git a/t/search.t b/t/search.t
index fda32d36..516f5670 100644
--- a/t/search.t
+++ b/t/search.t
@@ -306,31 +306,33 @@ sub filter_mids {
 
 # names and addresses
 {
-        my $res = $ro->query('t:list@example.com');
-        is(scalar @$res, 6, 'searched To: successfully');
-        foreach my $smsg (@$res) {
+        my $mset = $ro->query('t:list@example.com', {mset => 1});
+        is($mset->size, 6, 'searched To: successfully');
+        foreach my $m ($mset->items) {
+                my $smsg = $ro->lookup_article($m->get_docid);
                 like($smsg->to, qr/\blist\@example\.com\b/, 'to appears');
         }
 
-        $res = $ro->query('tc:list@example.com');
-        is(scalar @$res, 6, 'searched To+Cc: successfully');
-        foreach my $smsg (@$res) {
+        $mset = $ro->query('tc:list@example.com', {mset => 1});
+        is($mset->size, 6, 'searched To+Cc: successfully');
+        foreach my $m ($mset->items) {
+                my $smsg = $ro->lookup_article($m->get_docid);
                 my $tocc = join("\n", $smsg->to, $smsg->cc);
                 like($tocc, qr/\blist\@example\.com\b/, 'tocc appears');
         }
 
         foreach my $pfx ('tcf:', 'c:') {
-                $res = $ro->query($pfx . 'foo@example.com');
-                is(scalar @$res, 1,
-                        "searched $pfx successfully for Cc:");
-                foreach my $smsg (@$res) {
+                my $mset = $ro->query($pfx . 'foo@example.com', { mset => 1 });
+                is($mset->items, 1, "searched $pfx successfully for Cc:");
+                foreach my $m ($mset->items) {
+                        my $smsg = $ro->lookup_article($m->get_docid);
                         like($smsg->cc, qr/\bfoo\@example\.com\b/,
                                 'cc appears');
                 }
         }
 
         foreach my $pfx ('', 'tcf:', 'f:') {
-                $res = $ro->query($pfx . 'Laggy');
+                my $res = $ro->query($pfx . 'Laggy');
                 is(scalar(@$res), 1,
                         "searched $pfx successfully for From:");
                 foreach my $smsg (@$res) {
diff --git a/t/v2writable.t b/t/v2writable.t
index b543c53f..85fb6a6d 100644
--- a/t/v2writable.t
+++ b/t/v2writable.t
@@ -220,13 +220,14 @@ EOF
                 'commit message propagated to git');
         is_deeply(\@after, \@before, 'only one commit written to git');
         is($ibx->mm->num_for($smsg->mid), undef, 'no longer in Msgmap by mid');
-        like($smsg->num, qr/\A\d+\z/, 'numeric number in return message');
-        is($ibx->mm->mid_for($smsg->num), undef, 'no longer in Msgmap by num');
+        my $num = $smsg->{num};
+        like($num, qr/\A\d+\z/, 'numeric number in return message');
+        is($ibx->mm->mid_for($num), undef, 'no longer in Msgmap by num');
         my $srch = $ibx->search->reopen;
         my $mset = $srch->query('m:'.$smsg->mid, { mset => 1});
         is($mset->size, 0, 'no longer found in Xapian');
         my @log1 = qw(log -1 --pretty=raw --raw -r --no-abbrev --no-renames);
-        is($srch->{over_ro}->get_art($smsg->num), undef,
+        is($srch->{over_ro}->get_art($num), undef,
                 'removal propagated to Over DB');
 
         my $after = $git0->qx(@log1);