@@ -526,12 +526,12 @@ func (f *factoryImpl) init(clusterName string, limiters map[string]quotas.Limite
526
526
defaultDataStore := Datastore {ratelimit : limiters [f .config .DefaultStore ]}
527
527
switch {
528
528
case defaultCfg .NoSQL != nil :
529
- parser := getParser ( f . logger , constants . EncodingTypeThriftRW , constants . EncodingTypeThriftRW )
529
+ parser := f . getParser ( )
530
530
taskSerializer := serialization .NewTaskSerializer (parser )
531
531
shardedNoSQLConfig := defaultCfg .NoSQL .ConvertToShardedNoSQLConfig ()
532
532
defaultDataStore .factory = nosql .NewFactory (* shardedNoSQLConfig , clusterName , f .logger , f .metricsClient , taskSerializer , parser , f .dc )
533
533
case defaultCfg .ShardedNoSQL != nil :
534
- parser := getParser ( f . logger , constants . EncodingTypeThriftRW , constants . EncodingTypeThriftRW )
534
+ parser := f . getParser ( )
535
535
taskSerializer := serialization .NewTaskSerializer (parser )
536
536
defaultDataStore .factory = nosql .NewFactory (* defaultCfg .ShardedNoSQL , clusterName , f .logger , f .metricsClient , taskSerializer , parser , f .dc )
537
537
case defaultCfg .SQL != nil :
@@ -543,16 +543,7 @@ func (f *factoryImpl) init(clusterName string, limiters map[string]quotas.Limite
543
543
string (constants .EncodingTypeThriftRW ),
544
544
}
545
545
}
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 )
556
547
default :
557
548
f .logger .Fatal ("invalid config: one of nosql or sql params must be specified for defaultDataStore" )
558
549
}
@@ -576,32 +567,23 @@ func (f *factoryImpl) init(clusterName string, limiters map[string]quotas.Limite
576
567
visibilityDataStore := Datastore {ratelimit : limiters [f .config .VisibilityStore ]}
577
568
switch {
578
569
case visibilityCfg .NoSQL != nil :
579
- parser := getParser ( f . logger , constants . EncodingTypeThriftRW , constants . EncodingTypeThriftRW )
570
+ parser := f . getParser ( )
580
571
taskSerializer := serialization .NewTaskSerializer (parser )
581
572
shardedNoSQLConfig := visibilityCfg .NoSQL .ConvertToShardedNoSQLConfig ()
582
573
visibilityDataStore .factory = nosql .NewFactory (* shardedNoSQLConfig , clusterName , f .logger , f .metricsClient , taskSerializer , parser , f .dc )
583
574
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 )
594
576
default :
595
577
f .logger .Fatal ("invalid config: one of nosql or sql params must be specified for visibilityStore" )
596
578
}
597
579
598
580
f .datastores [storeTypeVisibility ] = visibilityDataStore
599
581
}
600
582
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 )
603
585
if err != nil {
604
- logger .Fatal ("failed to construct parser" , tag .Error (err ))
586
+ f . logger .Fatal ("failed to construct parser" , tag .Error (err ))
605
587
}
606
588
return parser
607
589
}
0 commit comments