Merge pull request lotusdblabs#7 from SchopenhauerZhang/main

add test code & format utils funtcion name
F2xuan · Oct 9, 2023 · b7f787d · b7f787d
2 parents 4dd2157 + daca9c3
commit b7f787d
Showing 5 changed files with 37 additions and 18 deletions.
diff --git a/searcher/engine.go b/searcher/engine.go
@@ -367,7 +367,7 @@ func (e *Engine) MultiSearch(request *model.SearchRequest) (*model.SearchResult,
 		Order:   request.Order,
 	}
 
-	_time := utils.ExecTime(func() {
+	_time := utils.ExecTimeWithNanoseconds(func() {
 
 		base := len(words)
 		wg := &sync.WaitGroup{}

diff --git a/searcher/sorts/sort.go b/searcher/sorts/sort.go
@@ -39,15 +39,15 @@ func (e *IdSort) GetAll(order string) []uint32 {
 	scores := make([]int, 0)
 	ids := make([]uint32, 0)
 	it := e.Tree.Iterator()
-	_tt := utils.ExecTime(func() {
+	_tt := utils.ExecTimeWithNanoseconds(func() {
 		for it.Next() {
 			scores = append(scores, it.Value().(int))
 			ids = append(ids, it.Key().(uint32))
 		}
 	})
 	log.Println("迭代耗时:", _tt)
 
-	_t := utils.ExecTime(func() {
+	_t := utils.ExecTimeWithNanoseconds(func() {
 		//ids 降序
 		if order == "desc" {
 			for i, j := 0, len(ids)-1; i < j; i, j = i+1, j-1 {
@@ -58,7 +58,7 @@ func (e *IdSort) GetAll(order string) []uint32 {
 	})
 	log.Println("id排序耗时:", _t)
 
-	_t = utils.ExecTime(func() {
+	_t = utils.ExecTimeWithNanoseconds(func() {
 		// 排序，得分越高 排越前
 		for i := 0; i < len(scores); i++ {
 			for j := i + 1; j < len(scores); j++ {

diff --git a/searcher/utils/utils.go b/searcher/utils/utils.go
@@ -11,18 +11,16 @@ import (
 	"time"
 )
 
-func ExecTime(fn func()) float64 {
+func ExecTimeWithNanoseconds(fn func()) float64 {
 	start := time.Now()
 	fn()
-	tc := float64(time.Since(start).Nanoseconds())
-	return tc / 1e6
+	return float64(time.Since(start).Nanoseconds()) / 1e6
 }
 
 func ExecTimeWithError(fn func() error) (float64, error) {
 	start := time.Now()
 	err := fn()
-	tc := float64(time.Since(start).Nanoseconds())
-	return tc / 1e6, err
+	return float64(time.Since(start).Nanoseconds()) / 1e6, err
 }
 
 func Encoder(data interface{}) []byte {

diff --git a/searcher/utils/utils_test.go b/searcher/utils/utils_test.go
@@ -0,0 +1,21 @@
+package utils
+
+import (
+	"fmt"
+	"github.com/go-playground/assert/v2"
+	"testing"
+)
+
+func TestExecTimeWithNanoseconds(t *testing.T)  {
+	fmt.Println("TestExecTime ",ExecTimeWithNanoseconds(func() {
+		fmt.Println("handle function")
+	}))
+}
+
+func TestExecTimeWithError(t *testing.T){
+	_,err := ExecTimeWithError(func() error {
+		return fmt.Errorf("error handle function")
+	})
+	assert.Equal(t,fmt.Errorf("error handle function"),err)
+}
+
diff --git a/tests/sort_test.go b/tests/sort_test.go
@@ -33,14 +33,14 @@ func TestSort(t *testing.T) {
 	var data4 = make([]int, len(data))
 	copy(data4, data)
 
-	_time := utils.ExecTime(func() {
+	_time := utils.ExecTimeWithNanoseconds(func() {
 		BubbleSort(data1)
 	})
 	fmt.Println("冒泡排序耗时：", _time)
 	//fmt.Println("data1", data1)
 	//快速排序
 
-	_time = utils.ExecTime(func() {
+	_time = utils.ExecTimeWithNanoseconds(func() {
 		//QuickSortAsc(data2, 0, len(data2)-1)
 		utils.QuickSortAsc(data2, 0, len(data2)-1, func(i int, j int) {
 			//log.Println(i, j)
@@ -50,13 +50,13 @@ func TestSort(t *testing.T) {
 	fmt.Println("快速排序耗时：", _time)
 	//fmt.Println("data2", data2)
 
-	_time = utils.ExecTime(func() {
+	_time = utils.ExecTimeWithNanoseconds(func() {
 		SelectSort(data3)
 	})
 	fmt.Println("选择排序耗时：", _time)
 	//fmt.Println("data3", data3)
 
-	_time = utils.ExecTime(func() {
+	_time = utils.ExecTimeWithNanoseconds(func() {
 		InsertSort(data4)
 	})
 	fmt.Println("插入排序耗时：", _time)
@@ -152,7 +152,7 @@ func TestFastSort(t *testing.T) {
 
 	}
 
-	_time := utils.ExecTime(func() {
+	_time := utils.ExecTimeWithNanoseconds(func() {
 		//utils.QuickSortDesc(data, 0, len(data)-1, func(i int, j int) {
 
 		//})
@@ -229,13 +229,13 @@ func TestFind(t *testing.T) {
 		data2 = append(data2, val)
 	}
 
-	t1 := utils.ExecTime(func() {
+	t1 := utils.ExecTimeWithNanoseconds(func() {
 		sort.Sort(sort.IntSlice(data))
 	})
 	fmt.Println("快排用时", t1)
 
 	//fmt.Println(find(data, 1))
-	t2 := utils.ExecTime(func() {
+	t2 := utils.ExecTimeWithNanoseconds(func() {
 		BucketSort(data2)
 		for i, j := 0, len(data2)-1; i < j; i, j = i+1, j-1 {
 			data2[i], data2[j] = data2[j], data2[i]
@@ -272,7 +272,7 @@ func TestMerge(t *testing.T) {
 		data2 = append(data2, uint32(v))
 	}
 
-	t1 := utils.ExecTime(func() {
+	t1 := utils.ExecTimeWithNanoseconds(func() {
 		temp := make([]uint32, 0)
 		for _, v := range data1 {
 			if found, _ := find(temp, v); found {
@@ -284,7 +284,7 @@ func TestMerge(t *testing.T) {
 
 	fmt.Println("二分法去重", t1)
 
-	t2 := utils.ExecTime(func() {
+	t2 := utils.ExecTimeWithNanoseconds(func() {
 		temp := make(map[uint32]bool, len(data2))
 		d := make([]uint32, 0)
 		for _, val := range data2 {