You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by gr...@apache.org on 2018/03/21 20:13:42 UTC
[incubator-superset] branch master updated: Cache the query string
(#4633)
This is an automated email from the ASF dual-hosted git repository.
graceguo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-superset.git
The following commit(s) were added to refs/heads/master by this push:
new 33aa976 Cache the query string (#4633)
33aa976 is described below
commit 33aa976e3d467847d4bc2940417e0e5ec873eb3a
Author: Jeffrey Wang <je...@gmail.com>
AuthorDate: Wed Mar 21 16:13:36 2018 -0400
Cache the query string (#4633)
* Cache the query string
* misc linter
---
superset/viz.py | 7 +++++--
tests/cache_tests.py | 41 +++++++++++++++++++++++++++++++++++++++++
tests/superset_test_config.py | 1 +
3 files changed, 47 insertions(+), 2 deletions(-)
diff --git a/superset/viz.py b/superset/viz.py
index 0c55262..f879639 100644
--- a/superset/viz.py
+++ b/superset/viz.py
@@ -315,9 +315,11 @@ class BaseViz(object):
try:
cache_value = pkl.loads(cache_value)
df = cache_value['df']
- is_loaded = True
- self._any_cache_key = cache_key
+ self.query = cache_value['query']
self._any_cached_dttm = cache_value['dttm']
+ self._any_cache_key = cache_key
+ self.status = utils.QueryStatus.SUCCESS
+ is_loaded = True
except Exception as e:
logging.exception(e)
logging.error('Error reading cache: ' +
@@ -346,6 +348,7 @@ class BaseViz(object):
cache_value = dict(
dttm=cached_dttm,
df=df if df is not None else None,
+ query=self.query,
)
cache_value = pkl.dumps(
cache_value, protocol=pkl.HIGHEST_PROTOCOL)
diff --git a/tests/cache_tests.py b/tests/cache_tests.py
new file mode 100644
index 0000000..27a2c5f
--- /dev/null
+++ b/tests/cache_tests.py
@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+"""Unit tests for Superset with caching"""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
+import json
+
+from superset import cache, db, utils
+from .base_tests import SupersetTestCase
+
+
+class CacheTests(SupersetTestCase):
+
+ def __init__(self, *args, **kwargs):
+ super(CacheTests, self).__init__(*args, **kwargs)
+
+ def setUp(self):
+ cache.clear()
+
+ def tearDown(self):
+ cache.clear()
+
+ def test_cache_value(self):
+ self.login(username='admin')
+ slc = self.get_slice('Girls', db.session)
+
+ json_endpoint = (
+ '/superset/explore_json/{}/{}/'
+ .format(slc.datasource_type, slc.datasource_id)
+ )
+ resp = self.get_json_resp(
+ json_endpoint, {'form_data': json.dumps(slc.viz.form_data)})
+ resp_from_cache = self.get_json_resp(
+ json_endpoint, {'form_data': json.dumps(slc.viz.form_data)})
+ self.assertFalse(resp['is_cached'])
+ self.assertTrue(resp_from_cache['is_cached'])
+ self.assertEqual(resp_from_cache['status'], utils.QueryStatus.SUCCESS)
+ self.assertEqual(resp['data'], resp_from_cache['data'])
+ self.assertEqual(resp['query'], resp_from_cache['query'])
diff --git a/tests/superset_test_config.py b/tests/superset_test_config.py
index 4d13744..3076a05 100644
--- a/tests/superset_test_config.py
+++ b/tests/superset_test_config.py
@@ -23,6 +23,7 @@ PUBLIC_ROLE_LIKE_GAMMA = True
AUTH_ROLE_PUBLIC = 'Public'
EMAIL_NOTIFICATIONS = False
+CACHE_CONFIG = {'CACHE_TYPE': 'simple'}
class CeleryConfig(object):
BROKER_URL = 'redis://localhost'
--
To stop receiving notification emails like this one, please contact
graceguo@apache.org.