search: use "z:" instead of "bytes:" prefix

So far, searching by size has never been publicly documented,
and IMHO, of questionable utility.  In any case, "z:" is what
mairix(1) uses, so it may be familiar to existing mairix users
(I've never used this prefix myself).

So far, this prefix is only used internally in tests and in
auto-translated queries from IMAP; thus this incompatible change
is unlikely to affect anyone.

diff --git a/lib/PublicInbox/IMAPsearchqp.pm b/lib/PublicInbox/IMAPsearchqp.pm
index 2fb92bb8eaf0c5f1f0cf57be37daae2bf9827146..9f0c1205492dfb23cb67dbd58cebbc58497b5cac 100644 (file)
--- a/lib/PublicInbox/IMAPsearchqp.pm
+++ b/lib/PublicInbox/IMAPsearchqp.pm
@@ -165,7 +165,7 @@ sub msn_set {
 # things that should not match
 sub impossible {
        my ($self) = @_;
-       push @{$self->{xap}}, 'bytes:..0';
+       push @{$self->{xap}}, 'z:..0';
        my $sql = $self->{sql} or return 1;
        $$sql .= ' AND num < 0';
 }
@@ -217,8 +217,8 @@ BEFORE_date : 'BEFORE' date { $q->BEFORE(\%item) }
 
 MSN_set : sequence_set { $q->msn_set($item{sequence_set}) }
 UID_set : "UID" sequence_set { $q->uid_set($item{sequence_set}) }
-LARGER_number : "LARGER" number { $q->xap_only("bytes:$item{number}..") }
-SMALLER_number : "SMALLER" number { $q->xap_only("bytes:..$item{number}") }
+LARGER_number : "LARGER" number { $q->xap_only("z:$item{number}..") }
+SMALLER_number : "SMALLER" number { $q->xap_only("z:..$item{number}") }
 
 DELETED : "DELETED" { $q->impossible }
 OLD : "OLD" { $q->impossible }

diff --git a/lib/PublicInbox/LeiXSearch.pm b/lib/PublicInbox/LeiXSearch.pm
index 059aa2844bfa724c1f765b1653c06fcc6b436429..3270b420b64c18a94b74b67574c8e5089b91de0f 100644 (file)
--- a/lib/PublicInbox/LeiXSearch.pm
+++ b/lib/PublicInbox/LeiXSearch.pm
@@ -92,7 +92,7 @@ sub recent {
        my ($self, $qstr, $opt) = @_;
        $opt //= {};
        $opt->{relevance} //= -2;
-       $self->mset($qstr //= 'bytes:1..', $opt);
+       $self->mset($qstr //= 'z:1..', $opt);
 }
 
 sub over {}

diff --git a/lib/PublicInbox/Search.pm b/lib/PublicInbox/Search.pm
index c5a1bd69cdaa7076c8c4445457146717dd16c6a8..209969c57c94b6a1d515d60c33e08a079da4f6f5 100644 (file)
--- a/lib/PublicInbox/Search.pm
+++ b/lib/PublicInbox/Search.pm
@@ -481,7 +481,7 @@ sub qparse_new ($) {
        $cb->($qp, $NVRP->new(DT, 'dt:'));
 
        # for IMAP, undocumented for WWW and may be split off go away
-       $cb->($qp, $NVRP->new(BYTES, 'bytes:'));
+       $cb->($qp, $NVRP->new(BYTES, 'z:'));
        $cb->($qp, $NVRP->new(TS, 'rt:'));
        $cb->($qp, $NVRP->new(UID, 'uid:'));
 

diff --git a/t/lei-externals.t b/t/lei-externals.t
index b78b5580000e5dfe7b5738cb26fe5774d47ebeed..296676409701c71e7f9542607fb039aafb7ce34f 100644 (file)
--- a/t/lei-externals.t
+++ b/t/lei-externals.t
@@ -40,7 +40,7 @@ SKIP: {
                pipe(my ($r, $w)) or BAIL_OUT $!;
                open my $err, '+>', undef or BAIL_OUT $!;
                my $opt = { run_mode => 0, 1 => $w, 2 => $err };
-               my $cmd = [qw(lei q -qt), @$out, 'bytes:1..'];
+               my $cmd = [qw(lei q -qt), @$out, 'z:1..'];
                my $tp = start_script($cmd, undef, $opt);
                close $w;
                sysread($r, my $buf, 1);

diff --git a/t/lei-import-imap.t b/t/lei-import-imap.t
index a6ba805fffe0815898217bb7875f4b88bd59c2ec..15a355ab6a7523a3f95b3b778d2cd54aaa905536 100644 (file)
--- a/t/lei-import-imap.t
+++ b/t/lei-import-imap.t
@@ -13,11 +13,11 @@ my $td = start_script($cmd, $env, { 3 => $sock }) or BAIL_OUT("-imapd: $?");
 my $host_port = tcp_host_port($sock);
 undef $sock;
 test_lei({ tmpdir => $tmpdir }, sub {
-       lei_ok(qw(q bytes:1..));
+       lei_ok(qw(q z:1..));
        my $out = json_utf8->decode($lei_out);
        is_deeply($out, [ undef ], 'nothing imported, yet');
        lei_ok('import', "imap://$host_port/t.v2.0");
-       lei_ok(qw(q bytes:1..));
+       lei_ok(qw(q z:1..));
        $out = json_utf8->decode($lei_out);
        ok(scalar(@$out) > 1, 'got imported messages');
        is(pop @$out, undef, 'trailing JSON null element was null');

diff --git a/t/lei-import-nntp.t b/t/lei-import-nntp.t
index 3fb78fbcb9d27c995f02f58b654ac40142f1428d..1fc6dbadfc90a546a1e95ad2f4857f87a6743cad 100644 (file)
--- a/t/lei-import-nntp.t
+++ b/t/lei-import-nntp.t
@@ -13,12 +13,12 @@ my $td = start_script($cmd, $env, { 3 => $sock }) or BAIL_OUT("-nntpd $?");
 my $host_port = tcp_host_port($sock);
 undef $sock;
 test_lei({ tmpdir => $tmpdir }, sub {
-       lei_ok(qw(q bytes:1..));
+       lei_ok(qw(q z:1..));
        my $out = json_utf8->decode($lei_out);
        is_deeply($out, [ undef ], 'nothing imported, yet');
        lei_ok('import', "nntp://$host_port/t.v2");
        diag $lei_err;
-       lei_ok(qw(q bytes:1..));
+       lei_ok(qw(q z:1..));
        diag $lei_err;
        $out = json_utf8->decode($lei_out);
        ok(scalar(@$out) > 1, 'got imported messages');

diff --git a/xt/lei-sigpipe.t b/xt/lei-sigpipe.t
index ba2d23c87e1cff3db195dee3780ca619192d4c86..44020badd4e4b7e94b64e002a4955ab1971c8ed1 100644 (file)
--- a/xt/lei-sigpipe.t
+++ b/xt/lei-sigpipe.t
@@ -15,7 +15,7 @@ my $do_test = sub {
                pipe(my ($r, $w)) or BAIL_OUT $!;
                open my $err, '+>', undef or BAIL_OUT $!;
                my $opt = { run_mode => 0, 1 => $w, 2 => $err };
-               my $cmd = [qw(lei q -q -t), @$out, 'bytes:1..'];
+               my $cmd = [qw(lei q -q -t), @$out, 'z:1..'];
                my $tp = start_script($cmd, $env, $opt);
                close $w;
                sysread($r, my $buf, 1);