14965: Optimizes dict iteration

Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti <ebiagiotti@veritasgenetics.com>

diff --git a/services/fuse/arvados_fuse/__init__.py b/services/fuse/arvados_fuse/__init__.py
index ef66a97fa362468cd46caa48e164fde27f5842ea..1fbfc1ee46424ab95ae90449694f0426f50cb78a 100644 (file)
--- a/services/fuse/arvados_fuse/__init__.py
+++ b/services/fuse/arvados_fuse/__init__.py
@@ -54,6 +54,7 @@ from __future__ import division
 from future.utils import viewitems
 from future.utils import native
 from future.utils import listvalues
+from future.utils import listitems
 from future import standard_library
 standard_library.install_aliases()
 from builtins import next
@@ -723,8 +724,7 @@ class Operations(llfuse.Operations):
 
         # update atime
         self.inodes.touch(p)
-
-        self._filehandles[fh] = DirectoryHandle(fh, p, [('.', p), ('..', parent)] + list(p.items()))
+        self._filehandles[fh] = DirectoryHandle(fh, p, [('.', p), ('..', parent)] + listitems(p))
         return fh
 
     @readdir_time.time()

diff --git a/services/fuse/arvados_fuse/fusedir.py b/services/fuse/arvados_fuse/fusedir.py
index 9d53df950b8cd4886398be7134d4207dcb0beef5..328765744128d180ba30854854f71b2340ee1cc0 100644 (file)
--- a/services/fuse/arvados_fuse/fusedir.py
+++ b/services/fuse/arvados_fuse/fusedir.py
@@ -5,6 +5,7 @@
 from __future__ import absolute_import
 from __future__ import division
 from future.utils import viewitems
+from future.utils import itervalues
 from builtins import dict
 import logging
 import re
@@ -167,7 +168,7 @@ class Directory(FreshBase):
     def in_use(self):
         if super(Directory, self).in_use():
             return True
-        for v in self._entries.values():
+        for v in itervalues(self._entries):
             if v.in_use():
                 return True
         return False
@@ -175,7 +176,7 @@ class Directory(FreshBase):
     def has_ref(self, only_children):
         if super(Directory, self).has_ref(only_children):
             return True
-        for v in self._entries.values():
+        for v in itervalues(self._entries):
             if v.has_ref(False):
                 return True
         return False