Changeset 3372

Timestamp:

08/13/13 15:41:02 (11 years ago)

Author:

olhsha

Message:

removing cached given representation of a given source. tested as well.

Location:

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src

Files:

• main/java/eu/dasish/annotation/backend/dao/CachedRepresentationDao.java (modified) (1 diff)
• main/java/eu/dasish/annotation/backend/dao/VersionDao.java (modified) (1 diff)
• main/java/eu/dasish/annotation/backend/dao/impl/JdbcCachedRepresentationDao.java (modified) (1 diff)
• main/java/eu/dasish/annotation/backend/dao/impl/JdbcSourceDao.java (modified) (1 diff)
• main/java/eu/dasish/annotation/backend/dao/impl/JdbcVersionDao.java (modified) (1 diff)
• test/java/eu/dasish/annotation/backend/dao/impl/JdbcVersionDaoTest.java (modified) (1 diff)

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/CachedRepresentationDao.java

@@ -66 +66 @@
     
    
-  
+    
   
 }

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/VersionDao.java

@@ -75 +75 @@
     public int deleteVersionCachedRepresentationRow(Number versionID);
     
+    
+    /**
+     * 
+     * @param sourceID
+     * @param cachedRepresentationID
+     * @return 
+     * 1) the amount of rows affected by deleting cached representation "cachedRepresentationID"
+     * from the table "versions_cached_representations", if the corresponding version is a sibling-version of the source surceID
+     * 2) the amount of rows affected by SAFE removing cachedRepresentationID from cached_representation table, 
+     * if the first number>0
+     * 
+     * used to fulfill DELETE api/sources/<sid>/cached/<cid>
+     */
+    public  int[] deleteCachedRepresentationForSource(Number sourceID, Number cachedRepresentationID);
 }
+    
+

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcCachedRepresentationDao.java

@@ -123 +123 @@
 
         if (result.isEmpty()) {
-            // rou can remove the cached representation
+            // you can remove the cached representation
             String sql = "DELETE FROM " + cachedRepresentationTableName + " where " + cached_representation_id + " = ?";
             return getSimpleJdbcTemplate().update(sql, internalID);

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcSourceDao.java

@@ -265 +265 @@
       return result;
     }
-
+    
+  
     //////// HELPERS //////////////////////
     ////////////////////////////////////////////////////////

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/JdbcVersionDao.java

@@ -177 +177 @@
             return null;
         }
-        
+
         // adding the corresponding cached representation is initiated from the separate service POST api/sources/<sid>/cached
         // so it is not implemented here
     }
 
+    @Override
+    public int[] deleteCachedRepresentationForSource(Number sourceID, Number cachedRepresentationID) {
+        List<Number> versions = retrieveVersionList(sourceID);
+        int[] result = new int[2];
+
+        if (versions == null) {
+            result[0] = 0;
+            result[1] = 0;
+            return result;
+        }
+        if (versions.isEmpty()) {
+            result[0] = 0;
+            result[1] = 0;
+            return result;
+        }
+
+        String values = makeListOfValues(versions);
+        StringBuilder sql = new StringBuilder("DELETE FROM ");
+        sql.append(versionsCachedRepresentationsTableName).append(" WHERE ").append(version_id).append(" IN ").append(values);
+        sql.append(" AND ").append(cached_representation_id).append(" = ?");
+        result[0] = getSimpleJdbcTemplate().update(sql.toString(), cachedRepresentationID);
+
+        // safe remove from the DB
+        if (result[0] > 0) {
+            result[1] = jdbcCachedRepresentationDao.deleteCachedRepresentationInfo(cachedRepresentationID);
+        } else {
+            result[1] = 0;
+        }
+        return result;
+    }
+
+    ////////////////////// HELPERS ///////////////////////////////
     private Version makeFreshCopy(Version version) {
         Version result = new Version();

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/test/java/eu/dasish/annotation/backend/dao/impl/JdbcVersionDaoTest.java

@@ -177 +177 @@
 
   
- 
+    /**
+     * test 
+     * public int deleteCachedRepresentationForSource(Number sourceID, Number cachedRepresentationID)
+     * 
+     **/
   
+   
+    @Test
+    public void tesDeleteCachedRepresentationForSource() {
+         System.out.println("test delete CachedRepresentationForSource");
+         
+         /// TEST 1 /////
+          mockery.checking(new Expectations() {
+            { 
+                oneOf(cachedRepresentationDao).deleteCachedRepresentationInfo(5);
+                will(returnValue(0));
+                
+            }
+         });         
+         int[] result = jdbcVersionDao.deleteCachedRepresentationForSource(1, 5); // source 1 has versions {1,2}, versions 1 and 2 have cached representations {1, 5} and {3} respectively
+         assertEquals(1, result[0]); 
+         assertEquals(0, result[1]); //cahced representation 5 is also connected version 6, therefore cannot be removed
+         
+         
+         // TEST 2 ////////
+          mockery.checking(new Expectations() {
+            { 
+                oneOf(cachedRepresentationDao).deleteCachedRepresentationInfo(4);
+                will(returnValue(1));
+                
+            }
+         });      
+         int[] result_2 = jdbcVersionDao.deleteCachedRepresentationForSource(3, 4); //source 1 --> version 4 --> cached 4
+         assertEquals(1, result_2[0]); 
+         assertEquals(1, result_2[1]); 
+    }
 }