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.

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

Improve perfs by using ujson #3827

Merged
merged 1 commit into from
Jun 18, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions admin/c2cgeoportal_admin/views/functionalities.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def index(self):
return super().index()

@view_config(route_name='c2cgeoform_grid',
renderer='json')
renderer='fast_json')
def grid(self):
return super().grid()

Expand All @@ -49,7 +49,7 @@ def save(self):

@view_config(route_name='c2cgeoform_item',
request_method='DELETE',
renderer='json')
renderer='fast_json')
def delete(self):
return super().delete()

Expand Down
4 changes: 2 additions & 2 deletions admin/c2cgeoportal_admin/views/interfaces.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def index(self):
return super().index()

@view_config(route_name='c2cgeoform_grid',
renderer='json')
renderer='fast_json')
def grid(self):
return super().grid()

Expand All @@ -55,7 +55,7 @@ def save(self):

@view_config(route_name='c2cgeoform_item',
request_method='DELETE',
renderer='json')
renderer='fast_json')
def delete(self):
return super().delete()

Expand Down
4 changes: 2 additions & 2 deletions admin/c2cgeoportal_admin/views/layer_groups.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def index(self):
return super().index()

@view_config(route_name='c2cgeoform_grid',
renderer='json')
renderer='fast_json')
def grid(self):
return super().grid()

Expand All @@ -64,7 +64,7 @@ def save(self):

@view_config(route_name='c2cgeoform_item',
request_method='DELETE',
renderer='json')
renderer='fast_json')
def delete(self):
return super().delete()

Expand Down
4 changes: 2 additions & 2 deletions admin/c2cgeoportal_admin/views/layers_v1.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def index(self):
return super().index()

@view_config(route_name='c2cgeoform_grid',
renderer='json')
renderer='fast_json')
def grid(self):
return super().grid()

Expand All @@ -82,7 +82,7 @@ def save(self):

@view_config(route_name='c2cgeoform_item',
request_method='DELETE',
renderer='json')
renderer='fast_json')
def delete(self):
return super().delete()

Expand Down
6 changes: 3 additions & 3 deletions admin/c2cgeoportal_admin/views/layers_wms.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def index(self):
return super().index()

@view_config(route_name='c2cgeoform_grid',
renderer='json')
renderer='fast_json')
def grid(self):
return super().grid()

Expand Down Expand Up @@ -96,7 +96,7 @@ def save(self):

@view_config(route_name='c2cgeoform_item',
request_method='DELETE',
renderer='json')
renderer='fast_json')
def delete(self):
return super().delete()

Expand All @@ -108,7 +108,7 @@ def duplicate(self):

@view_config(route_name='convert_to_wmts',
request_method='POST',
renderer='json')
renderer='fast_json')
def convert_to_wmts(self):
src = self._get_object()
dbsession = self._request.dbsession
Expand Down
6 changes: 3 additions & 3 deletions admin/c2cgeoportal_admin/views/layers_wmts.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def index(self):
return super().index()

@view_config(route_name='c2cgeoform_grid',
renderer='json')
renderer='fast_json')
def grid(self):
return super().grid()

Expand Down Expand Up @@ -90,7 +90,7 @@ def save(self):

@view_config(route_name='c2cgeoform_item',
request_method='DELETE',
renderer='json')
renderer='fast_json')
def delete(self):
return super().delete()

Expand All @@ -102,7 +102,7 @@ def duplicate(self):

@view_config(route_name='convert_to_wms',
request_method='POST',
renderer='json')
renderer='fast_json')
def convert_to_wms(self):
src = self._get_object()
dbsession = self._request.dbsession
Expand Down
6 changes: 3 additions & 3 deletions admin/c2cgeoportal_admin/views/layertree.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def index(self):
return {'limit_exceeded': limit_exceeded}

@view_config(route_name='layertree_children',
renderer='json')
renderer='fast_json')
def children(self):
group_id = self._request.params.get('group_id', None)
path = self._request.params.get('path', '')
Expand Down Expand Up @@ -143,7 +143,7 @@ def _item_actions(self, item, parent_id=None):

