From 9403e8b0eaa628a062d338244cfeb6f88ffe372d Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期一, 08 七月 2019 10:24:51 +0800
Subject: [PATCH] add if tableid== , range all
---
shardmap/shardmap.go | 6 +++---
dbpersoninfo.go | 34 +++++++++++++++++++---------------
2 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/dbpersoninfo.go b/dbpersoninfo.go
index 7846cd9..1a4d816 100644
--- a/dbpersoninfo.go
+++ b/dbpersoninfo.go
@@ -72,23 +72,33 @@
// Getdbpersonmsg("")
//}
-func Getdbpersonmsg(tableid, teststring string, IsCompare bool) ([]byte) {
+func Getdbpersonmsg(tableid string, teststring []byte, IsCompare bool) ([]byte) {
var buf []byte
if !IsCompare {
return nil
}
- if teststring == "" {
+ if tableid == "" {
return nil
}
- for id, value := range Cmap.cam{
- if id == tableid{
- fmt.Println(id)
- buf =value.Walk(Printest, teststring)
+ if tableid == "" {
+ for _, val := range Cmap.cam{
+ tmpbuf := val.Walk(Printest, teststring)
+ buf =append(buf, tmpbuf...)
}
- }
+
+ }else{
+
+ for id, value := range Cmap.cam{
+ if id == tableid{
+ fmt.Println(id)
+ buf =value.Walk(Printest, teststring)
+ break
+ }
+ }
+ }
fmt.Println()
fmt.Println()
@@ -98,13 +108,7 @@
return buf
}
-func Printest(ci, co string ) (float32){
-
- //ci_d, err := base64.StdEncoding.DecodeString(ci)
- //if err != nil {
- // fmt.Println("ci_d : error : ", err)
- // return -1
- //}
+func Printest(ci []byte, co string ) (float32){
co_d, err := base64.StdEncoding.DecodeString(co)
if err != nil {
@@ -112,6 +116,6 @@
return -1
}
- sec := gosdk.FaceCompare([]byte(ci), co_d)
+ sec := gosdk.FaceCompare(ci, co_d)
return sec
}
diff --git a/shardmap/shardmap.go b/shardmap/shardmap.go
index 9f1dc6c..6e19e48 100644
--- a/shardmap/shardmap.go
+++ b/shardmap/shardmap.go
@@ -26,7 +26,7 @@
var Count = make(chan int)
-type wfOp func(a, b string) float32
+type wfOp func(a []byte, b string) float32
/**
* @param uint8, shardCnt must be pow of two
@@ -78,7 +78,7 @@
}
// modify by long.
-func (s *ShardMap) Walk(wf wfOp, cfrom string) ([]byte){
+func (s *ShardMap) Walk(wf wfOp, cfrom []byte) ([]byte){
var wg sync.WaitGroup
var second float32
var buf []byte
@@ -92,7 +92,7 @@
wg.Add(1)
- go func(st *shardItem, fw wfOp, cf string) {
+ go func(st *shardItem, fw wfOp, cf []byte) {
defer wg.Done()
commonmux.Lock()
for id, feature := range st.data {
--
Gitblit v1.8.0