Skip to content

Prevent unnecessary bytes <-> string conversions and unnecessary allocations when converying to bytes. #9097

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

Merged
nicktobey merged 2 commits into from
Apr 10, 2025
Merged

Prevent unnecessary bytes <-> string conversions and unnecessary allocations when converying to bytes. #9097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c6eee0
Rename StringiftJSON to JsonToMySqlString
nicktobey Apr 9, 2025
06b6f91
[ga-bump-dep] Bump dependency in Dolt by nicktobey
nicktobey Apr 9, 2025
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
2 changes: 1 addition & 1 deletion go/cmd/dolt/commands/remote.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ func getJsonAsString(sqlCtx *sql.Context, params interface{}) (string, error) {
case string:
return p, nil
case sql.JSONWrapper:
json, err := types.StringifyJSON(p)
json, err := types.JsonToMySqlString(p)
if err != nil {
return "", err
}
Expand Down
4 changes: 2 additions & 2 deletions go/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ require (
github.com/dolthub/fslock v0.0.3
github.com/dolthub/ishell v0.0.0-20240701202509-2b217167d718
github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81
github.com/dolthub/vitess v0.0.0-20250409183615-d8335325e91c
github.com/dolthub/vitess v0.0.0-20250410090211-143e6b272ad4
github.com/dustin/go-humanize v1.0.1
github.com/fatih/color v1.13.0
github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568
Expand Down Expand Up @@ -60,7 +60,7 @@ require (
github.com/creasty/defaults v1.6.0
github.com/dolthub/aws-sdk-go-ini-parser v0.0.0-20250305001723-2821c37f6c12
github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2
github.com/dolthub/go-mysql-server v0.19.1-0.20250409204801-55165d7f988e
github.com/dolthub/go-mysql-server v0.19.1-0.20250410185900-7c05ba91e4a0
github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63
github.com/esote/minmaxheap v1.0.0
github.com/goccy/go-json v0.10.2
Expand Down
10 changes: 4 additions & 6 deletions go/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,10 +221,8 @@ github.com/dolthub/fslock v0.0.3 h1:iLMpUIvJKMKm92+N1fmHVdxJP5NdyDK5bK7z7Ba2s2U=
github.com/dolthub/fslock v0.0.3/go.mod h1:QWql+P17oAAMLnL4HGB5tiovtDuAjdDTPbuqx7bYfa0=
github.com/dolthub/go-icu-regex v0.0.0-20250327004329-6799764f2dad h1:66ZPawHszNu37VPQckdhX1BPPVzREsGgNxQeefnlm3g=
github.com/dolthub/go-icu-regex v0.0.0-20250327004329-6799764f2dad/go.mod h1:ylU4XjUpsMcvl/BKeRRMXSH7e7WBrPXdSLvnRJYrxEA=
github.com/dolthub/go-mysql-server v0.19.1-0.20250409191717-9ce988e1518a h1:OVh3vpCvX2qCHNz7+J+os48+fUG9R6W71UJjYVboLsM=
github.com/dolthub/go-mysql-server v0.19.1-0.20250409191717-9ce988e1518a/go.mod h1:y8gqsM2lmvTHxuyEi5nWzQMtIKsXM6aDe1EdbCOQofM=
github.com/dolthub/go-mysql-server v0.19.1-0.20250409204801-55165d7f988e h1:kOi+nDzjWQyB2iPWDsGDBMS+v+6MgQrV7IVCDPFoeY0=
github.com/dolthub/go-mysql-server v0.19.1-0.20250409204801-55165d7f988e/go.mod h1:lt1xwT52nowkmcVWaFpLShNUrScQV8EQ1aNNGGMduRE=
github.com/dolthub/go-mysql-server v0.19.1-0.20250410185900-7c05ba91e4a0 h1:HOdhFajqz5THDTNMvsVrl4fzzZUeKZZUcWbvXovL7zc=
github.com/dolthub/go-mysql-server v0.19.1-0.20250410185900-7c05ba91e4a0/go.mod h1:KZyoO3jngyZCLyCf100FEQTrwAHj33AIMj4Zv4u3MNE=
github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 h1:OAsXLAPL4du6tfbBgK0xXHZkOlos63RdKYS3Sgw/dfI=
github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63/go.mod h1:lV7lUeuDhH5thVGDCKXbatwKy2KW80L4rMT46n+Y2/Q=
github.com/dolthub/ishell v0.0.0-20240701202509-2b217167d718 h1:lT7hE5k+0nkBdj/1UOSFwjWpNxf+LCApbRHgnCA17XE=
Expand All @@ -233,8 +231,8 @@ github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71 h1:bMGS25NWAGTE
github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71/go.mod h1:2/2zjLQ/JOOSbbSboojeg+cAwcRV0fDLzIiWch/lhqI=
github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81 h1:7/v8q9XGFa6q5Ap4Z/OhNkAMBaK5YeuEzwJt+NZdhiE=
github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81/go.mod h1:siLfyv2c92W1eN/R4QqG/+RjjX5W2+gCTRjZxBjI3TY=
github.com/dolthub/vitess v0.0.0-20250409183615-d8335325e91c h1:hl+yPanHdJML9aMB0MgrTCpzsd3jIf/o3r8pC6Tqx6E=
github.com/dolthub/vitess v0.0.0-20250409183615-d8335325e91c/go.mod h1:1gQZs/byeHLMSul3Lvl3MzioMtOW1je79QYGyi2fd70=
github.com/dolthub/vitess v0.0.0-20250410090211-143e6b272ad4 h1:LGTt2LtYX8vaai32d+c9L0sMcP+Dg9w1kO6+lbsxxYg=
github.com/dolthub/vitess v0.0.0-20250410090211-143e6b272ad4/go.mod h1:1gQZs/byeHLMSul3Lvl3MzioMtOW1je79QYGyi2fd70=
github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
Expand Down
10 changes: 2 additions & 8 deletions go/go.work.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,14 +384,8 @@ github.com/creack/pty v1.1.9 h1:uDmaGzcdjhF4i/plgjmEsriH11Y0o7RKapEf/LDaM3w=
github.com/creack/pty v1.1.17/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
github.com/dimchansky/utfbom v1.1.1/go.mod h1:SxdoEBH5qIqFocHMyGOXVAybYJdr71b1Q/j0mACtrfE=
github.com/dolthub/go-mysql-server v0.19.1-0.20250320042421-9a6edfcfab0d h1:Ra9hv9fvJkSvjihPmtQB4EMGhq9qNp08gUI/mRmF9no=
github.com/dolthub/go-mysql-server v0.19.1-0.20250320042421-9a6edfcfab0d/go.mod h1:9itIc5jYYDRxmchFmegPaLaqdf4XWYX6nua5HhrajgA=
github.com/dolthub/go-mysql-server v0.19.1-0.20250321210205-e9e48ab740ab h1:yYkM6qM3eGcjsFYhYkpfnfZ+xMLjXWGCmg/cxQIBwUk=
github.com/dolthub/go-mysql-server v0.19.1-0.20250321210205-e9e48ab740ab/go.mod h1:WyimbJzsrNiYsQ7nfnXYLIoFAfNX0I7rHH1WaDt7faM=
github.com/dolthub/go-mysql-server v0.19.1-0.20250401035901-9988aefe97a0 h1:ToWGLHVSyWYl9rdQEbAjSDPta3zjVrLxOsC6WdYCUh4=
github.com/dolthub/go-mysql-server v0.19.1-0.20250401035901-9988aefe97a0/go.mod h1:lt1xwT52nowkmcVWaFpLShNUrScQV8EQ1aNNGGMduRE=
github.com/dolthub/go-mysql-server v0.19.1-0.20250401054040-54ed687f16d1 h1:cs4Sh6ly0EhPXkdIsNZikfPXcqHWWkkJkEOYa1SZagA=
github.com/dolthub/go-mysql-server v0.19.1-0.20250401054040-54ed687f16d1/go.mod h1:lt1xwT52nowkmcVWaFpLShNUrScQV8EQ1aNNGGMduRE=
github.com/dolthub/go-mysql-server v0.19.1-0.20250410002213-011cda7862d1 h1:fCorytqHHl8rr3k/SPLWUhWK2fTe2FAV04NiiYe1/7s=
github.com/dolthub/go-mysql-server v0.19.1-0.20250410002213-011cda7862d1/go.mod h1:y8gqsM2lmvTHxuyEi5nWzQMtIKsXM6aDe1EdbCOQofM=
github.com/dolthub/maphash v0.0.0-20221220182448-74e1e1ea1577 h1:SegEguMxToBn045KRHLIUlF2/jR7Y2qD6fF+3tdOfvI=
github.com/dolthub/maphash v0.0.0-20221220182448-74e1e1ea1577/go.mod h1:gkg4Ch4CdCDu5h6PMriVLawB7koZ+5ijb9puGMV50a4=
github.com/dolthub/vitess v0.0.0-20241104125316-860772ba6683 h1:2/RJeUfNAXS7mbBnEr9C36htiCJHk5XldDPzhxtEsME=
Expand Down
4 changes: 2 additions & 2 deletions go/store/prolly/tree/json_indexed_document.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,12 +567,12 @@ func (i IndexedJsonDocument) ArrayAppend(path string, val sql.JSONWrapper) (type

// Value implements driver.Valuer for interoperability with other go libraries
func (i IndexedJsonDocument) Value() (driver.Value, error) {
return types.StringifyJSON(i)
return types.JsonToMySqlString(i)
}

// String implements the fmt.Stringer interface.
func (i IndexedJsonDocument) String() string {
s, err := types.StringifyJSON(i)
s, err := types.JsonToMySqlString(i)
if err != nil {
return fmt.Sprintf("error while stringifying JSON: %s", err.Error())
}
Expand Down
Loading