Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Klaus Wölfel
erp5
Commits
413d8cfd
Commit
413d8cfd
authored
Mar 01, 2013
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://git.erp5.org/repos/erp5
into erp5-component
parents
29f5836a
5fe7dd5d
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
63 additions
and
6 deletions
+63
-6
CHANGES.erp5.util.txt
CHANGES.erp5.util.txt
+8
-0
bt5/erp5_stock_cache/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/SQLCatalog_trimInventoryCacheOnCatalog.xml
...5_mysql_innodb/SQLCatalog_trimInventoryCacheOnCatalog.xml
+8
-0
bt5/erp5_stock_cache/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/SQLCatalog_trimInventoryCacheOnUncatalog.catalog_keys.xml
...SQLCatalog_trimInventoryCacheOnUncatalog.catalog_keys.xml
+9
-0
bt5/erp5_stock_cache/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/SQLCatalog_trimInventoryCacheOnUncatalog.xml
...mysql_innodb/SQLCatalog_trimInventoryCacheOnUncatalog.xml
+8
-0
bt5/erp5_stock_cache/bt/revision
bt5/erp5_stock_cache/bt/revision
+1
-1
product/ERP5/tests/testSimulationElementPerformance.py
product/ERP5/tests/testSimulationElementPerformance.py
+26
-2
product/ERP5Type/tests/testPerformance.py
product/ERP5Type/tests/testPerformance.py
+2
-2
setup.py
setup.py
+1
-1
No files found.
CHANGES.erp5.util.txt
View file @
413d8cfd
Changes
Changes
=======
=======
0.4.31 (2013-03-01)
-------------------
* erp5.util.testnode:
- after resetting software, retry_software_count was not resetted correctly
[Sebastien Robin]
0.4.30 (2013-02-20)
0.4.30 (2013-02-20)
-------------------
-------------------
...
...
bt5/erp5_stock_cache/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/SQLCatalog_trimInventoryCacheOnCatalog.xml
View file @
413d8cfd
...
@@ -78,6 +78,14 @@ except ProgrammingError:\n
...
@@ -78,6 +78,14 @@ except ProgrammingError:\n
<key>
<string>
_params
</string>
</key>
<key>
<string>
_params
</string>
</key>
<value>
<string>
uid, isMovement, isInventoryMovement, getResourceUid, getDestinationUid, getStopDate, getSourceUid, getStartDate
</string>
</value>
<value>
<string>
uid, isMovement, isInventoryMovement, getResourceUid, getDestinationUid, getStopDate, getSourceUid, getStartDate
</string>
</value>
</item>
</item>
<item>
<key>
<string>
_proxy_roles
</string>
</key>
<value>
<tuple>
<string>
Manager
</string>
</tuple>
</value>
</item>
<item>
<item>
<key>
<string>
id
</string>
</key>
<key>
<string>
id
</string>
</key>
<value>
<string>
SQLCatalog_trimInventoryCacheOnCatalog
</string>
</value>
<value>
<string>
SQLCatalog_trimInventoryCacheOnCatalog
</string>
</value>
...
...
bt5/erp5_stock_cache/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/SQLCatalog_trimInventoryCacheOnUncatalog.catalog_keys.xml
View file @
413d8cfd
...
@@ -2,4 +2,13 @@
...
@@ -2,4 +2,13 @@
<item
key=
"sql_uncatalog_object"
type=
"int"
>
<item
key=
"sql_uncatalog_object"
type=
"int"
>
<value>
1
</value>
<value>
1
</value>
</item>
</item>
<item
key=
"_is_filtered_archive"
type=
"int"
>
<value>
1
</value>
</item>
<item
key=
"_filter_expression_archive"
type=
"str"
>
<value>
python: context.providesIMovement() and not context.isInventoryMovement()
</value>
</item>
<item
key=
"_filter_expression_cache_key_archive"
type=
"tuple"
>
<value>
portal_type
</value>
</item>
</catalog_method>
</catalog_method>
bt5/erp5_stock_cache/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/SQLCatalog_trimInventoryCacheOnUncatalog.xml
View file @
413d8cfd
...
@@ -64,6 +64,14 @@ except ProgrammingError:\n
...
@@ -64,6 +64,14 @@ except ProgrammingError:\n
<key>
<string>
_params
</string>
</key>
<key>
<string>
_params
</string>
</key>
<value>
<string>
uid
</string>
</value>
<value>
<string>
uid
</string>
</value>
</item>
</item>
<item>
<key>
<string>
_proxy_roles
</string>
</key>
<value>
<tuple>
<string>
Manager
</string>
</tuple>
</value>
</item>
<item>
<item>
<key>
<string>
id
</string>
</key>
<key>
<string>
id
</string>
</key>
<value>
<string>
SQLCatalog_trimInventoryCacheOnUncatalog
</string>
</value>
<value>
<string>
SQLCatalog_trimInventoryCacheOnUncatalog
</string>
</value>
...
...
bt5/erp5_stock_cache/bt/revision
View file @
413d8cfd
12
13
\ No newline at end of file
\ No newline at end of file
product/ERP5/tests/testSimulationElementPerformance.py
View file @
413d8cfd
...
@@ -83,12 +83,13 @@ from Products.ERP5Type.tests.Sequence import SequenceList
...
@@ -83,12 +83,13 @@ from Products.ERP5Type.tests.Sequence import SequenceList
# Define variable to chek if performance are good or not
# Define variable to chek if performance are good or not
# XXX These variable are specific to the testing environment
# XXX These variable are specific to the testing environment
# (pystone results: min: <
75757.6 - mean: ~ 77174.4 - max: > 78125
)
# (pystone results: min: <
131578.9 - mean: ~ 139768.5 - max: > 147058.8
)
# Historical values are here to remember original values on this
# Historical values are here to remember original values on this
# specific testing environment. We must always try to stay below max
# specific testing environment. We must always try to stay below max
# historical values.
# historical values.
EXPECTED_MIN_MAX_TIME
=
{
# Only for information
HISTORICAL_EXPECTED_MIN_MAX_TIME
=
{
'Creation Of New Applied Rules'
:
(
34.8
,
36.8
),
'Creation Of New Applied Rules'
:
(
34.8
,
36.8
),
'Expansion of Existing Applied Rules'
:
(
16.9
,
19.5
),
'Expansion of Existing Applied Rules'
:
(
16.9
,
19.5
),
...
@@ -111,6 +112,29 @@ EXPECTED_MIN_MAX_TIME = {
...
@@ -111,6 +112,29 @@ EXPECTED_MIN_MAX_TIME = {
'Addition of New Invoices Lines'
:
(
145.1
,
157.6
),
'Addition of New Invoices Lines'
:
(
145.1
,
157.6
),
}
}
EXPECTED_MIN_MAX_TIME
=
{
'Creation Of New Applied Rules'
:
(
5
,
10
),
'Expansion of Existing Applied Rules'
:
(
5
,
10
),
'Creation of New Sale Packing Lists'
:
(
5
,
10
),
'Expansion of Converged Changes'
:
(
8
,
12
),
'Expansion of Diverged Changes'
:
(
9
,
13
),
'Adoption of Previsions'
:
(
20
,
25
),
'Acceptance of Decisions'
:
(
20
,
25
),
'Creation of New Applied Rules from Partially Simulated Deliveries'
:
(
12
,
17
),
'Creation Of New Sale Invoices'
:
(
9
,
14
),
'Addition of New Invoices Lines'
:
(
36
,
44
),
}
class
TestSimulationPerformance
(
ERP5TypeTestCase
,
LogInterceptor
):
class
TestSimulationPerformance
(
ERP5TypeTestCase
,
LogInterceptor
):
def
getTitle
(
self
):
def
getTitle
(
self
):
...
...
product/ERP5Type/tests/testPerformance.py
View file @
413d8cfd
...
@@ -52,8 +52,8 @@ MIN_OBJECT_PROXYFIELD_VIEW=0.020 # 0.199
...
@@ -52,8 +52,8 @@ MIN_OBJECT_PROXYFIELD_VIEW=0.020 # 0.199
MAX_OBJECT_PROXYFIELD_VIEW
=
0.090
# 0.220
MAX_OBJECT_PROXYFIELD_VIEW
=
0.090
# 0.220
#CURRENT_MIN_OBJECT_VIEW=0.1220
#CURRENT_MIN_OBJECT_VIEW=0.1220
#CURRENT_MAX_OBJECT_VIEW=0.1280
#CURRENT_MAX_OBJECT_VIEW=0.1280
MIN_MODULE_VIEW
=
0.
148
# 0.125
MIN_MODULE_VIEW
=
0.
020
# 0.125
MAX_MODULE_VIEW
=
0.
153
# 0.175
MAX_MODULE_VIEW
=
0.
070
# 0.175
MIN_TIC
=
0.0020
# 0.260
MIN_TIC
=
0.0020
# 0.260
MAX_TIC
=
0.0090
# 0.343
MAX_TIC
=
0.0090
# 0.343
MIN_OBJECT_CREATION
=
0.0010
# 0.0070
MIN_OBJECT_CREATION
=
0.0010
# 0.0070
...
...
setup.py
View file @
413d8cfd
...
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
...
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
import
glob
import
glob
import
os
import
os
version
=
'0.4.3
0
'
version
=
'0.4.3
1
'
name
=
'erp5.util'
name
=
'erp5.util'
long_description
=
open
(
"README.erp5.util.txt"
).
read
()
+
"
\
n
"
long_description
=
open
(
"README.erp5.util.txt"
).
read
()
+
"
\
n
"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment