From 74446ec85779c7d3e13af1549c7f4ba0dcea128a Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Sun, 16 Jun 2024 14:26:20 +0800 Subject: [PATCH] 1 --- server/marketserver/cache/cachemgr.go | 2 +- server/marketserver/mt/Contract.go | 2 -- server/marketserver/mt/Item.go | 14 ++++++-------- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/server/marketserver/cache/cachemgr.go b/server/marketserver/cache/cachemgr.go index e96d73a6..fed77917 100644 --- a/server/marketserver/cache/cachemgr.go +++ b/server/marketserver/cache/cachemgr.go @@ -13,7 +13,7 @@ type cacheMgr struct { } func (this *cacheMgr) Init() { - + this.nftHash = new(q5.ConcurrentMap[string, *nft]) } func (this *cacheMgr) UnInit() { diff --git a/server/marketserver/mt/Contract.go b/server/marketserver/mt/Contract.go index 9de60b4b..33e83251 100644 --- a/server/marketserver/mt/Contract.go +++ b/server/marketserver/mt/Contract.go @@ -3,7 +3,6 @@ package mt import ( "f5" "mtb" - "sync" "strings" ) @@ -13,7 +12,6 @@ type Contract struct { type ContractTable struct { f5.NameMetaTable[Contract] - itemHash sync.Map //string => Contract } func (this *Contract) Init1() { diff --git a/server/marketserver/mt/Item.go b/server/marketserver/mt/Item.go index df8253a7..7f3672d7 100644 --- a/server/marketserver/mt/Item.go +++ b/server/marketserver/mt/Item.go @@ -3,30 +3,28 @@ package mt import ( "f5" "mtb" - "sync" "strings" ) type Item struct { mtb.Item + lowerName string } type ItemTable struct { f5.IdMetaTable[Item] - itemHash sync.Map //string => item_id } func (this *Item) Init1() { - Table.Item.itemHash.Store(strings.ToLower(this.GetName()), this.GetItemId()) + this.lowerName = strings.ToLower(this.GetName()) } func (this *ItemTable) Search(name string, itemIds map[int32]int32) { name = strings.ToLower(name) - this.itemHash.Range( - func (k, v interface{}) bool { - key := k.(string) - if strings.Contains(key, name) { - itemIds[v.(int32)] = 1 + this.Traverse( + func (ele *Item) bool { + if strings.Contains(ele.lowerName, name) { + itemIds[ele.GetItemId()] = 1 } return true })