@@ -574,50 +574,48 @@ func (connPool *ConnectionPool) NewPrepared(expr string, userMode Mode) (*tarant
574
574
func (connPool * ConnectionPool ) getConnectionRole (conn * tarantool.Connection ) (Role , error ) {
575
575
resp , err := conn .Call17 ("box.info" , []interface {}{})
576
576
if err != nil {
577
- return unknown , err
577
+ return UnknownRole , err
578
578
}
579
579
if resp == nil {
580
- return unknown , ErrIncorrectResponse
580
+ return UnknownRole , ErrIncorrectResponse
581
581
}
582
582
if len (resp .Data ) < 1 {
583
- return unknown , ErrIncorrectResponse
583
+ return UnknownRole , ErrIncorrectResponse
584
584
}
585
585
586
586
instanceStatus , ok := resp .Data [0 ].(map [interface {}]interface {})["status" ]
587
587
if ! ok {
588
- return unknown , ErrIncorrectResponse
588
+ return UnknownRole , ErrIncorrectResponse
589
589
}
590
590
if instanceStatus != "running" {
591
- return unknown , ErrIncorrectStatus
591
+ return UnknownRole , ErrIncorrectStatus
592
592
}
593
593
594
594
replicaRole , ok := resp .Data [0 ].(map [interface {}]interface {})["ro" ]
595
595
if ! ok {
596
- return unknown , ErrIncorrectResponse
596
+ return UnknownRole , ErrIncorrectResponse
597
597
}
598
598
599
599
switch replicaRole {
600
600
case false :
601
- return master , nil
601
+ return MasterRole , nil
602
602
case true :
603
- return replica , nil
603
+ return ReplicaRole , nil
604
604
}
605
605
606
- return unknown , nil
606
+ return UnknownRole , nil
607
607
}
608
608
609
609
func (connPool * ConnectionPool ) getConnectionFromPool (addr string ) (* tarantool.Connection , Role ) {
610
- conn := connPool .rwPool .GetConnByAddr (addr )
611
- if conn != nil {
612
- return conn , master
610
+ if conn := connPool .rwPool .GetConnByAddr (addr ); conn != nil {
611
+ return conn , MasterRole
613
612
}
614
613
615
- conn = connPool .roPool .GetConnByAddr (addr )
616
- if conn != nil {
617
- return conn , replica
614
+ if conn := connPool .roPool .GetConnByAddr (addr ); conn != nil {
615
+ return conn , ReplicaRole
618
616
}
619
617
620
- return connPool .anyPool .GetConnByAddr (addr ), unknown
618
+ return connPool .anyPool .GetConnByAddr (addr ), UnknownRole
621
619
}
622
620
623
621
func (connPool * ConnectionPool ) deleteConnectionFromPool (addr string ) {
@@ -639,9 +637,9 @@ func (connPool *ConnectionPool) setConnectionToPool(addr string, conn *tarantool
639
637
connPool .anyPool .AddConn (addr , conn )
640
638
641
639
switch role {
642
- case master :
640
+ case MasterRole :
643
641
connPool .rwPool .AddConn (addr , conn )
644
- case replica :
642
+ case ReplicaRole :
645
643
connPool .roPool .AddConn (addr , conn )
646
644
}
647
645
0 commit comments