Mboxlist root mailboxid #3571
Mboxlist root mailboxid #3571
Conversation
There was a problem hiding this comment.
A bunch of little bits of edge-case feedback here, but it's looking like it'll be useful soon :)
The big question is whether we want to version the mailboxes.db with a single key rather than using the presence of AS as the upgraded marker and needing yet another upgraded marker later. This would allow us to rev the database with more improvements without needing this upgrade magic each time - just have ctl_cyrusdb -r check if it's current and upgrade it if not.
| @@ -96,6 +96,7 @@ enum mboxop { DUMP, | |||
| CHECKPOINT, | |||
| UNDUMP, | |||
| VERIFY, | |||
| ADD_ROOTS, | |||
There was a problem hiding this comment.
This really does feel like what we need is a $V key or something in mailboxes.db, rather than using the AS key as the upgrade indicator, and then we can confirm that roots have been added.
| int is_root = 0, is_child = 0; | ||
|
|
||
| /* Skip DELETED.* mailboxes */ | ||
| if (mbname_isdeleted(mbname)) { |
There was a problem hiding this comment.
I think maybe we do want to add the INBOX root_mailboxid to DELETED.user.foo mailboxes as well, so we know to consider them in the same userid, since they're findable with mboxlist_usermboxtree and flags.
| /* Toplevel mailbox */ | ||
| is_root = 1; | ||
| } | ||
| else if (rrock->mbname && |
There was a problem hiding this comment.
does this also need && !mbname_userid(rock->mbname) for maximum safety?
| rrock->mbname = mbname; | ||
| rrock->mboxid = xstrdup(mbentry->uniqueid); | ||
| } | ||
| else if (is_child) { |
There was a problem hiding this comment.
I believe we should also be setting root_mailboxid on the INBOX or top-level folder, so we can just use that field rather than having to interpret the lack of one as "this is the root".
Particularly since that's what we do further down when we maintain this field in the mailbox creation code.
| struct root_rock rrock = { NULL, NULL }; | ||
| int flags = MBOXTREE_TOMBSTONES; | ||
|
|
||
| if (intermediary) flags |= MBOXTREE_INTERMEDIATES; |
There was a problem hiding this comment.
I think we should be always doing INTERMEDIATES here, while they still exist. We don't want to leave them rootless.
|
Superseded by #4838 |
Add a 'R' (root mailboxid) field to mbentry records.
Also add 's' option to ctl_mboxlist to ass 'R' field to existing records