You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by si...@apache.org on 2012/09/05 09:45:14 UTC
svn commit: r1381045 - in /lucene/dev/branches/branch_4x/solr: ./ cloud-dev/
contrib/ core/ core/src/java/org/apache/solr/handler/
core/src/test-files/solr/collection1/conf/
core/src/test/org/apache/solr/handler/ dev-tools/ example/ lib/ licenses/
scri...
Author: siren
Date: Wed Sep 5 07:45:13 2012
New Revision: 1381045
URL: http://svn.apache.org/viewvc?rev=1381045&view=rev
Log:
SOLR-3789: Fix bug in SnapPuller that caused 'internal' compression to fail, merge r1381043
Modified:
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_4x/solr/LICENSE.txt (props changed)
lucene/dev/branches/branch_4x/solr/NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/solr/README.txt (props changed)
lucene/dev/branches/branch_4x/solr/build.xml (props changed)
lucene/dev/branches/branch_4x/solr/cloud-dev/ (props changed)
lucene/dev/branches/branch_4x/solr/common-build.xml (props changed)
lucene/dev/branches/branch_4x/solr/contrib/ (props changed)
lucene/dev/branches/branch_4x/solr/core/ (props changed)
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/SnapPuller.java
lucene/dev/branches/branch_4x/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave.xml
lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
lucene/dev/branches/branch_4x/solr/dev-tools/ (props changed)
lucene/dev/branches/branch_4x/solr/example/ (props changed)
lucene/dev/branches/branch_4x/solr/lib/ (props changed)
lucene/dev/branches/branch_4x/solr/licenses/ (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpclient-LICENSE-ASL.txt (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpclient-NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpcore-LICENSE-ASL.txt (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpcore-NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpmime-LICENSE-ASL.txt (props changed)
lucene/dev/branches/branch_4x/solr/licenses/httpmime-NOTICE.txt (props changed)
lucene/dev/branches/branch_4x/solr/scripts/ (props changed)
lucene/dev/branches/branch_4x/solr/solrj/ (props changed)
lucene/dev/branches/branch_4x/solr/test-framework/ (props changed)
lucene/dev/branches/branch_4x/solr/testlogging.properties (props changed)
lucene/dev/branches/branch_4x/solr/webapp/ (props changed)
Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1381045&r1=1381044&r2=1381045&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Wed Sep 5 07:45:13 2012
@@ -109,6 +109,9 @@ Bug Fixes
* SOLR-3611: We do not show ZooKeeper data in the UI for a node that has children.
(Mark Miller)
+* SOLR-3789: Fix bug in SnapPuller that caused "internal" compression to fail.
+ (siren)
+
Other Changes
----------------------
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/SnapPuller.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/SnapPuller.java?rev=1381045&r1=1381044&r2=1381045&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/SnapPuller.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/SnapPuller.java Wed Sep 5 07:45:13 2012
@@ -1139,7 +1139,7 @@ public class SnapPuller {
params.set(FILE, fileName);
}
if (useInternal) {
- params.set(COMPRESSION, "internal");
+ params.set(COMPRESSION, "true");
}
//use checksum
if (this.includeChecksum) {
Modified: lucene/dev/branches/branch_4x/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave.xml?rev=1381045&r1=1381044&r2=1381045&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave.xml (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave.xml Wed Sep 5 07:45:13 2012
@@ -53,7 +53,8 @@
<lst name="slave">
<str name="masterUrl">http://localhost:TEST_PORT/solr</str>
<str name="pollInterval">00:00:01</str>
- </lst>
+ <str name="compression">COMPRESSION</str>
+ </lst>
</requestHandler>
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java?rev=1381045&r1=1381044&r2=1381045&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java Wed Sep 5 07:45:13 2012
@@ -41,7 +41,6 @@ import org.apache.lucene.store.SimpleFSD
import org.apache.lucene.util.LuceneTestCase.Slow;
import org.apache.solr.BaseDistributedSearchTestCase;
import org.apache.solr.SolrTestCaseJ4;
-import org.apache.solr.TestDistributedSearch;
import org.apache.solr.client.solrj.SolrServer;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
@@ -57,7 +56,6 @@ import org.apache.solr.common.util.Simpl
import org.apache.solr.util.AbstractSolrTestCase;
import org.junit.AfterClass;
import org.junit.BeforeClass;
-import org.junit.Ignore;
/**
* Test for ReplicationHandler
@@ -928,13 +926,13 @@ public class TestReplicationHandler exte
/* character copy of file using UTF-8 */
private static void copyFile(File src, File dst) throws IOException {
- copyFile(src, dst, null);
+ copyFile(src, dst, null, false);
}
/**
* character copy of file using UTF-8. If port is non-null, will be substituted any time "TEST_PORT" is found.
*/
- private static void copyFile(File src, File dst, Integer port) throws IOException {
+ private static void copyFile(File src, File dst, Integer port, boolean internalCompression) throws IOException {
BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(src), "UTF-8"));
Writer out = new OutputStreamWriter(new FileOutputStream(dst), "UTF-8");
@@ -942,6 +940,9 @@ public class TestReplicationHandler exte
if (null != port)
line = line.replace("TEST_PORT", port.toString());
+
+ line = line.replace("COMPRESSION", internalCompression?"internal":"false");
+
out.write(line);
}
in.close();
@@ -1020,10 +1021,9 @@ public class TestReplicationHandler exte
public void copyConfigFile(String srcFile, String destFile)
throws IOException {
-
copyFile(getFile(srcFile),
new File(confDir, destFile),
- testPort);
+ testPort, random().nextBoolean());
}
}