Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Driver for Sqlserver #43

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Driver for Sqlserver #43

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
58a97d2
Added a minimal sample of using kine with RKE
ibrokethecloud Feb 3, 2020
4150886
Merge branch 'master' of github.com:rancher/kine
ibrokethecloud Mar 11, 2020
0ff89f4
Merge branch 'master' of github.com:rancher/kine
ibrokethecloud Jun 25, 2020
c703875
Initial commit for sqlserver driver
ibrokethecloud Jul 9, 2020
31ab3f8
Changes to generic driver to allow custom limit function to be passed…
ibrokethecloud Jul 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 8 additions & 11 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,12 @@ module github.com/rancher/kine
go 1.12

require (
github.com/Rican7/retry v0.1.0
github.com/canonical/go-dqlite v1.5.1
github.com/go-sql-driver/mysql v1.4.1
github.com/lib/pq v1.1.1
github.com/mattn/go-sqlite3 v1.10.0
github.com/pkg/errors v0.8.1
github.com/rancher/wrangler v0.4.0
github.com/sirupsen/logrus v1.4.2
github.com/urfave/cli v1.21.0
go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738
google.golang.org/grpc v1.23.1
github.com/Rican7/retry v0.1.0 // indirect
github.com/canonical/go-dqlite v1.5.1 // indirect
github.com/denisenkom/go-mssqldb v0.0.0-20200620013148-b91950f658ec // indirect
github.com/go-sql-driver/mysql v1.4.1 // indirect
github.com/lib/pq v1.1.1 // indirect
github.com/mattn/go-sqlite3 v1.10.0 // indirect
github.com/rancher/wrangler v0.4.0 // indirect
github.com/urfave/cli v1.21.0 // indirect
)
7 changes: 7 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/denisenkom/go-mssqldb v0.0.0-20200620013148-b91950f658ec h1:NfhRXXFDPxcF5Cwo06DzeIaE7uuJtAUhsDwH3LNsjos=
github.com/denisenkom/go-mssqldb v0.0.0-20200620013148-b91950f658ec/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
Expand Down Expand Up @@ -128,6 +130,8 @@ github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE=
github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d h1:3PaI8p3seN09VjbTYC/QWlUZdZ1qS1zGjy7LH2Wt07I=
github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY=
github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903 h1:LbsanbbD6LieFkXbj9YNNBupiGHJgFeLpO0j0Fza1h8=
Expand Down Expand Up @@ -251,6 +255,8 @@ github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
github.com/prometheus/procfs v0.0.2 h1:6LJUbpNm42llc4HRCuvApCSWB/WfhuNo9K98Q9sNGfs=
github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
github.com/rancher/kine v0.4.0 h1:1IhWy3TzjExG8xnj46eyUEWdzqNAD1WrgL4eEBKm6Uc=
github.com/rancher/kine v0.4.0/go.mod h1:IImtCJ68AIkE+VY/kUI0NkyJL5q5WzO8QvMsSXqbrpA=
github.com/rancher/wrangler v0.4.0 h1:iLvuJcZkd38E3RGG74dFMMNEju0PeTzfT1PQiv5okVU=
github.com/rancher/wrangler v0.4.0/go.mod h1:1cR91WLhZgkZ+U4fV9nVuXqKurWbgXcIReU4wnQvTN8=
github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M=
Expand Down Expand Up @@ -316,6 +322,7 @@ golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnf
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20190617133340-57b3e21c3d56/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586 h1:7KByu05hhLed2MO29w7p1XfZvZ13m8mub3shuVftRs0=
Expand Down
63 changes: 39 additions & 24 deletions pkg/drivers/generic/generic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ type TranslateErr func(error) error

