|
@@ -35,7 +35,7 @@
|
|
|
that you fully re-index after changing this setting as it can
|
|
that you fully re-index after changing this setting as it can
|
|
|
affect both how text is indexed and queried.
|
|
affect both how text is indexed and queried.
|
|
|
-->
|
|
-->
|
|
|
- <luceneMatchVersion>4.4</luceneMatchVersion>
|
|
|
|
|
|
|
+ <luceneMatchVersion>4.10.3</luceneMatchVersion>
|
|
|
|
|
|
|
|
<!-- <lib/> directives can be used to instruct Solr to load an Jars
|
|
<!-- <lib/> directives can be used to instruct Solr to load an Jars
|
|
|
identified and use them to resolve any "plugins" specified in
|
|
identified and use them to resolve any "plugins" specified in
|
|
@@ -116,21 +116,28 @@
|
|
|
solr.RAMDirectoryFactory is memory based, not
|
|
solr.RAMDirectoryFactory is memory based, not
|
|
|
persistent, and doesn't work with replication.
|
|
persistent, and doesn't work with replication.
|
|
|
-->
|
|
-->
|
|
|
- <directoryFactory name="DirectoryFactory" class="org.apache.solr.core.HdfsDirectoryFactory">
|
|
|
|
|
|
|
+ <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:org.apache.solr.core.HdfsDirectoryFactory}">
|
|
|
<str name="solr.hdfs.home">${solr.hdfs.home:}</str>
|
|
<str name="solr.hdfs.home">${solr.hdfs.home:}</str>
|
|
|
<str name="solr.hdfs.confdir">${solr.hdfs.confdir:}</str>
|
|
<str name="solr.hdfs.confdir">${solr.hdfs.confdir:}</str>
|
|
|
<str name="solr.hdfs.security.kerberos.enabled">${solr.hdfs.security.kerberos.enabled:false}</str>
|
|
<str name="solr.hdfs.security.kerberos.enabled">${solr.hdfs.security.kerberos.enabled:false}</str>
|
|
|
<str name="solr.hdfs.security.kerberos.keytabfile">${solr.hdfs.security.kerberos.keytabfile:}</str>
|
|
<str name="solr.hdfs.security.kerberos.keytabfile">${solr.hdfs.security.kerberos.keytabfile:}</str>
|
|
|
<str name="solr.hdfs.security.kerberos.principal">${solr.hdfs.security.kerberos.principal:}</str>
|
|
<str name="solr.hdfs.security.kerberos.principal">${solr.hdfs.security.kerberos.principal:}</str>
|
|
|
<bool name="solr.hdfs.blockcache.enabled">${solr.hdfs.blockcache.enabled:true}</bool>
|
|
<bool name="solr.hdfs.blockcache.enabled">${solr.hdfs.blockcache.enabled:true}</bool>
|
|
|
|
|
+ <!-- Enable/Disable using one global cache for all SolrCores.
|
|
|
|
|
+ The settings used will be from the first HdfsDirectoryFactory created. -->
|
|
|
|
|
+ <str name="solr.hdfs.blockcache.global">${solr.hdfs.blockcache.global:true}</str>
|
|
|
<int name="solr.hdfs.blockcache.slab.count">${solr.hdfs.blockcache.slab.count:1}</int>
|
|
<int name="solr.hdfs.blockcache.slab.count">${solr.hdfs.blockcache.slab.count:1}</int>
|
|
|
<bool name="solr.hdfs.blockcache.direct.memory.allocation">${solr.hdfs.blockcache.direct.memory.allocation:true}</bool>
|
|
<bool name="solr.hdfs.blockcache.direct.memory.allocation">${solr.hdfs.blockcache.direct.memory.allocation:true}</bool>
|
|
|
<int name="solr.hdfs.blockcache.blocksperbank">${solr.hdfs.blockcache.blocksperbank:16384}</int>
|
|
<int name="solr.hdfs.blockcache.blocksperbank">${solr.hdfs.blockcache.blocksperbank:16384}</int>
|
|
|
<bool name="solr.hdfs.blockcache.read.enabled">${solr.hdfs.blockcache.read.enabled:true}</bool>
|
|
<bool name="solr.hdfs.blockcache.read.enabled">${solr.hdfs.blockcache.read.enabled:true}</bool>
|
|
|
<bool name="solr.hdfs.blockcache.write.enabled">${solr.hdfs.blockcache.write.enabled:false}</bool>
|
|
<bool name="solr.hdfs.blockcache.write.enabled">${solr.hdfs.blockcache.write.enabled:false}</bool>
|
|
|
|
|
+ <!-- the buffercount is actually the total size in bytes to used for buffer caching -->
|
|
|
|
|
+ <int name="solr.hdfs.blockcache.bufferstore.buffercount">${solr.hdfs.blockcache.bufferstore.buffercount:0}</int>
|
|
|
<bool name="solr.hdfs.nrtcachingdirectory.enable">${solr.hdfs.nrtcachingdirectory.enable:true}</bool>
|
|
<bool name="solr.hdfs.nrtcachingdirectory.enable">${solr.hdfs.nrtcachingdirectory.enable:true}</bool>
|
|
|
<int name="solr.hdfs.nrtcachingdirectory.maxmergesizemb">${solr.hdfs.nrtcachingdirectory.maxmergesizemb:16}</int>
|
|
<int name="solr.hdfs.nrtcachingdirectory.maxmergesizemb">${solr.hdfs.nrtcachingdirectory.maxmergesizemb:16}</int>
|
|
|
<int name="solr.hdfs.nrtcachingdirectory.maxcachedmb">${solr.hdfs.nrtcachingdirectory.maxcachedmb:192}</int>
|
|
<int name="solr.hdfs.nrtcachingdirectory.maxcachedmb">${solr.hdfs.nrtcachingdirectory.maxcachedmb:192}</int>
|
|
|
|
|
+ <!-- HDFS Block Locality Reporter can be toggled on and off -->
|
|
|
|
|
+ <bool name="solr.hdfs.locality.metrics.enabled">${solr.hdfs.locality.metrics.enabled:false}</bool>
|
|
|
</directoryFactory>
|
|
</directoryFactory>
|
|
|
|
|
|
|
|
<!-- The CodecFactory for defining the format of the inverted index.
|
|
<!-- The CodecFactory for defining the format of the inverted index.
|
|
@@ -355,6 +362,7 @@
|
|
|
solr data directory. -->
|
|
solr data directory. -->
|
|
|
<updateLog>
|
|
<updateLog>
|
|
|
<str name="dir">${solr.ulog.dir:}</str>
|
|
<str name="dir">${solr.ulog.dir:}</str>
|
|
|
|
|
+ <int name="tlogDfsReplication">${solr.ulog.tlogDfsReplication:3}</int>
|
|
|
</updateLog>
|
|
</updateLog>
|
|
|
|
|
|
|
|
<!-- AutoCommit
|
|
<!-- AutoCommit
|
|
@@ -389,7 +397,7 @@
|
|
|
faster and more near-realtime friendly than a hard commit.
|
|
faster and more near-realtime friendly than a hard commit.
|
|
|
-->
|
|
-->
|
|
|
<autoSoftCommit>
|
|
<autoSoftCommit>
|
|
|
- <maxTime>${solr.autoSoftCommit.maxTime:1000}</maxTime>
|
|
|
|
|
|
|
+ <maxTime>${solr.autoSoftCommit.maxTime:15000}</maxTime>
|
|
|
</autoSoftCommit>
|
|
</autoSoftCommit>
|
|
|
|
|
|
|
|
|
|
|
|
@@ -876,6 +884,7 @@
|
|
|
-->
|
|
-->
|
|
|
<arr name="first-components">
|
|
<arr name="first-components">
|
|
|
<str>queryIndexAuthorization</str>
|
|
<str>queryIndexAuthorization</str>
|
|
|
|
|
+ <str>queryDocAuthorization</str>
|
|
|
</arr>
|
|
</arr>
|
|
|
|
|
|
|
|
</requestHandler>
|
|
</requestHandler>
|
|
@@ -890,6 +899,7 @@
|
|
|
</lst>
|
|
</lst>
|
|
|
<arr name="first-components">
|
|
<arr name="first-components">
|
|
|
<str>queryIndexAuthorization</str>
|
|
<str>queryIndexAuthorization</str>
|
|
|
|
|
+ <str>queryDocAuthorization</str>
|
|
|
</arr>
|
|
</arr>
|
|
|
</requestHandler>
|
|
</requestHandler>
|
|
|
|
|
|
|
@@ -897,7 +907,7 @@
|
|
|
<!-- realtime get handler, guaranteed to return the latest stored fields of
|
|
<!-- realtime get handler, guaranteed to return the latest stored fields of
|
|
|
any document, without the need to commit or open a new searcher. The
|
|
any document, without the need to commit or open a new searcher. The
|
|
|
current implementation relies on the updateLog feature being enabled. -->
|
|
current implementation relies on the updateLog feature being enabled. -->
|
|
|
- <requestHandler name="/get" class="solr.RealTimeGetHandler">
|
|
|
|
|
|
|
+ <requestHandler name="/get" class="solr.SecureRealTimeGetHandler">
|
|
|
<lst name="defaults">
|
|
<lst name="defaults">
|
|
|
<str name="omitHeader">true</str>
|
|
<str name="omitHeader">true</str>
|
|
|
<str name="wt">json</str>
|
|
<str name="wt">json</str>
|
|
@@ -905,6 +915,7 @@
|
|
|
</lst>
|
|
</lst>
|
|
|
<arr name="first-components">
|
|
<arr name="first-components">
|
|
|
<str>queryIndexAuthorization</str>
|
|
<str>queryIndexAuthorization</str>
|
|
|
|
|
+ <str>queryDocAuthorization</str>
|
|
|
</arr>
|
|
</arr>
|
|
|
</requestHandler>
|
|
</requestHandler>
|
|
|
|
|
|
|
@@ -1002,6 +1013,7 @@
|
|
|
|
|
|
|
|
<arr name="first-components">
|
|
<arr name="first-components">
|
|
|
<str>queryIndexAuthorization</str>
|
|
<str>queryIndexAuthorization</str>
|
|
|
|
|
+ <str>queryDocAuthorization</str>
|
|
|
</arr>
|
|
</arr>
|
|
|
|
|
|
|
|
<!-- append spellchecking to our list of components -->
|
|
<!-- append spellchecking to our list of components -->
|
|
@@ -1035,7 +1047,7 @@
|
|
|
on each Update Request
|
|
on each Update Request
|
|
|
-->
|
|
-->
|
|
|
|
|
|
|
|
- <lst name="defaults">
|
|
|
|
|
|
|
+ <lst name="invariants">
|
|
|
<str name="update.chain">updateIndexAuthorization</str>
|
|
<str name="update.chain">updateIndexAuthorization</str>
|
|
|
</lst>
|
|
</lst>
|
|
|
|
|
|
|
@@ -1046,6 +1058,8 @@
|
|
|
<requestHandler name="/update/json" class="solr.JsonUpdateRequestHandler">
|
|
<requestHandler name="/update/json" class="solr.JsonUpdateRequestHandler">
|
|
|
<lst name="defaults">
|
|
<lst name="defaults">
|
|
|
<str name="stream.contentType">application/json</str>
|
|
<str name="stream.contentType">application/json</str>
|
|
|
|
|
+ </lst>
|
|
|
|
|
+ <lst name="invariants">
|
|
|
<str name="update.chain">updateIndexAuthorization</str>
|
|
<str name="update.chain">updateIndexAuthorization</str>
|
|
|
</lst>
|
|
</lst>
|
|
|
|
|
|
|
@@ -1053,6 +1067,8 @@
|
|
|
<requestHandler name="/update/csv" class="solr.CSVRequestHandler">
|
|
<requestHandler name="/update/csv" class="solr.CSVRequestHandler">
|
|
|
<lst name="defaults">
|
|
<lst name="defaults">
|
|
|
<str name="stream.contentType">application/csv</str>
|
|
<str name="stream.contentType">application/csv</str>
|
|
|
|
|
+ </lst>
|
|
|
|
|
+ <lst name="invariants">
|
|
|
<str name="update.chain">updateIndexAuthorization</str>
|
|
<str name="update.chain">updateIndexAuthorization</str>
|
|
|
</lst>
|
|
</lst>
|
|
|
|
|
|
|
@@ -1338,6 +1354,21 @@
|
|
|
<searchComponent name="queryIndexAuthorization" class="org.apache.solr.handler.component.QueryIndexAuthorizationComponent" >
|
|
<searchComponent name="queryIndexAuthorization" class="org.apache.solr.handler.component.QueryIndexAuthorizationComponent" >
|
|
|
</searchComponent>
|
|
</searchComponent>
|
|
|
|
|
|
|
|
|
|
+ <searchComponent name="queryDocAuthorization" class="org.apache.solr.handler.component.QueryDocAuthorizationComponent" >
|
|
|
|
|
+ <!-- Set to true to enabled document-level authorization -->
|
|
|
|
|
+ <bool name="enabled">false</bool>
|
|
|
|
|
+
|
|
|
|
|
+ <!-- Field where the auth tokens are stored in the document -->
|
|
|
|
|
+ <str name="sentryAuthField">sentry_auth</str>
|
|
|
|
|
+
|
|
|
|
|
+ <!-- Auth token defined to allow any role to access the document.
|
|
|
|
|
+ Uncomment to enable. -->
|
|
|
|
|
+ <!--<str name="allRolesToken">*</str>-->
|
|
|
|
|
+ </searchComponent>
|
|
|
|
|
+
|
|
|
|
|
+ <searchComponent name="secureGet" class="org.apache.solr.handler.component.SecureRealTimeGetComponent" >
|
|
|
|
|
+ </searchComponent>
|
|
|
|
|
+
|
|
|
<!-- A request handler for demonstrating the spellcheck component.
|
|
<!-- A request handler for demonstrating the spellcheck component.
|
|
|
|
|
|
|
|
NOTE: This is purely as an example. The whole purpose of the
|
|
NOTE: This is purely as an example. The whole purpose of the
|
|
@@ -1395,6 +1426,7 @@
|
|
|
</lst>
|
|
</lst>
|
|
|
<arr name="first-components">
|
|
<arr name="first-components">
|
|
|
<str>queryIndexAuthorization</str>
|
|
<str>queryIndexAuthorization</str>
|
|
|
|
|
+ <str>queryDocAuthorization</str>
|
|
|
</arr>
|
|
</arr>
|
|
|
<arr name="last-components">
|
|
<arr name="last-components">
|
|
|
<str>tvComponent</str>
|
|
<str>tvComponent</str>
|
|
@@ -1506,6 +1538,7 @@
|
|
|
</lst>
|
|
</lst>
|
|
|
<arr name="first-components">
|
|
<arr name="first-components">
|
|
|
<str>queryIndexAuthorization</str>
|
|
<str>queryIndexAuthorization</str>
|
|
|
|
|
+ <str>queryDocAuthorization</str>
|
|
|
</arr>
|
|
</arr>
|
|
|
<arr name="last-components">
|
|
<arr name="last-components">
|
|
|
<str>clustering</str>
|
|
<str>clustering</str>
|
|
@@ -1527,10 +1560,9 @@
|
|
|
<bool name="terms">true</bool>
|
|
<bool name="terms">true</bool>
|
|
|
<bool name="distrib">false</bool>
|
|
<bool name="distrib">false</bool>
|
|
|
</lst>
|
|
</lst>
|
|
|
- <arr name="first-components">
|
|
|
|
|
- <str>queryIndexAuthorization</str>
|
|
|
|
|
- </arr>
|
|
|
|
|
<arr name="components">
|
|
<arr name="components">
|
|
|
|
|
+ <str>queryIndexAuthorization</str>
|
|
|
|
|
+ <str>queryDocAuthorization</str>
|
|
|
<str>terms</str>
|
|
<str>terms</str>
|
|
|
</arr>
|
|
</arr>
|
|
|
</requestHandler>
|
|
</requestHandler>
|
|
@@ -1558,6 +1590,7 @@
|
|
|
</lst>
|
|
</lst>
|
|
|
<arr name="first-components">
|
|
<arr name="first-components">
|
|
|
<str>queryIndexAuthorization</str>
|
|
<str>queryIndexAuthorization</str>
|
|
|
|
|
+ <str>queryDocAuthorization</str>
|
|
|
</arr>
|
|
</arr>
|
|
|
<arr name="last-components">
|
|
<arr name="last-components">
|
|
|
<str>elevator</str>
|
|
<str>elevator</str>
|