Remove visitor ordering and order selection.

11 files changed, 12 insertions, 49 deletions

diff --git a/documentapi/abi-spec.json b/documentapi/abi-spec.json
index 415c9df1e77..dc8daf737e4 100644
--- a/documentapi/abi-spec.json
+++ b/documentapi/abi-spec.json
@@ -865,8 +865,6 @@
       "public long getMaxTotalHits()",
       "public java.util.Set getBucketsToVisit()",
       "public void setBucketsToVisit(java.util.Set)",
-      "public int getVisitorOrdering()",
-      "public void setVisitorOrdering(int)",
       "public int getMaxBucketsPerVisitor()",
       "public void setMaxBucketsPerVisitor(int)",
       "public void setTraceLevel(int)",
@@ -1502,10 +1500,6 @@
       "public void setToTimestamp(long)",
       "public long getFromTimestamp()",
       "public long getToTimestamp()",
-      "public void setVisitorDispatcherVersion(int)",
-      "public int getVisitorDispatcherVersion()",
-      "public void setVisitorOrdering(int)",
-      "public int getVisitorOrdering()",
       "public void setMaxBucketsPerVisitor(int)",
       "public int getMaxBucketsPerVisitor()",
       "public com.yahoo.documentapi.messagebus.protocol.DocumentReply createReply()",
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/ProgressToken.java b/documentapi/src/main/java/com/yahoo/documentapi/ProgressToken.java
index 9a6c2ea3bd3..2bb93659a78 100644
--- a/documentapi/src/main/java/com/yahoo/documentapi/ProgressToken.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/ProgressToken.java
@@ -690,9 +690,6 @@ public class ProgressToken {
      * sure if the bucket is still active until the buckets have been made
      * consistent.
      *
-     * <strong>FIXME: verify correctness with regards to orderdoc et al.
-     * Don't make this method public until this has been done!</strong>
-     *
      * @param bucket Bucket to check whether or not is finished.
      * @return <code>true</code> if <code>bucket</code>'s super-bucket is
      * finished, <code>false</code> otherwise.
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/VisitorParameters.java b/documentapi/src/main/java/com/yahoo/documentapi/VisitorParameters.java
index c7c1773a517..5b511a1dea8 100644
--- a/documentapi/src/main/java/com/yahoo/documentapi/VisitorParameters.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/VisitorParameters.java
@@ -41,7 +41,6 @@ public class VisitorParameters extends Parameters {
     private float weight = 1;
     private long maxFirstPassHits = -1;
     private long maxTotalHits = -1;
-    private int visitorOrdering = 0;
     private int maxBucketsPerVisitor = 1;
     private boolean dynamicallyIncreaseMaxBucketsPerVisitor = false;
     private float dynamicMaxBucketsIncreaseFactor = 2;
@@ -92,7 +91,6 @@ public class VisitorParameters extends Parameters {
         setControlHandler(params.getControlHandler());
         setMaxFirstPassHits(params.getMaxFirstPassHits());
         setMaxTotalHits(params.getMaxTotalHits());
-        setVisitorOrdering(params.getVisitorOrdering());
         setMaxBucketsPerVisitor(params.getMaxBucketsPerVisitor());
         setLoadType(params.getLoadType());
         setPriority(params.getPriority());
@@ -300,10 +298,6 @@ public class VisitorParameters extends Parameters {
 
     public void setBucketsToVisit(Set<BucketId> buckets) { bucketsToVisit = buckets; }
 
-    public int getVisitorOrdering() { return visitorOrdering; }
-
-    public void setVisitorOrdering(int order) { visitorOrdering = order; }
-
     public int getMaxBucketsPerVisitor() { return maxBucketsPerVisitor; }
 
     public void setMaxBucketsPerVisitor(int max) { maxBucketsPerVisitor = max; }
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSession.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSession.java
index aa422c2ad46..54e6fbf8be1 100755
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSession.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSession.java
@@ -628,7 +628,6 @@ public class MessageBusVisitorSession implements VisitorSession {
             msg.setVisitRemoves(params.visitRemoves());
             msg.setParameters(params.getLibraryParameters());
             msg.setRoute(params.getRoute());
-            msg.setVisitorOrdering(params.getVisitorOrdering());
             msg.setMaxBucketsPerVisitor(params.getMaxBucketsPerVisitor());
             msg.setLoadType(params.getLoadType());
             msg.setPriority(params.getPriority());
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/CreateVisitorMessage.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/CreateVisitorMessage.java
index 1b1c3f23d0a..c4e17141237 100644
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/CreateVisitorMessage.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/CreateVisitorMessage.java
@@ -4,7 +4,11 @@ package com.yahoo.documentapi.messagebus.protocol;
 import com.yahoo.document.BucketId;
 import com.yahoo.document.FixedBucketSpaces;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
 
 public class CreateVisitorMessage extends DocumentMessage {
 
@@ -22,8 +26,6 @@ public class CreateVisitorMessage extends DocumentMessage {
     private String fieldSet = "[all]";
     private boolean visitInconsistentBuckets = false;
     private Map<String, byte[]> params = new TreeMap<>();
-    private int version = 42;
-    private int ordering = 0;
     private int maxBucketsPerVisitor = 1;
 
     CreateVisitorMessage() {
@@ -150,22 +152,6 @@ public class CreateVisitorMessage extends DocumentMessage {
         return toTime;
     }
 
-    public void setVisitorDispatcherVersion(int version) {
-        this.version = version;
-    }
-
-    public int getVisitorDispatcherVersion() {
-        return version;
-    }
-
-    public void setVisitorOrdering(int ordering) {
-        this.ordering = ordering;
-    }
-
-    public int getVisitorOrdering() {
-        return ordering;
-    }
-
     public void setMaxBucketsPerVisitor(int max) {
         this.maxBucketsPerVisitor = max;
     }
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RemoveLocationMessage.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RemoveLocationMessage.java
index 1339975d27e..fba1db3d5dd 100755
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RemoveLocationMessage.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RemoveLocationMessage.java
@@ -6,7 +6,7 @@ import com.yahoo.document.select.BucketSelector;
 import java.util.Set;
 
 /**
- * Message (VDS only) to remove an entire location for users using userdoc or groupdoc schemes.
+ * Message (VDS only) to remove an entire location for users using n= or g= schemes.
  * We use a document selection so the user can specify a subset of those documents to be deleted
  * if they wish.
  */
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableFactories60.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableFactories60.java
index af3ff2992e5..cba93f5716a 100644
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableFactories60.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableFactories60.java
@@ -183,9 +183,8 @@ public abstract class RoutableFactories60 {
                 msg.getParameters().put(key, buf.getBytes(null, sz));
             }
 
-            msg.setVisitorOrdering(buf.getInt(null));
+            buf.getInt(null); // unused ordering spec
             msg.setMaxBucketsPerVisitor(buf.getInt(null));
-            msg.setVisitorDispatcherVersion(50);
             msg.setBucketSpace(decodeBucketSpace(buf));
             return msg;
         }
@@ -229,7 +228,7 @@ public abstract class RoutableFactories60 {
                 buf.put(null, b);
             }
 
-            buf.putInt(null, msg.getVisitorOrdering());
+            buf.putInt(null, 0);
             buf.putInt(null, msg.getMaxBucketsPerVisitor());
             return encodeBucketSpace(msg.getBucketSpace(), buf);
         }
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/removelocationmessage.h b/documentapi/src/vespa/documentapi/messagebus/messages/removelocationmessage.h
index f58f115a8ec..e0fab5e9ae5 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/removelocationmessage.h
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/removelocationmessage.h
@@ -10,7 +10,7 @@ namespace document { class BucketIdFactory; }
 namespace documentapi {
 
 /**
- * Message (VDS only) to remove an entire location for users using userdoc or groupdoc schemes for their documents.
+ * Message (VDS only) to remove an entire location for users using user or group schemes for their documents.
  * A location in this context is either a user id or a group name.
  */
 class RemoveLocationMessage : public DocumentMessage {
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/visitor.cpp b/documentapi/src/vespa/documentapi/messagebus/messages/visitor.cpp
index 3cea95dbd39..43ad30ea24f 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/visitor.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/visitor.cpp
@@ -25,7 +25,6 @@ CreateVisitorMessage::CreateVisitorMessage() :
     _visitInconsistentBuckets(false),
     _params(),
     _version(42),
-    _ordering(document::OrderingSpecification::ASCENDING),
     _maxBucketsPerVisitor(1)
 {}
 
@@ -49,11 +48,10 @@ CreateVisitorMessage::CreateVisitorMessage(const string& libraryName,
     _visitInconsistentBuckets(false),
     _params(),
     _version(42),
-    _ordering(document::OrderingSpecification::ASCENDING),
     _maxBucketsPerVisitor(1)
 {}
 
-CreateVisitorMessage::~CreateVisitorMessage() {}
+CreateVisitorMessage::~CreateVisitorMessage() = default;
 
 DocumentReply::UP
 CreateVisitorMessage::doCreateReply() const
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/visitor.h b/documentapi/src/vespa/documentapi/messagebus/messages/visitor.h
index e748e1cbc40..b838fc9d395 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/visitor.h
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/visitor.h
@@ -40,7 +40,6 @@ private:
     bool _visitInconsistentBuckets;
     vdslib::Parameters _params;
     uint32_t _version;
-    document::OrderingSpecification::Order _ordering;
     uint32_t _maxBucketsPerVisitor;
 
 protected:
@@ -101,9 +100,6 @@ public:
     Timestamp getToTimestamp() const { return _toTime; };
     void setToTimestamp(Timestamp to) { _toTime = to; };
 
-    document::OrderingSpecification::Order getVisitorOrdering() const { return _ordering; }
-    void setVisitorOrdering(document::OrderingSpecification::Order ordering) { _ordering = ordering; }
-
     uint32_t getMaxBucketsPerVisitor() const { return _maxBucketsPerVisitor; }
     void setMaxBucketsPerVisitor(uint32_t max) { _maxBucketsPerVisitor = max; }
 
diff --git a/documentapi/src/vespa/documentapi/messagebus/routablefactories60.cpp b/documentapi/src/vespa/documentapi/messagebus/routablefactories60.cpp
index 00c16c16fec..797f55120fc 100644
--- a/documentapi/src/vespa/documentapi/messagebus/routablefactories60.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/routablefactories60.cpp
@@ -95,7 +95,7 @@ RoutableFactories60::CreateVisitorMessageFactory::doDecode(document::ByteBuffer
     msg->setVisitInconsistentBuckets(decodeBoolean(buf));
     msg->getParameters().deserialize(_repo, buf);
     msg->setVisitorDispatcherVersion(50);
-    msg->setVisitorOrdering((document::OrderingSpecification::Order)decodeInt(buf));
+    decodeInt(buf); // Unused legacy visitor ordering
     msg->setMaxBucketsPerVisitor(decodeInt(buf));
     msg->setBucketSpace(decodeBucketSpace(buf));
 
@@ -131,7 +131,7 @@ RoutableFactories60::CreateVisitorMessageFactory::doEncode(const DocumentMessage
     document::ByteBuffer dbuf(tmp, len);
     msg.getParameters().serialize(dbuf);
 
-    buf.putInt(msg.getVisitorOrdering());
+    buf.putInt(0); // Unused legacy visitor ordering
     buf.putInt(msg.getMaxBucketsPerVisitor());
     return encodeBucketSpace(msg.getBucketSpace(), buf);
 }