You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by jo...@apache.org on 2023/07/19 14:21:51 UTC
[superset] branch master updated: fix(druid): Delete obsolete Druid NoSQL slice parameters (#24737)
This is an automated email from the ASF dual-hosted git repository.
johnbodley pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/superset.git
The following commit(s) were added to refs/heads/master by this push:
new 4c5ada421c fix(druid): Delete obsolete Druid NoSQL slice parameters (#24737)
4c5ada421c is described below
commit 4c5ada421c44054c56a3c6ccb5551352e4fd94c8
Author: John Bodley <45...@users.noreply.github.com>
AuthorDate: Wed Jul 19 07:21:43 2023 -0700
fix(druid): Delete obsolete Druid NoSQL slice parameters (#24737)
---
...delete_obsolete_druid_nosql_slice_parameters.py | 103 +++++++++++++++++++++
1 file changed, 103 insertions(+)
diff --git a/superset/migrations/versions/2023-07-18_15-30_863adcf72773_delete_obsolete_druid_nosql_slice_parameters.py b/superset/migrations/versions/2023-07-18_15-30_863adcf72773_delete_obsolete_druid_nosql_slice_parameters.py
new file mode 100644
index 0000000000..ce25bd85ef
--- /dev/null
+++ b/superset/migrations/versions/2023-07-18_15-30_863adcf72773_delete_obsolete_druid_nosql_slice_parameters.py
@@ -0,0 +1,103 @@
+# 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.
+"""delete obsolete Druid NoSQL slice parameters
+
+Revision ID: 863adcf72773
+Revises: 6d05b0a70c89
+Create Date: 2023-07-18 15:30:43.695135
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = "863adcf72773"
+down_revision = "6d05b0a70c89"
+
+import json
+import logging
+
+from alembic import op
+from sqlalchemy import Column, Integer, 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)
+ query_context = Column(Text)
+
+
+def upgrade():
+ bind = op.get_bind()
+ session = db.Session(bind=bind)
+
+ for slc in session.query(Slice).all():
+ if slc.params:
+ updated = False
+
+ try:
+ params = json.loads(slc.params)
+
+ for key in ["druid_time_origin", "granularity"]:
+ if key in params:
+ del params[key]
+ updated = True
+
+ if updated:
+ slc.params = json.dumps(params)
+ except Exception:
+ logging.exception(f"Unable to parse params for slice {slc.id}")
+
+ if slc.query_context:
+ updated = False
+
+ try:
+ query_context = json.loads(slc.query_context)
+
+ if form_data := query_context.get("form_data"):
+ for key in ["druid_time_origin", "granularity"]:
+ if key in form_data:
+ del form_data[key]
+ updated = True
+
+ for query in query_context.get("queries", []):
+ for key in ["druid_time_origin", "granularity"]:
+ if key in query:
+ del query[key]
+ updated = True
+
+ if extras := query.get("extras"):
+ if "having_druid" in extras:
+ del extras["having_druid"]
+ updated = True
+
+ if updated:
+ slc.query_context = json.dumps(query_context)
+ except Exception:
+ logging.exception(f"Unable to parse query context for slice {slc.id}")
+
+ session.commit()
+ session.close()
+
+
+def downgrade():
+ pass