Re: svn commit: r1664126 - in /lucene/dev/trunk/solr: core/src/java/org/apache/solr/core/ core/src/java/org/apache/solr/handler/ core/src/test-files/ core/src/test/org/apache/solr/core/ core/src/test/
Thanks all, I have now added the changes entry.
On Wed, Mar 4, 2015 at 10:23 PM, Chris Hostetter hossman_luc...@fucit.org
wrote:
: The change had no functional impact, hence left it alone.
:
: But happy to follow whatever is the existing practice. Should I have one
: for every change?
anything non trivial should be noted in CHANGES.txt - the Other
Changes section is good fit for internal refacotrings that don't fix any
bugs, but also don't add any features.
:
: On Wed, Mar 4, 2015 at 8:29 PM, Alan Woodward a...@flax.co.uk wrote:
:
: Hi Ram, I think you missed a CHANGES.txt entry on this one?
:
: Alan Woodward
: www.flax.co.uk
:
:
: On 4 Mar 2015, at 19:45, andyetitmo...@apache.org wrote:
:
: Author: andyetitmoves
: Date: Wed Mar 4 19:45:09 2015
: New Revision: 1664126
:
: URL: http://svn.apache.org/r1664126
: Log:
: SOLR-6804: Untangle SnapPuller and ReplicationHandler
:
: This closes #110
:
: Added:
:
:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java
: - copied, changed from r1663969,
:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapPuller.java
: Removed:
:
:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapPuller.java
: Modified:
:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java
:
:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
:
:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapShooter.java
: lucene/dev/trunk/solr/core/src/test-files/log4j.properties
:
:
lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestArbitraryIndexDir.java
:
:
lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
:
:
lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/core/MockDirectoryFactory.java
:
: Modified:
: lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java
: URL:
:
http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java?rev=1664126r1=1664125r2=1664126view=diff
:
:
==
: ---
lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java
: (original)
: +++
lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java
: Wed Mar 4 19:45:09 2015
: @@ -83,9 +83,9 @@ import org.apache.solr.common.util.IOUti
: import org.apache.solr.common.util.NamedList;
: import org.apache.solr.common.util.SimpleOrderedMap;
: import org.apache.solr.core.DirectoryFactory.DirContext;
: +import org.apache.solr.handler.IndexFetcher;
: import org.apache.solr.handler.ReplicationHandler;
: import org.apache.solr.handler.RequestHandlerBase;
: -import org.apache.solr.handler.SnapPuller;
: import org.apache.solr.handler.admin.ShowFileRequestHandler;
: import org.apache.solr.handler.component.DebugComponent;
: import org.apache.solr.handler.component.ExpandComponent;
: @@ -291,7 +291,7 @@ public final class SolrCore implements S
:dir = getDirectoryFactory().get(getDataDir(),
DirContext.META_DATA,
: getSolrConfig().indexConfig.lockType);
:IndexInput input;
:try {
: -input = dir.openInput(SnapPuller.INDEX_PROPERTIES,
: IOContext.DEFAULT);
: +input = dir.openInput(IndexFetcher.INDEX_PROPERTIES,
: IOContext.DEFAULT);
:} catch (FileNotFoundException | NoSuchFileException e) {
: input = null;
:}
: @@ -307,7 +307,7 @@ public final class SolrCore implements S
:}
:
: } catch (Exception e) {
: - log.error(Unable to load + SnapPuller.INDEX_PROPERTIES,
e);
: + log.error(Unable to load +
IndexFetcher.INDEX_PROPERTIES, e);
: } finally {
:IOUtils.closeQuietly(is);
: }
:
: Copied:
:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java
: (from r1663969,
:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapPuller.java)
: URL:
:
http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java?p2=lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/IndexFetcher.javap1=lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapPuller.javar1=1663969r2=1664126rev=1664126view=diff
:
:
==
: ---
:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapPuller.java
: (original)
: +++
:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java
: Wed Mar 4 19:45:09 2015
: @@ -67,11 +67,7 @@ import java.util.concurrent.ExecutionExc
: import java.util.concurrent.ExecutorService;
: import java.util.concurrent.Executors;
: import java.util.concurrent.Future;
: -import
Re: svn commit: r1664126 - in /lucene/dev/trunk/solr: core/src/java/org/apache/solr/core/ core/src/java/org/apache/solr/handler/ core/src/test-files/ core/src/test/org/apache/solr/core/ core/src/test/
I guess it depends on how much credit you want to take for it :-) I'd normally
put a CHANGES entry in for something that has a JIRA number attached to it
though.
Alan Woodward
www.flax.co.uk
On 4 Mar 2015, at 21:17, david.w.smi...@gmail.com wrote:
I use that judgement too — sometimes I don’t bother if it’s internal and I
never would for something trivial like a typo.
~ David Smiley
Freelance Apache Lucene/Solr Search Consultant/Developer
http://www.linkedin.com/in/davidwsmiley
On Wed, Mar 4, 2015 at 4:13 PM, Ramkumar R. Aiyengar
andyetitmo...@gmail.com wrote:
The change had no functional impact, hence left it alone.
But happy to follow whatever is the existing practice. Should I have one for
every change?
On Wed, Mar 4, 2015 at 8:29 PM, Alan Woodward a...@flax.co.uk wrote:
Hi Ram, I think you missed a CHANGES.txt entry on this one?
Alan Woodward
www.flax.co.uk
On 4 Mar 2015, at 19:45, andyetitmo...@apache.org wrote:
Author: andyetitmoves
Date: Wed Mar 4 19:45:09 2015
New Revision: 1664126
URL: http://svn.apache.org/r1664126
Log:
SOLR-6804: Untangle SnapPuller and ReplicationHandler
This closes #110
Added:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java
- copied, changed from r1663969,
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapPuller.java
Removed:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapPuller.java
Modified:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapShooter.java
lucene/dev/trunk/solr/core/src/test-files/log4j.properties
lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestArbitraryIndexDir.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/core/MockDirectoryFactory.java
Modified:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java
URL:
http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java?rev=1664126r1=1664125r2=1664126view=diff
==
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java
(original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java
Wed Mar 4 19:45:09 2015
@@ -83,9 +83,9 @@ import org.apache.solr.common.util.IOUti
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.core.DirectoryFactory.DirContext;
+import org.apache.solr.handler.IndexFetcher;
import org.apache.solr.handler.ReplicationHandler;
import org.apache.solr.handler.RequestHandlerBase;
-import org.apache.solr.handler.SnapPuller;
import org.apache.solr.handler.admin.ShowFileRequestHandler;
import org.apache.solr.handler.component.DebugComponent;
import org.apache.solr.handler.component.ExpandComponent;
@@ -291,7 +291,7 @@ public final class SolrCore implements S
dir = getDirectoryFactory().get(getDataDir(), DirContext.META_DATA,
getSolrConfig().indexConfig.lockType);
IndexInput input;
try {
-input = dir.openInput(SnapPuller.INDEX_PROPERTIES,
IOContext.DEFAULT);
+input = dir.openInput(IndexFetcher.INDEX_PROPERTIES,
IOContext.DEFAULT);
} catch (FileNotFoundException | NoSuchFileException e) {
input = null;
}
@@ -307,7 +307,7 @@ public final class SolrCore implements S
}
} catch (Exception e) {
- log.error(Unable to load + SnapPuller.INDEX_PROPERTIES, e);
+ log.error(Unable to load + IndexFetcher.INDEX_PROPERTIES, e);
} finally {
IOUtils.closeQuietly(is);
}
Copied:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java
(from r1663969,
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapPuller.java)
URL:
http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java?p2=lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/IndexFetcher.javap1=lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapPuller.javar1=1663969r2=1664126rev=1664126view=diff
==
---
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapPuller.java
(original)
+++
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java
Wed Mar 4 19:45:09 2015
@@ -67,11 +67,7 @@ import java.util.concurrent.ExecutionExc
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
-import
Re: svn commit: r1664126 - in /lucene/dev/trunk/solr: core/src/java/org/apache/solr/core/ core/src/java/org/apache/solr/handler/ core/src/test-files/ core/src/test/org/apache/solr/core/ core/src/test/
Hi Ram, I think you missed a CHANGES.txt entry on this one?
Alan Woodward
www.flax.co.uk
On 4 Mar 2015, at 19:45, andyetitmo...@apache.org wrote:
Author: andyetitmoves
Date: Wed Mar 4 19:45:09 2015
New Revision: 1664126
URL: http://svn.apache.org/r1664126
Log:
SOLR-6804: Untangle SnapPuller and ReplicationHandler
This closes #110
Added:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java
- copied, changed from r1663969,
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapPuller.java
Removed:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapPuller.java
Modified:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapShooter.java
lucene/dev/trunk/solr/core/src/test-files/log4j.properties
lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestArbitraryIndexDir.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/core/MockDirectoryFactory.java
Modified:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java
URL:
http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java?rev=1664126r1=1664125r2=1664126view=diff
==
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java
(original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java
Wed Mar 4 19:45:09 2015
@@ -83,9 +83,9 @@ import org.apache.solr.common.util.IOUti
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.core.DirectoryFactory.DirContext;
+import org.apache.solr.handler.IndexFetcher;
import org.apache.solr.handler.ReplicationHandler;
import org.apache.solr.handler.RequestHandlerBase;
-import org.apache.solr.handler.SnapPuller;
import org.apache.solr.handler.admin.ShowFileRequestHandler;
import org.apache.solr.handler.component.DebugComponent;
import org.apache.solr.handler.component.ExpandComponent;
@@ -291,7 +291,7 @@ public final class SolrCore implements S
dir = getDirectoryFactory().get(getDataDir(), DirContext.META_DATA,
getSolrConfig().indexConfig.lockType);
IndexInput input;
try {
-input = dir.openInput(SnapPuller.INDEX_PROPERTIES,
IOContext.DEFAULT);
+input = dir.openInput(IndexFetcher.INDEX_PROPERTIES,
IOContext.DEFAULT);
} catch (FileNotFoundException | NoSuchFileException e) {
input = null;
}
@@ -307,7 +307,7 @@ public final class SolrCore implements S
}
} catch (Exception e) {
- log.error(Unable to load + SnapPuller.INDEX_PROPERTIES, e);
+ log.error(Unable to load + IndexFetcher.INDEX_PROPERTIES, e);
} finally {
IOUtils.closeQuietly(is);
}
Copied:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java
(from r1663969,
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapPuller.java)
URL:
http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java?p2=lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/IndexFetcher.javap1=lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapPuller.javar1=1663969r2=1664126rev=1664126view=diff
==
---
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapPuller.java
(original)
+++
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java
Wed Mar 4 19:45:09 2015
@@ -67,11 +67,7 @@ import java.util.concurrent.ExecutionExc
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
-import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
import java.util.zip.Adler32;
import java.util.zip.Checksum;
import java.util.zip.InflaterInputStream;
@@ -94,7 +90,6 @@ import org.apache.solr.common.SolrExcept
import org.apache.solr.common.SolrException.ErrorCode;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.ModifiableSolrParams;
-import org.apache.solr.common.util.ExecutorUtil;
import org.apache.solr.common.util.FastInputStream;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.DirectoryFactory;
@@ -121,24 +116,16 @@ import org.slf4j.LoggerFactory;
*
* @since solr 1.4
*/
-public class SnapPuller {
Re: svn commit: r1664126 - in /lucene/dev/trunk/solr: core/src/java/org/apache/solr/core/ core/src/java/org/apache/solr/handler/ core/src/test-files/ core/src/test/org/apache/solr/core/ core/src/test/
The change had no functional impact, hence left it alone.
But happy to follow whatever is the existing practice. Should I have one
for every change?
On Wed, Mar 4, 2015 at 8:29 PM, Alan Woodward a...@flax.co.uk wrote:
Hi Ram, I think you missed a CHANGES.txt entry on this one?
Alan Woodward
www.flax.co.uk
On 4 Mar 2015, at 19:45, andyetitmo...@apache.org wrote:
Author: andyetitmoves
Date: Wed Mar 4 19:45:09 2015
New Revision: 1664126
URL: http://svn.apache.org/r1664126
Log:
SOLR-6804: Untangle SnapPuller and ReplicationHandler
This closes #110
Added:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java
- copied, changed from r1663969,
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapPuller.java
Removed:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapPuller.java
Modified:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapShooter.java
lucene/dev/trunk/solr/core/src/test-files/log4j.properties
lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestArbitraryIndexDir.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/core/MockDirectoryFactory.java
Modified:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java
URL:
http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java?rev=1664126r1=1664125r2=1664126view=diff
==
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java
(original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java
Wed Mar 4 19:45:09 2015
@@ -83,9 +83,9 @@ import org.apache.solr.common.util.IOUti
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.core.DirectoryFactory.DirContext;
+import org.apache.solr.handler.IndexFetcher;
import org.apache.solr.handler.ReplicationHandler;
import org.apache.solr.handler.RequestHandlerBase;
-import org.apache.solr.handler.SnapPuller;
import org.apache.solr.handler.admin.ShowFileRequestHandler;
import org.apache.solr.handler.component.DebugComponent;
import org.apache.solr.handler.component.ExpandComponent;
@@ -291,7 +291,7 @@ public final class SolrCore implements S
dir = getDirectoryFactory().get(getDataDir(), DirContext.META_DATA,
getSolrConfig().indexConfig.lockType);
IndexInput input;
try {
-input = dir.openInput(SnapPuller.INDEX_PROPERTIES,
IOContext.DEFAULT);
+input = dir.openInput(IndexFetcher.INDEX_PROPERTIES,
IOContext.DEFAULT);
} catch (FileNotFoundException | NoSuchFileException e) {
input = null;
}
@@ -307,7 +307,7 @@ public final class SolrCore implements S
}
} catch (Exception e) {
- log.error(Unable to load + SnapPuller.INDEX_PROPERTIES, e);
+ log.error(Unable to load + IndexFetcher.INDEX_PROPERTIES, e);
} finally {
IOUtils.closeQuietly(is);
}
Copied:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java
(from r1663969,
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapPuller.java)
URL:
http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java?p2=lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/IndexFetcher.javap1=lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapPuller.javar1=1663969r2=1664126rev=1664126view=diff
==
---
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapPuller.java
(original)
+++
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java
Wed Mar 4 19:45:09 2015
@@ -67,11 +67,7 @@ import java.util.concurrent.ExecutionExc
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
-import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
import java.util.zip.Adler32;
import java.util.zip.Checksum;
import java.util.zip.InflaterInputStream;
@@ -94,7 +90,6 @@ import org.apache.solr.common.SolrExcept
import org.apache.solr.common.SolrException.ErrorCode;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.ModifiableSolrParams;
-import org.apache.solr.common.util.ExecutorUtil;
import
Re: svn commit: r1664126 - in /lucene/dev/trunk/solr: core/src/java/org/apache/solr/core/ core/src/java/org/apache/solr/handler/ core/src/test-files/ core/src/test/org/apache/solr/core/ core/src/test/
I use that judgement too — sometimes I don’t bother if it’s internal and I
never would for something trivial like a typo.
~ David Smiley
Freelance Apache Lucene/Solr Search Consultant/Developer
http://www.linkedin.com/in/davidwsmiley
On Wed, Mar 4, 2015 at 4:13 PM, Ramkumar R. Aiyengar
andyetitmo...@gmail.com wrote:
The change had no functional impact, hence left it alone.
But happy to follow whatever is the existing practice. Should I have one
for every change?
On Wed, Mar 4, 2015 at 8:29 PM, Alan Woodward a...@flax.co.uk wrote:
Hi Ram, I think you missed a CHANGES.txt entry on this one?
Alan Woodward
www.flax.co.uk
On 4 Mar 2015, at 19:45, andyetitmo...@apache.org wrote:
Author: andyetitmoves
Date: Wed Mar 4 19:45:09 2015
New Revision: 1664126
URL: http://svn.apache.org/r1664126
Log:
SOLR-6804: Untangle SnapPuller and ReplicationHandler
This closes #110
Added:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java
- copied, changed from r1663969,
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapPuller.java
Removed:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapPuller.java
Modified:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapShooter.java
lucene/dev/trunk/solr/core/src/test-files/log4j.properties
lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestArbitraryIndexDir.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/core/MockDirectoryFactory.java
Modified:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java
URL:
http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java?rev=1664126r1=1664125r2=1664126view=diff
==
---
lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java
(original)
+++
lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java Wed
Mar 4 19:45:09 2015
@@ -83,9 +83,9 @@ import org.apache.solr.common.util.IOUti
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.core.DirectoryFactory.DirContext;
+import org.apache.solr.handler.IndexFetcher;
import org.apache.solr.handler.ReplicationHandler;
import org.apache.solr.handler.RequestHandlerBase;
-import org.apache.solr.handler.SnapPuller;
import org.apache.solr.handler.admin.ShowFileRequestHandler;
import org.apache.solr.handler.component.DebugComponent;
import org.apache.solr.handler.component.ExpandComponent;
@@ -291,7 +291,7 @@ public final class SolrCore implements S
dir = getDirectoryFactory().get(getDataDir(), DirContext.META_DATA,
getSolrConfig().indexConfig.lockType);
IndexInput input;
try {
-input = dir.openInput(SnapPuller.INDEX_PROPERTIES,
IOContext.DEFAULT);
+input = dir.openInput(IndexFetcher.INDEX_PROPERTIES,
IOContext.DEFAULT);
} catch (FileNotFoundException | NoSuchFileException e) {
input = null;
}
@@ -307,7 +307,7 @@ public final class SolrCore implements S
}
} catch (Exception e) {
- log.error(Unable to load + SnapPuller.INDEX_PROPERTIES, e);
+ log.error(Unable to load + IndexFetcher.INDEX_PROPERTIES,
e);
} finally {
IOUtils.closeQuietly(is);
}
Copied:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java
(from r1663969,
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapPuller.java)
URL:
http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java?p2=lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/IndexFetcher.javap1=lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapPuller.javar1=1663969r2=1664126rev=1664126view=diff
==
---
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapPuller.java
(original)
+++
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java
Wed Mar 4 19:45:09 2015
@@ -67,11 +67,7 @@ import java.util.concurrent.ExecutionExc
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
-import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
import java.util.zip.Adler32;
import java.util.zip.Checksum;
import
Re: svn commit: r1664126 - in /lucene/dev/trunk/solr: core/src/java/org/apache/solr/core/ core/src/java/org/apache/solr/handler/ core/src/test-files/ core/src/test/org/apache/solr/core/ core/src/test/
: The change had no functional impact, hence left it alone.
:
: But happy to follow whatever is the existing practice. Should I have one
: for every change?
anything non trivial should be noted in CHANGES.txt - the Other
Changes section is good fit for internal refacotrings that don't fix any
bugs, but also don't add any features.
:
: On Wed, Mar 4, 2015 at 8:29 PM, Alan Woodward a...@flax.co.uk wrote:
:
: Hi Ram, I think you missed a CHANGES.txt entry on this one?
:
: Alan Woodward
: www.flax.co.uk
:
:
: On 4 Mar 2015, at 19:45, andyetitmo...@apache.org wrote:
:
: Author: andyetitmoves
: Date: Wed Mar 4 19:45:09 2015
: New Revision: 1664126
:
: URL: http://svn.apache.org/r1664126
: Log:
: SOLR-6804: Untangle SnapPuller and ReplicationHandler
:
: This closes #110
:
: Added:
:
:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java
: - copied, changed from r1663969,
: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapPuller.java
: Removed:
:
:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapPuller.java
: Modified:
: lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java
:
:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
:
:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapShooter.java
: lucene/dev/trunk/solr/core/src/test-files/log4j.properties
:
:
lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestArbitraryIndexDir.java
:
:
lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
:
:
lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/core/MockDirectoryFactory.java
:
: Modified:
: lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java
: URL:
:
http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java?rev=1664126r1=1664125r2=1664126view=diff
:
:
==
: --- lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java
: (original)
: +++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java
: Wed Mar 4 19:45:09 2015
: @@ -83,9 +83,9 @@ import org.apache.solr.common.util.IOUti
: import org.apache.solr.common.util.NamedList;
: import org.apache.solr.common.util.SimpleOrderedMap;
: import org.apache.solr.core.DirectoryFactory.DirContext;
: +import org.apache.solr.handler.IndexFetcher;
: import org.apache.solr.handler.ReplicationHandler;
: import org.apache.solr.handler.RequestHandlerBase;
: -import org.apache.solr.handler.SnapPuller;
: import org.apache.solr.handler.admin.ShowFileRequestHandler;
: import org.apache.solr.handler.component.DebugComponent;
: import org.apache.solr.handler.component.ExpandComponent;
: @@ -291,7 +291,7 @@ public final class SolrCore implements S
:dir = getDirectoryFactory().get(getDataDir(), DirContext.META_DATA,
: getSolrConfig().indexConfig.lockType);
:IndexInput input;
:try {
: -input = dir.openInput(SnapPuller.INDEX_PROPERTIES,
: IOContext.DEFAULT);
: +input = dir.openInput(IndexFetcher.INDEX_PROPERTIES,
: IOContext.DEFAULT);
:} catch (FileNotFoundException | NoSuchFileException e) {
: input = null;
:}
: @@ -307,7 +307,7 @@ public final class SolrCore implements S
:}
:
: } catch (Exception e) {
: - log.error(Unable to load + SnapPuller.INDEX_PROPERTIES, e);
: + log.error(Unable to load + IndexFetcher.INDEX_PROPERTIES, e);
: } finally {
:IOUtils.closeQuietly(is);
: }
:
: Copied:
:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java
: (from r1663969,
: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapPuller.java)
: URL:
:
http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java?p2=lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/IndexFetcher.javap1=lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapPuller.javar1=1663969r2=1664126rev=1664126view=diff
:
:
==
: ---
: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapPuller.java
: (original)
: +++
:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/IndexFetcher.java
: Wed Mar 4 19:45:09 2015
: @@ -67,11 +67,7 @@ import java.util.concurrent.ExecutionExc
: import java.util.concurrent.ExecutorService;
: import java.util.concurrent.Executors;
: import java.util.concurrent.Future;
: -import java.util.concurrent.ScheduledExecutorService;
: import java.util.concurrent.TimeUnit;
: -import java.util.concurrent.atomic.AtomicBoolean;
: -import java.util.regex.Matcher;
: -import java.util.regex.Pattern;
: import
