@@ -553,27 +553,36 @@ func newClientWithConfig(ctx context.Context, database string, config ClientConf
553553 md .Append (afeMetricHeader , "true" )
554554 }
555555
556- if isMultiplexed := strings . ToLower ( os .Getenv ("GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS" )); isMultiplexed != "" && ! config . enableMultiplexSession {
557- config .enableMultiplexSession , err = strconv .ParseBool (isMultiplexed )
556+ if isMultiplexed , found := os .LookupEnv ("GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS" ); found {
557+ config .enableMultiplexSession , err = strconv .ParseBool (strings . ToLower ( isMultiplexed ) )
558558 if err != nil {
559559 return nil , spannerErrorf (codes .InvalidArgument , "GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS must be either true or false" )
560560 }
561+ } else {
562+ config .enableMultiplexSession = true
561563 }
562- if isMultiplexForRW := os .Getenv ("GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_FOR_RW" ); isMultiplexForRW != "" && ! config .enableMultiplexedSessionForRW {
563- config .enableMultiplexedSessionForRW , err = strconv .ParseBool (isMultiplexForRW )
564+
565+ if isMultiplexForRW , found := os .LookupEnv ("GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_FOR_RW" ); found {
566+ config .enableMultiplexedSessionForRW , err = strconv .ParseBool (strings .ToLower (isMultiplexForRW ))
564567 if err != nil {
565568 return nil , spannerErrorf (codes .InvalidArgument , "GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_FOR_RW must be either true or false" )
566569 }
567- config .enableMultiplexedSessionForRW = config .enableMultiplexedSessionForRW && config .SessionPoolConfig .enableMultiplexSession
570+ } else {
571+ config .enableMultiplexedSessionForRW = true
568572 }
569- if isMultiplexForPartitionOps := os .Getenv ("GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_PARTITIONED_OPS" ); isMultiplexForPartitionOps != "" && ! config .enableMultiplexedSessionForPartitionedOps {
570- config .enableMultiplexedSessionForPartitionedOps , err = strconv .ParseBool (isMultiplexForPartitionOps )
573+
574+ if isMultiplexForPartitionOps , found := os .LookupEnv ("GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_PARTITIONED_OPS" ); found {
575+ config .enableMultiplexedSessionForPartitionedOps , err = strconv .ParseBool (strings .ToLower (isMultiplexForPartitionOps ))
571576 if err != nil {
572577 return nil , spannerErrorf (codes .InvalidArgument , "GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_PARTITIONED_OPS must be either true or false" )
573578 }
574- config .enableMultiplexedSessionForPartitionedOps = config .enableMultiplexedSessionForPartitionedOps && config .SessionPoolConfig .enableMultiplexSession
579+ } else {
580+ config .enableMultiplexedSessionForPartitionedOps = true
575581 }
576582
583+ config .enableMultiplexedSessionForRW = config .SessionPoolConfig .enableMultiplexSession && config .enableMultiplexedSessionForRW
584+ config .enableMultiplexedSessionForPartitionedOps = config .SessionPoolConfig .enableMultiplexSession && config .enableMultiplexedSessionForPartitionedOps
585+
577586 if config .IsExperimentalHost {
578587 config .SessionPoolConfig .enableMultiplexSession = true
579588 config .enableMultiplexedSessionForRW = true
0 commit comments