#1291 remove threadThrottleFactor as this is not needed anymore

Author: lling

marklogic-client-api/src/main/java/com/marklogic/client/datamovement/QueryBatcher.java

@@ -292,38 +292,12 @@ public interface QueryBatcher extends Batcher {
    */
   public QueryBatcher withBatchSize(int docBatchSize, int docToUriBatchRatio);
 
-  /*
-   * Sets the number of documents processed in a batch, the ratio of the document processing batch to the document uri
-   * collection batch and threadThrottleFactor. For example, if docBatchSize is 100 and docToUriBatchRatio is 5, the
-   * document processing batch size is 100 and the document URI collection batch is 500. Ordinarily, QueryBatcher starts
-   * a separate thread for each document processing batch (and also collects document uris in one of these threads).
-   * The threadThrottleFactor reduces the number of default threads. Thus, a threadThrottleFactor equal to the
-   * docToUriBatchRatio - 1 runs in a single thread. A threadThrottleFactor of 0 explicitly uses the maximum number of
-   * threads.
-   * @param docBatchSize the number of documents processed in a batch
-   * @param docToUriBatchRatio the ratio of the document processing batch to the document uri collection batch. The
-   *                           docToUriBatchRatio should ordinarily be larger than 1 because URIs are small relative to
-   *                           full documents and because collecting URIs from indexes is ordinarily faster than
-   *                           processing documents
-   * @param threadThrottleFactor The threadThrottleFactor reduces the number of default threads. A threadThrottleFactor
-   *                             equal to the docToUriBatchRatio - 1 runs in a single thread. A threadThrottleFactor of
-   *                             0 explicitly uses the maximum number of threads
-   * @return this instance for method chaining
-   */
-  //public QueryBatcher withBatchSize(int docBatchSize, int docToUriBatchRatio, int threadThrottleFactor);
-
   /**
    * Returns docToUriBatchRatio set to the QueryBatcher
    * @return docToUriBatchRatio
    */
   public int getDocToUriBatchRatio();
 
-  /*
-   * Returns threadThrottleFactor set to the QueryBatcher
-   * @return threadThrottleFactor
-   */
-  //public int getThreadThrottleFactor();
-
   /**
    * Returns defaultDocBatchSize, which is calculated according to server status
    * @return defaultDocBatchSize

marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/QueryBatcherImpl.java

@@ -83,7 +83,6 @@ public class QueryBatcherImpl extends BatcherImpl implements QueryBatcher {
   private int docToUriBatchRatio;
   private int defaultDocBatchSize;
   private int maxUriBatchSize;
-  private int threadThrottleFactor;
 
   QueryBatcherImpl(
           SearchQueryDefinition originalQuery, DataMovementManager moveMgr, ForestConfiguration forestConfig,
@@ -324,7 +323,6 @@ public QueryBatcher withBatchSize(int docBatchSize) {
     if (this.docToUriBatchRatio == 0) {
       this.docToUriBatchRatio = 1;
     }
-    this.threadThrottleFactor = 0;
     return this;
   }
 
@@ -344,30 +342,11 @@ public QueryBatcher withBatchSize(int docBatchSize, int docToUriBatchRatio) {
     return this;
   }
 
-/*  @Override
-  public QueryBatcher withBatchSize(int docBatchSize, int docToUriBatchRatio, int threadThrottleFactor) {
-    if (threadThrottleFactor < 0 || threadThrottleFactor > this.maxDocToUriBatchRatio) {
-      throw new IllegalArgumentException("threadThrottleFactor is less than 0 or " +
-              "threadThrottleFactor is larger than maxDocToUriBatchRatio");
-    }
-    if (threadThrottleFactor >= docToUriBatchRatio) {
-      throw new IllegalArgumentException("threadThrottleFactor must be less than docToUriBatchRatio");
-    }
-    withBatchSize(docBatchSize, docToUriBatchRatio);
-    this.threadThrottleFactor = threadThrottleFactor;
-    return this;
-  }*/
-
   @Override
   public int getDocToUriBatchRatio() {
     return this.docToUriBatchRatio;
   }
 
-//  @Override
-  public int getThreadThrottleFactor() {
-    return this.threadThrottleFactor;
-  }
-
   @Override
   public int getDefaultDocBatchSize() {
     return this.defaultDocBatchSize;
@@ -473,7 +452,7 @@ private synchronized void initialize() {
     if ( threadCountSet == false ) {
       if ( query != null ) {
         logger.warn("threadCount not set--defaulting to number of forests ({})", forests.length);
-        withThreadCount(forests.length * (docToUriBatchRatio - threadThrottleFactor));
+        withThreadCount(forests.length * docToUriBatchRatio);
       } else {
         int hostCount = clientList.get().size();
         logger.warn("threadCount not set--defaulting to number of hosts ({})", hostCount);
@@ -488,9 +467,9 @@ private synchronized void initialize() {
     if(getThreadCount() == 1) {
       isSingleThreaded = true;
     }
-    logger.info("Starting job forest length={}, docBatchSize={}, docToUriBatchRatio={}, threadThrottleFactor= {}, " +
+    logger.info("Starting job forest length={}, docBatchSize={}, docToUriBatchRatio={}, " +
                     "threadCount={}, onUrisReady listeners={}, failure listeners={}",
-            forests.length, getBatchSize(), getDocToUriBatchRatio(), getThreadThrottleFactor(), getThreadCount(),
+            forests.length, getBatchSize(), getDocToUriBatchRatio(), getThreadCount(),
             urisReadyListeners.size(), failureListeners.size());
     threadPool = new QueryThreadPoolExecutor(getThreadCount(), forests.length, getDocToUriBatchRatio(), this);
   }

marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/ConcurrencyTest.java

@@ -55,7 +55,6 @@ public void ConcurrencyTest() {
         int batchSize = 20;
         int docToUriBatchRatio = 5;
         int totalCount = 1000;
-        //int threadThrottleFactor = 4;
 
         DocumentMetadataHandle documentMetadata = new DocumentMetadataHandle().withCollections("ConcurrencyTest");
         WriteBatcher batcher = moveMgr.newWriteBatcher().withDefaultMetadata(documentMetadata);
@@ -96,7 +95,7 @@ public void ConcurrencyTest() {
 /*        QueryBatcher queryBatcherAfter = dmManager.newQueryBatcher(new StructuredQueryBuilder().collection("ConcurrencyTest"));
         AtomicInteger minAfter = new AtomicInteger(Integer.MAX_VALUE);
         AtomicInteger maxAfter = new AtomicInteger(0);
-        queryBatcherAfter.withBatchSize(batchSize, docToUriBatchRatio, threadThrottleFactor)
+        queryBatcherAfter.withBatchSize(batchSize, docToUriBatchRatio)
                 .onUrisReady(batch -> {
                     ThreadPoolExecutor threadPoolAfter = ((QueryBatcherImpl) queryBatcherAfter).getThreadPool();
                     int activeThreadCount = threadPoolAfter.getPoolSize();
@@ -116,7 +115,7 @@ public void ConcurrencyTest() {
         dmManager.stopJob(queryBatcherAfter);*/
 
         assertTrue(max.get() <= forest_count * docToUriBatchRatio);
-        //assertTrue(maxAfter.get() <= forest_count * (docToUriBatchRatio - threadThrottleFactor));
+        //assertTrue(maxAfter.get() <= forest_count * docToUriBatchRatio);
     }
 
     static void changeAssignmentPolicy(String value) throws IOException {