Remove function UnrouteRoutes

Author: reshke

router/poolmgr/pool_mgr.go

@@ -128,6 +128,12 @@ func (s *SessConnManager) UnRouteWithError(client client.RouterClient, sh []kr.S
 
 // TODO : unit tests
 func (s *SessConnManager) UnRouteCB(cl client.RouterClient, sh []kr.ShardKey) error {
+
+	if cl.Server() == nil {
+		/* If there is nothing to unroute, return */
+		return nil
+	}
+
 	for _, shkey := range sh {
 		if err := cl.Server().UnRouteShard(shkey, cl.Rule()); err != nil {
 			return err

router/relay/relay.go

@@ -659,10 +659,10 @@ func (rst *RelayStateImpl) RerouteToTargetRoute(route *kr.ShardKey) error {
 }
 
 // TODO : unit tests
-func (rst *RelayStateImpl) CurrentRoutes() []*kr.ShardKey {
+func (rst *RelayStateImpl) CurrentRoutes() []kr.ShardKey {
 	switch q := rst.routingState.(type) {
 	case plan.ShardMatchState:
-		return []*kr.ShardKey{q.Route}
+		return []kr.ShardKey{*q.Route}
 	default:
 		return nil
 	}
@@ -1064,7 +1064,7 @@ func (rst *RelayStateImpl) ProcessExtendedBuffer() error {
 				if rst.bindRoute == nil {
 					routes := rst.CurrentRoutes()
 					if len(routes) == 1 {
-						rst.bindRoute = routes[0]
+						rst.bindRoute = &routes[0]
 					} else {
 						return fmt.Errorf("failed to deploy prepared statement")
 					}
@@ -1440,7 +1440,7 @@ func (rst *RelayStateImpl) PrepareRelayStepOnAnyRoute() (func() error, error) {
 	case nil:
 		routes := rst.CurrentRoutes()
 		return func() error {
-			return rst.UnrouteRoutes(routes)
+			return rst.Unroute(routes)
 		}, nil
 	case ErrSkipQuery:
 		if err := rst.Client().ReplyErr(err); err != nil {

router/route/routemgr.go

@@ -13,9 +13,8 @@ type RouteMgr interface {
 	RerouteToRandomRoute() error
 	RerouteToTargetRoute(route *kr.ShardKey) error
 
-	CurrentRoutes() []*kr.ShardKey
+	CurrentRoutes() []kr.ShardKey
 	/* Unroute Routines */
 	UnRouteWithError(shkey []kr.ShardKey, errmsg error) error
 	Unroute(shkey []kr.ShardKey) error
-	UnrouteRoutes(routes []*kr.ShardKey) error
 }