mirror of
https://gitee.com/johng/gf
synced 2026-07-06 13:42:46 +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.
263 lines
7.8 KiB
Go
Executable File
263 lines
7.8 KiB
Go
Executable File
// 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 this file,
|
|
// You can obtain one at https://github.com/gogf/gf.
|
|
|
|
package gutil_test
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/gogf/gf/v2/frame/g"
|
|
"github.com/gogf/gf/v2/test/gtest"
|
|
"github.com/gogf/gf/v2/util/gutil"
|
|
)
|
|
|
|
func Test_ListItemValues_Map(t *testing.T) {
|
|
gtest.C(t, func(t *gtest.T) {
|
|
listMap := g.List{
|
|
g.Map{"id": 1, "score": 100},
|
|
g.Map{"id": 2, "score": 99},
|
|
g.Map{"id": 3, "score": 99},
|
|
}
|
|
t.Assert(gutil.ListItemValues(listMap, "id"), g.Slice{1, 2, 3})
|
|
t.Assert(gutil.ListItemValues(&listMap, "id"), g.Slice{1, 2, 3})
|
|
t.Assert(gutil.ListItemValues(listMap, "score"), g.Slice{100, 99, 99})
|
|
})
|
|
gtest.C(t, func(t *gtest.T) {
|
|
listMap := g.List{
|
|
g.Map{"id": 1, "score": 100},
|
|
g.Map{"id": 2, "score": nil},
|
|
g.Map{"id": 3, "score": 0},
|
|
}
|
|
t.Assert(gutil.ListItemValues(listMap, "id"), g.Slice{1, 2, 3})
|
|
t.Assert(gutil.ListItemValues(listMap, "score"), g.Slice{100, nil, 0})
|
|
})
|
|
gtest.C(t, func(t *gtest.T) {
|
|
listMap := g.List{}
|
|
t.Assert(len(gutil.ListItemValues(listMap, "id")), 0)
|
|
})
|
|
}
|
|
|
|
func Test_ListItemValues_Map_SubKey(t *testing.T) {
|
|
type Scores struct {
|
|
Math int
|
|
English int
|
|
}
|
|
gtest.C(t, func(t *gtest.T) {
|
|
listMap := g.List{
|
|
g.Map{"id": 1, "scores": Scores{100, 60}},
|
|
g.Map{"id": 2, "scores": Scores{0, 100}},
|
|
g.Map{"id": 3, "scores": Scores{59, 99}},
|
|
}
|
|
t.Assert(gutil.ListItemValues(listMap, "scores", "Math"), g.Slice{100, 0, 59})
|
|
t.Assert(gutil.ListItemValues(listMap, "scores", "English"), g.Slice{60, 100, 99})
|
|
t.Assert(gutil.ListItemValues(listMap, "scores", "PE"), g.Slice{})
|
|
})
|
|
}
|
|
|
|
func Test_ListItemValues_Map_Array_SubKey(t *testing.T) {
|
|
type Scores struct {
|
|
Math int
|
|
English int
|
|
}
|
|
gtest.C(t, func(t *gtest.T) {
|
|
listMap := g.List{
|
|
g.Map{"id": 1, "scores": []Scores{{1, 2}, {3, 4}}},
|
|
g.Map{"id": 2, "scores": []Scores{{5, 6}, {7, 8}}},
|
|
g.Map{"id": 3, "scores": []Scores{{9, 10}, {11, 12}}},
|
|
}
|
|
t.Assert(gutil.ListItemValues(listMap, "scores", "Math"), g.Slice{1, 3, 5, 7, 9, 11})
|
|
t.Assert(gutil.ListItemValues(listMap, "scores", "English"), g.Slice{2, 4, 6, 8, 10, 12})
|
|
t.Assert(gutil.ListItemValues(listMap, "scores", "PE"), g.Slice{})
|
|
})
|
|
}
|
|
|
|
func Test_ListItemValues_Struct(t *testing.T) {
|
|
gtest.C(t, func(t *gtest.T) {
|
|
type T struct {
|
|
Id int
|
|
Score float64
|
|
}
|
|
listStruct := g.Slice{
|
|
T{1, 100},
|
|
T{2, 99},
|
|
T{3, 0},
|
|
}
|
|
t.Assert(gutil.ListItemValues(listStruct, "Id"), g.Slice{1, 2, 3})
|
|
t.Assert(gutil.ListItemValues(listStruct, "Score"), g.Slice{100, 99, 0})
|
|
})
|
|
// Pointer items.
|
|
gtest.C(t, func(t *gtest.T) {
|
|
type T struct {
|
|
Id int
|
|
Score float64
|
|
}
|
|
listStruct := g.Slice{
|
|
&T{1, 100},
|
|
&T{2, 99},
|
|
&T{3, 0},
|
|
}
|
|
t.Assert(gutil.ListItemValues(listStruct, "Id"), g.Slice{1, 2, 3})
|
|
t.Assert(gutil.ListItemValues(listStruct, "Score"), g.Slice{100, 99, 0})
|
|
})
|
|
// Nil element value.
|
|
gtest.C(t, func(t *gtest.T) {
|
|
type T struct {
|
|
Id int
|
|
Score any
|
|
}
|
|
listStruct := g.Slice{
|
|
T{1, 100},
|
|
T{2, nil},
|
|
T{3, 0},
|
|
}
|
|
t.Assert(gutil.ListItemValues(listStruct, "Id"), g.Slice{1, 2, 3})
|
|
t.Assert(gutil.ListItemValues(listStruct, "Score"), g.Slice{100, nil, 0})
|
|
})
|
|
}
|
|
|
|
func Test_ListItemValues_Struct_SubKey(t *testing.T) {
|
|
gtest.C(t, func(t *gtest.T) {
|
|
type Student struct {
|
|
Id int
|
|
Score float64
|
|
}
|
|
type Class struct {
|
|
Total int
|
|
Students []Student
|
|
}
|
|
listStruct := g.Slice{
|
|
Class{2, []Student{{1, 1}, {2, 2}}},
|
|
Class{3, []Student{{3, 3}, {4, 4}, {5, 5}}},
|
|
Class{1, []Student{{6, 6}}},
|
|
}
|
|
t.Assert(gutil.ListItemValues(listStruct, "Total"), g.Slice{2, 3, 1})
|
|
t.Assert(gutil.ListItemValues(listStruct, "Students"), `[[{"Id":1,"Score":1},{"Id":2,"Score":2}],[{"Id":3,"Score":3},{"Id":4,"Score":4},{"Id":5,"Score":5}],[{"Id":6,"Score":6}]]`)
|
|
t.Assert(gutil.ListItemValues(listStruct, "Students", "Id"), g.Slice{1, 2, 3, 4, 5, 6})
|
|
})
|
|
gtest.C(t, func(t *gtest.T) {
|
|
type Student struct {
|
|
Id int
|
|
Score float64
|
|
}
|
|
type Class struct {
|
|
Total int
|
|
Students []*Student
|
|
}
|
|
listStruct := g.Slice{
|
|
&Class{2, []*Student{{1, 1}, {2, 2}}},
|
|
&Class{3, []*Student{{3, 3}, {4, 4}, {5, 5}}},
|
|
&Class{1, []*Student{{6, 6}}},
|
|
}
|
|
t.Assert(gutil.ListItemValues(listStruct, "Total"), g.Slice{2, 3, 1})
|
|
t.Assert(gutil.ListItemValues(listStruct, "Students"), `[[{"Id":1,"Score":1},{"Id":2,"Score":2}],[{"Id":3,"Score":3},{"Id":4,"Score":4},{"Id":5,"Score":5}],[{"Id":6,"Score":6}]]`)
|
|
t.Assert(gutil.ListItemValues(listStruct, "Students", "Id"), g.Slice{1, 2, 3, 4, 5, 6})
|
|
})
|
|
}
|
|
|
|
func Test_ListItemValuesUnique(t *testing.T) {
|
|
gtest.C(t, func(t *gtest.T) {
|
|
listMap := g.List{
|
|
g.Map{"id": 1, "score": 100},
|
|
g.Map{"id": 2, "score": 100},
|
|
g.Map{"id": 3, "score": 100},
|
|
g.Map{"id": 4, "score": 100},
|
|
g.Map{"id": 5, "score": 100},
|
|
}
|
|
t.Assert(gutil.ListItemValuesUnique(listMap, "id"), g.Slice{1, 2, 3, 4, 5})
|
|
t.Assert(gutil.ListItemValuesUnique(listMap, "score"), g.Slice{100})
|
|
})
|
|
gtest.C(t, func(t *gtest.T) {
|
|
listMap := g.List{
|
|
g.Map{"id": 1, "score": 100},
|
|
g.Map{"id": 2, "score": 100},
|
|
g.Map{"id": 3, "score": 100},
|
|
g.Map{"id": 4, "score": 100},
|
|
g.Map{"id": 5, "score": 99},
|
|
}
|
|
t.Assert(gutil.ListItemValuesUnique(listMap, "id"), g.Slice{1, 2, 3, 4, 5})
|
|
t.Assert(gutil.ListItemValuesUnique(listMap, "score"), g.Slice{100, 99})
|
|
})
|
|
gtest.C(t, func(t *gtest.T) {
|
|
listMap := g.List{
|
|
g.Map{"id": 1, "score": 100},
|
|
g.Map{"id": 2, "score": 100},
|
|
g.Map{"id": 3, "score": 0},
|
|
g.Map{"id": 4, "score": 100},
|
|
g.Map{"id": 5, "score": 99},
|
|
}
|
|
t.Assert(gutil.ListItemValuesUnique(listMap, "id"), g.Slice{1, 2, 3, 4, 5})
|
|
t.Assert(gutil.ListItemValuesUnique(listMap, "score"), g.Slice{100, 0, 99})
|
|
})
|
|
}
|
|
|
|
func Test_ListItemValuesUnique_Struct_SubKey(t *testing.T) {
|
|
gtest.C(t, func(t *gtest.T) {
|
|
type Student struct {
|
|
Id int
|
|
Score float64
|
|
}
|
|
type Class struct {
|
|
Total int
|
|
Students []Student
|
|
}
|
|
listStruct := g.Slice{
|
|
Class{2, []Student{{1, 1}, {1, 2}}},
|
|
Class{3, []Student{{2, 3}, {2, 4}, {5, 5}}},
|
|
Class{1, []Student{{6, 6}}},
|
|
}
|
|
t.Assert(gutil.ListItemValuesUnique(listStruct, "Total"), g.Slice{2, 3, 1})
|
|
t.Assert(gutil.ListItemValuesUnique(listStruct, "Students", "Id"), g.Slice{1, 2, 5, 6})
|
|
})
|
|
gtest.C(t, func(t *gtest.T) {
|
|
type Student struct {
|
|
Id int
|
|
Score float64
|
|
}
|
|
type Class struct {
|
|
Total int
|
|
Students []*Student
|
|
}
|
|
listStruct := g.Slice{
|
|
&Class{2, []*Student{{1, 1}, {1, 2}}},
|
|
&Class{3, []*Student{{2, 3}, {2, 4}, {5, 5}}},
|
|
&Class{1, []*Student{{6, 6}}},
|
|
}
|
|
t.Assert(gutil.ListItemValuesUnique(listStruct, "Total"), g.Slice{2, 3, 1})
|
|
t.Assert(gutil.ListItemValuesUnique(listStruct, "Students", "Id"), g.Slice{1, 2, 5, 6})
|
|
})
|
|
}
|
|
|
|
func Test_ListItemValuesUnique_Map_Array_SubKey(t *testing.T) {
|
|
type Scores struct {
|
|
Math int
|
|
English int
|
|
}
|
|
gtest.C(t, func(t *gtest.T) {
|
|
listMap := g.List{
|
|
g.Map{"id": 1, "scores": []Scores{{1, 2}, {1, 2}}},
|
|
g.Map{"id": 2, "scores": []Scores{{5, 8}, {5, 8}}},
|
|
g.Map{"id": 3, "scores": []Scores{{9, 10}, {11, 12}}},
|
|
}
|
|
t.Assert(gutil.ListItemValuesUnique(listMap, "scores", "Math"), g.Slice{1, 5, 9, 11})
|
|
t.Assert(gutil.ListItemValuesUnique(listMap, "scores", "English"), g.Slice{2, 8, 10, 12})
|
|
t.Assert(gutil.ListItemValuesUnique(listMap, "scores", "PE"), g.Slice{})
|
|
})
|
|
}
|
|
|
|
func Test_ListItemValuesUnique_Binary_ID(t *testing.T) {
|
|
gtest.C(t, func(t *gtest.T) {
|
|
listMap := g.List{
|
|
g.Map{"id": []byte{1}, "score": 100},
|
|
g.Map{"id": []byte{2}, "score": 100},
|
|
g.Map{"id": []byte{3}, "score": 100},
|
|
g.Map{"id": []byte{4}, "score": 100},
|
|
g.Map{"id": []byte{4}, "score": 100},
|
|
}
|
|
t.Assert(gutil.ListItemValuesUnique(listMap, "id"), g.Slice{[]byte{1}, []byte{2}, []byte{3}, []byte{4}})
|
|
t.Assert(gutil.ListItemValuesUnique(listMap, "score"), g.Slice{100})
|
|
})
|
|
}
|