[no-release-notes] skip more wire allocs (#8651)

* [no-release-notes] skip more wire allocs * bump * bump * bump * bump
dolthub · Dec 11, 2024 · 20135d8 · 20135d8
1 parent ffd5bde
commit 20135d8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/go/cmd/dolt/commands/query_diff.go b/go/cmd/dolt/commands/query_diff.go
@@ -70,8 +70,8 @@ func (q QueryDiff) ArgParser() *argparser.ArgParser {
 func (q QueryDiff) compareRows(pkOrds []int, row1, row2 sql.Row) (int, bool) {
 	var cmp int
 	for _, pkOrd := range pkOrds {
-		pk1, _ := gmstypes.ConvertToString(row1[pkOrd], gmstypes.Text)
-		pk2, _ := gmstypes.ConvertToString(row2[pkOrd], gmstypes.Text)
+		pk1, _ := gmstypes.ConvertToString(row1[pkOrd], gmstypes.Text, nil)
+		pk2, _ := gmstypes.ConvertToString(row2[pkOrd], gmstypes.Text, nil)
 		if pk1 < pk2 {
 			cmp = -1
 		} else if pk1 > pk2 {
@@ -82,8 +82,8 @@ func (q QueryDiff) compareRows(pkOrds []int, row1, row2 sql.Row) (int, bool) {
 	}
 	var diff bool
 	for i := 0; i < len(row1); i++ {
-		a, _ := gmstypes.ConvertToString(row1[i], gmstypes.Text)
-		b, _ := gmstypes.ConvertToString(row2[i], gmstypes.Text)
+		a, _ := gmstypes.ConvertToString(row1[i], gmstypes.Text, nil)
+		b, _ := gmstypes.ConvertToString(row2[i], gmstypes.Text, nil)
 		if a != b {
 			diff = true
 			break

diff --git a/go/go.mod b/go/go.mod
@@ -57,7 +57,7 @@ require (
 	github.com/cespare/xxhash/v2 v2.2.0
 	github.com/creasty/defaults v1.6.0
 	github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2
-	github.com/dolthub/go-mysql-server v0.18.2-0.20241209182739-d644619dc9ed
+	github.com/dolthub/go-mysql-server v0.18.2-0.20241210234720-9643b85e7135
 	github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63
 	github.com/dolthub/swiss v0.1.0
 	github.com/goccy/go-json v0.10.2

diff --git a/go/go.sum b/go/go.sum
@@ -183,8 +183,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-20240916130659-0118adc6b662 h1:aC17hZD6iwzBwwfO5M+3oBT5E5gGRiQPdn+vzpDXqIA=
 github.com/dolthub/go-icu-regex v0.0.0-20240916130659-0118adc6b662/go.mod h1:KPUcpx070QOfJK1gNe0zx4pA5sicIK1GMikIGLKC168=
-github.com/dolthub/go-mysql-server v0.18.2-0.20241209182739-d644619dc9ed h1:YlXOo9xfRRglBrg+OvAFpBNohzWtK3YQ7SnTZNTbYZ0=
-github.com/dolthub/go-mysql-server v0.18.2-0.20241209182739-d644619dc9ed/go.mod h1:Ra4lA9OjCy9J5tWPn05IBBlODnwaXZc8j+cChvfN/9Q=
+github.com/dolthub/go-mysql-server v0.18.2-0.20241210234720-9643b85e7135 h1:YlnNdYuspWNVTfpeErw9iZMHCq5RnvMUJo6d/BdHUZ4=
+github.com/dolthub/go-mysql-server v0.18.2-0.20241210234720-9643b85e7135/go.mod h1:Ra4lA9OjCy9J5tWPn05IBBlODnwaXZc8j+cChvfN/9Q=
 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=