You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2014/07/22 17:02:44 UTC
svn commit: r1612585 - in /lucene/dev/trunk/solr: ./
core/src/test/org/apache/solr/ core/src/test/org/apache/solr/cloud/
core/src/test/org/apache/solr/handler/component/
core/src/test/org/apache/solr/search/ core/src/test/org/apache/solr/update/
solrj/...
Author: markrmiller
Date: Tue Jul 22 15:02:43 2014
New Revision: 1612585
URL: http://svn.apache.org/r1612585
Log:
SOLR-3345: BaseDistributedSearchTestCase should always ignore QTime.
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestDistributedMissingSort.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestDistributedSearch.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestHighlightDedupGrouping.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/DistribCursorPagingTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/DistribDocExpirationUpdateProcessorTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/RemoteQueryErrorTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ShardRoutingTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/SyncSliceTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/TestDistribDocBasedVersion.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/TriLevelCompositeIdRoutingTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedExpandComponentTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedMLTComponentTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentCustomSortTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentOptimizationTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryElevationComponentTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedSuggestComponentTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedTermsComponentTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentDistributedTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/MergeStrategyTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/PeerSyncTest.java
lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrServerTest.java
lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1612585&r1=1612584&r2=1612585&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Tue Jul 22 15:02:43 2014
@@ -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
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java?rev=1612585&r1=1612584&r2=1612585&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java Tue Jul 22 15:02:43 2014
@@ -49,7 +49,6 @@ public class TestDistributedGrouping ext
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
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestDistributedMissingSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestDistributedMissingSort.java?rev=1612585&r1=1612584&r2=1612585&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestDistributedMissingSort.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestDistributedMissingSort.java Tue Jul 22 15:02:43 2014
@@ -93,7 +93,6 @@ public class TestDistributedMissingSort
commit();
handle.clear();
- handle.put("QTime", SKIPVAL);
handle.put("timestamp", SKIPVAL);
handle.put("_version_", SKIPVAL); // not a cloud test, but may use updateLog
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestDistributedSearch.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestDistributedSearch.java?rev=1612585&r1=1612584&r2=1612585&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestDistributedSearch.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestDistributedSearch.java Tue Jul 22 15:02:43 2014
@@ -119,7 +119,6 @@ public class TestDistributedSearch exten
commit();
handle.clear();
- handle.put("QTime", SKIPVAL);
handle.put("timestamp", SKIPVAL);
handle.put("_version_", SKIPVAL); // not a cloud test, but may use updateLog
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestHighlightDedupGrouping.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestHighlightDedupGrouping.java?rev=1612585&r1=1612584&r2=1612585&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestHighlightDedupGrouping.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestHighlightDedupGrouping.java Tue Jul 22 15:02:43 2014
@@ -52,7 +52,6 @@ public class TestHighlightDedupGrouping
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
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
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java?rev=1612585&r1=1612584&r2=1612585&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java Tue Jul 22 15:02:43 2014
@@ -81,7 +81,6 @@ public class AliasIntegrationTest extend
public void doTest() throws Exception {
handle.clear();
- handle.put("QTime", SKIPVAL);
handle.put("timestamp", SKIPVAL);
waitForThingsToLevelOut(30);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java?rev=1612585&r1=1612584&r2=1612585&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java Tue Jul 22 15:02:43 2014
@@ -77,7 +77,6 @@ public class BasicDistributedZk2Test ext
boolean testFinished = false;
try {
handle.clear();
- handle.put("QTime", SKIPVAL);
handle.put("timestamp", SKIPVAL);
testNodeWithoutCollectionForwarding();
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java?rev=1612585&r1=1612584&r2=1612585&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java Tue Jul 22 15:02:43 2014
@@ -156,7 +156,6 @@ public class BasicDistributedZkTest exte
waitForRecoveriesToFinish(false);
handle.clear();
- handle.put("QTime", SKIPVAL);
handle.put("timestamp", SKIPVAL);
del("*:*");
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java?rev=1612585&r1=1612584&r2=1612585&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java Tue Jul 22 15:02:43 2014
@@ -116,7 +116,6 @@ public class ChaosMonkeyNothingIsSafeTes
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
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java?rev=1612585&r1=1612584&r2=1612585&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java Tue Jul 22 15:02:43 2014
@@ -96,7 +96,6 @@ public class ChaosMonkeySafeLeaderTest e
public void doTest() throws Exception {
handle.clear();
- handle.put("QTime", SKIPVAL);
handle.put("timestamp", SKIPVAL);
// randomly turn on 1 seconds 'soft' commit
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/DistribCursorPagingTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/DistribCursorPagingTest.java?rev=1612585&r1=1612584&r2=1612585&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/DistribCursorPagingTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/DistribCursorPagingTest.java Tue Jul 22 15:02:43 2014
@@ -76,7 +76,6 @@ public class DistribCursorPagingTest ext
boolean testFinished = false;
try {
handle.clear();
- handle.put("QTime", SKIPVAL);
handle.put("timestamp", SKIPVAL);
doBadInputTest();
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/DistribDocExpirationUpdateProcessorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/DistribDocExpirationUpdateProcessorTest.java?rev=1612585&r1=1612584&r2=1612585&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/DistribDocExpirationUpdateProcessorTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/DistribDocExpirationUpdateProcessorTest.java Tue Jul 22 15:02:43 2014
@@ -69,7 +69,6 @@ public class DistribDocExpirationUpdateP
handle.clear();
handle.put("maxScore", SKIPVAL);
- handle.put("QTime", SKIPVAL);
handle.put("timestamp", SKIPVAL);
// some docs with no expiration
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java?rev=1612585&r1=1612584&r2=1612585&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java Tue Jul 22 15:02:43 2014
@@ -67,7 +67,6 @@ public class FullSolrCloudDistribCmdsTes
@Override
public void doTest() throws Exception {
handle.clear();
- handle.put("QTime", SKIPVAL);
handle.put("timestamp", SKIPVAL);
waitForRecoveriesToFinish(false);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java?rev=1612585&r1=1612584&r2=1612585&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java Tue Jul 22 15:02:43 2014
@@ -57,7 +57,6 @@ public class RecoveryZkTest extends Abst
@Override
public void doTest() throws Exception {
handle.clear();
- handle.put("QTime", SKIPVAL);
handle.put("timestamp", SKIPVAL);
// start a couple indexing threads
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/RemoteQueryErrorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/RemoteQueryErrorTest.java?rev=1612585&r1=1612584&r2=1612585&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/RemoteQueryErrorTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/RemoteQueryErrorTest.java Tue Jul 22 15:02:43 2014
@@ -40,7 +40,6 @@ public class RemoteQueryErrorTest extend
@Override
public void doTest() throws Exception {
handle.clear();
- handle.put("QTime", SKIPVAL);
handle.put("timestamp", SKIPVAL);
waitForThingsToLevelOut(15);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ShardRoutingTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ShardRoutingTest.java?rev=1612585&r1=1612584&r2=1612585&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ShardRoutingTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ShardRoutingTest.java Tue Jul 22 15:02:43 2014
@@ -114,7 +114,6 @@ public class ShardRoutingTest extends Ab
boolean testFinished = false;
try {
handle.clear();
- handle.put("QTime", SKIPVAL);
handle.put("timestamp", SKIPVAL);
// todo: do I have to do this here?
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/SyncSliceTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/SyncSliceTest.java?rev=1612585&r1=1612584&r2=1612585&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/SyncSliceTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/SyncSliceTest.java Tue Jul 22 15:02:43 2014
@@ -90,7 +90,6 @@ public class SyncSliceTest extends Abstr
public void doTest() throws Exception {
handle.clear();
- handle.put("QTime", SKIPVAL);
handle.put("timestamp", SKIPVAL);
waitForThingsToLevelOut(30);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/TestDistribDocBasedVersion.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/TestDistribDocBasedVersion.java?rev=1612585&r1=1612584&r2=1612585&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/TestDistribDocBasedVersion.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/TestDistribDocBasedVersion.java Tue Jul 22 15:02:43 2014
@@ -94,7 +94,6 @@ public class TestDistribDocBasedVersion
boolean testFinished = false;
try {
handle.clear();
- handle.put("QTime", SKIPVAL);
handle.put("timestamp", SKIPVAL);
// todo: do I have to do this here?
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/TriLevelCompositeIdRoutingTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/TriLevelCompositeIdRoutingTest.java?rev=1612585&r1=1612584&r2=1612585&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/TriLevelCompositeIdRoutingTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/TriLevelCompositeIdRoutingTest.java Tue Jul 22 15:02:43 2014
@@ -56,7 +56,6 @@ public class TriLevelCompositeIdRoutingT
boolean testFinished = false;
try {
handle.clear();
- handle.put("QTime", SKIPVAL);
handle.put("timestamp", SKIPVAL);
// todo: do I have to do this here?
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedExpandComponentTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedExpandComponentTest.java?rev=1612585&r1=1612584&r2=1612585&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedExpandComponentTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedExpandComponentTest.java Tue Jul 22 15:02:43 2014
@@ -70,7 +70,6 @@ public class DistributedExpandComponentT
handle.put("explain", SKIPVAL);
- handle.put("QTime", SKIPVAL);
handle.put("timestamp", SKIPVAL);
handle.put("score", SKIPVAL);
handle.put("wt", SKIP);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedMLTComponentTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedMLTComponentTest.java?rev=1612585&r1=1612584&r2=1612585&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedMLTComponentTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedMLTComponentTest.java Tue Jul 22 15:02:43 2014
@@ -90,7 +90,6 @@ public class DistributedMLTComponentTest
commit();
handle.clear();
- handle.put("QTime", SKIPVAL);
handle.put("timestamp", SKIPVAL);
handle.put("maxScore", SKIPVAL);
// we care only about the mlt results
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentCustomSortTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentCustomSortTest.java?rev=1612585&r1=1612584&r2=1612585&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentCustomSortTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentCustomSortTest.java Tue Jul 22 15:02:43 2014
@@ -64,8 +64,6 @@ public class DistributedQueryComponentCu
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);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentOptimizationTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentOptimizationTest.java?rev=1612585&r1=1612584&r2=1612585&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentOptimizationTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentOptimizationTest.java Tue Jul 22 15:02:43 2014
@@ -69,8 +69,6 @@ public class DistributedQueryComponentOp
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);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryElevationComponentTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryElevationComponentTest.java?rev=1612585&r1=1612584&r2=1612585&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryElevationComponentTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryElevationComponentTest.java Tue Jul 22 15:02:43 2014
@@ -76,7 +76,6 @@ public class DistributedQueryElevationCo
handle.put("explain", SKIPVAL);
handle.put("debug", SKIPVAL);
- handle.put("QTime", SKIPVAL);
handle.put("maxScore", SKIPVAL);
handle.put("timestamp", SKIPVAL);
handle.put("score", SKIPVAL);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java?rev=1612585&r1=1612584&r2=1612585&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java Tue Jul 22 15:02:43 2014
@@ -126,7 +126,6 @@ public class DistributedSpellCheckCompon
commit();
handle.clear();
- handle.put("QTime", SKIPVAL);
handle.put("timestamp", SKIPVAL);
handle.put("maxScore", SKIPVAL);
// we care only about the spellcheck results
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedSuggestComponentTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedSuggestComponentTest.java?rev=1612585&r1=1612584&r2=1612585&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedSuggestComponentTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedSuggestComponentTest.java Tue Jul 22 15:02:43 2014
@@ -92,7 +92,6 @@ public class DistributedSuggestComponent
commit();
handle.clear();
- handle.put("QTime", SKIPVAL);
handle.put("timestamp", SKIPVAL);
handle.put("maxScore", SKIPVAL);
handle.put("response", SKIP);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedTermsComponentTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedTermsComponentTest.java?rev=1612585&r1=1612584&r2=1612585&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedTermsComponentTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/DistributedTermsComponentTest.java Tue Jul 22 15:02:43 2014
@@ -41,7 +41,6 @@ public class DistributedTermsComponentTe
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");
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentDistributedTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentDistributedTest.java?rev=1612585&r1=1612584&r2=1612585&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentDistributedTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentDistributedTest.java Tue Jul 22 15:02:43 2014
@@ -34,7 +34,6 @@ public class TermVectorComponentDistribu
public void doTest() throws Exception {
handle.clear();
- handle.put("QTime", SKIPVAL);
handle.put("timestamp", SKIPVAL);
handle.put("maxScore", SKIPVAL);
handle.put("score", SKIPVAL);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/MergeStrategyTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/MergeStrategyTest.java?rev=1612585&r1=1612584&r2=1612585&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/MergeStrategyTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/MergeStrategyTest.java Tue Jul 22 15:02:43 2014
@@ -68,7 +68,6 @@ public class MergeStrategyTest extends B
commit();
handle.put("explain", SKIPVAL);
- handle.put("QTime", SKIPVAL);
handle.put("timestamp", SKIPVAL);
handle.put("score", SKIPVAL);
handle.put("wt", SKIP);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/PeerSyncTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/PeerSyncTest.java?rev=1612585&r1=1612584&r2=1612585&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/PeerSyncTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/update/PeerSyncTest.java Tue Jul 22 15:02:43 2014
@@ -54,7 +54,6 @@ public class PeerSyncTest extends BaseDi
@Override
public void doTest() throws Exception {
handle.clear();
- handle.put("QTime", SKIPVAL);
handle.put("timestamp", SKIPVAL);
handle.put("score", SKIPVAL);
handle.put("maxScore", SKIPVAL);
Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrServerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrServerTest.java?rev=1612585&r1=1612584&r2=1612585&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrServerTest.java (original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrServerTest.java Tue Jul 22 15:02:43 2014
@@ -137,7 +137,6 @@ public class CloudSolrServerTest extends
assertNotNull(cloudClient);
handle.clear();
- handle.put("QTime", SKIPVAL);
handle.put("timestamp", SKIPVAL);
waitForThingsToLevelOut(30);
Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java?rev=1612585&r1=1612584&r2=1612585&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java (original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java Tue Jul 22 15:02:43 2014
@@ -830,6 +830,8 @@ public abstract class BaseDistributedSea
}
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);