Skip to content

Commit 9b3f033

Browse files
CC11001100CC11001100
committed
refactor
1 parent ecd25f7 commit 9b3f033

File tree

8 files changed

+28
-16
lines changed

8 files changed

+28
-16
lines changed

‎examples/create_mariadb_storage_from_dsn/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ func main() {
1010

1111
// 使用一个DSN形式的数据库连接字符串创建ConnectionManager
1212
testDsn := "root:UeGqAm8CxYGldMDLoNNt@tcp(127.0.0.1:3306)/storage_lock_test"
13-
connectionManager := mariadb_storage.NewMariaDBConnectionManagerFromDsn(testDsn)
13+
connectionManager := mariadb_storage.NewMariadbConnectionManagerFromDsn(testDsn)
1414

1515
// 然后从这个ConnectionManager创建MariadbStorage
16-
options := mariadb_storage.NewMariaStorageOptions().SetConnectionManager(connectionManager)
16+
options := mariadb_storage.NewMariadbStorageOptions().SetConnectionManager(connectionManager)
1717
storage, err := mariadb_storage.NewMariadbStorage(context.Background(), options)
1818
if err != nil {
1919
panic(err)

‎examples/create_mariadb_storage_from_service_properties/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ func main() {
1414
username := "root"
1515
passwd := "UeGqAm8CxYGldMDLoNNt"
1616
database := "storage_lock_test"
17-
connectionManager := mariadb_storage.NewMariaDBConnectionManager(host, port, username, passwd, database)
17+
connectionManager := mariadb_storage.NewMariadbConnectionManager(host, port, username, passwd, database)
1818

1919
// 然后从这个连接管理器创建MariadbStorage
20-
options := mariadb_storage.NewMariaStorageOptions().SetConnectionManager(connectionManager)
20+
options := mariadb_storage.NewMariadbStorageOptions().SetConnectionManager(connectionManager)
2121
storage, err := mariadb_storage.NewMariadbStorage(context.Background(), options)
2222
if err != nil {
2323
panic(err)

‎examples/create_mariadb_storage_from_sqldb/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ func main() {
1919

2020
// 则可以从这个*sql.DB中创建一个MariadbStorage
2121
connectionManager := storage.NewFixedSqlDBConnectionManager(db)
22-
options := mariadb_storage.NewMariaStorageOptions().SetConnectionManager(connectionManager)
22+
options := mariadb_storage.NewMariadbStorageOptions().SetConnectionManager(connectionManager)
2323
storage, err := mariadb_storage.NewMariadbStorage(context.Background(), options)
2424
if err != nil {
2525
panic(err)

‎go.mod

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@ require (
77
github.com/golang-infrastructure/go-iterator v0.0.0-20230524171120-56988a9b127c
88
github.com/storage-lock/go-mysql-storage v0.0.3-0.20230912011331-93f8153bb8b7
99
github.com/storage-lock/go-storage v0.0.2
10-
github.com/storage-lock/go-storage-test-helper v0.0.2
10+
github.com/storage-lock/go-storage-test-helper v0.0.3
1111
github.com/stretchr/testify v1.8.4
1212
)
1313

1414
require (
1515
github.com/davecgh/go-spew v1.1.1 // indirect
1616
github.com/golang-infrastructure/go-goroutine-id v0.0.0-20230917075314-f1af231c0b06 // indirect
17+
github.com/golang-infrastructure/go-if-expression v0.0.3 // indirect
1718
github.com/golang-infrastructure/go-pointer v0.0.5 // indirect
1819
github.com/golang-infrastructure/go-reflect-utils v0.0.0-20221130143747-965ef2eb09c3 // indirect
1920
github.com/google/uuid v1.3.1 // indirect

‎go.sum

+4
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ github.com/golang-infrastructure/go-goroutine-id v0.0.0-20230331174358-98b48a640
66
github.com/golang-infrastructure/go-goroutine-id v0.0.0-20230331174358-98b48a64077b/go.mod h1:1L+eneS0HXUlZP0tmESGhlmpJ3hl063JGz6UQaJCmY0=
77
github.com/golang-infrastructure/go-goroutine-id v0.0.0-20230917075314-f1af231c0b06 h1:A28MrYe3pSClGhMVyTQF6wd3h3Tt/U31nddoK60+HZQ=
88
github.com/golang-infrastructure/go-goroutine-id v0.0.0-20230917075314-f1af231c0b06/go.mod h1:1L+eneS0HXUlZP0tmESGhlmpJ3hl063JGz6UQaJCmY0=
9+
github.com/golang-infrastructure/go-if-expression v0.0.3 h1:Ic6L/s250nwtQz8CtTFpkWopCwsWmxQErSRkrBqBVj4=
10+
github.com/golang-infrastructure/go-if-expression v0.0.3/go.mod h1:U4ZtU29/RtZ/cM0tAdBzFaFxENFShSFj+jCRFRE/cv4=
911
github.com/golang-infrastructure/go-iterator v0.0.0-20230524171120-56988a9b127c h1:h4321AFRVv5rTKcColUjE5pa+Y1exG1e6aEXn43L/Eg=
1012
github.com/golang-infrastructure/go-iterator v0.0.0-20230524171120-56988a9b127c/go.mod h1:Guf14ZZ7f7qiE0YpZbUkICcm7LWc3nrn3/gDObT//WI=
1113
github.com/golang-infrastructure/go-pointer v0.0.5 h1:wzZ/XnXKzD3DWECTnUpUh+xAlGSWqfn/pQyusPNsqrQ=
@@ -45,6 +47,8 @@ github.com/storage-lock/go-storage-lock v0.0.5 h1:fFCePBP635+pqnhq1QW3FTvDMkqDTB
4547
github.com/storage-lock/go-storage-lock v0.0.5/go.mod h1:8u6BrTf+H/EwheP7i2bGGUcxjVnDvGbIj6bUUdYsBx8=
4648
github.com/storage-lock/go-storage-test-helper v0.0.2 h1:6uipDmyxhncEJJSVwPiydKJrGVLoFARwbnkarDfhWSY=
4749
github.com/storage-lock/go-storage-test-helper v0.0.2/go.mod h1:JrQptW0yJZVqDsObE9vWSoyZxhQHdQDM8/eh4vz7Tls=
50+
github.com/storage-lock/go-storage-test-helper v0.0.3 h1:y8B24zJkQaI7uYOW2MTBIHTZXbRpkEG6rS1XMWAttjs=
51+
github.com/storage-lock/go-storage-test-helper v0.0.3/go.mod h1:Zn6YIq0r0pmK+naGUhRhb7TqTEFDjoU+25yIugt9iAw=
4852
github.com/storage-lock/go-utils v0.0.2 h1:pdacTOlD+AHqwWVmDqZLcjKF+7p8TjsmlvZ9bmmkIfE=
4953
github.com/storage-lock/go-utils v0.0.2/go.mod h1:tx8ATHL7yOC0Nyjpba7hJNk0+QNt2XEnMr8NcGm9Gak=
5054
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=

‎mariadb_connection_manager.go

+14-7
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,24 @@ type MariadbConnectionManager struct {
1515

1616
var _ storage.ConnectionManager[*sql.DB] = &MariadbConnectionManager{}
1717

18-
// NewMariaDBConnectionManagerFromDsn 从DSN创建MariaDB连接管理器
19-
func NewMariaDBConnectionManagerFromDsn(dsn string) *MariadbConnectionManager {
18+
// NewMariadbConnectionManager 从连接属性创建数据库连接
19+
func NewMariadbConnectionManager(host string, port uint, user, passwd, database string) *MariadbConnectionManager {
20+
return &MariadbConnectionManager{
21+
MysqlConnectionManager: mysql_storage.NewMysqlConnectionManager(host, port, user, passwd, database),
22+
}
23+
}
24+
25+
// NewMariadbConnectionManagerFromDsn 从DSN创建MariaDB连接管理器
26+
func NewMariadbConnectionManagerFromDsn(dsn string) *MariadbConnectionManager {
2027
return &MariadbConnectionManager{
2128
MysqlConnectionManager: mysql_storage.NewMysqlConnectionManagerFromDsn(dsn),
2229
}
2330
}
2431

25-
// NewMariaDBConnectionManager 从连接属性创建数据库连接
26-
func NewMariaDBConnectionManager(host string, port uint, user, passwd, database string) *MariadbConnectionManager {
32+
// NewMariadbConnectionManagerFromSqlDb 从*sql.DB创建MariaDB连接管理器
33+
func NewMariadbConnectionManagerFromSqlDb(db *sql.DB) *MariadbConnectionManager {
2734
return &MariadbConnectionManager{
28-
MysqlConnectionManager: mysql_storage.NewMysqlConnectionManager(host, port, user, passwd, database),
35+
MysqlConnectionManager: mysql_storage.NewMysqlConnectionManagerFromSqlDb(db),
2936
}
3037
}
3138

@@ -54,10 +61,10 @@ func (x *MariadbConnectionManager) SetDatabaseName(databaseName string) *Mariadb
5461
return x
5562
}
5663

57-
const MariaDBConnectionManagerName = "mariadb-connection-manager"
64+
const MariadbConnectionManagerName = "mariadb-connection-manager"
5865

5966
func (x *MariadbConnectionManager) Name() string {
60-
return MariaDBConnectionManagerName
67+
return MariadbConnectionManagerName
6168
}
6269

6370
// Take 获取到数据库的连接

‎mariadb_options.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ type MariadbStorageOptions struct {
1111
*mysql_storage.MysqlStorageOptions
1212
}
1313

14-
func NewMariaStorageOptions() *MariadbStorageOptions {
14+
func NewMariadbStorageOptions() *MariadbStorageOptions {
1515
return &MariadbStorageOptions{
1616
MysqlStorageOptions: mysql_storage.NewMySQLStorageOptions(),
1717
}

‎mariadb_storage_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ import (
88
"testing"
99
)
1010

11-
func TestNewMariaDbStorage(t *testing.T) {
11+
func TestNewMariadbStorage(t *testing.T) {
1212
envName := "STORAGE_LOCK_MARIA_DSN"
1313
dsn := os.Getenv(envName)
1414
assert.NotEmpty(t, dsn)
15-
options := NewMariaStorageOptions().SetConnectionManager(NewMariaDBConnectionManagerFromDsn(dsn))
15+
options := NewMariadbStorageOptions().SetConnectionManager(NewMariadbConnectionManagerFromDsn(dsn))
1616
s, err := NewMariadbStorage(context.Background(), options)
1717
assert.Nil(t, err)
1818
storage_test_helper.TestStorage(t, s)

0 commit comments

Comments
 (0)