type Generic struct {
sync.Mutex

DriverName string
LockWrites bool
LastInsertID bool
DB *sql.DB
Expand All @@ -82,11 +82,13 @@ type Generic struct {
InsertSQL string
FillSQL string
InsertLastInsertIDSQL string
RevSQL string
CompactRevSQL string
Retry ErrRetry
TranslateErr TranslateErr
}

func q(sql, param string, numbered bool) string {
func QueryBuilder(sql, param string, numbered bool) string {
if param == "?" && !numbered {
return sql
}
Expand Down Expand Up @@ -128,7 +130,7 @@ func (d *Generic) Migrate(ctx context.Context) {
}
}

func openAndTest(driverName, dataSourceName string) (*sql.DB, error) {
func OpenAndTest(driverName, dataSourceName string) (*sql.DB, error) {
db, err := sql.Open(driverName, dataSourceName)
if err != nil {
return nil, err
Expand All @@ -151,7 +153,7 @@ func Open(ctx context.Context, driverName, dataSourceName string, paramCharacter
)

for i := 0; i < 300; i++ {
db, err = openAndTest(driverName, dataSourceName)
db, err = OpenAndTest(driverName, dataSourceName)
if err == nil {
break
}
Expand All @@ -165,49 +167,51 @@ func Open(ctx context.Context, driverName, dataSourceName string, paramCharacter
}

return &Generic{
DB: db,

GetRevisionSQL: q(fmt.Sprintf(`
DB: db,
DriverName: driverName,
GetRevisionSQL: QueryBuilder(fmt.Sprintf(`
SELECT
0, 0, %s
FROM kine kv
WHERE kv.id = ?`, columns), paramCharacter, numbered),

GetCurrentSQL: q(fmt.Sprintf(listSQL, ""), paramCharacter, numbered),
ListRevisionStartSQL: q(fmt.Sprintf(listSQL, "AND mkv.id <= ?"), paramCharacter, numbered),
GetRevisionAfterSQL: q(fmt.Sprintf(listSQL, idOfKey), paramCharacter, numbered),
GetCurrentSQL: QueryBuilder(fmt.Sprintf(listSQL, ""), paramCharacter, numbered),
ListRevisionStartSQL: QueryBuilder(fmt.Sprintf(listSQL, "AND mkv.id <= ?"), paramCharacter, numbered),
GetRevisionAfterSQL: QueryBuilder(fmt.Sprintf(listSQL, idOfKey), paramCharacter, numbered),

CountSQL: q(fmt.Sprintf(`
CountSQL: QueryBuilder(fmt.Sprintf(`
SELECT (%s), COUNT(c.theid)
FROM (
%s
) c`, revSQL, fmt.Sprintf(listSQL, "")), paramCharacter, numbered),

AfterSQL: q(fmt.Sprintf(`
AfterSQL: QueryBuilder(fmt.Sprintf(`
SELECT (%s), (%s), %s
FROM kine kv
WHERE
kv.name LIKE ? AND
kv.id > ?
ORDER BY kv.id ASC`, revSQL, compactRevSQL, columns), paramCharacter, numbered),

DeleteSQL: q(`
DeleteSQL: QueryBuilder(`
DELETE FROM kine
WHERE id = ?`, paramCharacter, numbered),

UpdateCompactSQL: q(`
UpdateCompactSQL: QueryBuilder(`
UPDATE kine
SET prev_revision = ?
WHERE name = 'compact_rev_key'`, paramCharacter, numbered),

InsertLastInsertIDSQL: q(`INSERT INTO kine(name, created, deleted, create_revision, prev_revision, lease, value, old_value)
InsertLastInsertIDSQL: QueryBuilder(`INSERT INTO kine(name, created, deleted, create_revision, prev_revision, lease, value, old_value)
values(?, ?, ?, ?, ?, ?, ?, ?)`, paramCharacter, numbered),

InsertSQL: q(`INSERT INTO kine(name, created, deleted, create_revision, prev_revision, lease, value, old_value)
values(?, ?, ?, ?, ?, ?, ?, ?) RETURNING id`, paramCharacter, numbered),
InsertSQL: QueryBuilder(`INSERT INTO kine(name, created, deleted, create_revision, prev_revision, lease, value, old_value)
values(?, ?, ?, ?, ?, ?, ?, ?)`, paramCharacter, numbered),

FillSQL: q(`INSERT INTO kine(id, name, created, deleted, create_revision, prev_revision, lease, value, old_value)
FillSQL: QueryBuilder(`INSERT INTO kine(id, name, created, deleted, create_revision, prev_revision, lease, value, old_value)
values(?, ?, ?, ?, ?, ?, ?, ?, ?)`, paramCharacter, numbered),
RevSQL: revSQL,
CompactRevSQL: compactRevSQL,
}, err
}

Expand Down Expand Up @@ -246,7 +250,7 @@ func (d *Generic) execute(ctx context.Context, sql string, args ...interface{})

func (d *Generic) GetCompactRevision(ctx context.Context) (int64, error) {
var id int64
row := d.queryRow(ctx, compactRevSQL)
row := d.queryRow(ctx, d.CompactRevSQL)
err := row.Scan(&id)
if err == sql.ErrNoRows {
return 0, nil
Expand All @@ -271,7 +275,7 @@ func (d *Generic) DeleteRevision(ctx context.Context, revision int64) error {
func (d *Generic) ListCurrent(ctx context.Context, prefix string, limit int64, includeDeleted bool) (*sql.Rows, error) {
sql := d.GetCurrentSQL
if limit > 0 {
sql = fmt.Sprintf("%s LIMIT %d", sql, limit)
sql = d.applyLimit(sql, limit)
}
return d.query(ctx, sql, prefix, includeDeleted)
}
Expand All @@ -280,14 +284,14 @@ func (d *Generic) List(ctx context.Context, prefix, startKey string, limit, revi
if startKey == "" {
sql := d.ListRevisionStartSQL
if limit > 0 {
sql = fmt.Sprintf("%s LIMIT %d", sql, limit)
sql = d.applyLimit(sql, limit)
}
return d.query(ctx, sql, prefix, revision, includeDeleted)
}

sql := d.GetRevisionAfterSQL
if limit > 0 {
sql = fmt.Sprintf("%s LIMIT %d", sql, limit)
sql = d.applyLimit(sql, limit)
}
return d.query(ctx, sql, prefix, revision, startKey, revision, includeDeleted)
}
Expand All @@ -305,7 +309,7 @@ func (d *Generic) Count(ctx context.Context, prefix string) (int64, int64, error

func (d *Generic) CurrentRevision(ctx context.Context) (int64, error) {
var id int64
row := d.queryRow(ctx, revSQL)
row := d.queryRow(ctx, d.RevSQL)
err := row.Scan(&id)
if err == sql.ErrNoRows {
return 0, nil
Expand All @@ -316,7 +320,7 @@ func (d *Generic) CurrentRevision(ctx context.Context) (int64, error) {
func (d *Generic) After(ctx context.Context, prefix string, rev, limit int64) (*sql.Rows, error) {
sql := d.AfterSQL
if limit > 0 {
sql = fmt.Sprintf("%s LIMIT %d", sql, limit)
sql = d.applyLimit(sql, limit)
}
return d.query(ctx, sql, prefix, rev)
}
Expand Down Expand Up @@ -360,3 +364,14 @@ func (d *Generic) Insert(ctx context.Context, key string, create, delete bool, c
err = row.Scan(&id)
return id, err
}

func (d Generic) applyLimit(sql string, limit int64) string {
brandond marked this conversation as resolved.
Show resolved Hide resolved
if d.DriverName != "sqlserver" {
sql = fmt.Sprintf("%s LIMIT %d", sql, limit)
} else {
limitRewrite := fmt.Sprintf("SELECT TOP %d ", limit)
strings.Replace(sql, "SELECT", limitRewrite, 1)
}

return sql
}
Loading