From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 4 Jul 2008 19:18:28 +0000 (+0000)
Subject: Introduce second level caching
X-Git-Tag: argeo-slc-2.1.7~2687
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=29a62341b61130736314628fb2af317d210f59dd;hp=e93f27ba6f7b9c25b8e35dcf3607aa9da8a30d60;p=gpl%2Fargeo-slc.git

Introduce second level caching

git-svn-id: https://svn.argeo.org/slc/trunk@1355 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/org.argeo.slc.hibernate/pom.xml b/org.argeo.slc.hibernate/pom.xml
index 5f0da4127..35aed6e4d 100644
--- a/org.argeo.slc.hibernate/pom.xml
+++ b/org.argeo.slc.hibernate/pom.xml
@@ -62,6 +62,10 @@
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-jdbc</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context-support</artifactId>
+		</dependency>
 
 		<dependency>
 			<groupId>hsqldb</groupId>
diff --git a/org.argeo.slc.hibernate/src/main/resources/org/argeo/slc/hibernate/cache/ehcache.xml b/org.argeo.slc.hibernate/src/main/resources/org/argeo/slc/hibernate/cache/ehcache.xml
new file mode 100644
index 000000000..6082951ee
--- /dev/null
+++ b/org.argeo.slc.hibernate/src/main/resources/org/argeo/slc/hibernate/cache/ehcache.xml
@@ -0,0 +1,48 @@
+<ehcache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="ehcache.xsd">
+
+	<diskStore path="java.io.tmpdir" />
+
+	<defaultCache maxElementsInMemory="10000" overflowToDisk="false" />
+
+	<cache name="org.argeo.slc.core.test.tree.TreeTestResult"
+		maxElementsInMemory="1000" />
+	<cache name="org.argeo.slc.core.test.tree.TreeTestResult.attributes"
+		maxElementsInMemory="1000" />
+	<cache name="org.argeo.slc.core.test.tree.PartSubList"
+		maxElementsInMemory="5000" />
+	<cache name="org.argeo.slc.core.test.tree.PartSubList.parts"
+		maxElementsInMemory="10000" />
+	<cache name="org.argeo.slc.core.test.SimpleResultPart"
+		maxElementsInMemory="10000" />
+	<cache
+		name="org.argeo.slc.core.test.tree.TreeTestResult.resultParts"
+		maxElementsInMemory="10000" />
+	<cache name="org.argeo.slc.core.test.tree.TreeTestResult.elements"
+		maxElementsInMemory="10000" />
+	<cache name="org.argeo.slc.core.structure.SimpleSElement"
+		maxElementsInMemory="10000" />
+	<cache name="org.argeo.slc.core.structure.SimpleSElement.tags"
+		maxElementsInMemory="20000" />
+
+	<cache name="org.argeo.slc.core.test.tree.TreeTestResultCollection"
+		maxElementsInMemory="100" />
+	<cache
+		name="org.argeo.slc.core.test.tree.TreeTestResultCollection.results"
+		maxElementsInMemory="1000" />
+
+	<cache name="org.argeo.slc.core.process.SlcExecution"
+		maxElementsInMemory="1000" />
+	<cache name="org.argeo.slc.core.process.SlcExecution.attributes"
+		maxElementsInMemory="5000" />
+	<cache name="org.argeo.slc.core.process.SlcExecution.steps"
+		maxElementsInMemory="10000" />
+	<cache name="org.argeo.slc.core.process.SlcExecutionStep"
+		maxElementsInMemory="10000" />
+	<cache name="org.argeo.slc.core.process.SlcExecutionStep.logLines"
+		maxElementsInMemory="100000" />
+
+	<cache name="org.argeo.slc.core.test.TestRunDescriptor"
+		maxElementsInMemory="1000" />
+
+</ehcache>
\ No newline at end of file
diff --git a/org.argeo.slc.hibernate/src/main/resources/org/argeo/slc/hibernate/process/SlcExecution.hbm.xml b/org.argeo.slc.hibernate/src/main/resources/org/argeo/slc/hibernate/process/SlcExecution.hbm.xml
index 59781dca8..5a9702421 100644
--- a/org.argeo.slc.hibernate/src/main/resources/org/argeo/slc/hibernate/process/SlcExecution.hbm.xml
+++ b/org.argeo.slc.hibernate/src/main/resources/org/argeo/slc/hibernate/process/SlcExecution.hbm.xml
@@ -4,6 +4,8 @@
 	"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 <hibernate-mapping package="org.argeo.slc.core.process">
 	<class name="SlcExecution" table="SLC_EXECUTION">
