Revert "Geirst/add bucket space to document api"

9 files changed, 10 insertions, 144 deletions

diff --git a/documentapi/src/main/java/com/yahoo/documentapi/VisitorParameters.java b/documentapi/src/main/java/com/yahoo/documentapi/VisitorParameters.java
index 0efdefa197e..01abd6454a9 100644
--- a/documentapi/src/main/java/com/yahoo/documentapi/VisitorParameters.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/VisitorParameters.java
@@ -20,7 +20,6 @@ import java.util.TreeMap;
 public class VisitorParameters extends Parameters {
 
     private String documentSelection;
-    private String bucketSpace = "default";
     private String visitorLibrary = "DumpVisitor";
     private int maxPending = 32;
     private long timeoutMs = -1;
@@ -70,7 +69,6 @@ public class VisitorParameters extends Parameters {
      */
     public VisitorParameters(VisitorParameters params) {
         setDocumentSelection(params.getDocumentSelection());
-        setBucketSpace(params.getBucketSpace());
         setVisitorLibrary(params.getVisitorLibrary());
         setMaxPending(params.getMaxPending());
         setTimeoutMs(params.getTimeoutMs());
@@ -110,9 +108,6 @@ public class VisitorParameters extends Parameters {
     /** @return The selection string used for visiting. */
     public String getDocumentSelection() { return documentSelection; }
 
-    /** @return The bucket space to visit */
-    public String getBucketSpace() { return bucketSpace; }
-
     /** @return What visitor library to use for the visiting. The library in question must be installed on each storage node in the target cluster. */
     public String getVisitorLibrary() { return visitorLibrary; }
 
@@ -197,9 +192,6 @@ public class VisitorParameters extends Parameters {
     /** Set the document selection expression */
     public void setDocumentSelection(String selection) { documentSelection = selection; }
 
-    /** Set which (single) bucket space this visiting will be against. */
-    public void setBucketSpace(String bucketSpace) { this.bucketSpace = bucketSpace; }
-
     /** Set which visitor library is used for visiting in storage. DumpVisitor is most common implementation. */
     public void setVisitorLibrary(String library) { visitorLibrary = library; }
 
@@ -351,11 +343,11 @@ public class VisitorParameters extends Parameters {
         this.dynamicMaxBucketsIncreaseFactor = dynamicMaxBucketsIncreaseFactor;
     }
 
+    // Inherit docs from Object
     public String toString() {
         StringBuffer sb = new StringBuffer();
         sb.append("VisitorParameters(\n")
                 .append("  Document selection: ").append(documentSelection).append('\n')
-                .append("  Bucket space:       ").append(bucketSpace).append('\n')
                 .append("  Visitor library:    ").append(visitorLibrary).append('\n')
                 .append("  Max pending:        ").append(maxPending).append('\n')
                 .append("  Timeout (ms):       ").append(timeoutMs).append('\n')
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 a146caa972e..4dd78278df0 100755
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSession.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSession.java
@@ -595,7 +595,6 @@ public class MessageBusVisitorSession implements VisitorSession {
             msg.setTimeRemaining(messageTimeoutMs);
             msg.setBuckets(Arrays.asList(bucket.getSuperbucket(), bucket.getProgress()));
             msg.setDocumentSelection(params.getDocumentSelection());
-            msg.setBucketSpace(params.getBucketSpace());
             msg.setFromTimestamp(params.getFromTimestamp());
             msg.setToTimestamp(params.getToTimestamp());
             msg.setMaxPendingReplyCount(params.getMaxPending());
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 e6d51103b3e..57384836001 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
@@ -12,7 +12,6 @@ public class CreateVisitorMessage extends DocumentMessage {
     private String controlDestination = "";
     private String dataDestination = "";
     private String docSelection = "";
-    private String bucketSpace = "default";
     private int maxPendingReplyCount = 8;
     private List<BucketId> buckets = new ArrayList<>();
     private long fromTime = 0;
@@ -77,14 +76,6 @@ public class CreateVisitorMessage extends DocumentMessage {
         docSelection = documentSelection;
     }
 
-    public String getBucketSpace() {
-        return bucketSpace;
-    }
-
-    public void setBucketSpace(String bucketSpace) {
-        this.bucketSpace = bucketSpace;
-    }
-
     public int getMaxPendingReplyCount() {
         return maxPendingReplyCount;
     }
@@ -211,7 +202,6 @@ public class CreateVisitorMessage extends DocumentMessage {
             sb.append(", time ").append(fromTime).append('-').append(toTime);
         }
         sb.append(", selection '").append(docSelection).append('\'');
-        sb.append(", bucket space '").append(bucketSpace).append('\'');
         if (!libName.equals("DumpVisitor")) {
             sb.append(", library ").append(libName);
         }
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 57e7070296f..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
@@ -298,13 +298,10 @@ public class DocumentProtocol implements Protocol {
         VersionSpecification version50 = new VersionSpecification(5, 0);
         VersionSpecification version51 = new VersionSpecification(5, 1);
         VersionSpecification version52 = new VersionSpecification(5, 115);
-        VersionSpecification version6 = new VersionSpecification(6, 999); // TODO change once stable protocol
 
-        // TODO ensure version semantics
-        List<VersionSpecification> from50 = Arrays.asList(version50, version51, version52, version6);
-        List<VersionSpecification> from51 = Arrays.asList(version51, version52, version6);
-        List<VersionSpecification> from52 = Arrays.asList(version52, version6);
-        List<VersionSpecification> from6 = Collections.singletonList(version6); // TODO decide minor version...
+        List<VersionSpecification> from50 = Arrays.asList(version50, version51, version52);
+        List<VersionSpecification> from51 = Arrays.asList(version51, version52);
+        List<VersionSpecification> from52 = Arrays.asList(version52);
 
         // 5.0 serialization (keep alphabetized please)
         putRoutableFactory(MESSAGE_BATCHDOCUMENTUPDATE, new RoutableFactories50.BatchDocumentUpdateMessageFactory(), from50);
@@ -355,11 +352,6 @@ public class DocumentProtocol implements Protocol {
         putRoutableFactory(MESSAGE_PUTDOCUMENT, new RoutableFactories52.PutDocumentMessageFactory(), from52);
         putRoutableFactory(MESSAGE_UPDATEDOCUMENT, new RoutableFactories52.UpdateDocumentMessageFactory(), from52);
         putRoutableFactory(MESSAGE_REMOVEDOCUMENT, new RoutableFactories52.RemoveDocumentMessageFactory(), from52);
-
-        // 6.x serialization
-        putRoutableFactory(MESSAGE_CREATEVISITOR, new RoutableFactories60.CreateVisitorMessageFactory(), from6);
-        putRoutableFactory(MESSAGE_STATBUCKET, new RoutableFactories60.StatBucketMessageFactory(), from6);
-        putRoutableFactory(MESSAGE_GETBUCKETLIST, new RoutableFactories60.GetBucketListMessageFactory(), from6);
     }
 
     /**
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/GetBucketListMessage.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/GetBucketListMessage.java
index 5e5d79f86b7..74629018e55 100755
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/GetBucketListMessage.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/GetBucketListMessage.java
@@ -6,19 +6,13 @@ import com.yahoo.document.BucketId;
 public class GetBucketListMessage extends DocumentMessage {
 
     private BucketId bucketId;
-    private String bucketSpace = "default";
 
     GetBucketListMessage() {
         // must be deserialized into
     }
 
     public GetBucketListMessage(BucketId bucketId) {
-        this(bucketId, "default");
-    }
-
-    public GetBucketListMessage(BucketId bucketId, String bucketSpace) {
         this.bucketId = bucketId;
-        this.bucketSpace = bucketSpace;
     }
 
     public BucketId getBucketId() {
@@ -29,14 +23,6 @@ public class GetBucketListMessage extends DocumentMessage {
         bucketId = id;
     }
 
-    public String getBucketSpace() {
-        return bucketSpace;
-    }
-
-    public void setBucketSpace(String bucketSpace) {
-        this.bucketSpace = bucketSpace;
-    }
-
     @Override
     public DocumentReply createReply() {
         return new StatBucketReply();
@@ -44,7 +30,7 @@ public class GetBucketListMessage extends DocumentMessage {
 
     @Override
     public int getApproxSize() {
-        return super.getApproxSize() + 8 + bucketSpace.length();
+        return super.getApproxSize() + 8;
     }
 
     @Override
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableFactories50.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableFactories50.java
index 0ea82ba0d83..7417e63480e 100755
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableFactories50.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableFactories50.java
@@ -392,28 +392,18 @@ public abstract class RoutableFactories50 {
 
     public static class GetBucketListMessageFactory extends DocumentMessageFactory {
 
-        protected String decodeBucketSpace(Deserializer deserializer) {
-            return "default"; // TODO fixed space repo
-        }
-
         @Override
         protected DocumentMessage doDecode(DocumentDeserializer buf) {
             GetBucketListMessage msg = new GetBucketListMessage();
             msg.setBucketId(new BucketId(buf.getLong(null)));
-            msg.setBucketSpace(decodeBucketSpace(buf));
             return msg;
         }
 
-        protected boolean encodeBucketSpace(String bucketSpace, DocumentSerializer buf) {
-            // TODO fixed space repo
-            return "default".equals(bucketSpace);
-        }
-
         @Override
         protected boolean doEncode(DocumentMessage obj, DocumentSerializer buf) {
             GetBucketListMessage msg = (GetBucketListMessage)obj;
             buf.putLong(null, msg.getBucketId().getRawId());
-            return encodeBucketSpace(msg.getBucketSpace(), buf);
+            return true;
         }
     }
 
@@ -841,30 +831,20 @@ public abstract class RoutableFactories50 {
 
     public static class StatBucketMessageFactory extends DocumentMessageFactory {
 
-        protected String decodeBucketSpace(Deserializer deserializer) {
-            return "default"; // TODO fixed space repo
-        }
-
         @Override
         protected DocumentMessage doDecode(DocumentDeserializer buf) {
             StatBucketMessage msg = new StatBucketMessage();
             msg.setBucketId(new BucketId(buf.getLong(null)));
             msg.setDocumentSelection(decodeString(buf));
-            msg.setBucketSpace(decodeBucketSpace(buf));
             return msg;
         }
 
-        protected boolean encodeBucketSpace(String bucketSpace, DocumentSerializer buf) {
-            // TODO fixed space repo
-            return "default".equals(bucketSpace);
-        }
-
         @Override
         protected boolean doEncode(DocumentMessage obj, DocumentSerializer buf) {
             StatBucketMessage msg = (StatBucketMessage)obj;
             buf.putLong(null, msg.getBucketId().getRawId());
             encodeString(msg.getDocumentSelection(), buf);
-            return encodeBucketSpace(msg.getBucketSpace(), buf);
+            return true;
         }
     }
 
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableFactories51.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableFactories51.java
index a99902c1d13..c2f986b8fb8 100755
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableFactories51.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableFactories51.java
@@ -5,7 +5,6 @@ import com.yahoo.document.BucketId;
 import com.yahoo.document.DocumentId;
 import com.yahoo.document.serialization.DocumentDeserializer;
 import com.yahoo.document.serialization.DocumentSerializer;
-import com.yahoo.vespa.objects.Deserializer;
 
 import java.util.Map;
 
@@ -18,10 +17,6 @@ public abstract class RoutableFactories51 extends RoutableFactories50 {
 
     public static class CreateVisitorMessageFactory extends DocumentMessageFactory {
 
-        protected String decodeBucketSpace(Deserializer deserializer) {
-            return "default"; // TODO fixed space repo
-        }
-
         @Override
         protected DocumentMessage doDecode(DocumentDeserializer buf) {
             CreateVisitorMessage msg = new CreateVisitorMessage();
@@ -58,15 +53,9 @@ public abstract class RoutableFactories51 extends RoutableFactories50 {
             msg.setVisitorOrdering(buf.getInt(null));
             msg.setMaxBucketsPerVisitor(buf.getInt(null));
             msg.setVisitorDispatcherVersion(50);
-            msg.setBucketSpace(decodeBucketSpace(buf));
             return msg;
         }
 
-        protected boolean encodeBucketSpace(String bucketSpace, DocumentSerializer buf) {
-            // TODO fixed space repo
-            return "default".equals(bucketSpace);
-        }
-
         @Override
         protected boolean doEncode(DocumentMessage obj, DocumentSerializer buf) {
             CreateVisitorMessage msg = (CreateVisitorMessage)obj;
@@ -103,7 +92,7 @@ public abstract class RoutableFactories51 extends RoutableFactories50 {
 
             buf.putInt(null, msg.getVisitorOrdering());
             buf.putInt(null, msg.getMaxBucketsPerVisitor());
-            return encodeBucketSpace(msg.getBucketSpace(), buf);
+            return true;
         }
     }
 
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
deleted file mode 100644
index 723760df117..00000000000
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableFactories60.java
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2018 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.serialization.DocumentSerializer;
-import com.yahoo.vespa.objects.Deserializer;
-
-public class RoutableFactories60 extends RoutableFactories52 {
-
-    public static class CreateVisitorMessageFactory extends RoutableFactories52.CreateVisitorMessageFactory {
-        @Override
-        protected String decodeBucketSpace(Deserializer deserializer) {
-            return decodeString(deserializer);
-        }
-
-        @Override
-        protected boolean encodeBucketSpace(String bucketSpace, DocumentSerializer buf) {
-            encodeString(bucketSpace, buf);
-            return true;
-        }
-    }
-
-    public static class StatBucketMessageFactory extends RoutableFactories52.StatBucketMessageFactory {
-        @Override
-        protected String decodeBucketSpace(Deserializer deserializer) {
-            return decodeString(deserializer);
-        }
-
-        @Override
-        protected boolean encodeBucketSpace(String bucketSpace, DocumentSerializer buf) {
-            encodeString(bucketSpace, buf);
-            return true;
-        }
-    }
-
-    public static class GetBucketListMessageFactory extends RoutableFactories52.GetBucketListMessageFactory {
-        @Override
-        protected String decodeBucketSpace(Deserializer deserializer) {
-            return decodeString(deserializer);
-        }
-
-        @Override
-        protected boolean encodeBucketSpace(String bucketSpace, DocumentSerializer buf) {
-            encodeString(bucketSpace, buf);
-            return true;
-        }
-    }
-
-}
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/StatBucketMessage.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/StatBucketMessage.java
index 8fb4ceb6d41..9b2176d85f6 100755
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/StatBucketMessage.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/StatBucketMessage.java
@@ -6,7 +6,6 @@ import com.yahoo.document.BucketId;
 public class StatBucketMessage extends DocumentMessage {
 
     private BucketId bucketId;
-    private String bucketSpace = "default";
     private String documentSelection;
 
     StatBucketMessage() {
@@ -14,12 +13,7 @@ public class StatBucketMessage extends DocumentMessage {
     }
 
     public StatBucketMessage(BucketId bucket, String documentSelection) {
-        this(bucket, "default", documentSelection);
-    }
-
-    public StatBucketMessage(BucketId bucketId, String bucketSpace, String documentSelection) {
-        this.bucketId = bucketId;
-        this.bucketSpace = bucketSpace;
+        this.bucketId = bucket;
         this.documentSelection = documentSelection;
     }
 
@@ -39,14 +33,6 @@ public class StatBucketMessage extends DocumentMessage {
         this.documentSelection = documentSelection;
     }
 
-    public String getBucketSpace() {
-        return bucketSpace;
-    }
-
-    public void setBucketSpace(String bucketSpace) {
-        this.bucketSpace = bucketSpace;
-    }
-
     @Override
     public DocumentReply createReply() {
         return new StatBucketReply();
@@ -54,7 +40,7 @@ public class StatBucketMessage extends DocumentMessage {
 
     @Override
     public int getApproxSize() {
-        return super.getApproxSize() + 8 + bucketSpace.length() + documentSelection.length();
+        return super.getApproxSize() + 8 + documentSelection.length();
     }
 
     @Override