}
sub new {
- my ($class, $ibx, $creat) = @_;
+ my ($class, $ibx, $creat, $part) = @_;
my $mainrepo = $ibx; # for "public-inbox-index" w/o entry in config
my $git_dir = $mainrepo;
my ($altid, $git);
if ($version == 1) {
$self->{lock_path} = "$mainrepo/ssoma.lock";
} elsif ($version == 2) {
- $self->{lock_path} = "$mainrepo/inbox.lock";
+ defined $part or die "partition is required for v2\n";
+ # partition is a number or "all"
+ $self->{partition} = $part;
+ $self->{lock_path} = undef;
$self->{msgmap_path} = "$mainrepo/msgmap.sqlite3";
} else {
die "unsupported inbox version=$version\n";
sub _lock_acquire {
my ($self) = @_;
croak 'already locked' if $self->{lockfh};
- sysopen(my $lockfh, $self->{lock_path}, O_WRONLY|O_CREAT) or
- die "failed to open lock $self->{lock_path}: $!\n";
+ my $lock_path = $self->{lock_path} or return;
+ sysopen(my $lockfh, $lock_path, O_WRONLY|O_CREAT) or
+ die "failed to open lock $lock_path: $!\n";
flock($lockfh, LOCK_EX) or die "lock failed: $!\n";
$self->{lockfh} = $lockfh;
}
sub _lock_release {
my ($self) = @_;
+ return unless $self->{lock_path};
my $lockfh = delete $self->{lockfh} or croak 'not locked';
flock($lockfh, LOCK_UN) or die "unlock failed: $!\n";
close $lockfh or die "close failed: $!\n";
$doc->add_value($col, $num);
}
-sub add_values ($$$) {
- my ($smsg, $bytes, $num) = @_;
+sub add_values ($$$$) {
+ my ($smsg, $bytes, $num, $lines) = @_;
my $ts = $smsg->ts;
my $doc = $smsg->{doc};
defined($bytes) and add_val($doc, &PublicInbox::Search::BYTES, $bytes);
- add_val($doc, &PublicInbox::Search::LINES,
- $smsg->{mime}->body_raw =~ tr!\n!\n!);
+ add_val($doc, &PublicInbox::Search::LINES, $lines);
my $yyyymmdd = strftime('%Y%m%d', gmtime($ts));
add_val($doc, PublicInbox::Search::YYYYMMDD, $yyyymmdd);
my ($doc_id, $old_tid);
my $mid = mid_clean(mid_mime($mime));
+ my $threader = $self->{threader};
eval {
die 'Message-ID too long' if length($mid) > MAX_MID_SIZE;
# convert a ghost to a regular message
# it will also clobber any existing regular message
$doc_id = $smsg->{doc_id};
- $old_tid = $smsg->thread_id;
+ $old_tid = $smsg->thread_id unless $threader;
}
$smsg = PublicInbox::SearchMsg->new($mime);
my $doc = $smsg->{doc};
$doc->add_term('XMID' . $mid);
my $subj = $smsg->subject;
+ my $xpath;
if ($subj ne '') {
- my $path = $self->subject_path($subj);
- $doc->add_term('XPATH' . id_compress($path));
+ $xpath = $self->subject_path($subj);
+ $xpath = id_compress($xpath);
+ $doc->add_term('XPATH' . $xpath);
}
- add_values($smsg, $bytes, $num);
+ my $lines = $mime->body_raw =~ tr!\n!\n!;
+ add_values($smsg, $bytes, $num, $lines);
my $tg = $self->term_generator;
index_body($tg, \@orig, $doc) if @orig;
});
- link_message($self, $smsg, $old_tid);
+ # populates smsg->references for smsg->to_doc_data
+ my $refs = parse_references($smsg);
+ my $data = $smsg->to_doc_data($blob);
+ if ($threader) {
+ $threader->thread_msg($mid, $smsg->ts, $xpath, $data);
+ } else {
+ link_message($self, $smsg, $refs, $old_tid);
+ }
$tg->index_text($mid, 1, 'XM');
- $doc->set_data($smsg->to_doc_data($blob));
+ $doc->set_data($data);
if (my $altid = $self->{-altid}) {
foreach my $alt (@$altid) {
$last_thread_id;
}
-sub link_message {
- my ($self, $smsg, $old_tid) = @_;
+sub parse_references ($) {
+ my ($smsg) = @_;
my $doc = $smsg->{doc};
my $mid = $smsg->mid;
my $mime = $smsg->{mime};
my @refs = (($hdr->header_raw('References') || '') =~ /<([^>]+)>/g);
push(@refs, (($hdr->header_raw('In-Reply-To') || '') =~ /<([^>]+)>/g));
- my $tid;
if (@refs) {
my %uniq = ($mid => 1);
my @orig_refs = @refs;
push @refs, $ref;
}
}
+ $smsg->{references} = '<'.join('> <', @refs).'>' if @refs;
+ \@refs
+}
- if (@refs) {
- $smsg->{references} = '<'.join('> <', @refs).'>';
+sub link_message {
+ my ($self, $smsg, $refs, $old_tid) = @_;
+ my $tid;
+
+ if (@$refs) {
# first ref *should* be the thread root,
# but we can never trust clients to do the right thing
- my $ref = shift @refs;
+ my $ref = shift @$refs;
$tid = $self->_resolve_mid_to_tid($ref);
$self->merge_threads($tid, $old_tid) if defined $old_tid;
# the rest of the refs should point to this tid:
- foreach $ref (@refs) {
+ foreach $ref (@$refs) {
my $ptid = $self->_resolve_mid_to_tid($ref);
merge_threads($self, $tid, $ptid);
}
} else {
$tid = defined $old_tid ? $old_tid : $self->next_thread_id;
}
- $doc->add_term('G' . $tid);
+ $smsg->{doc}->add_term('G' . $tid);
}
sub index_blob {
$_[0]->{lockfh} = undef;
}
+# remote_* subs are only used by SearchIdxPart and SearchIdxThread:
+sub remote_commit {
+ my ($self) = @_;
+ print { $self->{w} } "commit\n" or die "failed to write commit: $!";
+}
+
+sub remote_close {
+ my ($self) = @_;
+ my $pid = delete $self->{pid} or die "no process to wait on\n";
+ my $w = delete $self->{w} or die "no pipe to write to\n";
+ print $w "close\n" or die "failed to write to pid:$pid: $!\n";
+ close $w or die "failed to close pipe for pid:$pid: $!\n";
+ waitpid($pid, 0) == $pid or die "remote process did not finish";
+ $? == 0 or die ref($self)." exited with: $?";
+}
+
1;