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

Jump to bottom

feat(chart): Enable caching per user when user impersonation is enabled #20114

Merged
merged 14 commits into from
Jun 21, 2022
Merged

feat(chart): Enable caching per user when user impersonation is enabled #20114

Changes from 2 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5aa9df2
add username to extra cache keys when impersonation is enabled.
Samira-El May 18, 2022
2c4d0d4
Merge branch 'apache:master' into cache_per_user
Samira-El May 18, 2022
dfba02a
Merge branch 'apache:master' into cache_per_user
Samira-El May 20, 2022
4ec20bc
Merge branch 'apache:master' into cache_per_user
Samira-El May 25, 2022
1d47f76
don't put effective_user in extra_cache_key
Samira-El May 20, 2022
5890a52
get_impersonation_key method in engine_spec class to construct an im…
Samira-El May 25, 2022
f3cba77
pass datasource when creating query objects
Samira-El May 25, 2022
9d78199
adding an impersonation key when construction cache key
Samira-El May 25, 2022
69fbb36
add feature flag to control caching per user
Samira-El May 25, 2022
01f8bb3
revert changes
Samira-El May 25, 2022
8315c21
make precommit and pylint happy
Samira-El May 26, 2022
0731669
pass a User instance
Samira-El Jun 16, 2022
92498a5
remove unnecessary import
Samira-El Jun 16, 2022
01f0da1
Merge branch 'apache:master' into cache_per_user
Samira-El Jun 17, 2022
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
10 changes: 10 additions & 0 deletions superset/connectors/sqla/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@
get_virtual_table_metadata,
validate_adhoc_subquery,
)
from superset.databases.utils import make_url_safe
from superset.datasets.models import Dataset as NewDataset
from superset.db_engine_specs.base import BaseEngineSpec, CTE_ALIAS, TimestampExpression
from superset.exceptions import (
Expand Down Expand Up @@ -2026,6 +2027,15 @@ class and any keys added via `ExtraCache`.
if self.has_extra_cache_key_calls(query_obj):
sqla_query = self.get_sqla_query(**query_obj)
extra_cache_keys += sqla_query.extra_cache_keys

sqlalchemy_url = make_url_safe(self.database.sqlalchemy_uri_decrypted)

if effective_user := self.database.get_effective_user(sqlalchemy_url):
logger.debug("User impersonation is enabled for database '%s', adding "
"current username to '%s' datasource's extra cache keys",
self.database_name, self.datasource_name)
extra_cache_keys.append(effective_user)
Samira-El marked this conversation as resolved.
Show resolved Hide resolved

return extra_cache_keys

@property
Expand Down