fixup

cmd/app/main.go

@@ -19,8 +19,9 @@ var (
 	port                        = flag.Int("port", 9090, "TCP port for HTTP server to bind")
 	serverID                    = flag.String("serverID", uuid.New().String(), "ID to identify the server. Must be globally unique within the cluster")
 	discoveryType               = flag.String("discoveryType", virtual.DiscoveryTypeLocalHost, "how the server should register itself with the discovery serice. Valid options: localhost|remote. Use localhost for local testing, use remote for multi-node setups")
-	registryType                = flag.String("registryBackend", "memory", "backend to use for the Registry. Validation options: memory|foundationdb")
+	registryType                = flag.String("registryBackend", "memory", "backend to use for the Registry. Validation options: memory|foundationdb|postgres")
 	foundationDBClusterFilePath = flag.String("foundationDBClusterFilePath", "", "path to use for the FoundationDB cluster file")
+	postgresDSN                 = flag.String("postgresDSN", "", "postgres dsn for registry storage")
 )
 
 func main() {
@@ -40,6 +41,12 @@ func main() {
 		if err != nil {
 			log.Fatalf("error creating FoundationDB registry: %v\n", err)
 		}
+	case "postgres":
+		var err error
+		reg, err = registry.NewPostgresSQLRegistry(*postgresDSN)
+		if err != nil {
+			log.Fatalf("error creating postgres registry: %v\n", err)
+		}
 	default:
 		log.Fatalf("unknown registry type: %v", *registryType)
 	}

go.mod

@@ -10,9 +10,8 @@ require (
 	github.com/dgraph-io/ristretto v0.1.1
 	github.com/google/btree v1.1.2
 	github.com/google/uuid v1.3.0
-	github.com/lib/pq v1.10.7
-	github.com/mattn/go-sqlite3 v1.14.16
-	github.com/stretchr/testify v1.7.1
+	github.com/jackc/pgx/v5 v5.2.0
+	github.com/stretchr/testify v1.8.0
 	github.com/tetratelabs/wazero v1.0.0-pre.5
 	github.com/wapc/wapc-go v0.5.6
 	github.com/wapc/wapc-guest-tinygo v0.3.3
@@ -26,15 +25,18 @@ require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dustin/go-humanize v1.0.0 // indirect
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
-	github.com/kr/pretty v0.3.0 // indirect
+	github.com/jackc/pgpassfile v1.0.0 // indirect
+	github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect
+	github.com/kr/text v0.2.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/rogpeppe/go-internal v1.8.0 // indirect
+	golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 // indirect
 	golang.org/x/sys v0.0.0-20221010170243-090e33056c14 // indirect
+	golang.org/x/text v0.3.8 // indirect
 	golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect
 	google.golang.org/protobuf v1.28.0 // indirect
-	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
-	gopkg.in/yaml.v3 v3.0.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
 // wapc-go only works with pre.4 because pre.5 changes the API slightly. Once wapc-go

go.sum

@@ -32,33 +32,36 @@ github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
 github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
+github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
+github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b h1:C8S2+VttkHFdOOCXJe+YGfa4vHYwlt4Zx+IVXQ97jYg=
+github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E=
+github.com/jackc/pgx/v5 v5.2.0 h1:NdPpngX0Y6z6XDFKqmFQaE+bCtkqzvQIOt1wvBlAqs8=
+github.com/jackc/pgx/v5 v5.2.0/go.mod h1:Ptn7zmohNsWEsdxRawMzk3gaKma2obW+NWTnKa0S4nk=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
-github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/lib/pq v1.10.7 h1:p7ZhMD+KsSRozJr34udlUrhboJwWAgCg34+/ZZNvZZw=
-github.com/lib/pq v1.10.7/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
-github.com/mattn/go-sqlite3 v1.14.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwpU1Y=
-github.com/mattn/go-sqlite3 v1.14.16/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
 github.com/philhofer/fwd v1.1.1/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8=
 github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/tetratelabs/wazero v1.0.0-pre.4 h1:RBJQT5OzmORkSp6MmZDWoFEr0zXjk4pmvMKAdeUnsaI=
 github.com/tetratelabs/wazero v1.0.0-pre.4/go.mod h1:u8wrFmpdrykiFK0DFPiFm5a4+0RzsdmXYVtijBKqUVo=
 github.com/tinylib/msgp v1.1.5/go.mod h1:eQsjooMTnV42mHu917E26IogZ2930nFyBQdofk10Udg=
@@ -73,6 +76,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 h1:Y/gsMcFOcR+6S6f3YeMKl5g+dZMEWqcz5Czj/GWYbkM=
+golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -88,6 +93,8 @@ golang.org/x/sys v0.0.0-20221010170243-090e33056c14 h1:k5II8e6QD8mITdi+okbbmR/cI
 golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20201022035929-9cf592e881e9/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
@@ -104,9 +111,8 @@ google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqw
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0 h1:hjy8E9ON/egN1tAYqKb61G10WtihqetD4sz2H+8nIeA=
-gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

virtual/registry/sql_kv.go

@@ -2,15 +2,19 @@ package registry
 
 import (
 	"context"
-	"database/sql"
 	"errors"
 	"fmt"
 	"time"
+	"database/sql"
+
+	_ "github.com/jackc/pgx/v5"
+	_ "github.com/jackc/pgx/v5/stdlib"
 )
 
-// TODO: hardcoded for now, but may be useful as a configuration option for
-// some type of isolation
-const defaultTableName = "nola_kv"
+const (
+	defaultTableName = "nola_kv"
+	postgresKVDriverName = "postgres"
+)
 
 type sqlKV struct {
 	db *sql.DB
@@ -26,46 +30,43 @@ type sqlKVStatement struct {
 	rangeStmt  *sql.Stmt
 }
 
-func newSQLKV(driver, dsn string) (kv, error) {
+func newPostgresSQLKV(dsn string) (kv, error) {
 	tableName := defaultTableName
-	db, err := sql.Open(driver, dsn) // TODO support selecting driver at runtime
+	db, err := sql.Open("pgx", dsn)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("failed to open %q connection: %w", postgresKVDriverName, err)
 	}
 
-	db.SetMaxOpenConns(1)
-	db.SetMaxIdleConns(1)
-	db.SetConnMaxIdleTime(0)
-
 	err = db.Ping()
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("failed to ping database (%q), faild init: %w", postgresKVDriverName, err)
 	}
 
-	// TODO Improve indexing
-	_, err = db.Exec("CREATE TABLE IF NOT EXISTS nola_kv (k BLOB PRIMARY KEY, v BLOB NOT NULL);")
+	// XXX Could we possibly index the part of the prefix to improve the
+	// performance of iterRange?
+	_, err = db.Exec(fmt.Sprintf("CREATE TABLE IF NOT EXISTS %v (k BYTEA PRIMARY KEY, v BYTEA NOT NULL);", defaultTableName))
 	if err != nil {
-		return nil, fmt.Errorf("failed to create table: %w", err)
+		return nil, fmt.Errorf("failed to create table (%q): %w", postgresKVDriverName, err)
 	}
 
-	setStmt, err := db.Prepare("INSERT INTO nola_kv (k, v) VALUES (?,?) ON CONFLICT (k) DO UPDATE SET v=?;")
+	setStmt, err := db.Prepare(fmt.Sprintf("INSERT INTO %q (k, v) VALUES ($1,$2) ON CONFLICT (k) DO UPDATE SET v=$2;", tableName))
 	if err != nil {
-		return nil, fmt.Errorf("failed to prepare insert statement: %w", err)
+		return nil, fmt.Errorf("failed to prepare insert statement (%q): %w", postgresKVDriverName, err)
 	}
 
-	getStmt, err := db.Prepare("SELECT v FROM nola_kv WHERE k=?;")
+	getStmt, err := db.Prepare(fmt.Sprintf("SELECT v FROM %v WHERE k=$1;", tableName))
 	if err != nil {
-		return nil, fmt.Errorf("failed to prepare select statement: %w", err)
+		return nil, fmt.Errorf("failed to prepare select statement (%q): %w", postgresKVDriverName, err)
 	}
 
-	deleteStmt, err := db.Prepare("DELETE FROM nola_kv where k=?;")
+	deleteStmt, err := db.Prepare(fmt.Sprintf("DELETE FROM %v where k=$1;", tableName))
 	if err != nil {
-		return nil, fmt.Errorf("failed to prepare delete statement: %w", err)
+		return nil, fmt.Errorf("failed to prepare delete statement (%q): %w", postgresKVDriverName, err)
 	}
 
-	rangeStmt, err := db.Prepare("SELECT k, v FROM nola_kv WHERE k LIKE ?;")
+	rangeStmt, err := db.Prepare(fmt.Sprintf("SELECT k, v FROM %v WHERE k LIKE $1;", tableName))
 	if err != nil {
-		return nil, fmt.Errorf("failed to prepare range statement: %w", err)
+		return nil, fmt.Errorf("failed to prepare range statement (%q): %w", postgresKVDriverName, err)
 	}
 
 	return &sqlKV{
@@ -84,7 +85,7 @@ func newSQLKV(driver, dsn string) (kv, error) {
 func (sqlkv *sqlKV) beginTransaction(ctx context.Context) (transaction, error) {
 	tx, err := sqlkv.db.BeginTx(ctx, &sql.TxOptions{Isolation: sql.LevelSerializable})
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("failed to start transaction (%q): %w", postgresKVDriverName, err)
 	}
 
 	return &sqlTransactionKV{tx: tx, sqlKVStatement: &sqlKVStatement{
@@ -98,21 +99,24 @@ func (sqlkv *sqlKV) beginTransaction(ctx context.Context) (transaction, error) {
 }
 
 func (sqlkv *sqlKV) transact(txfn func(transaction) (any, error)) (any, error) {
-	ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
+	// This limits the total time of the transaction to 10sec including the time
+	// to start/stop. FDB has a max 5sec transaction, which we're aiming for
+	// here.
+	ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
 	defer cancel()
 	tx, err := sqlkv.beginTransaction(ctx)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("failed transact begin: %w", err)
 	}
 
 	rt, err := txfn(tx)
 	if err != nil {
-		return nil, err
+		return nil, err // user supplied error
 	}
 
-	err = tx.commit(context.TODO())
+	err = tx.commit(ctx)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("failed transact commit: %w", err)
 	}
 
 	return rt, nil
@@ -123,7 +127,7 @@ func (sqlkv *sqlKV) close(ctx context.Context) error {
 }
 
 func (sqlkv *sqlKV) unsafeWipeAll() error {
-	_, err := sqlkv.db.Exec("DELETE FROM nola_kv;")
+	_, err := sqlkv.db.Exec("DELETE FROM $1;", defaultTableName)
 	if err != nil {
 		return fmt.Errorf("failed to wipe table: %w", err)
 	}
@@ -138,7 +142,11 @@ type sqlTransactionKV struct {
 
 func (sqltransactionkv *sqlKVStatement) put(ctx context.Context, key []byte, value []byte) error {
 	_, err := sqltransactionkv.setStmt.ExecContext(ctx, key, value, value)
-	return err
+	if err != nil {
+		return fmt.Errorf("failed to put (%q): %w", postgresKVDriverName, err)
+	}
+
+	return nil
 }
 
 func (sqltransactionkv *sqlKVStatement) get(ctx context.Context, key []byte) ([]byte, bool, error) {
@@ -165,30 +173,49 @@ func (sqltransactionkv *sqlKVStatement) iterPrefix(ctx context.Context, prefix [
 		var key []byte
 		var value []byte
 		if err := rows.Scan(&key, &value); err != nil {
-			return err
+			return fmt.Errorf("failed to scan in iterPrefix: %w", err)
 		}
 
 		err = fn(key, value)
 		if err != nil {
-			return err
+			return fmt.Errorf("failed to apply iterPrefix function %w", err)
 		}
 	}
 
 	if err := rows.Err(); err != nil {
-		return err
+		return fmt.Errorf("failed to list rows when iterating prefix: %w", err)
 	}
 
 	return nil
 }
 
 func (sqltransactionkv *sqlTransactionKV) getVersionStamp() (int64, error) {
-	return time.Since(sqltransactionkv.vst).Microseconds(), nil
+	ctx, cancel := context.WithTimeout(context.Background(), 1*time.Second)
+	defer cancel()
+
+	var now time.Time
+	err := sqltransactionkv.tx.QueryRowContext(ctx, "SELECT NOW() AT TIMEZONE 'UTC';").Scan(&now)
+	if err != nil {
+		return 0, fmt.Errorf("failed to get versionstamp (%q): %w", postgresKVDriverName, err)
+	}
+
+	return now.UTC().UnixMicro(), nil
 }
 
 func (sqltransactionkv *sqlTransactionKV) commit(ctx context.Context) error {
-	return sqltransactionkv.tx.Commit()
+	err := sqltransactionkv.tx.Commit()
+	if err != nil {
+		return fmt.Errorf("failed to commit transaction (%q): %w", postgresKVDriverName, err)
+	}
+
+	return nil
 }
 
 func (sqltransactionkv *sqlTransactionKV) cancel(ctx context.Context) error {
-	return sqltransactionkv.tx.Rollback()
+	err := sqltransactionkv.tx.Rollback()
+	if err != nil {
+		return fmt.Errorf("failed to cancel transaction (%q): %w", postgresKVDriverName, err)
+	}
+
+	return nil
 }

virtual/registry/sql_registry.go

@@ -1,34 +1,8 @@
 package registry
 
-import (
-	"os"
-	"path/filepath"
-	"testing"
-
-	_ "github.com/lib/pq"
-	_ "github.com/mattn/go-sqlite3"
-)
-
-// NewSQLRegistry creates a new SQL backed registry.
-// Currently this only supports Postgres.
-func NewSQLRegistry(dsn string) (Registry, error) {
-	registry, err := newSQLKV("postgres", dsn)
-	if err != nil {
-		return nil, err
-	}
-	return newValidatedRegistry(newKVRegistry(registry)), nil
-}
-
-func newTestSQLRegistry(t *testing.T) (Registry, error) {
-	dir, err := os.MkdirTemp("", "sqlite-test*")
-	if err != nil {
-		return nil, err
-	}
-	dbPath := filepath.Join(dir, "test.db")
-
-	t.Log(dbPath)
-
-	registry, err := newSQLKV("sqlite3", dbPath)
+// NewPostgresSQLRegistry creates a new Postgres backed registry.
+func NewPostgresSQLRegistry(dsn string) (Registry, error) {
+	registry, err := newPostgresSQLKV( dsn)
 	if err != nil {
 		return nil, err
 	}

virtual/registry/sql_registry_test.go

@@ -8,7 +8,7 @@ import (
 
 func TestSQLRegistry(t *testing.T) {
 	testAllCommon(t, func() Registry {
-		registry, err := newTestSQLRegistry(t)
+		registry, err := NewPostgresSQLRegistry("postgres://postgres:test1234@localhost:5432/postgres?sslmode=disable")
 		require.NoError(t, err)
 
 		registry.UnsafeWipeAll()