You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2014/03/09 18:46:20 UTC
svn commit: r1575731 - in /jena/trunk/jena-arq/src:
main/java/org/apache/jena/atlas/lib/CacheFactory.java
main/java/org/apache/jena/atlas/lib/cache/CacheSync.java
test/java/org/apache/jena/atlas/lib/TestCache.java
Author: andy
Date: Sun Mar 9 17:46:19 2014
New Revision: 1575731
URL: http://svn.apache.org/r1575731
Log:
Remove CacheSync (cache changes are usually multiple operations which need to be sync'ed).
Removed:
jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/cache/CacheSync.java
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/CacheFactory.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestCache.java
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/CacheFactory.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/CacheFactory.java?rev=1575731&r1=1575730&r2=1575731&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/CacheFactory.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/CacheFactory.java Sun Mar 9 17:46:19 2014
@@ -88,14 +88,6 @@ public class CacheFactory
return new CacheStatsAtomic<Key, Value>(cache) ;
}
- /** Add a synchronization wrapper to an existing cache */
- public static <Key, Value> Cache<Key, Value> createSync(Cache<Key, Value> cache)
- {
- if ( cache instanceof CacheSync<?,?>)
- return cache ;
- return new CacheSync<Key, Value>(cache) ;
- }
-
/** Create set-cache, rather than a map-cache.
* @see Pool
*/
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestCache.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestCache.java?rev=1575731&r1=1575730&r2=1575731&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestCache.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestCache.java Sun Mar 9 17:46:19 2014
@@ -60,16 +60,6 @@ public class TestCache extends BaseTest
}
;
- private static CacheMaker<Integer, Integer> syncStandard =
- new CacheMaker<Integer, Integer>()
- {
- @Override
- public Cache<Integer, Integer> make(int size) { return CacheFactory.createSync(standard.make(size)) ; }
- @Override
- public String name() { return "Sync Standard" ; }
- }
- ;
-
private static CacheMaker<Integer, Integer> stats =
new CacheMaker<Integer, Integer>()
{
@@ -102,26 +92,21 @@ public class TestCache extends BaseTest
public static Collection<Object[]> cacheMakers()
{
return Arrays.asList(new Object[][] {
-// { simple , 1 }
-
- { simple , 10 }
- , { simple , 2 }
- , { simple , 1 }
- , { standard , 10 }
- , { standard , 2 }
- , { standard , 1 }
- , { syncStandard , 10 }
- , { syncStandard , 2 }
- , { syncStandard , 1 }
- , { stats , 10 }
- , { stats , 2 }
- , { stats , 1 }
- , { statsAtomic , 10 }
- , { statsAtomic , 2 }
- , { statsAtomic , 1 }
- } ) ;
+ { simple , 10 }
+ , { simple , 2 }
+ , { simple , 1 }
+ , { standard , 10 }
+ , { standard , 2 }
+ , { standard , 1 }
+ , { stats , 10 }
+ , { stats , 2 }
+ , { stats , 1 }
+ , { statsAtomic , 10 }
+ , { statsAtomic , 2 }
+ , { statsAtomic , 1 }
+ } ) ;
}
-
+
Cache<Integer, Integer> cache ;
CacheMaker<Integer,Integer> cacheMaker ;
int size ;