unistack-org/micro
4
0
Fork 2
Code Issues 18 Pull Requests Actions Packages Projects Releases 324 Wiki Activity

initial hasql support #407

Merged
vtolstov merged 8 commits from hasql into v4 2025-09-20 22:57:40 +03:00
Conversation 9 Commits 8 Files Changed 10 +82 -44
1 changed files with 82 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e053eeac74 - Show all commits

90
hooks/sql/cluster.go
View File

@@ -84,6 +84,14 @@ func NewCluster[T Querier](opts ...ClusterOption) (ClusterQuerier, error) {
return nil, ErrClusterPicker return nil, ErrClusterPicker
} }
if options.Retries < 1 {
options.Retries = 1
}
if options.NodeStateCriterion == 0 {
options.NodeStateCriterion = hasql.Primary
}
options.Options = append(options.Options, hasql.WithNodePicker(options.NodePicker)) options.Options = append(options.Options, hasql.WithNodePicker(options.NodePicker))
if p, ok := options.NodePicker.(*CustomPicker[Querier]); ok { if p, ok := options.NodePicker.(*CustomPicker[Querier]); ok {
p.opts.Priority = options.NodePriority p.opts.Priority = options.NodePriority
@@ -111,18 +119,11 @@ func NodeStateCriterion(ctx context.Context, c hasql.NodeStateCriterion) context
return context.WithValue(ctx, nodeStateCriterionKey{}, c) return context.WithValue(ctx, nodeStateCriterionKey{}, c)
} }
func getNodeStateCriterion(ctx context.Context) hasql.NodeStateCriterion {
if v, ok := ctx.Value(nodeStateCriterionKey{}).(hasql.NodeStateCriterion); ok {
return v
}
return hasql.PreferPrimary
}
// CustomPickerOptions holds options to pick nodes // CustomPickerOptions holds options to pick nodes
type CustomPickerOptions struct { type CustomPickerOptions struct {
MaxLag int MaxLag int
Priority map[string]int32 Priority map[string]int32
RetryOnError bool Retries int
} }
// CustomPickerOption func apply option to CustomPickerOptions // CustomPickerOption func apply option to CustomPickerOptions
@@ -233,8 +234,9 @@ type ClusterOptions struct {
NodeDiscoverer hasql.NodeDiscoverer[Querier] NodeDiscoverer hasql.NodeDiscoverer[Querier]
Options []hasql.ClusterOpt[Querier] Options []hasql.ClusterOpt[Querier]
Context context.Context Context context.Context
RetryOnError bool Retries int
NodePriority map[string]int32 NodePriority map[string]int32
NodeStateCriterion hasql.NodeStateCriterion
} }
// ClusterOption apply cluster options to ClusterOptions // ClusterOption apply cluster options to ClusterOptions
@@ -261,10 +263,10 @@ func WithClusterNodeDiscoverer(d hasql.NodeDiscoverer[Querier]) ClusterOption {
} }
} }
// WithRetryOnError retry on other nodes on error // WithRetries retry count on other nodes in case of error
func WithRetryOnError(b bool) ClusterOption { func WithRetries(n int) ClusterOption {
return func(o *ClusterOptions) { return func(o *ClusterOptions) {
o.RetryOnError = b o.Retries = n
} }
} }
@@ -282,6 +284,13 @@ func WithClusterOptions(opts ...hasql.ClusterOpt[Querier]) ClusterOption {
} }
} }
// WithClusterNodeStateCriterion pass default hasql.NodeStateCriterion
func WithClusterNodeStateCriterion(c hasql.NodeStateCriterion) ClusterOption {
return func(o *ClusterOptions) {
o.NodeStateCriterion = c
}
}
type ClusterNode struct { type ClusterNode struct {
Name string Name string
DB Querier DB Querier
@@ -310,10 +319,13 @@ func (c *Cluster) BeginTx(ctx context.Context, opts *sql.TxOptions) (*sql.Tx, er
var tx *sql.Tx var tx *sql.Tx
var err error var err error
c.hasql.NodesIter(getNodeStateCriterion(ctx))(func(n *hasql.Node[Querier]) bool { retries := 0
if tx, err = n.DB().BeginTx(ctx, opts); err != nil && !c.options.RetryOnError { c.hasql.NodesIter(c.getNodeStateCriterion(ctx))(func(n *hasql.Node[Querier]) bool {
for ; retries < c.options.Retries; retries++ {
if tx, err = n.DB().BeginTx(ctx, opts); err != nil && retries >= c.options.Retries {
return true return true
} }
}
return false return false
}) })
@@ -332,10 +344,13 @@ func (c *Cluster) Conn(ctx context.Context) (*sql.Conn, error) {
var conn *sql.Conn var conn *sql.Conn
var err error var err error
c.hasql.NodesIter(getNodeStateCriterion(ctx))(func(n *hasql.Node[Querier]) bool { retries := 0
if conn, err = n.DB().Conn(ctx); err != nil && !c.options.RetryOnError { c.hasql.NodesIter(c.getNodeStateCriterion(ctx))(func(n *hasql.Node[Querier]) bool {
for ; retries < c.options.Retries; retries++ {
if conn, err = n.DB().Conn(ctx); err != nil && retries >= c.options.Retries {
return true return true
} }
}
return false return false
}) })
@@ -350,10 +365,13 @@ func (c *Cluster) ExecContext(ctx context.Context, query string, args ...interfa
var res sql.Result var res sql.Result
var err error var err error
c.hasql.NodesIter(getNodeStateCriterion(ctx))(func(n *hasql.Node[Querier]) bool { retries := 0
if res, err = n.DB().ExecContext(ctx, query, args...); err != nil && !c.options.RetryOnError { c.hasql.NodesIter(c.getNodeStateCriterion(ctx))(func(n *hasql.Node[Querier]) bool {
for ; retries < c.options.Retries; retries++ {
if res, err = n.DB().ExecContext(ctx, query, args...); err != nil && retries >= c.options.Retries {
return true return true
} }
}
return false return false
}) })
@@ -368,10 +386,13 @@ func (c *Cluster) PrepareContext(ctx context.Context, query string) (*sql.Stmt,
var res *sql.Stmt var res *sql.Stmt
var err error var err error
c.hasql.NodesIter(getNodeStateCriterion(ctx))(func(n *hasql.Node[Querier]) bool { retries := 0
if res, err = n.DB().PrepareContext(ctx, query); err != nil && !c.options.RetryOnError { c.hasql.NodesIter(c.getNodeStateCriterion(ctx))(func(n *hasql.Node[Querier]) bool {
for ; retries < c.options.Retries; retries++ {
if res, err = n.DB().PrepareContext(ctx, query); err != nil && retries >= c.options.Retries {
return true return true
} }
}
return false return false
}) })
@@ -386,10 +407,13 @@ func (c *Cluster) QueryContext(ctx context.Context, query string, args ...interf
var res *sql.Rows var res *sql.Rows
var err error var err error
c.hasql.NodesIter(getNodeStateCriterion(ctx))(func(n *hasql.Node[Querier]) bool { retries := 0
if res, err = n.DB().QueryContext(ctx, query); err != nil && err != sql.ErrNoRows && !c.options.RetryOnError { c.hasql.NodesIter(c.getNodeStateCriterion(ctx))(func(n *hasql.Node[Querier]) bool {
for ; retries < c.options.Retries; retries++ {
if res, err = n.DB().QueryContext(ctx, query); err != nil && err != sql.ErrNoRows && retries >= c.options.Retries {
return true return true
} }
}
return false return false
}) })
@@ -402,13 +426,17 @@ func (c *Cluster) QueryContext(ctx context.Context, query string, args ...interf
func (c *Cluster) QueryRowContext(ctx context.Context, query string, args ...interface{}) *sql.Row { func (c *Cluster) QueryRowContext(ctx context.Context, query string, args ...interface{}) *sql.Row {
var res *sql.Row var res *sql.Row
c.hasql.NodesIter(getNodeStateCriterion(ctx))(func(n *hasql.Node[Querier]) bool {
retries := 0
c.hasql.NodesIter(c.getNodeStateCriterion(ctx))(func(n *hasql.Node[Querier]) bool {
for ; retries < c.options.Retries; retries++ {
res = n.DB().QueryRowContext(ctx, query, args...) res = n.DB().QueryRowContext(ctx, query, args...)
if res.Err() == nil { if res.Err() == nil {
return false return false
} else if res.Err() != nil && !c.options.RetryOnError { } else if res.Err() != nil && retries >= c.options.Retries {
return false return false
} }
}
return true return true
}) })
@@ -423,11 +451,14 @@ func (c *Cluster) PingContext(ctx context.Context) error {
var err error var err error
var ok bool var ok bool
c.hasql.NodesIter(getNodeStateCriterion(ctx))(func(n *hasql.Node[Querier]) bool { retries := 0
c.hasql.NodesIter(c.getNodeStateCriterion(ctx))(func(n *hasql.Node[Querier]) bool {
ok = true ok = true
if err = n.DB().PingContext(ctx); err != nil && !c.options.RetryOnError { for ; retries < c.options.Retries; retries++ {
if err = n.DB().PingContext(ctx); err != nil && retries >= c.options.Retries {
return true return true
} }
}
return false return false
}) })
@@ -491,3 +522,10 @@ func (c *Cluster) Stats() sql.DBStats {
}) })
return s return s
} }
func (c *Cluster) getNodeStateCriterion(ctx context.Context) hasql.NodeStateCriterion {
if v, ok := ctx.Value(nodeStateCriterionKey{}).(hasql.NodeStateCriterion); ok {
return v
}
return c.options.NodeStateCriterion
}