数据存储优化

src/jy/extract/extract.go

@@ -751,9 +751,6 @@ func AnalysisSaveResult(j *ju.Job, task *TaskInfo) {
 	//resulttmp := tmp
 	resulttmp, _ := ju.DeepCopy(tmp).(map[string]interface{}) //保存结果
 	resulttmp["result"] = result
-	if len(j.BlockPackage) > 0 { //分包详情
-		resulttmp["epackage"] = j.BlockPackage
-	}
 	if len(j.PackageInfo) > 0 { //分包信息
 		resulttmp["package"] = j.PackageInfo
 	}
@@ -779,13 +776,25 @@ func AnalysisSaveResult(j *ju.Job, task *TaskInfo) {
 
 	if task.TestColl == "" {
 		if len(tmp) > 0 { //保存抽取结果
-			task.DB.Update(task.SaveColl, `{"_id":"`+_id+`"}`, map[string]interface{}{"$set": tmp}, true, false)
+			b := task.DB.Update(task.SaveColl, `{"_id":"`+_id+`"}`, map[string]interface{}{"$set": tmp}, true, false)
+			if !b {
+				log.Println(task.SaveColl, _id)
+			}
 		}
 		if b, ok := ju.Config["saveresult"].(bool); ok && b {
-			db.Mgo.Update("extract_result", `{"_id":"`+_id+`"}`, map[string]interface{}{"$set": resulttmp}, true, false)
+			b := db.Mgo.Update("extract_result", `{"_id":"`+_id+`"}`, map[string]interface{}{"$set": resulttmp}, true, false)
+			if !b {
+				log.Println("extract_result", _id)
+			}
 		}
 	} else { //测试结果
-		db.Mgo.Update(task.TestColl, `{"_id":"`+_id+`"}`, map[string]interface{}{"$set": resulttmp}, true, false)
+		if len(j.BlockPackage) > 0 { //分包详情
+			resulttmp["epackage"] = j.BlockPackage
+		}
+		b := db.Mgo.Update(task.TestColl, `{"_id":"`+_id+`"}`, map[string]interface{}{"$set": resulttmp}, true, false)
+		if !b {
+			log.Println(task.TestColl, _id)
+		}
 	}
 }
 

src/jy/extract/extractInit.go

@@ -115,6 +115,7 @@ func (e *ExtractTask) InitTaskInfo() {
 //加载通用前置规则
 func (e *ExtractTask) InitRulePres() {
 	defer qu.Catch()
+	e.RulePres = []*RegLuaInfo{}
 	list, _ := db.Mgo.Find("rule_pre", `{"s_version":"`+e.TaskInfo.Version+`","delete":false}`, nil, nil, false, -1, -1)
 	for _, v := range *list {
 		rinfo := &RegLuaInfo{
@@ -145,6 +146,7 @@ func (e *ExtractTask) InitRulePres() {
 //加载通用后置规则
 func (e *ExtractTask) InitRuleBacks() {
 	defer qu.Catch()
+	e.RuleBacks = []*RegLuaInfo{}
 	list, _ := db.Mgo.Find("rule_back", `{"s_version":"`+e.TaskInfo.Version+`","delete":false}`, nil, nil, false, -1, -1)
 	for _, v := range *list {
 		rinfo := &RegLuaInfo{
@@ -175,6 +177,7 @@ func (e *ExtractTask) InitRuleBacks() {
 //加载抽取规则
 func (e *ExtractTask) InitRuleCore() {
 	defer qu.Catch()
+	e.RuleCores = []*RuleCore{}
 	vinfos, _ := db.Mgo.Find("versioninfo", `{"vid":"`+e.TaskInfo.VersionId+`","delete":false}`, nil, nil, false, -1, -1)
 	for _, vinfo := range *vinfos {
 		if b, _ := vinfo["isuse"].(bool); !b {