Merge pull request #9 from ibuildthecloud/master

Detect "unique constraint" errors and return ErrKeyExists

Author: ibuildthecloud

pkg/drivers/dqlite/dqlite.go

@@ -91,7 +91,6 @@ func New(ctx context.Context, datasourceName string) (server.Backend, error) {
 	if err != nil {
 		return nil, err
 	}
-
 	if err := migrate(ctx, generic.DB); err != nil {
 		return nil, errors.Wrap(err, "failed to migrate DB from sqlite")
 	}
@@ -103,6 +102,12 @@ func New(ctx context.Context, datasourceName string) (server.Backend, error) {
 		}
 		return false
 	}
+	generic.TranslateErr = func(err error) error {
+		if strings.Contains(err.Error(), "UNIQUE constraint") {
+			return server.ErrKeyExists
+		}
+		return err
+	}
 
 	return backend, nil
 }

pkg/drivers/generic/generic.go

@@ -12,7 +12,6 @@ import (
 
 	"github.com/Rican7/retry/backoff"
 	"github.com/Rican7/retry/strategy"
-
 	"github.com/sirupsen/logrus"
 )
 
@@ -63,6 +62,7 @@ func (s Stripped) String() string {
 }
 
 type ErrRetry func(error) bool
+type TranslateErr func(error) error
 
 type Generic struct {
 	sync.Mutex
@@ -83,6 +83,7 @@ type Generic struct {
 	FillSQL               string
 	InsertLastInsertIDSQL string
 	Retry                 ErrRetry
+	TranslateErr          TranslateErr
 }
 
 func q(sql, param string, numbered bool) string {
@@ -308,6 +309,14 @@ func (d *Generic) IsFill(key string) bool {
 }
 
 func (d *Generic) Insert(ctx context.Context, key string, create, delete bool, createRevision, previousRevision int64, ttl int64, value, prevValue []byte) (id int64, err error) {
+	if d.TranslateErr != nil {
+		defer func() {
+			if err != nil {
+				err = d.TranslateErr(err)
+			}
+		}()
+	}
+
 	cVal := 0
 	dVal := 0
 	if create {
@@ -320,7 +329,7 @@ func (d *Generic) Insert(ctx context.Context, key string, create, delete bool, c
 	if d.LastInsertID {
 		row, err := d.execute(ctx, d.InsertLastInsertIDSQL, key, cVal, dVal, createRevision, previousRevision, ttl, value, prevValue)
 		if err != nil {
-			return 00, err
+			return 0, err
 		}
 		return row.LastInsertId()
 	}

pkg/drivers/mysql/mysql.go

@@ -23,7 +23,7 @@ var (
 		`create table if not exists kine
 			(
 				id INTEGER AUTO_INCREMENT,
-				name TEXT,
+				name VARCHAR(630),
 				created INTEGER,
 				deleted INTEGER,
 				create_revision INTEGER,
@@ -34,8 +34,8 @@ var (
 				PRIMARY KEY (id)
 			);`,
 	}
-	nameIdx     = "create index kine_name_index on kine (name(100))"
-	revisionIdx = "create unique index kine_name_prev_revision_uindex on kine (name(100), prev_revision)"
+	nameIdx     = "create index kine_name_index on kine (name)"
+	revisionIdx = "create unique index kine_name_prev_revision_uindex on kine (name, prev_revision)"
 	createDB    = "create database if not exists "
 )
 
@@ -63,6 +63,12 @@ func New(dataSourceName string, tlsInfo tls.Config) (server.Backend, error) {
 		return nil, err
 	}
 	dialect.LastInsertID = true
+	dialect.TranslateErr = func(err error) error {
+		if err, ok := err.(*mysql.MySQLError); ok && err.Number == 1062 {
+			return server.ErrKeyExists
+		}
+		return err
+	}
 	if err := setup(dialect.DB); err != nil {
 		return nil, err
 	}

pkg/drivers/pgsql/pgsql.go

@@ -25,7 +25,7 @@ var (
 		`create table if not exists kine
  			(
  				id SERIAL PRIMARY KEY,
- 				name TEXT,
+				name VARCHAR(630),
 				created INTEGER,
 				deleted INTEGER,
  				create_revision INTEGER,
@@ -54,6 +54,12 @@ func New(dataSourceName string, tlsInfo tls.Config) (server.Backend, error) {
 	if err != nil {
 		return nil, err
 	}
+	dialect.TranslateErr = func(err error) error {
+		if err, ok := err.(*pq.Error); ok && err.Code == "23505" {
+			return server.ErrKeyExists
+		}
+		return err
+	}
 
 	if err := setup(dialect.DB); err != nil {
 		return nil, err

pkg/drivers/sqlite/sqlite.go

@@ -5,6 +5,7 @@ import (
 	"database/sql"
 	"os"
 
+	"github.com/mattn/go-sqlite3"
 	"github.com/rancher/kine/pkg/drivers/generic"
 	"github.com/rancher/kine/pkg/logstructured"
 	"github.com/rancher/kine/pkg/logstructured/sqllog"
@@ -51,6 +52,12 @@ func NewVariant(driverName, dataSourceName string) (server.Backend, *generic.Gen
 		return nil, nil, err
 	}
 	dialect.LastInsertID = true
+	dialect.TranslateErr = func(err error) error {
+		if err, ok := err.(sqlite3.Error); ok && err.ExtendedCode == sqlite3.ErrConstraintUnique {
+			return server.ErrKeyExists
+		}
+		return err
+	}
 
 	if err := setup(dialect.DB); err != nil {
 		return nil, nil, err

pkg/logstructured/logstructured.go

@@ -108,11 +108,6 @@ func (l *LogStructured) Create(ctx context.Context, key string, value []byte, le
 	}
 
 	revRet, errRet = l.log.Append(ctx, createEvent)
-	if errRet != nil {
-		if _, prevEvent, err := l.get(ctx, key, 0, true); err == nil && prevEvent != nil && !prevEvent.Delete {
-			return 0, server.ErrKeyExists
-		}
-	}
 	return
 }