+		<cache usage="read-write" />
+
 		<id name="uuid" column="UUID" />
 		<property name="host" column="HOST" />
 		<property name="user" column="USER" />
@@ -11,6 +13,7 @@
 		<property name="status" column="STATUS" />
 
 		<list name="steps" cascade="all" table="SLC_EXECUTIONS_STEPS">
+			<cache usage="read-write" />
 			<key column="SLC_EXECUTION_ID" />
 			<list-index column="INDX" />
 			<one-to-many
@@ -19,6 +22,8 @@
 
 		<map name="attributes" table="SLC_EXEC_ATTRS_MAP" cascade="all"
 			lazy="false" sort="natural">
+			<cache usage="read-write" />
+
 			<key column="PARENT_ID" />
 			<map-key column="ATTR_NAME" type="string" />
 			<element column="NAME" type="string" />
diff --git a/org.argeo.slc.hibernate/src/main/resources/org/argeo/slc/hibernate/process/SlcExecutionStep.hbm.xml b/org.argeo.slc.hibernate/src/main/resources/org/argeo/slc/hibernate/process/SlcExecutionStep.hbm.xml
index ce22c71a4..c8888efa4 100644
--- a/org.argeo.slc.hibernate/src/main/resources/org/argeo/slc/hibernate/process/SlcExecutionStep.hbm.xml
+++ b/org.argeo.slc.hibernate/src/main/resources/org/argeo/slc/hibernate/process/SlcExecutionStep.hbm.xml
@@ -1,18 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
 	"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 <hibernate-mapping package="org.argeo.slc.core.process">
 	<class name="SlcExecutionStep" table="SLC_EXECUTION_STEP">
+		<cache usage="nonstrict-read-write" />
+
 		<id name="uuid" column="UUID" />
 		<property name="type" column="TYPE" />
 		<property name="begin" column="BEGIN" />
 
-		<list name="logLines" cascade="all" lazy="false"
-			table="SLC_EXECUTION_STEP_LOG_LINE">
-			<key column="SLC_EXECUTION_STEP_ID" />
-			<list-index column="INDX" />
-			<element column="LOG_LINE" type="string" />
-		</list>
-	</class>
+		<list name="logLines" cascade="all" lazy="false"
+			table="SLC_EXECUTION_STEP_LOG_LINE">
+			<cache usage="nonstrict-read-write" />
+			<key column="SLC_EXECUTION_STEP_ID" />
+			<list-index column="INDX" />
+			<element column="LOG_LINE" type="string" />
+		</list>
+	</class>
 </hibernate-mapping>
\ No newline at end of file
diff --git a/org.argeo.slc.hibernate/src/main/resources/org/argeo/slc/hibernate/spring/applicationContext.xml b/org.argeo.slc.hibernate/src/main/resources/org/argeo/slc/hibernate/spring/applicationContext.xml
index d7eb22266..1d59de1a6 100644
--- a/org.argeo.slc.hibernate/src/main/resources/org/argeo/slc/hibernate/spring/applicationContext.xml
+++ b/org.argeo.slc.hibernate/src/main/resources/org/argeo/slc/hibernate/spring/applicationContext.xml
@@ -1,83 +1,97 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"
-	default-lazy-init="true">
-
-	<bean id="slcDefault.dataSource.inMemoryTestHSQL"
-		class="org.springframework.jdbc.datasource.SingleConnectionDataSource"
-		destroy-method="destroy">
-		<property name="driverClassName" value="org.hsqldb.jdbcDriver" />
-		<property name="url" value="jdbc:hsqldb:mem:test" />
-		<property name="username" value="sa" />
-		<property name="password" value="" />
-		<property name="suppressClose" value="true" />
-	</bean>
-
-	<bean id="slcTemplates.sessionFactory.hibernateBasic"
-		abstract="true"
-		class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
-		<property name="mappingResources">
-			<list>
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"
+	default-lazy-init="true">
+
+	<bean id="slcDefault.dataSource.inMemoryTestHSQL"
+		class="org.springframework.jdbc.datasource.SingleConnectionDataSource"
+		destroy-method="destroy">
+		<property name="driverClassName" value="org.hsqldb.jdbcDriver" />
+		<property name="url" value="jdbc:hsqldb:mem:test" />
+		<property name="username" value="sa" />
+		<property name="password" value="" />
+		<property name="suppressClose" value="true" />
+	</bean>
+
+	<bean id="slcTemplates.sessionFactory.hibernateBasic"
+		abstract="true"
+		class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
+		<property name="mappingResources">
+			<list>
 				<value>
 					org/argeo/slc/hibernate/structure/SimpleSElement.hbm.xml
 				</value>
 				<value>
 					org/argeo/slc/hibernate/test/SimpleResultPart.hbm.xml
 				</value>
