From e18ca9aac110ecbafea66492daa03b15ea9ec9dc Mon Sep 17 00:00:00 2001
From: sunwei <18801147024@163.com>
Date: Sun, 9 Aug 2020 22:07:30 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90rich=20function=E3=80=91VersionCompare?=
 =?UTF-8?q?=20replace?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/utils/version.go      | 35 ++---------------------------------
 core/utils/version_test.go | 25 +------------------------
 2 files changed, 3 insertions(+), 57 deletions(-)

diff --git a/core/utils/version.go b/core/utils/version.go
index 656ac3358..bcd35667e 100644
--- a/core/utils/version.go
+++ b/core/utils/version.go
@@ -5,37 +5,6 @@ import (
 	"strings"
 )
 
-// returns -1 if the first version is lower than the second, 0 if they are equal, and 1 if the second is lower.
-func CompareVersions(a, b string) int {
-	as := strings.Split(a, ".")
-	bs := strings.Split(b, ".")
-	var loop int
-	if len(as) > len(bs) {
-		loop = len(as)
-	} else {
-		loop = len(bs)
-	}
-
-	for i := 0; i < loop; i++ {
-		var x, y string
-		if len(as) > i {
-			x = as[i]
-		}
-		if len(bs) > i {
-			y = bs[i]
-		}
-		xi, _ := strconv.Atoi(x)
-		yi, _ := strconv.Atoi(y)
-		if xi > yi {
-			return 1
-		} else if xi < yi {
-			return -1
-		}
-	}
-
-	return 0
-}
-
 //return 0 if they are equal,and 1 if v1>2,and 2 if v1<v2
 func Compare(v1, v2 string) int {
 	replaceMap := map[string]string{"V": "", "v": "", "-": "."}
@@ -95,8 +64,8 @@ func strSlice2IntSlice(strs []string) []int64 {
 	return retInt
 }
 
-//custom operator compare
-func CustomCompareVersions(v1, v2, operator string) bool {
+//operator compare returns true if the first field and the second field are equal else false
+func CompareVersions(v1, v2, operator string) bool {
 	com := Compare(v1, v2)
 	switch operator {
 	case "==":
diff --git a/core/utils/version_test.go b/core/utils/version_test.go
index 1cdd60f75..808756508 100644
--- a/core/utils/version_test.go
+++ b/core/utils/version_test.go
@@ -6,29 +6,6 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func TestCompareVersions(t *testing.T) {
-	cases := []struct {
-		ver1 string
-		ver2 string
-		out  int
-	}{
-		{"1", "1.0.1", -1},
-		{"1.0.1", "1.0.2", -1},
-		{"1.0.3", "1.1", -1},
-		{"1.1", "1.1.1", -1},
-		{"1.3.2", "1.2", 1},
-		{"1.1.1", "1.1.1", 0},
-		{"1.1.0", "1.1", 0},
-	}
-
-	for _, each := range cases {
-		t.Run(each.ver1, func(t *testing.T) {
-			actual := CompareVersions(each.ver1, each.ver2)
-			assert.Equal(t, each.out, actual)
-		})
-	}
-}
-
 func TestCustomCompareVersions(t *testing.T) {
 	cases := []struct {
 		ver1     string
@@ -53,7 +30,7 @@ func TestCustomCompareVersions(t *testing.T) {
 
 	for _, each := range cases {
 		t.Run(each.ver1, func(t *testing.T) {
-			actual := CustomCompareVersions(each.ver1, each.ver2, each.operator)
+			actual := CompareVersions(each.ver1, each.ver2, each.operator)
 			assert.Equal(t, each.out, actual)
 		})
 	}