You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2015/10/20 16:46:39 UTC
svn commit: r1709619 - in
/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler:
CdcrReplicator.java CdcrReplicatorScheduler.java CdcrReplicatorState.java
CdcrRequestHandler.java CdcrStateManager.java
Author: shalin
Date: Tue Oct 20 14:46:39 2015
New Revision: 1709619
URL: http://svn.apache.org/viewvc?rev=1709619&view=rev
Log:
SOLR-6273: Fixed a null check, some typos and a few compiler warnings
Modified:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/CdcrReplicator.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/CdcrReplicatorScheduler.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/CdcrReplicatorState.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/CdcrRequestHandler.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/CdcrStateManager.java
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/CdcrReplicator.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/CdcrReplicator.java?rev=1709619&r1=1709618&r2=1709619&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/CdcrReplicator.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/CdcrReplicator.java Tue Oct 20 14:46:39 2015
@@ -66,7 +66,7 @@ public class CdcrReplicator implements R
// Add the param to indicate the {@link CdcrUpdateProcessor} to keep the provided version number
req.setParam(CdcrUpdateProcessor.CDCR_UPDATE, "");
- // Start the benchmakr timer
+ // Start the benchmark timer
state.getBenchmarkTimer().start();
long counter = 0;
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/CdcrReplicatorScheduler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/CdcrReplicatorScheduler.java?rev=1709619&r1=1709618&r2=1709619&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/CdcrReplicatorScheduler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/CdcrReplicatorScheduler.java Tue Oct 20 14:46:39 2015
@@ -64,7 +64,6 @@ class CdcrReplicatorScheduler {
void start() {
if (!isStarted) {
scheduler = Executors.newSingleThreadScheduledExecutor(new DefaultSolrThreadFactory("cdcr-scheduler"));
- //replicatorsPool = Executors.newFixedThreadPool(poolSize, new DefaultSolrThreadFactory("cdcr-replicator"));
replicatorsPool = ExecutorUtil.newMDCAwareFixedThreadPool(poolSize, new DefaultSolrThreadFactory("cdcr-replicator"));
// the scheduler thread is executed every second and submits one replication task
@@ -75,7 +74,7 @@ class CdcrReplicatorScheduler {
public void run() {
int nCandidates = statesQueue.size();
for (int i = 0; i < nCandidates; i++) {
- // a thread that pool one state from the queue, execute the replication task, and push back
+ // a thread that poll one state from the queue, execute the replication task, and push back
// the state in the queue when the task is completed
replicatorsPool.execute(new Runnable() {
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/CdcrReplicatorState.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/CdcrReplicatorState.java?rev=1709619&r1=1709618&r2=1709619&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/CdcrReplicatorState.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/CdcrReplicatorState.java Tue Oct 20 14:46:39 2015
@@ -147,7 +147,7 @@ class CdcrReplicatorState {
// Shift back to the right by 20 bits the version number - See VersionInfo#getNewClock
return DateFormatUtil.formatExternal(new Date(logReader.getLastVersion() >> 20));
}
- return new String();
+ return "";
}
/**
@@ -201,7 +201,6 @@ class CdcrReplicatorState {
}
default:
- return;
}
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/CdcrRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/CdcrRequestHandler.java?rev=1709619&r1=1709618&r2=1709619&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/CdcrRequestHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/CdcrRequestHandler.java Tue Oct 20 14:46:39 2015
@@ -126,10 +126,10 @@ public class CdcrRequestHandler extends
replicasConfiguration = new HashMap<>();
List replicas = args.getAll(CdcrParams.REPLICA_PARAM);
for (Object replica : replicas) {
- if (replicas != null && replica instanceof NamedList) {
+ if (replica != null && replica instanceof NamedList) {
SolrParams params = SolrParams.toSolrParams((NamedList) replica);
if (!replicasConfiguration.containsKey(params.get(CdcrParams.SOURCE_COLLECTION_PARAM))) {
- replicasConfiguration.put(params.get(CdcrParams.SOURCE_COLLECTION_PARAM), new ArrayList<SolrParams>());
+ replicasConfiguration.put(params.get(CdcrParams.SOURCE_COLLECTION_PARAM), new ArrayList<>());
}
replicasConfiguration.get(params.get(CdcrParams.SOURCE_COLLECTION_PARAM)).add(params);
}
@@ -591,8 +591,7 @@ public class CdcrRequestHandler extends
@Override
public Long call() throws Exception {
- HttpSolrClient server = new HttpSolrClient(baseUrl);
- try {
+ try (HttpSolrClient server = new HttpSolrClient(baseUrl)) {
server.setConnectionTimeout(15000);
server.setSoTimeout(60000);
@@ -604,8 +603,6 @@ public class CdcrRequestHandler extends
NamedList response = server.request(request);
return (Long) response.get(CdcrParams.CHECKPOINT);
- } finally {
- server.close();
}
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/CdcrStateManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/CdcrStateManager.java?rev=1709619&r1=1709618&r2=1709619&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/CdcrStateManager.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/CdcrStateManager.java Tue Oct 20 14:46:39 2015
@@ -38,9 +38,9 @@ abstract class CdcrStateManager {
}
}
- static interface CdcrStateObserver {
+ interface CdcrStateObserver {
- public void stateUpdate();
+ void stateUpdate();
}