Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SVCS-676] Further Improve Memory Usage for CSV rendering #327

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

[SVCS-676] Further Improve Memory Usage for CSV rendering #327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c9d701
Further improve memory usage for CSV rendering
cslzchen Mar 29, 2018
ca1199d
Ignore false-positive flake8 undefined for del
cslzchen Mar 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions mfr/extensions/tabular/libs/stdlib_tools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ def csv_stdlib(fp):
dialect = csv.excel
else:
_set_dialect_quote_attrs(dialect, data)

del data

reader = csv.DictReader(fp, dialect=dialect)
columns = []
# update the reader field names to avoid duplicate column names when performing row extraction
Expand All @@ -41,6 +41,7 @@ def csv_stdlib(fp):
try:
rows = [row for row in reader]
except csv.Error as e:
del reader
if any("field larger than field limit" in errorMsg for errorMsg in e.args):
raise TabularRendererError(
'This file contains a field too large to render. '
Expand All @@ -51,10 +52,9 @@ def csv_stdlib(fp):
else:
raise TabularRendererError('csv.Error: {}'.format(e), extension='csv') from e

del reader # noqa
if not columns and not rows:
raise EmptyTableError('Table empty or corrupt.', extension='csv')

del reader
return {'Sheet 1': (columns, rows)}


Expand Down
16 changes: 11 additions & 5 deletions mfr/extensions/tabular/render.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,21 +33,27 @@ def render(self):
with open(self.file_path, errors='replace') as fp:
sheets, size, nbr_rows, nbr_cols = self._render_grid(fp, self.metadata.ext)

# Force GC
gc.collect()

if sheets and size:
json_sheets = json.dumps(sheets)
del sheets
# Forcing garbage collection accelerates the memory free/release process with a small
# but acceptable cost in performance
nbr_objs = gc.collect()
logger.debug('Number of unreachable objects collected: {}'.format(nbr_objs))
return self.TEMPLATE.render(
base=self.assets_url,
width=settings.TABLE_WIDTH,
height=settings.TABLE_HEIGHT,
sheets=json.dumps(sheets),
sheets=json_sheets,
options=json.dumps(size),
)

nbr_objs = gc.collect()
logger.debug('Number of unreachable objects collected: {}'.format(nbr_objs))
assert nbr_rows and nbr_cols
raise exceptions.TableTooBigError(
'Table is too large to render.',
'Table with more than {} rows or columns are not rendered. Please download the file to '
'view.'.format(settings.MAX_SIZE),
extension=self.metadata.ext,
nbr_cols=nbr_cols,
nbr_rows=nbr_rows
Expand Down