From commits-return-2735-archive-asf-public=cust-asf.ponee.io@superset.incubator.apache.org Fri May 24 03:29:08 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id 399E918076D for ; Fri, 24 May 2019 05:29:07 +0200 (CEST) Received: (qmail 39169 invoked by uid 500); 24 May 2019 03:29:06 -0000 Mailing-List: contact commits-help@superset.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@superset.incubator.apache.org Delivered-To: mailing list commits@superset.incubator.apache.org Received: (qmail 39150 invoked by uid 99); 24 May 2019 03:29:06 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 May 2019 03:29:06 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 71EC485DB1; Fri, 24 May 2019 03:29:06 +0000 (UTC) Date: Fri, 24 May 2019 03:29:07 +0000 To: "commits@superset.apache.org" Subject: [incubator-superset] 02/03: [sql lab]revert #4833 (#7498) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: johnbodley@apache.org In-Reply-To: <155866854514.16603.8758645717295691637@gitbox.apache.org> References: <155866854514.16603.8758645717295691637@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: incubator-superset X-Git-Refname: refs/heads/release--0.32 X-Git-Reftype: branch X-Git-Rev: 3b01f4efaf5482faf7b6e8057ce91f1b7c397ceb X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20190524032906.71EC485DB1@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. johnbodley pushed a commit to branch release--0.32 in repository https://gitbox.apache.org/repos/asf/incubator-superset.git commit 3b01f4efaf5482faf7b6e8057ce91f1b7c397ceb Author: Grace Guo AuthorDate: Thu May 23 17:39:40 2019 -0700 [sql lab]revert #4833 (#7498) (cherry picked from commit 20143293eb9cac93a1692dcd552be5cb48b5d3e9) --- superset/views/core.py | 47 ++++++++--------------------------------------- 1 file changed, 8 insertions(+), 39 deletions(-) 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 inspect import logging import os import re -import time import traceback from urllib import parse @@ -36,8 +35,7 @@ from flask_babel import gettext as __ 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 @@ class Superset(BaseSupersetView): 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 @@ class Superset(BaseSupersetView): ) .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 @@ class Superset(BaseSupersetView): Dash, ) .filter( - sqla.or_( + or_( Dash.created_by_fk == user_id, Dash.changed_by_fk == user_id, ), @@ -1938,13 +1936,13 @@ class Superset(BaseSupersetView): 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 @@ class Superset(BaseSupersetView): 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 @@ class Superset(BaseSupersetView): ) .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 @@ class Superset(BaseSupersetView): .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))