forked from cyrusimap/cyrus-imapd
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Remove improved_mboxlist_sort leftovers
• Remove option CYRUSDB_MBOXSORT • The database comparisson functions do not need a copy of the database handle, so simplify accordingly. • Delete unused functions bsearch_uncompare_mbox() and bsearch_compare_mbox()
- Loading branch information
1 parent
48f05b2
commit c71f401
Showing
32 changed files
with
61 additions
and
435 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1121,96 +1121,6 @@ sub test_quota_d | |
$self->assert_does_not_match(qr{dave\@qux.com}, $content); | ||
} | ||
|
||
# https://github.com/cyrusimap/cyrus-imapd/issues/2877 | ||
sub test_quota_f_no_improved_mboxlist_sort | ||
:unixHierarchySep :AltNamespace :VirtDomains :NoStartInstances | ||
{ | ||
my ($self) = @_; | ||
|
||
my $user = '[email protected]'; | ||
my @otherusers = ( | ||
'[email protected]', | ||
'[email protected]', | ||
'[email protected]', | ||
); | ||
|
||
$self->{instance}->{config}->set('improved_mboxlist_sort', 'no'); | ||
$self->_start_instances(); | ||
|
||
my $admintalk = $self->{adminstore}->get_client(); | ||
$admintalk->create("user/$user"); | ||
$self->assert_str_equals('ok', | ||
$admintalk->get_last_completion_response()); | ||
$admintalk->setacl("user/$user", $user, 'lrswipkxtecdan'); | ||
$self->assert_str_equals('ok', | ||
$admintalk->get_last_completion_response()); | ||
|
||
xlog $self, "set ourselves a basic usage quota"; | ||
$self->_set_limits( | ||
quotaroot => "user/$user", | ||
storage => 100000, | ||
message => 50000, | ||
$res_annot_storage => 10000, | ||
); | ||
$self->_check_usages( | ||
quotaroot => "user/$user", | ||
storage => 0, | ||
message => 0, | ||
$res_annot_storage => 0, | ||
); | ||
|
||
# create some other users to tickle sort-order issues? | ||
foreach my $x (@otherusers) { | ||
$admintalk->create("user/$x"); | ||
$self->_set_limits( | ||
quotaroot => "user/$x", | ||
storage => 100000, | ||
message => 50000, | ||
$res_annot_storage => 10000, | ||
); | ||
} | ||
|
||
my $svc = $self->{instance}->get_service('imap'); | ||
my $userstore = $svc->create_store(username => $user); | ||
my $usertalk = $userstore->get_client(); | ||
|
||
foreach my $submbox ('Drafts', 'Junk', 'Sent', 'Trash') { | ||
xlog $self, "creating $submbox..."; | ||
$usertalk->create($submbox); | ||
$self->assert_str_equals('ok', | ||
$usertalk->get_last_completion_response()); | ||
} | ||
|
||
$usertalk->list("", "*"); | ||
|
||
foreach my $mbox (qw(INBOX Drafts Sent Junk Trash)) { | ||
$usertalk->select($mbox); | ||
foreach (1..3) { | ||
$self->make_message("msg $_ in $mbox", store => $userstore); | ||
} | ||
} | ||
|
||
xlog $self, "run quota -d"; | ||
$self->{instance}->run_command({ cyrus => 1 }, | ||
'quota', '-d', 'example.com'); | ||
|
||
xlog $self, "run quota -d -f"; | ||
my $outfile = $self->{instance}->{basedir} . '/quota.out'; | ||
my @data = $self->{instance}->run_command({ | ||
cyrus => 1, | ||
redirects => { | ||
stderr => $outfile, | ||
stdout => $outfile, | ||
}, | ||
}, 'quota', '-f', '-d', 'example.com'); | ||
|
||
my $str = slurp_file($outfile); | ||
xlog $self, $str; | ||
|
||
#example.com!user.user1.Junk: quota root example.com!user.user1 --> (none) | ||
$self->assert_does_not_match(qr{ quota root \S+ --> \(none\)}, $str); | ||
} | ||
|
||
sub test_quota_f_unixhs | ||
:UnixHierarchySep | ||
{ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
Description: | ||
|
||
The improved_mboxlist_sort option had no effect since v3.6. It is now deprecated. | ||
|
||
cyr_dbtool option -M/--improved-mboxlist-sort is removed. | ||
|
||
|
||
Config changes: | ||
|
||
improved_mboxlist_sort is now deprecated. | ||
|
||
|
||
Upgrade instructions: | ||
|
||
Remove improved_mboxlist_sort from imapd.conf. It has no effect and is now deprecated. | ||
|
||
|
||
GitHub issue: | ||
|
||
https://github.com/cyrusimap/cyrus-imapd/pull/4559 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.