incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [3/3] git commit: Disabling query cache because if used with readinterceptor the cache would return incorrect results.
Date Thu, 06 Feb 2014 18:58:55 GMT
Disabling query cache because if used with readinterceptor the cache would return incorrect
results.


Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/1a445d00
Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/1a445d00
Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/1a445d00

Branch: refs/heads/apache-blur-0.2
Commit: 1a445d006300186be99bafc3307409c1962b91fd
Parents: cfa3a07
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Thu Feb 6 13:50:49 2014 -0500
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Thu Feb 6 13:50:49 2014 -0500

----------------------------------------------------------------------
 .../org/apache/blur/thrift/BlurShardServer.java | 29 ++++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/1a445d00/blur-core/src/main/java/org/apache/blur/thrift/BlurShardServer.java
----------------------------------------------------------------------
diff --git a/blur-core/src/main/java/org/apache/blur/thrift/BlurShardServer.java b/blur-core/src/main/java/org/apache/blur/thrift/BlurShardServer.java
index 3532429..f16f814 100644
--- a/blur-core/src/main/java/org/apache/blur/thrift/BlurShardServer.java
+++ b/blur-core/src/main/java/org/apache/blur/thrift/BlurShardServer.java
@@ -65,6 +65,7 @@ import org.apache.blur.utils.QueryCacheKey;
 public class BlurShardServer extends TableAdmin implements Iface {
 
   private static final Log LOG = LogFactory.getLog(BlurShardServer.class);
+  private static final boolean ENABLE_CACHE = false;
   private IndexManager _indexManager;
   private IndexServer _indexServer;
   private boolean _closed;
@@ -107,17 +108,18 @@ public class BlurShardServer extends TableAdmin implements Iface {
 
       // Note: Querying the Shard Server directly if query.startTime == 0
       BlurUtil.setStartTime(blurQuery);
-
-      if (blurQuery.useCacheIfPresent && selector == null) {
-        // Selector has to be null because we might cache data if it's not.
-        LOG.debug("Using cache for query [{0}] on table [{1}].", blurQuery, table);
-        QueryCacheKey key = QueryCache.getNormalizedBlurQueryKey(table, blurQuery);
-        QueryCacheEntry queryCacheEntry = _queryCache.get(key);
-        if (_queryCache.isValid(queryCacheEntry, _indexServer.getShardListCurrentServerOnly(table)))
{
-          LOG.debug("Cache hit for query [{0}] on table [{1}].", blurQuery, table);
-          return queryCacheEntry.getBlurResults(blurQuery);
-        } else {
-          _queryCache.remove(key);
+      if (ENABLE_CACHE) {
+        if (blurQuery.useCacheIfPresent && selector == null) {
+          // Selector has to be null because we might cache data if it's not.
+          LOG.debug("Using cache for query [{0}] on table [{1}].", blurQuery, table);
+          QueryCacheKey key = QueryCache.getNormalizedBlurQueryKey(table, blurQuery);
+          QueryCacheEntry queryCacheEntry = _queryCache.get(key);
+          if (_queryCache.isValid(queryCacheEntry, _indexServer.getShardListCurrentServerOnly(table)))
{
+            LOG.debug("Cache hit for query [{0}] on table [{1}].", blurQuery, table);
+            return queryCacheEntry.getBlurResults(blurQuery);
+          } else {
+            _queryCache.remove(key);
+          }
         }
       }
       BlurUtil.setStartTime(original);
@@ -131,7 +133,10 @@ public class BlurShardServer extends TableAdmin implements Iface {
         if (selector != null) {
           return blurResults;
         }
-        return _queryCache.cache(table, original, blurResults);
+        if (ENABLE_CACHE) {
+          return _queryCache.cache(table, original, blurResults);
+        }
+        return blurResults;
       } catch (BlurException e) {
         throw e;
       } catch (Exception e) {


Mime
View raw message