Skip to content

Commit ea9a58a

Browse files
committed
Remove singleflight.
1 parent 0b46e74 commit ea9a58a

4 files changed

Lines changed: 27 additions & 34 deletions

File tree

‎litestream/cache.go‎

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,55 @@
11
package litestream
22

33
import (
4-
"encoding/binary"
4+
"context"
5+
"fmt"
56
"sync"
67

7-
"golang.org/x/sync/singleflight"
8-
8+
"github.com/benbjohnson/litestream"
99
"github.com/superfly/ltx"
1010
)
1111

1212
type pageCache struct {
13-
single singleflight.Group
14-
pages map[uint32]cachedPage // +checklocks:mtx
15-
size int
16-
mtx sync.Mutex
13+
pages map[uint32]cachedPage // +checklocks:mtx
14+
size int
15+
mtx sync.Mutex
1716
}
1817

1918
type cachedPage struct {
2019
data []byte
2120
txid ltx.TXID
2221
}
2322

24-
func (c *pageCache) getOrFetch(pgno uint32, maxTXID ltx.TXID, fetch func() (any, error)) ([]byte, error) {
25-
if c.size >= 0 {
23+
func (c *pageCache) getOrFetch(ctx context.Context, client ReplicaClient, pgno uint32, elem ltx.PageIndexElem) ([]byte, error) {
24+
if c.size > 0 {
2625
c.mtx.Lock()
27-
if c.pages == nil {
28-
c.pages = map[uint32]cachedPage{}
29-
}
3026
page := c.pages[pgno]
3127
c.mtx.Unlock()
3228

33-
if page.txid == maxTXID {
29+
if page.txid == elem.MaxTXID {
3430
return page.data, nil
3531
}
3632
}
3733

38-
var key [12]byte
39-
binary.LittleEndian.PutUint32(key[0:], pgno)
40-
binary.LittleEndian.PutUint64(key[4:], uint64(maxTXID))
41-
v, err, _ := c.single.Do(string(key[:]), fetch)
42-
34+
h, data, err := litestream.FetchPage(ctx, client, elem.Level, elem.MinTXID, elem.MaxTXID, elem.Offset, elem.Size)
4335
if err != nil {
44-
return nil, err
36+
return nil, fmt.Errorf("fetch page: %w", err)
37+
}
38+
if pgno != h.Pgno {
39+
return nil, fmt.Errorf("fetch page: want %d, got %d", pgno, h.Pgno)
4540
}
4641

47-
page := cachedPage{v.([]byte), maxTXID}
48-
if c.size >= 0 {
42+
if c.size > 0 {
4943
c.mtx.Lock()
50-
c.evict(len(page.data))
51-
c.pages[pgno] = page
44+
if c.pages != nil {
45+
c.evict(len(data))
46+
} else {
47+
c.pages = map[uint32]cachedPage{}
48+
}
49+
c.pages[pgno] = cachedPage{data, elem.MaxTXID}
5250
c.mtx.Unlock()
5351
}
54-
return page.data, nil
52+
return data, nil
5553
}
5654

5755
// +checklocks:c.mtx

‎litestream/go.mod‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@ go 1.24.4
44

55
require (
66
github.com/benbjohnson/litestream v0.5.3
7-
github.com/ncruces/go-sqlite3 v0.30.3
7+
github.com/ncruces/go-sqlite3 v0.30.4-0.20251216123455-0b46e74ea69b
88
github.com/ncruces/wbt v0.2.0
99
github.com/superfly/ltx v0.5.0
10-
golang.org/x/sync v0.19.0
1110
)
1211

1312
// github.com/ncruces/go-sqlite3
@@ -34,7 +33,6 @@ require (
3433
github.com/prometheus/procfs v0.19.2 // indirect
3534
github.com/rogpeppe/go-internal v1.12.0 // indirect
3635
go.yaml.in/yaml/v2 v2.4.3 // indirect
37-
golang.org/x/crypto v0.46.0 // indirect
3836
google.golang.org/protobuf v1.36.11 // indirect
3937
)
4038

‎litestream/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ github.com/nats-io/nkeys v0.4.11 h1:q44qGV008kYd9W1b1nEBkNzvnWxtRSQ7A8BoqRrcfa0=
103103
github.com/nats-io/nkeys v0.4.11/go.mod h1:szDimtgmfOi9n25JpfIdGw12tZFYXqhGxjhVxsatHVE=
104104
github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw=
105105
github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
106-
github.com/ncruces/go-sqlite3 v0.30.3 h1:X/CgWW9GzmIAkEPrifhKqf0cC15DuOVxAJaHFTTAURQ=
107-
github.com/ncruces/go-sqlite3 v0.30.3/go.mod h1:AxKu9sRxkludimFocbktlY6LiYSkxiI5gTA8r+os/Nw=
106+
github.com/ncruces/go-sqlite3 v0.30.4-0.20251216123455-0b46e74ea69b h1:0HG7ul3Q1d/E/jrZpBTpzx4xhxJwMKuq5J4nuZIogm8=
107+
github.com/ncruces/go-sqlite3 v0.30.4-0.20251216123455-0b46e74ea69b/go.mod h1:wz6IQnveXfqaXZozfhM8ciIJi2LRnnifBuBQarPDYo0=
108108
github.com/ncruces/julianday v1.0.0 h1:fH0OKwa7NWvniGQtxdJRxAgkBMolni2BjDHaWTxqt7M=
109109
github.com/ncruces/julianday v1.0.0/go.mod h1:Dusn2KvZrrovOMJuOt0TNXL6tB7U2E8kvza5fFc9G7g=
110110
github.com/ncruces/litestream v0.5.3 h1:5qMwt99t2k0+AI1AGv7gY9QNkdVADWhzLp9zVcf2EGU=

‎litestream/vfs.go‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,7 @@ func (f *liteFile) ReadAt(p []byte, off int64) (n int, err error) {
9292
return 0, io.EOF
9393
}
9494

95-
data, err := f.db.cache.getOrFetch(pgno, elem.MaxTXID, func() (any, error) {
96-
_, data, err := litestream.FetchPage(ctx, f.db.client, elem.Level, elem.MinTXID, elem.MaxTXID, elem.Offset, elem.Size)
97-
return data, err
98-
})
95+
data, err := f.db.cache.getOrFetch(ctx, f.db.client, pgno, elem)
9996
if err != nil {
10097
f.db.opts.Logger.Error("fetch page", "error", err)
10198
return 0, err
@@ -291,7 +288,7 @@ func (d *liteDB) buildIndex(ctx context.Context) error {
291288
defer d.mtx.Unlock()
292289

293290
// Skip if we already have an index.
294-
if d.pages != nil {
291+
if !d.lastPoll.IsZero() {
295292
return nil
296293
}
297294

0 commit comments

Comments
 (0)