Merge lp:~openerp-dev/openobject-server/7.0-transient-al into lp:openobject-server/7.0

[Antony Lesuisse (OpenERP)]

[Antony Lesuisse (OpenERP) (al-openerp)]

It doesnt work if any wizard fail to unlink like the multi account chart wizard

review: Needs Fixing

Unmerged revisions

4760. By Antony Lesuisse (OpenERP) on 2012-12-29

TransientModel deprecate count based vaccum, remove create hooks

=== modified file 'openerp/osv/orm.py'
--- openerp/osv/orm.py	2012-12-27 17:28:25 +0000
+++ openerp/osv/orm.py	2012-12-29 14:55:24 +0000
@@ -1069,8 +1069,6 @@
 
         # Transience
         if self.is_transient():
-            self._transient_check_count = 0
-            self._transient_max_count = config.get('osv_memory_count_limit')
             self._transient_max_hours = config.get('osv_memory_age_limit')
             assert self._log_access, "TransientModels must have log_access turned on, "\
                                      "in order to implement their access rights policy"
@@ -4305,9 +4303,6 @@
         if not context:
             context = {}
 
-        if self.is_transient():
-            self._transient_vacuum(cr, user)
-
         self.check_access_rights(cr, user, 'create')
 
         if self._log_access:
@@ -5154,46 +5149,18 @@
         ids = [x[0] for x in cr.fetchall()]
         self.unlink(cr, SUPERUSER_ID, ids)
 
-    def _transient_clean_old_rows(self, cr, max_count):
-        # Check how many rows we have in the table
-        cr.execute("SELECT count(*) AS row_count FROM " + self._table)
-        res = cr.fetchall()
-        if res[0][0] <= max_count:
-            return  # max not reached, nothing to do
-        self._transient_clean_rows_older_than(cr, 300)
-
     def _transient_vacuum(self, cr, uid, force=False):
-        """Clean the transient records.
+        """Clean the TransientModel records.
 
-        This unlinks old records from the transient model tables whenever the
-        "_transient_max_count" or "_max_age" conditions (if any) are reached.
-        Actual cleaning will happen only once every "_transient_check_time" calls.
-        This means this method can be called frequently called (e.g. whenever
-        a new record is created).
-        Example with both max_hours and max_count active:
-        Suppose max_hours = 0.2 (e.g. 12 minutes), max_count = 20, there are 55 rows in the
-        table, 10 created/changed in the last 5 minutes, an additional 12 created/changed between
-        5 and 10 minutes ago, the rest created/changed more then 12 minutes ago.
-        - age based vacuum will leave the 22 rows created/changed in the last 12 minutes
-        - count based vacuum will wipe out another 12 rows. Not just 2, otherwise each addition
-          would immediately cause the maximum to be reached again.
-        - the 10 rows that have been created/changed the last 5 minutes will NOT be deleted
+        This unlinks transient if the "_max_age" is reached. A cron job is
+        defined on osv_memory.autovacuum that calls _transient_vacuum on every
+        transient model.
         """
         assert self._transient, "Model %s is not transient, it cannot be vacuumed!" % self._name
-        _transient_check_time = 20          # arbitrary limit on vacuum executions
-        self._transient_check_count += 1
-        if not force and (self._transient_check_count < _transient_check_time):
-            return True  # no vacuum cleaning this time
-        self._transient_check_count = 0
-
         # Age-based expiration
         if self._transient_max_hours:
             self._transient_clean_rows_older_than(cr, self._transient_max_hours * 60 * 60)
 
-        # Count-based expiration
-        if self._transient_max_count:
-            self._transient_clean_old_rows(cr, self._transient_max_count)
-
         return True
 
     def resolve_2many_commands(self, cr, uid, field_name, commands, fields=None, context=None):

=== modified file 'openerp/tools/config.py'
--- openerp/tools/config.py	2012-12-29 13:22:16 +0000
+++ openerp/tools/config.py	2012-12-29 14:55:24 +0000
@@ -261,10 +261,6 @@
                           help="stop the server after its initialization")
         group.add_option("-t", "--timezone", dest="timezone", my_default=False,
                          help="specify reference timezone for the server (e.g. Europe/Brussels")
-        group.add_option("--osv-memory-count-limit", dest="osv_memory_count_limit", my_default=False,
-                         help="Force a limit on the maximum number of records kept in the virtual "
-                              "osv_memory tables. The default is False, which means no count-based limit.",
-                         type="int")
         group.add_option("--osv-memory-age-limit", dest="osv_memory_age_limit", my_default=1.0,
                          help="Force a limit on the maximum age of records kept in the virtual "
                               "osv_memory tables. This is a decimal value expressed in hours, "
@@ -407,7 +403,7 @@
             'stop_after_init', 'logrotate', 'without_demo', 'netrpc', 'xmlrpc', 'syslog',
             'list_db', 'xmlrpcs', 'proxy_mode',
             'test_file', 'test_enable', 'test_commit', 'test_report_directory',
-            'osv_memory_count_limit', 'osv_memory_age_limit', 'max_cron_threads', 'unaccent',
+            'osv_memory_age_limit', 'max_cron_threads', 'unaccent',
             'workers', 'limit_memory_hard', 'limit_memory_soft', 'limit_time_cpu', 'limit_time_real', 'limit_request'
         ]