xiugai

jyinfomatch/src/qyfw/loadDatas.go

@@ -26,7 +26,6 @@ var (
 	eachpool        = make(chan bool, 100)
 	searchWaitGroup = &sync.WaitGroup{}
 	MaxSearch       = 10000 //缓存中总共加载这么多条
-	OnceMax         = 400   //ES一次查询这么多条
 )
 
 func LoadDatasByEs(Config *map[string]interface{}) bool {
@@ -52,7 +51,7 @@ func LoadDatasByEs(Config *map[string]interface{}) bool {
 		log.Println("获取本次查询的最大id的时候，未查找到数据...", idQuery)
 		return false
 	}
-	ok, list := initBiddingCache(_id, lastid, lastTime, 0, 0, false)
+	ok, list := initBiddingCache(_id, lastid, lastTime, 0, 0)
 	if !ok {
 		log.Println("加载数据到内存中的时候，未查找到数据...")
 		return false
@@ -66,13 +65,8 @@ func LoadDatasByEs(Config *map[string]interface{}) bool {
 }
 
 //加载数据到内存中
-func initBiddingCache(_id, lastid string, lastTime int64, startTime, endTime int64, isRepair bool) (bool, []map[string]interface{}) {
-	c_query := ""
-	if isRepair {
-		c_query = fmt.Sprintf(FilterQuery, fmt.Sprintf(TimeRange, startTime, endTime))
-	} else {
-		c_query = fmt.Sprintf(FilterQuery, fmt.Sprintf(IDRange, _id, lastid, lastTime-7*86400))
-	}
+func initBiddingCache(_id, lastid string, lastTime int64, startTime, endTime int64) (bool, []map[string]interface{}) {
+	c_query := fmt.Sprintf(FilterQuery, fmt.Sprintf(IDRange, _id, lastid, lastTime-7*86400))
 	log.Println("es query：", c_query)
 	//testquery := `{"terms":{"_id":["596f21935d11e1c7455ddc7f"]}}`
 	//c_query = fmt.Sprintf(FilterQuery, testquery)
@@ -82,10 +76,11 @@ func initBiddingCache(_id, lastid string, lastTime int64, startTime, endTime int
 	if count == 0 {
 		return false, res
 	}
-	if count > MaxSearch && !isRepair {
+	if count > MaxSearch {
 		count = MaxSearch
 		log.Println("目前数据多于", MaxSearch, "，只加载了", MaxSearch, "条！")
 	}
+	OnceMax := 400 //ES一次查询这么多条
 	if OnceMax > count {
 		OnceMax = count
 	}