diff --git a/execute_query.go b/execute_query.go index 177371e..5999b53 100644 --- a/execute_query.go +++ b/execute_query.go @@ -27,16 +27,9 @@ func (qe *QueryExecutor) executeQuery() ([]byte, error) { defer bufferPool.Put(buf) buf.Reset() - _, err := buf.Write(qe.Query) - if err != nil { - qe.Logger.Error(&libpack_logger.LogMessage{ - Message: "Can't write to buffer", - Pairs: map[string]interface{}{"error": err.Error()}, - }) - return nil, err - } + buf.Write(qe.Query) - httpRequest, err := http.NewRequest(http.MethodPost, qe.endpoint, buf) + httpRequest, err := http.NewRequest(http.MethodPost, qe.endpoint, nil) if err != nil { qe.Logger.Error(&libpack_logger.LogMessage{ Message: "Can't create HTTP request", @@ -48,78 +41,62 @@ func (qe *QueryExecutor) executeQuery() ([]byte, error) { for key, value := range qe.Headers { httpRequest.Header.Set(key, fmt.Sprint(value)) } + // Set Content-Type header if not already set + if httpRequest.Header.Get("Content-Type") == "" { + httpRequest.Header.Set("Content-Type", "application/json") + } retriesMax := 1 if qe.Retries { - qe.Logger.Debug(&libpack_logger.LogMessage{ - Message: "Retries enabled", - Pairs: map[string]interface{}{"retries": qe.retries_number}, - }) retriesMax = qe.retries_number - } else { - qe.Logger.Debug(&libpack_logger.LogMessage{ - Message: "Retries disabled", - Pairs: map[string]interface{}{"retries": 1}, - }) } var queryResult queryResults err = retry.Do( func() error { + // Reset buffer before each retry + buf.Reset() + buf.Write(qe.Query) + + // Set the body of the request + httpRequest.Body = io.NopCloser(bytes.NewReader(buf.Bytes())) + httpRequest.ContentLength = int64(buf.Len()) + httpResponse, err := qe.client.Do(httpRequest) if err != nil { - qe.Logger.Debug(&libpack_logger.LogMessage{ - Message: "Error executing HTTP request", - Pairs: map[string]interface{}{"error": err.Error()}, - }) return err } defer func() { - _, err := io.Copy(io.Discard, httpResponse.Body) - if err != nil { - qe.Logger.Debug(&libpack_logger.LogMessage{ - Message: "Error discarding HTTP response body", - Pairs: map[string]interface{}{"error": err.Error()}, - }) - } + io.Copy(io.Discard, httpResponse.Body) httpResponse.Body.Close() }() - if httpResponse.StatusCode < http.StatusOK || httpResponse.StatusCode >= http.StatusNoContent { + if httpResponse.StatusCode < http.StatusOK || httpResponse.StatusCode >= http.StatusMultipleChoices { return fmt.Errorf("HTTP error - status code: %s for %s", httpResponse.Status, httpRequest.URL) } - var reader io.ReadCloser + var reader io.Reader encoding := httpResponse.Header.Get("Content-Encoding") if encoding == "gzip" { - reader, err = gzip.NewReader(httpResponse.Body) + gzipReader, err := gzip.NewReader(httpResponse.Body) if err != nil { - qe.Logger.Debug(&libpack_logger.LogMessage{ - Message: "Error creating gzip reader", - Pairs: map[string]interface{}{"error": err.Error()}, - }) return fmt.Errorf("error creating gzip reader: %w", err) } - defer reader.Close() + defer gzipReader.Close() + reader = gzipReader } else { reader = httpResponse.Body } + // Read all response body body, err := io.ReadAll(reader) if err != nil { - qe.Logger.Debug(&libpack_logger.LogMessage{ - Message: "Error reading HTTP response", - Pairs: map[string]interface{}{"error": err.Error()}, - }) return fmt.Errorf("error reading HTTP response: %w", err) } + // Unmarshal response err = json.Unmarshal(body, &queryResult) if err != nil { - qe.Logger.Debug(&libpack_logger.LogMessage{ - Message: "Error unmarshalling HTTP response", - Pairs: map[string]interface{}{"error": err.Error()}, - }) return fmt.Errorf("error unmarshalling HTTP response: %w", err) } @@ -160,6 +137,7 @@ func (qe *QueryExecutor) executeQuery() ([]byte, error) { return nil, errors.New("error executing query: no data") } + // Marshal queryResult.Data jsonData, err := json.Marshal(queryResult.Data) if err != nil { qe.Logger.Debug(&libpack_logger.LogMessage{ diff --git a/helpers.go b/helpers.go index e5d54a8..25bdc0f 100644 --- a/helpers.go +++ b/helpers.go @@ -9,7 +9,7 @@ import ( libpack_logger "github.com/lukaszraczylo/go-simple-graphql/logging" ) -func searchForKeysInMapStringInterface(msi map[string]interface{}, key string) (value any) { +func searchForKeysInMapStringInterface(msi map[string]interface{}, key string) interface{} { if msi == nil { return nil } @@ -17,7 +17,7 @@ func searchForKeysInMapStringInterface(msi map[string]interface{}, key string) ( } func calculateHash(query *Query) string { - hash := md5.Sum([]byte(query.JsonQuery)) + hash := md5.Sum(query.JsonQuery) return hex.EncodeToString(hash[:]) } diff --git a/query.go b/query.go index d017c5c..a1de3ff 100644 --- a/query.go +++ b/query.go @@ -1,8 +1,8 @@ package gql import ( + "bytes" "fmt" - "sync" "github.com/goccy/go-json" "github.com/gookit/goutil" @@ -10,17 +10,13 @@ import ( libpack_logger "github.com/lukaszraczylo/go-simple-graphql/logging" ) -var jsonBufferPool = sync.Pool{ - New: func() interface{} { - return new([]byte) - }, -} - func (b *BaseClient) convertToJSON(v any) []byte { - jsonBuffer := jsonBufferPool.Get().(*[]byte) - defer jsonBufferPool.Put(jsonBuffer) + // Reuse buffer to reduce allocations + buf := bufferPool.Get().(*bytes.Buffer) + defer bufferPool.Put(buf) + buf.Reset() - *jsonBuffer = (*jsonBuffer)[:0] + // Use json.Marshal to avoid adding extra newline jsonData, err := json.Marshal(v) if err != nil { b.Logger.Error(&libpack_logger.LogMessage{ @@ -29,8 +25,14 @@ func (b *BaseClient) convertToJSON(v any) []byte { }) return nil } - *jsonBuffer = append(*jsonBuffer, jsonData...) - return *jsonBuffer + + // Copy the bytes to the buffer + buf.Write(jsonData) + + // Copy the bytes to a new slice before returning + result := make([]byte, buf.Len()) + copy(result, buf.Bytes()) + return result } func (b *BaseClient) compileQuery(queryPartials ...any) *Query { @@ -92,7 +94,7 @@ func (b *BaseClient) Query(query string, variables map[string]interface{}, heade Message: "Cache hit", Pairs: map[string]interface{}{"query": compiledQuery}, }) - return cachedValue, nil + return b.decodeResponse(cachedValue) } b.Logger.Debug(&libpack_logger.LogMessage{ Message: "Cache miss", @@ -100,13 +102,6 @@ func (b *BaseClient) Query(query string, variables map[string]interface{}, heade }) } - if enableRetries || b.retries_enable { - b.Logger.Debug(&libpack_logger.LogMessage{ - Message: "Retries enabled", - Pairs: nil, - }) - } - q := &QueryExecutor{ BaseClient: b, Query: compiledQuery.JsonQuery, @@ -129,7 +124,7 @@ func (b *BaseClient) Query(query string, variables map[string]interface{}, heade return nil, err } - return q.decodeResponse(rv) + return b.decodeResponse(rv) } func (q *Query) parseHeadersAndVariables(headers map[string]interface{}) (enableCache, enableRetries, recompileRequired bool) {