$self->requeue if $new_size == 1;
}
-# my ($uid_base, $UID) = @_;
-sub fetch_msn_uid ($$) { '* '.($_[1] - $_[0]).' FETCH (UID '.$_[1] }
+# my ($msn, $UID) = @_;
+sub fetch_msn_uid ($$) { '* '.(${$_[0]}++).' FETCH (UID '.$_[1] }
sub fetch_run_ops {
- my ($self, $uid_base, $smsg, $bref, $ops, $partial) = @_;
- $self->msg_more(fetch_msn_uid($uid_base, $smsg->{num}));
+ my ($self, $msn, $smsg, $bref, $ops, $partial) = @_;
+ $self->msg_more(fetch_msn_uid($msn, $smsg->{num}));
my ($eml, $k);
for (my $i = 0; $i < @$ops;) {
$k = $ops->[$i++];
sub fetch_blob_cb { # called by git->cat_async via git_async_cat
my ($bref, $oid, $type, $size, $fetch_arg) = @_;
- my ($self, undef, $msgs, undef, $ops, $partial) = @$fetch_arg;
+ my ($self, undef, $msgs, $range_info, $ops, $partial) = @$fetch_arg;
my $smsg = shift @$msgs or die 'BUG: no smsg';
if (!defined($oid)) {
# it's possible to have TOCTOU if an admin runs
} else {
$smsg->{blob} eq $oid or die "BUG: $smsg->{blob} != $oid";
}
- fetch_run_ops($self, $self->{uid_base}, $smsg, $bref, $ops, $partial);
+ fetch_run_ops($self, $range_info->[3], $smsg, $bref, $ops, $partial);
requeue_once($self);
}
return 'BAD fetch range';
}
uid_clamp($self, \$beg, \$end) if defined($range);
- [ $beg, $end, $$range_csv ];
+ my $msn = $beg - $self->{uid_base};
+ [ $beg, $end, $$range_csv, \$msn ];
}
sub refill_range ($$$) {
return;
}
}
- my $uid_base = $self->{uid_base};
- fetch_run_ops($self, $uid_base, $_, undef, $ops) for @$msgs;
+ fetch_run_ops($self, $range_info->[3], $_, undef, $ops) for @$msgs;
@$msgs = ();
1; # more
}
}
# continue looping
}
- my $uid_base = $self->{uid_base};
my ($i, $k);
+ my $msn = $range_info->[3];
for (@$uids) {
- $self->msg_more(fetch_msn_uid($uid_base, $_));
+ $self->msg_more(fetch_msn_uid($msn, $_));
for ($i = 0; $i < @$ops;) {
$k = $ops->[$i++];
$ops->[$i++]->($self, $k);
}
my $r2 = $mic->fetch_hash('1:*', 'BODY.PEEK[]') or BAIL_OUT "FETCH $@";
is(scalar keys %$r2, 2, 'did not get all 3 messages');
-is($r2->{2}->{'BODY[]'}, $ret->{2}->{RFC822}, 'message 2 unchanged');
-is($r2->{3}->{'BODY[]'}, $ret->{3}->{RFC822}, 'message 3 unchanged');
+is($r2->{1}->{'BODY[]'}, $ret->{2}->{RFC822}, 'message 2 unchanged');
+is($r2->{2}->{'BODY[]'}, $ret->{3}->{RFC822}, 'message 3 unchanged');
$r2 = $mic->fetch_hash(2, 'BODY.PEEK[HEADER.FIELDS (message-id)]')
or BAIL_OUT "FETCH $@";
is($r2->{2}->{'BODY[HEADER.FIELDS (MESSAGE-ID)]'},