remove lock changes

superset/commands/key_value/get.py

@@ -16,6 +16,7 @@
 # under the License.
 
 import logging
+from datetime import datetime
 from typing import Any, Optional, Union
 from uuid import UUID
 
@@ -66,6 +67,6 @@ def validate(self) -> None:
     def get(self) -> Optional[Any]:
         filter_ = get_filter(self.resource, self.key)
         entry = db.session.query(KeyValueEntry).filter_by(**filter_).first()
-        if entry and not entry.is_expired():
+        if entry and (entry.expires_on is None or entry.expires_on > datetime.now()):
             return self.codec.decode(entry.value)
         return None

superset/key_value/models.py

@@ -14,8 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from datetime import datetime
-
 from flask_appbuilder import Model
 from sqlalchemy import Column, DateTime, ForeignKey, Integer, LargeBinary, String
 from sqlalchemy.orm import relationship
@@ -40,6 +38,3 @@ class KeyValueEntry(AuditMixinNullable, ImportExportMixin, Model):
     changed_by_fk = Column(Integer, ForeignKey("ab_user.id"), nullable=True)
     created_by = relationship(security_manager.user_model, foreign_keys=[created_by_fk])
     changed_by = relationship(security_manager.user_model, foreign_keys=[changed_by_fk])
-
-    def is_expired(self) -> bool:
-        return self.expires_on is not None and self.expires_on <= datetime.now()

superset/utils/json.py

@@ -211,7 +211,7 @@ def dumps(  # pylint: disable=too-many-arguments
             cls=cls,
         )
     except UnicodeDecodeError:
-        results_string = simplejson.dumps(
+        results_string = simplejson.dumps(  # type: ignore[call-overload]
             obj,
             default=default,
             allow_nan=allow_nan,

superset/utils/lock.py

@@ -54,10 +54,6 @@ def sort(obj: T) -> T:
     return json.dumps(params)
 
 
-def get_key(namespace: str, **kwargs: Any) -> uuid.UUID:
-    return uuid.uuid5(uuid.uuid5(uuid.NAMESPACE_DNS, namespace), serialize(kwargs))
-
-
 @contextmanager
 def KeyValueDistributedLock(  # pylint: disable=invalid-name
     namespace: str,
@@ -82,7 +78,7 @@ def KeyValueDistributedLock(  # pylint: disable=invalid-name
     from superset.commands.key_value.delete import DeleteKeyValueCommand
     from superset.commands.key_value.delete_expired import DeleteExpiredKeyValueCommand
 
-    key = get_key(namespace, **kwargs)
+    key = uuid.uuid5(uuid.uuid5(uuid.NAMESPACE_DNS, namespace), serialize(kwargs))
     logger.debug("Acquiring lock on namespace %s for key %s", namespace, key)
     try:
         DeleteExpiredKeyValueCommand(resource=KeyValueResource.LOCK).run()