valitydev/redash
14
0
Fork 0
mirror of https://github.com/valitydev/redash.git synced 2024-11-07 17:38:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update query results for same data source only

Browse Source
This commit is contained in:
Arik Fraimovich 2014-03-19 14:58:13 +02:00
parent 515eb28d4d
commit ee3150fc6b
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
redash/data/manager.py
View File

@ -6,7 +6,6 @@ import collections
import json
import time
import logging
import psycopg2
import qr
import redis
from redash.data import worker
@ -55,6 +54,7 @@ class Manager(object):
job = worker.Job.load(self.redis_connection, job_id)
else:
job = worker.Job(self.redis_connection, query=query, priority=priority,
data_source_id=data_source.id,
data_source_name=data_source.name,
data_source_type=data_source.type,
data_source_options=data_source.options)
@ -108,7 +108,7 @@ class Manager(object):
logging.info("Done refreshing queries... %d" % len(queries))
def store_query_result(self, query, data, run_time, retrieved_at):
def store_query_result(self, data_source_id, query, data, run_time, retrieved_at):
query_result_id = None
query_hash = gen_query_hash(query)
sql = "INSERT INTO query_results (query_hash, query, data, runtime, retrieved_at) " \
@ -119,8 +119,8 @@ class Manager(object):
query_result_id = cursor.fetchone()[0]
logging.info("[Manager][%s] Inserted query data; id=%s", query_hash, query_result_id)
sql = "UPDATE queries SET latest_query_data_id=%s WHERE query_hash=%s"
cursor.execute(sql, (query_result_id, query_hash))
sql = "UPDATE queries SET latest_query_data_id=%s WHERE query_hash=%s AND data_source_id=%s"
cursor.execute(sql, (query_result_id, query_hash, data_source_id))
logging.info("[Manager][%s] Updated %s queries.", query_hash, cursor.rowcount)
else:

4
redash/data/worker.py
View File

@ -101,6 +101,7 @@ class Job(RedisObject):
'status': WAITING,
'process_id': None,
'query_result_id': None,
'data_source_id': None,
'data_source_name': None,
'data_source_type': None,
'data_source_options': None
@ -314,7 +315,8 @@ class Worker(threading.Thread):
query_result_id = None
if not error:
self.set_title("storing results %s" % job_id)
query_result_id = self.manager.store_query_result(job.query, data, run_time,
query_result_id = self.manager.store_query_result(job.data_source_id,
job.query, data, run_time,
datetime.datetime.utcnow())
self.set_title("marking job as done %s" % job_id)