Skip to content

Marshal the value into the null value if the slot is not migrating #346

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
git-hulk merged 10 commits into from
Sep 29, 2025
Merged

Marshal the value into the null value if the slot is not migrating #346

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5a31c23
Fix old cluster that had -1 denoting isNotMigrating, compatible new c…
hll1213181368 Sep 6, 2025
bb49dae
Update cluster_shard.go
hll1213181368 Sep 19, 2025
7a0401b
Update slot.go
hll1213181368 Sep 19, 2025
88e4cd3
Update slot_test.go
hll1213181368 Sep 19, 2025
7240b0a
Update slot_test.go
hll1213181368 Sep 26, 2025
715308d
Merge branch 'unstable' into unstable
git-hulk Sep 28, 2025
da50fa1
Merge branch 'unstable' into unstable
git-hulk Sep 28, 2025
85d6f4d
Merge branch 'unstable' into unstable
hll1213181368 Sep 29, 2025
5927e71
Update store/slot_test.go
git-hulk Sep 29, 2025
2fc56e6
Update store/slot_test.go
git-hulk Sep 29, 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
8 changes: 1 addition & 7 deletions store/slot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,13 +227,7 @@ func (s *MigratingSlot) UnmarshalJSON(data []byte) error {

func (s *MigratingSlot) MarshalJSON() ([]byte, error) {
if !s.IsMigrating {
// backwards compatibility. When we read from an old cluster that had `-1`
// denoting !isMigrating. The MigratingSlot field will not be nil. So when
// this field is marshal'd back into JSON format, we can keep it as it was
// which was `-1`.
// The only case this turns back to null is if a migration happens on this
// shard, and the function `ClearMigrateState()` is called on the shard.
return json.Marshal(NotMigratingInt)
return json.Marshal(nil)
}
return json.Marshal(s.String())
}
Expand Down
12 changes: 5 additions & 7 deletions store/slot_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,17 +94,15 @@ func TestMigratingSlot_MarshalUnmarshalJSON(t *testing.T) {
migratingSlot = MigratingSlot{SlotRange: SlotRange{Start: 0, Stop: 0}, IsMigrating: false}
migratingSlotBytes, err = json.Marshal(&migratingSlot)
require.NoError(t, err)
err = json.Unmarshal(migratingSlotBytes, &migratingSlot)
require.NoError(t, err)
assert.Equal(t, MigratingSlot{SlotRange{Start: 0, Stop: 0}, false}, migratingSlot)
// null []byte equal
assert.Equal(t, []byte{0x6e, 0x75, 0x6c, 0x6c}, migratingSlotBytes)

// same test as earlier, but checks that it resets the start and stop
migratingSlot = MigratingSlot{SlotRange: SlotRange{Start: 5, Stop: 5}, IsMigrating: false}
migratingSlotBytes, err = json.Marshal(&migratingSlot)
require.NoError(t, err)
err = json.Unmarshal(migratingSlotBytes, &migratingSlot)
require.NoError(t, err)
assert.Equal(t, MigratingSlot{SlotRange{Start: 0, Stop: 0}, false}, migratingSlot, "expects start and stop to reset to 0")
// null []byte equal
assert.Equal(t, []byte{0x6e, 0x75, 0x6c, 0x6c}, migratingSlotBytes)
}

// TestMigratingSlot_MarshalJSON will checks the resulting string
Expand All @@ -122,7 +120,7 @@ func TestMigratingSlot_MarshalJSON(t *testing.T) {
migratingSlot = MigratingSlot{SlotRange: SlotRange{Start: 5, Stop: 10}, IsMigrating: false}
migratingSlotBytes, err = json.Marshal(&migratingSlot)
require.NoError(t, err)
assert.Equal(t, `-1`, string(migratingSlotBytes))
assert.Equal(t, `null`, string(migratingSlotBytes))
}

func TestMigrateSlotRange_MarshalAndUnmarshalJSON(t *testing.T) {
Expand Down
Loading