mirror of
https://gitee.com/johng/gf
synced 2026-06-06 16:21:40 +08:00
This pull request standardizes the use of the Go 1.18+ `any` type alias
instead of `interface{}` throughout the codebase. The change improves
code readability and aligns with modern Go best practices. The update
touches many files, including core data structures, code generation
templates, logging utilities, and test data, ensuring consistency across
all usages.
**Type alias migration to `any`:**
* Replaced all instances of `interface{}` with `any` in core data
structures such as `garray` and in generated model structs (e.g.,
`TableUser`, `User1`, `User2`) to modernize type usage.
[[1]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L31-R31)
[[2]](diffhunk://#diff-6c19859cb32c7516ea95ddc8f8235460818eb2f24d2204308e0d9e1b19e7d90fL15-R19)
[[3]](diffhunk://#diff-a15ba2f5e830b4833c47b902515a4f9e5a4f83a3707698f3229b307ec3776b41L15-R18)
[[4]](diffhunk://#diff-52e0837e84d49221d1b810d88fdf78221f36cffcd664fb42f8aba49a79b974dcL15-R19)
[[5]](diffhunk://#diff-11c3457d1a23a4ca6ecd00d6b856289774936b6a708384cf03aff164044e7546L15-R19)
[[6]](diffhunk://#diff-2cff9cf8e6a0cc34087326d8c8149c3bbaf74c76fdbdf5a73daed13cc04249e1L15-R19)
* Updated function signatures, method parameters, and return types from
`interface{}` to `any` in various parts of the codebase, including code
generation, service logic, and logging utilities (e.g., `mlog`).
[[1]](diffhunk://#diff-175edfeea54490b8fe4e18ffcbea5835efaf8f0b8acf623359073987cae7eb76L48-R55)
[[2]](diffhunk://#diff-2b1953fb78cf3593d8c2c7d911e95b65fd0b847c30ed0b4d167d16fe6d781235L54-R74)
[[3]](diffhunk://#diff-e001b7a4b63603b9b14f00de78a4d570bb76c5f57d856a24643f071032e12356L66-R73)
[[4]](diffhunk://#diff-5582954e8a9983988dc8854ad82067fb2ac6269b988e07357ad8db1dfec5f1a0L39-R41)
[[5]](diffhunk://#diff-c5d51d56f487779a2b6207c7ad26c7a20bbadcc846ce094fe60ab4cabff58c51L107-R107)
[[6]](diffhunk://#diff-f96e6a9fdb416eb1804ceaba1fe0ac637bff22c43837f8bb849c2366ce72d4a1L116-R121)
[[7]](diffhunk://#diff-f94c83a1b08ae060d9346f4a6031fc4a7b9a0b894e02d9afaa09018b6598eac0L112-R112)
[[8]](diffhunk://#diff-748b11dbe8828dd4c040ec23cae0b8fe57ecf0a2d1b7694ea39102294e633c64L36-R36)
[[9]](diffhunk://#diff-748b11dbe8828dd4c040ec23cae0b8fe57ecf0a2d1b7694ea39102294e633c64L74-R74)
[[10]](diffhunk://#diff-748b11dbe8828dd4c040ec23cae0b8fe57ecf0a2d1b7694ea39102294e633c64L96-R96)
**Generated code and templates:**
* Adjusted generated files and code generation templates to output `any`
instead of `interface{}` for relevant struct fields and function
signatures, ensuring that new code generation aligns with the updated
convention.
[[1]](diffhunk://#diff-6c19859cb32c7516ea95ddc8f8235460818eb2f24d2204308e0d9e1b19e7d90fL15-R19)
[[2]](diffhunk://#diff-a15ba2f5e830b4833c47b902515a4f9e5a4f83a3707698f3229b307ec3776b41L15-R18)
[[3]](diffhunk://#diff-52e0837e84d49221d1b810d88fdf78221f36cffcd664fb42f8aba49a79b974dcL15-R19)
[[4]](diffhunk://#diff-11c3457d1a23a4ca6ecd00d6b856289774936b6a708384cf03aff164044e7546L15-R19)
[[5]](diffhunk://#diff-2cff9cf8e6a0cc34087326d8c8149c3bbaf74c76fdbdf5a73daed13cc04249e1L15-R19)
[[6]](diffhunk://#diff-175edfeea54490b8fe4e18ffcbea5835efaf8f0b8acf623359073987cae7eb76L48-R55)
[[7]](diffhunk://#diff-e001b7a4b63603b9b14f00de78a4d570bb76c5f57d856a24643f071032e12356L66-R73)
[[8]](diffhunk://#diff-5582954e8a9983988dc8854ad82067fb2ac6269b988e07357ad8db1dfec5f1a0L39-R41)
**Container and utility updates:**
* Refactored the `garray` container implementation and related
constructors/methods to use `[]any` instead of `[]interface{}`, along
with corresponding function signatures.
[[1]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L31-R31)
[[2]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L52-R52)
[[3]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L62-R62)
[[4]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L73-R86)
[[5]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L96-R97)
[[6]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L107-R114)
[[7]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L124-R124)
[[8]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L135-R143)
[[9]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L167-R167)
These changes collectively modernize the codebase and prepare it for
future Go developments by using the idiomatic `any` type.
191 lines
4.3 KiB
Go
191 lines
4.3 KiB
Go
// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
|
|
//
|
|
// This Source Code Form is subject to the terms of the MIT License.
|
|
// If a copy of the MIT was not distributed with gm file,
|
|
// You can obtain one at https://github.com/gogf/gf.
|
|
|
|
package gmap_test
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/gogf/gf/v2/container/gmap"
|
|
"github.com/gogf/gf/v2/test/gtest"
|
|
"github.com/gogf/gf/v2/util/gutil"
|
|
)
|
|
|
|
func getValue() any {
|
|
return 3
|
|
}
|
|
|
|
func Test_Map_Var(t *testing.T) {
|
|
gtest.C(t, func(t *gtest.T) {
|
|
var m gmap.Map
|
|
m.Set(1, 11)
|
|
t.Assert(m.Get(1), 11)
|
|
})
|
|
gtest.C(t, func(t *gtest.T) {
|
|
var m gmap.IntAnyMap
|
|
m.Set(1, 11)
|
|
t.Assert(m.Get(1), 11)
|
|
})
|
|
gtest.C(t, func(t *gtest.T) {
|
|
var m gmap.IntIntMap
|
|
m.Set(1, 11)
|
|
t.Assert(m.Get(1), 11)
|
|
})
|
|
gtest.C(t, func(t *gtest.T) {
|
|
var m gmap.IntStrMap
|
|
m.Set(1, "11")
|
|
t.Assert(m.Get(1), "11")
|
|
})
|
|
gtest.C(t, func(t *gtest.T) {
|
|
var m gmap.StrAnyMap
|
|
m.Set("1", "11")
|
|
t.Assert(m.Get("1"), "11")
|
|
})
|
|
gtest.C(t, func(t *gtest.T) {
|
|
var m gmap.StrStrMap
|
|
m.Set("1", "11")
|
|
t.Assert(m.Get("1"), "11")
|
|
})
|
|
gtest.C(t, func(t *gtest.T) {
|
|
var m gmap.StrIntMap
|
|
m.Set("1", 11)
|
|
t.Assert(m.Get("1"), 11)
|
|
})
|
|
gtest.C(t, func(t *gtest.T) {
|
|
var m gmap.ListMap
|
|
m.Set("1", 11)
|
|
t.Assert(m.Get("1"), 11)
|
|
})
|
|
gtest.C(t, func(t *gtest.T) {
|
|
var m gmap.TreeMap
|
|
m.SetComparator(gutil.ComparatorString)
|
|
m.Set("1", 11)
|
|
t.Assert(m.Get("1"), 11)
|
|
})
|
|
}
|
|
|
|
func Test_Map_Basic(t *testing.T) {
|
|
gtest.C(t, func(t *gtest.T) {
|
|
m := gmap.New()
|
|
m.Set("key1", "val1")
|
|
t.Assert(m.Keys(), []any{"key1"})
|
|
|
|
t.Assert(m.Get("key1"), "val1")
|
|
t.Assert(m.Size(), 1)
|
|
t.Assert(m.IsEmpty(), false)
|
|
|
|
t.Assert(m.GetOrSet("key2", "val2"), "val2")
|
|
t.Assert(m.SetIfNotExist("key2", "val2"), false)
|
|
|
|
t.Assert(m.SetIfNotExist("key3", "val3"), true)
|
|
|
|
t.Assert(m.Remove("key2"), "val2")
|
|
t.Assert(m.Contains("key2"), false)
|
|
|
|
t.AssertIN("key3", m.Keys())
|
|
t.AssertIN("key1", m.Keys())
|
|
t.AssertIN("val3", m.Values())
|
|
t.AssertIN("val1", m.Values())
|
|
|
|
m.Flip()
|
|
t.Assert(m.Map(), map[any]any{"val3": "key3", "val1": "key1"})
|
|
|
|
m.Clear()
|
|
t.Assert(m.Size(), 0)
|
|
t.Assert(m.IsEmpty(), true)
|
|
|
|
m2 := gmap.NewFrom(map[any]any{1: 1, "key1": "val1"})
|
|
t.Assert(m2.Map(), map[any]any{1: 1, "key1": "val1"})
|
|
})
|
|
}
|
|
|
|
func Test_Map_Set_Fun(t *testing.T) {
|
|
gtest.C(t, func(t *gtest.T) {
|
|
m := gmap.New()
|
|
m.GetOrSetFunc("fun", getValue)
|
|
m.GetOrSetFuncLock("funlock", getValue)
|
|
t.Assert(m.Get("funlock"), 3)
|
|
t.Assert(m.Get("fun"), 3)
|
|
m.GetOrSetFunc("fun", getValue)
|
|
t.Assert(m.SetIfNotExistFunc("fun", getValue), false)
|
|
t.Assert(m.SetIfNotExistFuncLock("funlock", getValue), false)
|
|
})
|
|
}
|
|
|
|
func Test_Map_Batch(t *testing.T) {
|
|
gtest.C(t, func(t *gtest.T) {
|
|
m := gmap.New()
|
|
m.Sets(map[any]any{1: 1, "key1": "val1", "key2": "val2", "key3": "val3"})
|
|
t.Assert(m.Map(), map[any]any{1: 1, "key1": "val1", "key2": "val2", "key3": "val3"})
|
|
m.Removes([]any{"key1", 1})
|
|
t.Assert(m.Map(), map[any]any{"key2": "val2", "key3": "val3"})
|
|
})
|
|
}
|
|
|
|
func Test_Map_Iterator(t *testing.T) {
|
|
gtest.C(t, func(t *gtest.T) {
|
|
expect := map[any]any{1: 1, "key1": "val1"}
|
|
|
|
m := gmap.NewFrom(expect)
|
|
m.Iterator(func(k any, v any) bool {
|
|
t.Assert(expect[k], v)
|
|
return true
|
|
})
|
|
// 断言返回值对遍历控制
|
|
i := 0
|
|
j := 0
|
|
m.Iterator(func(k any, v any) bool {
|
|
i++
|
|
return true
|
|
})
|
|
m.Iterator(func(k any, v any) bool {
|
|
j++
|
|
return false
|
|
})
|
|
t.Assert(i, 2)
|
|
t.Assert(j, 1)
|
|
})
|
|
}
|
|
|
|
func Test_Map_Lock(t *testing.T) {
|
|
gtest.C(t, func(t *gtest.T) {
|
|
expect := map[any]any{1: 1, "key1": "val1"}
|
|
m := gmap.NewFrom(expect)
|
|
m.LockFunc(func(m map[any]any) {
|
|
t.Assert(m, expect)
|
|
})
|
|
m.RLockFunc(func(m map[any]any) {
|
|
t.Assert(m, expect)
|
|
})
|
|
})
|
|
}
|
|
|
|
func Test_Map_Clone(t *testing.T) {
|
|
gtest.C(t, func(t *gtest.T) {
|
|
// clone 方法是深克隆
|
|
m := gmap.NewFrom(map[any]any{1: 1, "key1": "val1"})
|
|
m_clone := m.Clone()
|
|
m.Remove(1)
|
|
// 修改原 map,clone 后的 map 不影响
|
|
t.AssertIN(1, m_clone.Keys())
|
|
|
|
m_clone.Remove("key1")
|
|
// 修改clone map,原 map 不影响
|
|
t.AssertIN("key1", m.Keys())
|
|
})
|
|
}
|
|
|
|
func Test_Map_Basic_Merge(t *testing.T) {
|
|
gtest.C(t, func(t *gtest.T) {
|
|
m1 := gmap.New()
|
|
m2 := gmap.New()
|
|
m1.Set("key1", "val1")
|
|
m2.Set("key2", "val2")
|
|
m1.Merge(m2)
|
|
t.Assert(m1.Map(), map[any]any{"key1": "val1", "key2": "val2"})
|
|
})
|
|
}
|