over: ensure old, merged {tid} is really gone

[public-inbox.git] / lib / PublicInbox / OverIdx.pm

diff --git a/lib/PublicInbox/OverIdx.pm b/lib/PublicInbox/OverIdx.pm
index 6f0477f0a7150587e4b64a0bf0470736b8caba75..840e2c2a11aa92047a7fd0c3c51c40ebe7299337 100644 (file)
--- a/lib/PublicInbox/OverIdx.pm
+++ b/lib/PublicInbox/OverIdx.pm
@@ -170,8 +170,14 @@ sub _resolve_mid_to_tid {
                $$tid = $cur_tid;
        } else { # rethreading, queue up dead ghosts
                $$tid = next_tid($self);
-               my $num = $smsg->{num};
-               push(@{$self->{-ghosts_to_delete}}, $num) if $num < 0;
+               my $n = $smsg->{num};
+               if ($n > 0) {
+                       $self->{dbh}->prepare_cached(<<'')->execute($$tid, $n);
+UPDATE over SET tid = ? WHERE num = ?
+
+               } elsif ($n < 0) {
+                       push(@{$self->{-ghosts_to_delete}}, $n);
+               }
        }
        1;
 }
@@ -294,7 +300,7 @@ sub _add_over {
                }
        } elsif ($n < 0) { # ghost
                $$old_tid //= $cur_valid ? $cur_tid : next_tid($self);
-               link_refs($self, $refs, $$old_tid);
+               $$old_tid = link_refs($self, $refs, $$old_tid);
                delete_by_num($self, $n);
                $$v++;
        }
@@ -379,12 +385,12 @@ sub create_tables {
 
        $dbh->do(<<'');
 CREATE TABLE IF NOT EXISTS over (
-       num INTEGER NOT NULL,
-       tid INTEGER NOT NULL,
-       sid INTEGER,
-       ts INTEGER,
-       ds INTEGER,
-       ddd VARBINARY, /* doc-data-deflated */
+       num INTEGER NOT NULL, /* NNTP article number == IMAP UID */
+       tid INTEGER NOT NULL, /* THREADID (IMAP REFERENCES threading, JMAP) */
+       sid INTEGER, /* Subject ID (IMAP ORDEREDSUBJECT "threading") */
+       ts INTEGER, /* IMAP INTERNALDATE (Received: header, git commit time) */
+       ds INTEGER, /* RFC-2822 sent Date: header, git author time */
+       ddd VARBINARY, /* doc-data-deflated (->to_doc_data, ->load_from_data) */
        UNIQUE (num)
 )
 
@@ -406,13 +412,13 @@ CREATE TABLE IF NOT EXISTS counter (
        $dbh->do(<<'');
 CREATE TABLE IF NOT EXISTS subject (
        sid INTEGER PRIMARY KEY AUTOINCREMENT,
-       path VARCHAR(40) NOT NULL,
+       path VARCHAR(40) NOT NULL, /* SHA-1 of normalized subject */
        UNIQUE (path)
 )
 
        $dbh->do(<<'');
 CREATE TABLE IF NOT EXISTS id2num (
-       id INTEGER NOT NULL,
+       id INTEGER NOT NULL, /* <=> msgid.id */
        num INTEGER NOT NULL,
        UNIQUE (id, num)
 )
@@ -423,7 +429,7 @@ CREATE TABLE IF NOT EXISTS id2num (
 
        $dbh->do(<<'');
 CREATE TABLE IF NOT EXISTS msgid (
-       id INTEGER PRIMARY KEY AUTOINCREMENT,
+       id INTEGER PRIMARY KEY AUTOINCREMENT, /* <=> id2num.id */
        mid VARCHAR(244) NOT NULL,
        UNIQUE (mid)
 )