mirror of
https://github.com/apache/superset.git
synced 2026-05-11 10:55:43 +00:00
fix: row limits & row count labels are confusing (#27700)
(cherry picked from commit 12fe2929a4)
This commit is contained in:
committed by
Michael S. Molina
parent
026c75e018
commit
54942e2eaa
@@ -64,6 +64,7 @@ class QueryCacheManager:
|
||||
is_cached: bool | None = None,
|
||||
cache_dttm: str | None = None,
|
||||
cache_value: dict[str, Any] | None = None,
|
||||
sql_rowcount: int | None = None,
|
||||
) -> None:
|
||||
self.df = df
|
||||
self.query = query
|
||||
@@ -79,6 +80,7 @@ class QueryCacheManager:
|
||||
self.is_cached = is_cached
|
||||
self.cache_dttm = cache_dttm
|
||||
self.cache_value = cache_value
|
||||
self.sql_rowcount = sql_rowcount
|
||||
|
||||
# pylint: disable=too-many-arguments
|
||||
def set_query_result(
|
||||
@@ -102,6 +104,7 @@ class QueryCacheManager:
|
||||
self.rejected_filter_columns = query_result.rejected_filter_columns
|
||||
self.error_message = query_result.error_message
|
||||
self.df = query_result.df
|
||||
self.sql_rowcount = query_result.sql_rowcount
|
||||
self.annotation_data = {} if annotation_data is None else annotation_data
|
||||
|
||||
if self.status != QueryStatus.FAILED:
|
||||
@@ -117,6 +120,7 @@ class QueryCacheManager:
|
||||
"applied_filter_columns": self.applied_filter_columns,
|
||||
"rejected_filter_columns": self.rejected_filter_columns,
|
||||
"annotation_data": self.annotation_data,
|
||||
"sql_rowcount": self.sql_rowcount,
|
||||
}
|
||||
if self.is_loaded and key and self.status != QueryStatus.FAILED:
|
||||
self.set(
|
||||
@@ -167,6 +171,7 @@ class QueryCacheManager:
|
||||
query_cache.status = QueryStatus.SUCCESS
|
||||
query_cache.is_loaded = True
|
||||
query_cache.is_cached = cache_value is not None
|
||||
query_cache.sql_rowcount = cache_value.get("sql_rowcount", None)
|
||||
query_cache.cache_dttm = (
|
||||
cache_value["dttm"] if cache_value is not None else None
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user