remove long gone SearchRow and SearchColumn policies.

5 files changed, 0 insertions, 485 deletions

diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentProtocol.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentProtocol.java
index c401fc16a2f..e1e501d3e1b 100755
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentProtocol.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentProtocol.java
@@ -291,8 +291,6 @@ public class DocumentProtocol implements Protocol {
         putRoutingPolicyFactory("MessageType", new RoutingPolicyFactories.MessageTypePolicyFactory(cfg));
         putRoutingPolicyFactory("RoundRobin", new RoutingPolicyFactories.RoundRobinPolicyFactory());
         putRoutingPolicyFactory("LoadBalancer", new RoutingPolicyFactories.LoadBalancerPolicyFactory());
-        putRoutingPolicyFactory("SearchColumn", new RoutingPolicyFactories.SearchColumnPolicyFactory());
-        putRoutingPolicyFactory("SearchRow", new RoutingPolicyFactories.SearchRowPolicyFactory());
         putRoutingPolicyFactory("Storage", new RoutingPolicyFactories.StoragePolicyFactory());
         putRoutingPolicyFactory("SubsetService", new RoutingPolicyFactories.SubsetServicePolicyFactory());
 
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutingPolicyFactories.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutingPolicyFactories.java
index acd73a21a8a..6c13b7468c7 100755
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutingPolicyFactories.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutingPolicyFactories.java
@@ -116,26 +116,6 @@ public abstract class RoutingPolicyFactories {
         }
     }
 
