@@ -526,12 +526,12 @@ func (f *factoryImpl) init(clusterName string, limiters map[string]quotas.Limite
526526 defaultDataStore := Datastore {ratelimit : limiters [f .config .DefaultStore ]}
527527 switch {
528528 case defaultCfg .NoSQL != nil :
529- parser := getParser ( f . logger , constants . EncodingTypeThriftRW , constants . EncodingTypeThriftRW )
529+ parser := f . getParser ( )
530530 taskSerializer := serialization .NewTaskSerializer (parser )
531531 shardedNoSQLConfig := defaultCfg .NoSQL .ConvertToShardedNoSQLConfig ()
532532 defaultDataStore .factory = nosql .NewFactory (* shardedNoSQLConfig , clusterName , f .logger , f .metricsClient , taskSerializer , parser , f .dc )
533533 case defaultCfg .ShardedNoSQL != nil :
534- parser := getParser ( f . logger , constants . EncodingTypeThriftRW , constants . EncodingTypeThriftRW )
534+ parser := f . getParser ( )
535535 taskSerializer := serialization .NewTaskSerializer (parser )
536536 defaultDataStore .factory = nosql .NewFactory (* defaultCfg .ShardedNoSQL , clusterName , f .logger , f .metricsClient , taskSerializer , parser , f .dc )
537537 case defaultCfg .SQL != nil :
@@ -543,16 +543,7 @@ func (f *factoryImpl) init(clusterName string, limiters map[string]quotas.Limite
543543 string (constants .EncodingTypeThriftRW ),
544544 }
545545 }
546- var decodingTypes []constants.EncodingType
547- for _ , dt := range defaultCfg .SQL .DecodingTypes {
548- decodingTypes = append (decodingTypes , constants .EncodingType (dt ))
549- }
550- defaultDataStore .factory = sql .NewFactory (
551- * defaultCfg .SQL ,
552- clusterName ,
553- f .logger ,
554- getParser (f .logger , constants .EncodingType (defaultCfg .SQL .EncodingType ), decodingTypes ... ),
555- f .dc )
546+ defaultDataStore .factory = sql .NewFactory (* defaultCfg .SQL , clusterName , f .logger , f .getParser (), f .dc )
556547 default :
557548 f .logger .Fatal ("invalid config: one of nosql or sql params must be specified for defaultDataStore" )
558549 }
@@ -576,32 +567,23 @@ func (f *factoryImpl) init(clusterName string, limiters map[string]quotas.Limite
576567 visibilityDataStore := Datastore {ratelimit : limiters [f .config .VisibilityStore ]}
577568 switch {
578569 case visibilityCfg .NoSQL != nil :
579- parser := getParser ( f . logger , constants . EncodingTypeThriftRW , constants . EncodingTypeThriftRW )
570+ parser := f . getParser ( )
580571 taskSerializer := serialization .NewTaskSerializer (parser )
581572 shardedNoSQLConfig := visibilityCfg .NoSQL .ConvertToShardedNoSQLConfig ()
582573 visibilityDataStore .factory = nosql .NewFactory (* shardedNoSQLConfig , clusterName , f .logger , f .metricsClient , taskSerializer , parser , f .dc )
583574 case visibilityCfg .SQL != nil :
584- var decodingTypes []constants.EncodingType
585- for _ , dt := range visibilityCfg .SQL .DecodingTypes {
586- decodingTypes = append (decodingTypes , constants .EncodingType (dt ))
587- }
588- visibilityDataStore .factory = sql .NewFactory (
589- * visibilityCfg .SQL ,
590- clusterName ,
591- f .logger ,
592- getParser (f .logger , constants .EncodingType (visibilityCfg .SQL .EncodingType ), decodingTypes ... ),
593- f .dc )
575+ visibilityDataStore .factory = sql .NewFactory (* visibilityCfg .SQL , clusterName , f .logger , f .getParser (), f .dc )
594576 default :
595577 f .logger .Fatal ("invalid config: one of nosql or sql params must be specified for visibilityStore" )
596578 }
597579
598580 f .datastores [storeTypeVisibility ] = visibilityDataStore
599581}
600582
601- func getParser ( logger log. Logger , encodingType constants. EncodingType , decodingTypes ... constants. EncodingType ) serialization.Parser {
602- parser , err := serialization .NewParser (encodingType , decodingTypes ... )
583+ func ( f * factoryImpl ) getParser ( ) serialization.Parser {
584+ parser , err := serialization .NewParser (f . dc )
603585 if err != nil {
604- logger .Fatal ("failed to construct parser" , tag .Error (err ))
586+ f . logger .Fatal ("failed to construct parser" , tag .Error (err ))
605587 }
606588 return parser
607589}
0 commit comments