Less unusable options.

3 files changed, 6 insertions, 43 deletions

diff --git a/docproc/src/main/java/com/yahoo/docproc/jdisc/DocprocThreadManager.java b/docproc/src/main/java/com/yahoo/docproc/jdisc/DocprocThreadManager.java
index 4fb3c8f0913..6fd4beac056 100644
--- a/docproc/src/main/java/com/yahoo/docproc/jdisc/DocprocThreadManager.java
+++ b/docproc/src/main/java/com/yahoo/docproc/jdisc/DocprocThreadManager.java
@@ -1,11 +1,8 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.docproc.jdisc;
 
-import com.yahoo.docproc.jdisc.metric.NullMetric;
 import com.yahoo.document.DocumentUtil;
-import com.yahoo.jdisc.Metric;
 import com.yahoo.log.LogLevel;
-import com.yahoo.statistics.*;
 
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.logging.Logger;
@@ -22,12 +19,6 @@ class DocprocThreadManager {
     private final AtomicLong bytesFinished = new AtomicLong(0);
 
     DocprocThreadManager(double maxConcurrentFactor, double documentExpansionFactor, int containerCoreMemoryMb) {
-        this(maxConcurrentFactor, documentExpansionFactor, containerCoreMemoryMb, Statistics.nullImplementation,
-             new NullMetric());
-    }
-
-    DocprocThreadManager(double maxConcurrentFactor, double documentExpansionFactor, int containerCoreMemoryMb,
-                         Statistics statistics, Metric metric) {
         this((long) (((double) DocumentUtil.calculateMaxPendingSize(maxConcurrentFactor, documentExpansionFactor,
                                                       containerCoreMemoryMb)) * maxConcurrentFactor));
     }
diff --git a/docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingHandler.java b/docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingHandler.java
index ec74fb9246d..5b7b9d85a91 100644
--- a/docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingHandler.java
+++ b/docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingHandler.java
@@ -19,7 +19,6 @@ import com.yahoo.docproc.jdisc.messagebus.MbusRequestContext;
 import com.yahoo.docproc.proxy.SchemaMap;
 import com.yahoo.document.DocumentTypeManager;
 import com.yahoo.document.config.DocumentmanagerConfig;
-import com.yahoo.documentapi.ThroughputLimitQueue;
 import com.yahoo.jdisc.Metric;
 import com.yahoo.jdisc.Request;
 import com.yahoo.jdisc.handler.AbstractRequestHandler;
@@ -33,7 +32,6 @@ import com.yahoo.statistics.Statistics;
 import java.util.TimerTask;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.PriorityBlockingQueue;
 import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.SynchronousQueue;
@@ -96,29 +94,20 @@ public class DocumentProcessingHandler extends AbstractRequestHandler {
                                      DocumentProcessingHandlerParameters params) {
         this(docprocServiceRegistry, documentProcessorComponentRegistry, docFactoryRegistry,
              new DocprocThreadPoolExecutor(params.getMaxNumThreads(),
-                                           chooseQueueType(params),
+                                           chooseQueueType(params.getMaxNumThreads()),
                                            new DocprocThreadManager(params.getMaxConcurrentFactor(),
                                                                     params.getDocumentExpansionFactor(),
-                                                                    params.getContainerCoreMemoryMb(),
-                                                                    params.getStatisticsManager(),
-                                                                    params.getMetric())),
+                                                                    params.getContainerCoreMemoryMb())),
              params.getDocumentTypeManager(), params.getChainsModel(), params.getSchemaMap(),
              params.getStatisticsManager(),
              params.getMetric(),
              params.getContainerDocConfig());
     }
 
-    private static BlockingQueue<Runnable> chooseQueueType(DocumentProcessingHandlerParameters params) {
-        if (params.getMaxQueueTimeMs() > 0) {
-            return new ThroughputLimitQueue<>(params.getMaxQueueTimeMs());
-        }
-        if (params.getMaxQueueTimeMs() == 0) {
-            return new PriorityBlockingQueue<>(); // Probably no need to bound this queue, see bug #4254537
-        }
-        if (params.getMaxNumThreads() > 0) {
-            return new LinkedBlockingQueue<>();
-        }
-        return new SynchronousQueue<>();
+    private static BlockingQueue<Runnable> chooseQueueType(int maxNumThreads) {
+        return (maxNumThreads > 0)
+                ? new LinkedBlockingQueue<>()
+                : new SynchronousQueue<>();
     }
 
     @Inject
@@ -138,7 +127,6 @@ public class DocumentProcessingHandler extends AbstractRequestHandler {
                      .setMaxConcurrentFactor(containerMbusConfig.maxConcurrentFactor())
                      .setDocumentExpansionFactor(containerMbusConfig.documentExpansionFactor())
                      .setContainerCoreMemoryMb(containerMbusConfig.containerCoreMemory())
-                     .setMaxQueueTimeMs(docprocConfig.maxqueuetimems())
                      .setDocumentTypeManager(new DocumentTypeManager(docManConfig))
                      .setChainsModel(buildFromConfig(chainsConfig)).setSchemaMap(configureMapping(mappingConfig))
                      .setStatisticsManager(manager)
diff --git a/docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerParameters.java b/docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerParameters.java
index cec943306c8..bf308e39218 100644
--- a/docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerParameters.java
+++ b/docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerParameters.java
@@ -21,7 +21,6 @@ public class DocumentProcessingHandlerParameters {
     private double maxConcurrentFactor = 0.2;
     private double documentExpansionFactor = 20.0;
     private int containerCoreMemoryMb = 50;
-    private long maxQueueTimeMs = 0;
     private DocumentTypeManager documentTypeManager = null;
     private ChainsModel chainsModel = null;
     private SchemaMap schemaMap = null;
@@ -86,21 +85,6 @@ public class DocumentProcessingHandlerParameters {
     }
 
     /**
-     * Returns the maximum time (in milliseconds) that a document may stay in the input queue.&nbsp;The default value
-     * of 0 disables this functionality.
-     *
-     * @return the maximum time (in milliseconds) that a document may stay in the input queue.
-     */
-    public long getMaxQueueTimeMs() {
-        return maxQueueTimeMs;
-    }
-
-    public DocumentProcessingHandlerParameters setMaxQueueTimeMs(long maxQueueTimeMs) {
-        this.maxQueueTimeMs = maxQueueTimeMs;
-        return this;
-    }
-
-    /**
      * Returns the maximum number of thread that the thread pool will ever attempt to run simultaneously.
      *
      * @return the maximum number of thread that the thread pool will ever attempt to run simultaneously.