Skip to content

Some small performance optimizations #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Some small performance optimizations #19

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92e2f35
Faster unameCache by Sprintfing only once
dans-stuff Mar 28, 2015
8a60b39
Scanning is now more efficient, by not unmarshalling the data until n…
dans-stuff Mar 28, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 16 additions & 15 deletions clever.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (

const debug = false

var unameCache []byte
var unameCache *string

// Clever wraps the Clever API at the specified URL e.g. "https://api.clever.com"
type Clever struct {
Expand All @@ -33,13 +33,15 @@ type BasicAuthTransport struct {
func setTrackingHeaders(req *http.Request) {
// Want to swallow errors here because desired behavior is nil --> blank string if value doesn't exist
if unameCache == nil {
unameCache, _ = exec.Command("uname", "-a").Output()
unameBytes, _ := exec.Command("uname", "-a").Output()
unameString := fmt.Sprintf("%s", string(unameBytes))
unameCache = &unameString
}
customUA, _ := json.Marshal(map[string]string{
"lang": "go",
"lang_version": runtime.Version(),
"platform": runtime.GOOS,
"uname": fmt.Sprintf("%s", unameCache),
"uname": *unameCache,
"publisher": "clever",
"bindings_version": Version,
})
Expand Down Expand Up @@ -259,7 +261,8 @@ func (clever *Clever) Request(method string, path string, params url.Values, bod
// Create request URI from Clever base, path, params
uri := fmt.Sprintf("%s%s", clever.url, path)
if params != nil {
uri = fmt.Sprintf("%s%s?%s", clever.url, path, params.Encode())
// Append params to already-built uri
uri = fmt.Sprintf("%s?%s", uri, params.Encode())
}

var bodyReader io.Reader
Expand Down Expand Up @@ -290,24 +293,26 @@ func (clever *Clever) Request(method string, path string, params url.Values, bod
log.Printf("response:\n")
log.Printf("%v\n", string(dump))
}
if r.StatusCode == 429 {
switch r.StatusCode {
case 429:
return &TooManyRequestsError{r.Header}
} else if r.StatusCode != 200 {
case 200:
err = json.NewDecoder(r.Body).Decode(resp)
return err
default:
var error CleverError
if err := json.NewDecoder(r.Body).Decode(&error); err != nil {
return err
}
return &error
}
err = json.NewDecoder(r.Body).Decode(resp)
return err
}

// PagedResult wraps a response. It allows for paged reading of a response in conjunction with QueryAll() and Next()
type PagedResult struct {
clever Clever
nextPagePath string
lastData []map[string]interface{}
lastData []map[string]json.RawMessage
lastDataCursor int
lastError error
}
Expand Down Expand Up @@ -335,7 +340,7 @@ func (r *PagedResult) Next() bool {
}

resp := &struct {
Data []map[string]interface{}
Data []map[string]json.RawMessage
Links []Link
Paging Paging
}{}
Expand All @@ -357,11 +362,7 @@ func (r *PagedResult) Next() bool {

// Scan parses the next page of results in a PagedResult r into result. Scan throws an error if r is invalid JSON.
func (r *PagedResult) Scan(result interface{}) error {
data, err := json.Marshal(r.lastData[r.lastDataCursor]["data"])
if err != nil {
return err
}
return json.Unmarshal(data, result)
return json.Unmarshal(r.lastData[r.lastDataCursor]["data"], result)
}

// Error returns the error in a response, if there is one
Expand Down