extindex: speed up --reindex --fast

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

diff --git a/lib/PublicInbox/Over.pm b/lib/PublicInbox/Over.pm
index 587e0516ea61dbef73207558691cea0cd985cbe7..30ad949dd027153f30835f928c962d00e5d9f82a 100644 (file)
--- a/lib/PublicInbox/Over.pm
+++ b/lib/PublicInbox/Over.pm
@@ -16,9 +16,11 @@ use constant DEFAULT_LIMIT => 1000;
 sub dbh_new {
        my ($self, $rw) = @_;
        my $f = delete $self->{filename};
-       if (!-f $f) { # SQLite defaults mode to 0644, we want 0666
+       if (!-s $f) { # SQLite defaults mode to 0644, we want 0666
                if ($rw) {
                        require PublicInbox::Spawn;
+                       my ($dir) = ($f =~ m!(.+)/[^/]+\z!);
+                       PublicInbox::Spawn::nodatacow_dir($dir);
                        open my $fh, '+>>', $f or die "failed to open $f: $!";
                        PublicInbox::Spawn::nodatacow_fd(fileno($fh));
                } else {
@@ -106,8 +108,8 @@ sub do_get {
 }
 
 sub query_xover {
-       my ($self, $beg, $end) = @_;
-       do_get($self, <<'', {}, $beg, $end);
+       my ($self, $beg, $end, $opt) = @_;
+       do_get($self, <<'', $opt, $beg, $end);
 SELECT num,ts,ds,ddd FROM over WHERE num >= ? AND num <= ?
 ORDER BY num ASC
 
@@ -349,13 +351,13 @@ sub check_inodes {
        }
 }
 
-sub blob_exists {
-       my ($self, $oidhex) = @_;
+sub oidbin_exists {
+       my ($self, $oidbin) = @_;
        if (wantarray) {
                my $sth = $self->dbh->prepare_cached(<<'', undef, 1);
-SELECT docid FROM xref3 WHERE oidbin = ?
+SELECT docid FROM xref3 WHERE oidbin = ? ORDER BY docid ASC
 
-               $sth->bind_param(1, pack('H*', $oidhex), SQL_BLOB);
+               $sth->bind_param(1, $oidbin, SQL_BLOB);
                $sth->execute;
                my $tmp = $sth->fetchall_arrayref;
                map { $_->[0] } @$tmp;
@@ -363,10 +365,23 @@ SELECT docid FROM xref3 WHERE oidbin = ?
                my $sth = $self->dbh->prepare_cached(<<'', undef, 1);
 SELECT COUNT(*) FROM xref3 WHERE oidbin = ?
 
-               $sth->bind_param(1, pack('H*', $oidhex), SQL_BLOB);
+               $sth->bind_param(1, $oidbin, SQL_BLOB);
                $sth->execute;
                $sth->fetchrow_array;
        }
 }
 
+sub blob_exists { oidbin_exists($_[0], pack('H*', $_[1])) }
+
+# used by NNTP.pm
+sub ids_after {
+       my ($self, $num) = @_;
+       my $ids = dbh($self)->selectcol_arrayref(<<'', undef, $$num);
+SELECT num FROM over WHERE num > ?
+ORDER BY num ASC LIMIT 1000
+
+       $$num = $ids->[-1] if @$ids;
+       $ids;
+}
+
 1;