pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[UPD] various: update query counters

Browse Source 
closes odoo/odoo#95556

Related: odoo/enterprise#29247
Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
This commit is contained in:
Thibault Delavallée
2022-07-08 14:34:04 +02:00
parent 3305e2d1d4
commit 40f4ea486b
10 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/crm/tests/test_crm_lead_convert_mass.py
+2 -2
View File
@@ -24,7 +24,7 @@ class TestLeadConvertMass(crm_common.TestLeadConvertMassCommon):
with self.assertQueryCount(user_sales_manager=0):
test_leads = self.env['crm.lead'].browse(test_leads.ids)
with self.assertQueryCount(user_sales_manager=173): # crm only: 170 (often), sometimes +3 on runbot
with self.assertQueryCount(user_sales_manager=176): # crm only: 170 (often), sometimes +3 on runbot // 176 on community ?
test_leads._handle_salesmen_assignment(user_ids=user_ids, team_id=False)
self.assertEqual(test_leads.team_id, self.sales_team_convert | self.sales_team_1)
@@ -166,7 +166,7 @@ class TestLeadConvertMass(crm_common.TestLeadConvertMassCommon):
test_leads = self._create_leads_batch(count=50, user_ids=[False])
user_ids = self.assign_users.ids
with self.assertQueryCount(user_sales_manager=1038): # 1034-35 - crm only: 1029
with self.assertQueryCount(user_sales_manager=1038): # 1033 - crm only: 1029
mass_convert = self.env['crm.lead2opportunity.partner.mass'].with_context({
'active_model': 'crm.lead',
'active_ids': test_leads.ids,
addons/crm/tests/test_performances.py
+2 -2
View File
@@ -49,7 +49,7 @@ class TestLeadAssignPerf(TestLeadAssignCommon):
with self.with_user('user_sales_manager'):
self.env['res.users'].has_group('base.group_user') # warmup the cache to avoid inconsistency between community an enterprise
with self.assertQueryCount(user_sales_manager=1269):
with self.assertQueryCount(user_sales_manager=1265):
self.env['crm.team'].browse(self.sales_teams.ids)._action_assign_leads(work_days=2)
# teams assign
@@ -175,7 +175,7 @@ class TestLeadAssignPerf(TestLeadAssignCommon):
leads.flush_recordset()
with self.with_user('user_sales_manager'):
with self.assertQueryCount(user_sales_manager=6433):
with self.assertQueryCount(user_sales_manager=6277):
self.env['crm.team'].browse(sales_teams.ids)._action_assign_leads(work_days=30)
# teams assign
addons/google_calendar/tests/test_sync_odoo2google.py
+2 -2
View File
@@ -70,7 +70,7 @@ class TestSyncOdoo2Google(TestSyncGoogle):
})
partner_model = self.env.ref('base.model_res_partner')
partner = self.env['res.partner'].search([], limit=1)
with self.assertQueryCount(__system__=618):
with self.assertQueryCount(__system__=616):
events = self.env['calendar.event'].create([{
'name': "Event %s" % (i),
'start': datetime(2020, 1, 15, 8, 0),
@@ -102,7 +102,7 @@ class TestSyncOdoo2Google(TestSyncGoogle):
})
partner_model = self.env.ref('base.model_res_partner')
partner = self.env['res.partner'].search([], limit=1)
with self.assertQueryCount(__system__=73):
with self.assertQueryCount(__system__=72):
event = self.env['calendar.event'].create({
'name': "Event",
'start': datetime(2020, 1, 15, 8, 0),
addons/hr_holidays/tests/test_company_leave.py
+1 -1
View File
@@ -323,7 +323,7 @@ class TestCompanyLeave(TransactionCase):
})
company_leave._compute_date_from_to()
with self.assertQueryCount(__system__=353, admin=865):
with self.assertQueryCount(__system__=350, admin=865):
# Original query count: 1987
# Without tracking/activity context keys: 5154
company_leave.action_validate()
addons/hr_work_entry_holidays/tests/test_performance.py
+3 -3
View File
@@ -31,7 +31,7 @@ class TestWorkEntryHolidaysPerformance(TestWorkEntryHolidaysBase):
self.richard_emp.generate_work_entries(date(2018, 1, 1), date(2018, 1, 2))
leave = self.create_leave(datetime(2018, 1, 1, 7, 0), datetime(2018, 1, 1, 18, 0))
with self.assertQueryCount(__system__=92, admin=93):
with self.assertQueryCount(__system__=90, admin=91):
leave.action_validate()
leave.action_refuse()
@@ -40,14 +40,14 @@ class TestWorkEntryHolidaysPerformance(TestWorkEntryHolidaysBase):
def test_performance_leave_write(self):
leave = self.create_leave(datetime(2018, 1, 1, 7, 0), datetime(2018, 1, 1, 18, 0))
with self.assertQueryCount(__system__=19, admin=19):
with self.assertQueryCount(__system__=18, admin=18):
leave.date_to = datetime(2018, 1, 1, 19, 0)
leave.action_refuse()
@users('__system__', 'admin')
@warmup
def test_performance_leave_create(self):
with self.assertQueryCount(__system__=27, admin=28): # 25/26 com
with self.assertQueryCount(__system__=26, admin=27): # 25/26 com
leave = self.create_leave(datetime(2018, 1, 1, 7, 0), datetime(2018, 1, 1, 18, 0))
leave.action_refuse()
addons/sale_stock/tests/test_create_perf.py
+4 -4
View File
@@ -38,7 +38,7 @@ class TestPERF(common.TransactionCase):
@users('admin')
@warmup
def test_empty_sale_order_creation_perf(self):
with self.assertQueryCount(admin=35):
with self.assertQueryCount(admin=34):
self.env['sale.order'].create({
'partner_id': self.partners[0].id,
'user_id': self.salesmans[0].id,
@@ -52,7 +52,7 @@ class TestPERF(common.TransactionCase):
# + 1 warehouse fetch
# + 1 query to get analytic default account
# + 1 followers queries ?
with self.assertQueryCount(admin=40):
with self.assertQueryCount(admin=39):
self.env['sale.order'].create([{
'partner_id': self.partners[0].id,
'user_id': self.salesmans[0].id,
@@ -63,7 +63,7 @@ class TestPERF(common.TransactionCase):
def test_dummy_sales_orders_batch_creation_perf(self):
""" Dummy SOlines (notes/sections) should not add any custom queries other than their insert"""
# + 2 SOL (batched) insert
with self.assertQueryCount(admin=42):
with self.assertQueryCount(admin=41):
self.env['sale.order'].create([{
'partner_id': self.partners[0].id,
'user_id': self.salesmans[0].id,
@@ -80,7 +80,7 @@ class TestPERF(common.TransactionCase):
# + 2 SQL insert
# + 2 queries to get analytic default tags
# + 9 follower queries ?
with self.assertQueryCount(admin=53):
with self.assertQueryCount(admin=52):
self.env['sale.order'].create([{
'partner_id': self.partners[0].id,
'user_id': self.salesmans[0].id,
addons/test_crm_full/tests/test_performance.py
+5 -5
View File
@@ -42,7 +42,7 @@ class TestCrmPerformance(CrmPerformanceCase):
country_be = self.env.ref('base.be')
lang_be_id = self.env['res.lang']._lang_get_id('fr_BE')
with freeze_time(self.reference_now), self.assertQueryCount(user_sales_leads=241): # 235, sometimes +6
with freeze_time(self.reference_now), self.assertQueryCount(user_sales_leads=194):
self.env.cr._now = self.reference_now # force create_date to check schedulers
crm_values = [
{'country_id': country_be.id,
@@ -70,7 +70,7 @@ class TestCrmPerformance(CrmPerformanceCase):
country_be = self.env.ref('base.be')
lang_be = self.env['res.lang']._lang_get('fr_BE')
with freeze_time(self.reference_now), self.assertQueryCount(user_sales_leads=184): # tcf only: 175 - com runbot: 167
with freeze_time(self.reference_now), self.assertQueryCount(user_sales_leads=177): # com 166
self.env.cr._now = self.reference_now # force create_date to check schedulers
with Form(self.env['crm.lead']) as lead_form:
lead_form.country_id = country_be
@@ -89,7 +89,7 @@ class TestCrmPerformance(CrmPerformanceCase):
@warmup
def test_lead_create_form_partner(self):
""" Test a single lead creation using Form with a partner """
with freeze_time(self.reference_now), self.assertQueryCount(user_sales_leads=189): # tcf only: 180 - com runbot: 172
with freeze_time(self.reference_now), self.assertQueryCount(user_sales_leads=186): # com 175
self.env.cr._now = self.reference_now # force create_date to check schedulers
with self.debug_mode():
# {'invisible': ['|', ('type', '=', 'opportunity'), ('is_partner_visible', '=', False)]}
@@ -107,7 +107,7 @@ class TestCrmPerformance(CrmPerformanceCase):
country_be = self.env.ref('base.be')
lang_be_id = self.env['res.lang']._lang_get_id('fr_BE')
with freeze_time(self.reference_now), self.assertQueryCount(user_sales_leads=41):
with freeze_time(self.reference_now), self.assertQueryCount(user_sales_leads=31):
self.env.cr._now = self.reference_now # force create_date to check schedulers
crm_values = [
{'country_id': country_be.id,
@@ -127,7 +127,7 @@ class TestCrmPerformance(CrmPerformanceCase):
@warmup
def test_lead_create_single_partner(self):
""" Test multiple lead creation (import) """
with freeze_time(self.reference_now), self.assertQueryCount(user_sales_leads=47):
with freeze_time(self.reference_now), self.assertQueryCount(user_sales_leads=32):
self.env.cr._now = self.reference_now # force create_date to check schedulers
crm_values = [
{'partner_id': self.partners[0].id,
addons/test_event_full/tests/test_performance.py
+20 -20
View File
@@ -52,7 +52,7 @@ class TestEventPerformance(EventPerformanceCase):
batch_size = 20
# simple without type involved + website
with freeze_time(self.reference_now), self.assertQueryCount(event_user=5462): # tef only: 5068? (5064?) - com runbot: 5037 - ent runbot 5462
with freeze_time(self.reference_now), self.assertQueryCount(event_user=5368): # com runbot: 4943 - ent runbot 5368
self.env.cr._now = self.reference_now # force create_date to check schedulers
event_values = [
dict(self.event_base_vals,
@@ -70,7 +70,7 @@ class TestEventPerformance(EventPerformanceCase):
event_type = self.env['event.type'].browse(self.test_event_type.ids)
# complex with type
with freeze_time(self.reference_now), self.assertQueryCount(event_user=448): # 442 (sometimes +6)
with freeze_time(self.reference_now), self.assertQueryCount(event_user=445): # 439 (sometimes +6)
self.env.cr._now = self.reference_now # force create_date to check schedulers
event_values = [
dict(self.event_base_vals,
@@ -89,7 +89,7 @@ class TestEventPerformance(EventPerformanceCase):
event_type = self.env['event.type'].browse(self.test_event_type.ids)
# complex with type + website
with freeze_time(self.reference_now), self.assertQueryCount(event_user=5576): # tef only: 5178 - com runbot: 5151 - ent runbot 5576
with freeze_time(self.reference_now), self.assertQueryCount(event_user=5480): # com runbot: 5055 - ent runbot 5480
self.env.cr._now = self.reference_now # force create_date to check schedulers
event_values = [
dict(self.event_base_vals,
@@ -128,7 +128,7 @@ class TestEventPerformance(EventPerformanceCase):
has_social = 'social_menu' in self.env['event.event'] # otherwise view may crash in enterprise
# no type, website
with freeze_time(self.reference_now), self.assertQueryCount(event_user=671): # tef only: 638? - com runbot: 571 - ent runbot: 671
with freeze_time(self.reference_now), self.assertQueryCount(event_user=667): # tef only: 638? - com runbot: 567 - ent runbot: 667
self.env.cr._now = self.reference_now # force create_date to check schedulers
# Require for `website_menu` to be visible
# <div name="event_menu_configuration" groups="base.group_no_one">
@@ -150,7 +150,7 @@ class TestEventPerformance(EventPerformanceCase):
has_social = 'social_menu' in self.env['event.event'] # otherwise view may crash in enterprise
# type and website
with freeze_time(self.reference_now), self.assertQueryCount(event_user=700): # tef only: 601 - com runbot: 604 - ent runbot: 700
with freeze_time(self.reference_now), self.assertQueryCount(event_user=693): # tef only: 601 - com runbot: 597 - ent runbot: 693
self.env.cr._now = self.reference_now # force create_date to check schedulers
# Require for `website_menu` to be visible
# <div name="event_menu_configuration" groups="base.group_no_one">
@@ -181,7 +181,7 @@ class TestEventPerformance(EventPerformanceCase):
def test_event_create_single_notype_website(self):
""" Test a single event creation """
# simple without type involved + website
with freeze_time(self.reference_now), self.assertQueryCount(event_user=370): # tef only: 347? (342?) - com runbot: 344 - ent runbot 370
with freeze_time(self.reference_now), self.assertQueryCount(event_user=352): # tef only: 347? (342?) - com runbot: 326 - ent runbot 352
self.env.cr._now = self.reference_now # force create_date to check schedulers
event_values = dict(
self.event_base_vals,
@@ -196,7 +196,7 @@ class TestEventPerformance(EventPerformanceCase):
event_type = self.env['event.type'].browse(self.test_event_type.ids)
# complex with type
with freeze_time(self.reference_now), self.assertQueryCount(event_user=67): # 61 (sometimes +6)
with freeze_time(self.reference_now), self.assertQueryCount(event_user=64): # 58 (sometimes +6)
self.env.cr._now = self.reference_now # force create_date to check schedulers
event_values = dict(
self.event_base_vals,
@@ -212,7 +212,7 @@ class TestEventPerformance(EventPerformanceCase):
event_type = self.env['event.type'].browse(self.test_event_type.ids)
# complex with type + website
with freeze_time(self.reference_now), self.assertQueryCount(event_user=407): # tef only: 395 (389) - com runbot: 381 - ent runbot 407
with freeze_time(self.reference_now), self.assertQueryCount(event_user=387): # tef only: 395 (389) - com runbot: 361 - ent runbot 387
self.env.cr._now = self.reference_now # force create_date to check schedulers
event_values = dict(
self.event_base_vals,
@@ -234,7 +234,7 @@ class TestRegistrationPerformance(EventPerformanceCase):
"""
event = self.env['event.event'].browse(self.test_event.ids)
with freeze_time(self.reference_now), self.assertQueryCount(event_user=734): # tef only: 672? - com runbot 731 - ent runbot 734
with freeze_time(self.reference_now), self.assertQueryCount(event_user=684): # tef only: 672? - com runbot 681
self.env.cr._now = self.reference_now # force create_date to check schedulers
registration_values = [
dict(reg_data,
@@ -258,7 +258,7 @@ class TestRegistrationPerformance(EventPerformanceCase):
"""
event = self.env['event.event'].browse(self.test_event.ids)
with freeze_time(self.reference_now), self.assertQueryCount(event_user=239): # tef only: 197? - com runbot 235
with freeze_time(self.reference_now), self.assertQueryCount(event_user=211): # tef only: 197? - com runbot 207
self.env.cr._now = self.reference_now # force create_date to check schedulers
registration_values = [
dict(reg_data,
@@ -280,7 +280,7 @@ class TestRegistrationPerformance(EventPerformanceCase):
form like) """
event = self.env['event.event'].browse(self.test_event.ids)
with freeze_time(self.reference_now), self.assertQueryCount(event_user=745): # tef only: 683? - com runbot 742 - ent runbot: 745
with freeze_time(self.reference_now), self.assertQueryCount(event_user=695): # tef only: 683? - com runbot 692
self.env.cr._now = self.reference_now # force create_date to check schedulers
registration_values = [
dict(reg_data,
@@ -301,7 +301,7 @@ class TestRegistrationPerformance(EventPerformanceCase):
""" Test a single registration creation using Form """
event = self.env['event.event'].browse(self.test_event.ids)
with freeze_time(self.reference_now), self.assertQueryCount(event_user=212): # tef only: 208? - com runbot: 200 - ent runbot: 212
with freeze_time(self.reference_now), self.assertQueryCount(event_user=201): # tef only: 208? - com runbot: 189
self.env.cr._now = self.reference_now # force create_date to check schedulers
with Form(self.env['event.registration']) as reg_form:
reg_form.event_id = event
@@ -317,7 +317,7 @@ class TestRegistrationPerformance(EventPerformanceCase):
""" Test a single registration creation using Form """
event = self.env['event.event'].browse(self.test_event.ids)
with freeze_time(self.reference_now), self.assertQueryCount(event_user=214): # tef only: 211? - com runbot: 201 - ent runbot: 214
with freeze_time(self.reference_now), self.assertQueryCount(event_user=206): # tef only: 211? - com runbot: 193
self.env.cr._now = self.reference_now # force create_date to check schedulers
with Form(self.env['event.registration']) as reg_form:
reg_form.event_id = event
@@ -330,7 +330,7 @@ class TestRegistrationPerformance(EventPerformanceCase):
""" Test a single registration creation using Form """
event = self.env['event.event'].browse(self.test_event.ids)
with freeze_time(self.reference_now), self.assertQueryCount(event_user=123): # tef only: 120? - com runbot 109
with freeze_time(self.reference_now), self.assertQueryCount(event_user=123): # tef only: 120? - com runbot 108
self.env.cr._now = self.reference_now # force create_date to check schedulers
with Form(self.env['event.registration'].with_context(event_lead_rule_skip=True)) as reg_form:
reg_form.event_id = event
@@ -344,7 +344,7 @@ class TestRegistrationPerformance(EventPerformanceCase):
event = self.env['event.event'].browse(self.test_event.ids)
# simple customer data
with freeze_time(self.reference_now), self.assertQueryCount(event_user=138): # tef only: 133? - com runbot: 136 - ent runbot: 138
with freeze_time(self.reference_now), self.assertQueryCount(event_user=124): # tef only: 133? - com runbot: 122
self.env.cr._now = self.reference_now # force create_date to check schedulers
registration_values = dict(
self.customer_data[0],
@@ -358,7 +358,7 @@ class TestRegistrationPerformance(EventPerformanceCase):
event = self.env['event.event'].browse(self.test_event.ids)
# partner-based customer
with freeze_time(self.reference_now), self.assertQueryCount(event_user=144): # tef only: 141? - com runbot: 143 - ent runbot: 144
with freeze_time(self.reference_now), self.assertQueryCount(event_user=126): # tef only: 141? - com runbot: 125
self.env.cr._now = self.reference_now # force create_date to check schedulers
registration_values = {
'event_id': event.id,
@@ -373,7 +373,7 @@ class TestRegistrationPerformance(EventPerformanceCase):
event = self.env['event.event'].browse(self.test_event.ids)
# partner-based customer
with freeze_time(self.reference_now), self.assertQueryCount(event_user=55): # tef only: 54? - com runbot: 53 - ent runbot: 55
with freeze_time(self.reference_now), self.assertQueryCount(event_user=44): # tef only: 54? - com runbot: 42
self.env.cr._now = self.reference_now # force create_date to check schedulers
registration_values = {
'event_id': event.id,
@@ -388,7 +388,7 @@ class TestRegistrationPerformance(EventPerformanceCase):
event = self.env['event.event'].browse(self.test_event.ids)
# website customer data
with freeze_time(self.reference_now), self.assertQueryCount(event_user=146): # tef only: 140? - com runbot: 142 - ent runbot: 146
with freeze_time(self.reference_now), self.assertQueryCount(event_user=132): # tef only: 140? - com runbot: 128
self.env.cr._now = self.reference_now # force create_date to check schedulers
registration_values = dict(
self.website_customer_data[0],
@@ -437,7 +437,7 @@ class TestOnlineEventPerformance(EventPerformanceCase, UtilPerf):
# website customer data
with freeze_time(self.reference_now):
self.authenticate('user_eventmanager', 'user_eventmanager')
with self.assertQueryCount(default=49): # tef only: 48 (+1 ent)
with self.assertQueryCount(default=36):
self._test_url_open('/event/%i' % self.test_event.id)
@warmup
@@ -453,7 +453,7 @@ class TestOnlineEventPerformance(EventPerformanceCase, UtilPerf):
# website customer data
with freeze_time(self.reference_now):
self.authenticate('user_eventmanager', 'user_eventmanager')
with self.assertQueryCount(default=49): # com runbot: 48 (+1 ent)
with self.assertQueryCount(default=39):
self._test_url_open('/event')
@warmup
addons/test_mail_full/tests/test_rating.py
+3 -3
View File
@@ -127,9 +127,9 @@ class TestRatingFlow(TestRatingCommon):
partners = self.env['res.partner'].create([
{'name': 'Jean-Luc %s' % (idx), 'email': 'jean-luc-%s@opoo.com' % (idx)} for idx in range(RECORD_COUNT)])
# 3713 requests if only test_mail_full is installed
# 4511 runbot community
# 4911 runbot enterprise
with self.assertQueryCount(__system__=4912):
# 4510 runbot community
# 4910 runbot enterprise
with self.assertQueryCount(__system__=4910):
record_ratings = self.env['mail.test.rating'].create([{
'customer_id': partners[idx].id,
'name': 'Test Rating',
odoo/addons/base/tests/test_ir_actions.py
+1 -1
View File
@@ -503,7 +503,7 @@ class TestCustomFields(common.TransactionCase):
# create a non-computed field, and assert how many queries it takes
model_id = self.env['ir.model']._get_id('res.partner')
query_count = 42
query_count = 41
with self.assertQueryCount(query_count):
self.env.registry.clear_caches()
self.env['ir.model.fields'].create({