* [PATCH 8/9] *idx: pass smsg in even more places
2020-03-20 8:18 7% ` [PATCH 0/9] preserve time and date of initial commit Eric Wong
@ 2020-03-20 8:18 4% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2020-03-20 8:18 UTC (permalink / raw)
To: meta
We can finally get rid of the awkward, ad-hoc use of V2Writable,
SearchIdx, and OverIdx args for passing {cotime} and {autime}
between classes.
We'll still use those git time fields internally within
V2Writable and SearchIdx for (re)indexing, but that's not
worth avoiding as a fallback.
---
lib/PublicInbox/Import.pm | 19 ++++++++++---------
lib/PublicInbox/OverIdx.pm | 8 ++------
lib/PublicInbox/SearchIdx.pm | 16 ++++++++++------
lib/PublicInbox/SearchIdxShard.pm | 14 +++++---------
lib/PublicInbox/V2Writable.pm | 15 ++++++++-------
t/import.t | 14 ++++++--------
6 files changed, 41 insertions(+), 45 deletions(-)
diff --git a/lib/PublicInbox/Import.pm b/lib/PublicInbox/Import.pm
index 3853ff2b..c72c1e92 100644
--- a/lib/PublicInbox/Import.pm
+++ b/lib/PublicInbox/Import.pm
@@ -275,7 +275,7 @@ sub git_timestamp {
}
sub extract_cmt_info ($;$) {
- my ($mime, $v2w) = @_;
+ my ($mime, $smsg) = @_;
my $sender = '';
my $from = $mime->header('From');
@@ -325,9 +325,9 @@ sub extract_cmt_info ($;$) {
utf8::encode($subject);
my $at = git_timestamp(my @at = msg_datestamp($hdr));
my $ct = git_timestamp(my @ct = msg_timestamp($hdr));
- if ($v2w) { # set fallbacks in case message had no date
- $v2w->{autime} = $at[0];
- $v2w->{cotime} = $ct[0];
+ if ($smsg) {
+ $smsg->{ds} = $at[0];
+ $smsg->{ts} = $ct[0];
}
($name, $email, $at, $ct, $subject);
}
@@ -374,9 +374,9 @@ sub clean_tree_v2 ($$$) {
# returns undef on duplicate
# returns the :MARK of the most recent commit
sub add {
- my ($self, $mime, $check_cb, $v2w) = @_; # mime = Email::MIME
+ my ($self, $mime, $check_cb, $smsg) = @_; # mime = Email::MIME
- my ($name, $email, $at, $ct, $subject) = extract_cmt_info($mime, $v2w);
+ my ($name, $email, $at, $ct, $subject) = extract_cmt_info($mime, $smsg);
my $path_type = $self->{path_type};
my $path;
if ($path_type eq '2/38') {
@@ -406,9 +406,10 @@ sub add {
print $w $raw_email, "\n" or wfail;
# v2: we need this for Xapian
- if ($self->{want_object_info}) {
- my $oid = $self->get_mark(":$blob");
- $self->{last_object} = [ $oid, $n, \$raw_email ];
+ if ($smsg) {
+ $smsg->{blob} = $self->get_mark(":$blob");
+ $smsg->{bytes} = $n;
+ $smsg->{-raw_email} = \$raw_email;
}
my $ref = $self->{ref};
my $commit = $self->{mark}++;
diff --git a/lib/PublicInbox/OverIdx.pm b/lib/PublicInbox/OverIdx.pm
index 2d71956d..acbf2c8d 100644
--- a/lib/PublicInbox/OverIdx.pm
+++ b/lib/PublicInbox/OverIdx.pm
@@ -15,7 +15,6 @@ use IO::Handle;
use DBI qw(:sql_types); # SQL_BLOB
use PublicInbox::MID qw/id_compress mids_for_index references/;
use PublicInbox::Smsg qw(subject_normalized);
-use PublicInbox::MsgTime qw(msg_timestamp msg_datestamp);
use Compress::Zlib qw(compress);
use PublicInbox::Search;
@@ -245,7 +244,7 @@ sub subject_path ($) {
}
sub add_overview {
- my ($self, $mime, $smsg, $times) = @_;
+ my ($self, $mime, $smsg) = @_;
$smsg->{lines} = $mime->body_raw =~ tr!\n!\n!;
$smsg->{mime} = $mime; # XXX temporary?
my $hdr = $mime->header_obj;
@@ -260,10 +259,7 @@ sub add_overview {
my $dd = $smsg->to_doc_data;
utf8::encode($dd);
$dd = compress($dd);
- my $ds = msg_timestamp($hdr, $times->{autime});
- my $ts = msg_datestamp($hdr, $times->{cotime});
- my $values = [ $ts, $ds, $smsg->{num}, $mids, $refs, $xpath, $dd ];
- add_over($self, $values);
+ add_over($self, [ @$smsg{qw(ts ds num)}, $mids, $refs, $xpath, $dd ]);
}
sub add_over {
diff --git a/lib/PublicInbox/SearchIdx.pm b/lib/PublicInbox/SearchIdx.pm
index 5ca819c3..44b05813 100644
--- a/lib/PublicInbox/SearchIdx.pm
+++ b/lib/PublicInbox/SearchIdx.pm
@@ -310,8 +310,6 @@ sub add_xapian ($$$$) {
my ($self, $mime, $smsg, $mids) = @_;
$smsg->{mime} = $mime; # XXX dangerous
my $hdr = $mime->header_obj;
- $smsg->{ds} = msg_datestamp($hdr, $self->{autime});
- $smsg->{ts} = msg_timestamp($hdr, $self->{cotime});
my $doc = $X->{Document}->new;
my $subj = $smsg->subject;
add_val($doc, PublicInbox::Search::TS(), $smsg->{ts});
@@ -368,13 +366,19 @@ sub _msgmap_init ($) {
sub add_message {
# mime = Email::MIME object
my ($self, $mime, $smsg) = @_;
- my $mids = mids_for_index($mime->header_obj);
+ my $hdr = $mime->header_obj;
+ my $mids = mids_for_index($hdr);
$smsg //= bless { blob => '' }, 'PublicInbox::Smsg'; # test-only compat
$smsg->{mid} //= $mids->[0]; # v1 compatibility
$smsg->{num} //= do { # v1
_msgmap_init($self);
index_mm($self, $mime);
};
+
+ # v1 and tests only:
+ $smsg->{ds} //= msg_datestamp($hdr, $self->{autime});
+ $smsg->{ts} //= msg_timestamp($hdr, $self->{cotime});
+
eval {
# order matters, overview stores every possible piece of
# data in doc_data (deflated). Xapian only stores a subset
@@ -382,7 +386,7 @@ sub add_message {
# storing doc_data in Xapian sometime after we get multi-inbox
# search working.
if (my $over = $self->{over}) { # v1 only
- $over->add_overview($mime, $smsg, $self);
+ $over->add_overview($mime, $smsg);
}
if (need_xapian($self)) {
add_xapian($self, $mime, $smsg, $mids);
@@ -611,9 +615,9 @@ sub read_log {
$latest = $1;
$newest ||= $latest;
} elsif ($line =~ /^author .*? ([0-9]+) [\-\+][0-9]+$/) {
- $self->{over}->{autime} = $self->{autime} = $1;
+ $self->{autime} = $1;
} elsif ($line =~ /^committer .*? ([0-9]+) [\-\+][0-9]+$/) {
- $self->{over}->{cotime} = $self->{cotime} = $1;
+ $self->{cotime} = $1;
}
}
close($log) or die "git log failed: \$?=$?";
diff --git a/lib/PublicInbox/SearchIdxShard.pm b/lib/PublicInbox/SearchIdxShard.pm
index 21e81b16..2b48b1b4 100644
--- a/lib/PublicInbox/SearchIdxShard.pm
+++ b/lib/PublicInbox/SearchIdxShard.pm
@@ -67,19 +67,19 @@ sub shard_worker_loop ($$$$$) {
$self->remove_by_oid($oid, $mid);
} else {
chomp $line;
- my ($bytes, $num, $blob, $mid, $autime, $cotime) =
+ my ($bytes, $num, $blob, $mid, $ds, $ts) =
split(/ /, $line);
$self->begin_txn_lazy;
my $n = read($r, my $msg, $bytes) or die "read: $!\n";
$n == $bytes or die "short read: $n != $bytes\n";
my $mime = PublicInbox::MIME->new(\$msg);
- $self->{autime} = $autime;
- $self->{cotime} = $cotime;
my $smsg = bless {
bytes => $bytes,
num => $num + 0,
blob => $blob,
mid => $mid,
+ ds => $ds,
+ ts => $ts,
}, 'PublicInbox::Smsg';
$self->add_message($mime, $smsg);
}
@@ -89,17 +89,13 @@ sub shard_worker_loop ($$$$$) {
# called by V2Writable
sub index_raw {
- my ($self, $msgref, $mime, $smsg, $times) = @_;
- my $at = $times->{autime} // time;
- my $ct = $times->{cotime} // time;
+ my ($self, $msgref, $mime, $smsg) = @_;
if (my $w = $self->{w}) {
- print $w join(' ', @$smsg{qw(bytes num blob mid)}, $at, $ct),
+ print $w join(' ', @$smsg{qw(bytes num blob mid ds ts)}),
"\n", $$msgref or die "failed to write shard $!\n";
} else {
$$msgref = undef;
$self->begin_txn_lazy;
- $self->{autime} = $at;
- $self->{cotime} = $ct;
$self->add_message($mime, $smsg);
}
}
diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm
index b5332da4..b45d2722 100644
--- a/lib/PublicInbox/V2Writable.pm
+++ b/lib/PublicInbox/V2Writable.pm
@@ -19,6 +19,7 @@ use PublicInbox::OverIdx;
use PublicInbox::Msgmap;
use PublicInbox::Spawn qw(spawn popen_rd);
use PublicInbox::SearchIdx;
+use PublicInbox::MsgTime qw(msg_timestamp msg_datestamp);
use IO::Handle; # ->autoflush
use File::Temp qw(tempfile);
@@ -150,9 +151,11 @@ sub add {
# indexes a message, returns true if checkpointing is needed
sub do_idx ($$$$) {
my ($self, $msgref, $mime, $smsg) = @_;
- $self->{over}->add_overview($mime, $smsg, $self);
+ $smsg->{ds} //= msg_datestamp($mime->header_obj, $self->{autime});
+ $smsg->{ts} //= msg_timestamp($mime->header_obj, $self->{cotime});
+ $self->{over}->add_overview($mime, $smsg);
my $idx = idx_shard($self, $smsg->{num} % $self->{shards});
- $idx->index_raw($msgref, $mime, $smsg, $self);
+ $idx->index_raw($msgref, $mime, $smsg);
my $n = $self->{transact_bytes} += $smsg->{bytes};
$n >= (PublicInbox::SearchIdx::BATCH_BYTES * $self->{shards});
}
@@ -176,13 +179,12 @@ sub _add {
defined $num or return; # duplicate
defined $mid0 or die "BUG: $mid0 undefined\n";
my $im = $self->importer;
- my $cmt = $im->add($mime, undef, $self); # sets $self->{(au|co)time}
+ my $smsg = bless { mid => $mid0, num => $num }, 'PublicInbox::Smsg';
+ my $cmt = $im->add($mime, undef, $smsg); # sets $smsg->{ds|ts|blob}
$cmt = $im->get_mark($cmt);
$self->{last_commit}->[$self->{epoch_max}] = $cmt;
- my $msgref;
- my $smsg = bless { mid => $mid0, num => $num }, 'PublicInbox::Smsg';
- ($smsg->{blob}, $smsg->{bytes}, $msgref) = @{$im->{last_object}};
+ my $msgref = delete $smsg->{-raw_email};
if (do_idx($self, $msgref, $mime, $smsg)) {
$self->checkpoint;
}
@@ -793,7 +795,6 @@ sub import_init {
my ($self, $git, $packed_bytes, $tmp) = @_;
my $im = PublicInbox::Import->new($git, undef, undef, $self->{-inbox});
$im->{bytes_added} = int($packed_bytes / $PACKING_FACTOR);
- $im->{want_object_info} = 1;
$im->{lock_path} = undef;
$im->{path_type} = 'v2';
$self->{im} = $im unless $tmp;
diff --git a/t/import.t b/t/import.t
index b88d308e..703aa362 100644
--- a/t/import.t
+++ b/t/import.t
@@ -28,15 +28,13 @@ my $mime = PublicInbox::MIME->create(
body => "hello world\n",
);
my $v2 = require_git(2.6, 1);
-
-$im->{want_object_info} = 1 if $v2;
-like($im->add($mime), qr/\A:\d+\z/, 'added one message');
+my $smsg = {} if $v2;
+like($im->add($mime, undef, $smsg), qr/\A:[0-9]+\z/, 'added one message');
if ($v2) {
- my $info = $im->{last_object};
- like($info->[0], qr/\A[a-f0-9]{40}\z/, 'got last object_id');
- is($mime->as_string, ${$info->[2]}, 'string matches');
- is($info->[1], length(${$info->[2]}), 'length matches');
+ like($smsg->{blob}, qr/\A[a-f0-9]{40}\z/, 'got last object_id');
+ is($mime->as_string, ${$smsg->{-raw_email}}, 'string matches');
+ is($smsg->{bytes}, length(${$smsg->{-raw_email}}), 'length matches');
my @cmd = ('git', "--git-dir=$git->{git_dir}", qw(hash-object --stdin));
my $in = tempfile();
print $in $mime->as_string or die "write failed: $!";
@@ -48,7 +46,7 @@ if ($v2) {
is($?, 0, 'hash-object');
seek($out, 0, SEEK_SET);
chomp(my $hashed_obj = <$out>);
- is($hashed_obj, $info->[0], "last object_id matches exp");
+ is($hashed_obj, $smsg->{blob}, "blob object_id matches exp");
}
$im->done;
^ permalink raw reply related [relevance 4%]
* [PATCH 0/9] preserve time and date of initial commit
@ 2020-03-20 8:18 7% ` Eric Wong
2020-03-20 8:18 4% ` [PATCH 8/9] *idx: pass smsg in even more places Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2020-03-20 8:18 UTC (permalink / raw)
To: meta
For messages lacking Date and/or Received headers, search
queries for "d:YYYYMMDD..YYYYMMDD" ranges can be unreliable in
mirrors, as can the $INBOX_URL/?t=$TIMESTAMP query which
only hits SQLite.
Yes, this ended up being a lot of work to deal with corner case
messages (probably most of which are spam), but there's also a
lot of internal cleanups which made the end result easier to
follow, I think...
The main fix is actually in 1/9, but it's gross.
Patch 2/9 fixes a small window where a race can happen and
cause searches to be off by a minute.
Patches 3-8 cleanup the mess left in 1 and 2,
Finally, patch 9 fixes the corner-case-of-corner-cases for
dealing with multi-MID messages which require a one-off queue to
store the git commit/author times instead of overloading msgmap.
Eric Wong (9):
index: use git commit times on missing Date/Received
v2writable: preserve timestamps from import if generated
rename PublicInbox::SearchMsg => PublicInbox::Smsg
smsg: to_doc_data: use existing fields
overidx: parse_references: less error-prone args
*idx: pass $smsg in more places instead of many args
v2: pass smsg in more places
*idx: pass smsg in even more places
v2: SDBM-based multi Message-ID queue
Documentation/mknews.perl | 4 +-
Documentation/technical/data_structures.txt | 4 +-
MANIFEST | 4 +-
lib/PublicInbox/ExtMsg.pm | 3 +-
lib/PublicInbox/Feed.pm | 4 +-
lib/PublicInbox/Import.pm | 19 +++--
lib/PublicInbox/Inbox.pm | 2 +-
lib/PublicInbox/Mbox.pm | 4 +-
lib/PublicInbox/MsgTime.pm | 12 +--
lib/PublicInbox/MultiMidQueue.pm | 57 +++++++++++++
lib/PublicInbox/NNTP.pm | 14 ++--
lib/PublicInbox/Over.pm | 8 +-
lib/PublicInbox/OverIdx.pm | 30 +++----
lib/PublicInbox/Search.pm | 8 +-
lib/PublicInbox/SearchIdx.pm | 68 ++++++++++-----
lib/PublicInbox/SearchIdxShard.pm | 26 ++++--
lib/PublicInbox/SearchView.pm | 8 +-
lib/PublicInbox/{SearchMsg.pm => Smsg.pm} | 19 +++--
lib/PublicInbox/SolverGit.pm | 2 +-
lib/PublicInbox/V2Writable.pm | 84 ++++++++++++-------
lib/PublicInbox/View.pm | 2 +-
t/import.t | 14 ++--
t/index-git-times.t | 93 +++++++++++++++++++++
t/multi-mid.t | 27 +++++-
t/search-thr-index.t | 17 +++-
t/thread-cycle.t | 2 +-
26 files changed, 386 insertions(+), 149 deletions(-)
create mode 100644 lib/PublicInbox/MultiMidQueue.pm
rename lib/PublicInbox/{SearchMsg.pm => Smsg.pm} (92%)
create mode 100644 t/index-git-times.t
^ permalink raw reply [relevance 7%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2020-03-05 5:13 [PATCH] index: use git commit times on missing Date/Received Eric Wong
2020-03-20 8:18 7% ` [PATCH 0/9] preserve time and date of initial commit Eric Wong
2020-03-20 8:18 4% ` [PATCH 8/9] *idx: pass smsg in even more places Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).