Remove visitor ordering and order selection.

2 files changed, 2 insertions, 24 deletions

diff --git a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcher.java b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcher.java
index 0fd3d5b5aa1..827fcb885df 100644
--- a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcher.java
+++ b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcher.java
@@ -273,8 +273,7 @@ public class VdsStreamingSearcher extends VespaBackEndSearcher {
             if (docId.getScheme().hasNumber()) {
                 userId = docId.getScheme().getNumber();
             } else {
-                log.log(logLevel, "Got result with wrong scheme (expected " + IdString.Scheme.userdoc +
-                        " or " + IdString.Scheme.orderdoc + ") in document ID (" + id + ") for " + query);
+                log.log(logLevel, "Got result with wrong scheme  in document ID (" + id + ") for " + query);
                 return false;
             }
             if (new BigInteger(expUserId).longValue() != userId) {
@@ -288,8 +287,7 @@ public class VdsStreamingSearcher extends VespaBackEndSearcher {
             if (docId.getScheme().hasGroup()) {
                 groupName = docId.getScheme().getGroup();
             } else {
-                log.log(logLevel, "Got result with wrong scheme (expected " + IdString.Scheme.groupdoc +
-                        " or " + IdString.Scheme.orderdoc + ") in document ID (" + id + ") for " + query);
+                log.log(logLevel, "Got result with wrong scheme  in document ID (" + id + ") for " + query);
                 return false;
             }
             if (!expGroupName.equals(groupName)) {
diff --git a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsVisitor.java b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsVisitor.java
index 32b48f0f8ae..628c24fffd1 100644
--- a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsVisitor.java
+++ b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsVisitor.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.AckToken;
 import com.yahoo.documentapi.DocumentAccess;
@@ -62,7 +61,6 @@ class VdsVisitor extends VisitorDataHandler implements Visitor {
     private static final CompoundName streamingTotimestamp=new CompoundName("streaming.totimestamp");
     private static final CompoundName streamingLoadtype=new CompoundName("streaming.loadtype");
     private static final CompoundName streamingPriority=new CompoundName("streaming.priority");
-    private static final CompoundName streamingOrdering=new CompoundName("streaming.ordering");
     private static final CompoundName streamingMaxbucketspervisitor=new CompoundName("streaming.maxbucketspervisitor");
 
     private static final Logger log = Logger.getLogger(VdsVisitor.class.getName());
@@ -75,16 +73,6 @@ class VdsVisitor extends VisitorDataHandler implements Visitor {
     private Query query = null;
     private VisitorSessionFactory visitorSessionFactory;
 
-    static int getOrdering(String ordering) {
-        if (ordering.equals("+")) {
-            return OrderingSpecification.ASCENDING;
-        } else if (ordering.equals("-")) {
-            return OrderingSpecification.DESCENDING;
-        } else {
-            throw new RuntimeException("Ordering must be on the format {+/-}");
-        }
-    }
-
     public interface VisitorSessionFactory {
         VisitorSession createVisitorSession(VisitorParameters params) throws ParseException;
         LoadTypeSet getLoadTypeSet();
@@ -210,14 +198,6 @@ class VdsVisitor extends VisitorDataHandler implements Visitor {
         params.setTraceLevel(inferSessionTraceLevel(query));
 
 
-        String ordering = query.properties().getString(streamingOrdering);
-        if (ordering != null) {
-            params.setVisitorOrdering(getOrdering(ordering));
-            params.setMaxFirstPassHits(query.getOffset() + query.getHits());
-            params.setMaxBucketsPerVisitor(1);
-            params.setDynamicallyIncreaseMaxBucketsPerVisitor(true);
-        }
-
         String maxbuckets = query.properties().getString(streamingMaxbucketspervisitor);
         if (maxbuckets != null) {
             params.setMaxBucketsPerVisitor(Integer.parseInt(maxbuckets));