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 2017/01/03 22:44:51 UTC

[5/6] lucene-solr:branch_6x: tests: speed up very slow test

tests: speed up very slow test


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/3942c42a
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/3942c42a
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/3942c42a

Branch: refs/heads/branch_6x
Commit: 3942c42a7f6dfaf8ed31373ff0cab8e53295a3ab
Parents: 307db44
Author: markrmiller <ma...@apache.org>
Authored: Wed Dec 28 08:36:08 2016 -0500
Committer: markrmiller <ma...@apache.org>
Committed: Tue Jan 3 17:37:25 2017 -0500

----------------------------------------------------------------------
 .../apache/solr/cloud/CdcrBootstrapTest.java    | 25 ++++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/3942c42a/solr/core/src/test/org/apache/solr/cloud/CdcrBootstrapTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/CdcrBootstrapTest.java b/solr/core/src/test/org/apache/solr/cloud/CdcrBootstrapTest.java
index aca5e0b..6959bd8 100644
--- a/solr/core/src/test/org/apache/solr/cloud/CdcrBootstrapTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/CdcrBootstrapTest.java
@@ -76,11 +76,11 @@ public class CdcrBootstrapTest extends SolrTestCaseJ4 {
             .withProperty("solr.directoryFactory", "solr.StandardDirectoryFactory")
             .process(source.getSolrClient());
 
-        // index 10000 docs with a hard commit every 1000 documents
         CloudSolrClient sourceSolrClient = source.getSolrClient();
         sourceSolrClient.setDefaultCollection("cdcr-source");
+        int docs = (TEST_NIGHTLY ? 100 : 10);
         int numDocs = 0;
-        for (int k = 0; k < 100; k++) {
+        for (int k = 0; k < docs; k++) {
           UpdateRequest req = new UpdateRequest();
           for (; numDocs < (k + 1) * 100; numDocs++) {
             SolrInputDocument doc = new SolrInputDocument();
@@ -89,7 +89,7 @@ public class CdcrBootstrapTest extends SolrTestCaseJ4 {
             req.add(doc);
           }
           req.setAction(AbstractUpdateRequest.ACTION.COMMIT, true, true);
-          System.out.println("Adding 100 docs with commit=true, numDocs=" + numDocs);
+          System.out.println("Adding " + docs + " docs with commit=true, numDocs=" + numDocs);
           req.process(sourceSolrClient);
         }
 
@@ -170,11 +170,11 @@ public class CdcrBootstrapTest extends SolrTestCaseJ4 {
             .withProperty("solr.directoryFactory", "solr.StandardDirectoryFactory")
             .process(source.getSolrClient());
 
-        // index 10000 docs with a hard commit every 1000 documents
         CloudSolrClient sourceSolrClient = source.getSolrClient();
         sourceSolrClient.setDefaultCollection("cdcr-source");
+        int docs = (TEST_NIGHTLY ? 100 : 10);
         int numDocs = 0;
-        for (int k = 0; k < 100; k++) {
+        for (int k = 0; k < docs; k++) {
           UpdateRequest req = new UpdateRequest();
           for (; numDocs < (k + 1) * 100; numDocs++) {
             SolrInputDocument doc = new SolrInputDocument();
@@ -183,7 +183,7 @@ public class CdcrBootstrapTest extends SolrTestCaseJ4 {
             req.add(doc);
           }
           req.setAction(AbstractUpdateRequest.ACTION.COMMIT, true, true);
-          System.out.println("Adding 100 docs with commit=true, numDocs=" + numDocs);
+          System.out.println("Adding " + docs + " docs with commit=true, numDocs=" + numDocs);
           req.process(sourceSolrClient);
         }
 
@@ -209,7 +209,7 @@ public class CdcrBootstrapTest extends SolrTestCaseJ4 {
         cdcrDisableBuffer(sourceSolrClient);
 
         int c = 0;
-        for (int k = 0; k < 100; k++) {
+        for (int k = 0; k < 10; k++) {
           UpdateRequest req = new UpdateRequest();
           for (; c < (k + 1) * 100; c++, numDocs++) {
             SolrInputDocument doc = new SolrInputDocument();
@@ -256,11 +256,11 @@ public class CdcrBootstrapTest extends SolrTestCaseJ4 {
             .withProperty("solr.directoryFactory", "solr.StandardDirectoryFactory")
             .process(source.getSolrClient());
 
-        // index 10000 docs with a hard commit every 1000 documents
         CloudSolrClient sourceSolrClient = source.getSolrClient();
         sourceSolrClient.setDefaultCollection("cdcr-source");
+        int docs = (TEST_NIGHTLY ? 100 : 10);
         int numDocs = 0;
-        for (int k = 0; k < 100; k++) {
+        for (int k = 0; k < docs; k++) {
           UpdateRequest req = new UpdateRequest();
           for (; numDocs < (k + 1) * 100; numDocs++) {
             SolrInputDocument doc = new SolrInputDocument();
@@ -269,7 +269,7 @@ public class CdcrBootstrapTest extends SolrTestCaseJ4 {
             req.add(doc);
           }
           req.setAction(AbstractUpdateRequest.ACTION.COMMIT, true, true);
-          System.out.println("Adding 100 docs with commit=true, numDocs=" + numDocs);
+          System.out.println("Adding " + docs + " docs with commit=true, numDocs=" + numDocs);
           req.process(sourceSolrClient);
         }
 
@@ -286,9 +286,8 @@ public class CdcrBootstrapTest extends SolrTestCaseJ4 {
 
         cdcrStart(targetSolrClient);
         cdcrStart(sourceSolrClient);
-
         int c = 0;
-        for (int k = 0; k < 100; k++) {
+        for (int k = 0; k < docs; k++) {
           UpdateRequest req = new UpdateRequest();
           for (; c < (k + 1) * 100; c++, numDocs++) {
             SolrInputDocument doc = new SolrInputDocument();
@@ -297,7 +296,7 @@ public class CdcrBootstrapTest extends SolrTestCaseJ4 {
             req.add(doc);
           }
           req.setAction(AbstractUpdateRequest.ACTION.COMMIT, true, true);
-          System.out.println("Adding 100 docs with commit=true, numDocs=" + numDocs);
+          System.out.println("Adding " + docs + " docs with commit=true, numDocs=" + numDocs);
           req.process(sourceSolrClient);
         }