-				<value>
-					org/argeo/slc/hibernate/test/tree/TreeTestResult.hbm.xml
-				</value>
-				<value>
-					org/argeo/slc/hibernate/test/tree/TreeTestResultCollection.hbm.xml
-				</value>
-				<value>
-					org/argeo/slc/hibernate/test/tree/PartSubList.hbm.xml
-				</value>
-				<value>
-					org/argeo/slc/hibernate/test/TestRunDescriptor.hbm.xml
-				</value>
-				<value>
-					org/argeo/slc/hibernate/process/SlcExecution.hbm.xml
-				</value>
-				<value>
-					org/argeo/slc/hibernate/process/SlcExecutionStep.hbm.xml
-				</value>
-			</list>
-		</property>
-	</bean>
-
-	<bean id="slcDefault.sessionFactory.hibernateTestHSQL"
-		parent="slcTemplates.sessionFactory.hibernateBasic">
-		<property name="dataSource"
-			ref="slcDefault.dataSource.inMemoryTestHSQL" />
-		<property name="hibernateProperties">
+				<value>
+					org/argeo/slc/hibernate/test/tree/TreeTestResult.hbm.xml
+				</value>
+				<value>
+					org/argeo/slc/hibernate/test/tree/TreeTestResultCollection.hbm.xml
+				</value>
+				<value>
+					org/argeo/slc/hibernate/test/tree/PartSubList.hbm.xml
+				</value>
+				<value>
+					org/argeo/slc/hibernate/test/TestRunDescriptor.hbm.xml
+				</value>
+				<value>
+					org/argeo/slc/hibernate/process/SlcExecution.hbm.xml
+				</value>
+				<value>
+					org/argeo/slc/hibernate/process/SlcExecutionStep.hbm.xml
+				</value>
+			</list>
+		</property>
+		<property name="cacheProvider"
+			ref="slcDefault.cacheProvider.ehCache" />
+	</bean>
+
+	<bean id="slcDefault.cacheProvider.ehCache"
+		class="net.sf.ehcache.hibernate.SingletonEhCacheProvider"
+		depends-on="slcDefault.cacheProvider.ehCacheManager">
+	</bean>
+
+	<bean id="slcDefault.cacheProvider.ehCacheManager"
+		class="org.springframework.cache.ehcache.EhCacheManagerFactoryBean">
+		<property name="shared" value="true" />
+		<property name="configLocation"
+			value="classpath:/org/argeo/slc/hibernate/cache/ehcache.xml" />
+	</bean>
+
+	<bean id="slcDefault.sessionFactory.hibernateTestHSQL"
+		parent="slcTemplates.sessionFactory.hibernateBasic">
+		<property name="dataSource"
+			ref="slcDefault.dataSource.inMemoryTestHSQL" />
+		<property name="hibernateProperties">
 			<value><![CDATA[
 				hibernate.dialect=org.hibernate.dialect.HSQLDialect
 				hibernate.hbm2ddl.auto=create
-				hibernate.current_session_context_class=thread
-			]]></value>
-		</property>
-	</bean>
-
-	<bean id="slcTemplates.dao.testResultDao"
-		class="org.argeo.slc.hibernate.test.tree.TreeTestResultDaoHibernate"
-		abstract="true">
-	</bean>
-
-	<bean id="slcTemplates.dao.testResultCollectionDao"
-		class="org.argeo.slc.hibernate.test.tree.TreeTestResultCollectionDaoHibernate"
-		abstract="true">
-	</bean>
-
-	<bean id="slcTemplates.dao.testRunDescriptorDao"
-		class="org.argeo.slc.hibernate.test.TestRunDescriptorDaoHibernate"
-		abstract="true">
-	</bean>
-
-	<bean id="slcTemplates.dao.slcExecutionDao"
-		class="org.argeo.slc.hibernate.process.SlcExecutionDaoHibernate"
-		abstract="true">
-	</bean>
-
+				hibernate.current_session_context_class=thread
+			]]></value>
+		</property>
+	</bean>
+
+	<bean id="slcTemplates.dao.testResultDao"
+		class="org.argeo.slc.hibernate.test.tree.TreeTestResultDaoHibernate"
+		abstract="true">
+	</bean>
+
+	<bean id="slcTemplates.dao.testResultCollectionDao"
+		class="org.argeo.slc.hibernate.test.tree.TreeTestResultCollectionDaoHibernate"
+		abstract="true">
+	</bean>
+
+	<bean id="slcTemplates.dao.testRunDescriptorDao"
+		class="org.argeo.slc.hibernate.test.TestRunDescriptorDaoHibernate"
+		abstract="true">
+	</bean>
+
+	<bean id="slcTemplates.dao.slcExecutionDao"
+		class="org.argeo.slc.hibernate.process.SlcExecutionDaoHibernate"
+		abstract="true">
+	</bean>
+
 </beans>
