Merge pull request #228 from sak0/fix_redundantCode

loadbalancer: fix redundant code

Author: ChaoyongLiang

plugin/loadbalancer/common/half_open.go

@@ -19,6 +19,7 @@ package common
 
 import (
 	"github.com/polarismesh/polaris-go/pkg/model"
+	"github.com/polarismesh/polaris-go/pkg/plugin/loadbalancer"
 )
 
 // SelectAvailableInstanceSet select available instance set
@@ -35,3 +36,19 @@ func SelectAvailableInstanceSet(clsValue *model.ClusterValue, hasLimitedInstance
 	targetInstances := clsValue.GetInstancesSet(hasLimitedInstances, includeHalfOpen)
 	return targetInstances
 }
+
+// SelectAvailableInstanceSetFromCriteria select available instance from criteria
+func SelectAvailableInstanceSetFromCriteria(criteria *loadbalancer.Criteria,
+	inputInstances model.ServiceInstances) (*model.InstanceSet, error) {
+	cluster := criteria.Cluster
+	svcClusters := inputInstances.GetServiceClusters()
+	clusterValue := cluster.GetClusterValue()
+	targetInstances := SelectAvailableInstanceSet(clusterValue, cluster.HasLimitedInstances,
+		cluster.IncludeHalfOpen)
+	if targetInstances.TotalWeight() == 0 {
+		return nil, model.NewSDKError(model.ErrCodeAPIInstanceNotFound, nil,
+			"instances of %s in cluster %s all weight 0 (instance count %d) in load balance",
+			svcClusters.GetServiceKey(), *cluster, targetInstances.Count())
+	}
+	return targetInstances, nil
+}

plugin/loadbalancer/hash/hash.go

@@ -65,17 +65,9 @@ func (g *LoadBalancer) Destroy() error {
 // ChooseInstance 获取单个服务实例
 func (g *LoadBalancer) ChooseInstance(criteria *loadbalancer.Criteria,
 	inputInstances model.ServiceInstances) (model.Instance, error) {
-	cluster := criteria.Cluster
-	svcClusters := inputInstances.GetServiceClusters()
-	clusterValue := cluster.GetClusterValue()
-	var instance model.Instance
-	svcInstances := svcClusters.GetServiceInstances()
-	targetInstances := lbcommon.SelectAvailableInstanceSet(clusterValue, cluster.HasLimitedInstances,
-		cluster.IncludeHalfOpen)
-	if targetInstances.TotalWeight() == 0 {
-		return nil, model.NewSDKError(model.ErrCodeAPIInstanceNotFound, nil,
-			"instances of %s in cluster %s all weight 0 (instance count %d) in load balance",
-			svcClusters.GetServiceKey(), *cluster, targetInstances.Count())
+	targetInstances, err := lbcommon.SelectAvailableInstanceSetFromCriteria(criteria, inputInstances)
+	if err != nil {
+		return nil, err
 	}
 	hashValue, err := lbcommon.CalcHashValue(criteria, g.hashFunc)
 	if err != nil {
@@ -86,7 +78,9 @@ func (g *LoadBalancer) ChooseInstance(criteria *loadbalancer.Criteria,
 	// 按照权重区间来寻找
 	targetIndex := search.BinarySearch(weightedSlice, uint64(targetValue))
 	instanceIndex := targetInstances.GetInstances()[targetIndex]
-	instance = svcInstances.GetInstances()[instanceIndex.Index]
+
+	instance := inputInstances.GetServiceClusters().GetServiceInstances().GetInstances()[instanceIndex.Index]
+
 	return instance, nil
 }
 

plugin/loadbalancer/maglev/maglev.go

@@ -79,17 +79,11 @@ func (m *MaglevLoadBalancer) getOrBuildHashRing(instSet *model.InstanceSet) (mod
 // ChooseInstance 获取单个服务实例
 func (m *MaglevLoadBalancer) ChooseInstance(criteria *loadbalancer.Criteria,
 	inputInstances model.ServiceInstances) (model.Instance, error) {
-	cluster := criteria.Cluster
-	svcClusters := inputInstances.GetServiceClusters()
-	clusterValue := cluster.GetClusterValue()
-	svcInstances := svcClusters.GetServiceInstances()
-	targetInstances := lbcommon.SelectAvailableInstanceSet(clusterValue, cluster.HasLimitedInstances,
-		cluster.IncludeHalfOpen)
-	if targetInstances.TotalWeight() == 0 {
-		return nil, model.NewSDKError(model.ErrCodeAPIInstanceNotFound, nil,
-			"instances of %s in cluster %s all weight 0 (instance count %d) in load balance",
-			svcClusters.GetServiceKey(), *cluster, targetInstances.Count())
+	targetInstances, err := lbcommon.SelectAvailableInstanceSetFromCriteria(criteria, inputInstances)
+	if err != nil {
+		return nil, err
 	}
+	svcInstances := inputInstances.GetServiceClusters().GetServiceInstances()
 	selector, err := m.getOrBuildHashRing(targetInstances)
 	if err != nil {
 		return nil, model.NewSDKError(model.ErrCodeInternalError, err, "fail to build maglev table")

plugin/loadbalancer/ringhash/ringhash.go

@@ -78,16 +78,9 @@ func (k *KetamaLoadBalancer) getOrBuildHashRing(instSet *model.InstanceSet) (mod
 // ChooseInstance 获取单个服务实例
 func (k *KetamaLoadBalancer) ChooseInstance(criteria *loadbalancer.Criteria,
 	inputInstances model.ServiceInstances) (model.Instance, error) {
-	cluster := criteria.Cluster
-	svcClusters := inputInstances.GetServiceClusters()
-	clusterValue := cluster.GetClusterValue()
-	svcInstances := svcClusters.GetServiceInstances()
-	targetInstances := lbcommon.SelectAvailableInstanceSet(clusterValue, cluster.HasLimitedInstances,
-		cluster.IncludeHalfOpen)
-	if targetInstances.TotalWeight() == 0 {
-		return nil, model.NewSDKError(model.ErrCodeAPIInstanceNotFound, nil,
-			"instances of %s in cluster %s all weight 0 (instance count %d) in load balance",
-			svcClusters.GetServiceKey(), *cluster, targetInstances.Count())
+	targetInstances, err := lbcommon.SelectAvailableInstanceSetFromCriteria(criteria, inputInstances)
+	if err != nil {
+		return nil, err
 	}
 	selector, err := k.getOrBuildHashRing(targetInstances)
 	if err != nil {
@@ -101,7 +94,7 @@ func (k *KetamaLoadBalancer) ChooseInstance(criteria *loadbalancer.Criteria,
 		criteria.ReplicateInfo.Nodes = nodes.GetInstances()
 	}
 
-	instance := svcInstances.GetInstances()[index]
+	instance := inputInstances.GetInstances()[index]
 	return instance, nil
 }