@view_config(route_name='layertree_unlink',
request_method='DELETE',
renderer='json')
renderer='fast_json')
def unlink(self):
group_id = self._request.matchdict.get('group_id')
item_id = self._request.matchdict.get('item_id')
Expand All @@ -162,7 +162,7 @@ def unlink(self):

@view_config(route_name='layertree_delete',
request_method='DELETE',
renderer='json')
renderer='fast_json')
def delete(self):
item_id = self._request.matchdict.get('item_id')
item = self._request.dbsession.query(TreeItem).get(item_id)
Expand Down
4 changes: 2 additions & 2 deletions admin/c2cgeoportal_admin/views/ogc_servers.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def index(self):
return super().index()

@view_config(route_name='c2cgeoform_grid',
renderer='json')
renderer='fast_json')
def grid(self):
return super().grid()

Expand All @@ -56,7 +56,7 @@ def save(self):

@view_config(route_name='c2cgeoform_item',
request_method='DELETE',
renderer='json')
renderer='fast_json')
def delete(self):
return super().delete()

Expand Down
4 changes: 2 additions & 2 deletions admin/c2cgeoportal_admin/views/restriction_areas.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def index(self):
return super().index()

@view_config(route_name='c2cgeoform_grid',
renderer='json')
renderer='fast_json')
def grid(self):
return super().grid()

Expand All @@ -70,7 +70,7 @@ def save(self):

@view_config(route_name='c2cgeoform_item',
request_method='DELETE',
renderer='json')
renderer='fast_json')
def delete(self):
return super().delete()

Expand Down
4 changes: 2 additions & 2 deletions admin/c2cgeoportal_admin/views/roles.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def index(self):
return super().index()

@view_config(route_name='c2cgeoform_grid',
renderer='json')
renderer='fast_json')
def grid(self):
return super().grid()

Expand All @@ -71,7 +71,7 @@ def save(self):

@view_config(route_name='c2cgeoform_item',
request_method='DELETE',
renderer='json')
renderer='fast_json')
def delete(self):
return super().delete()

Expand Down
4 changes: 2 additions & 2 deletions admin/c2cgeoportal_admin/views/themes.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def index(self):
return super().index()

@view_config(route_name='c2cgeoform_grid',
renderer='json')
renderer='fast_json')
def grid(self):
return super().grid()

Expand All @@ -92,7 +92,7 @@ def save(self):

@view_config(route_name='c2cgeoform_item',
request_method='DELETE',
renderer='json')
renderer='fast_json')
def delete(self):
return super().delete()

Expand Down
4 changes: 2 additions & 2 deletions admin/c2cgeoportal_admin/views/users.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def index(self):
return super().index()

@view_config(route_name='c2cgeoform_grid',
renderer='json')
renderer='fast_json')
def grid(self):
return super().grid()

Expand Down Expand Up @@ -76,7 +76,7 @@ def save(self):

@view_config(route_name='c2cgeoform_item',
request_method='DELETE',
renderer='json')
renderer='fast_json')
def delete(self):
return super().delete()

Expand Down
2 changes: 1 addition & 1 deletion geoportal/c2cgeoportal_geoportal/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,7 @@ def includeme(config):

settings = config.get_settings()

config.add_notfound_view(notfound, append_slash=True, renderer='json', http_cache=0)
config.add_notfound_view(notfound, append_slash=True, renderer='fast_json', http_cache=0)

config.include("c2cgeoportal_commons")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const webpack = require('webpack');
const HtmlWebpackPlugin = require('html-webpack-plugin');
const CopyWebpackPlugin = require('copy-webpack-plugin');

const INTERFACE_THEME = ${__import__('json').dumps(interfaces_theme)};
const INTERFACE_THEME = ${__import__('ujson').dumps(interfaces_theme)};

const plugins = [];
const entry = {};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const webpack = require('webpack');
const HtmlWebpackPlugin = require('html-webpack-plugin');
const CopyWebpackPlugin = require('copy-webpack-plugin');

const INTERFACE_THEME = ${__import__('json').dumps(interfaces_theme)};
const INTERFACE_THEME = ${__import__('ujson').dumps(interfaces_theme)};

const plugins = [];
const entry = {};
Expand Down