aboutsummaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2023-05-25 18:31:01 +0200
committerMartin Polden <mpolden@mpolden.no>2023-05-25 18:31:01 +0200
commitf47c3e5dee29529ec06254c76f1e9154eb1dc08b (patch)
tree7e6ead9acb23409180a63a8c1b5daaa7160243ab /client
parent2a3d0867074ee6abc4efbdc8d6400dc8c55a66c1 (diff)
Avoid large buffer by default
Diffstat (limited to 'client')
-rw-r--r--client/go/internal/cli/cmd/feed.go3
-rw-r--r--client/go/internal/vespa/document/document.go4
2 files changed, 3 insertions, 4 deletions
diff --git a/client/go/internal/cli/cmd/feed.go b/client/go/internal/cli/cmd/feed.go
index 2a7d8491578..6d368cb210b 100644
--- a/client/go/internal/cli/cmd/feed.go
+++ b/client/go/internal/cli/cmd/feed.go
@@ -1,6 +1,7 @@
package cmd
import (
+ "bufio"
"encoding/json"
"fmt"
"io"
@@ -164,7 +165,7 @@ func feedFiles(files []string, dispatcher *document.Dispatcher, cli *CLI) {
}
func dispatchFrom(r io.ReadCloser, dispatcher *document.Dispatcher, cli *CLI) {
- dec := document.NewDecoder(r)
+ dec := document.NewDecoder(bufio.NewReaderSize(r, 1<<26)) // Buffer up to 64M of data at a time
defer r.Close()
for {
doc, err := dec.Decode()
diff --git a/client/go/internal/vespa/document/document.go b/client/go/internal/vespa/document/document.go
index 0fcdc8610ec..a9b184190fb 100644
--- a/client/go/internal/vespa/document/document.go
+++ b/client/go/internal/vespa/document/document.go
@@ -1,7 +1,6 @@
package document
import (
- "bufio"
"bytes"
"errors"
"fmt"
@@ -362,10 +361,9 @@ loop:
}
func NewDecoder(r io.Reader) *Decoder {
- br := bufio.NewReaderSize(r, 1<<26)
d := &Decoder{}
d.documentBuffers.New = func() any { return &bytes.Buffer{} }
- d.dec = json.NewDecoder(io.TeeReader(br, &d.buf))
+ d.dec = json.NewDecoder(io.TeeReader(r, &d.buf))
return d
}