@@ -493,22 +493,20 @@ func newClientWithConfig(ctx context.Context, database string, config ClientConf
493493 return nil , spannerErrorf (codes .InvalidArgument , "GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS must be either true or false" )
494494 }
495495 }
496- //TODO: Uncomment this once the feature is enabled.
497- //if isMultiplexForRW := os.Getenv("GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_FOR_RW"); isMultiplexForRW != "" {
498- // config.enableMultiplexedSessionForRW, err = strconv.ParseBool(isMultiplexForRW)
499- // if err != nil {
500- // return nil, spannerErrorf(codes.InvalidArgument, "GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_FOR_RW must be either true or false")
501- // }
502- // config.enableMultiplexedSessionForRW = config.enableMultiplexedSessionForRW && config.SessionPoolConfig.enableMultiplexSession
503- //}
504-
505- //if isMultiplexForPartitionOps := os.Getenv("GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_PARTITIONED_OPS"); isMultiplexForPartitionOps != "" {
506- // config.enableMultiplexedSessionForPartitionedOps, err = strconv.ParseBool(isMultiplexForPartitionOps)
507- // if err != nil {
508- // return nil, spannerErrorf(codes.InvalidArgument, "GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_PARTITIONED_OPS must be either true or false")
509- // }
510- // config.enableMultiplexedSessionForPartitionedOps = config.enableMultiplexedSessionForPartitionedOps && config.SessionPoolConfig.enableMultiplexSession
511- //}
496+ if isMultiplexForRW := os .Getenv ("GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_FOR_RW" ); isMultiplexForRW != "" {
497+ config .enableMultiplexedSessionForRW , err = strconv .ParseBool (isMultiplexForRW )
498+ if err != nil {
499+ return nil , spannerErrorf (codes .InvalidArgument , "GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_FOR_RW must be either true or false" )
500+ }
501+ config .enableMultiplexedSessionForRW = config .enableMultiplexedSessionForRW && config .SessionPoolConfig .enableMultiplexSession
502+ }
503+ if isMultiplexForPartitionOps := os .Getenv ("GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_PARTITIONED_OPS" ); isMultiplexForPartitionOps != "" {
504+ config .enableMultiplexedSessionForPartitionedOps , err = strconv .ParseBool (isMultiplexForPartitionOps )
505+ if err != nil {
506+ return nil , spannerErrorf (codes .InvalidArgument , "GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_PARTITIONED_OPS must be either true or false" )
507+ }
508+ config .enableMultiplexedSessionForPartitionedOps = config .enableMultiplexedSessionForPartitionedOps && config .SessionPoolConfig .enableMultiplexSession
509+ }
512510
513511 // Create a session client.
514512 sc := newSessionClient (pool , database , config .UserAgent , sessionLabels , config .DatabaseRole , config .DisableRouteToLeader , md , config .BatchTimeout , config .Logger , config .CallOptions )
0 commit comments