From 883d8cfee0096974433fe4cbeac1a7a4ee86d9a3 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期二, 26 三月 2024 10:42:33 +0800
Subject: [PATCH] add compare
---
cache/compare.go | 44 ++++++++++++++++++++++----------------------
1 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/cache/compare.go b/cache/compare.go
index d2e5b23..d78760e 100644
--- a/cache/compare.go
+++ b/cache/compare.go
@@ -82,7 +82,7 @@
// 璋冪敤澧為噺鐨勬帴鍙�
captures, err := libEs.GetPeriodInfos(serverIp, alarmPort, laststring, curstring, indexName, shardStr, targetType)
if err != nil {
- logger.Debug(err)
+ logger.Error(err)
return
}
for _, ei := range captures {
@@ -102,7 +102,7 @@
func getShards(serverIp string, alarmIp string, alarmPort string) (string, error) {
infos, e := libEs.GetShardsByIndex(alarmIp, alarmPort, config.EsInfo.EsIndex.AiOcean.IndexName)
if e != nil || infos == nil {
- logger.Debug("get es primary ips err")
+ logger.Error("get es primary ips err")
return "", errors.New("get es primary ips err")
}
@@ -148,7 +148,7 @@
captures, err := libEs.GetOceanFeatures(serverIp, alarmPort, 1000, indexName, shardStr, targetType)
if err != nil {
- logger.Debug("libEs.GetOceanFeatures err:", err)
+ logger.Error("libEs.GetOceanFeatures err:", err)
return err
}
logger.Debug("len(captures):", len(captures))
@@ -238,7 +238,7 @@
defer wg.Done()
dbpersons, err := dbpApi.GetPersonsCompareCacheBase(j, queryEachNum)
if err != nil {
- logger.Debug(err)
+ logger.Error(err)
return
}
logger.Debugf("鑾峰彇%d鏉′汉鍛樹俊鎭�", len(dbpersons))
@@ -271,7 +271,7 @@
var dbpApi DbPersons
info, err := dbpApi.GetPersonsCompareCacheById(id)
if err != nil {
- logger.Debug(err)
+ logger.Error(err)
return
}
if info.Tableid != "" {
@@ -310,7 +310,7 @@
Cmap.Cam[tableId].Del(id)
logger.Debug("DelPerson ok success")
} else {
- logger.Debug("tableId:", tableId, " not exist")
+ logger.Error("tableId:", tableId, " not exist")
}
}
@@ -425,7 +425,7 @@
for _, tid := range compareArgs.TableIds { //ruleProcess姣斿鎸囧畾搴曞簱
shardins, ok := Cmap.Cam[tid]
if !ok {
- logger.Debug("ruleProcess compare get shard error by tableId:", tid)
+ logger.Error("ruleProcess compare get shard error by tableId:", tid)
continue
}
if tShard, hasT := Cmap.Cam[PRE_DBTABLE]; hasT {
@@ -438,10 +438,10 @@
}
}
} else {
- logger.Debug("ruleProcess compare tables,tShard not exist tableId:", tid)
+ logger.Error("ruleProcess compare tables,tShard not exist tableId:", tid)
}
} else {
- logger.Debug("ruleProcess compare tables,PRE_DBTABLE tableId:", tid, " not exist")
+ logger.Error("ruleProcess compare tables,PRE_DBTABLE tableId:", tid, " not exist")
}
}
} else { //web璇锋眰锛屾瘮瀵规寚瀹氱殑鎶撴媿搴撴垨鑰呭簳搴�
@@ -450,7 +450,7 @@
tStart := time.Now()
serverIp, _, e := util.GetLocalIP(config.Server.NetworkAdapter)
if e != nil {
- logger.Debug("util.GetLocalIP err:", e)
+ logger.Error("util.GetLocalIP err:", e)
continue
}
alarmPort := config.EsCompServerInfo.ESPort
@@ -519,7 +519,7 @@
} else {
shardins, ok := Cmap.Cam[tid]
if !ok {
- logger.Debug("get shard error by tableId:", tid)
+ logger.Error("get shard error by tableId:", tid)
continue
}
@@ -536,7 +536,7 @@
buf, err := proto.Marshal(&scResult)
if err != nil {
- logger.Debug("scResult Marshal error!", err)
+ logger.Error("scResult Marshal error!", err)
return nil
}
@@ -547,18 +547,18 @@
co_d, err := base64.StdEncoding.DecodeString(co)
if err != nil {
- logger.Debug("DoSdkCompare err:", err)
+ logger.Error("DoSdkCompare err:", err)
return -1
}
- if len(co_d) != 2560 {
- logger.Debug("target fea.len !=2560")
- return -1
- }
-
- if len(ci) != 2560 {
- logger.Debug("source fea.len !=2560")
- return -1
- }
+ //if len(co_d) != 2560 {
+ // logger.Error("target fea.len !=2560")
+ // return -1
+ //}
+ //
+ //if len(ci) != 2560 {
+ // logger.Error("source fea.len !=2560")
+ // return -1
+ //}
sec := DecCompare(ci, co_d)
//logger.Debug("姣斿寰楀垎涓猴細", sec)
--
Gitblit v1.8.0