Skip to content

fix: DataStoreStage doesn't delete keys when overwritten with a table #459

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: DataStoreStage doesn't delete keys when overwritten with a table #459

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3c68bf
fix: DataStoreStage doesn't delete keys when overwritten with a table
OttoHatt Apr 21, 2024
f8db7e8
Update DataStoreStage.lua
Quenty Sep 25, 2024
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
24 changes: 16 additions & 8 deletions src/datastore/src/Server/Modules/DataStoreStage.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,23 +514,31 @@ function DataStoreStage:Overwrite(data)
if type(data) == "table" then
local newSaveSnapshot = {}

local remaining = Set.fromKeys(self._stores)
for key, store in pairs(self._stores) do
-- Update each store
store:Overwrite(data[key])
-- Capture all keys
local remainingKeys = Set.fromKeys(self._stores)
if typeof(self._saveDataSnapshot) == "table" then
Set.unionUpdate(remainingKeys, Set.fromKeys(self._saveDataSnapshot))
end
if typeof(self._baseDataSnapshot) == "table" then
Set.unionUpdate(remainingKeys, Set.fromKeys(self._baseDataSnapshot))
end

-- TODO: Overwriting stores is non-atomic and fires off multiple changes. Re-entrance could break our stuff.
for key, value in pairs(data) do
remaining[key] = nil
remainingKeys[key] = nil
if self._stores[key] then
self._stores[key]:Overwrite(value)
else
newSaveSnapshot[key] = value
end
end

for key, _ in pairs(remaining) do
self._stores[key]:Overwrite(DataStoreDeleteToken)
for key, _ in pairs(remainingKeys) do
if self._stores[key] then
self._stores[key]:Overwrite(DataStoreDeleteToken)
else
newSaveSnapshot[key] = DataStoreDeleteToken
end
end

self._saveDataSnapshot = table.freeze(newSaveSnapshot)
Expand Down Expand Up @@ -1021,4 +1029,4 @@ function DataStoreStage:_checkIntegrity()
end


return DataStoreStage
return DataStoreStage
Loading