panic during dolt_rebase: `panic: expected false`

[kennethklee]

Dolt version 1.59.20

Cannot share db data, but the stack trace might help resolve the panic.

Commands run:

call dolt_checkout('my-branch');
call dolt_rebase('-i', 'main');

Stack trace in logs:

panic: expected false

goroutine 1060 [running]:
github.com/dolthub/dolt/go/store/d.PanicIfFalse(...)
	github.com/dolthub/dolt/go/store/d/try.go:80
github.com/dolthub/dolt/go/store/hash.New(...)
	github.com/dolthub/dolt/go/store/hash/hash.go:102
github.com/dolthub/dolt/go/libraries/doltcore/merge.(*valueMerger).mergeJSONAddr(0xc00f76d208?, {0x43fd360?, 0xc000a7dc20?}, {0x0?, 0xc017661572?, 0xc02209c320?}, {0xc017661572?, 0x27?, 0xc01996bd00?}, {0xc01765d4ee, ...})
	github.com/dolthub/dolt/go/libraries/doltcore/merge/merge_prolly_rows.go:2169 +0x93c
github.com/dolthub/dolt/go/libraries/doltcore/merge.(*valueMerger).processColumn(0xc01a618508, 0xc000a7dc20, 0x25, {0xc0176614a6, 0x142, 0xaa6}, {0xc01765d44b, 0x103, 0x9e9}, {0xc01771544b, ...})
	github.com/dolthub/dolt/go/libraries/doltcore/merge/merge_prolly_rows.go:2157 +0xe3f
github.com/dolthub/dolt/go/libraries/doltcore/merge.(*valueMerger).TryMerge(0xc01a618508, 0xc000a7dc20, {0xc0176614a6, 0x142, 0xaa6}, {0xc01765d44b, 0x103, 0x9e9}, {0xc01771544b, 0xe9, ...})
	github.com/dolthub/dolt/go/libraries/doltcore/merge/merge_prolly_rows.go:1915 +0x311
github.com/dolthub/dolt/go/store/prolly/tree.(*ThreeWayDiffer[...]).Next(0x4498880, 0xc000a7dc20)
	github.com/dolthub/dolt/go/store/prolly/tree/three_way_differ.go:200 +0x6f8
github.com/dolthub/dolt/go/libraries/doltcore/merge.computeProllyTreePatches(0xc000a7dc20, 0xc01465f180, {0x44a6be0, 0xc00da91580}, 0xc018b57c00, 0xc01a618508, {0x0?, 0x0?, 0x0?}, {0x0, ...}, ...)
	github.com/dolthub/dolt/go/libraries/doltcore/merge/merge_prolly_rows.go:296 +0x13af
github.com/dolthub/dolt/go/libraries/doltcore/merge.mergeProllyTableData.func1()
	github.com/dolthub/dolt/go/libraries/doltcore/merge/merge_prolly_rows.go:429 +0x91
golang.org/x/sync/errgroup.(*Group).Go.func1()
	golang.org/x/sync@v0.16.0/errgroup/errgroup.go:93 +0x50
created by golang.org/x/sync/errgroup.(*Group).Go in goroutine 861
	golang.org/x/sync@v0.16.0/errgroup/errgroup.go:78 +0x247

[timsehn]

Thanks for the report. This has @nicktobey written all over it.

[nicktobey]

Hey Kenneth, thanks for reporting the issue.

It looks like this happens when a JSON value is NULL in the common ancestor and gets changed to different values in the two branches. I'm working on a fix that reports this as a merge conflict instead.

(Note that is only happens with the SQL NULL value, not a JSON document containing the JSON null value. These are separate values in MySQL)

[nicktobey]

#10178 contains the fix and was just merged. I'm cutting a new release now, and this should be fixed in v1.78.7