Make json diff error message less scary.

nicktobey · nicktobey · commit bc9836320f4b · 2024-11-05T16:36:57.000-08:00
diff --git a/go/store/prolly/tree/json_scanner.go b/go/store/prolly/tree/json_scanner.go
@@ -38,7 +38,7 @@ type JsonScanner struct {
 	valueOffset int
 }
 
-var jsonParseError = fmt.Errorf("an error occurred while reading or writing JSON to/from the database. This is most likely a bug, but could indicate database corruption")
+var jsonParseError = fmt.Errorf("encountered invalid JSON while reading JSON from the database, or while preparing to write JSON to the database. This is most likely a bug in JSON diffing")
 
 func (j JsonScanner) Clone() JsonScanner {
 	return JsonScanner{

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ type JsonScanner struct {`
`38`	`38`	`valueOffset int`
`39`	`39`	`}`
`40`	`40`
`41`		`-var jsonParseError = fmt.Errorf("an error occurred while reading or writing JSON to/from the database. This is most likely a bug, but could indicate database corruption")`
	`41`	`+var jsonParseError = fmt.Errorf("encountered invalid JSON while reading JSON from the database, or while preparing to write JSON to the database. This is most likely a bug in JSON diffing")`
`42`	`42`
`43`	`43`	`func (j JsonScanner) Clone() JsonScanner {`
`44`	`44`	`return JsonScanner{`