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

2 files changed, 12 insertions, 69 deletions

diff --git a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcherTestCase.java
index b656a509683..9dd6aae9e7b 100644
--- a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcherTestCase.java
@@ -35,8 +35,8 @@ import static org.junit.Assert.assertFalse;
  * @author <a href="mailto:ulf@yahoo-inc.com">Ulf Carlin</a>
  */
 public class VdsStreamingSearcherTestCase {
-    public static final String USERDOC_ID_PREFIX = "userdoc:namespace:1:userspecific";
-    public static final String GROUPDOC_ID_PREFIX = "groupdoc:namespace:group1:userspecific";
+    public static final String USERDOC_ID_PREFIX = "id:namespace:mytype:n=1:userspecific";
+    public static final String GROUPDOC_ID_PREFIX = "id:namespace:mytype:g=group1:userspecific";
 
     private static class MockVisitor implements Visitor {
         private final Query query;
@@ -236,14 +236,10 @@ public class VdsStreamingSearcherTestCase {
         Query generalQuery = new Query("/?streaming.selection=true&query=test");
         Query user1Query = new Query("/?streaming.userid=1&query=test");
         Query group1Query = new Query("/?streaming.groupname=group1&query=test");
-        String userId1 = "userdoc:namespace:1:userspecific";
-        String userId2 = "userdoc:namespace:2:userspecific";
-        String groupId1 = "groupdoc:namespace:group1:userspecific";
-        String groupId2 = "groupdoc:namespace:group2:userspecific";
-        String orderIdGroup1 = "orderdoc(3,1):storage_test:group1:0:userspecific";
-        String orderIdGroup2 = "orderdoc(5,2):storage_test:group2:0:userspecific";
-        String orderIdUser1 = "orderdoc(3,1):storage_test:1:0:userspecific";
-        String orderIdUser2 = "orderdoc(5,2):storage_test:2:0:userspecific";
+        String userId1 = "id:namespace:mytype:n=1:userspecific";
+        String userId2 = "id:namespace:mytype:n=2:userspecific";
+        String groupId1 = "id:namespace:mytype:g=group1:userspecific";
+        String groupId2 = "id:namespace:mytype:g=group2:userspecific";
         String badId = "unknowscheme:namespace:something";
 
         assertTrue(VdsStreamingSearcher.verifyDocId(userId1, generalQuery, true));
@@ -252,30 +248,18 @@ public class VdsStreamingSearcherTestCase {
         assertTrue(VdsStreamingSearcher.verifyDocId(userId2, generalQuery, false));
         assertTrue(VdsStreamingSearcher.verifyDocId(groupId1, generalQuery, false));
         assertTrue(VdsStreamingSearcher.verifyDocId(groupId2, generalQuery, false));
-        assertTrue(VdsStreamingSearcher.verifyDocId(orderIdGroup1, generalQuery, false));
-        assertTrue(VdsStreamingSearcher.verifyDocId(orderIdGroup2, generalQuery, false));
-        assertTrue(VdsStreamingSearcher.verifyDocId(orderIdUser1, generalQuery, false));
-        assertTrue(VdsStreamingSearcher.verifyDocId(orderIdUser2, generalQuery, false));
         assertFalse(VdsStreamingSearcher.verifyDocId(badId, generalQuery, false));
 
         assertTrue(VdsStreamingSearcher.verifyDocId(userId1, user1Query, false));
         assertFalse(VdsStreamingSearcher.verifyDocId(userId2, user1Query, false));
         assertFalse(VdsStreamingSearcher.verifyDocId(groupId1, user1Query, false));
         assertFalse(VdsStreamingSearcher.verifyDocId(groupId2, user1Query, false));
-        assertFalse(VdsStreamingSearcher.verifyDocId(orderIdGroup1, user1Query, false));
-        assertFalse(VdsStreamingSearcher.verifyDocId(orderIdGroup2, user1Query, false));
-        assertTrue(VdsStreamingSearcher.verifyDocId(orderIdUser1, user1Query, false));
-        assertFalse(VdsStreamingSearcher.verifyDocId(orderIdUser2, user1Query, false));
         assertFalse(VdsStreamingSearcher.verifyDocId(badId, user1Query, false));
 
         assertFalse(VdsStreamingSearcher.verifyDocId(userId1, group1Query, false));
         assertFalse(VdsStreamingSearcher.verifyDocId(userId2, group1Query, false));
         assertTrue(VdsStreamingSearcher.verifyDocId(groupId1, group1Query, false));
         assertFalse(VdsStreamingSearcher.verifyDocId(groupId2, group1Query, false));
-        assertTrue(VdsStreamingSearcher.verifyDocId(orderIdGroup1, group1Query, false));
-        assertFalse(VdsStreamingSearcher.verifyDocId(orderIdGroup2, group1Query, false));
-        assertFalse(VdsStreamingSearcher.verifyDocId(orderIdUser1, group1Query, false));
-        assertFalse(VdsStreamingSearcher.verifyDocId(orderIdUser2, group1Query, false));
         assertFalse(VdsStreamingSearcher.verifyDocId(badId, group1Query, false));
     }
 
diff --git a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsVisitorTestCase.java b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsVisitorTestCase.java
index d7fc53a6c00..9c8feedf111 100644
--- a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsVisitorTestCase.java
+++ b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsVisitorTestCase.java
@@ -1,7 +1,6 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.streamingvisitors;
 
-import com.yahoo.document.select.OrderingSpecification;
 import com.yahoo.document.select.parser.ParseException;
 import com.yahoo.documentapi.*;
 import com.yahoo.documentapi.messagebus.loadtypes.LoadType;
@@ -118,7 +117,6 @@ public class VdsVisitorTestCase {
         long to = 0;
         String loadTypeName = null;
         DocumentProtocol.Priority priority = null;
-        String ordering = null;
         int maxBucketsPerVisitor = 0;
 
         // Parameters in query object
@@ -143,7 +141,6 @@ public class VdsVisitorTestCase {
             to = 456;
             loadTypeName = "low";
             priority = DocumentProtocol.Priority.HIGH_2;
-            ordering = "-";
             maxBucketsPerVisitor = 2;
 
             defineGrouping = true;
@@ -202,9 +199,6 @@ public class VdsVisitorTestCase {
         if (qa.priority != null) {
             queryString.append("&streaming.priority=").append(qa.priority);
         }
-        if (qa.ordering != null) {
-            queryString.append("&streaming.ordering=").append(URLEncoder.encode(qa.ordering, "UTF-8"));
-        }
         if (qa.maxBucketsPerVisitor != 0) {
             queryString.append("&streaming.maxbucketspervisitor=").append(qa.maxBucketsPerVisitor);
         }
@@ -249,25 +243,13 @@ public class VdsVisitorTestCase {
                 assertEquals(DocumentProtocol.Priority.VERY_HIGH, params.getPriority());
             }
         }
-        if (qa.ordering != null) {
-            assertEquals(VdsVisitor.getOrdering(qa.ordering), params.getVisitorOrdering());
-            assertEquals(qa.offset+qa.hits, params.getMaxFirstPassHits());
-            if (qa.maxBucketsPerVisitor != 0) {
-                assertEquals(qa.maxBucketsPerVisitor, params.getMaxBucketsPerVisitor());
-            } else {
-                assertEquals(1, params.getMaxBucketsPerVisitor());
-            }
-            assertEquals(true, params.getDynamicallyIncreaseMaxBucketsPerVisitor());
+        assertEquals(-1, params.getMaxFirstPassHits());
+        if (qa.maxBucketsPerVisitor != 0) {
+            assertEquals(qa.maxBucketsPerVisitor, params.getMaxBucketsPerVisitor());
         } else {
-            assertEquals(0, params.getVisitorOrdering());
-            assertEquals(-1, params.getMaxFirstPassHits());
-            if (qa.maxBucketsPerVisitor != 0) {
-                assertEquals(qa.maxBucketsPerVisitor, params.getMaxBucketsPerVisitor());
-            } else {
-                assertEquals(Integer.MAX_VALUE, params.getMaxBucketsPerVisitor());
-            }
-            assertEquals(false, params.getDynamicallyIncreaseMaxBucketsPerVisitor());
+            assertEquals(Integer.MAX_VALUE, params.getMaxBucketsPerVisitor());
         }
+        assertEquals(false, params.getDynamicallyIncreaseMaxBucketsPerVisitor());
 
         // Verify parameters based only on query
         assertEquals(qa.timeout*1000, params.getTimeoutMs(),0.0000001);
@@ -337,18 +319,6 @@ public class VdsVisitorTestCase {
     }
 
     @Test
-    public void testGetOrdering() {
-        assertEquals(OrderingSpecification.ASCENDING, VdsVisitor.getOrdering("+"));
-        assertEquals(OrderingSpecification.DESCENDING, VdsVisitor.getOrdering("-"));
-        try {
-            VdsVisitor.getOrdering("illegalValue");
-            assertTrue("Method expected to throw RuntimeException", false);
-        } catch (RuntimeException e) {
-            assertEquals("Ordering must be on the format {+/-}", e.getMessage());
-        }
-    }
-
-    @Test
     public void testBasics() throws Exception {
         Route route = Route.parse("storageClusterRouteSpec");
         String searchCluster = "searchClusterConfigId";
@@ -360,7 +330,7 @@ public class VdsVisitorTestCase {
 
         // Groupdoc
         qa.groupName = "group";
-        qa.maxBucketsPerVisitor = 2; // default ordering, non-default maxBucketsPerVisitor
+        qa.maxBucketsPerVisitor = 2; // non-default maxBucketsPerVisitor
         qa.loadTypeName = "normal"; // non-default loadTypeName, default priority
         verifyVisitorOk(factory, qa, route, searchCluster);
 
@@ -370,17 +340,6 @@ public class VdsVisitorTestCase {
         qa.priority = DocumentProtocol.Priority.NORMAL_2; // unknown loadTypeName, non-default priority
         verifyVisitorOk(factory, qa, route, searchCluster);
 
-        // Orderdoc
-        qa.groupName = null;
-        qa.selection = "id.group==\"group1\" and id.order(3,1)>=0";
-        qa.ordering = "+"; // non-default ordering, default maxBucketsPerVisitor
-        qa.maxBucketsPerVisitor = 0;
-        qa.loadTypeName = null; // default loadTypeName, non-default priority
-        verifyVisitorOk(factory, qa, route, searchCluster);
-        qa.selection = "";
-
-        verifyVisitorOk(factory, qa, route, searchCluster);
-
         // Userdoc and lots of non-default parameters
         qa.setNonDefaults();
         verifyVisitorOk(factory, qa, route, searchCluster);