go/sqlite3
1
0
Fork 0
mirror of https://github.com/ncruces/go-sqlite3.git synced 2026-01-12 05:59:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid weird mutex.

Browse Source
This commit is contained in:
Nuno Cruces
2025-01-09 11:19:40 +00:00
parent 7424747338
commit a79ee4c2c6
1 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
ext/serdes/serdes.go
View File

@@ -3,7 +3,6 @@ package serdes
import ( import (
"io" "io"
"sync"
"github.com/ncruces/go-sqlite3" "github.com/ncruces/go-sqlite3"
"github.com/ncruces/go-sqlite3/vfs" "github.com/ncruces/go-sqlite3/vfs"
@@ -18,8 +17,7 @@ func init() {
// https://sqlite.org/c3ref/serialize.html // https://sqlite.org/c3ref/serialize.html
func Serialize(db *sqlite3.Conn, schema string) ([]byte, error) { func Serialize(db *sqlite3.Conn, schema string) ([]byte, error) {
var file sliceFile var file sliceFile
openMtx.Lock() fileToOpen <- &file
openFile = &file
err := db.Backup(schema, "file:db?vfs="+vfsName) err := db.Backup(schema, "file:db?vfs="+vfsName)
return file.data, err return file.data, err
} }
@@ -39,15 +37,11 @@ func Serialize(db *sqlite3.Conn, schema string) ([]byte, error) {
// ["memdb"]: https://pkg.go.dev/github.com/ncruces/go-sqlite3/vfs/memdb // ["memdb"]: https://pkg.go.dev/github.com/ncruces/go-sqlite3/vfs/memdb
// ["reader"]: https://pkg.go.dev/github.com/ncruces/go-sqlite3/vfs/readervfs // ["reader"]: https://pkg.go.dev/github.com/ncruces/go-sqlite3/vfs/readervfs
func Deserialize(db *sqlite3.Conn, schema string, data []byte) error { func Deserialize(db *sqlite3.Conn, schema string, data []byte) error {
openMtx.Lock() fileToOpen <- &sliceFile{data}
openFile = &sliceFile{data}
return db.Restore(schema, "file:db?vfs="+vfsName) return db.Restore(schema, "file:db?vfs="+vfsName)
} }
var ( var fileToOpen = make(chan *sliceFile, 1)
openMtx sync.Mutex
openFile *sliceFile
)
const vfsName = "github.com/ncruces/go-sqlite3/ext/deserialize.sliceVFS" const vfsName = "github.com/ncruces/go-sqlite3/ext/deserialize.sliceVFS"
@@ -58,16 +52,7 @@ func (sliceVFS) Open(name string, flags vfs.OpenFlag) (vfs.File, vfs.OpenFlag, e
// notest // OPEN_MEMORY // notest // OPEN_MEMORY
return nil, flags, sqlite3.CANTOPEN return nil, flags, sqlite3.CANTOPEN
} }
return <-fileToOpen, flags | vfs.OPEN_MEMORY, nil
file := openFile
openFile = nil
openMtx.Unlock()
if file.data != nil {
flags |= vfs.OPEN_READONLY
}
flags |= vfs.OPEN_MEMORY
return file, flags, nil
} }
func (sliceVFS) Delete(name string, dirSync bool) error { func (sliceVFS) Delete(name string, dirSync bool) error {