Skip to content

修改为使用SqlBasedStorage #4

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

Merged
merged 1 commit into from
Sep 3, 2023
Merged

修改为使用SqlBasedStorage #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions errors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package postgresql_storage

import "errors"

var (
ErrQueryPostgresqlServerTime = errors.New("query postgresql server time failed")
)
7 changes: 4 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,20 @@ go 1.19

require (
github.com/lib/pq v1.10.9
github.com/storage-lock/go-sql-based-storage v0.0.0-20230815152553-e6057f9c32e7
github.com/storage-lock/go-sql-based-storage v0.0.0-20230903155403-1c8c724d3383
github.com/storage-lock/go-storage v0.0.2
github.com/storage-lock/go-storage-test-helper v0.0.2
github.com/storage-lock/go-storage-test-helper v0.0.3
github.com/stretchr/testify v1.8.4
)

require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/golang-infrastructure/go-goroutine-id v0.0.0-20230331174358-98b48a64077b // indirect
github.com/golang-infrastructure/go-if-expression v0.0.3 // indirect
github.com/golang-infrastructure/go-iterator v0.0.0-20230524171120-56988a9b127c // indirect
github.com/golang-infrastructure/go-pointer v0.0.5 // indirect
github.com/golang-infrastructure/go-reflect-utils v0.0.0-20221130143747-965ef2eb09c3 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/google/uuid v1.3.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/storage-lock/go-events v0.0.3 // indirect
github.com/storage-lock/go-storage-events v0.0.5 // indirect
Expand Down
12 changes: 8 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,16 @@ 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/golang-infrastructure/go-goroutine-id v0.0.0-20230331174358-98b48a64077b h1:kt3zNiijgkfPm47YaL4MaQJkw0T7ukEEttnCQMOcWxo=
github.com/golang-infrastructure/go-goroutine-id v0.0.0-20230331174358-98b48a64077b/go.mod h1:1L+eneS0HXUlZP0tmESGhlmpJ3hl063JGz6UQaJCmY0=
github.com/golang-infrastructure/go-if-expression v0.0.3 h1:Ic6L/s250nwtQz8CtTFpkWopCwsWmxQErSRkrBqBVj4=
github.com/golang-infrastructure/go-if-expression v0.0.3/go.mod h1:U4ZtU29/RtZ/cM0tAdBzFaFxENFShSFj+jCRFRE/cv4=
github.com/golang-infrastructure/go-iterator v0.0.0-20230524171120-56988a9b127c h1:h4321AFRVv5rTKcColUjE5pa+Y1exG1e6aEXn43L/Eg=
github.com/golang-infrastructure/go-iterator v0.0.0-20230524171120-56988a9b127c/go.mod h1:Guf14ZZ7f7qiE0YpZbUkICcm7LWc3nrn3/gDObT//WI=
github.com/golang-infrastructure/go-pointer v0.0.5 h1:wzZ/XnXKzD3DWECTnUpUh+xAlGSWqfn/pQyusPNsqrQ=
github.com/golang-infrastructure/go-pointer v0.0.5/go.mod h1:SBP0/8QH+mr8LGP/tDo28EQ2b45WqfzjXYbPjmK88g8=
github.com/golang-infrastructure/go-reflect-utils v0.0.0-20221130143747-965ef2eb09c3 h1:jJ7AdpNdLQudsx1hiXY9iwmauHARV4/UB52KnBh9Se0=
github.com/golang-infrastructure/go-reflect-utils v0.0.0-20221130143747-965ef2eb09c3/go.mod h1:zqXYxqOBa1mL2ilBK6PuH/Wb/Iego7en6XhiKWdZQHI=
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/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=
github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
Expand All @@ -21,14 +23,16 @@ github.com/storage-lock/go-events v0.0.3 h1:QuNbaREe5m1WYC0meKs7SRJ5lY11a18jCJJS
github.com/storage-lock/go-events v0.0.3/go.mod h1:DKwPgfuq8T8CyPLipH+0XHsNt8hEN4g9krUGfosU2oY=
github.com/storage-lock/go-sql-based-storage v0.0.0-20230815152553-e6057f9c32e7 h1:WbtCSU+1NC4eO0QwehH4aQNLGBm9SUyvo39aMEYLFjE=
github.com/storage-lock/go-sql-based-storage v0.0.0-20230815152553-e6057f9c32e7/go.mod h1:kKR7bTZ59cP7jK0tFhQ4yz2hD2XAL8A97Haql9NAygI=
github.com/storage-lock/go-sql-based-storage v0.0.0-20230903155403-1c8c724d3383 h1:fw1cz2FM9h6Y7XmfEP8xgA8AmxpGFZVXcBi0iKa+O8Y=
github.com/storage-lock/go-sql-based-storage v0.0.0-20230903155403-1c8c724d3383/go.mod h1:4ixNpjEQ9Aj4E9GExfopf3vw14oqXRSuFSduq7QRgF4=
github.com/storage-lock/go-storage v0.0.2 h1:N5glUlrr1bbJ8ixYsPmOv+TuhIOObX/65+hrNMPWFDc=
github.com/storage-lock/go-storage v0.0.2/go.mod h1:4vuU2nLdbmzj2UIBKpwB5lj8RI+GnPDZ4YHZ7QAcFHE=
github.com/storage-lock/go-storage-events v0.0.5 h1:qUgB/VZIQNM0PIos67T9D1JIqu3Yiu3+YDpuHEal3FI=
github.com/storage-lock/go-storage-events v0.0.5/go.mod h1:aBMVsOSr61+BLxO3QnU5FwKd5bdMGE4IpV0oDrAg8uQ=
github.com/storage-lock/go-storage-lock v0.0.3 h1:eobL73fhfAjLKNk4msQNTYFcilrPKwySXY/5ympfeRU=
github.com/storage-lock/go-storage-lock v0.0.3/go.mod h1:kzyjFhgPmiYMwLuuVoQfYxXPUOIGNETA+Z/wDnRc/iw=
github.com/storage-lock/go-storage-test-helper v0.0.2 h1:6uipDmyxhncEJJSVwPiydKJrGVLoFARwbnkarDfhWSY=
github.com/storage-lock/go-storage-test-helper v0.0.2/go.mod h1:JrQptW0yJZVqDsObE9vWSoyZxhQHdQDM8/eh4vz7Tls=
github.com/storage-lock/go-storage-test-helper v0.0.3 h1:y8B24zJkQaI7uYOW2MTBIHTZXbRpkEG6rS1XMWAttjs=
github.com/storage-lock/go-storage-test-helper v0.0.3/go.mod h1:Zn6YIq0r0pmK+naGUhRhb7TqTEFDjoU+25yIugt9iAw=
github.com/storage-lock/go-utils v0.0.2 h1:pdacTOlD+AHqwWVmDqZLcjKF+7p8TjsmlvZ9bmmkIfE=
github.com/storage-lock/go-utils v0.0.2/go.mod h1:tx8ATHL7yOC0Nyjpba7hJNk0+QNt2XEnMr8NcGm9Gak=
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
Expand Down
2 changes: 2 additions & 0 deletions postgresql_connection_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ import (
"github.com/storage-lock/go-storage"
)

