From 360d52e45b2342607c15854194ed146dc085f05a Mon Sep 17 00:00:00 2001 From: "ACH(OpenERP)" <> Date: Mon, 23 Nov 2009 17:57:36 +0530 Subject: [PATCH 1/5] [FIX] Expression : Making search easier for 'child_of'- Recursivity on field used as a Left operand bzr revid: jvo@tinyerp.com-20091123122736-591bz55oke4ot5mj --- bin/osv/expression.py | 63 ++++++++++++++++++++++++++++--------------- 1 file changed, 41 insertions(+), 22 deletions(-) diff --git a/bin/osv/expression.py b/bin/osv/expression.py index d695fc62230..135559706ba 100644 --- a/bin/osv/expression.py +++ b/bin/osv/expression.py @@ -141,6 +141,12 @@ class expression(object): if field._type == 'many2one': right = field_obj.search(cr, uid, [(fargs[1], operator, right)], context=context) self.__exp[i] = (fargs[0], 'in', right) + # Making search easier when there is a left operand as field.o2m or field.m2m + if field._type in ['many2many','one2many']: + right = field_obj.search(cr, uid, [(fargs[1], operator, right)], context=context) + right1 = table.search(cr, uid, [(fargs[0],'in', right)], context=context) + self.__exp[i] = ('id', 'in', right1) + continue if field._properties: @@ -163,32 +169,45 @@ class expression(object): elif field._type == 'one2many': - call_null = True - - if right: + # Applying recursivity on field(one2many) + if operator == 'child_of': if isinstance(right, basestring): - ids2 = [x[0] for x in field_obj.name_search(cr, uid, right, [], operator, limit=None)] - operator = 'in' + ids2 = [x[0] for x in field_obj.name_search(cr, uid, right, [], 'like', limit=None)] else: - if not isinstance(right,list): - ids2 = [right] - else: - ids2 = right - if not ids2: - call_null = True - operator = 'in' # operator changed because ids are directly related to main object + ids2 = list(right) + if field._obj != working_table._name: + dom = _rec_get(ids2, field_obj, left=left, prefix=field._obj) else: - call_null = False - o2m_op = 'in' - if operator in ['not like','not ilike','not in','<>','!=']: - o2m_op = 'not in' - self.__exp[i] = ('id', o2m_op, self.__execute_recursive_in(cr, field._fields_id, field_obj._table, 'id', ids2, operator, field._type)) + dom = _rec_get(ids2, working_table, parent=left) + self.__exp = self.__exp[:i] + dom + self.__exp[i+1:] - if call_null: - o2m_op = 'not in' - if operator in ['not like','not ilike','not in','<>','!=']: - o2m_op = 'in' - self.__exp[i] = ('id', o2m_op, self.__execute_recursive_in(cr, field._fields_id, field_obj._table, 'id', [], operator, field._type) or [0]) + else: + call_null = True + + if right: + if isinstance(right, basestring): + ids2 = [x[0] for x in field_obj.name_search(cr, uid, right, [], operator, limit=None)] + operator = 'in' + else: + if not isinstance(right,list): + ids2 = [right] + else: + ids2 = right + if not ids2: + call_null = True + operator = 'in' # operator changed because ids are directly related to main object + else: + call_null = False + o2m_op = 'in' + if operator in ['not like','not ilike','not in','<>','!=']: + o2m_op = 'not in' + self.__exp[i] = ('id', o2m_op, self.__execute_recursive_in(cr, field._fields_id, field_obj._table, 'id', ids2, operator, field._type)) + + if call_null: + o2m_op = 'not in' + if operator in ['not like','not ilike','not in','<>','!=']: + o2m_op = 'in' + self.__exp[i] = ('id', o2m_op, self.__execute_recursive_in(cr, field._fields_id, field_obj._table, 'id', [], operator, field._type) or [0]) elif field._type == 'many2many': #FIXME From 3dbbb61c0d39731f3f98d7b819ed0c004577c2db Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Mon, 23 Nov 2009 18:05:09 +0100 Subject: [PATCH 2/5] [IMP] better connection pool (global) bzr revid: chs@tinyerp.com-20091123170509-qe5keihqjoa71ppd --- bin/addons/base/ir/ir_cron.py | 2 +- bin/service/web_services.py | 24 ++-- bin/sql_db.py | 218 +++++++++++++++++++++++----------- 3 files changed, 159 insertions(+), 85 deletions(-) diff --git a/bin/addons/base/ir/ir_cron.py b/bin/addons/base/ir/ir_cron.py index 86d4bd57c0e..3e3f2e1e50b 100644 --- a/bin/addons/base/ir/ir_cron.py +++ b/bin/addons/base/ir/ir_cron.py @@ -97,8 +97,8 @@ class ir_cron(osv.osv, netsvc.Agent): db, pool = pooler.get_db_and_pool(db_name) except: return False + cr = db.cursor() try: - cr = db.cursor() if not pool._init: now = DateTime.now() cr.execute('select * from ir_cron where numbercall<>0 and active and nextcall<=now() order by priority') diff --git a/bin/service/web_services.py b/bin/service/web_services.py index 46a66594162..a3280719f2c 100644 --- a/bin/service/web_services.py +++ b/bin/service/web_services.py @@ -72,13 +72,14 @@ class db(netsvc.Service): self.actions[id] = {'clean': False} db = sql_db.db_connect('template1') - cr = db.serialized_cursor() + cr = db.cursor() try: - cr.autocommit(True) # XXX inhibit the effect of a serialized cursor. is it what we want ? + cr.autocommit(True) # avoid transaction block cr.execute('CREATE DATABASE "%s" ENCODING \'unicode\'' % db_name) finally: cr.close() - sql_db.close_db('template1') + del db + class DBInitialize(object): def __call__(self, serv, id, db_name, demo, lang, user_password='admin'): cr = None @@ -153,8 +154,8 @@ class db(netsvc.Service): logger = netsvc.Logger() db = sql_db.db_connect('template1') - cr = db.serialized_cursor() - cr.autocommit(True) # XXX inhibit the effect of a serialized cursor. is it what we want ? + cr = db.cursor() + cr.autocommit(True) # avoid transaction block try: try: cr.execute('DROP DATABASE "%s"' % db_name) @@ -166,9 +167,7 @@ class db(netsvc.Service): logger.notifyChannel("web-services", netsvc.LOG_INFO, 'DROP DB: %s' % (db_name)) finally: - cr.commit() cr.close() - sql_db.close_db('template1') return True def _set_pg_psw_env_var(self): @@ -222,13 +221,13 @@ class db(netsvc.Service): raise Exception, "Database already exists" db = sql_db.db_connect('template1') - cr = db.serialized_cursor() - cr.autocommit(True) # XXX inhibit the effect of a serialized cursor. is it what we want ? + cr = db.cursor() + cr.autocommit(True) # avoid transaction block try: cr.execute("""CREATE DATABASE "%s" ENCODING 'unicode' TEMPLATE "template0" """ % db_name) finally: cr.close() - sql_db.close_db('template1') + del db cmd = ['pg_restore', '--no-owner'] if tools.config['db_user']: @@ -267,7 +266,7 @@ class db(netsvc.Service): logger = netsvc.Logger() db = sql_db.db_connect('template1') - cr = db.serialized_cursor() + cr = db.cursor() try: try: cr.execute('ALTER DATABASE "%s" RENAME TO "%s"' % (old_name, new_name)) @@ -283,9 +282,7 @@ class db(netsvc.Service): logger.notifyChannel("web-services", netsvc.LOG_INFO, 'RENAME DB: %s -> %s' % (old_name, new_name)) finally: - cr.commit() cr.close() - sql_db.close_db('template1') return True def db_exist(self, db_name): @@ -317,7 +314,6 @@ class db(netsvc.Service): res = [] finally: cr.close() - sql_db.close_db('template1') res.sort() return res diff --git a/bin/sql_db.py b/bin/sql_db.py index 679ce2da7ac..5c288efd817 100644 --- a/bin/sql_db.py +++ b/bin/sql_db.py @@ -20,10 +20,12 @@ # ############################################################################## +__all__ = ['db_connect', 'close_db'] + import netsvc from psycopg2.extensions import ISOLATION_LEVEL_AUTOCOMMIT, ISOLATION_LEVEL_READ_COMMITTED, ISOLATION_LEVEL_SERIALIZABLE -from psycopg2.pool import ThreadedConnectionPool from psycopg2.psycopg1 import cursor as psycopg1cursor +from psycopg2.pool import PoolError import psycopg2.extensions @@ -49,26 +51,23 @@ psycopg2.extensions.register_type(psycopg2.extensions.new_type((700, 701, 1700,) import tools -import re +from tools.func import wraps +from datetime import datetime as mdt +import threading -from mx import DateTime as mdt +import re re_from = re.compile('.* from "?([a-zA-Z_0-9]+)"? .*$'); re_into = re.compile('.* into "?([a-zA-Z_0-9]+)"? .*$'); + def log(msg, lvl=netsvc.LOG_DEBUG): logger = netsvc.Logger() logger.notifyChannel('sql', lvl, msg) class Cursor(object): IN_MAX = 1000 - sql_from_log = {} - sql_into_log = {} - sql_log = False - count = 0 - - def check(f): - from tools.func import wraps + def check(f): @wraps(f) def wrapper(self, *args, **kwargs): if self.__closed: @@ -76,36 +75,41 @@ class Cursor(object): return f(self, *args, **kwargs) return wrapper - def __init__(self, pool, serialized=False): + def __init__(self, pool, dbname, serialized=False): + self.sql_from_log = {} + self.sql_into_log = {} + self.sql_log = False + self.sql_log_count = 0 + + self.__closed = True # avoid the call of close() (by __del__) if an exception + # is raised by any of the following initialisations self._pool = pool + self.dbname = dbname self._serialized = serialized - self._cnx = pool.getconn() + self._cnx = pool.borrow(dsn(dbname)) self._obj = self._cnx.cursor(cursor_factory=psycopg1cursor) - self.__closed = False + self.__closed = False # real initialisation value self.autocommit(False) - self.dbname = pool.dbname if tools.config['log_level'] in (netsvc.LOG_DEBUG, netsvc.LOG_DEBUG_RPC): from inspect import stack self.__caller = tuple(stack()[2][1:3]) - + def __del__(self): if not self.__closed: + # Oops. 'self' has not been closed explicitly. + # The cursor will be deleted by the garbage collector, + # but the database connection is not put back into the connection + # pool, preventing some operation on the database like dropping it. + # This can also lead to a server overload. if tools.config['log_level'] in (netsvc.LOG_DEBUG, netsvc.LOG_DEBUG_RPC): - # Oops. 'self' has not been closed explicitly. - # The cursor will be deleted by the garbage collector, - # but the database connection is not put back into the connection - # pool, preventing some operation on the database like dropping it. - # This can also lead to a server overload. msg = "Cursor not closed explicitly\n" \ "Cursor was created at %s:%s" % self.__caller - log(msg, netsvc.LOG_WARNING) self.close() @check def execute(self, query, params=None): - self.count+=1 if '%d' in query or '%f' in query: log(query, netsvc.LOG_WARNING) log("SQL queries mustn't contain %d or %f anymore. Use only %s", netsvc.LOG_WARNING) @@ -125,7 +129,7 @@ class Cursor(object): if self.sql_log: log("query: %s" % self._obj.query) - self.count+=1 + self.sql_log_count+=1 res_from = re_from.match(query.lower()) if res_from: self.sql_from_log.setdefault(res_from.group(1), [0, 0]) @@ -139,6 +143,9 @@ class Cursor(object): return res def print_log(self): + if not self.sql_log: + return + def process(type): sqllogs = {'from':self.sql_from_log, 'into':self.sql_into_log} if not sqllogs[type]: @@ -150,17 +157,23 @@ class Cursor(object): for r in sqllogitems: log("table: %s: %s/%s" %(r[0], str(r[1][1]), r[1][0])) sum+= r[1][1] - log("SUM:%s/%d" % (sum, self.count)) + log("SUM:%s/%d" % (sum, self.sql_log_count)) sqllogs[type].clear() process('from') process('into') - self.count = 0 + self.sql_log_count = 0 self.sql_log = False @check def close(self): - self.rollback() # Ensure we close the current transaction. + if not self._obj: + return + self.print_log() + + if not self._serialized: + self.rollback() # Ensure we close the current transaction. + self._obj.close() # This force the cursor to be freed, and thus, available again. It is @@ -170,8 +183,8 @@ class Cursor(object): # part because browse records keep a reference to the cursor. del self._obj self.__closed = True - self._pool.putconn(self._cnx) - + self._pool.give_back(self._cnx) + @check def autocommit(self, on): offlevel = [ISOLATION_LEVEL_READ_COMMITTED, ISOLATION_LEVEL_SERIALIZABLE][bool(self._serialized)] @@ -189,63 +202,128 @@ class Cursor(object): def __getattr__(self, name): return getattr(self._obj, name) + class ConnectionPool(object): - def __init__(self, pool, dbname): + + def locked(fun): + @wraps(fun) + def _locked(self, *args, **kwargs): + self._lock.acquire() + try: + return fun(self, *args, **kwargs) + finally: + self._lock.release() + return _locked + + + def __init__(self, maxconn=64): + self._connections = [] + self._maxconn = max(maxconn, 1) + self._lock = threading.Lock() + self._logger = netsvc.Logger() + + def _log(self, msg): + #self._logger.notifyChannel('ConnectionPool', netsvc.LOG_INFO, msg) + pass + def _debug(self, msg): + #self._logger.notifyChannel('ConnectionPool', netsvc.LOG_DEBUG, msg) + pass + + @locked + def borrow(self, dsn): + self._log('Borrow connection to %s' % (dsn,)) + + result = None + for i, (cnx, used) in enumerate(self._connections): + if not used and cnx.dsn == dsn: + self._debug('Existing connection found at index %d' % i) + + self._connections.pop(i) + self._connections.append((cnx, True)) + + result = cnx + break + if result: + return result + + if len(self._connections) >= self._maxconn: + # try to remove the older connection not used + for i, (cnx, used) in enumerate(self._connections): + if not used: + self._debug('Removing old connection at index %d: %s' % (i, cnx.dsn)) + self._connections.pop(i) + break + else: + # note: this code is called only if the for loop has completed (no break) + raise PoolError('Connection Pool Full') + + self._debug('Create new connection') + result = psycopg2.connect(dsn=dsn) + self._connections.append((result, True)) + return result + + @locked + def give_back(self, connection): + self._log('Give back connection to %s' % (connection.dsn,)) + for i, (cnx, used) in enumerate(self._connections): + if cnx is connection: + self._connections.pop(i) + self._connections.append((cnx, False)) + break + else: + raise PoolError('This connection does not below to the pool') + + @locked + def close_all(self, dsn): + for i, (cnx, used) in tools.reverse_enumerate(self._connections): + if cnx.dsn == dsn: + cnx.close() + self._connections.pop(i) + + +class Connection(object): + __LOCKS = {} + + def __init__(self, pool, dbname, unique=False): self.dbname = dbname self._pool = pool + self._unique = unique + if unique: + if dbname not in self.__LOCKS: + self.__LOCKS[dbname] = threading.Lock() + self.__LOCKS[dbname].acquire() - def cursor(self): - return Cursor(self) + def __del__(self): + if self._unique: + self.__LOCKS[self.dbname].release() + + def cursor(self, serialized=False): + return Cursor(self._pool, self.dbname, serialized=serialized) def serialized_cursor(self): - return Cursor(self, True) + return self.cursor(True) - def __getattr__(self, name): - return getattr(self._pool, name) -class PoolManager(object): - _pools = {} - _dsn = None - maxconn = int(tools.config['db_maxconn']) or 64 - - @classmethod - def dsn(cls, db_name): - if cls._dsn is None: - cls._dsn = '' - for p in ('host', 'port', 'user', 'password'): - cfg = tools.config['db_' + p] - if cfg: - cls._dsn += '%s=%s ' % (p, cfg) - return '%s dbname=%s' % (cls._dsn, db_name) +_dsn = '' +for p in ('host', 'port', 'user', 'password'): + cfg = tools.config['db_' + p] + if cfg: + _dsn += '%s=%s ' % (p, cfg) - @classmethod - def get(cls, db_name): - if db_name not in cls._pools: - logger = netsvc.Logger() - try: - logger.notifyChannel('dbpool', netsvc.LOG_INFO, 'Connecting to %s' % (db_name,)) - cls._pools[db_name] = ConnectionPool(ThreadedConnectionPool(1, cls.maxconn, cls.dsn(db_name)), db_name) - except Exception, e: - logger.notifyChannel('dbpool', netsvc.LOG_ERROR, 'Unable to connect to %s: %s' % - (db_name, str(e))) - raise - return cls._pools[db_name] +def dsn(db_name): + return '%sdbname=%s' % (_dsn, db_name) - @classmethod - def close(cls, db_name): - if db_name in cls._pools: - logger = netsvc.Logger() - logger.notifyChannel('dbpool', netsvc.LOG_INFO, 'Closing all connections to %s' % (db_name,)) - cls._pools[db_name].closeall() - del cls._pools[db_name] + +_Pool = ConnectionPool(int(tools.config['db_maxconn'])) def db_connect(db_name): - return PoolManager.get(db_name) + unique = db_name in ['template1', 'template0'] + return Connection(_Pool, db_name, unique) def close_db(db_name): - PoolManager.close(db_name) + _Pool.close_all(dsn(db_name)) tools.cache.clean_caches_for_db(db_name) - + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From fc75b394c78af90182454f69939df2c684052414 Mon Sep 17 00:00:00 2001 From: "Jay (Open ERP)" Date: Tue, 24 Nov 2009 16:02:48 +0530 Subject: [PATCH 3/5] [FIX] Upgrade could have failed when its a change in name field,added cascade bzr revid: jvo@tinyerp.com-20091124103248-dvq9f5n1m68c0y46 --- bin/osv/orm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/osv/orm.py b/bin/osv/orm.py index 5318c242ad2..32006111fc6 100644 --- a/bin/osv/orm.py +++ b/bin/osv/orm.py @@ -1853,7 +1853,7 @@ class orm(orm_template): cr.execute('ALTER TABLE "%s" RENAME COLUMN "%s" TO temp_change_size' % (self._table, k)) cr.execute('ALTER TABLE "%s" ADD COLUMN "%s" VARCHAR(%d)' % (self._table, k, f.size)) cr.execute('UPDATE "%s" SET "%s"=temp_change_size::VARCHAR(%d)' % (self._table, k, f.size)) - cr.execute('ALTER TABLE "%s" DROP COLUMN temp_change_size' % (self._table,)) + cr.execute('ALTER TABLE "%s" DROP COLUMN temp_change_size CASCADE' % (self._table,)) cr.commit() for c in casts: if (f_pg_type==c[0]) and (f._type==c[1]): From 459b4639a8b5f9c69d6da936fc0140557bf0d848 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dukai=20G=C3=A1bor?= <> Date: Tue, 24 Nov 2009 18:23:28 +0530 Subject: [PATCH 4/5] [FIX] Stock :Invoice created from manual picking might miss UoS. lp bug: https://launchpad.net/bugs/487091 fixed bzr revid: jvo@tinyerp.com-20091124125328-mrsw98pqp5cprzkx --- addons/stock/stock.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 5259c2b0e0b..11d72428ab8 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -743,13 +743,18 @@ class stock_picking(osv.osv): tax_ids = self._get_taxes_invoice(cursor, user, move_line, type) account_analytic_id = self._get_account_analytic_invoice(cursor, user, picking, move_line) + + #set UoS if it's a sale and the picking doesn't have one + uos_id = move_line.product_uos and move_line.product_uos.id or False + if not uos_id and type in ('out_invoice', 'out_refund'): + uos_id = move_line.product_uom.id account_id = self.pool.get('account.fiscal.position').map_account(cursor, user, partner.property_account_position, account_id) invoice_line_id = invoice_line_obj.create(cursor, user, { 'name': name, 'origin': origin, 'invoice_id': invoice_id, - 'uos_id': move_line.product_uos.id, + 'uos_id': uos_id, 'product_id': move_line.product_id.id, 'account_id': account_id, 'price_unit': price_unit, From fcbe52c0a036a1db08ea45d1c4c05e808db94587 Mon Sep 17 00:00:00 2001 From: "Jay (Open ERP)" Date: Tue, 24 Nov 2009 20:20:23 +0530 Subject: [PATCH 5/5] [FIX] Stock : Added Product UoS to the Stock Move view bzr revid: jvo@tinyerp.com-20091124145023-p7vb6hc0pp1587s9 --- addons/stock/stock_view.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 2f6eb80fd87..382a8f87bba 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -1241,6 +1241,7 @@ +