@@ -17,7 +17,6 @@ import (
17
17
"encoding/json"
18
18
"errors"
19
19
"fmt"
20
- "github.com/davecgh/go-spew/spew"
21
20
"io/ioutil"
22
21
"log"
23
22
"net/http"
@@ -385,27 +384,37 @@ func (rt *Router) saveHintsToJsonFile(request apiRequest) error {
385
384
}
386
385
defer f .Close ()
387
386
388
- i := 0
387
+ scrollId := ""
389
388
for {
390
- if i > 3 {
391
- break
392
- }
393
- fmt .Println (">>>>" , i , req )
394
- sresponse , err := rt .doPost (host + request .Search .Index + "/_search?scroll=10m" , req , "Search" )
395
- if err != nil {
396
- return err
389
+ sresponse := []byte {}
390
+ if scrollId == "" {
391
+ r , err := rt .doPost (host + request .Search .Index + "/_search?scroll=10m" , req , "Search" )
392
+ if err != nil {
393
+ return err
394
+ }
395
+ sresponse = r
396
+ } else {
397
+ scroll := map [string ]interface {}{"scroll" : "10m" , "scroll_id" : scrollId }
398
+ r , err := rt .doPost (host + "_search/scroll" , scroll , "Search" )
399
+ if err != nil {
400
+ return err
401
+ }
402
+ sresponse = r
397
403
}
398
404
399
405
err = json .Unmarshal (sresponse , & scrollresponse )
400
406
if err != nil {
401
407
return err
402
408
}
403
409
404
- spew .Println ("Hints total" , scrollresponse .HitsRoot .Total .Value )
405
- spew .Println ("Hints req len" , len (scrollresponse .HitsRoot .Hits ))
406
- spew .Println ("ScrollID" , scrollresponse .ScrollID )
410
+ scrollId = scrollresponse .ScrollID
411
+
412
+ log .Println ("Hints total" , scrollresponse .HitsRoot .Total .Value )
413
+ log .Println ("Hints req len" , len (scrollresponse .HitsRoot .Hits ))
414
+ log .Println ("scrollId" , scrollId )
407
415
408
416
if len (scrollresponse .HitsRoot .Hits ) == 0 {
417
+ log .Println ("Search is done!" )
409
418
break
410
419
}
411
420
@@ -440,12 +449,6 @@ func (rt *Router) saveHintsToJsonFile(request apiRequest) error {
440
449
f .WriteString (string (jsonData ) + "\n " )
441
450
442
451
}
443
-
444
- if scrollresponse .ScrollID != "" {
445
- //req = map[string]interface{}{"scroll": "10m", "scroll_id": scrollresponse.ScrollID}
446
- }
447
-
448
- i = i + 1
449
452
}
450
453
451
454
return nil
0 commit comments