// DefaultPostgresqlStorageSchema 默认的schema
const DefaultPostgresqlStorageSchema = "public"

// PostgresqlConnectionManager Postgresql的连接管理器
type PostgresqlConnectionManager struct {

// 主机的名字
Expand Down
22 changes: 21 additions & 1 deletion postgresql_sql_provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

// PostgresqlSqlProvider storage sql的postgresql方言
type PostgresqlSqlProvider struct {
*sql_based_storage.Sql97Provider
*sql_based_storage.Sql92Provider
}

var _ sql_based_storage.SqlProvider = &PostgresqlSqlProvider{}
Expand Down Expand Up @@ -41,3 +41,23 @@ func (x *PostgresqlSqlProvider) UpdateWithVersionSql(ctx context.Context, tableF
insertSql := fmt.Sprintf("UPDATE %s SET version = $1, lock_information_json_string = $2 WHERE lock_id = $3 AND owner_id = $4 AND version = $5", tableFullName)
return insertSql, []any{newVersion, lockInformation.ToJsonString(), lockId, lockInformation.OwnerId, exceptedVersion}
}

func (x *PostgresqlSqlProvider) CreateTableSql(ctx context.Context, tableFullName string) (string, []any) {
createTableSql := `CREATE TABLE IF NOT EXISTS %s (
lock_id VARCHAR(255) NOT NULL PRIMARY KEY,
owner_id VARCHAR(255) NOT NULL,
version BIGINT NOT NULL,
lock_information_json_string VARCHAR(255) NOT NULL
)`
return fmt.Sprintf(createTableSql, tableFullName), nil
}

func (x *PostgresqlSqlProvider) FindLockInformationJsonStringByIdSql(ctx context.Context, tableFullName string, lockId string) (string, []any) {
getLockSql := fmt.Sprintf("SELECT lock_information_json_string FROM %s WHERE lock_id = $1", tableFullName)
return getLockSql, []any{lockId}
}

func (x *PostgresqlSqlProvider) ListLockInformationJsonStringSql(ctx context.Context, tableFullName string) (string, []any) {
sql := fmt.Sprintf("SELECT lock_information_json_string FROM %s", tableFullName)
return sql, nil
}
3 changes: 1 addition & 2 deletions postgresql_storage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package postgresql_storage

import (
"context"
"errors"
"fmt"
_ "github.com/lib/pq"
sql_based_storage "github.com/storage-lock/go-sql-based-storage"
Expand Down Expand Up @@ -116,7 +115,7 @@ func (x *PostgresqlStorage) GetTime(ctx context.Context) (time.Time, error) {
_ = rs.Close()
}()
if !rs.Next() {
return zero, errors.New("query postgresql server time failed")
return zero, ErrQueryPostgresqlServerTime
}
var databaseTime time.Time
err = rs.Scan(&databaseTime)
Expand Down
2 changes: 2 additions & 0 deletions postgresql_storage_options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ type PostgresqlStorageOptions struct {
ConnectionManager storage.ConnectionManager[*sql.DB]
}

// NewPostgresqlStorageOptions 创建一个Storage选项
func NewPostgresqlStorageOptions() *PostgresqlStorageOptions {
return &PostgresqlStorageOptions{
Schema: DefaultPostgresqlStorageSchema,
Expand Down Expand Up @@ -61,6 +62,7 @@ func (x *PostgresqlStorageOptions) SetConnectionManager(connectionManager storag

func (x *PostgresqlStorageOptions) Check() error {

// TODO 参数为空的时候是设置值还是返回错误比较合适呢？
if x.Schema == "" {
x.Schema = DefaultPostgresqlStorageSchema
}
Expand Down
6 changes: 1 addition & 5 deletions postgresql_storage_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package postgresql_storage

import (
"context"
"github.com/storage-lock/go-storage"
storage_test_helper "github.com/storage-lock/go-storage-test-helper"
"github.com/stretchr/testify/assert"
"os"
Expand All @@ -15,10 +14,7 @@ func TestNewPostgresqlStorage(t *testing.T) {
dsn := os.Getenv(envName)
assert.NotEmpty(t, dsn)
connectionGetter := NewPostgresqlConnectionGetterFromDSN(dsn)
s, err := NewPostgresqlStorage(context.Background(), &PostgresqlStorageOptions{
ConnectionManager: connectionGetter,
TableName: storage.DefaultStorageTableName,
})
s, err := NewPostgresqlStorage(context.Background(), NewPostgresqlStorageOptions().SetConnectionManager(connectionGetter))
assert.Nil(t, err)
storage_test_helper.TestStorage(t, s)
}
1 change: 1 addition & 0 deletions scripts/postgresql.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ docker rm -f storage-lock-postgres
# 启动测试使用的Postgresql数据库
docker run -d --name storage-lock-postgres -p 5432:5432 -e POSTGRES_PASSWORD=UeGqAm8CxYGldMDLoNNt postgres:14

# 设置环境变量
export STORAGE_LOCK_POSTGRESQL_DSN="host=127.0.0.1 user=postgres password=UeGqAm8CxYGldMDLoNNt port=5432 dbname=postgres sslmode=disable"