|
@@ -2,6 +2,7 @@ package elastic
|
|
|
|
|
|
import (
|
|
import (
|
|
"encoding/json"
|
|
"encoding/json"
|
|
|
|
+ "errors"
|
|
"fmt"
|
|
"fmt"
|
|
"log"
|
|
"log"
|
|
"runtime"
|
|
"runtime"
|
|
@@ -104,7 +105,7 @@ func (e *Elastic) Get(index, itype, query string) (*[]map[string]interface{}, er
|
|
searchResult, err := client.Search().Index(index).Type(itype).Source(query).Do()
|
|
searchResult, err := client.Search().Index(index).Type(itype).Source(query).Do()
|
|
if err != nil {
|
|
if err != nil {
|
|
log.Println("从ES查询出错", err.Error())
|
|
log.Println("从ES查询出错", err.Error())
|
|
- return nil, err
|
|
|
|
|
|
+ return nil, errors.New("Es查询出错")
|
|
}
|
|
}
|
|
if searchResult.Hits != nil {
|
|
if searchResult.Hits != nil {
|
|
resNum := len(searchResult.Hits.Hits)
|
|
resNum := len(searchResult.Hits.Hits)
|
|
@@ -117,9 +118,12 @@ func (e *Elastic) Get(index, itype, query string) (*[]map[string]interface{}, er
|
|
}
|
|
}
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
|
|
+ return nil, errors.New("查询数量超过限制")
|
|
log.Println("查询结果太多,查询到:", resNum, "条")
|
|
log.Println("查询结果太多,查询到:", resNum, "条")
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ } else {
|
|
|
|
+ return nil, errors.New("Es查询出错")
|
|
}
|
|
}
|
|
return &res, nil
|
|
return &res, nil
|
|
}
|
|
}
|