mirror of
https://github.com/rojo-rbx/rojo.git
synced 2026-04-24 22:56:02 +00:00
Fix PatchTree performance issues (#755)
When building the tree, I've implemented a few improvements: - We no longer traverse the full ancestry for every leaf node- we exit early when we find a node that already exists - We no longer search the entire tree to see if a node id exists before creating one with that id, we just check if is in the map
This commit is contained in:
@@ -22,6 +22,7 @@
|
|||||||
* Added better support for `Font` properties ([#731])
|
* Added better support for `Font` properties ([#731])
|
||||||
* Add new plugin template to the `init` command ([#738])
|
* Add new plugin template to the `init` command ([#738])
|
||||||
* Added rich Source diffs in patch visualizer ([#748])
|
* Added rich Source diffs in patch visualizer ([#748])
|
||||||
|
* Fix PatchTree performance issues ([#755])
|
||||||
|
|
||||||
[#745]: https://github.com/rojo-rbx/rojo/pull/745
|
[#745]: https://github.com/rojo-rbx/rojo/pull/745
|
||||||
[#668]: https://github.com/rojo-rbx/rojo/pull/668
|
[#668]: https://github.com/rojo-rbx/rojo/pull/668
|
||||||
@@ -44,6 +45,7 @@
|
|||||||
[#731]: https://github.com/rojo-rbx/rojo/pull/731
|
[#731]: https://github.com/rojo-rbx/rojo/pull/731
|
||||||
[#738]: https://github.com/rojo-rbx/rojo/pull/738
|
[#738]: https://github.com/rojo-rbx/rojo/pull/738
|
||||||
[#748]: https://github.com/rojo-rbx/rojo/pull/748
|
[#748]: https://github.com/rojo-rbx/rojo/pull/748
|
||||||
|
[#755]: https://github.com/rojo-rbx/rojo/pull/755
|
||||||
|
|
||||||
## [7.3.0] - April 22, 2023
|
## [7.3.0] - April 22, 2023
|
||||||
* Added `$attributes` to project format. ([#574])
|
* Added `$attributes` to project format. ([#574])
|
||||||
|
|||||||
@@ -64,18 +64,18 @@ local Tree = {}
|
|||||||
Tree.__index = Tree
|
Tree.__index = Tree
|
||||||
|
|
||||||
function Tree.new()
|
function Tree.new()
|
||||||
local tree = {
|
local tree = {
|
||||||
idToNode = {},
|
idToNode = {},
|
||||||
ROOT = {
|
ROOT = {
|
||||||
className = "DataModel",
|
className = "DataModel",
|
||||||
name = "ROOT",
|
name = "ROOT",
|
||||||
children = {},
|
children = {},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
-- Add ROOT to idToNode or it won't be found by getNode since that searches *within* ROOT
|
-- Add ROOT to idToNode or it won't be found by getNode since that searches *within* ROOT
|
||||||
tree.idToNode["ROOT"] = tree.ROOT
|
tree.idToNode["ROOT"] = tree.ROOT
|
||||||
|
|
||||||
return setmetatable(tree, Tree)
|
return setmetatable(tree, Tree)
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Iterates over all sub-nodes, depth first
|
-- Iterates over all sub-nodes, depth first
|
||||||
@@ -94,23 +94,27 @@ end
|
|||||||
-- Finds a node by id, depth first
|
-- Finds a node by id, depth first
|
||||||
-- searchNode is the node to start the search within, defaults to root
|
-- searchNode is the node to start the search within, defaults to root
|
||||||
function Tree:getNode(id, searchNode)
|
function Tree:getNode(id, searchNode)
|
||||||
if self.idToNode[id] then
|
if self.idToNode[id] then
|
||||||
return self.idToNode[id]
|
return self.idToNode[id]
|
||||||
end
|
end
|
||||||
|
|
||||||
local searchChildren = (searchNode or self.ROOT).children
|
local searchChildren = (searchNode or self.ROOT).children
|
||||||
for nodeId, node in searchChildren do
|
for nodeId, node in searchChildren do
|
||||||
if nodeId == id then
|
if nodeId == id then
|
||||||
self.idToNode[id] = node
|
self.idToNode[id] = node
|
||||||
return node
|
return node
|
||||||
end
|
end
|
||||||
local descendant = self:getNode(id, node)
|
local descendant = self:getNode(id, node)
|
||||||
if descendant then
|
if descendant then
|
||||||
return descendant
|
return descendant
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
|
end
|
||||||
|
|
||||||
|
function Tree:doesNodeExist(id)
|
||||||
|
return self.idToNode[id] ~= nil
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Adds a node to the tree as a child of the node with id == parent
|
-- Adds a node to the tree as a child of the node with id == parent
|
||||||
@@ -120,52 +124,53 @@ end
|
|||||||
function Tree:addNode(parent, props)
|
function Tree:addNode(parent, props)
|
||||||
assert(props.id, "props must contain id")
|
assert(props.id, "props must contain id")
|
||||||
|
|
||||||
parent = parent or "ROOT"
|
parent = parent or "ROOT"
|
||||||
|
|
||||||
local node = self:getNode(props.id)
|
if self:doesNodeExist(props.id) then
|
||||||
if node then
|
|
||||||
-- Update existing node
|
-- Update existing node
|
||||||
for k, v in props do
|
local node = self:getNode(props.id)
|
||||||
node[k] = v
|
for k, v in props do
|
||||||
end
|
node[k] = v
|
||||||
return node
|
end
|
||||||
end
|
return node
|
||||||
|
end
|
||||||
|
|
||||||
node = table.clone(props)
|
local node = table.clone(props)
|
||||||
node.children = {}
|
node.children = {}
|
||||||
node.parentId = parent
|
node.parentId = parent
|
||||||
|
|
||||||
local parentNode = self:getNode(parent)
|
local parentNode = self:getNode(parent)
|
||||||
if not parentNode then
|
if not parentNode then
|
||||||
Log.warn("Failed to create node since parent doesnt exist: {}, {}", parent, props)
|
Log.warn("Failed to create node since parent doesnt exist: {}, {}", parent, props)
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
parentNode.children[node.id] = node
|
parentNode.children[node.id] = node
|
||||||
self.idToNode[node.id] = node
|
self.idToNode[node.id] = node
|
||||||
|
|
||||||
return node
|
return node
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Given a list of ancestor ids in descending order, builds the nodes for them
|
-- Given a list of ancestor ids in descending order, builds the nodes for them
|
||||||
-- using the patch and instanceMap info
|
-- using the patch and instanceMap info
|
||||||
function Tree:buildAncestryNodes(ancestryIds: { string }, patch, instanceMap)
|
function Tree:buildAncestryNodes(previousId: string?, ancestryIds: { string }, patch, instanceMap)
|
||||||
-- Build nodes for ancestry by going up the tree
|
-- Build nodes for ancestry by going up the tree
|
||||||
local previousId = "ROOT"
|
previousId = previousId or "ROOT"
|
||||||
for _, ancestorId in ancestryIds do
|
|
||||||
local value = instanceMap.fromIds[ancestorId] or patch.added[ancestorId]
|
for _, ancestorId in ancestryIds do
|
||||||
if not value then
|
local value = instanceMap.fromIds[ancestorId] or patch.added[ancestorId]
|
||||||
Log.warn("Failed to find ancestor object for " .. ancestorId)
|
if not value then
|
||||||
continue
|
Log.warn("Failed to find ancestor object for " .. ancestorId)
|
||||||
end
|
continue
|
||||||
self:addNode(previousId, {
|
end
|
||||||
id = ancestorId,
|
self:addNode(previousId, {
|
||||||
className = value.ClassName,
|
id = ancestorId,
|
||||||
name = value.Name,
|
className = value.ClassName,
|
||||||
instance = if typeof(value) == "Instance" then value else nil,
|
name = value.Name,
|
||||||
})
|
instance = if typeof(value) == "Instance" then value else nil,
|
||||||
previousId = ancestorId
|
})
|
||||||
end
|
previousId = ancestorId
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
local PatchTree = {}
|
local PatchTree = {}
|
||||||
@@ -175,6 +180,8 @@ local PatchTree = {}
|
|||||||
function PatchTree.build(patch, instanceMap, changeListHeaders)
|
function PatchTree.build(patch, instanceMap, changeListHeaders)
|
||||||
local tree = Tree.new()
|
local tree = Tree.new()
|
||||||
|
|
||||||
|
local knownAncestors = {}
|
||||||
|
|
||||||
for _, change in patch.updated do
|
for _, change in patch.updated do
|
||||||
local instance = instanceMap.fromIds[change.id]
|
local instance = instanceMap.fromIds[change.id]
|
||||||
if not instance then
|
if not instance then
|
||||||
@@ -185,13 +192,21 @@ function PatchTree.build(patch, instanceMap, changeListHeaders)
|
|||||||
local ancestryIds = {}
|
local ancestryIds = {}
|
||||||
local parentObject = instance.Parent
|
local parentObject = instance.Parent
|
||||||
local parentId = instanceMap.fromInstances[parentObject]
|
local parentId = instanceMap.fromInstances[parentObject]
|
||||||
|
local previousId = nil
|
||||||
while parentObject do
|
while parentObject do
|
||||||
|
if knownAncestors[parentId] then
|
||||||
|
-- We've already added this ancestor
|
||||||
|
previousId = parentId
|
||||||
|
break
|
||||||
|
end
|
||||||
|
|
||||||
table.insert(ancestryIds, 1, parentId)
|
table.insert(ancestryIds, 1, parentId)
|
||||||
|
knownAncestors[parentId] = true
|
||||||
parentObject = parentObject.Parent
|
parentObject = parentObject.Parent
|
||||||
parentId = instanceMap.fromInstances[parentObject]
|
parentId = instanceMap.fromInstances[parentObject]
|
||||||
end
|
end
|
||||||
|
|
||||||
tree:buildAncestryNodes(ancestryIds, patch, instanceMap)
|
tree:buildAncestryNodes(previousId, ancestryIds, patch, instanceMap)
|
||||||
|
|
||||||
-- Gather detail text
|
-- Gather detail text
|
||||||
local changeList, hint = nil, nil
|
local changeList, hint = nil, nil
|
||||||
@@ -268,14 +283,22 @@ function PatchTree.build(patch, instanceMap, changeListHeaders)
|
|||||||
local ancestryIds = {}
|
local ancestryIds = {}
|
||||||
local parentObject = instance.Parent
|
local parentObject = instance.Parent
|
||||||
local parentId = instanceMap.fromInstances[parentObject] or HttpService:GenerateGUID(false)
|
local parentId = instanceMap.fromInstances[parentObject] or HttpService:GenerateGUID(false)
|
||||||
|
local previousId = nil
|
||||||
while parentObject do
|
while parentObject do
|
||||||
|
if knownAncestors[parentId] then
|
||||||
|
-- We've already added this ancestor
|
||||||
|
previousId = parentId
|
||||||
|
break
|
||||||
|
end
|
||||||
|
|
||||||
instanceMap:insert(parentId, parentObject) -- This ensures we can find the parent later
|
instanceMap:insert(parentId, parentObject) -- This ensures we can find the parent later
|
||||||
table.insert(ancestryIds, 1, parentId)
|
table.insert(ancestryIds, 1, parentId)
|
||||||
|
knownAncestors[parentId] = true
|
||||||
parentObject = parentObject.Parent
|
parentObject = parentObject.Parent
|
||||||
parentId = instanceMap.fromInstances[parentObject] or HttpService:GenerateGUID(false)
|
parentId = instanceMap.fromInstances[parentObject] or HttpService:GenerateGUID(false)
|
||||||
end
|
end
|
||||||
|
|
||||||
tree:buildAncestryNodes(ancestryIds, patch, instanceMap)
|
tree:buildAncestryNodes(previousId, ancestryIds, patch, instanceMap)
|
||||||
|
|
||||||
-- Add this node to tree
|
-- Add this node to tree
|
||||||
local nodeId = instanceMap.fromInstances[instance] or HttpService:GenerateGUID(false)
|
local nodeId = instanceMap.fromInstances[instance] or HttpService:GenerateGUID(false)
|
||||||
@@ -295,8 +318,16 @@ function PatchTree.build(patch, instanceMap, changeListHeaders)
|
|||||||
local parentId = change.Parent
|
local parentId = change.Parent
|
||||||
local parentData = patch.added[parentId]
|
local parentData = patch.added[parentId]
|
||||||
local parentObject = instanceMap.fromIds[parentId]
|
local parentObject = instanceMap.fromIds[parentId]
|
||||||
|
local previousId = nil
|
||||||
while parentId do
|
while parentId do
|
||||||
|
if knownAncestors[parentId] then
|
||||||
|
-- We've already added this ancestor
|
||||||
|
previousId = parentId
|
||||||
|
break
|
||||||
|
end
|
||||||
|
|
||||||
table.insert(ancestryIds, 1, parentId)
|
table.insert(ancestryIds, 1, parentId)
|
||||||
|
knownAncestors[parentId] = true
|
||||||
parentId = nil
|
parentId = nil
|
||||||
|
|
||||||
if parentData then
|
if parentData then
|
||||||
@@ -312,7 +343,7 @@ function PatchTree.build(patch, instanceMap, changeListHeaders)
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
tree:buildAncestryNodes(ancestryIds, patch, instanceMap)
|
tree:buildAncestryNodes(previousId, ancestryIds, patch, instanceMap)
|
||||||
|
|
||||||
-- Gather detail text
|
-- Gather detail text
|
||||||
local changeList, hint = nil, nil
|
local changeList, hint = nil, nil
|
||||||
|
|||||||
Reference in New Issue
Block a user