Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-3345: BaseDistributedSearchTestCase should always ignore QTime. 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1612585 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Mark Robert Miller 2014-07-22 15:02:43 +00:00
parent 1c6508b284
commit f94f4952a7
32 changed files with 5 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
solr/CHANGES.txt
View File

@ -275,6 +275,9 @@ Other Changes
* SOLR-6252: A couple of small improvements to UnInvertedField class.
(Vamsee Yarlagadda, Gregory Chanan, Mark Miller)
* SOLR-3345: BaseDistributedSearchTestCase should always ignore QTime.
(Vamsee Yarlagadda, Benson Margulies via Mark Miller)
================== 4.9.0 ==================
Versions of Major Components

1
solr/core/src/test/org/apache/solr/TestDistributedGrouping.java
View File

@ -49,7 +49,6 @@ public class TestDistributedGrouping extends BaseDistributedSearchTestCase {
commit();
handle.clear();
handle.put("QTime", SKIPVAL);
handle.put("timestamp", SKIPVAL);
handle.put("grouped", UNORDERED); // distrib grouping doesn't guarantee order of top level group commands

1
solr/core/src/test/org/apache/solr/TestDistributedMissingSort.java
View File

@ -93,7 +93,6 @@ public class TestDistributedMissingSort extends BaseDistributedSearchTestCase {
commit();
handle.clear();
handle.put("QTime", SKIPVAL);
handle.put("timestamp", SKIPVAL);
handle.put("_version_", SKIPVAL); // not a cloud test, but may use updateLog
}

1
solr/core/src/test/org/apache/solr/TestDistributedSearch.java
View File

@ -119,7 +119,6 @@ public class TestDistributedSearch extends BaseDistributedSearchTestCase {
commit();
handle.clear();
handle.put("QTime", SKIPVAL);
handle.put("timestamp", SKIPVAL);
handle.put("_version_", SKIPVAL); // not a cloud test, but may use updateLog

2
solr/core/src/test/org/apache/solr/TestHighlightDedupGrouping.java
View File

@ -52,7 +52,6 @@ public class TestHighlightDedupGrouping extends BaseDistributedSearchTestCase {
commit();
handle.clear();
handle.put("QTime", SKIPVAL);
handle.put("timestamp", SKIPVAL);
handle.put("grouped", UNORDERED); // distrib grouping doesn't guarantee order of top level group commands
@ -82,7 +81,6 @@ public class TestHighlightDedupGrouping extends BaseDistributedSearchTestCase {
commit();
handle.clear();
handle.put("QTime", SKIPVAL);
handle.put("timestamp", SKIPVAL);
handle.put("grouped", UNORDERED); // distrib grouping doesn't guarantee order of top level group commands

1
solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java
View File

@ -81,7 +81,6 @@ public class AliasIntegrationTest extends AbstractFullDistribZkTestBase {
public void doTest() throws Exception {
handle.clear();
handle.put("QTime", SKIPVAL);
handle.put("timestamp", SKIPVAL);
waitForThingsToLevelOut(30);

1
solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java
View File

@ -77,7 +77,6 @@ public class BasicDistributedZk2Test extends AbstractFullDistribZkTestBase {
boolean testFinished = false;
try {
handle.clear();
handle.put("QTime", SKIPVAL);
handle.put("timestamp", SKIPVAL);
testNodeWithoutCollectionForwarding();

1
solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
View File

@ -156,7 +156,6 @@ public class BasicDistributedZkTest extends AbstractFullDistribZkTestBase {
waitForRecoveriesToFinish(false);
handle.clear();
handle.put("QTime", SKIPVAL);
handle.put("timestamp", SKIPVAL);
del("*:*");

1
solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java
View File

@ -116,7 +116,6 @@ public class ChaosMonkeyNothingIsSafeTest extends AbstractFullDistribZkTestBase
boolean testsSuccesful = false;
try {
handle.clear();
handle.put("QTime", SKIPVAL);
handle.put("timestamp", SKIPVAL);
ZkStateReader zkStateReader = cloudClient.getZkStateReader();
// make sure we have leaders for each shard

1
solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java
View File

@ -96,7 +96,6 @@ public class ChaosMonkeySafeLeaderTest extends AbstractFullDistribZkTestBase {
public void doTest() throws Exception {
handle.clear();
handle.put("QTime", SKIPVAL);
handle.put("timestamp", SKIPVAL);
// randomly turn on 1 seconds 'soft' commit

1
solr/core/src/test/org/apache/solr/cloud/DistribCursorPagingTest.java
View File

@ -76,7 +76,6 @@ public class DistribCursorPagingTest extends AbstractFullDistribZkTestBase {
boolean testFinished = false;
try {
handle.clear();
handle.put("QTime", SKIPVAL);
handle.put("timestamp", SKIPVAL);
doBadInputTest();

1
solr/core/src/test/org/apache/solr/cloud/DistribDocExpirationUpdateProcessorTest.java
View File

@ -69,7 +69,6 @@ public class DistribDocExpirationUpdateProcessorTest extends AbstractFullDistrib
handle.clear();
handle.put("maxScore", SKIPVAL);
handle.put("QTime", SKIPVAL);
handle.put("timestamp", SKIPVAL);
// some docs with no expiration

1
solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java
View File

@ -67,7 +67,6 @@ public class FullSolrCloudDistribCmdsTest extends AbstractFullDistribZkTestBase
@Override
public void doTest() throws Exception {
handle.clear();
handle.put("QTime", SKIPVAL);
handle.put("timestamp", SKIPVAL);
waitForRecoveriesToFinish(false);

1
solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java
View File

@ -57,7 +57,6 @@ public class RecoveryZkTest extends AbstractFullDistribZkTestBase {
@Override
public void doTest() throws Exception {
handle.clear();
handle.put("QTime", SKIPVAL);
handle.put("timestamp", SKIPVAL);
// start a couple indexing threads

1
solr/core/src/test/org/apache/solr/cloud/RemoteQueryErrorTest.java
View File

@ -40,7 +40,6 @@ public class RemoteQueryErrorTest extends AbstractFullDistribZkTestBase {
@Override
public void doTest() throws Exception {
handle.clear();
handle.put("QTime", SKIPVAL);
handle.put("timestamp", SKIPVAL);
waitForThingsToLevelOut(15);

1
solr/core/src/test/org/apache/solr/cloud/ShardRoutingTest.java
View File

@ -114,7 +114,6 @@ public class ShardRoutingTest extends AbstractFullDistribZkTestBase {
boolean testFinished = false;
try {
handle.clear();
handle.put("QTime", SKIPVAL);
handle.put("timestamp", SKIPVAL);
// todo: do I have to do this here?

1
solr/core/src/test/org/apache/solr/cloud/SyncSliceTest.java
View File

@ -90,7 +90,6 @@ public class SyncSliceTest extends AbstractFullDistribZkTestBase {
public void doTest() throws Exception {
handle.clear();
handle.put("QTime", SKIPVAL);
handle.put("timestamp", SKIPVAL);
waitForThingsToLevelOut(30);

1
solr/core/src/test/org/apache/solr/cloud/TestDistribDocBasedVersion.java
View File

@ -94,7 +94,6 @@ public class TestDistribDocBasedVersion extends AbstractFullDistribZkTestBase {
boolean testFinished = false;
try {
handle.clear();
handle.put("QTime", SKIPVAL);
handle.put("timestamp", SKIPVAL);
// todo: do I have to do this here?

1
solr/core/src/test/org/apache/solr/cloud/TriLevelCompositeIdRoutingTest.java
View File

@ -56,7 +56,6 @@ public class TriLevelCompositeIdRoutingTest extends ShardRoutingTest {
boolean testFinished = false;
try {
handle.clear();
handle.put("QTime", SKIPVAL);
handle.put("timestamp", SKIPVAL);
// todo: do I have to do this here?

1
solr/core/src/test/org/apache/solr/handler/component/DistributedExpandComponentTest.java
View File

@ -70,7 +70,6 @@ public class DistributedExpandComponentTest extends BaseDistributedSearchTestCas
handle.put("explain", SKIPVAL);
handle.put("QTime", SKIPVAL);
handle.put("timestamp", SKIPVAL);
handle.put("score", SKIPVAL);
handle.put("wt", SKIP);

1
solr/core/src/test/org/apache/solr/handler/component/DistributedMLTComponentTest.java
View File

@ -90,7 +90,6 @@ public class DistributedMLTComponentTest extends BaseDistributedSearchTestCase {
commit();
handle.clear();
handle.put("QTime", SKIPVAL);
handle.put("timestamp", SKIPVAL);
handle.put("maxScore", SKIPVAL);
// we care only about the mlt results

2
solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentCustomSortTest.java
View File

@ -64,8 +64,6 @@ public class DistributedQueryComponentCustomSortTest extends BaseDistributedSear
index(id, "13", "text", "d", "payload", ByteBuffer.wrap(new byte[] { (byte)0x80, 0x11, 0x33 })); // 12
commit();
handle.put("QTime", SKIPVAL);
QueryResponse rsp;
rsp = query("q", "*:*", "fl", "id", "sort", "payload asc", "rows", "20");
assertFieldValues(rsp.getResults(), id, 7, 1, 6, 4, 2, 10, 12, 3, 5, 9, 8, 13, 11);

2
solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentOptimizationTest.java
View File

@ -69,8 +69,6 @@ public class DistributedQueryComponentOptimizationTest extends BaseDistributedSe
index(id, "13", "text", "d", "test_sS", "33", "payload", ByteBuffer.wrap(new byte[] { (byte)0x80, 0x11, 0x33 })); // 12
commit();
handle.put("QTime", SKIPVAL);
QueryResponse rsp;
rsp = query("q", "*:*", "fl", "id,test_sS,score", "sort", "payload asc", "rows", "20");
assertFieldValues(rsp.getResults(), id, 7, 1, 6, 4, 2, 10, 12, 3, 5, 9, 8, 13, 11);

1
solr/core/src/test/org/apache/solr/handler/component/DistributedQueryElevationComponentTest.java
View File

@ -76,7 +76,6 @@ public class DistributedQueryElevationComponentTest extends BaseDistributedSearc
handle.put("explain", SKIPVAL);
handle.put("debug", SKIPVAL);
handle.put("QTime", SKIPVAL);
handle.put("maxScore", SKIPVAL);
handle.put("timestamp", SKIPVAL);
handle.put("score", SKIPVAL);

1
solr/core/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java
View File

@ -126,7 +126,6 @@ public class DistributedSpellCheckComponentTest extends BaseDistributedSearchTes
commit();
handle.clear();
handle.put("QTime", SKIPVAL);
handle.put("timestamp", SKIPVAL);
handle.put("maxScore", SKIPVAL);
// we care only about the spellcheck results

1
solr/core/src/test/org/apache/solr/handler/component/DistributedSuggestComponentTest.java
View File

@ -92,7 +92,6 @@ public class DistributedSuggestComponentTest extends BaseDistributedSearchTestCa
commit();
handle.clear();
handle.put("QTime", SKIPVAL);
handle.put("timestamp", SKIPVAL);
handle.put("maxScore", SKIPVAL);
handle.put("response", SKIP);

1
solr/core/src/test/org/apache/solr/handler/component/DistributedTermsComponentTest.java
View File

@ -41,7 +41,6 @@ public class DistributedTermsComponentTest extends BaseDistributedSearchTestCase
commit();
handle.clear();
handle.put("QTime", SKIPVAL);
query("qt", "/terms", "shards.qt", "/terms", "terms", "true", "terms.fl", "b_t");
query("qt", "/terms", "shards.qt", "/terms", "terms.limit", 5, "terms", "true", "terms.fl", "b_t", "terms.lower", "s");

1
solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentDistributedTest.java
View File

@ -34,7 +34,6 @@ public class TermVectorComponentDistributedTest extends BaseDistributedSearchTes
public void doTest() throws Exception {
handle.clear();
handle.put("QTime", SKIPVAL);
handle.put("timestamp", SKIPVAL);
handle.put("maxScore", SKIPVAL);
handle.put("score", SKIPVAL);

1
solr/core/src/test/org/apache/solr/search/MergeStrategyTest.java
View File

@ -68,7 +68,6 @@ public class MergeStrategyTest extends BaseDistributedSearchTestCase {
commit();
handle.put("explain", SKIPVAL);
handle.put("QTime", SKIPVAL);
handle.put("timestamp", SKIPVAL);
handle.put("score", SKIPVAL);
handle.put("wt", SKIP);

1
solr/core/src/test/org/apache/solr/update/PeerSyncTest.java
View File

@ -54,7 +54,6 @@ public class PeerSyncTest extends BaseDistributedSearchTestCase {
@Override
public void doTest() throws Exception {
handle.clear();
handle.put("QTime", SKIPVAL);
handle.put("timestamp", SKIPVAL);
handle.put("score", SKIPVAL);
handle.put("maxScore", SKIPVAL);

1
solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrServerTest.java
View File

@ -137,7 +137,6 @@ public class CloudSolrServerTest extends AbstractFullDistribZkTestBase {
assertNotNull(cloudClient);
handle.clear();
handle.put("QTime", SKIPVAL);
handle.put("timestamp", SKIPVAL);
waitForThingsToLevelOut(30);

2
solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
View File

@ -830,6 +830,8 @@ public abstract class BaseDistributedSearchTestCase extends SolrTestCaseJ4 {
}
protected void compareSolrResponses(SolrResponse a, SolrResponse b) {
// SOLR-3345: Checking QTime value can be skipped as there is no guarantee that the numbers will match.
handle.put("QTime", SKIPVAL);
String cmp = compare(a.getResponse(), b.getResponse(), flags, handle);
if (cmp != null) {
log.error("Mismatched responses:\n" + a + "\n" + b);