\ No newline at end of file
diff --git a/org.argeo.slc.hibernate/src/main/resources/org/argeo/slc/hibernate/structure/SimpleSElement.hbm.xml b/org.argeo.slc.hibernate/src/main/resources/org/argeo/slc/hibernate/structure/SimpleSElement.hbm.xml
index 0bc9e6aea..0c20f3170 100644
--- a/org.argeo.slc.hibernate/src/main/resources/org/argeo/slc/hibernate/structure/SimpleSElement.hbm.xml
+++ b/org.argeo.slc.hibernate/src/main/resources/org/argeo/slc/hibernate/structure/SimpleSElement.hbm.xml
@@ -1,18 +1,20 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC
 	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
 	"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 <hibernate-mapping package="org.argeo.slc.core.structure">
 	<class name="SimpleSElement" table="SIMPLE_SELEMENT">
+		<cache usage="nonstrict-read-write" />
 		<id name="tid" column="T_ID">
 			<generator class="native" />
 		</id>
 		<property name="label" column="LABEL" not-null="true" />
-		<map name="tags" table="SIMPLE_SELEMENT_TAGS" cascade="all"
-			lazy="false" sort="natural">
-			<key column="PARENT_ID" />
-			<map-key type="string" column="NAME" />
-			<element type="string" column="VALUE" />
-		</map>
-	</class>
+		<map name="tags" table="SIMPLE_SELEMENT_TAGS" cascade="all"
+			lazy="false" sort="natural">
+			<cache usage="nonstrict-read-write" />
+			<key column="PARENT_ID" />
+			<map-key type="string" column="NAME" />
+			<element type="string" column="VALUE" />
+		</map>
+	</class>
 </hibernate-mapping>
\ No newline at end of file
diff --git a/org.argeo.slc.hibernate/src/main/resources/org/argeo/slc/hibernate/test/SimpleResultPart.hbm.xml b/org.argeo.slc.hibernate/src/main/resources/org/argeo/slc/hibernate/test/SimpleResultPart.hbm.xml
index 8a7e9da70..acd3b8cc5 100644
--- a/org.argeo.slc.hibernate/src/main/resources/org/argeo/slc/hibernate/test/SimpleResultPart.hbm.xml
+++ b/org.argeo.slc.hibernate/src/main/resources/org/argeo/slc/hibernate/test/SimpleResultPart.hbm.xml
@@ -4,6 +4,7 @@
 	"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 <hibernate-mapping package="org.argeo.slc.core.test">
 	<class name="SimpleResultPart" table="SIMPLE_RESULT_PART">
+		<cache usage="nonstrict-read-write" />
 		<id name="tid" column="T_ID">
 			<generator class="native" />
 		</id>
diff --git a/org.argeo.slc.hibernate/src/main/resources/org/argeo/slc/hibernate/test/TestRunDescriptor.hbm.xml b/org.argeo.slc.hibernate/src/main/resources/org/argeo/slc/hibernate/test/TestRunDescriptor.hbm.xml
index a00332cc2..f28c1264e 100644
--- a/org.argeo.slc.hibernate/src/main/resources/org/argeo/slc/hibernate/test/TestRunDescriptor.hbm.xml
+++ b/org.argeo.slc.hibernate/src/main/resources/org/argeo/slc/hibernate/test/TestRunDescriptor.hbm.xml
@@ -4,6 +4,7 @@
 	"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 <hibernate-mapping package="org.argeo.slc.core.test">
 	<class name="TestRunDescriptor" table="TEST_RUN_DESCRIPTOR">
+		<cache usage="nonstrict-read-write" />
 		<id name="testRunUuid" column="TEST_RUN_UUID" />
 		<property name="slcExecutionUuid" column="SLC_EXEC_UUID"
 			not-null="false" />
