Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: sitescripts/filterhits/db.py

Issue 4615801646612480: Issue 395 - Filter hits statistics backend (Closed)
Left Patch Set: Improvements regarding comments Created Feb. 17, 2015, 10:50 a.m.
Right Patch Set: Addressed further comments from Sebastian. Created April 2, 2015, 10:13 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « sitescripts/filterhits/bin/reprocess_logs.py ('k') | sitescripts/filterhits/geometrical_mean.py » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 # coding: utf-8 1 # coding: utf-8
2 2
3 # This file is part of the Adblock Plus web scripts, 3 # This file is part of the Adblock Plus web scripts,
4 # Copyright (C) 2006-2015 Eyeo GmbH 4 # Copyright (C) 2006-2015 Eyeo GmbH
5 # 5 #
6 # Adblock Plus is free software: you can redistribute it and/or modify 6 # Adblock Plus is free software: you can redistribute it and/or modify
7 # it under the terms of the GNU General Public License version 3 as 7 # it under the terms of the GNU General Public License version 3 as
8 # published by the Free Software Foundation. 8 # published by the Free Software Foundation.
9 # 9 #
10 # Adblock Plus is distributed in the hope that it will be useful, 10 # Adblock Plus is distributed in the hope that it will be useful,
11 # but WITHOUT ANY WARRANTY; without even the implied warranty of 11 # but WITHOUT ANY WARRANTY; without even the implied warranty of
12 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 12 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 # GNU General Public License for more details. 13 # GNU General Public License for more details.
14 # 14 #
15 # You should have received a copy of the GNU General Public License 15 # You should have received a copy of the GNU General Public License
16 # along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. 16 # along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
17 17
18 import itertools, MySQLdb 18 import itertools
19 19
20 def connect(user, password, database): 20 import MySQLdb
21
22 from sitescripts.utils import get_config
23
24 def connect():
25 config = get_config()
21 return MySQLdb.connect( 26 return MySQLdb.connect(
22 user=user, 27 user=config.get("filterhitstats", "dbuser"),
23 passwd=password, 28 passwd=config.get("filterhitstats", "dbpassword"),
24 db=database, 29 db=config.get("filterhitstats", "database"),
25 use_unicode=True, charset="utf8" 30 use_unicode=True, charset="utf8"
26 ) 31 )
27 32
28 def query(db, sql, *params, **kwargs): 33 def query(db, sql, *params, **kwargs):
29 """ 34 """
30 Executes the query given by the provided SQL and returns the results. 35 Executes the query given by the provided SQL and returns the results.
31 If dict_result keyword argument is provided + True the results will be 36 If dict_result keyword argument is provided + True the results will be
32 returned as a tuple of dictionaries, otherwise a tuple of tuples. 37 returned as a tuple of dictionaries, otherwise a tuple of tuples.
33 """ 38 """
34 dict_result=kwargs.pop('dict_result', False) 39 if kwargs.get("dict_result"):
35 40 cursor = db.cursor(MySQLdb.cursors.DictCursor)
41 else:
42 cursor = db.cursor()
36 try: 43 try:
37 if dict_result:
38 cursor = db.cursor(MySQLdb.cursors.DictCursor)
39 else:
40 cursor = db.cursor()
41 cursor.execute(sql, params) 44 cursor.execute(sql, params)
42 results = cursor.fetchall() 45 db.commit()
46 return cursor.fetchall()
43 finally: 47 finally:
44 if cursor: 48 cursor.close()
45 cursor.close()
46 return results
47 49
48 def write(db, queries): 50 def write(db, queries):
49 """ 51 """
50 This writes a given SQL string or iterator of tuples containing SQL 52 This writes a given iteratable object of tuples containing SQL
Sebastian Noack 2015/02/17 14:59:17 Iterators (in Python) are objects that implement t
kzar 2015/02/24 18:05:11 Done.
51 strings and any required parameters to the database. All queries will 53 strings and any required parameters to the database. All queries will
52 be run as one transaction and rolled back on error. 54 be run as one transaction and rolled back on error.
53 """ 55 """
54 if isinstance(queries, str):
55 queries = ((queries,),)
56
57 try: 56 try:
58 cursor = db.cursor() 57 cursor = db.cursor()
59 try: 58 try:
60 for query in queries: 59 for query in queries:
61 sql, params = query[0], query[1:] 60 sql, params = query[0], query[1:]
Sebastian Noack 2015/02/17 14:59:17 I'd prefer to use a two-dimensional tuple here and
kzar 2015/02/24 18:05:11 I like doing it this way for db.query and db.write
Sebastian Noack 2015/02/26 16:39:25 I don't agree. So I am leaving it up to Wladimir.
62 cursor.execute(sql, params) 61 cursor.execute(sql, params)
63 db.commit() 62 db.commit()
64 finally: 63 finally:
65 cursor.close() 64 cursor.close()
66 except MySQLdb.Error: 65 except MySQLdb.Error:
67 if db: 66 db.rollback()
68 db.rollback()
69 raise 67 raise
LEFTRIGHT

Powered by Google App Engine
This is Rietveld