github/dejavu
1
0
Fork 0
mirror of https://github.com/correl/dejavu.git synced 2024-11-23 19:19:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'wessie/master'

Browse source
This commit is contained in:
Vin 2013-12-17 01:14:13 +00:00
commit 776995e454
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
dejavu/cursor.py
View file

@ -2,8 +2,8 @@ from __future__ import unicode_literals
from __future__ import absolute_import from __future__ import absolute_import
import Queue import Queue
import pymysql import MySQLdb as mysql
import pymysql.cursors import MySQLdb.cursors
def cursor_factory(**factory_options): def cursor_factory(**factory_options):
@ -26,18 +26,18 @@ class Cursor(object):
""" """
_cache = Queue.Queue(maxsize=5) _cache = Queue.Queue(maxsize=5)
def __init__(self, cursor_type=pymysql.cursors.DictCursor, **options): def __init__(self, cursor_type=mysql.cursors.DictCursor, **options):
super(Cursor, self).__init__() super(Cursor, self).__init__()
try: try:
conn = self._cache.get_nowait() conn = self._cache.get_nowait()
except Queue.Empty: except Queue.Empty:
conn = pymysql.connect(**options) conn = mysql.connect(**options)
self.conn = conn self.conn = conn
self.cursor_type = cursor_type self.cursor_type = cursor_type
def __enter__(self): def __enter__(slf):
self.cursor = self.conn.cursor(self.cursor_type) self.cursor = self.conn.cursor(self.cursor_type)
return self.cursor return self.cursor

11
dejavu/database.py
View file

@ -1,6 +1,8 @@
from __future__ import absolute_import from __future__ import absolute_import
from binascii import unhexlify from binascii import unhexlify
from MySQLdb.cursors import Cursor
class Database(object): class Database(object):
def __init__(self): def __init__(self):
super(Database, self).__init__() super(Database, self).__init__()
@ -274,14 +276,13 @@ class SQLDatabase(Database):
def return_matches(self, hashes): def return_matches(self, hashes):
""" """
Return the (song_id, offset_diff) tuples associated with Return the (song_id, offset_diff) tuples associated with
a list of a list of
sha1 => (None, sample_offset) sha1 => (None, sample_offset)
values. values.
""" """
from pymysql.cursors import Cursor
# Create a dictionary of hash => offset pairs for later lookups # Create a dictionary of hash => offset pairs for later lookups
mapper = {} mapper = {}
for hash, (_, offset) in hashes: for hash, (_, offset) in hashes: