mirror of
https://github.com/mjl-/mox.git
synced 2025-07-12 17:44:35 +03:00
add condstore & qresync imap extensions
for conditional storing and quick resynchronisation (not sure if mail clients are actually using it that). each message now has a "modseq". it is increased for each change. with condstore, imap clients can request changes since a certain modseq. that already allows quickly finding changes since a previous connection. condstore also allows storing (e.g. setting new message flags) only when the modseq of a message hasn't changed. qresync should make it fast for clients to get a full list of changed messages for a mailbox, including removals. we now also keep basic metadata of messages that have been removed (expunged). just enough (uid, modseq) to tell client that the messages have been removed. this does mean we have to be careful when querying messages from the database. we must now often filter the expunged messages out. we also keep "createseq", the modseq when a message was created. this will be useful for the jmap implementation.
This commit is contained in:
@ -39,6 +39,16 @@ func (tc *testconn) xsearch(nums ...uint32) {
|
||||
tc.xuntagged(imapclient.UntaggedSearch(nums))
|
||||
}
|
||||
|
||||
func (tc *testconn) xsearchmodseq(modseq int64, nums ...uint32) {
|
||||
tc.t.Helper()
|
||||
|
||||
if len(nums) == 0 {
|
||||
tc.xnountagged()
|
||||
return
|
||||
}
|
||||
tc.xuntagged(imapclient.UntaggedSearchModSeq{Nums: nums, ModSeq: modseq})
|
||||
}
|
||||
|
||||
func (tc *testconn) xesearch(exp imapclient.UntaggedEsearch) {
|
||||
tc.t.Helper()
|
||||
|
||||
@ -220,43 +230,11 @@ func TestSearch(t *testing.T) {
|
||||
tc.transactf("ok", `search charset utf-8 text "mox"`)
|
||||
tc.xsearch(2, 3)
|
||||
|
||||
// esearchall makes an UntaggedEsearch response with All set, for comparisons.
|
||||
esearchall0 := func(ss string) imapclient.NumSet {
|
||||
seqset := imapclient.NumSet{}
|
||||
for _, rs := range strings.Split(ss, ",") {
|
||||
t := strings.Split(rs, ":")
|
||||
if len(t) > 2 {
|
||||
panic("bad seqset")
|
||||
}
|
||||
var first uint32
|
||||
var last *uint32
|
||||
if t[0] != "*" {
|
||||
v, err := strconv.ParseUint(t[0], 10, 32)
|
||||
if err != nil {
|
||||
panic("parse first")
|
||||
}
|
||||
first = uint32(v)
|
||||
}
|
||||
if len(t) == 2 {
|
||||
if t[1] != "*" {
|
||||
v, err := strconv.ParseUint(t[1], 10, 32)
|
||||
if err != nil {
|
||||
panic("parse last")
|
||||
}
|
||||
u := uint32(v)
|
||||
last = &u
|
||||
}
|
||||
}
|
||||
seqset.Ranges = append(seqset.Ranges, imapclient.NumRange{First: first, Last: last})
|
||||
}
|
||||
return seqset
|
||||
}
|
||||
|
||||
esearchall := func(ss string) imapclient.UntaggedEsearch {
|
||||
return imapclient.UntaggedEsearch{All: esearchall0(ss)}
|
||||
}
|
||||
|
||||
uintptr := func(v uint32) *uint32 {
|
||||
uint32ptr := func(v uint32) *uint32 {
|
||||
return &v
|
||||
}
|
||||
|
||||
@ -265,10 +243,10 @@ func TestSearch(t *testing.T) {
|
||||
tc.xesearch(esearchall("1:3")) // Without any options, "ALL" is implicit.
|
||||
|
||||
tc.transactf("ok", "search return (min max count all) all")
|
||||
tc.xesearch(imapclient.UntaggedEsearch{Min: 1, Max: 3, Count: uintptr(3), All: esearchall0("1:3")})
|
||||
tc.xesearch(imapclient.UntaggedEsearch{Min: 1, Max: 3, Count: uint32ptr(3), All: esearchall0("1:3")})
|
||||
|
||||
tc.transactf("ok", "UID search return (min max count all) all")
|
||||
tc.xesearch(imapclient.UntaggedEsearch{UID: true, Min: 5, Max: 7, Count: uintptr(3), All: esearchall0("5:7")})
|
||||
tc.xesearch(imapclient.UntaggedEsearch{UID: true, Min: 5, Max: 7, Count: uint32ptr(3), All: esearchall0("5:7")})
|
||||
|
||||
tc.transactf("ok", "search return (min) all")
|
||||
tc.xesearch(imapclient.UntaggedEsearch{Min: 1})
|
||||
@ -304,19 +282,19 @@ func TestSearch(t *testing.T) {
|
||||
tc.xesearch(imapclient.UntaggedEsearch{})
|
||||
|
||||
tc.transactf("ok", "search return (min max all count) not all")
|
||||
tc.xesearch(imapclient.UntaggedEsearch{Count: uintptr(0)})
|
||||
tc.xesearch(imapclient.UntaggedEsearch{Count: uint32ptr(0)})
|
||||
|
||||
tc.transactf("ok", "search return (min max count all) 1,3")
|
||||
tc.xesearch(imapclient.UntaggedEsearch{Min: 1, Max: 3, Count: uintptr(2), All: esearchall0("1,3")})
|
||||
tc.xesearch(imapclient.UntaggedEsearch{Min: 1, Max: 3, Count: uint32ptr(2), All: esearchall0("1,3")})
|
||||
|
||||
tc.transactf("ok", "search return (min max count all) UID 5,7")
|
||||
tc.xesearch(imapclient.UntaggedEsearch{Min: 1, Max: 3, Count: uintptr(2), All: esearchall0("1,3")})
|
||||
tc.xesearch(imapclient.UntaggedEsearch{Min: 1, Max: 3, Count: uint32ptr(2), All: esearchall0("1,3")})
|
||||
|
||||
tc.transactf("ok", "uid search return (min max count all) 1,3")
|
||||
tc.xesearch(imapclient.UntaggedEsearch{UID: true, Min: 5, Max: 7, Count: uintptr(2), All: esearchall0("5,7")})
|
||||
tc.xesearch(imapclient.UntaggedEsearch{UID: true, Min: 5, Max: 7, Count: uint32ptr(2), All: esearchall0("5,7")})
|
||||
|
||||
tc.transactf("ok", "uid search return (min max count all) UID 5,7")
|
||||
tc.xesearch(imapclient.UntaggedEsearch{UID: true, Min: 5, Max: 7, Count: uintptr(2), All: esearchall0("5,7")})
|
||||
tc.xesearch(imapclient.UntaggedEsearch{UID: true, Min: 5, Max: 7, Count: uint32ptr(2), All: esearchall0("5,7")})
|
||||
|
||||
tc.transactf("no", `search return () charset unknown text "mox"`)
|
||||
tc.transactf("ok", `search return () charset us-ascii text "mox"`)
|
||||
@ -353,3 +331,35 @@ func TestSearch(t *testing.T) {
|
||||
tc.transactf("ok", `search undraft`)
|
||||
tc.xesearch(esearchall("1:2"))
|
||||
}
|
||||
|
||||
// esearchall makes an UntaggedEsearch response with All set, for comparisons.
|
||||
func esearchall0(ss string) imapclient.NumSet {
|
||||
seqset := imapclient.NumSet{}
|
||||
for _, rs := range strings.Split(ss, ",") {
|
||||
t := strings.Split(rs, ":")
|
||||
if len(t) > 2 {
|
||||
panic("bad seqset")
|
||||
}
|
||||
var first uint32
|
||||
var last *uint32
|
||||
if t[0] != "*" {
|
||||
v, err := strconv.ParseUint(t[0], 10, 32)
|
||||
if err != nil {
|
||||
panic("parse first")
|
||||
}
|
||||
first = uint32(v)
|
||||
}
|
||||
if len(t) == 2 {
|
||||
if t[1] != "*" {
|
||||
v, err := strconv.ParseUint(t[1], 10, 32)
|
||||
if err != nil {
|
||||
panic("parse last")
|
||||
}
|
||||
u := uint32(v)
|
||||
last = &u
|
||||
}
|
||||
}
|
||||
seqset.Ranges = append(seqset.Ranges, imapclient.NumRange{First: first, Last: last})
|
||||
}
|
||||
return seqset
|
||||
}
|
||||
|
Reference in New Issue
Block a user