From 855f98dfa80b180bdbade05b30ad2f3e89f4c543 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 10 九月 2019 16:50:21 +0800
Subject: [PATCH] cpu test
---
ruleserver/readyDataForRule.go | 35 ++++++++++++++++++++---------------
1 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/ruleserver/readyDataForRule.go b/ruleserver/readyDataForRule.go
index 3d4b0e3..66e22a0 100644
--- a/ruleserver/readyDataForRule.go
+++ b/ruleserver/readyDataForRule.go
@@ -1,23 +1,22 @@
package ruleserver
import (
+ "basic.com/dbapi.git"
bigCache "basic.com/pubsub/cache.git"
- "basic.com/pubsub/cache.git/esutil"
"basic.com/pubsub/protomsg.git"
"encoding/json"
"errors"
"fmt"
"github.com/go-yaml/yaml"
+ "github.com/golang/protobuf/proto"
"io/ioutil"
"math"
"nanomsg.org/go-mangos"
"nanomsg.org/go-mangos/protocol/req"
"nanomsg.org/go-mangos/transport/tcp"
"net"
- "os"
"ruleprocess/cache"
"ruleprocess/logger"
- "github.com/golang/protobuf/proto"
"strconv"
"time"
)
@@ -170,18 +169,20 @@
// 缁欑洰鏍囧～鍏卨iker
func (arg *Arg) fillLiker(tableId []string, compareThreshold float32) {
//bytes := bigCache.GetComparePersonBaseInfo(tableId, arg.Feature, compareThreshold)
- comArg := &protomsg.CompareArgs{
- TableIds:tableId,
- FaceFeature:arg.Feature,
- CompareThreshold:compareThreshold,
- Source:false,
- }
- serverIp, _ := GetLocalIP()
- bytes := Push("tcp://"+serverIp+":40010",comArg,sock)
+ //comArg := &protomsg.CompareArgs{
+ // TableIds:tableId,
+ // FaceFeature:arg.Feature,
+ // CompareThreshold:compareThreshold,
+ // Source:false,
+ //}
+ //serverIp, _ := GetLocalIP()
+ //bytes := Push("tcp://"+serverIp+":4010",comArg,sock)
+ bytes := []byte{}
var scResult protomsg.SdkCompareResult
err1 := proto.Unmarshal(bytes, &scResult)
if err1 != nil {
logger.Error("getBaseInfo瑙ｅ帇閿欒", err1)
+ return
}
//logger.Info("----------------------------------------map鏄�", m)
ids := []string{}
@@ -193,16 +194,20 @@
logger.Info("------------------------------------------------------------------------------------------------------------------------")
//logger.Info("=====================浜哄憳id鐨勯泦鍚堜负锛�",ids)
if len(ids) > 0 {
- baseinfos, err1 := esutil.Dbpersoninfosbyid(ids, dbTablePersons, serverIp, serverPort)
+ var dbApi dbapi.DbPersonApi
+ baseinfos, err1 := dbApi.Dbpersoninfosbyid(ids)
+ //baseinfos, err1 := esutil.Dbpersoninfosbyid(ids, dbTablePersons, serverIp, serverPort)
if err1 != nil {
logger.Error("鏌ヨ搴曞簱浜哄憳淇℃伅鍑洪敊", err1)
}
+ var dtapi dbapi.DbTableApi
for _, baseinfo := range baseinfos {
// 鏍规嵁tableId鏌ヨ搴曞簱淇℃伅缁檒iker璧嬪��
//logger.Info("---------鐪嬬湅姣忎釜搴曞簱浜哄憳鐨勪俊鎭細",baseinfo.Id,baseinfo.PersonName)
tableIds := []string{}
tableIds = append(tableIds, baseinfo.TableId) // 铏界劧鏄紶鍏ユ暟缁勮繑鍥炴暟缁勭殑鎺ュ彛锛屼絾鎴戞寜鍗曚釜鐨勪娇鐢ㄤ簡
- table, err := esutil.Dbtablefosbyid(tableIds, "dbtables", serverIp, serverPort)
+ table, err := dtapi.DbtablesById(tableIds)
+ //table, err := esutil.Dbtablefosbyid(tableIds, "dbtables", serverIp, serverPort)
if err != nil || len(table) == 0 {
logger.Error("鏍规嵁id鏌ヨ搴曞簱淇℃伅鍑洪敊锛�", err, "--杩斿洖鍊奸暱搴︿负锛�", len(table))
}
@@ -357,11 +362,11 @@
//bytes := []byte("ndfasojdfaidsos")
if err = sock.Send(bytes); err != nil {
logger.Error("鎺ㄩ�乻ocket鍙戦�佹暟鎹け璐�: %s", err.Error())
- os.Exit(1)
+ //os.Exit(1)
}
if msg, err = sock.Recv(); err != nil {
logger.Error("鎺ユ敹鍝嶅簲澶辫触: %s", err.Error())
- os.Exit(1)
+ //os.Exit(1)
}
logger.Debug("鏁版嵁鎺ㄩ�佹垚鍔燂紒鏀跺埌鍝嶅簲,鏁版嵁闀垮害涓猴細",len(msg))
return msg
--
Gitblit v1.8.0