fix: 0 size
This commit is contained in:
parent
ebb4365135
commit
2c80079a8f
@ -2,6 +2,7 @@ package cmd
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"github.com/loveuer/esgo2dump/log"
|
||||||
|
|
||||||
"github.com/loveuer/esgo2dump/internal/opt"
|
"github.com/loveuer/esgo2dump/internal/opt"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
@ -48,7 +49,7 @@ esgo2dump --input=http://127.0.0.1:9200/some_index --output=./data.json --query_
|
|||||||
)
|
)
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
rootCommand.Flags().BoolVar(&opt.Debug, "debug", false, "")
|
rootCommand.PersistentFlags().BoolVar(&opt.Debug, "debug", false, "")
|
||||||
rootCommand.Flags().BoolVarP(&f_version, "version", "v", false, "print esgo2dump version")
|
rootCommand.Flags().BoolVarP(&f_version, "version", "v", false, "print esgo2dump version")
|
||||||
rootCommand.Flags().IntVar(&opt.Timeout, "timeout", 30, "max timeout seconds per operation with limit")
|
rootCommand.Flags().IntVar(&opt.Timeout, "timeout", 30, "max timeout seconds per operation with limit")
|
||||||
|
|
||||||
@ -62,6 +63,12 @@ func init() {
|
|||||||
rootCommand.Flags().StringVarP(&f_query, "query", "q", "", `query dsl, example: {"bool":{"must":[{"term":{"name":{"value":"some_name"}}}],"must_not":[{"range":{"age":{"gte":18,"lt":60}}}]}}`)
|
rootCommand.Flags().StringVarP(&f_query, "query", "q", "", `query dsl, example: {"bool":{"must":[{"term":{"name":{"value":"some_name"}}}],"must_not":[{"range":{"age":{"gte":18,"lt":60}}}]}}`)
|
||||||
rootCommand.Flags().StringVar(&f_query_file, "query_file", "", `query json file (will execute line by line)`)
|
rootCommand.Flags().StringVar(&f_query_file, "query_file", "", `query json file (will execute line by line)`)
|
||||||
rootCommand.Flags().Uint64VarP(&f_limit, "limit", "l", 100, "")
|
rootCommand.Flags().Uint64VarP(&f_limit, "limit", "l", 100, "")
|
||||||
|
|
||||||
|
rootCommand.PersistentPreRun = func(cmd *cobra.Command, args []string) {
|
||||||
|
if opt.Debug {
|
||||||
|
log.SetLogLevel(log.LogLevelDebug)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func Start(ctx context.Context) error {
|
func Start(ctx context.Context) error {
|
||||||
|
@ -51,10 +51,6 @@ func run(cmd *cobra.Command, args []string) error {
|
|||||||
ioo interfaces.DumpIO
|
ioo interfaces.DumpIO
|
||||||
)
|
)
|
||||||
|
|
||||||
if opt.Debug {
|
|
||||||
log.SetLogLevel(log.LogLevelDebug)
|
|
||||||
}
|
|
||||||
|
|
||||||
if f_version {
|
if f_version {
|
||||||
fmt.Printf("esgo2dump (Version: %s)\n", opt.Version)
|
fmt.Printf("esgo2dump (Version: %s)\n", opt.Version)
|
||||||
os.Exit(0)
|
os.Exit(0)
|
||||||
|
@ -7,3 +7,15 @@ func Min[T ~string | ~int | ~int64 | ~uint64 | ~float64 | ~float32 | ~int32 | ~u
|
|||||||
|
|
||||||
return b
|
return b
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func AbsMin(a, b uint64) uint64 {
|
||||||
|
if a == 0 {
|
||||||
|
return b
|
||||||
|
}
|
||||||
|
|
||||||
|
if b == 0 {
|
||||||
|
return a
|
||||||
|
}
|
||||||
|
|
||||||
|
return Min(a, b)
|
||||||
|
}
|
||||||
|
@ -199,11 +199,14 @@ func ReadDataV2(
|
|||||||
close(errCh)
|
close(errCh)
|
||||||
}()
|
}()
|
||||||
|
|
||||||
|
fina_size := util.AbsMin(size, max-total)
|
||||||
|
log.Debug("es7.read: size = %d, max = %d, total = %d, fina size = %d", size, max, total, fina_size)
|
||||||
|
|
||||||
for {
|
for {
|
||||||
qs = []func(*esapi.SearchRequest){
|
qs = []func(*esapi.SearchRequest){
|
||||||
client.Search.WithContext(util.TimeoutCtx(ctx, 30)),
|
client.Search.WithContext(util.TimeoutCtx(ctx, 30)),
|
||||||
client.Search.WithIndex(index),
|
client.Search.WithIndex(index),
|
||||||
client.Search.WithSize(int(util.Min(size, max-total))),
|
client.Search.WithSize(int(fina_size)),
|
||||||
client.Search.WithSort(sorts...),
|
client.Search.WithSort(sorts...),
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -221,6 +224,8 @@ func ReadDataV2(
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
log.Debug("body raw: %s", string(bs))
|
||||||
|
|
||||||
qs = append(qs, client.Search.WithBody(bytes.NewReader(bs)))
|
qs = append(qs, client.Search.WithBody(bytes.NewReader(bs)))
|
||||||
if resp, err = client.Search(qs...); err != nil {
|
if resp, err = client.Search(qs...); err != nil {
|
||||||
errCh <- err
|
errCh <- err
|
||||||
@ -247,6 +252,8 @@ func ReadDataV2(
|
|||||||
dataCh <- result.Hits.Hits
|
dataCh <- result.Hits.Hits
|
||||||
total += uint64(len(result.Hits.Hits))
|
total += uint64(len(result.Hits.Hits))
|
||||||
|
|
||||||
|
log.Debug("es7.read: total: %d", total)
|
||||||
|
|
||||||
if uint64(len(result.Hits.Hits)) < size || (max > 0 && total >= max) {
|
if uint64(len(result.Hits.Hits)) < size || (max > 0 && total >= max) {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user