Thanks to visit codestin.com
Credit goes to github.com

Skip to content

refactor: isolate filter with appid #233

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
dk-lockdown merged 1 commit into from
Aug 9, 2022
Merged

refactor: isolate filter with appid #233

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
2 changes: 1 addition & 1 deletion cmd/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ var (
if err != nil {
log.Fatal(errors.Wrapf(err, "failed to create filter: %s", filterConf.Name))
}
filter.RegisterFilter(filterConf.Name, f)
filter.RegisterFilter(appid, filterConf.Name, f)
}

resource.RegisterDBManager(appid, dbpackConf.DataSources, func(dbName, dsn string) pools.Factory {
Expand Down
2 changes: 1 addition & 1 deletion pkg/executor/read_write_splitting.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ func NewReadWriteSplittingExecutor(conf *config.Executor) (proto.Executor, error

for i := 0; i < len(conf.Filters); i++ {
filterName := conf.Filters[i]
f := filter.GetFilter(filterName)
f := filter.GetFilter(conf.AppID, filterName)
if f != nil {
preFilter, ok := f.(proto.DBPreFilter)
if ok {
Expand Down
2 changes: 1 addition & 1 deletion pkg/executor/sharding.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ func NewShardingExecutor(conf *config.Executor) (proto.Executor, error) {

for i := 0; i < len(conf.Filters); i++ {
filterName := conf.Filters[i]
f := filter.GetFilter(filterName)
f := filter.GetFilter(conf.AppID, filterName)
if f != nil {
preFilter, ok := f.(proto.DBPreFilter)
if ok {
Expand Down
2 changes: 1 addition & 1 deletion pkg/executor/single_db.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ func NewSingleDBExecutor(conf *config.Executor) (proto.Executor, error) {

for i := 0; i < len(conf.Filters); i++ {
filterName := conf.Filters[i]
f := filter.GetFilter(filterName)
f := filter.GetFilter(conf.AppID, filterName)
if f != nil {
preFilter, ok := f.(proto.DBPreFilter)
if ok {
Expand Down
16 changes: 11 additions & 5 deletions pkg/filter/filters.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,11 @@

package filter

import "github.com/cectc/dbpack/pkg/proto"
import (
"strings"

"github.com/cectc/dbpack/pkg/proto"
)

var (
filterFactories = make(map[string]proto.FilterFactory)
Expand All @@ -31,10 +35,12 @@ func GetFilterFactory(kind string) proto.FilterFactory {
return filterFactories[kind]
}

func RegisterFilter(name string, filter proto.Filter) {
filters[name] = filter
func RegisterFilter(appid, name string, filter proto.Filter) {
key := strings.Join([]string{appid, name}, "-")
filters[key] = filter
}

func GetFilter(name string) proto.Filter {
return filters[name]
func GetFilter(appid, name string) proto.Filter {
key := strings.Join([]string{appid, name}, "-")
return filters[key]
}
2 changes: 1 addition & 1 deletion pkg/listener/http.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ func NewHttpListener(conf *config.Listener) (proto.Listener, error) {

for i := 0; i < len(conf.Filters); i++ {
filterName := conf.Filters[i]
f := filter.GetFilter(filterName)
f := filter.GetFilter(conf.AppID, filterName)
if f != nil {
preFilter, ok := f.(proto.HttpPreFilter)
if ok {
Expand Down
2 changes: 1 addition & 1 deletion pkg/resource/data_source.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ func RegisterDBManager(appid string, dataSources []*config.DataSource, factory f
db := sql.NewDB(dataSource.Name, dataSource.PingInterval, dataSource.PingTimesForChangeStatus, resourcePool)
for j := 0; j < len(dataSource.Filters); j++ {
filterName := dataSource.Filters[j]
f := filter.GetFilter(filterName)
f := filter.GetFilter(appid, filterName)
if f != nil {
preFilter, ok := f.(proto.DBConnectionPreFilter)
if ok {
Expand Down