Trying to avoid buffers and write directly to pipe

this change makes Dispatch write request body and
 http headers directly to pipe one by one
 in case of non-empty request body,
 if not - write headers and close finalize JSON
This commit is contained in:
Denis Makogon
2017-09-30 03:17:03 +03:00
parent 955b294bc6
commit 1cdd241920

View File

@@ -1,7 +1,6 @@
package protocol package protocol
import ( import (
"bytes"
"encoding/json" "encoding/json"
"fmt" "fmt"
"io" "io"
@@ -27,27 +26,51 @@ func (p *JSONProtocol) IsStreamable() bool {
} }
func (h *JSONProtocol) Dispatch(w io.Writer, req *http.Request) error { func (h *JSONProtocol) Dispatch(w io.Writer, req *http.Request) error {
var body bytes.Buffer _, err := io.WriteString(h.in, `{`)
if req.Body != nil {
var dest io.Writer = &body
// TODO copy w/ ctx
_, err := io.Copy(dest, req.Body)
if err != nil { if err != nil {
// this shouldn't happen
return respondWithError(
w, fmt.Errorf("error reader JSON object from request body: %s", err.Error()))
}
if req.Body != nil {
_, err := io.WriteString(h.in, `"body":"`)
if err != nil {
// this shouldn't happen
return respondWithError(
w, fmt.Errorf("error reader JSON object from request body: %s", err.Error()))
}
_, err = io.CopyN(h.in, req.Body, req.ContentLength)
if err != nil {
// this shouldn't happen
return respondWithError(
w, fmt.Errorf("error reader JSON object from request body: %s", err.Error()))
}
_, err = io.WriteString(h.in, `",`)
if err != nil {
// this shouldn't happen
return respondWithError( return respondWithError(
w, fmt.Errorf("error reader JSON object from request body: %s", err.Error())) w, fmt.Errorf("error reader JSON object from request body: %s", err.Error()))
} }
defer req.Body.Close() defer req.Body.Close()
} }
err := json.NewEncoder(h.in).Encode(&JSONIO{ _, err = io.WriteString(h.in, `"headers:"`)
Headers: req.Header, if err != nil {
Body: body.String(), // this shouldn't happen
}) return respondWithError(
w, fmt.Errorf("error reader JSON object from request body: %s", err.Error()))
}
err = json.NewEncoder(h.in).Encode(req.Header)
if err != nil { if err != nil {
// this shouldn't happen // this shouldn't happen
return respondWithError( return respondWithError(
w, fmt.Errorf("error marshalling JSONInput: %s", err.Error())) w, fmt.Errorf("error marshalling JSONInput: %s", err.Error()))
} }
_, err = io.WriteString(h.in, `"}`)
if err != nil {
// this shouldn't happen
return respondWithError(
w, fmt.Errorf("error reader JSON object from request body: %s", err.Error()))
}
jout := new(JSONIO) jout := new(JSONIO)
dec := json.NewDecoder(h.out) dec := json.NewDecoder(h.out)