update

Author: chenjie

bufpool/bufpool.go

@@ -7,22 +7,57 @@ import (
 
 	cerror "github.com/chenjie199234/Corelib/error"
 	ctime "github.com/chenjie199234/Corelib/util/time"
-	//"time"
 )
 
-type A struct {
-	E1 *error
-	E2 error
-	E3 error
-	E4 *cerror.Error
-	E5 error
-	T1 ctime.Time
-}
-
 func Test_Bufpool(t *testing.T) {
 	b := GetBuffer()
-	e := errors.New("e")
-	ee := cerror.Error{}
-	b.Append(&A{E1: &e, E2: e, E3: ee, E4: &ee, E5: nil, T1: ctime.Time(time.Now())})
-	t.Log(b.String())
+	var s = time.Second
+	b.AppendStdDuration(s)
+	if b.String() != "1000000000" {
+		panic("std duration error")
+	}
+	b.Reset()
+	b.AppendStdDurations([]time.Duration{s})
+	if b.String() != "[1000000000]" {
+		panic("std durations error")
+	}
+	b.Reset()
+	b.AppendStdDurationPointers([]*time.Duration{nil, &s})
+	if b.String() != "[null,1000000000]" {
+		panic("std durationpointers error")
+	}
+	b.Reset()
+	var cs ctime.Duration = ctime.Duration(s)
+	b.AppendDuration(cs)
+	if b.String() != "1s" {
+		panic("corelib duration error")
+	}
+	b.Reset()
+	b.AppendDurations([]ctime.Duration{cs})
+	if b.String() != "[\"1s\"]" {
+		panic("corelib durations error")
+	}
+	b.Reset()
+	b.AppendDurationPointers([]*ctime.Duration{nil, &cs})
+	if b.String() != "[null,\"1s\"]" {
+		panic("corelib durationpointers error")
+	}
+	b.Reset()
+	stde := errors.New("stde")
+	ce := cerror.MakeError(1, "ce")
+	b.AppendError(stde)
+	if b.String() != "stde" {
+		panic("std error error")
+	}
+	b.Reset()
+	b.AppendError(ce)
+	if b.String() != "{\"code\":1,\"msg\":\"ce\"}" {
+		panic("corelib error error")
+	}
+	b.Reset()
+	b.AppendErrors([]error{nil, stde, ce})
+	if b.String() != "[null,\"stde\",{\"code\":1,\"msg\":\"ce\"}]" {
+		panic("corelib errors error")
+	}
+	b.Reset()
 }

bufpool/bufpool_test.go

