You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2014/01/31 21:29:25 UTC
svn commit: r1563248 [2/2] - in /lucene/dev/branches/lucene5376: ./
dev-tools/ dev-tools/maven/ lucene/ lucene/analysis/ lucene/analysis/common/
lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/
lucene/analysis/common/src/test/org/apa...
Modified: lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/analytics/facet/FieldFacetExtrasTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/analytics/facet/FieldFacetExtrasTest.java?rev=1563248&r1=1563247&r2=1563248&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/analytics/facet/FieldFacetExtrasTest.java (original)
+++ lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/analytics/facet/FieldFacetExtrasTest.java Fri Jan 31 20:29:24 2014
@@ -99,7 +99,7 @@ public class FieldFacetExtrasTest extend
}
if (usually()) {
- commit(); // to have several segments
+ assertU(commit()); // to have several segments
}
}
Modified: lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/analytics/facet/FieldFacetTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/analytics/facet/FieldFacetTest.java?rev=1563248&r1=1563247&r2=1563248&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/analytics/facet/FieldFacetTest.java (original)
+++ lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/analytics/facet/FieldFacetTest.java Fri Jan 31 20:29:24 2014
@@ -24,8 +24,11 @@ import java.util.List;
import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.Ignore;
+
@SuppressCodecs({"Lucene3x","Lucene40","Lucene41","Lucene42","Appending","Asserting"})
+@Ignore // failing after https://issues.apache.org/jira/browse/SOLR-5685
public class FieldFacetTest extends AbstractAnalyticsFacetTest{
static String fileName = "core/src/test-files/analytics/requestFiles/fieldFacets.txt";
@@ -383,7 +386,7 @@ public class FieldFacetTest extends Abst
}
if (usually()) {
- commit(); // to have several segments
+ assertU(commit()); // to have several segments
}
}
Modified: lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/analytics/facet/QueryFacetTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/analytics/facet/QueryFacetTest.java?rev=1563248&r1=1563247&r2=1563248&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/analytics/facet/QueryFacetTest.java (original)
+++ lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/analytics/facet/QueryFacetTest.java Fri Jan 31 20:29:24 2014
@@ -95,7 +95,7 @@ public class QueryFacetTest extends Abst
}
if (usually()) {
- commit(); // to have several segments
+ assertU(commit()); // to have several segments
}
}
Modified: lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/analytics/util/valuesource/FunctionTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/analytics/util/valuesource/FunctionTest.java?rev=1563248&r1=1563247&r2=1563248&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/analytics/util/valuesource/FunctionTest.java (original)
+++ lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/analytics/util/valuesource/FunctionTest.java Fri Jan 31 20:29:24 2014
@@ -76,7 +76,7 @@ public class FunctionTest extends Abstra
if (usually()) {
- commit(); // to have several segments
+ assertU(commit()); // to have several segments
}
}
Modified: lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/cloud/OverseerRolesTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/cloud/OverseerRolesTest.java?rev=1563248&r1=1563247&r2=1563248&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/cloud/OverseerRolesTest.java (original)
+++ lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/cloud/OverseerRolesTest.java Fri Jan 31 20:29:24 2014
@@ -17,6 +17,8 @@ package org.apache.solr.cloud;
* limitations under the License.
*/
+import com.google.protobuf.TextFormat;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.client.solrj.SolrRequest;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.impl.CloudSolrServer;
@@ -47,7 +49,7 @@ import static org.apache.solr.cloud.Over
import static org.apache.solr.cloud.OverseerCollectionProcessor.getSortedNodeNames;
import static org.apache.solr.common.cloud.ZkNodeProps.makeMap;
import static org.apache.solr.common.params.CollectionParams.CollectionAction;
-@Ignore("needs to restart the OverSeer")
+@LuceneTestCase.Slow
public class OverseerRolesTest extends AbstractFullDistribZkTestBase{
private CloudSolrServer client;
@@ -119,12 +121,16 @@ public class OverseerRolesTest extends
}
Thread.sleep(100);
}
- if(!leaderchanged){
+ /*if(!leaderchanged){
+
log.warn("expected {}, current order {}",
overseerDesignate,
getSortedNodeNames(client.getZkStateReader().getZkClient())+ " ldr :"+ OverseerCollectionProcessor.getLeaderNode(client.getZkStateReader().getZkClient()) );
- }
- assertTrue("could not set the new overseer",leaderchanged);
+ }*/
+ assertTrue("could not set the new overseer . expected "+
+ overseerDesignate + " current order : " +
+ getSortedNodeNames(client.getZkStateReader().getZkClient()) +
+ " ldr :"+ OverseerCollectionProcessor.getLeaderNode(client.getZkStateReader().getZkClient()) ,leaderchanged);
Modified: lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/schema/DocValuesMultiTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/schema/DocValuesMultiTest.java?rev=1563248&r1=1563247&r2=1563248&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/schema/DocValuesMultiTest.java (original)
+++ lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/schema/DocValuesMultiTest.java Fri Jan 31 20:29:24 2014
@@ -45,7 +45,7 @@ public class DocValuesMultiTest extends
public void testDocValues() throws IOException {
assertU(adoc("id", "1", "floatdv", "4.5", "intdv", "-1", "intdv", "3", "stringdv", "value1", "stringdv", "value2"));
- commit();
+ assertU(commit());
SolrCore core = h.getCoreInc();
try {
final RefCounted<SolrIndexSearcher> searcherRef = core.openNewSearcher(true, true);
@@ -150,7 +150,7 @@ public class DocValuesMultiTest extends
}
for (int i = 0; i < 50; ++i) {
if (rarely()) {
- commit(); // to have several segments
+ assertU(commit()); // to have several segments
}
assertU(adoc("id", "1000" + i, "floatdv", "" + i, "intdv", "" + i, "doubledv", "" + i, "longdv", "" + i, "datedv", (1900+i) + "-12-31T23:59:59.999Z", "stringdv", "abc" + i));
}
Modified: lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/schema/DocValuesTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/schema/DocValuesTest.java?rev=1563248&r1=1563247&r2=1563248&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/schema/DocValuesTest.java (original)
+++ lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/schema/DocValuesTest.java Fri Jan 31 20:29:24 2014
@@ -43,7 +43,7 @@ public class DocValuesTest extends SolrT
public void testDocValues() throws IOException {
assertU(adoc("id", "1"));
- commit();
+ assertU(commit());
SolrCore core = h.getCoreInc();
try {
final RefCounted<SolrIndexSearcher> searcherRef = core.openNewSearcher(true, true);
@@ -147,7 +147,7 @@ public class DocValuesTest extends SolrT
}
for (int i = 0; i < 50; ++i) {
if (rarely()) {
- commit(); // to have several segments
+ assertU(commit()); // to have several segments
}
assertU(adoc("id", "1000" + i, "floatdv", "" + i, "intdv", "" + i, "doubledv", "" + i, "longdv", "" + i, "datedv", (1900+i) + "-12-31T23:59:59.999Z", "stringdv", "abc" + i));
}
@@ -192,7 +192,7 @@ public class DocValuesTest extends SolrT
for (int i = 0; i < 50; ++i) {
assertU(adoc("id", "1000" + i, "floatdv", "" + i%2, "intdv", "" + i%3, "doubledv", "" + i%4, "longdv", "" + i%5, "datedv", (1900+i%6) + "-12-31T23:59:59.999Z", "stringdv", "abc" + i%7));
if (rarely()) {
- commit(); // to have several segments
+ assertU(commit()); // to have several segments
}
}
assertU(commit());
Modified: lucene/dev/branches/lucene5376/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrServer.java?rev=1563248&r1=1563247&r2=1563248&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrServer.java (original)
+++ lucene/dev/branches/lucene5376/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrServer.java Fri Jan 31 20:29:24 2014
@@ -595,7 +595,7 @@ public class HttpSolrServer extends Solr
* </p>
*/
public void setFollowRedirects(boolean followRedirects) {
- this.followRedirects = true;
+ this.followRedirects = followRedirects;
HttpClientUtil.setFollowRedirects(httpClient, followRedirects);
}
Modified: lucene/dev/branches/lucene5376/solr/solrj/src/java/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/solrj/src/java/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.java?rev=1563248&r1=1563247&r2=1563248&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/solrj/src/java/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.java (original)
+++ lucene/dev/branches/lucene5376/solr/solrj/src/java/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.java Fri Jan 31 20:29:24 2014
@@ -176,7 +176,6 @@ public class JavaBinUpdateRequestCodec {
// must be loaded now
if(updateRequest.getParams()==null) {
NamedList params = (NamedList) namedList[0].get("params");
- System.out.println("unmarchal params:" + params);
if(params!=null) {
updateRequest.setParams(new ModifiableSolrParams(SolrParams.toSolrParams(params)));
}
Modified: lucene/dev/branches/lucene5376/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java?rev=1563248&r1=1563247&r2=1563248&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java (original)
+++ lucene/dev/branches/lucene5376/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java Fri Jan 31 20:29:24 2014
@@ -195,8 +195,8 @@ public class ConnectionManager implement
log.info("zkClient has disconnected");
disconnected();
connectionStrategy.disconnected();
- } else {
- disconnected();
+ } else if (state == KeeperState.AuthFailed) {
+ log.warn("zkClient received AuthFailed");
}
}
Modified: lucene/dev/branches/lucene5376/solr/solrj/src/java/org/apache/solr/common/params/CoreAdminParams.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/solrj/src/java/org/apache/solr/common/params/CoreAdminParams.java?rev=1563248&r1=1563247&r2=1563248&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/solrj/src/java/org/apache/solr/common/params/CoreAdminParams.java (original)
+++ lucene/dev/branches/lucene5376/solr/solrj/src/java/org/apache/solr/common/params/CoreAdminParams.java Fri Jan 31 20:29:24 2014
@@ -128,7 +128,7 @@ public abstract class CoreAdminParams
REQUESTAPPLYUPDATES,
LOAD_ON_STARTUP,
TRANSIENT,
- REJOINOVERSEERELECTION;
+ OVERSEEROP;
public static CoreAdminAction get( String p )
{
Modified: lucene/dev/branches/lucene5376/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrServerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrServerTest.java?rev=1563248&r1=1563247&r2=1563248&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrServerTest.java (original)
+++ lucene/dev/branches/lucene5376/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrServerTest.java Fri Jan 31 20:29:24 2014
@@ -412,6 +412,14 @@ public class BasicHttpSolrServerTest ext
} catch (Throwable t) {
fail("Exception was thrown:" + t);
}
+ //And back again:
+ server.setFollowRedirects(false);
+ try {
+ QueryResponse response = server.query(q);
+ fail("Should have thrown an exception.");
+ } catch (SolrServerException e) {
+ assertTrue(e.getMessage().contains("redirect"));
+ }
server.shutdown();
}