mirror of
https://github.com/yacy/yacy_search_server.git
synced 2024-09-19 00:01:41 +02:00
added another solr connector, the ConcurrentUpdateSolrConnector which
does not block when long-running updates to solr are made. This is realized using blocking queues which process all long-running tasks in the background. Also some bugfixes to existing connectors.
This commit is contained in:
Michael Peter Christen
parent
0af7803367
commit
1aac722cc6
|
|
@ -97,7 +97,7 @@ public abstract class AbstractSolrConnector implements SolrConnector {
|
|||
@Override
|
||||
public BlockingQueue<SolrDocument> concurrentDocumentsByQuery(final String querystring, final int offset, final int maxcount, final long maxtime, final int buffersize, final String ... fields) {
|
||||
final BlockingQueue<SolrDocument> queue = buffersize <= 0 ? new LinkedBlockingQueue<SolrDocument>() : new ArrayBlockingQueue<SolrDocument>(buffersize);
|
||||
final long endtime = System.currentTimeMillis() + maxtime;
|
||||
final long endtime = maxtime == Long.MAX_VALUE ? Long.MAX_VALUE : System.currentTimeMillis() + maxtime; // we know infinity!
|
||||
final Thread t = new Thread() {
|
||||
@Override
|
||||
public void run() {
|
||||
|
|
@ -128,7 +128,7 @@ public abstract class AbstractSolrConnector implements SolrConnector {
|
|||
@Override
|
||||
public BlockingQueue<String> concurrentIDsByQuery(final String querystring, final int offset, final int maxcount, final long maxtime) {
|
||||
final BlockingQueue<String> queue = new LinkedBlockingQueue<String>();
|
||||
final long endtime = System.currentTimeMillis() + maxtime;
|
||||
final long endtime = maxtime == Long.MAX_VALUE ? Long.MAX_VALUE : System.currentTimeMillis() + maxtime; // we know infinity!
|
||||
final Thread t = new Thread() {
|
||||
@Override
|
||||
public void run() {
|
||||
|
|
@ -215,28 +215,6 @@ public abstract class AbstractSolrConnector implements SolrConnector {
|
|||
return exist;
|
||||
}
|
||||
|
||||
/**
|
||||
* get the number of results for this id.
|
||||
* This should only be called if the actual result is never used, and only the count is interesting
|
||||
* @param id
|
||||
* @return the number of results for this query
|
||||
*/
|
||||
public long getCountById(final String id) throws IOException {
|
||||
// construct raw query
|
||||
final SolrQuery params = new SolrQuery();
|
||||
params.setQuery("{!raw f=" + CollectionSchema.id.getSolrFieldName() + "}" + id);
|
||||
params.setRows(0);
|
||||
params.setStart(0);
|
||||
params.setFacet(false);
|
||||
params.setFields(CollectionSchema.id.getSolrFieldName());
|
||||
|
||||
// query the server
|
||||
QueryResponse rsp = getResponseByParams(params);
|
||||
final SolrDocumentList docs = rsp.getResults();
|
||||
long count = docs == null ? 0 : docs.getNumFound();
|
||||
return count;
|
||||
}
|
||||
|
||||
/**
|
||||
* get the number of results when this query is done.
|
||||
* This should only be called if the actual result is never used, and only the count is interesting
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@ package net.yacy.cora.federate.solr.connector;
|
|||
|
||||
import java.io.IOException;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import net.yacy.cora.sorting.ReversibleScoreMap;
|
||||
|
|
@ -107,7 +106,7 @@ public class CachedSolrConnector extends AbstractSolrConnector implements SolrCo
|
|||
* @throws IOException
|
||||
*/
|
||||
@Override
|
||||
public void deleteByIds(final List<String> ids) throws IOException {
|
||||
public void deleteByIds(final Collection<String> ids) throws IOException {
|
||||
for (String id: ids) {
|
||||
String q = idQuery(id);
|
||||
this.documentCache.remove(q);
|
||||
|
|
|
|||
|
|
@ -0,0 +1,348 @@
|
|||
/**
|
||||
* ConcurrentUpdateSolrConnector
|
||||
* Copyright 2013 by Michael Peter Christen
|
||||
* First released 28.04.2013 at http://yacy.net
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2.1 of the License, or (at your option) any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with this program in the file lgpl21.txt
|
||||
* If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package net.yacy.cora.federate.solr.connector;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Collection;
|
||||
import java.util.Iterator;
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.ArrayBlockingQueue;
|
||||
import java.util.concurrent.BlockingQueue;
|
||||
import java.util.concurrent.LinkedBlockingQueue;
|
||||
|
||||
import net.yacy.cora.document.ASCII;
|
||||
import net.yacy.cora.sorting.ReversibleScoreMap;
|
||||
import net.yacy.cora.storage.HandleSet;
|
||||
import net.yacy.cora.util.SpaceExceededException;
|
||||
import net.yacy.kelondro.data.meta.URIMetadataRow;
|
||||
import net.yacy.kelondro.index.RowHandleSet;
|
||||
import net.yacy.kelondro.logging.Log;
|
||||
import net.yacy.kelondro.util.MemoryControl;
|
||||
import net.yacy.search.schema.CollectionSchema;
|
||||
|
||||
import org.apache.solr.client.solrj.response.QueryResponse;
|
||||
import org.apache.solr.client.solrj.util.ClientUtils;
|
||||
import org.apache.solr.common.SolrDocument;
|
||||
import org.apache.solr.common.SolrDocumentList;
|
||||
import org.apache.solr.common.SolrException;
|
||||
import org.apache.solr.common.SolrInputDocument;
|
||||
import org.apache.solr.common.params.ModifiableSolrParams;
|
||||
|
||||
/**
|
||||
* The purpose of this connector is to provide a non-blocking interface to solr.
|
||||
* All time-consuming tasks like updates and deletions are done within a concurrent process
|
||||
* which is started for this class in the background.
|
||||
* To implement this, we introduce an id exist cache, a deletion id queue and a update document queue.
|
||||
*/
|
||||
public class ConcurrentUpdateSolrConnector implements SolrConnector {
|
||||
|
||||
SolrConnector connector;
|
||||
|
||||
private final static String POISON_ID = "________";
|
||||
private final static SolrInputDocument POISON_DOCUMENT = new SolrInputDocument();
|
||||
|
||||
private class DeletionHandler implements Runnable {
|
||||
@Override
|
||||
public void run() {
|
||||
String id;
|
||||
try {
|
||||
while ((id = ConcurrentUpdateSolrConnector.this.deleteQueue.take()) != POISON_ID) {
|
||||
removeIdFromUpdateQueue(id);
|
||||
ConcurrentUpdateSolrConnector.this.connector.deleteById(id);
|
||||
ConcurrentUpdateSolrConnector.this.idCache.remove(ASCII.getBytes(id));
|
||||
}
|
||||
} catch (InterruptedException e) {
|
||||
} catch (IOException e) {
|
||||
Log.logException(e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private class UpdateHandler implements Runnable {
|
||||
@Override
|
||||
public void run() {
|
||||
SolrInputDocument doc;
|
||||
try {
|
||||
while ((doc = ConcurrentUpdateSolrConnector.this.updateQueue.take()) != POISON_DOCUMENT) {
|
||||
ConcurrentUpdateSolrConnector.this.connector.add(doc);
|
||||
updateIdCache((String) doc.getFieldValue(CollectionSchema.id.getSolrFieldName())); // that should have been done earlier!
|
||||
}
|
||||
} catch (InterruptedException e) {
|
||||
} catch (IOException e) {
|
||||
Log.logException(e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private HandleSet idCache;
|
||||
private BlockingQueue<SolrInputDocument> updateQueue;
|
||||
private BlockingQueue<String> deleteQueue;
|
||||
private Thread deletionHandler, updateHandler;
|
||||
private int idCacheCapacity;
|
||||
|
||||
public ConcurrentUpdateSolrConnector(SolrConnector connector, int updateCapacity, int idCacheCapacity) {
|
||||
this.connector = connector;
|
||||
this.idCache = new RowHandleSet(URIMetadataRow.rowdef.primaryKeyLength, URIMetadataRow.rowdef.objectOrder, 100);
|
||||
this.updateQueue = new ArrayBlockingQueue<SolrInputDocument>(updateCapacity);
|
||||
this.deleteQueue = new LinkedBlockingQueue<String>();
|
||||
this.deletionHandler = null;
|
||||
this.updateHandler = null;
|
||||
this.idCacheCapacity = idCacheCapacity;
|
||||
ensureAliveDeletionHandler();
|
||||
ensureAliveUpdateHandler();
|
||||
}
|
||||
|
||||
/**
|
||||
* used for debugging
|
||||
*/
|
||||
private static void cacheSuccessSign() {
|
||||
//Log.logInfo("ConcurrentUpdate", "**** cache hit");
|
||||
}
|
||||
|
||||
private boolean existIdFromDeleteQueue(String id) {
|
||||
if (this.deleteQueue.size() == 0) return false;
|
||||
Iterator<String> i = this.deleteQueue.iterator();
|
||||
while (i.hasNext()) {
|
||||
String docID = i.next();
|
||||
if (docID == null) break;
|
||||
if (docID.equals(id)) return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private SolrInputDocument getFromUpdateQueue(String id) {
|
||||
if (this.updateQueue.size() == 0) return null;
|
||||
Iterator<SolrInputDocument> i = this.updateQueue.iterator();
|
||||
while (i.hasNext()) {
|
||||
SolrInputDocument doc = i.next();
|
||||
if (doc == null) break;
|
||||
String docID = (String) doc.getFieldValue(CollectionSchema.id.getSolrFieldName());
|
||||
if (docID != null && docID.equals(id)) return doc;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
private boolean existIdFromUpdateQueue(String id) {
|
||||
if (this.updateQueue.size() == 0) return false;
|
||||
Iterator<SolrInputDocument> i = this.updateQueue.iterator();
|
||||
while (i.hasNext()) {
|
||||
SolrInputDocument doc = i.next();
|
||||
if (doc == null) break;
|
||||
String docID = (String) doc.getFieldValue(CollectionSchema.id.getSolrFieldName());
|
||||
if (docID != null && docID.equals(id)) return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private void removeIdFromUpdateQueue(String id) {
|
||||
if (this.updateQueue.size() == 0) return;
|
||||
Iterator<SolrInputDocument> i = this.updateQueue.iterator();
|
||||
while (i.hasNext()) {
|
||||
SolrInputDocument doc = i.next();
|
||||
if (doc == null) break;
|
||||
String docID = (String) doc.getFieldValue(CollectionSchema.id.getSolrFieldName());
|
||||
if (docID != null && docID.equals(id)) {
|
||||
i.remove();
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void updateIdCache(String id) {
|
||||
if (id == null) return;
|
||||
if (this.idCache.size() >= this.idCacheCapacity || MemoryControl.shortStatus()) this.idCache.clear();
|
||||
try {
|
||||
this.idCache.put(ASCII.getBytes(id));
|
||||
} catch (SpaceExceededException e) {
|
||||
this.idCache.clear();
|
||||
}
|
||||
}
|
||||
|
||||
public void ensureAliveDeletionHandler() {
|
||||
if (this.deletionHandler == null || !this.deletionHandler.isAlive()) {
|
||||
this.deletionHandler = new Thread(new DeletionHandler());
|
||||
this.deletionHandler.setName(this.getClass().getName() + "_DeletionHandler");
|
||||
this.deletionHandler.start();
|
||||
}
|
||||
}
|
||||
|
||||
public void ensureAliveUpdateHandler() {
|
||||
if (this.updateHandler == null || !this.updateHandler.isAlive()) {
|
||||
this.updateHandler = new Thread(new UpdateHandler());
|
||||
this.deletionHandler.setName(this.getClass().getName() + "_UpdateHandler");
|
||||
this.updateHandler.start();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public Iterator<String> iterator() {
|
||||
return this.connector.iterator();
|
||||
}
|
||||
|
||||
@Override
|
||||
public long getSize() {
|
||||
return this.connector.getSize() + this.updateQueue.size();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void commit(boolean softCommit) {
|
||||
this.connector.commit(softCommit);
|
||||
if (!softCommit) {
|
||||
ensureAliveDeletionHandler();
|
||||
while (this.deleteQueue.size() > 0) try {Thread.sleep(10);} catch (InterruptedException e) {}
|
||||
ensureAliveUpdateHandler();
|
||||
while (this.updateQueue.size() > 0) try {Thread.sleep(10);} catch (InterruptedException e) {}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void optimize(int maxSegments) {
|
||||
this.connector.optimize(maxSegments);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void close() {
|
||||
ensureAliveDeletionHandler();
|
||||
try {this.deleteQueue.put(POISON_ID);} catch (InterruptedException e) {}
|
||||
ensureAliveUpdateHandler();
|
||||
try {this.updateQueue.put(POISON_DOCUMENT);} catch (InterruptedException e) {}
|
||||
try {this.deletionHandler.join();} catch (InterruptedException e) {}
|
||||
try {this.updateHandler.join();} catch (InterruptedException e) {}
|
||||
this.connector.close();
|
||||
this.idCache.clear();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void clear() throws IOException {
|
||||
this.deleteQueue.clear();
|
||||
this.updateQueue.clear();
|
||||
try {this.updateQueue.put(POISON_DOCUMENT);} catch (InterruptedException e) {}
|
||||
try {this.updateHandler.join();} catch (InterruptedException e) {}
|
||||
this.connector.clear();
|
||||
this.idCache.clear();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void deleteById(String id) throws IOException {
|
||||
try {this.deleteQueue.put(id);} catch (InterruptedException e) {}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void deleteByIds(Collection<String> ids) throws IOException {
|
||||
for (String id: ids) try {this.deleteQueue.put(id);} catch (InterruptedException e) {}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void deleteByQuery(String querystring) throws IOException {
|
||||
final BlockingQueue<String> idq = this.connector.concurrentIDsByQuery(querystring,0, 100000000, Long.MAX_VALUE);
|
||||
new Thread() {
|
||||
public void run() {
|
||||
String id;
|
||||
try {
|
||||
while ((id = idq.take()) != AbstractSolrConnector.POISON_ID) ConcurrentUpdateSolrConnector.this.deleteQueue.put(id);
|
||||
} catch (InterruptedException e) {}
|
||||
// if we are finished we do a soft commit since that is what an operator wants to see in the gui
|
||||
ConcurrentUpdateSolrConnector.this.connector.commit(true);
|
||||
}
|
||||
}.start();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean existsById(String id) throws IOException {
|
||||
if (this.idCache.has(ASCII.getBytes(id))) {cacheSuccessSign(); return true;}
|
||||
if (existIdFromDeleteQueue(id)) {cacheSuccessSign(); return false;}
|
||||
if (existIdFromUpdateQueue(id)) {cacheSuccessSign(); return true;}
|
||||
if (this.connector.existsById(id)) {
|
||||
updateIdCache(id);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean existsByQuery(String solrquery) throws IOException {
|
||||
// this is actually wrong but to make it right we need to wait until all queues are flushed. But that may take very long when the queues are filled again all the time.
|
||||
return this.connector.existsByQuery(solrquery);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void add(SolrInputDocument solrdoc) throws IOException, SolrException {
|
||||
updateIdCache((String) solrdoc.getFieldValue(CollectionSchema.id.getSolrFieldName()));
|
||||
try {this.updateQueue.put(solrdoc);} catch (InterruptedException e) {}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void add(Collection<SolrInputDocument> solrdocs) throws IOException, SolrException {
|
||||
for (SolrInputDocument doc: solrdocs) updateIdCache((String) doc.getFieldValue(CollectionSchema.id.getSolrFieldName()));
|
||||
for (SolrInputDocument doc: solrdocs) try {this.updateQueue.put(doc);} catch (InterruptedException e) {}
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getFieldById(String id, String field) throws IOException {
|
||||
if (existIdFromDeleteQueue(id)) return null;
|
||||
SolrInputDocument doc = getFromUpdateQueue(id);
|
||||
if (doc != null) {cacheSuccessSign(); return doc.getFieldValue(field);}
|
||||
Object val = this.connector.getFieldById(id, field);
|
||||
if (val != null) updateIdCache(id);
|
||||
return val;
|
||||
}
|
||||
|
||||
@Override
|
||||
public SolrDocument getDocumentById(String id, String... fields) throws IOException {
|
||||
if (existIdFromDeleteQueue(id)) return null;
|
||||
SolrInputDocument idoc = getFromUpdateQueue(id);
|
||||
if (idoc != null) {cacheSuccessSign(); return ClientUtils.toSolrDocument(idoc);}
|
||||
SolrDocument doc = this.connector.getDocumentById(id, fields);
|
||||
if (doc != null) updateIdCache(id);
|
||||
return doc;
|
||||
}
|
||||
|
||||
@Override
|
||||
public QueryResponse getResponseByParams(ModifiableSolrParams query) throws IOException, SolrException {
|
||||
return this.connector.getResponseByParams(query);
|
||||
}
|
||||
|
||||
@Override
|
||||
public SolrDocumentList getDocumentListByQuery(String querystring, int offset, int count, String... fields) throws IOException, SolrException {
|
||||
return this.connector.getDocumentListByQuery(querystring, offset, count, fields);
|
||||
}
|
||||
|
||||
@Override
|
||||
public long getCountByQuery(String querystring) throws IOException {
|
||||
return this.connector.getCountByQuery(querystring);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, ReversibleScoreMap<String>> getFacets(String query, int maxresults, String... fields) throws IOException {
|
||||
return this.connector.getFacets(query, maxresults, fields);
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockingQueue<SolrDocument> concurrentDocumentsByQuery(String querystring, int offset, int maxcount, long maxtime, int buffersize, String... fields) {
|
||||
return this.connector.concurrentDocumentsByQuery(querystring, offset, maxcount, maxtime, buffersize, fields);
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockingQueue<String> concurrentIDsByQuery(String querystring, int offset, int maxcount, long maxtime) {
|
||||
return this.connector.concurrentIDsByQuery(querystring, offset, maxcount, maxtime);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -23,7 +23,6 @@ package net.yacy.cora.federate.solr.connector;
|
|||
import java.io.IOException;
|
||||
import java.util.Collection;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.atomic.AtomicLong;
|
||||
|
||||
|
|
@ -133,7 +132,7 @@ public class MirrorSolrConnector extends AbstractSolrConnector implements SolrCo
|
|||
* @throws IOException
|
||||
*/
|
||||
@Override
|
||||
public void deleteByIds(final List<String> ids) throws IOException {
|
||||
public void deleteByIds(final Collection<String> ids) throws IOException {
|
||||
if (this.solr0 != null) this.solr0.deleteByIds(ids);
|
||||
if (this.solr1 != null) this.solr1.deleteByIds(ids);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@ package net.yacy.cora.federate.solr.connector;
|
|||
|
||||
import java.io.IOException;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.BlockingQueue;
|
||||
|
||||
|
|
@ -77,7 +76,7 @@ public interface SolrConnector extends Iterable<String> /* Iterable of document
|
|||
* @param ids a list of url hashes
|
||||
* @throws IOException
|
||||
*/
|
||||
public void deleteByIds(final List<String> ids) throws IOException;
|
||||
public void deleteByIds(final Collection<String> ids) throws IOException;
|
||||
|
||||
/**
|
||||
* delete entries from solr according the given solr query string
|
||||
|
|
@ -153,14 +152,6 @@ public interface SolrConnector extends Iterable<String> /* Iterable of document
|
|||
* @throws IOException
|
||||
*/
|
||||
public SolrDocumentList getDocumentListByQuery(final String querystring, final int offset, final int count, final String ... fields) throws IOException, SolrException;
|
||||
|
||||
/**
|
||||
* get the number of results for this id.
|
||||
* This should only be called if the actual result is never used, and only the count is interesting
|
||||
* @param key
|
||||
* @return the number of results for this query
|
||||
*/
|
||||
public long getCountById(final String key) throws IOException;
|
||||
|
||||
/**
|
||||
* get the number of results when this query is done.
|
||||
|
|
@ -196,7 +187,7 @@ public interface SolrConnector extends Iterable<String> /* Iterable of document
|
|||
|
||||
/**
|
||||
* get a document id result stream from a solr query.
|
||||
* The result queue is considered as terminated if AbstractSolrConnectro.POISON_ID is returned.
|
||||
* The result queue is considered as terminated if AbstractSolrConnector.POISON_ID is returned.
|
||||
* The method returns immediately and feeds the search results into the queue
|
||||
* @param querystring
|
||||
* @param offset
|
||||
|
|
|
|||
|
|
@ -128,9 +128,11 @@ public abstract class SolrServerConnector extends AbstractSolrConnector implemen
|
|||
}
|
||||
|
||||
@Override
|
||||
public synchronized void deleteByIds(final List<String> ids) throws IOException {
|
||||
public synchronized void deleteByIds(final Collection<String> ids) throws IOException {
|
||||
List<String> l = new ArrayList<String>();
|
||||
for (String s: ids) l.add(s);
|
||||
try {
|
||||
this.server.deleteById(ids, -1);
|
||||
this.server.deleteById(l, -1);
|
||||
} catch (final Throwable e) {
|
||||
throw new IOException(e);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ import java.util.Map;
|
|||
import java.util.concurrent.ConcurrentHashMap;
|
||||
|
||||
import net.yacy.cora.federate.solr.connector.CachedSolrConnector;
|
||||
import net.yacy.cora.federate.solr.connector.ConcurrentUpdateSolrConnector;
|
||||
import net.yacy.cora.federate.solr.connector.EmbeddedSolrConnector;
|
||||
import net.yacy.cora.federate.solr.connector.MirrorSolrConnector;
|
||||
import net.yacy.cora.federate.solr.connector.RemoteSolrConnector;
|
||||
|
|
@ -142,7 +143,7 @@ public class InstanceMirror {
|
|||
if (defaultCoreName == null) return null;
|
||||
EmbeddedSolrConnector esc = this.solr0 == null ? null : new EmbeddedSolrConnector(this.solr0, defaultCoreName);
|
||||
RemoteSolrConnector rsc = this.solr1 == null ? null : new RemoteSolrConnector(this.solr1, defaultCoreName);
|
||||
this.defaultConnector = /*new CachedSolrConnector(*/new MirrorSolrConnector(esc, rsc)/*, 10000, 1000, 100)*/;
|
||||
this.defaultConnector = new ConcurrentUpdateSolrConnector(new MirrorSolrConnector(esc, rsc), 100, 1000000);
|
||||
this.connectorCache.put(defaultCoreName, this.defaultConnector);
|
||||
return this.defaultConnector;
|
||||
}
|
||||
|
|
@ -152,7 +153,7 @@ public class InstanceMirror {
|
|||
if (msc != null) return msc;
|
||||
EmbeddedSolrConnector esc = this.solr0 == null ? null : new EmbeddedSolrConnector(this.solr0, corename);
|
||||
RemoteSolrConnector rsc = this.solr1 == null ? null : new RemoteSolrConnector(this.solr1, corename);
|
||||
msc = /*new CachedSolrConnector(*/new MirrorSolrConnector(esc, rsc)/*, 10000, 1000, 100)*/;
|
||||
msc = new ConcurrentUpdateSolrConnector(new MirrorSolrConnector(esc, rsc), 100, 1000000);
|
||||
this.connectorCache.put(corename, msc);
|
||||
return msc;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user