Remove deprecated and unused TimeoutCollector/TimeoutRate

2 files changed, 0 insertions, 67 deletions

diff --git a/container-core/src/main/java/com/yahoo/container/protect/TimeoutCollector.java b/container-core/src/main/java/com/yahoo/container/protect/TimeoutCollector.java
deleted file mode 100644
index e31716a292e..00000000000
--- a/container-core/src/main/java/com/yahoo/container/protect/TimeoutCollector.java
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.container.protect;
-
-import com.yahoo.concurrent.ThreadLocalDirectory.Updater;
-
-/**
- * Allocator and glue for sampling timeouts in SearchHandler.
- *
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
- * @deprecated this is not in use and will be removed in the next major release
- */
-@Deprecated
-public final class TimeoutCollector implements Updater<TimeoutRate, Boolean> {
-
-    @Override
-    public TimeoutRate createGenerationInstance(TimeoutRate previous) {
-        return new TimeoutRate();
-    }
-
-    @Override
-    public TimeoutRate update(TimeoutRate current, Boolean x) {
-        current.addQuery(x);
-        return current;
-    }
-
-}
diff --git a/container-core/src/main/java/com/yahoo/container/protect/TimeoutRate.java b/container-core/src/main/java/com/yahoo/container/protect/TimeoutRate.java
deleted file mode 100644
index 4bb68fedb9b..00000000000
--- a/container-core/src/main/java/com/yahoo/container/protect/TimeoutRate.java
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.container.protect;
-
-/**
- * Helper class to account for measuring how many queries times outs.
- *
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
- * @deprecated this is not in use and will be removed in the next major release
- */
-// TODO: Remove on Vespa 7
-@Deprecated
-public final class TimeoutRate {
-
-    private int timeouts = 0;
-    private int total = 0;
-
-    public void addQuery(Boolean timeout) {
-        if (timeout) {
-            timeouts += 1;
-        }
-        total += 1;
-    }
-
-    public void merge(TimeoutRate other) {
-        timeouts += other.timeouts;
-        total += other.total;
-    }
-
-    public double timeoutFraction() {
-        if (total == 0) {
-            return 0.0d;
-        } else {
-            return ((double) timeouts) / ((double) total);
-        }
-    }
-
-    public int getTotal() {
-        return total;
-    }
-
-}