Remove the use and testing of legacy groupdoc/userdoc/orderdoc document ids.

12 files changed, 8 insertions, 72 deletions

diff --git a/documentapi/src/main/java/com/yahoo/documentapi/VisitorParameters.java b/documentapi/src/main/java/com/yahoo/documentapi/VisitorParameters.java
index df0e0f0abdd..c7c1773a517 100644
--- a/documentapi/src/main/java/com/yahoo/documentapi/VisitorParameters.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/VisitorParameters.java
@@ -356,7 +356,7 @@ public class VisitorParameters extends Parameters {
     }
 
     public String toString() {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         sb.append("VisitorParameters(\n")
                 .append("  Document selection: ").append(documentSelection).append('\n')
                 .append("  Bucket space:       ").append(bucketSpace).append('\n')
@@ -382,7 +382,6 @@ public class VisitorParameters extends Parameters {
         sb.append("  Weight:             ").append(weight).append('\n');
         sb.append("  Max firstpass hits: ").append(maxFirstPassHits).append('\n');
         sb.append("  Max total hits:     ").append(maxTotalHits).append('\n');
-        sb.append("  Visitor ordering:   ").append(visitorOrdering).append('\n');
         sb.append("  Max buckets:        ").append(maxBucketsPerVisitor).append('\n');
         sb.append("  Priority:           ").append(getPriority().toString()).append('\n');
         if (dynamicallyIncreaseMaxBucketsPerVisitor) {
diff --git a/documentapi/src/test/java/com/yahoo/documentapi/VisitorParametersTestCase.java b/documentapi/src/test/java/com/yahoo/documentapi/VisitorParametersTestCase.java
index 181253c4377..61e0c9ba8b3 100644
--- a/documentapi/src/test/java/com/yahoo/documentapi/VisitorParametersTestCase.java
+++ b/documentapi/src/test/java/com/yahoo/documentapi/VisitorParametersTestCase.java
@@ -24,7 +24,6 @@ public class VisitorParametersTestCase {
         params.setTimeoutMs(1337);
         params.setMaxPending(111);
         params.setFieldSet("[header]");
-        params.setVisitorOrdering(123);
         params.setLoadType(loadType);
         params.setVisitRemoves(true);
         params.setVisitInconsistentBuckets(true);
@@ -61,7 +60,6 @@ public class VisitorParametersTestCase {
         assertEquals(1337, copy.getTimeoutMs());
         assertEquals(111, copy.getMaxPending());
         assertEquals("[header]", copy.getFieldSet());
-        assertEquals(123, copy.getVisitorOrdering());
         assertEquals(loadType, copy.getLoadType());
         assertEquals(true, copy.getVisitRemoves());
         assertEquals(true, copy.getVisitInconsistentBuckets());
@@ -105,7 +103,6 @@ public class VisitorParametersTestCase {
                 "  Weight:             1.0\n" +
                 "  Max firstpass hits: 555\n" +
                 "  Max total hits:     777\n" +
-                "  Visitor ordering:   123\n" +
                 "  Max buckets:        55\n" +
                 "  Priority:           HIGHEST\n" +
                 "  Dynamically increasing max buckets per visitor\n" +
diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/Messages60TestCase.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/Messages60TestCase.java
index ac09acf646c..3c28b3b84c9 100644
--- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/Messages60TestCase.java
+++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/Messages60TestCase.java
@@ -12,7 +12,6 @@ import com.yahoo.document.GlobalId;
 import com.yahoo.document.TestAndSetCondition;
 import com.yahoo.document.fieldpathupdate.RemoveFieldPathUpdate;
 import com.yahoo.document.idstring.IdString;
-import com.yahoo.document.select.OrderingSpecification;
 import com.yahoo.documentapi.messagebus.protocol.CreateVisitorMessage;
 import com.yahoo.documentapi.messagebus.protocol.CreateVisitorReply;
 import com.yahoo.documentapi.messagebus.protocol.DestroyVisitorMessage;
@@ -208,7 +207,6 @@ public class Messages60TestCase extends MessagesTestBase {
             msg.getBuckets().add(new BucketId(16, 1234));
             msg.setVisitRemoves(true);
             msg.setFieldSet("foo bar");
-            msg.setVisitorOrdering(OrderingSpecification.DESCENDING);
             msg.setMaxBucketsPerVisitor(2);
             msg.setBucketSpace(BUCKET_SPACE);
             assertEquals(BASE_MESSAGE_LENGTH + 178 + serializedLength(BUCKET_SPACE), serialize("CreateVisitorMessage", msg));
@@ -228,7 +226,6 @@ public class Messages60TestCase extends MessagesTestBase {
                 assertEquals(new BucketId(16, 1234), msg.getBuckets().iterator().next());
                 assertEquals("somevalue", Utf8.toString(msg.getParameters().get("myvar")));
                 assertEquals("34", Utf8.toString(msg.getParameters().get("anothervar")));
-                assertEquals(OrderingSpecification.DESCENDING, msg.getVisitorOrdering());
                 assertEquals(2, msg.getMaxBucketsPerVisitor());
                 assertEquals(BUCKET_SPACE, msg.getBucketSpace());
             }
@@ -370,13 +367,13 @@ public class Messages60TestCase extends MessagesTestBase {
         @Override
         public void run() {
             DocumentListMessage msg = (DocumentListMessage)deserialize("DocumentListMessage", DocumentProtocol.MESSAGE_DOCUMENTLIST, Language.CPP);
-            assertEquals("userdoc:scheme:1234:", msg.getDocuments().get(0).getDocument().getId().toString());
+            assertEquals("id:scheme:testdoc:n=1234:1", msg.getDocuments().get(0).getDocument().getId().toString());
             assertEquals(1234, msg.getDocuments().get(0).getTimestamp());
             assertFalse(msg.getDocuments().get(0).isRemoveEntry());
 
-            assertEquals(BASE_MESSAGE_LENGTH + 63, serialize("DocumentListMessage", msg));
+            assertEquals(BASE_MESSAGE_LENGTH + 69, serialize("DocumentListMessage", msg));
             msg = (DocumentListMessage)deserialize("DocumentListMessage", DocumentProtocol.MESSAGE_DOCUMENTLIST, Language.JAVA);
-            assertEquals("userdoc:scheme:1234:", msg.getDocuments().get(0).getDocument().getId().toString());
+            assertEquals("id:scheme:testdoc:n=1234:1", msg.getDocuments().get(0).getDocument().getId().toString());
             assertEquals(1234, msg.getDocuments().get(0).getTimestamp());
             assertFalse(msg.getDocuments().get(0).isRemoveEntry());
 
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 cb32ce75e03..53980242f2c 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
@@ -410,17 +410,6 @@ public class PolicyTestCase {
     }
 
     @Test
-    public void remove_document_messages_with_legacy_document_ids_are_sent_to_all_routes() {
-        PolicyTestFrame frame = createFrameWithTwoRoutes();
-
-        frame.setMessage(createRemove("userdoc:testdoc:1234:1"));
-        frame.assertSelect(Arrays.asList("testdoc-route", "other-route"));
-
-        frame.setMessage(createRemove("userdoc:other:1234:1"));
-        frame.assertSelect(Arrays.asList("testdoc-route", "other-route"));
-    }
-
-    @Test
     public void get_document_messages_are_sent_to_the_route_handling_the_given_document_type() {
         PolicyTestFrame frame = createFrameWithTwoRoutes();
 
@@ -431,17 +420,6 @@ public class PolicyTestCase {
         frame.assertSelect(Arrays.asList("other-route"));
     }
 
-    @Test
-    public void get_document_messages_with_legacy_document_ids_are_sent_to_all_routes() {
-        PolicyTestFrame frame = createFrameWithTwoRoutes();
-
-        frame.setMessage(createGet("userdoc:testdoc:1234:1"));
-        frame.assertSelect(Arrays.asList("testdoc-route", "other-route"));
-
-        frame.setMessage(createGet("userdoc:other:1234:1"));
-        frame.assertSelect(Arrays.asList("testdoc-route", "other-route"));
-    }
-
     private PolicyTestFrame createFrameWithTwoRoutes() {
         PolicyTestFrame result = new PolicyTestFrame(manager);
         result.setHop(new HopSpec("test", createDocumentRouteSelectorConfigWithTwoRoutes())
diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/storagepolicy/StoragePolicyTestEnvironment.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/storagepolicy/StoragePolicyTestEnvironment.java
index 6a3e6a172c3..00a045367bb 100644
--- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/storagepolicy/StoragePolicyTestEnvironment.java
+++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/storagepolicy/StoragePolicyTestEnvironment.java
@@ -53,7 +53,7 @@ public abstract class StoragePolicyTestEnvironment {
         DocumentProtocol protocol = (DocumentProtocol) frame.getMessageBus().getProtocol((Utf8Array)DocumentProtocol.NAME);
         policyFactory = new StoragePolicyTestFactory(nodes);
         protocol.putRoutingPolicyFactory("storage", policyFactory);
-        frame.setMessage(createMessage("userdoc:ns:1:foo"));
+        frame.setMessage(createMessage("id:ns:testdoc:n=1:foo"));
         frame.setHop(new HopSpec("test", "[storage:cluster=foo]"));
     }
 
diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/test/MessageBusVisitorSessionTestCase.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/test/MessageBusVisitorSessionTestCase.java
index 874066d50a3..161c06bce27 100755
--- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/test/MessageBusVisitorSessionTestCase.java
+++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/test/MessageBusVisitorSessionTestCase.java
@@ -493,9 +493,6 @@ public class MessageBusVisitorSessionTestCase {
         if (msg.getRoute() != null && !"storage".equals(msg.getRoute().toString())) {
             sb.append("route=").append(msg.getRoute()).append("\n");
         }
-        if (msg.getVisitorOrdering() != 0) {
-            sb.append("ordering=").append(msg.getVisitorOrdering()).append("\n");
-        }
         if (msg.getMaxBucketsPerVisitor() != 1) {
             sb.append("max buckets per visitor=").append(msg.getMaxBucketsPerVisitor()).append("\n");
         }
@@ -716,7 +713,6 @@ public class MessageBusVisitorSessionTestCase {
         params.setTimeoutMs(1337);
         params.setMaxPending(111);
         params.setFieldSet("[header]");
-        params.setVisitorOrdering(123);
         params.setLoadType(new LoadType(3, "samnmax", DocumentProtocol.Priority.HIGH_3));
         params.setVisitRemoves(true);
         params.setVisitInconsistentBuckets(true);
@@ -747,7 +743,6 @@ public class MessageBusVisitorSessionTestCase {
                 "ninja -> turtles\n" +
                 "]\n" +
                 "route=extraterrestrial/highway\n" +
-                "ordering=123\n" +
                 "max buckets per visitor=55\n" +
                 "load type=samnmax\n" +
                 "priority=HIGHEST\n" +
diff --git a/documentapi/src/tests/messages/messages60test.cpp b/documentapi/src/tests/messages/messages60test.cpp
index 2fdb4c12fd0..2e2b5ad3d1c 100644
--- a/documentapi/src/tests/messages/messages60test.cpp
+++ b/documentapi/src/tests/messages/messages60test.cpp
@@ -161,7 +161,6 @@ Messages60Test::testCreateVisitorMessage()
     tmp.getBuckets().push_back(document::BucketId(16, 1234));
     tmp.setVisitRemoves(true);
     tmp.setFieldSet("foo bar");
-    tmp.setVisitorOrdering(document::OrderingSpecification::DESCENDING);
     tmp.setMaxBucketsPerVisitor(2);
     tmp.setBucketSpace("bjarne");
 
@@ -185,7 +184,6 @@ Messages60Test::testCreateVisitorMessage()
             EXPECT_EQUAL(document::BucketId(16, 1234), ref.getBuckets()[0]);
             EXPECT_EQUAL(string("somevalue"), ref.getParameters().get("myvar"));
             EXPECT_EQUAL(uint64_t(34), ref.getParameters().get("anothervar", uint64_t(1)));
-            EXPECT_EQUAL(document::OrderingSpecification::DESCENDING, ref.getVisitorOrdering());
             EXPECT_EQUAL(uint32_t(2), ref.getMaxBucketsPerVisitor());
             EXPECT_EQUAL(string("bjarne"), ref.getBucketSpace());
         }
@@ -214,20 +212,20 @@ bool
 Messages60Test::testDocumentListMessage()
 {
     document::Document::SP doc =
-        createDoc(getTypeRepo(), "testdoc", "userdoc:scheme:1234:");
+        createDoc(getTypeRepo(), "testdoc", "id:scheme:testdoc:n=1234:1");
     DocumentListMessage::Entry entry(1234, doc, false);
 
     DocumentListMessage tmp(document::BucketId(16, 1234));
     tmp.getDocuments().push_back(entry);
 
-    EXPECT_EQUAL(MESSAGE_BASE_LENGTH + (size_t)63, serialize("DocumentListMessage", tmp));
+    EXPECT_EQUAL(MESSAGE_BASE_LENGTH + (size_t)69, serialize("DocumentListMessage", tmp));
 
     for (uint32_t lang = 0; lang < NUM_LANGUAGES; ++lang) {
         mbus::Routable::UP obj = deserialize("DocumentListMessage", DocumentProtocol::MESSAGE_DOCUMENTLIST, lang);
         if (EXPECT_TRUE(obj.get() != NULL)) {
             DocumentListMessage &ref = static_cast<DocumentListMessage&>(*obj);
 
-            EXPECT_EQUAL("userdoc:scheme:1234:", ref.getDocuments()[0].getDocument()->getId().toString());
+            EXPECT_EQUAL("id:scheme:testdoc:n=1234:1", ref.getDocuments()[0].getDocument()->getId().toString());
             EXPECT_EQUAL(1234, ref.getDocuments()[0].getTimestamp());
             EXPECT_TRUE(!ref.getDocuments()[0].isRemoveEntry());
         }
diff --git a/documentapi/src/tests/policies/policies_test.cpp b/documentapi/src/tests/policies/policies_test.cpp
index 7c93e186338..9d3e49e226d 100644
--- a/documentapi/src/tests/policies/policies_test.cpp
+++ b/documentapi/src/tests/policies/policies_test.cpp
@@ -65,9 +65,7 @@ public:
     void testDocumentRouteSelector();
     void testDocumentRouteSelectorIgnore();
     void remove_document_messages_are_sent_to_the_route_handling_the_given_document_type();
-    void remove_document_messages_with_legacy_document_ids_are_sent_to_all_routes();
     void get_document_messages_are_sent_to_the_route_handling_the_given_document_type();
-    void get_document_messages_with_legacy_document_ids_are_sent_to_all_routes();
     void testExternSend();
     void testExternMultipleSlobroks();
     void testLoadBalancer();
@@ -109,9 +107,7 @@ Test::Main() {
     testDocumentRouteSelector();        TEST_FLUSH();
     testDocumentRouteSelectorIgnore();  TEST_FLUSH();
     remove_document_messages_are_sent_to_the_route_handling_the_given_document_type(); TEST_FLUSH();
-    remove_document_messages_with_legacy_document_ids_are_sent_to_all_routes();        TEST_FLUSH();
     get_document_messages_are_sent_to_the_route_handling_the_given_document_type(); TEST_FLUSH();
-    get_document_messages_with_legacy_document_ids_are_sent_to_all_routes();        TEST_FLUSH();
     testExternSend();                   TEST_FLUSH();
     testExternMultipleSlobroks();       TEST_FLUSH();
     testLoadBalancer();                 TEST_FLUSH();
@@ -710,18 +706,6 @@ Test::remove_document_messages_are_sent_to_the_route_handling_the_given_document
 }
 
 void
-Test::remove_document_messages_with_legacy_document_ids_are_sent_to_all_routes()
-{
-    auto frame = createFrameWithTwoRoutes(_repo);
-
-    frame->setMessage(makeRemove("userdoc:testdoc:1234:1"));
-    EXPECT_TRUE(frame->testSelect({"testdoc-route", "other-route"}));
-
-    frame->setMessage(makeRemove("userdoc:other:1234:1"));
-    EXPECT_TRUE(frame->testSelect({"testdoc-route", "other-route"}));
-}
-
-void
 Test::get_document_messages_are_sent_to_the_route_handling_the_given_document_type()
 {
     auto frame = createFrameWithTwoRoutes(_repo);
@@ -733,18 +717,6 @@ Test::get_document_messages_are_sent_to_the_route_handling_the_given_document_ty
     EXPECT_TRUE(frame->testSelect({"other-route"}));
 }
 
-void
-Test::get_document_messages_with_legacy_document_ids_are_sent_to_all_routes()
-{
-    auto frame = createFrameWithTwoRoutes(_repo);
-
-    frame->setMessage(makeGet("userdoc:testdoc:1234:1"));
-    EXPECT_TRUE(frame->testSelect({"testdoc-route", "other-route"}));
-
-    frame->setMessage(makeGet("userdoc:other:1234:1"));
-    EXPECT_TRUE(frame->testSelect({"testdoc-route", "other-route"}));
-}
-
 namespace {
     string getDefaultDistributionConfig(
                     uint16_t redundancy = 2, uint16_t nodeCount = 10,
diff --git a/documentapi/test/crosslanguagefiles/6.221-cpp-CreateVisitorMessage.dat b/documentapi/test/crosslanguagefiles/6.221-cpp-CreateVisitorMessage.dat
index b249c8030e4..27e64170701 100644
--- a/documentapi/test/crosslanguagefiles/6.221-cpp-CreateVisitorMessage.dat
+++ b/documentapi/test/crosslanguagefiles/6.221-cpp-CreateVisitorMessage.dat
diff --git a/documentapi/test/crosslanguagefiles/6.221-cpp-DocumentListMessage.dat b/documentapi/test/crosslanguagefiles/6.221-cpp-DocumentListMessage.dat
index 2d8d12d2704..12c0d06ff4d 100644
--- a/documentapi/test/crosslanguagefiles/6.221-cpp-DocumentListMessage.dat
+++ b/documentapi/test/crosslanguagefiles/6.221-cpp-DocumentListMessage.dat
diff --git a/documentapi/test/crosslanguagefiles/6.221-java-CreateVisitorMessage.dat b/documentapi/test/crosslanguagefiles/6.221-java-CreateVisitorMessage.dat
index b249c8030e4..27e64170701 100644
--- a/documentapi/test/crosslanguagefiles/6.221-java-CreateVisitorMessage.dat
+++ b/documentapi/test/crosslanguagefiles/6.221-java-CreateVisitorMessage.dat
diff --git a/documentapi/test/crosslanguagefiles/6.221-java-DocumentListMessage.dat b/documentapi/test/crosslanguagefiles/6.221-java-DocumentListMessage.dat
index 2d8d12d2704..12c0d06ff4d 100644
--- a/documentapi/test/crosslanguagefiles/6.221-java-DocumentListMessage.dat
+++ b/documentapi/test/crosslanguagefiles/6.221-java-DocumentListMessage.dat