[ARVADOS] updated: 1.3.0-1372-g31cfadefd

Git user git at public.curoverse.com
Thu Jul 18 19:29:10 UTC 2019


Summary of changes:
 services/fuse/arvados_fuse/__init__.py | 4 ++--
 services/fuse/arvados_fuse/fusedir.py  | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

       via  31cfadefdd43f2ddf8f31b43e7ea85ebe30f2935 (commit)
      from  67e4024755b7871b7f6dcc30ff094bb3291e1631 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 31cfadefdd43f2ddf8f31b43e7ea85ebe30f2935
Author: Eric Biagiotti <ebiagiotti at veritasgenetics.com>
Date:   Thu Jul 18 15:28:05 2019 -0400

    14965: Optimizes dict iteration
    
    Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti <ebiagiotti at veritasgenetics.com>

diff --git a/services/fuse/arvados_fuse/__init__.py b/services/fuse/arvados_fuse/__init__.py
index ef66a97fa..1fbfc1ee4 100644
--- 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 9d53df950..328765744 100644
--- 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

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list