From e63cb52630915698a69633bd222c44a4b375bb21 Mon Sep 17 00:00:00 2001
From: John Bodley <4567245+john-bodley@users.noreply.github.com>
Date: Sat, 28 Mar 2020 12:33:16 -0700
Subject: [PATCH] [fix] Fixing cache key inconsistencies (#9382)

Co-authored-by: John Bodley <john.bodley@airbnb.com>
---
 .../f9a30386bd74_cleanup_time_grainularity.py | 98 +++++++++++++++++++
 superset/viz.py                               |  2 +-
 2 files changed, 99 insertions(+), 1 deletion(-)
 create mode 100644 superset/migrations/versions/f9a30386bd74_cleanup_time_grainularity.py

diff --git a/superset/migrations/versions/f9a30386bd74_cleanup_time_grainularity.py b/superset/migrations/versions/f9a30386bd74_cleanup_time_grainularity.py
new file mode 100644
index 0000000000000..675cdfa2c2e48
--- /dev/null
+++ b/superset/migrations/versions/f9a30386bd74_cleanup_time_grainularity.py
@@ -0,0 +1,98 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+"""cleanup_time_grainularity
+
+Revision ID: f9a30386bd74
+Revises: b5998378c225
+Create Date: 2020-03-25 10:42:11.047328
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = "f9a30386bd74"
+down_revision = "b5998378c225"
+
+import json
+
+from alembic import op
+from sqlalchemy import Column, Integer, String, Text
+from sqlalchemy.ext.declarative import declarative_base
+
+from superset import db
+
+Base = declarative_base()
+
+
+class Slice(Base):
+    __tablename__ = "slices"
+
+    id = Column(Integer, primary_key=True)
+    params = Column(Text)
+    viz_type = Column(String(250))
+
+
+def upgrade():
+    """
+    Remove any erroneous time grainularity fields from slices foor those visualization
+    types which do not support time granularity.
+
+    :see: https://github.com/apache/incubator-superset/pull/8674
+    :see: https://github.com/apache/incubator-superset/pull/8764
+    :see: https://github.com/apache/incubator-superset/pull/8800
+    :see: https://github.com/apache/incubator-superset/pull/8825
+    """
+
+    bind = op.get_bind()
+    session = db.Session(bind=bind)
+
+    # Visualization types which support time grainularity (hence negate).
+    viz_types = [
+        "area",
+        "bar",
+        "big_number",
+        "compare",
+        "dual_line",
+        "line",
+        "pivot_table",
+        "table",
+        "time_pivot",
+        "time_table",
+    ]
+
+    # Erroneous time grainularity fields for either Druid NoSQL or SQL slices which do
+    # not support time grainularity.
+    erroneous = ["grainularity", "time_grain_sqla"]
+
+    for slc in session.query(Slice).filter(Slice.viz_type.notin_(viz_types)).all():
+        try:
+            params = json.loads(slc.params)
+
+            if any(field in params for field in erroneous):
+                for field in erroneous:
+                    if field in params:
+                        del params[field]
+
+                slc.params = json.dumps(params, sort_keys=True)
+        except Exception:
+            pass
+
+    session.commit()
+    session.close()
+
+
+def downgrade():
+    pass
diff --git a/superset/viz.py b/superset/viz.py
index 2de0d1864b0e9..7df94c577862d 100644
--- a/superset/viz.py
+++ b/superset/viz.py
@@ -330,7 +330,7 @@ def query_obj(self) -> Dict[str, Any]:
             "druid_time_origin": form_data.get("druid_time_origin", ""),
             "having": form_data.get("having", ""),
             "having_druid": form_data.get("having_filters", []),
-            "time_grain_sqla": form_data.get("time_grain_sqla", ""),
+            "time_grain_sqla": form_data.get("time_grain_sqla"),
             "time_range_endpoints": form_data.get("time_range_endpoints"),
             "where": form_data.get("where", ""),
         }