-    static class SearchColumnPolicyFactory implements RoutingPolicyFactory {
-        public DocumentProtocolRoutingPolicy createPolicy(String param) {
-            return new SearchColumnPolicy(param);
-        }
-
-
-        public void destroy() {
-        }
-    }
-
-    static class SearchRowPolicyFactory implements RoutingPolicyFactory {
-        public DocumentProtocolRoutingPolicy createPolicy(String param) {
-            return new SearchRowPolicy(param);
-        }
-
-
-        public void destroy() {
-        }
-    }
-
     static class SubsetServicePolicyFactory implements RoutingPolicyFactory {
         public DocumentProtocolRoutingPolicy createPolicy(String param) {
             return new SubsetServicePolicy(param);
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/SearchColumnPolicy.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/SearchColumnPolicy.java
deleted file mode 100644
index aabb6407d14..00000000000
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/SearchColumnPolicy.java
+++ /dev/null
@@ -1,183 +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.documentapi.messagebus.protocol;
-
-import com.yahoo.document.BucketId;
-import com.yahoo.document.BucketIdFactory;
-import com.yahoo.document.DocumentId;
-import com.yahoo.log.LogLevel;
-import com.yahoo.messagebus.EmptyReply;
-import com.yahoo.messagebus.ErrorCode;
-import com.yahoo.messagebus.Message;
-import com.yahoo.messagebus.Reply;
-import com.yahoo.messagebus.metrics.MetricSet;
-import com.yahoo.messagebus.routing.Route;
-import com.yahoo.messagebus.routing.RoutingContext;
-import com.yahoo.messagebus.routing.RoutingNodeIterator;
-import com.yahoo.vdslib.BucketDistribution;
-
-import java.util.*;
-import java.util.logging.Logger;
-
-/**
- * <p>This policy implements the logic to select recipients for a single search column. It has 2 different modes of
- * operation;</p>
- *
- * <ol>
- * <li>If the "maxbadparts" parameter is 0, select recipient based on document id hash and use
- * shared merge logic. Do not allow any out-of-service replies.</li>
- * <li>Else do best-effort validation of system
- * state. This means;
- * <ol>
- * <li>if the message is sending to all recipients (typicall start- and
- * end-of-feed), allow at most "maxbadparts" out-of-service replies,</li>
- * <li>else always allow out-of-service reply by masking it with an empty
- * reply.</li>
- * </ol>
- * </li>
- * </ol>
- * <p>For systems that allow bad parts, one will not know whether or not feeding
- * was a success until the RTX attempts to set the new index live, because it is
- * only the RTX that is now able to verify that the service level requirements
- * are met. Feeding will still break if a message that was supposed to be sent
- * to all recipients receives more than "maxbadparts" out-of-service replies,
- * according to (2.a) above.</p>
- *
- * @author Simon Thoresen
- */
-public class SearchColumnPolicy implements DocumentProtocolRoutingPolicy {
-
-    private static Logger log = Logger.getLogger(SearchColumnPolicy.class.getName());
-    private BucketIdFactory factory = new BucketIdFactory();
-    private Map<Integer, BucketDistribution> distributions = new HashMap<Integer, BucketDistribution>();
-    private int maxOOS = 0; // The maximum OUT_OF_SERVICE replies to hide.
-
-    public static final int DEFAULT_NUM_BUCKET_BITS = 16;
-
-    /**
-     * Constructs a new policy object for the given parameter string. The string can be null or empty, which is a
-     * request to not allow any bad columns.
-     *
-     * @param param The maximum number of allowed bad columns.
-     */
-    public SearchColumnPolicy(String param) {
-        if (param != null && param.length() > 0) {
-            try {
-                maxOOS = Integer.parseInt(param);
-            } catch (NumberFormatException e) {
-                log.log(LogLevel.WARNING, "Parameter '" + param + "' could not be parsed as an integer.", e);
-            }
-            if (maxOOS < 0) {
-                log.log(LogLevel.WARNING, "Ignoring a request to set the maximum number of OOS replies to " + maxOOS +
-                                          " because it makes no sense. This routing policy will not allow any recipient" +
-                                          " to be out of service.");
-            }
-        }
-    }
-
-    @Override
-    public void select(RoutingContext context) {
-        List<Route> recipients = context.getMatchedRecipients();
-        if (recipients == null || recipients.size() == 0) {
-            return;
-        }
-        DocumentId id = null;
-        BucketId bucketId = null;
-        Message msg = context.getMessage();
-        switch (msg.getType()) {
-
-            case DocumentProtocol.MESSAGE_PUTDOCUMENT:
-                id = ((PutDocumentMessage)msg).getDocumentPut().getDocument().getId();
-                break;
-
-            case DocumentProtocol.MESSAGE_GETDOCUMENT:
-                id = ((GetDocumentMessage)msg).getDocumentId();
-                break;
-
-            case DocumentProtocol.MESSAGE_REMOVEDOCUMENT:
-                id = ((RemoveDocumentMessage)msg).getDocumentId();
-                break;
-
-            case DocumentProtocol.MESSAGE_UPDATEDOCUMENT:
-                id = ((UpdateDocumentMessage)msg).getDocumentUpdate().getId();
-                break;
-
-            case DocumentProtocol.MESSAGE_BATCHDOCUMENTUPDATE:
-                bucketId = ((BatchDocumentUpdateMessage)msg).getBucketId();
-                break;
-
-            case DocumentProtocol.MESSAGE_GETBUCKETSTATE:
-                bucketId = ((GetBucketStateMessage)msg).getBucketId();
-                break;
-
-            default:
-                throw new UnsupportedOperationException("Message type '" + msg.getType() + "' not supported.");
-        }
-        if (bucketId == null && id != null) {
-            bucketId = factory.getBucketId(id);
-        }
-        int recipient = getRecipient(bucketId, recipients.size());
-        context.addChild(recipients.get(recipient));
-        context.setSelectOnRetry(true);
-        if (maxOOS > 0) {
-            context.addConsumableError(ErrorCode.SERVICE_OOS);
-        }
-    }
-
-    @Override
-    public void merge(RoutingContext context) {
-        if (maxOOS > 0) {
-            if (context.getNumChildren() > 1) {
-                Set<Integer> oosReplies = new HashSet<Integer>();
-                int idx = 0;
-                for (RoutingNodeIterator it = context.getChildIterator();
-                     it.isValid(); it.next())
-                {
-                    Reply ref = it.getReplyRef();
-                    if (ref.hasErrors() && DocumentProtocol.hasOnlyErrorsOfType(ref, ErrorCode.SERVICE_OOS)) {
-                        oosReplies.add(idx);
-                    }
-                    ++idx;
-                }
-                if (oosReplies.size() <= maxOOS) {
-                    DocumentProtocol.merge(context, oosReplies);
-                    return; // may the rtx be with you
-                }
-            } else {
-                Reply ref = context.getChildIterator().getReplyRef();
-                if (ref.hasErrors() && DocumentProtocol.hasOnlyErrorsOfType(ref, ErrorCode.SERVICE_OOS)) {
-                    context.setReply(new EmptyReply());
-                    return; // god help us all
-                }
-            }
-        }
-        DocumentProtocol.merge(context);
-    }
-
-    /**
-     * Returns the recipient index for the given bucket id. This updates the shared internal distribution map, so it
-     * needs to be synchronized.
-     *
-     * @param bucketId      The bucket whose recipient to return.
-     * @param numRecipients The number of recipients being distributed to.
-     * @return The recipient to use.
-     */
-    private synchronized int getRecipient(BucketId bucketId, int numRecipients) {
-        BucketDistribution distribution = distributions.get(numRecipients);
-        if (distribution == null) {
-            distribution = new BucketDistribution(1, DEFAULT_NUM_BUCKET_BITS);
-            distribution.setNumColumns(numRecipients);
-            distributions.put(numRecipients, distribution);
-        }
-        return distribution.getColumn(bucketId);
-    }
-
-    @Override
-    public void destroy() {
-        // empty
-    }
-
-    @Override
-    public MetricSet getMetrics() {
-        return null;
-    }
-}
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/SearchRowPolicy.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/SearchRowPolicy.java
deleted file mode 100755
index 4d94107eae7..00000000000
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/SearchRowPolicy.java
+++ /dev/null
@@ -1,85 +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.documentapi.messagebus.protocol;
-
-import com.yahoo.log.LogLevel;
-import com.yahoo.messagebus.ErrorCode;
-import com.yahoo.messagebus.Reply;
-import com.yahoo.messagebus.metrics.MetricSet;
-import com.yahoo.messagebus.routing.RoutingContext;
-import com.yahoo.messagebus.routing.RoutingNodeIterator;
-
-import java.util.HashSet;
-import java.util.Set;
-import java.util.logging.Logger;
-
-/**
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
- */
-public class SearchRowPolicy implements DocumentProtocolRoutingPolicy {
-
-    private static Logger log = Logger.getLogger(SearchRowPolicy.class.getName());
-    private int minOk = 0; // Hide OUT_OF_SERVICE as long as this number of replies are something else.
-
-    /**
-     * Creates a search row policy that wraps the underlying search group policy in case the parameter is something
-     * other than an empty string.
-     *
-     * @param param The number of minimum non-OOS replies that this policy requires.
-     */
-    public SearchRowPolicy(String param) {
-        if (param != null && param.length() > 0) {
-            try {
-                minOk = Integer.parseInt(param);
-            }
-            catch (NumberFormatException e) {
-                log.log(LogLevel.WARNING, "Parameter '" + param + "' could not be parsed as an integer.", e);
-            }
-            if (minOk <= 0) {
-                log.log(LogLevel.WARNING, "Ignoring a request to set the minimum number of OK replies to " + minOk + " " +
-                                          "because it makes no sense. This routing policy will not allow any recipient " +
-                                          "to be out of service.");
-            }
-        }
-    }
-
-    @Override
-    public void select(RoutingContext context) {
-        context.addChildren(context.getMatchedRecipients());
-        context.setSelectOnRetry(false);
-        if (minOk > 0) {
-            context.addConsumableError(ErrorCode.SERVICE_OOS);
-        }
-    }
-
-    @Override
-    public void merge(RoutingContext context) {
-        if (minOk > 0) {
-            Set<Integer> oosReplies = new HashSet<Integer>();
-            int idx = 0;
-            for (RoutingNodeIterator it = context.getChildIterator();
-                 it.isValid(); it.next())
-            {
-                Reply ref = it.getReplyRef();
-                if (ref.hasErrors() && DocumentProtocol.hasOnlyErrorsOfType(ref, ErrorCode.SERVICE_OOS)) {
-                    oosReplies.add(idx);
-                }
-                ++idx;
-            }
-            if (context.getNumChildren() - oosReplies.size() >= minOk) {
-                DocumentProtocol.merge(context, oosReplies);
-                return;
-            }
-        }
-        DocumentProtocol.merge(context);
-    }
-
-    @Override
-    public void destroy() {
-        // empty
-    }
-
-    @Override
-    public MetricSet getMetrics() {
-        return null;
-    }
-}
diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/PolicyTestCase.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/PolicyTestCase.java
index ff237d46b90..fba2edf5cfd 100755
--- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/PolicyTestCase.java
+++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/PolicyTestCase.java
@@ -12,8 +12,6 @@ import com.yahoo.messagebus.Error;
 import com.yahoo.messagebus.network.rpc.test.TestServer;
 import com.yahoo.messagebus.routing.*;
 import com.yahoo.messagebus.test.Receptor;
-import com.yahoo.vdslib.DocumentList;
-import com.yahoo.vdslib.Entry;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -60,12 +58,6 @@ public class PolicyTestCase {
         policy = new DocumentProtocol(manager).createPolicy("RoundRobin", null);
         assertTrue(policy instanceof RoundRobinPolicy);
 
-        policy = new DocumentProtocol(manager).createPolicy("SearchRow", null);
-        assertTrue(policy instanceof SearchRowPolicy);
-
-        policy = new DocumentProtocol(manager).createPolicy("SearchColumn", null);
-        assertTrue(policy instanceof SearchColumnPolicy);
-
         policy = new DocumentProtocol(manager).createPolicy("SubsetService", null);
         assertTrue(policy instanceof SubsetServicePolicy);
 
@@ -330,125 +322,6 @@ public class PolicyTestCase {
     }
 
     @Test
-    public void testSearchRow() {
-        PolicyTestFrame frame = new PolicyTestFrame(manager);
-        frame.setMessage(new PutDocumentMessage(new DocumentPut(new Document(manager.getDocumentType("testdoc"),
-                                                             new DocumentId("doc:scheme:")))));
-        frame.setHop(new HopSpec("test", "[SearchRow]").addRecipient("foo"));
-        frame.assertMergeOneReply("foo");
-        frame.setHop(new HopSpec("test", "[SearchRow]").addRecipient("foo").addRecipient("bar"));
-        frame.assertMergeTwoReplies("foo", "bar");
-
-        frame.setHop(new HopSpec("test", "[SearchRow:1]").addRecipient("foo"));
-        Map<String, Integer> replies = new HashMap<>();
-        replies.put("foo", ErrorCode.SERVICE_OOS);
-        frame.assertMergeError(replies, Arrays.asList(ErrorCode.SERVICE_OOS));
-
-        frame.setHop(new HopSpec("test", "[SearchRow:1]").addRecipient("foo").addRecipient("bar"));
-        replies.put("foo", ErrorCode.SERVICE_OOS);
-        replies.put("bar", ErrorCode.NONE);
-        frame.assertMergeOk(replies, Arrays.asList("bar"));
-
-        replies.put("foo", ErrorCode.SERVICE_OOS);
-        replies.put("bar", ErrorCode.SERVICE_OOS);
-        frame.assertMergeError(replies, Arrays.asList(ErrorCode.SERVICE_OOS, ErrorCode.SERVICE_OOS));
-
-        frame.setHop(new HopSpec("test", "[SearchRow:1]").addRecipient("foo").addRecipient("bar").addRecipient("baz"));
-        replies.put("foo", ErrorCode.SERVICE_OOS);
-        replies.put("bar", ErrorCode.NONE);
-        replies.put("baz", ErrorCode.NONE);
-        frame.assertMergeOk(replies, Arrays.asList("bar", "baz"));
-
-        replies.put("foo", ErrorCode.SERVICE_OOS);
-        replies.put("bar", ErrorCode.SERVICE_OOS);
-        replies.put("baz", ErrorCode.NONE);
-        frame.assertMergeOk(replies, Arrays.asList("baz"));
-
-        replies.put("foo", ErrorCode.SERVICE_OOS);
-        replies.put("bar", ErrorCode.SERVICE_OOS);
-        replies.put("baz", ErrorCode.SERVICE_OOS);
-        frame.assertMergeError(replies,
-                               Arrays.asList(ErrorCode.SERVICE_OOS, ErrorCode.SERVICE_OOS, ErrorCode.SERVICE_OOS));
-
-        frame.setHop(new HopSpec("test", "[SearchRow:2]").addRecipient("foo").addRecipient("bar").addRecipient("baz"));
-        replies.put("foo", ErrorCode.SERVICE_OOS);
-        replies.put("bar", ErrorCode.NONE);
-        replies.put("baz", ErrorCode.NONE);
-        frame.assertMergeOk(replies, Arrays.asList("bar", "baz"));
-
-        replies.put("foo", ErrorCode.SERVICE_OOS);
-        replies.put("bar", ErrorCode.SERVICE_OOS);
-        replies.put("baz", ErrorCode.NONE);
-        frame.assertMergeError(replies, Arrays.asList(ErrorCode.SERVICE_OOS, ErrorCode.SERVICE_OOS));
-
-        replies.put("foo", ErrorCode.SERVICE_OOS);
-        replies.put("bar", ErrorCode.SERVICE_OOS);
-        replies.put("baz", ErrorCode.SERVICE_OOS);
-        frame.assertMergeError(replies,
-                               Arrays.asList(ErrorCode.SERVICE_OOS, ErrorCode.SERVICE_OOS, ErrorCode.SERVICE_OOS));
-
-        frame.destroy();
-    }
-
-    @Test
-    public void testSearchRowMerge() {
-        PolicyTestFrame frame = new PolicyTestFrame(manager);
-        frame.setHop(new HopSpec("test", "[SearchRow]").addRecipient("foo"));
-        tryWasFound(frame, 1, 0x0, false);
-        tryWasFound(frame, 1, 0x1, true);
-
-        frame.setHop(new HopSpec("test", "[SearchRow]").addRecipient("foo").addRecipient("bar"));
-        tryWasFound(frame, 2, 0x0, false);
-        tryWasFound(frame, 2, 0x1, true);
-        tryWasFound(frame, 2, 0x2, true);
-        tryWasFound(frame, 2, 0x3, true);
-
-        frame.setHop(new HopSpec("test", "[SearchRow]").addRecipient("foo").addRecipient("bar").addRecipient("baz"));
-        tryWasFound(frame, 3, 0x0, false);
-        tryWasFound(frame, 3, 0x1, true);
-        tryWasFound(frame, 3, 0x2, true);
-        tryWasFound(frame, 3, 0x3, true);
-        tryWasFound(frame, 3, 0x4, true);
-        tryWasFound(frame, 3, 0x5, true);
-        tryWasFound(frame, 3, 0x6, true);
-        tryWasFound(frame, 3, 0x7, true);
-        frame.destroy();
-    }
-
-    private void tryWasFound(PolicyTestFrame frame, int expectedRecipients,
-                             int foundMask, boolean expectedFound)
-    {
-        {
-            frame.setMessage(new RemoveDocumentMessage(new DocumentId("doc:scheme:69")));
-            List<RoutingNode> selected = frame.select(expectedRecipients);
-            for (int i = 0, len = selected.size(); i < len; ++i) {
-                RemoveDocumentReply reply = new RemoveDocumentReply();
-                reply.setWasFound(((1 << i) & foundMask) != 0);
-                selected.get(i).handleReply(reply);
-            }
-            Reply reply = frame.getReceptor().getReply(TIMEOUT);
-            assertNotNull(reply);
-            assertEquals(DocumentProtocol.REPLY_REMOVEDOCUMENT, reply.getType());
-            assertEquals(expectedFound, ((RemoveDocumentReply)reply).wasFound());
-        }
-        {
-            DocumentUpdate  upd = new DocumentUpdate(manager.getDocumentType("testdoc"),
-                                                     new DocumentId("doc:scheme:"));
-            frame.setMessage(new UpdateDocumentMessage(upd));
-            List<RoutingNode> selected = frame.select(expectedRecipients);
-            for (int i = 0, len = selected.size(); i < len; ++i) {
-                UpdateDocumentReply reply = new UpdateDocumentReply();
-                reply.setWasFound(((1 << i) & foundMask) != 0);
-                selected.get(i).handleReply(reply);
-            }
-            Reply reply = frame.getReceptor().getReply(TIMEOUT);
-            assertNotNull(reply);
-            assertEquals(DocumentProtocol.REPLY_UPDATEDOCUMENT, reply.getType());
-            assertEquals(expectedFound, ((UpdateDocumentReply)reply).wasFound());
-        }
-    }
-
-    @Test
     public void multipleGetRepliesAreMergedToFoundDocument() {
         PolicyTestFrame frame = new PolicyTestFrame(manager);
         frame.setHop(new HopSpec("test", getDocumentRouteSelectorRawConfig())
@@ -483,74 +356,6 @@ public class PolicyTestCase {
                 "route[1].feed \"myfeed\"\n]";
     }
 
-    @Test
-    public void testSearchColumn() {
-        PolicyTestFrame frame = new PolicyTestFrame(manager);
-        frame.setHop(new HopSpec("test", "[SearchColumn]")
-                .addRecipient("c0").addRecipient("c1")
-                .addRecipient("c2").addRecipient("c3"));
-
-        // Test hash distribution.
-        assertDistribution(frame, "doc:ns:3", "c0");
-        assertDistribution(frame, "doc:ns:18", "c1");
-        assertDistribution(frame, "doc:ns:0", "c2");
-        assertDistribution(frame, "doc:ns:4", "c3");
-
-        assertDistribution(frame, "userdoc:ns:49152:0", "c0");
-        assertDistribution(frame, "userdoc:ns:49152:1", "c0");
-        assertDistribution(frame, "userdoc:ns:16384:2", "c1");
-        assertDistribution(frame, "userdoc:ns:16384:3", "c1");
-        assertDistribution(frame, "userdoc:ns:5461:4", "c2");
-        assertDistribution(frame, "userdoc:ns:5461:5", "c2");
-        assertDistribution(frame, "userdoc:ns:0:6", "c3");
-        assertDistribution(frame, "userdoc:ns:0:7", "c3");
-
-        assertDistribution(frame, "groupdoc:ns:0:0", "c0");
-        assertDistribution(frame, "groupdoc:ns:0:1", "c0");
-        assertDistribution(frame, "groupdoc:ns:4:2", "c1");
-        assertDistribution(frame, "groupdoc:ns:4:3", "c1");
-        assertDistribution(frame, "groupdoc:ns:2:4", "c2");
-        assertDistribution(frame, "groupdoc:ns:2:5", "c2");
-        assertDistribution(frame, "groupdoc:ns:7:6", "c3");
-        assertDistribution(frame, "groupdoc:ns:7:7", "c3");
-
-        // Test routing based on message type.
-        Message put = new PutDocumentMessage(new DocumentPut(new Document(manager.getDocumentType("testdoc"),
-                                                          new DocumentId("doc:scheme:"))));
-        frame.setHop(new HopSpec("test", "[SearchColumn]").addRecipient("c0").addRecipient("c1"));
-        frame.setMessage(put);
-        frame.assertMergeOneReply("c0");
-
-        // Test allowed bad parts.
-        frame.setHop(new HopSpec("test", "[SearchColumn:1]").addRecipient("c0"));
-        frame.setMessage(put);
-        Map<String, Integer> replies = new HashMap<>();
-        replies.put("c0", ErrorCode.SERVICE_OOS);
-        frame.assertMergeOk(replies, null);
-
-        replies.put("c0", ErrorCode.SERVICE_OOS);
-        frame.assertMergeOk(replies, null);
-
-        frame.setHop(new HopSpec("test", "[SearchColumn:1]").addRecipient("c0").addRecipient("c1"));
-        frame.setMessage(put);
-        replies.put("c0", ErrorCode.SERVICE_OOS);
-        frame.assertMergeOk(replies, null);
-
-        frame.setHop(new HopSpec("test", "[SearchColumn:1]").addRecipient("c0").addRecipient("c1").addRecipient("c2"));
-        frame.setMessage(put);
-        replies.clear();
-        replies.put("c0", ErrorCode.SERVICE_OOS);
-        frame.assertMergeOk(replies, null);
-
-        frame.setHop(new HopSpec("test", "[SearchColumn:2]").addRecipient("c0").addRecipient("c1").addRecipient("c2"));
-        frame.setMessage(put);
-        replies.clear();
-        replies.put("c0", ErrorCode.SERVICE_OOS);
-        frame.assertMergeOk(replies, null);
-
-        frame.destroy();
-    }
-
     private void assertDistribution(PolicyTestFrame frame, String id, String expected) {
         frame.setMessage(new PutDocumentMessage(new DocumentPut(new Document(manager.getDocumentType("testdoc"),
                                                              new DocumentId(id)))));