Update sqlite3 piece completion

diff --git a/storage/sqlitePieceCompletion.go b/storage/sqlitePieceCompletion.go
index 831f6a1ebc5ea6ebb9e523444aa6d7f88e880f70..7efe041e43f1f88a2357bc74f713871ea45b1faf 100644 (file)
--- a/storage/sqlitePieceCompletion.go
+++ b/storage/sqlitePieceCompletion.go
@@ -15,13 +15,18 @@ type sqlitePieceCompletion struct {
        db *sql.DB
 }
 
+var _ PieceCompletion = (*sqlitePieceCompletion)(nil)
+
 func newSqlitePieceCompletion(dir string) (ret *sqlitePieceCompletion, err error) {
        p := filepath.Join(dir, ".torrent.db")
        db, err := sql.Open("sqlite3", p)
        if err != nil {
                return
        }
-       _, err = db.Exec(`create table if not exists completed(infohash, "index", unique(infohash, "index") on conflict ignore)`)
+       db.SetMaxOpenConns(1)
+       db.Exec(`PRAGMA journal_mode=WAL`)
+       db.Exec(`PRAGMA synchronous=1`)
+       _, err = db.Exec(`create table if not exists piece_completion(infohash, "index", complete, unique(infohash, "index"))`)
        if err != nil {
                db.Close()
                return
@@ -30,21 +35,22 @@ func newSqlitePieceCompletion(dir string) (ret *sqlitePieceCompletion, err error
        return
 }
 
-func (me *sqlitePieceCompletion) Get(pk metainfo.PieceKey) (ret bool, err error) {
-       row := me.db.QueryRow(`select exists(select * from completed where infohash=? and "index"=?)`, pk.InfoHash.HexString(), pk.Index)
-       err = row.Scan(&ret)
+func (me *sqlitePieceCompletion) Get(pk metainfo.PieceKey) (c Completion, err error) {
+       row := me.db.QueryRow(`select complete from piece_completion where infohash=? and "index"=?`, pk.InfoHash.HexString(), pk.Index)
+       err = row.Scan(&c.Complete)
+       if err == sql.ErrNoRows {
+               err = nil
+       } else if err == nil {
+               c.Ok = true
+       }
        return
 }
 
-func (me *sqlitePieceCompletion) Set(pk metainfo.PieceKey, b bool) (err error) {
-       if b {
-               _, err = me.db.Exec(`insert into completed (infohash, "index") values (?, ?)`, pk.InfoHash.HexString(), pk.Index)
-       } else {
-               _, err = me.db.Exec(`delete from completed where infohash=? and "index"=?`, pk.InfoHash.HexString(), pk.Index)
-       }
-       return
+func (me *sqlitePieceCompletion) Set(pk metainfo.PieceKey, b bool) error {
+       _, err := me.db.Exec(`insert or replace into piece_completion(infohash, "index", complete) values(?, ?, ?)`, pk.InfoHash.HexString(), pk.Index, b)
+       return err
 }
 
-func (me *sqlitePieceCompletion) Close() {
-       me.db.Close()
+func (me *sqlitePieceCompletion) Close() error {
+       return me.db.Close()
 }