Update config store client to support SQL database (uber#5395)

gaoshi1115 · Sep 8, 2023 · 98771a8 · 98771a8
1 parent e5f605c
commit 98771a8
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 15 deletions.
diff --git a/common/config/config.go b/common/config/config.go
@@ -30,11 +30,12 @@ import (
 	"github.com/uber-go/tally/m3"
 	"github.com/uber-go/tally/prometheus"
 
+	yarpctls "go.uber.org/yarpc/api/transport/tls"
+
 	"github.com/uber/cadence/common/dynamicconfig"
 	c "github.com/uber/cadence/common/dynamicconfig/configstore/config"
 	"github.com/uber/cadence/common/peerprovider/ringpopprovider"
 	"github.com/uber/cadence/common/service"
-	yarpctls "go.uber.org/yarpc/api/transport/tls"
 )
 
 type (

diff --git a/common/dynamicconfig/configstore/config_store_client.go b/common/dynamicconfig/configstore/config_store_client.go
@@ -38,6 +38,8 @@ import (
 	"github.com/uber/cadence/common/log/tag"
 	"github.com/uber/cadence/common/persistence"
 	"github.com/uber/cadence/common/persistence/nosql"
+	"github.com/uber/cadence/common/persistence/sql"
+	"github.com/uber/cadence/common/persistence/sql/sqlplugin"
 	"github.com/uber/cadence/common/types"
 )
 
@@ -104,14 +106,7 @@ func NewConfigStoreClient(clientCfg *csc.ClientConfig,
 	}
 
 	ds := persistenceCfg.DataStores[persistenceCfg.DefaultStore]
-	var dsConfig *config.ShardedNoSQL
-	if ds.ShardedNoSQL != nil {
-		dsConfig = ds.ShardedNoSQL
-	} else {
-		dsConfig = ds.NoSQL.ConvertToShardedNoSQLConfig()
-	}
-
-	client, err := newConfigStoreClient(clientCfg, dsConfig, logger, configType)
+	client, err := newConfigStoreClient(clientCfg, &ds, logger, configType)
 	if err != nil {
 		return nil, err
 	}
@@ -124,11 +119,26 @@ func NewConfigStoreClient(clientCfg *csc.ClientConfig,
 
 func newConfigStoreClient(
 	clientCfg *csc.ClientConfig,
-	persistenceCfg *config.ShardedNoSQL,
+	ds *config.DataStore,
 	logger log.Logger,
 	configType persistence.ConfigType,
 ) (*configStoreClient, error) {
-	store, err := nosql.NewNoSQLConfigStore(*persistenceCfg, logger, nil)
+	var store persistence.ConfigStore
+	var err error
+	switch {
+	case ds.ShardedNoSQL != nil:
+		store, err = nosql.NewNoSQLConfigStore(*ds.ShardedNoSQL, logger, nil)
+	case ds.NoSQL != nil:
+		store, err = nosql.NewNoSQLConfigStore(*ds.NoSQL.ConvertToShardedNoSQLConfig(), logger, nil)
+	case ds.SQL != nil:
+		var db sqlplugin.DB
+		db, err = sql.NewSQLDB(ds.SQL)
+		if err != nil {
+			return nil, err
+		}
+		store, err = sql.NewSQLConfigStore(db, logger, nil)
+	default:
+	}
 	if err != nil {
 		return nil, err
 	}

diff --git a/common/dynamicconfig/configstore/config_store_client_test.go b/common/dynamicconfig/configstore/config_store_client_test.go
@@ -313,10 +313,11 @@ func (s *configStoreClientSuite) SetupTest() {
 			FetchTimeout:        time.Second * 1,
 			UpdateTimeout:       time.Second * 1,
 		},
-
-		&config.ShardedNoSQL{
-			DefaultShard: config.NonShardedStoreName,
-			Connections:  connections,
+		&config.DataStore{
+			ShardedNoSQL: &config.ShardedNoSQL{
+				DefaultShard: config.NonShardedStoreName,
+				Connections:  connections,
+			},
 		}, log.NewNoop(), p.DynamicConfig)
 	s.Require().NoError(err)