From e73efb4afc3bc91ddc49ac63f0f3db463d1f8cc1 Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期五, 12 七月 2019 17:50:28 +0800
Subject: [PATCH] modify cam to Cam
---
dbpersoninfo.go | 54 ++++++++++++++++++++++++++++++------------------------
1 files changed, 30 insertions(+), 24 deletions(-)
diff --git a/dbpersoninfo.go b/dbpersoninfo.go
index cc0ab87..5832070 100644
--- a/dbpersoninfo.go
+++ b/dbpersoninfo.go
@@ -7,6 +7,8 @@
"sync"
"encoding/base64"
+ "encoding/json"
+
"basic.com/pubsub/cache.git/esutil"
"basic.com/pubsub/cache.git/shardmap"
@@ -18,7 +20,7 @@
type CmapItem struct {
sync.Mutex
- cam map[string]*shardmap.ShardMap
+ Cam map[string]*shardmap.ShardMap
}
var Cmap *CmapItem
@@ -28,7 +30,7 @@
gosdk.InitFaceExtractor(16, 0)
Cmap = &CmapItem{
- cam: make(map[string]*shardmap.ShardMap),
+ Cam: make(map[string]*shardmap.ShardMap),
}
temptime := time.Now()
@@ -48,11 +50,11 @@
Cmap.Lock()
for _, value := range escache{
- if _, ok :=Cmap.cam[value.Tableid]; !ok {
- Cmap.cam[value.Tableid]=shardmap.New(uint8(*threadnum))
+ if _, ok :=Cmap.Cam[value.Tableid]; !ok {
+ Cmap.Cam[value.Tableid]=shardmap.New(uint8(*threadnum))
}
- Cmap.cam[value.Tableid].Set(value.Id,value.FaceFeature)
+ Cmap.Cam[value.Tableid].Set(value.Id,value.FaceFeature)
}
Cmap.Unlock()
@@ -64,45 +66,49 @@
fmt.Println()
}
-//func main(){
-// Init()
-// Getdbpersonmsg("")
-//}
-
func Getdbpersonmsg(tableid string, teststring []byte, IsCompare bool) ([]byte) {
- var buf []byte
+ totalmap := make(map[string]float32)
+
if !IsCompare {
return nil
}
- if tableid == "" {
- return nil
+ if teststring == nil {
+ return nil
}
if tableid == "" {
- for _, val := range Cmap.cam{
- tmpbuf := val.Walk(Printest, teststring)
- buf =append(buf, tmpbuf...)
+ for id, val := range Cmap.Cam{
+ fmt.Println("the id is: ", id)
+ tmpmap := val.Walk(Printest, teststring)
+ for key, sec := range tmpmap {
+ totalmap[key] = sec
+ }
}
-
}else{
-
- for id, value := range Cmap.cam{
+ for id, value := range Cmap.Cam{
if id == tableid{
- fmt.Println(id)
- buf =value.Walk(Printest, teststring)
+ fmt.Println("the id is: ", id)
+ tmpmap :=value.Walk(Printest, teststring)
+ for key, sec := range tmpmap {
+ totalmap[key]= sec
+ }
break
}
}
}
- fmt.Println()
- fmt.Println()
firsttime := time.Now()
fmt.Println(time.Since(firsttime))
- return buf
+
+ buf, err := json.Marshal(totalmap)
+ if err != nil {
+ fmt.Println("map to json error!", err)
+ return nil
+ }
+ return buf
}
func Printest(ci []byte, co string ) (float32){
--
Gitblit v1.8.0