openstack/swift
Code Issues Proposed changes

Merge "Reuse a cursor instead of a conn.execute for better performance"

Browse Source
This commit is contained in:
Jenkins 2014-07-25 22:28:50 +00:00 committed by Gerrit Code Review
commit 6c256c5057
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
swift/container/backend.py
View File

@ -702,6 +702,7 @@ class ContainerBroker(DatabaseBroker):
""" """
def _really_merge_items(conn): def _really_merge_items(conn):
max_rowid = -1 max_rowid = -1
curs = conn.cursor()
for rec in item_list: for rec in item_list:
rec.setdefault('storage_policy_index', 0) # legacy rec.setdefault('storage_policy_index', 0) # legacy
query = ''' query = '''
@ -711,7 +712,7 @@ class ContainerBroker(DatabaseBroker):
''' '''
if self.get_db_version(conn) >= 1: if self.get_db_version(conn) >= 1:
query += ' AND deleted IN (0, 1)' query += ' AND deleted IN (0, 1)'
conn.execute(query, (rec['name'], rec['created_at'], curs.execute(query, (rec['name'], rec['created_at'],
rec['storage_policy_index'])) rec['storage_policy_index']))
query = ''' query = '''
SELECT 1 FROM object WHERE name = ? SELECT 1 FROM object WHERE name = ?
@ -719,9 +720,9 @@ class ContainerBroker(DatabaseBroker):
''' '''
if self.get_db_version(conn) >= 1: if self.get_db_version(conn) >= 1:
query += ' AND deleted IN (0, 1)' query += ' AND deleted IN (0, 1)'
if not conn.execute(query, ( if not curs.execute(query, (
rec['name'], rec['storage_policy_index'])).fetchall(): rec['name'], rec['storage_policy_index'])).fetchall():
conn.execute(''' curs.execute('''
INSERT INTO object (name, created_at, size, INSERT INTO object (name, created_at, size,
content_type, etag, deleted, storage_policy_index) content_type, etag, deleted, storage_policy_index)
VALUES (?, ?, ?, ?, ?, ?, ?) VALUES (?, ?, ?, ?, ?, ?, ?)