Skip to content

Commit

Permalink
fix: columns/index rebuild (apache#16355)
Browse files Browse the repository at this point in the history
  • Loading branch information
betodealmeida committed Aug 19, 2021
1 parent c364c37 commit 6dc4ba8
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
4 changes: 3 additions & 1 deletion superset/charts/post_processing.py
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,9 @@ def apply_post_process(
query["coltypes"] = extract_dataframe_dtypes(processed_df)
query["rowcount"] = len(processed_df.index)

# flatten columns/index so we can encode data as JSON
# Flatten hierarchical columns/index since they are represented as
# `Tuple[str]`. Otherwise encoding to JSON later will fail because
# maps cannot have tuples as their keys in JSON.
processed_df.columns = [
" ".join(str(name) for name in column).strip()
if isinstance(column, tuple)
Expand Down
8 changes: 6 additions & 2 deletions superset/utils/csv.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,14 @@ def get_chart_dataframe(

result = simplejson.loads(content.decode("utf-8"))
df = pd.DataFrame.from_dict(result["result"][0]["data"])

# rebuild hierarchical columns and index
df.columns = pd.MultiIndex.from_tuples(
tuple(colname) for colname in result["result"][0]["colnames"]
tuple(colname) if isinstance(colname, list) else (colname,)
for colname in result["result"][0]["colnames"]
)
df.index = pd.MultiIndex.from_tuples(
tuple(indexname) for indexname in result["result"][0]["indexnames"]
tuple(indexname) if isinstance(indexname, list) else (indexname,)
for indexname in result["result"][0]["indexnames"]
)
return df

0 comments on commit 6dc4ba8

Please sign in to comment.