diff --git a/org.argeo.slc.hibernate/src/main/resources/org/argeo/slc/hibernate/test/tree/PartSubList.hbm.xml b/org.argeo.slc.hibernate/src/main/resources/org/argeo/slc/hibernate/test/tree/PartSubList.hbm.xml
index 3a593acdf..23d417608 100644
--- a/org.argeo.slc.hibernate/src/main/resources/org/argeo/slc/hibernate/test/tree/PartSubList.hbm.xml
+++ b/org.argeo.slc.hibernate/src/main/resources/org/argeo/slc/hibernate/test/tree/PartSubList.hbm.xml
@@ -4,10 +4,12 @@
 	"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 <hibernate-mapping package="org.argeo.slc.core.test.tree">
 	<class name="PartSubList" table="PART_SUB_LIST">
+		<cache usage="nonstrict-read-write" />
 		<id name="tid" column="T_ID">
 			<generator class="native" />
 		</id>
 		<list name="parts" cascade="all" table="PARTS_LIST">
+			<cache usage="nonstrict-read-write" />
 			<key column="PART_SUBLIST_ID" />
 			<list-index column="INDX" />
 			<many-to-many
diff --git a/org.argeo.slc.hibernate/src/main/resources/org/argeo/slc/hibernate/test/tree/TreeTestResult.hbm.xml b/org.argeo.slc.hibernate/src/main/resources/org/argeo/slc/hibernate/test/tree/TreeTestResult.hbm.xml
index eb4a38a77..5397a64bd 100644
--- a/org.argeo.slc.hibernate/src/main/resources/org/argeo/slc/hibernate/test/tree/TreeTestResult.hbm.xml
+++ b/org.argeo.slc.hibernate/src/main/resources/org/argeo/slc/hibernate/test/tree/TreeTestResult.hbm.xml
@@ -4,6 +4,7 @@
 	"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 <hibernate-mapping package="org.argeo.slc.core.test.tree">
 	<class name="TreeTestResult" table="TREE_TEST_RESULT">
+		<cache usage="read-write" />
 		<id name="uuid" column="UUID" />
 
 		<property name="closeDate" column="CLOSE_DATE" type="timestamp"
@@ -11,6 +12,7 @@
 
 		<map name="attributes" table="TTR_ATTRS_MAP" cascade="all"
 			lazy="false" sort="natural">
+			<cache usage="read-write" />
 			<key column="PARENT_ID" />
 			<map-key column="ATTR_NAME" type="string" />
 			<element column="NAME" type="string" />
@@ -18,6 +20,7 @@
 
 		<map name="resultParts" table="RESULT_PARTS_MAP" cascade="all"
 			sort="natural">
+			<cache usage="nonstrict-read-write" />
 			<key column="PARENT_ID" />
 			<composite-map-key
 				class="org.argeo.slc.core.structure.tree.TreeSPath">
@@ -29,6 +32,7 @@
 
 		<map name="elements" table="RESULT_ELEMENTS_MAP" cascade="all"
 			sort="natural">
+			<cache usage="nonstrict-read-write" />
 			<key column="PARENT_ID" />
 			<composite-map-key
 				class="org.argeo.slc.core.structure.tree.TreeSPath">
diff --git a/org.argeo.slc.hibernate/src/main/resources/org/argeo/slc/hibernate/test/tree/TreeTestResultCollection.hbm.xml b/org.argeo.slc.hibernate/src/main/resources/org/argeo/slc/hibernate/test/tree/TreeTestResultCollection.hbm.xml
index 82d976052..f7fac780b 100644
--- a/org.argeo.slc.hibernate/src/main/resources/org/argeo/slc/hibernate/test/tree/TreeTestResultCollection.hbm.xml
+++ b/org.argeo.slc.hibernate/src/main/resources/org/argeo/slc/hibernate/test/tree/TreeTestResultCollection.hbm.xml
@@ -5,10 +5,12 @@
 <hibernate-mapping package="org.argeo.slc.core.test.tree">
 	<class name="TreeTestResultCollection"
 		table="TREE_TEST_RESULT_COLLECTION">
+		<cache usage="nonstrict-read-write" />
 		<id name="id" column="ID" />
 
 		<set name="results" table="TTR_COLLECTION_RESULTS"
 			sort="natural">
+			<cache usage="read-write" />
 			<key column="PARENT_ID" />
 			<many-to-many class="TreeTestResult" />
 		</set>