inteligr8/SearchServices
1
0
Fork 0
mirror of https://github.com/Alfresco/SearchServices.git synced 2026-09-16 18:12:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

SEARCH-223: Upgrade to Solr 6.3

Browse Source
This commit is contained in:
Joel
2016-11-10 17:54:25 -05:00
parent 21155675e7
commit 9a06eed79a
13 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
search-services/alfresco-search/src/main/java/org/alfresco/solr/AlfrescoCoreAdminHandler.java
+1 -1
View File
@@ -546,7 +546,7 @@ public class AlfrescoCoreAdminHandler extends CoreAdminHandler
properties.store(new FileOutputStream(config), null);
SolrCore core = coreContainer.create(coreName, newCore.toPath(), new HashMap<String, String>());
SolrCore core = coreContainer.create(coreName, newCore.toPath(), new HashMap<String, String>(), false);
rsp.add("core", core.getName());
}
search-services/alfresco-search/src/main/java/org/alfresco/solr/SolrInformationServer.java
+1 -1
View File
@@ -3763,7 +3763,7 @@ public class SolrInformationServer implements InformationServer
request = getLocalSolrQueryRequest();
NumericDocValues dbidDocValues = solrIndexSearcher.getLeafReader().getNumericDocValues(QueryConstants.FIELD_DBID);
NumericDocValues dbidDocValues = solrIndexSearcher.getSlowAtomicReader().getNumericDocValues(QueryConstants.FIELD_DBID);
ArrayList<Node> batch = new ArrayList<Node>(200);
DocList docList = cloud.getDocList(nativeRequestHandler, request, query.startsWith("{") ? query : "{!afts}"+query);
search-services/alfresco-search/src/main/java/org/alfresco/solr/query/AbstractQParser.java
+1 -1
View File
@@ -553,7 +553,7 @@ public abstract class AbstractQParser extends QParser implements QueryConstants
* @see org.apache.solr.search.QParser#getSort(boolean)
*/
@Override
public SortSpec getSort(boolean useGlobalParams) throws SyntaxError
public SortSpec getSortSpec(boolean useGlobalParams) throws SyntaxError
{
getQuery(); // ensure query is parsed first
search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrDeniedScorer.java
+1 -1
View File
@@ -63,7 +63,7 @@ public class SolrDeniedScorer extends AbstractSolrCachingScorer
{
int docID = it.nextDoc();
// Obtain the ACL ID for this ACL doc.
long aclID = searcher.getLeafReader().getNumericDocValues(QueryConstants.FIELD_ACLID).get(docID);
long aclID = searcher.getSlowAtomicReader().getNumericDocValues(QueryConstants.FIELD_ACLID).get(docID);
SchemaField schemaField = searcher.getSchema().getField(QueryConstants.FIELD_ACLID);
Query query = schemaField.getType().getFieldQuery(null, schemaField, Long.toString(aclID));
// Find real docs that match the ACL ID
search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrDenySetScorer.java
+1 -1
View File
@@ -69,7 +69,7 @@ public class SolrDenySetScorer extends AbstractSolrCachingScorer
{
int docID = it.nextDoc();
// Obtain the ACL ID for this ACL doc.
long aclID = searcher.getLeafReader().getNumericDocValues(QueryConstants.FIELD_ACLID).get(docID);
long aclID = searcher.getSlowAtomicReader().getNumericDocValues(QueryConstants.FIELD_ACLID).get(docID);
SchemaField schemaField = searcher.getSchema().getField(QueryConstants.FIELD_ACLID);
Query query = schemaField.getType().getFieldQuery(null, schemaField, Long.toString(aclID));
aQuery.add(query, Occur.SHOULD);
search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrDenySetScorer2.java
+2 -2
View File
@@ -68,7 +68,7 @@ public class SolrDenySetScorer2 extends AbstractSolrCachingScorer
DocSet aclDocs = searcher.getDocSet(wrapped);
HashSet<Long> aclsFound = new HashSet<Long>(aclDocs.size());
NumericDocValues aclDocValues = searcher.getLeafReader().getNumericDocValues(QueryConstants.FIELD_ACLID);
NumericDocValues aclDocValues = searcher.getSlowAtomicReader().getNumericDocValues(QueryConstants.FIELD_ACLID);
for (DocIterator it = aclDocs.iterator(); it.hasNext(); /**/)
{
@@ -80,7 +80,7 @@ public class SolrDenySetScorer2 extends AbstractSolrCachingScorer
if(aclsFound.size() > 0)
{
for(LeafReaderContext readerContext : searcher.getLeafReader().leaves() )
for(LeafReaderContext readerContext : searcher.getSlowAtomicReader().leaves() )
{
int maxDoc = readerContext.reader().maxDoc();
NumericDocValues fieldValues = DocValuesCache.getNumericDocValues(QueryConstants.FIELD_ACLID, readerContext.reader());
search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrReaderScorer.java
+1 -1
View File
@@ -63,7 +63,7 @@ public class SolrReaderScorer extends AbstractSolrCachingScorer
{
int docID = it.nextDoc();
// Obtain the ACL ID for this ACL doc.
long aclID = searcher.getLeafReader().getNumericDocValues(QueryConstants.FIELD_ACLID).get(docID);
long aclID = searcher.getSlowAtomicReader().getNumericDocValues(QueryConstants.FIELD_ACLID).get(docID);
SchemaField schemaField = searcher.getSchema().getField(QueryConstants.FIELD_ACLID);
Query query = schemaField.getType().getFieldQuery(null, schemaField, Long.toString(aclID));
DocSet docsForAclId = searcher.getDocSet(query);
search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrReaderSetScorer.java
+1 -1
View File
@@ -70,7 +70,7 @@ public class SolrReaderSetScorer extends AbstractSolrCachingScorer
{
int docID = it.nextDoc();
// Obtain the ACL ID for this ACL doc.
long aclID = searcher.getLeafReader().getNumericDocValues(QueryConstants.FIELD_ACLID).get(docID);
long aclID = searcher.getSlowAtomicReader().getNumericDocValues(QueryConstants.FIELD_ACLID).get(docID);
SchemaField schemaField = searcher.getSchema().getField(QueryConstants.FIELD_ACLID);
Query query = schemaField.getType().getFieldQuery(null, schemaField, Long.toString(aclID));
aQuery.add(query, Occur.SHOULD);
search-services/alfresco-search/src/main/java/org/alfresco/solr/query/SolrReaderSetScorer2.java
+2 -2
View File
@@ -68,7 +68,7 @@ public class SolrReaderSetScorer2 extends AbstractSolrCachingScorer
DocSet aclDocs = searcher.getDocSet(wrapped);
HashSet<Long> aclsFound = new HashSet<Long>(aclDocs.size());
NumericDocValues aclDocValues = searcher.getLeafReader().getNumericDocValues(QueryConstants.FIELD_ACLID);
NumericDocValues aclDocValues = searcher.getSlowAtomicReader().getNumericDocValues(QueryConstants.FIELD_ACLID);
for (DocIterator it = aclDocs.iterator(); it.hasNext(); /**/)
{
@@ -80,7 +80,7 @@ public class SolrReaderSetScorer2 extends AbstractSolrCachingScorer
if(aclsFound.size() > 0)
{
for(LeafReaderContext readerContext : searcher.getLeafReader().leaves() )
for(LeafReaderContext readerContext : searcher.getSlowAtomicReader().leaves() )
{
int maxDoc = readerContext.reader().maxDoc();
NumericDocValues fieldValues = DocValuesCache.getNumericDocValues(QueryConstants.FIELD_ACLID, readerContext.reader());
search-services/alfresco-search/src/main/java/org/alfresco/solr/transformer/DocValueDocTransformer.java
+5 -5
View File
@@ -76,7 +76,7 @@ public class DocValueDocTransformer extends DocTransformer
{
if(schemaField.hasDocValues())
{
SortedDocValues sortedDocValues = context.getSearcher().getLeafReader().getSortedDocValues(fieldName);
SortedDocValues sortedDocValues = context.getSearcher().getSlowAtomicReader().getSortedDocValues(fieldName);
if(sortedDocValues != null)
{
int ordinal = sortedDocValues.getOrd(docid);
@@ -89,7 +89,7 @@ public class DocValueDocTransformer extends DocTransformer
}
}
SortedSetDocValues sortedSetDocValues = context.getSearcher().getLeafReader().getSortedSetDocValues(fieldName);
SortedSetDocValues sortedSetDocValues = context.getSearcher().getSlowAtomicReader().getSortedSetDocValues(fieldName);
if(sortedSetDocValues != null)
{
ArrayList<Object> newValues = new ArrayList<Object>();
@@ -106,7 +106,7 @@ public class DocValueDocTransformer extends DocTransformer
}
BinaryDocValues binaryDocValues = context.getSearcher().getLeafReader().getBinaryDocValues(fieldName);
BinaryDocValues binaryDocValues = context.getSearcher().getSlowAtomicReader().getBinaryDocValues(fieldName);
if(binaryDocValues != null)
{
doc.removeFields(fieldName);
@@ -117,7 +117,7 @@ public class DocValueDocTransformer extends DocTransformer
if(schemaField.getType().getNumericType() != null)
{
NumericDocValues numericDocValues = context.getSearcher().getLeafReader().getNumericDocValues(fieldName);
NumericDocValues numericDocValues = context.getSearcher().getSlowAtomicReader().getNumericDocValues(fieldName);
if(numericDocValues != null)
{
doc.removeFields(fieldName);
@@ -140,7 +140,7 @@ public class DocValueDocTransformer extends DocTransformer
}
}
SortedNumericDocValues sortedNumericDocValues = context.getSearcher().getLeafReader().getSortedNumericDocValues(fieldName);
SortedNumericDocValues sortedNumericDocValues = context.getSearcher().getSlowAtomicReader().getSortedNumericDocValues(fieldName);
if(sortedNumericDocValues != null)
{
sortedNumericDocValues.setDocument(docid);
search-services/alfresco-search/src/main/java/org/apache/solr/handler/component/AlfrescoLukeRequestHandler.java
+1 -1
View File
@@ -372,7 +372,7 @@ public class AlfrescoLukeRequestHandler extends RequestHandlerBase {
fields = new TreeSet<>(Arrays.asList(fl.split("[,\\s]+")));
}
LeafReader reader = searcher.getLeafReader();
LeafReader reader = searcher.getSlowAtomicReader();
IndexSchema schema = searcher.getSchema();
// Don't be tempted to put this in the loop below, the whole point here
search-services/alfresco-search/src/main/java/org/apache/solr/handler/component/AlfrescoSolrHighlighter.java
+2 -2
View File
@@ -151,7 +151,7 @@ public class AlfrescoSolrHighlighter extends DefaultSolrHighlighter implements
// It'd be nice to know if payloads are on the tokenStream but the
// presence of the attribute isn't a good
// indicator.
final Terms terms = request.getSearcher().getLeafReader().fields()
final Terms terms = request.getSearcher().getSlowAtomicReader().fields()
.terms(schemaFieldName);
if (terms != null) {
defaultPayloads = terms.hasPayloads();
@@ -237,7 +237,7 @@ public class AlfrescoSolrHighlighter extends DefaultSolrHighlighter implements
FieldQuery fvhFieldQuery = null; // lazy
IndexReader reader = new TermVectorReusingLeafReader(req.getSearcher()
.getLeafReader()); // SOLR-5855
.getSlowAtomicReader()); // SOLR-5855
// Highlight each document
NamedList fragments = new SimpleOrderedMap();
search-services/pom.xml
+1 -1
View File
@@ -11,7 +11,7 @@
<packaging>pom</packaging>
<name>Alfresco Solr Search parent</name>
<properties>
<solr.version>6.2.1</solr.version>
<solr.version>6.3.0</solr.version>
<alfresco-solr.version>5.2.1-SNAPSHOT</alfresco-solr.version>
</properties>
<distributionManagement>