Anonymous avatar Anonymous committed 271d496

Fixed S3BotoStorage performance problem calling modified_time()

For running collectstatic on 10000 static files, it's the difference between <1s and minutes.

S3BotoStorage.modified_time was calling get() on entry and performing a remote call to populate the default (which only matters if get() fails to find the key)

I merely added a line to check if entry is None, then make the remote call.

Comments (0)

Files changed (1)

storages/backends/s3boto.py

         except ImportError:
             raise NotImplementedError()
         name = self._normalize_name(self._clean_name(name))
-        entry = self.entries.get(name, self.bucket.get_key(self._encode_name(name)))
+        entry = self.entries.get(name)
+        # only call the function if the get fails
+        if entry is None:
+            entry = self.bucket.get_key(self._encode_name(name))
         # convert to string to date
         last_modified_date = parser.parse(entry.last_modified)
         # if the date has no timzone, assume UTC
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.