JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

storage/postgreskv: Reverting back to the venerable PG CAS

Browse Source 
This was inadvertently converted to the Cockroach version. This reverts
most of that and keeps the changes since then.

Change-Id: Ia440eeebb01bc89fbfa8ce266668030173061469
This commit is contained in:
ccase 2020-01-22 11:10:14 -05:00
parent b2c454dbd6
commit 818242f452
No known key found for this signature in database
GPG Key ID: BB367E399EBB2B9D
1 changed files with 43 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
storage/postgreskv/client.go
View File

@ -4,7 +4,6 @@
package postgreskv package postgreskv
import ( import (
"bytes"
"context" "context"
"database/sql" "database/sql"
@ -14,7 +13,6 @@ import (
"storj.io/storj/private/dbutil" "storj.io/storj/private/dbutil"
"storj.io/storj/private/dbutil/pgutil" "storj.io/storj/private/dbutil/pgutil"
"storj.io/storj/private/dbutil/txutil"
"storj.io/storj/private/tagsql" "storj.io/storj/private/tagsql"
"storj.io/storj/storage" "storj.io/storj/storage"
"storj.io/storj/storage/postgreskv/schema" "storj.io/storj/storage/postgreskv/schema"
@ -201,6 +199,7 @@ func (client *Client) CompareAndSwap(ctx context.Context, key storage.Key, oldVa
if err != nil { if err != nil {
return Error.Wrap(err) return Error.Wrap(err)
} }
return storage.ErrValueChanged.New("%q", key) return storage.ErrValueChanged.New("%q", key)
} }
@ -217,62 +216,55 @@ func (client *Client) CompareAndSwap(ctx context.Context, key storage.Key, oldVa
if err == sql.ErrNoRows { if err == sql.ErrNoRows {
return storage.ErrValueChanged.New("%q", key) return storage.ErrValueChanged.New("%q", key)
} }
return Error.Wrap(err) return Error.Wrap(err)
} }
return txutil.WithTx(ctx, client.db, nil, func(_ context.Context, txn tagsql.Tx) error { var row *sql.Row
q := "SELECT metadata FROM pathdata WHERE fullpath = $1::BYTEA;" if newValue == nil {
row := txn.QueryRowContext(ctx, q, []byte(key)) q := `
WITH matching_key AS (
var metadata []byte SELECT * FROM pathdata WHERE fullpath = $1::BYTEA
err = row.Scan(&metadata) ), updated AS (
if err == sql.ErrNoRows { DELETE FROM pathdata
// Row not found for this fullpath. USING matching_key mk
// Potentially because another concurrent transaction changed the row. WHERE pathdata.metadata = $2::BYTEA
return storage.ErrKeyNotFound.New("%q", key) AND pathdata.fullpath = mk.fullpath
} RETURNING 1
if err != nil { )
return Error.Wrap(err) SELECT EXISTS(SELECT 1 FROM matching_key) AS key_present, EXISTS(SELECT 1 FROM updated) AS value_updated
}
if equal := bytes.Compare(metadata, oldValue); equal != 0 {
// If the row is found but the metadata has been already changed
// we can't continue to delete it.
return storage.ErrValueChanged.New("%q", key)
}
var res sql.Result
if newValue == nil {
q = `
DELETE FROM pathdata
WHERE pathdata.fullpath = $1::BYTEA
AND pathdata.metadata = $2::BYTEA
` `
row = client.db.QueryRow(ctx, q, []byte(key), []byte(oldValue))
res, err = txn.ExecContext(ctx, q, []byte(key), []byte(oldValue)) } else {
} else { q := `
q = ` WITH matching_key AS (
UPDATE pathdata SELECT * FROM pathdata WHERE fullpath = $1::BYTEA
SET metadata = $3::BYTEA ), updated AS (
WHERE pathdata.fullpath = $1::BYTEA UPDATE pathdata
AND pathdata.metadata = $2::BYTEA SET metadata = $3::BYTEA
FROM matching_key mk
WHERE pathdata.metadata = $2::BYTEA
AND pathdata.fullpath = mk.fullpath
RETURNING 1
)
SELECT EXISTS(SELECT 1 FROM matching_key) AS key_present, EXISTS(SELECT 1 FROM updated) AS value_updated;
` `
res, err = txn.ExecContext(ctx, q, []byte(key), []byte(oldValue), []byte(newValue)) row = client.db.QueryRow(ctx, q, []byte(key), []byte(oldValue), []byte(newValue))
} }
if err != nil { var keyPresent, valueUpdated bool
return Error.Wrap(err) err = row.Scan(&keyPresent, &valueUpdated)
} if err != nil {
return Error.Wrap(err)
}
affected, err := res.RowsAffected() if !keyPresent {
if err != nil { return storage.ErrKeyNotFound.New("%q", key)
return Error.Wrap(err) }
}
if affected != 1 { if !valueUpdated {
return storage.ErrValueChanged.New("%q", key) return storage.ErrValueChanged.New("%q", key)
} }
return nil return nil
})
} }