[Erp5-report] r27453 - in /erp5/trunk/products: ERP5/Document/ ERP5/bootstrap/erp5_core/Ski...
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Jun 9 09:22:25 CEST 2009
Author: kazuhiko
Date: Tue Jun 9 09:22:23 2009
New Revision: 27453
URL: http://svn.erp5.org?rev=27453&view=rev
Log:
SQL Cache and ZODB Cache no longer exist.
Removed:
erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/SQLCache_view/
erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/SQLCache_view.xml
erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ZODBCache_view/
erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ZODBCache_view.xml
Modified:
erp5/trunk/products/ERP5/Document/BusinessTemplate.py
erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
erp5/trunk/products/ERP5Type/Tool/CacheTool.py
erp5/trunk/products/ERP5Type/Tool/SessionTool.py
erp5/trunk/products/ERP5Type/tests/testCache.py
erp5/trunk/products/ERP5Type/tests/testSessionTool.py
Modified: erp5/trunk/products/ERP5/Document/BusinessTemplate.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/BusinessTemplate.py?rev=27453&r1=27452&r2=27453&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/BusinessTemplate.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/BusinessTemplate.py [utf8] Tue Jun 9 09:22:23 2009
@@ -866,9 +866,7 @@
if obj.title != 'BROKEN':
container._mapTransform(obj)
elif obj.meta_type in ('ERP5 Ram Cache',
- 'ERP5 Distributed Ram Cache',
- 'ERP5 SQL Cache',
- 'ERP5 ZODB Cache',):
+ 'ERP5 Distributed Ram Cache',):
assert container.meta_type == 'ERP5 Cache Factory'
container.getParentValue().updateCache()
Removed: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/SQLCache_view.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/SQLCache_view.xml?rev=27452&view=auto
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/SQLCache_view.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/SQLCache_view.xml (removed)
@@ -1,137 +1,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <tuple>
- <global name="ERP5Form" module="Products.ERP5Form.Form"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_bind_names</string> </key>
- <value>
- <object>
- <klass>
- <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_asgns</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
- <item>
- <key> <string>_objects</string> </key>
- <value>
- <tuple/>
- </value>
- </item>
- <item>
- <key> <string>action</string> </key>
- <value> <string>Base_edit</string> </value>
- </item>
- <item>
- <key> <string>encoding</string> </key>
- <value> <string>UTF-8</string> </value>
- </item>
- <item>
- <key> <string>enctype</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>group_list</string> </key>
- <value>
- <list>
- <string>left</string>
- <string>right</string>
- <string>center</string>
- <string>bottom</string>
- </list>
- </value>
- </item>
- <item>
- <key> <string>groups</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>bottom</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>center</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>left</string> </key>
- <value>
- <list>
- <string>my_title</string>
- <string>my_cache_expire_check_interval</string>
- <string>my_cache_table_name</string>
- <string>my_int_index</string>
- </list>
- </value>
- </item>
- <item>
- <key> <string>right</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>SQLCache_view</string> </value>
- </item>
- <item>
- <key> <string>method</string> </key>
- <value> <string>POST</string> </value>
- </item>
- <item>
- <key> <string>name</string> </key>
- <value> <string>Alarm_view</string> </value>
- </item>
- <item>
- <key> <string>pt</string> </key>
- <value> <string>form_view</string> </value>
- </item>
- <item>
- <key> <string>row_length</string> </key>
- <value> <int>4</int> </value>
- </item>
- <item>
- <key> <string>stored_encoding</string> </key>
- <value> <string>UTF-8</string> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string>SQL Cache Plugin</string> </value>
- </item>
- <item>
- <key> <string>unicode_mode</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>update_action</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
Removed: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ZODBCache_view.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ZODBCache_view.xml?rev=27452&view=auto
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ZODBCache_view.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ZODBCache_view.xml (removed)
@@ -1,136 +1,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <tuple>
- <global name="ERP5Form" module="Products.ERP5Form.Form"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_bind_names</string> </key>
- <value>
- <object>
- <klass>
- <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_asgns</string> </key>
- <value>
- <dictionary/>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
- <item>
- <key> <string>_objects</string> </key>
- <value>
- <tuple/>
- </value>
- </item>
- <item>
- <key> <string>action</string> </key>
- <value> <string>Base_edit</string> </value>
- </item>
- <item>
- <key> <string>encoding</string> </key>
- <value> <string>UTF-8</string> </value>
- </item>
- <item>
- <key> <string>enctype</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>group_list</string> </key>
- <value>
- <list>
- <string>left</string>
- <string>right</string>
- <string>center</string>
- <string>bottom</string>
- </list>
- </value>
- </item>
- <item>
- <key> <string>groups</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>bottom</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>center</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>left</string> </key>
- <value>
- <list>
- <string>my_title</string>
- <string>my_int_index</string>
- <string>my_cache_expire_check_interval</string>
- </list>
- </value>
- </item>
- <item>
- <key> <string>right</string> </key>
- <value>
- <list/>
- </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>ZODBCache_view</string> </value>
- </item>
- <item>
- <key> <string>method</string> </key>
- <value> <string>POST</string> </value>
- </item>
- <item>
- <key> <string>name</string> </key>
- <value> <string>Alarm_view</string> </value>
- </item>
- <item>
- <key> <string>pt</string> </key>
- <value> <string>form_view</string> </value>
- </item>
- <item>
- <key> <string>row_length</string> </key>
- <value> <int>4</int> </value>
- </item>
- <item>
- <key> <string>stored_encoding</string> </key>
- <value> <string>UTF-8</string> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string>Ram Cache Plugin</string> </value>
- </item>
- <item>
- <key> <string>unicode_mode</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>update_action</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision?rev=27453&r1=27452&r2=27453&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] Tue Jun 9 09:22:23 2009
@@ -1,1 +1,1 @@
-1223
+1224
Modified: erp5/trunk/products/ERP5Type/Tool/CacheTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Tool/CacheTool.py?rev=27453&r1=27452&r2=27453&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Tool/CacheTool.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/Tool/CacheTool.py [utf8] Tue Jun 9 09:22:23 2009
@@ -183,7 +183,7 @@
Note: this method will calculate RAM memory usage for 'local'
(RamCache) cache plugins and will not include
- 'shared' (DistributedRamCache and SQLCache) cache plugins."""
+ 'shared' (DistributedRamCache) cache plugins."""
stats = {}
total_size = 0
ram_cache_root = self.getRamCacheRoot()
Modified: erp5/trunk/products/ERP5Type/Tool/SessionTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Tool/SessionTool.py?rev=27453&r1=27452&r2=27453&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Tool/SessionTool.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/Tool/SessionTool.py [utf8] Tue Jun 9 09:22:23 2009
@@ -111,7 +111,7 @@
class DistributedSession(Session):
""" Distributed Session dictionary.
- It's use together with DistributedRamCache or SQLCache cache (storage) plugins."""
+ It uses DistributedRamCache plugins."""
# session_id used to get respective dictionary from memcached
session_id = None
@@ -159,7 +159,7 @@
your own generated session_id.
This session object can be used anywhere in Zope / ERP5 environment.
- It can be local RAM based or Distributed (memcached or SQL (MySQL)).
+ It can be local RAM based or Distributed (memcached).
Its type depends on the type of cache plugin used under Cache Factory defined
as string in SESSION_CACHE_FACTORY and its first (and only) Cache Plugin.
You do not need to initialize it as this tool will initialize it as a plain dictionary for you.
@@ -184,7 +184,7 @@
request they'll be returend wrapped.
- developer can store temporary RAM based objects like 'TempOrder' but ONLY
when using Local RAM type of sessions. In a distributed environment one can use only
- pickable types ue to the nature of memcached server and MySQL storage.
+ pickable types ue to the nature of memcached server.
"""
id = 'portal_sessions'
@@ -209,7 +209,7 @@
storage_plugin_type = storage_plugin.__class__.__name__
if storage_plugin_type in ("RamCache",):
session = RamSession()
- elif storage_plugin_type in ("DistributedRamCache", "SQLCache",):
+ elif storage_plugin_type in ("DistributedRamCache",):
session = DistributedSession()
session._updateSessionId(session_id)
if session_duration is None:
Modified: erp5/trunk/products/ERP5Type/tests/testCache.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/tests/testCache.py?rev=27453&r1=27452&r2=27453&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/tests/testCache.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/tests/testCache.py [utf8] Tue Jun 9 09:22:23 2009
@@ -34,7 +34,6 @@
from Products.ERP5Type.CachePlugins.RamCache import RamCache
from Products.ERP5Type.CachePlugins.DistributedRamCache import\
DistributedRamCache
-from Products.ERP5Type.CachePlugins.SQLCache import SQLCache
from Products.ERP5Type.CachePlugins.BaseCache import CacheEntry
from Products.ERP5Type.Tool.CacheTool import CacheTool
@@ -49,17 +48,9 @@
return "Cache"
def setUp(self):
- # for SQLCache, get the connection string from runUnitTest.py parameters,
- # and use parseDBConnectionString to make it usable by SQLCache
- mysql_connection_string = os.environ.get(
- 'erp5_sql_connection_string', 'test test')
- sql_cache_kw = CacheTool().parseDBConnectionString(mysql_connection_string)
- sql_cache_kw['cache_table_name'] = 'cache'
-
self.cache_plugins = (RamCache(),
DistributedRamCache({'server': '127.0.0.1:11211',
'debugLevel': 7,}),
- SQLCache( sql_cache_kw ),
)
def testScope(self):
Modified: erp5/trunk/products/ERP5Type/tests/testSessionTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/tests/testSessionTool.py?rev=27453&r1=27452&r2=27453&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/tests/testSessionTool.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/tests/testSessionTool.py [utf8] Tue Jun 9 09:22:23 2009
@@ -123,7 +123,7 @@
del session['attr_2']
# get again session object again and check that session value is updated
- # (this makes sense for memcached/SQL)
+ # (this makes sense for memcached)
session = portal_sessions[self.session_id]
self.assert_(not 'attr_1' in session.keys())
self.assert_(not 'attr_2' in session.keys())
@@ -285,29 +285,6 @@
sequence_list.addSequenceString(sequence_string)
sequence_list.play(self)
- def test_04_SQLDistributedSession(self, quiet=0, run=run_all_test):
- """ Test DistributedSession which uses SQL based cache plugin. """
- if not run:
- return
- if not quiet:
- message = '\nTest Distributed Session (SQL).'
- ZopeTestCase._print(message)
- LOG('Testing... ', 0, message)
- self.portal.portal_caches.clearAllCache()
- # create memcached plugin and test
- self._changeCachePlugin('SQL Cache')
- sequence_list = SequenceList()
- sequence_string = 'stepTestSetGet \
- stepModifySession \
- stepDeleteClearSession \
- stepTestSessionDictInterface \
- stepTestSessionGetattr \
- stepTestSessionBulkStorage \
- stepTestSessionExpire \
- '
- sequence_list.addSequenceString(sequence_string)
- sequence_list.play(self)
-
def test_suite():
suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite(TestSessionTool))
More information about the Erp5-report
mailing list