From: Matt Joiner <anacrolix@gmail.com> Date: Mon, 1 Feb 2021 04:47:28 +0000 (+1100) Subject: Fix sqlite storage for numconns 1 X-Git-Tag: v1.23.0~2 X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=15ccbc95c64e833fa0d3552ce758cdafe0f4f35c;p=btrtrc.git Fix sqlite storage for numconns 1 --- diff --git a/storage/sqlite/sqlite-storage.go b/storage/sqlite/sqlite-storage.go index fb2bea4c..7fa7343b 100644 --- a/storage/sqlite/sqlite-storage.go +++ b/storage/sqlite/sqlite-storage.go @@ -265,9 +265,8 @@ func NewPool(opts NewPoolOpts) (_ ConnPool, _ ProviderOpts, err error) { } return conns, ProviderOpts{ NumConns: opts.NumConns, - NoConcurrentBlobReads: opts.NoConcurrentBlobReads || opts.Memory, - BatchWrites: true, - //BatchWrites: opts.NumConns > 1, + NoConcurrentBlobReads: opts.NoConcurrentBlobReads || opts.Memory || opts.NumConns == 1, + BatchWrites: opts.NumConns > 1, }, nil } diff --git a/test/transfer_test.go b/test/transfer_test.go index b014e9a3..47efef0b 100644 --- a/test/transfer_test.go +++ b/test/transfer_test.go @@ -330,7 +330,7 @@ func TestClientTransferVarious(t *testing.T) { Wrapper: fileCachePieceResourceStorage, }), 0}, {"Boltdb", storage.NewBoltDB, 0}, - //sqliteLeecherStorageTestCase(1), + sqliteLeecherStorageTestCase(1), sqliteLeecherStorageTestCase(2), // This should use a number of connections equal to the number of CPUs sqliteLeecherStorageTestCase(0),