[sql lab]revert #4833 (#7498)
(cherry picked from commit 20143293eb9cac93a1692dcd552be5cb48b5d3e9)
diff --git a/superset/views/core.py b/superset/views/core.py
index c8c3275..2887ede 100755
--- a/superset/views/core.py
+++ b/superset/views/core.py
@@ -21,7 +21,6 @@
import logging
import os
import re
-import time
import traceback
from urllib import parse
@@ -36,8 +35,7 @@
from flask_babel import lazy_gettext as _
import pandas as pd
import simplejson as json
-import sqlalchemy as sqla
-from sqlalchemy import and_, create_engine, MetaData, or_, select, update
+from sqlalchemy import and_, create_engine, MetaData, or_, select
from sqlalchemy.engine.url import make_url
from sqlalchemy.exc import IntegrityError
from werkzeug.routing import BaseConverter
@@ -1811,7 +1809,7 @@
M.Slice.id == M.Log.slice_id,
)
.filter(
- sqla.and_(
+ and_(
~M.Log.action.in_(('queries', 'shortner', 'sql_json')),
M.Log.user_id == user_id,
),
@@ -1867,7 +1865,7 @@
)
.join(
models.FavStar,
- sqla.and_(
+ and_(
models.FavStar.user_id == int(user_id),
models.FavStar.class_name == 'Dashboard',
models.Dashboard.id == models.FavStar.obj_id,
@@ -1905,7 +1903,7 @@
Dash,
)
.filter(
- sqla.or_(
+ or_(
Dash.created_by_fk == user_id,
Dash.changed_by_fk == user_id,
),
@@ -1938,13 +1936,13 @@
db.session.query(Slice,
FavStar.dttm).join(
models.FavStar,
- sqla.and_(
+ and_(
models.FavStar.user_id == int(user_id),
models.FavStar.class_name == 'slice',
models.Slice.id == models.FavStar.obj_id,
),
isouter=True).filter(
- sqla.or_(
+ or_(
Slice.created_by_fk == user_id,
Slice.changed_by_fk == user_id,
FavStar.user_id == user_id,
@@ -1975,7 +1973,7 @@
qry = (
db.session.query(Slice)
.filter(
- sqla.or_(
+ or_(
Slice.created_by_fk == user_id,
Slice.changed_by_fk == user_id,
),
@@ -2007,7 +2005,7 @@
)
.join(
models.FavStar,
- sqla.and_(
+ and_(
models.FavStar.user_id == int(user_id),
models.FavStar.class_name == 'slice',
models.Slice.id == models.FavStar.obj_id,
@@ -2683,35 +2681,6 @@
.all()
)
dict_queries = {q.client_id: q.to_dict() for q in sql_queries}
-
- now = int(round(time.time() * 1000))
-
- unfinished_states = [
- QueryStatus.PENDING,
- QueryStatus.RUNNING,
- ]
-
- queries_to_timeout = [
- client_id for client_id, query_dict in dict_queries.items()
- if (
- query_dict['state'] in unfinished_states and (
- now - query_dict['startDttm'] >
- config.get('SQLLAB_ASYNC_TIME_LIMIT_SEC') * 1000
- )
- )
- ]
-
- if queries_to_timeout:
- update(Query).where(
- and_(
- Query.user_id == g.user.get_id(),
- Query.client_id in queries_to_timeout,
- ),
- ).values(state=QueryStatus.TIMED_OUT)
-
- for client_id in queries_to_timeout:
- dict_queries[client_id]['status'] = QueryStatus.TIMED_OUT
-
return json_success(
json.dumps(dict_queries, default=utils.json_int_dttm_ser))
