Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions dingolytics/tasks/run_query.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@ def enqueue_query( # TODO: Replace older enqueue_query() with this, then rename
metadata: dict | None = None,
) -> TaskResult:
scheduled_query_id = scheduled_query.id if scheduled_query else None
# query_hash = gen_query_hash(query)
# query_lock = f"query:{data_source.id}:{query_hash}"
# with workers.default.lock_task(query_lock):
task = run_query_task(
query=query,
data_source_id=data_source.id,
Expand All @@ -35,7 +32,6 @@ def enqueue_query( # TODO: Replace older enqueue_query() with this, then rename
scheduled_query_id=scheduled_query_id,
metadata=metadata,
)
# TODO: Return existing task result if locked.
return task


Expand All @@ -56,6 +52,7 @@ def run_query_task(
user = _resolve_user(user_id, is_api_key, metadata.get("query_id", 0))
data_source = DataSource.get_by_id(data_source_id)
query_runner = data_source.query_runner

# TODO: Handle 'adhoc' explicitly instead of using `scheduled_query_id`
scheduled_query = (
Query.get_by_id(scheduled_query_id)
Expand Down Expand Up @@ -104,8 +101,9 @@ def run_query_task(
retrieved_at=utcnow(),
)

# updated_query_ids = Query.update_latest_result(query_result)
db.session.commit() # make sure that alert sees the latest query result
Query.update_latest_result(query_result)
db.session.commit()

# for query_id in updated_query_ids:
# check_alerts_for_query_task(query_id)

Expand Down
Loading