Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-8132: HDFSDirectoryFactory now defaults to using the global block cache. 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1707067 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Mark Robert Miller 2015-10-06 14:40:12 +00:00
parent 63117eb077
commit 20a8df7a5d
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solr/CHANGES.txt
View File

@ -81,7 +81,6 @@ Optimizations
speedups were up to 2.5x for production of filters, and up to 10x for query evaluation with
embedded term range queres that resulted in filter cache hits. (yonik)
Other Changes
----------------------
@ -107,6 +106,7 @@ Other Changes
* SOLR-7441: Improve overall robustness of the Streaming stack: Streaming API,
Streaming Expressions, Parallel SQL (Joel Bernstein)
* SOLR-8132: HDFSDirectoryFactory now defaults to using the global block cache. (Mark Miller)
================== 5.4.0 ==================

3
solr/core/src/java/org/apache/solr/core/HdfsDirectoryFactory.java
View File

@ -61,7 +61,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import com.google.common.cache.CacheBuilder;
import com.google.common.cache.RemovalListener;
import com.google.common.cache.RemovalNotification;
@ -184,7 +183,7 @@ public class HdfsDirectoryFactory extends CachingDirectoryFactory implements Sol
}
boolean blockCacheEnabled = getConfig(BLOCKCACHE_ENABLED, true);
boolean blockCacheGlobal = getConfig(BLOCKCACHE_GLOBAL, false); // default to false for back compat
boolean blockCacheGlobal = getConfig(BLOCKCACHE_GLOBAL, true);
boolean blockCacheReadEnabled = getConfig(BLOCKCACHE_READ_ENABLED, true);
final HdfsDirectory hdfsDir;

2
solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog-with-delayingcomponent.xml
View File

@ -28,7 +28,7 @@
<int name="solr.hdfs.blockcache.blocksperbank">${solr.hdfs.blockcache.blocksperbank:1024}</int>
<str name="solr.hdfs.home">${solr.hdfs.home:}</str>
<str name="solr.hdfs.confdir">${solr.hdfs.confdir:}</str>
<str name="solr.hdfs.blockcache.global">${solr.hdfs.blockcache.global:false}</str>
<str name="solr.hdfs.blockcache.global">${solr.hdfs.blockcache.global:true}</str>
</directoryFactory>
<dataDir>${solr.data.dir:}</dataDir>

2
solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml
View File

@ -28,7 +28,7 @@
<int name="solr.hdfs.blockcache.blocksperbank">${solr.hdfs.blockcache.blocksperbank:1024}</int>
<str name="solr.hdfs.home">${solr.hdfs.home:}</str>
<str name="solr.hdfs.confdir">${solr.hdfs.confdir:}</str>
<str name="solr.hdfs.blockcache.global">${solr.hdfs.blockcache.global:false}</str>
<str name="solr.hdfs.blockcache.global">${solr.hdfs.blockcache.global:true}</str>
</directoryFactory>
<dataDir>${solr.data.dir:}</dataDir>