Changeset 1341

Timestamp:

05/19/11 08:40:46 (13 years ago)

Author:

twagoo

Message:

Caching of components (not descriptions) in ComponentRegistryDbImpl?

Location:

ComponentRegistry/trunk/ComponentRegistry/src

Files:

• main/java/clarin/cmdi/componentregistry/impl/database/CMDComponentSpecCache.java (added)
• main/java/clarin/cmdi/componentregistry/impl/database/CMDComponentSpecExpanderDbImpl.java (modified) (2 diffs)
• main/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryDbImpl.java (modified) (12 diffs)
• main/webresources/WEB-INF/spring-config/database-impl.xml (modified) (1 diff)
• test/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryDbImplTest.java (modified) (3 diffs)
• test/java/clarin/cmdi/componentregistry/rest/RegistryTestHelper.java (modified) (3 diffs)
• test/resources/spring-config/database-impl.xml (modified) (1 diff)

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/impl/database/CMDComponentSpecExpanderDbImpl.java

@@ -10 +10 @@
 public class CMDComponentSpecExpanderDbImpl extends CMDComponentSpecExpander {
 
+    private ComponentRegistryDbImpl dbImplRegistry;
+
     public CMDComponentSpecExpanderDbImpl(ComponentRegistryDbImpl registry) {
         super(registry);
+        dbImplRegistry = registry;
     }
 
@@ -26 +29 @@
     @Override
     protected CMDComponentSpec getUncachedComponent(String componentId) {
-        return registry.getMDComponent(componentId);
+        return dbImplRegistry.getUncachedMDComponent(componentId);
     }
 
     @Override
     protected CMDComponentSpec getUncachedProfile(String profileId) {
-        return registry.getMDProfile(profileId);
+        return dbImplRegistry.getUncachedMDProfile(profileId);
     }
 }

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryDbImpl.java

@@ -26 +26 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.dao.DataAccessException;
 
@@ -33 +34 @@
  * @author Twan Goosen <twan.goosen@mpi.nl>
  */
