Updated Branches: refs/heads/develop 9ef140d91 -> 4f1636355
don't explicitly call putAsync because the transaction might have been closed already when the future task is called Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/4f163635 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/4f163635 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/4f163635 Branch: refs/heads/develop Commit: 4f1636355e9c80f0a1b671c2410db0bcaec4a1d3 Parents: 9ef140d Author: Sebastian Schaffert <[email protected]> Authored: Fri Dec 20 15:22:53 2013 +0100 Committer: Sebastian Schaffert <[email protected]> Committed: Fri Dec 20 15:22:53 2013 +0100 ---------------------------------------------------------------------- .../marmotta/kiwi/caching/sail/KiWiCachingSailConnection.java | 6 +++--- .../marmotta/platform/backend/kiwi/KiWiStoreProvider.java | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/4f163635/libraries/kiwi/kiwi-caching/src/main/java/org/apache/marmotta/kiwi/caching/sail/KiWiCachingSailConnection.java ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-caching/src/main/java/org/apache/marmotta/kiwi/caching/sail/KiWiCachingSailConnection.java b/libraries/kiwi/kiwi-caching/src/main/java/org/apache/marmotta/kiwi/caching/sail/KiWiCachingSailConnection.java index aa47055..d0153dd 100644 --- a/libraries/kiwi/kiwi-caching/src/main/java/org/apache/marmotta/kiwi/caching/sail/KiWiCachingSailConnection.java +++ b/libraries/kiwi/kiwi-caching/src/main/java/org/apache/marmotta/kiwi/caching/sail/KiWiCachingSailConnection.java @@ -305,7 +305,7 @@ public class KiWiCachingSailConnection extends NotifyingSailConnectionWrapper im try { // cache the query result IntArray key = createCacheKey(subject,property,object,context,inferred); - queryCache.putAsync(key, result); + queryCache.put(key, result); // cache the nodes of the triples and the triples themselves Set<Value> nodes = new HashSet<Value>(); @@ -313,7 +313,7 @@ public class KiWiCachingSailConnection extends NotifyingSailConnectionWrapper im if(stmt instanceof KiWiTriple) { KiWiTriple triple = (KiWiTriple)stmt; Collections.addAll(nodes, new Value[]{triple.getSubject(), triple.getObject(), triple.getPredicate(), triple.getContext()}); - queryCache.putAsync(createCacheKey(triple.getSubject(), triple.getPredicate(), triple.getObject(), triple.getContext(), triple.isInferred()), ImmutableList.of(stmt)); + queryCache.put(createCacheKey(triple.getSubject(), triple.getPredicate(), triple.getObject(), triple.getContext(), triple.isInferred()), ImmutableList.of(stmt)); } } @@ -331,7 +331,7 @@ public class KiWiCachingSailConnection extends NotifyingSailConnectionWrapper im } for(Map.Entry<URI,List<Statement>> entry : properties.entrySet()) { IntArray key2 = createCacheKey(subject,entry.getKey(),null,context,inferred); - queryCache.putAsync(key2, entry.getValue()); + queryCache.put(key2, entry.getValue()); } } http://git-wip-us.apache.org/repos/asf/marmotta/blob/4f163635/platform/backends/marmotta-backend-kiwi/src/main/java/org/apache/marmotta/platform/backend/kiwi/KiWiStoreProvider.java ---------------------------------------------------------------------- diff --git a/platform/backends/marmotta-backend-kiwi/src/main/java/org/apache/marmotta/platform/backend/kiwi/KiWiStoreProvider.java b/platform/backends/marmotta-backend-kiwi/src/main/java/org/apache/marmotta/platform/backend/kiwi/KiWiStoreProvider.java index 4addd3c..4b19fee 100644 --- a/platform/backends/marmotta-backend-kiwi/src/main/java/org/apache/marmotta/platform/backend/kiwi/KiWiStoreProvider.java +++ b/platform/backends/marmotta-backend-kiwi/src/main/java/org/apache/marmotta/platform/backend/kiwi/KiWiStoreProvider.java @@ -139,6 +139,7 @@ public class KiWiStoreProvider implements StoreProvider { NotifyingSail base = new KiWiStore(configuration, cacheManager); if(configurationService.getBooleanConfiguration(CACHING_QUERY_ENABLED,true)) { + log.info(" - enabling query caching support"); KiWiQueryCacheConfiguration qcfg = new KiWiQueryCacheConfiguration(); qcfg.setMaxCacheSize(configurationService.getIntConfiguration(CACHING_QUERY_SIZE, 100000)); qcfg.setMaxEntrySize(configurationService.getIntConfiguration(CACHING_QUERY_LIMIT, 150)); @@ -147,6 +148,7 @@ public class KiWiStoreProvider implements StoreProvider { if("native".equalsIgnoreCase(configurationService.getStringConfiguration(SPARQL_STRATEGY))) { + log.info(" - enabling native SPARQL support"); base = new KiWiSparqlSail(base); }
