IQ.Lvbs/pytest-xdist
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loadscope: use dict instead of OrderedDict

Browse Source 
These days dicts are guaranteed to be ordered, so no need to use
OrderedDict in two of the three cases (the remaining case needs
`popitem(last=False)`).
This commit is contained in:
Ran Benita
2024-04-05 12:13:23 +03:00
parent 024c73f29e
commit ee0b09c61f
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/xdist/scheduler/loadscope.py
View File

@@ -90,8 +90,8 @@ class LoadScopeScheduling:
self.collection = None self.collection = None
self.workqueue = OrderedDict() self.workqueue = OrderedDict()
self.assigned_work = OrderedDict() self.assigned_work = {}
self.registered_collections = OrderedDict() self.registered_collections = {}
if log is None: if log is None:
self.log = Producer("loadscopesched") self.log = Producer("loadscopesched")
@@ -156,7 +156,7 @@ class LoadScopeScheduling:
bootstraps a new node. bootstraps a new node.
""" """
assert node not in self.assigned_work assert node not in self.assigned_work
self.assigned_work[node] = OrderedDict() self.assigned_work[node] = {}
def remove_node(self, node): def remove_node(self, node):
"""Remove a node from the scheduler. """Remove a node from the scheduler.
@@ -252,7 +252,7 @@ class LoadScopeScheduling:
scope, work_unit = self.workqueue.popitem(last=False) scope, work_unit = self.workqueue.popitem(last=False)
# Keep track of the assigned work # Keep track of the assigned work
assigned_to_node = self.assigned_work.setdefault(node, default=OrderedDict()) assigned_to_node = self.assigned_work.setdefault(node, {})
assigned_to_node[scope] = work_unit assigned_to_node[scope] = work_unit
# Ask the node to execute the workload # Ask the node to execute the workload
@@ -349,10 +349,10 @@ class LoadScopeScheduling:
return return
# Determine chunks of work (scopes) # Determine chunks of work (scopes)
unsorted_workqueue = OrderedDict() unsorted_workqueue = {}
for nodeid in self.collection: for nodeid in self.collection:
scope = self._split_scope(nodeid) scope = self._split_scope(nodeid)
work_unit = unsorted_workqueue.setdefault(scope, default=OrderedDict()) work_unit = unsorted_workqueue.setdefault(scope, {})
work_unit[nodeid] = False work_unit[nodeid] = False
# Insert tests scopes into work queue ordered by number of tests. # Insert tests scopes into work queue ordered by number of tests.
@@ -368,7 +368,7 @@ class LoadScopeScheduling:
self.log(f"Shutting down {extra_nodes} nodes") self.log(f"Shutting down {extra_nodes} nodes")
for _ in range(extra_nodes): for _ in range(extra_nodes):
unused_node, assigned = self.assigned_work.popitem(last=True) unused_node, assigned = self.assigned_work.popitem()
self.log(f"Shutting down unused node {unused_node}") self.log(f"Shutting down unused node {unused_node}")
unused_node.shutdown() unused_node.shutdown()