@@ -11,8 +11,8 @@ const text = `module {{.}}
 go 1.16
 
 require (
-	github.com/chenjie199234/Config v0.0.14
-	github.com/chenjie199234/Corelib v0.0.28
+	github.com/chenjie199234/Config v0.0.15
+	github.com/chenjie199234/Corelib v0.0.29
 	github.com/fsnotify/fsnotify v1.5.1
 	github.com/go-sql-driver/mysql v1.6.0
 	github.com/segmentio/kafka-go v0.4.18

codegen/tml/gomod/template_gomod.go

@@ -1,5 +1,7 @@
 package error
 
+import "context"
+
 var (
 	ErrUnknown  = &Error{Code: 10000, Msg: "unknown"}
 	ErrReq      = &Error{Code: 10001, Msg: "request error"}
@@ -10,3 +12,9 @@ var (
 	ErrBan      = &Error{Code: 10006, Msg: "ban"}
 	ErrNotExist = &Error{Code: 10007, Msg: "not exist"}
 )
+
+//convert std error
+var (
+	ErrDeadlineExceeded = &Error{Code: -1, Msg: context.DeadlineExceeded.Error()}
+	ErrCanceled         = &Error{Code: -1, Msg: context.Canceled.Error()}
+)

error/const.go

@@ -1,110 +1,92 @@
 package error
 
 import (
+	"context"
 	"encoding/json"
+	"strconv"
 
 	"github.com/chenjie199234/Corelib/util/common"
 )
 
 //if error was not in this error's format,code will return -1,msg will use the origin error.Error()
 
-type Error struct {
-	Code int32  `json:"code"`
-	Msg  string `json:"msg"`
-}
-
 func MakeError(code int32, msg string) *Error {
 	return &Error{Code: code, Msg: msg}
 }
 func GetCodeFromErrorstr(e string) int32 {
-	if e == "" {
+	ee := ConvertErrorstr(e)
+	if ee == nil {
 		return 0
 	}
-	tempe := &Error{}
-	if ee := json.Unmarshal(common.Str2byte(e), tempe); ee != nil {
-		return -1
-	}
-	return tempe.Code
+	return ee.Code
 }
 func GetCodeFromStdError(e error) int32 {
-	if e == nil {
+	ee := ConvertStdError(e)
+	if ee == nil {
 		return 0
 	}
-	tempe, ok := e.(*Error)
-	if ok {
-		return tempe.Code
-	}
-	tempe = &Error{}
-	if ee := json.Unmarshal(common.Str2byte(e.Error()), tempe); ee != nil {
-		return -1
-	}
-	return tempe.Code
+	return ee.Code
 }
 func GetMsgFromErrorstr(e string) string {
-	if e == "" {
+	ee := ConvertErrorstr(e)
+	if ee == nil {
 		return ""
 	}
-	tempe := &Error{}
-	if ee := json.Unmarshal(common.Str2byte(e), tempe); ee != nil {
-		return e
-	}
-	return tempe.Msg
+	return ee.Msg
 }
 func GetMsgFromStdError(e error) string {
-	if e == nil {
+	ee := ConvertStdError(e)
+	if ee == nil {
 		return ""
 	}
-	tempe, ok := e.(*Error)
-	if ok {
-		return tempe.Msg
-	}
-	tempe = &Error{}
-	if ee := json.Unmarshal(common.Str2byte(e.Error()), tempe); ee != nil {
-		return e.Error()
-	}
-	return tempe.Msg
+	return ee.Msg
 }
-func ErrorstrToError(e string) *Error {
+func ConvertErrorstr(e string) *Error {
 	if e == "" {
 		return nil
 	}
 	result := &Error{}
-	if ee := json.Unmarshal(common.Str2byte(e), result); ee != nil {
+	if e[0] == '{' {
+		//json format
+		if ee := json.Unmarshal(common.Str2byte(e), result); ee != nil {
+			result.Code = -1
+			result.Msg = e
+		}
+	} else {
+		//text format
 		result.Code = -1
 		result.Msg = e
 	}
 	return result
 }
-func StdErrorToError(e error) *Error {
+func ConvertStdError(e error) *Error {
 	if e == nil {
 		return nil
 	}
+	if e == context.DeadlineExceeded {
+		return ErrDeadlineExceeded
+	} else if e == context.Canceled {
+		return ErrCanceled
+	}
 	result, ok := e.(*Error)
 	if ok {
 		return result
 	}
-	result = &Error{}
-	if ee := json.Unmarshal(common.Str2byte(e.Error()), result); ee != nil {
-		result.Code = -1
-		result.Msg = e.Error()
-	}
-	return result
+	return ConvertErrorstr(e.Error())
 }
 func Equal(a, b error) bool {
-	aa := StdErrorToError(a)
-	bb := StdErrorToError(b)
+	aa := ConvertStdError(a)
+	bb := ConvertStdError(b)
 	if aa == nil && bb == nil {
 		return true
 	} else if (aa == nil && bb != nil) || (aa != nil && bb == nil) {
 		return false
 	}
 	return aa.Code == bb.Code && aa.Msg == bb.Msg
 }
-func (this Error) Error() string {
-	d, _ := json.Marshal(this)
-	return common.Byte2str(d)
-}
-func (this Error) String() string {
-	d, _ := json.Marshal(this)
-	return common.Byte2str(d)
+func (this *Error) Error() string {
+	if this == nil {
+		return ""
+	}
+	return "{\"code\":" + strconv.FormatInt(int64(this.Code), 10) + ",\"msg\":\"" + this.Msg + "\"}"
 }