-public class ComponentRegistryDbImpl extends ComponentRegistryImplBase implements ComponentRegistry  {
+public class ComponentRegistryDbImpl extends ComponentRegistryImplBase implements ComponentRegistry {
 
     private final static Logger LOG = LoggerFactory.getLogger(ComponentRegistryDbImpl.class);
@@ -43 +44 @@
     @Autowired
     Configuration configuration;
+    @Autowired
+    @Qualifier("componentsCache")
+    CMDComponentSpecCache componentsCache;
+    @Autowired
+    @Qualifier("profilesCache")
+    CMDComponentSpecCache profilesCache;
 
     /**
@@ -110 +117 @@
     @Override
     public CMDComponentSpec getMDProfile(String id) {
-        try {
-            return getMDComponent(id, profileDescriptionDao);
+        CMDComponentSpec result = profilesCache.get(id);
+        if (result == null && !profilesCache.containsKey(id)) {
+            result = getUncachedMDProfile(id);
+            profilesCache.put(id, result);
+        }
+        return result;
+    }
+
+    public CMDComponentSpec getUncachedMDProfile(String id) {
+        try {
+            return getUncachedMDComponent(id, profileDescriptionDao);
         } catch (DataAccessException ex) {
             LOG.error("Database access error while trying to get profile", ex);
@@ -120 +136 @@
     @Override
     public CMDComponentSpec getMDComponent(String id) {
-        try {
-            return getMDComponent(id, componentDescriptionDao);
+        CMDComponentSpec result = componentsCache.get(id);
+        if (result == null && !componentsCache.containsKey(id)) {
+            result = getUncachedMDComponent(id);
+            componentsCache.put(id, result);
+        }
+        return result;
+    }
+
+    public CMDComponentSpec getUncachedMDComponent(String id) {
+        try {
+            return getUncachedMDComponent(id, componentDescriptionDao);
         } catch (DataAccessException ex) {
             LOG.error("Database access error while trying to get component", ex);
@@ -138 +163 @@
                 componentDescriptionDao.insertDescription(description, xml, isPublic(), userId);
             }
+            invalidateCache(description);
             return 0;
         } catch (JAXBException ex) {
@@ -154 +180 @@
             AbstractDescriptionDao<?> dao = getDaoForDescription(description);
             dao.updateDescription(getIdForDescription(description), description, componentSpecToString(spec));
+            invalidateCache(description);
             return 0;
         } catch (DataAccessException ex) {
@@ -225 +252 @@
                 checkAge(desc, principal);
                 profileDescriptionDao.setDeleted(getIdForDescription(desc));
+                invalidateCache(desc);
             }
         } catch (DataAccessException ex) {
@@ -246 +274 @@
 //            }
                 componentDescriptionDao.setDeleted(getIdForDescription(desc));
+                invalidateCache(desc);
             }
         } catch (DataAccessException ex) {
@@ -275 +304 @@
     public void setUserId(Number user) {
         this.userId = user;
+    }
+
+    private void invalidateCache(AbstractDescription description){
+        if(description.isProfile()){
+            profilesCache.remove(description.getId());
+        } else{
+            componentsCache.remove(description.getId());
+        }
     }
 
@@ -311 +348 @@
     }
 
-    private CMDComponentSpec getMDComponent(String id, AbstractDescriptionDao dao) {
+    private CMDComponentSpec getUncachedMDComponent(String id, AbstractDescriptionDao dao) {
         String xml = dao.getContent(id);
         if (xml != null) {
@@ -345 +382 @@
         if (isPublic() && !configuration.isAdminUser(principal)) {
             try {
-                Date regDate = AbstractDescription.getDate(desc.getRegistrationDate());
+                Date regDate = AbstractDescription.getDate(desc.
+                        getRegistrationDate());
                 Calendar calendar = Calendar.getInstance();
                 calendar.set(Calendar.MONTH, calendar.get(Calendar.MONTH) - 1);

ComponentRegistry/trunk/ComponentRegistry/src/main/webresources/WEB-INF/spring-config/database-impl.xml

@@ -7 +7 @@
     <import resource="persistence.xml"/>
 
+    <bean id="componentsCache" class="clarin.cmdi.componentregistry.impl.database.CMDComponentSpecCache" />
+    <bean id="profilesCache" class="clarin.cmdi.componentregistry.impl.database.CMDComponentSpecCache" />
+
     <!-- Prototype bean for component registry (service) -->
-    <bean id="componentRegistry" class="clarin.cmdi.componentregistry.impl.database.ComponentRegistryDbImpl"  scope="prototype"></bean>
+    <bean id="componentRegistry" class="clarin.cmdi.componentregistry.impl.database.ComponentRegistryDbImpl" scope="prototype"></bean>
 
     <!-- Factory that will create component registries for us (and autowire them), to be used by actual ComponentRegistryFactory -->
     <bean id="componentRegistryBeanFactory"
             class="org.springframework.beans.factory.config.ServiceLocatorFactoryBean">
-        <property name="serviceLocatorInterface" value="clarin.cmdi.componentregistry.impl.database.ComponentRegistryBeanFactory"/>
+        <property name="serviceLocatorInterface" value="clarin.cmdi.componentregistry.impl.database.ComponentRegistryBeanFactory"/>
     </bean>
 

ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryDbImplTest.java

@@ -3 +3 @@
 import clarin.cmdi.componentregistry.ComponentRegistry;
 import clarin.cmdi.componentregistry.DeleteFailedException;
+import clarin.cmdi.componentregistry.MDMarshaller;
 import clarin.cmdi.componentregistry.UserCredentials;
 import clarin.cmdi.componentregistry.UserUnauthorizedException;
@@ -9 +10 @@
 import clarin.cmdi.componentregistry.model.ComponentDescription;
 import static clarin.cmdi.componentregistry.impl.database.ComponentRegistryDatabase.*;
+import clarin.cmdi.componentregistry.model.AbstractDescription;
 import clarin.cmdi.componentregistry.model.ProfileDescription;
 import clarin.cmdi.componentregistry.model.UserMapping.User;
@@ -449 +451 @@
         assertTrue(RegistryTestHelper.hasComponent(xsd, "XXX", "0", "99"));
     }
+
+    @Test
+    public void testUpdate() throws Exception {
+        ComponentRegistry register = getComponentRegistryForUser(null);
+        ComponentDescription description = ComponentDescription.
+                createNewDescription();
+        description.setName("Aap");
+        description.setDescription("MyDescription");
+
+        CMDComponentSpec testComponent = RegistryTestHelper.getTestComponent("Test1");
+        register.register(description, testComponent);
+
+        // Change values
+        description.setName("Noot");
+        description.setDescription("AnotherDescription");
+        // Update in db
+        register.update(description, testComponent);
+        description = register.getComponentDescription(description.getId());
+        // Test if new values are there
+        assertNotNull(description);
+        assertEquals("Noot", description.getName());
+        assertEquals("AnotherDescription", description.getDescription());
+
+        // Update content
+        CMDComponentSpec testComponent2 = RegistryTestHelper.getTestComponent("Test2");
+        register.update(description, testComponent2);
+        // Test if new content is there
+        assertEquals(RegistryTestHelper.getXml(testComponent2),
+                RegistryTestHelper.getXml(register.getMDComponent(description.
+                getId())));
+
+
+        // Update both
+        description.setName("Mies");
+        description.setDescription("YetAnotherDescription");
+        CMDComponentSpec testComponent3 = RegistryTestHelper.getTestComponent("Test3");
+
+        // Update in db
+        register.update(description, testComponent3);
+        description = register.getComponentDescription(description.getId());
+        // Test if new values are there
+        assertNotNull(description);
+        assertEquals("Mies", description.getName());
+        assertEquals("YetAnotherDescription", description.getDescription());
+        // Test if new content is there
+        assertEquals(RegistryTestHelper.getXml(testComponent3),
+                RegistryTestHelper.getXml(register.getMDComponent(description.
+                getId())));
+    }
 }

ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/rest/RegistryTestHelper.java

@@ -2 +2 @@
 
 import java.io.ByteArrayInputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
@@ -17 +18 @@
 import clarin.cmdi.componentregistry.model.ComponentDescription;
 import clarin.cmdi.componentregistry.model.ProfileDescription;
+import java.io.ByteArrayOutputStream;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -149 +151 @@
     }
 
+    public static CMDComponentSpec getTestComponent(String name) throws JAXBException {
+        return MDMarshaller.unmarshal(CMDComponentSpec.class, getComponentTestContent(name), MDMarshaller.getCMDComponentSchema());
+    }
+
+    public static String getXml(CMDComponentSpec componentSpec) throws JAXBException, UnsupportedEncodingException{
+        ByteArrayOutputStream os = new ByteArrayOutputStream();
+        MDMarshaller.marshal(componentSpec, os);
+        String xml = os.toString();
+        try {
+            os.close();
+        } catch (IOException ex) {
+        }
+        return xml;
+    }
 
 

ComponentRegistry/trunk/ComponentRegistry/src/test/resources/spring-config/database-impl.xml

@@ -9 +9 @@
     <import resource="persistence.xml"/>
 
+
+    <bean id="componentsCache" class="clarin.cmdi.componentregistry.impl.database.CMDComponentSpecCache" />
+    <bean id="profilesCache" class="clarin.cmdi.componentregistry.impl.database.CMDComponentSpecCache" />
 
     <!-- Prototype bean for component registry (service) -->