diff options
Diffstat (limited to 'documentapi')
18 files changed, 21 insertions, 360 deletions
diff --git a/documentapi/abi-spec.json b/documentapi/abi-spec.json index 2d4453d05de..58d91e427cf 100644 --- a/documentapi/abi-spec.json +++ b/documentapi/abi-spec.json @@ -931,8 +931,6 @@ "public void setTraceLevel(int)", "public int getTraceLevel()", "public void setPriority(com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority)", - "public void setLoadType(com.yahoo.documentapi.messagebus.loadtypes.LoadType)", - "public com.yahoo.documentapi.messagebus.loadtypes.LoadType getLoadType()", "public boolean skipBucketsOnFatalErrors()", "public void skipBucketsOnFatalErrors(boolean)", "public void slice(int, int)", @@ -1132,8 +1130,6 @@ ], "methods": [ "public void <init>()", - "public void <init>(com.yahoo.documentapi.messagebus.loadtypes.LoadTypeSet)", - "public com.yahoo.documentapi.messagebus.loadtypes.LoadTypeSet getLoadTypes()", "public java.lang.String getRoutingConfigId()", "public com.yahoo.documentapi.messagebus.MessageBusParams setRoutingConfigId(java.lang.String)", "public java.lang.String getProtocolConfigId()", @@ -1795,8 +1791,6 @@ "public void swapState(com.yahoo.messagebus.Routable)", "public com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority getPriority()", "public void setPriority(com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority)", - "public com.yahoo.documentapi.messagebus.loadtypes.LoadType getLoadType()", - "public void setLoadType(com.yahoo.documentapi.messagebus.loadtypes.LoadType)", "public int getApproxSize()", "public com.yahoo.text.Utf8String getProtocol()" ], @@ -1846,10 +1840,8 @@ "public static com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority getPriority(int)", "public static com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority getPriorityByName(java.lang.String)", "public void <init>(com.yahoo.document.DocumentTypeManager)", - "public void <init>(com.yahoo.document.DocumentTypeManager, java.lang.String)", "public void <init>(com.yahoo.document.DocumentTypeManager, com.yahoo.documentapi.messagebus.protocol.DocumentProtocolPoliciesConfig, com.yahoo.vespa.config.content.DistributionConfig)", - "public void <init>(com.yahoo.document.DocumentTypeManager, com.yahoo.documentapi.messagebus.loadtypes.LoadTypeSet, com.yahoo.documentapi.messagebus.protocol.DocumentProtocolPoliciesConfig, com.yahoo.vespa.config.content.DistributionConfig)", - "public void <init>(com.yahoo.document.DocumentTypeManager, java.lang.String, com.yahoo.documentapi.messagebus.loadtypes.LoadTypeSet)", + "public void <init>(com.yahoo.document.DocumentTypeManager, java.lang.String)", "public com.yahoo.documentapi.messagebus.protocol.DocumentProtocol putRoutingPolicyFactory(java.lang.String, com.yahoo.documentapi.messagebus.protocol.RoutingPolicyFactory)", "public com.yahoo.documentapi.messagebus.protocol.DocumentProtocol putRoutableFactory(int, com.yahoo.documentapi.messagebus.protocol.RoutableFactory, com.yahoo.component.VersionSpecification)", "public com.yahoo.documentapi.messagebus.protocol.DocumentProtocol putRoutableFactory(int, com.yahoo.documentapi.messagebus.protocol.RoutableFactory, java.util.List)", @@ -2701,7 +2693,7 @@ "protected abstract boolean doEncode(com.yahoo.documentapi.messagebus.protocol.DocumentMessage, com.yahoo.document.serialization.DocumentSerializer)", "protected abstract com.yahoo.documentapi.messagebus.protocol.DocumentMessage doDecode(com.yahoo.document.serialization.DocumentDeserializer)", "public boolean encode(com.yahoo.messagebus.Routable, com.yahoo.document.serialization.DocumentSerializer)", - "public com.yahoo.messagebus.Routable decode(com.yahoo.document.serialization.DocumentDeserializer, com.yahoo.documentapi.messagebus.loadtypes.LoadTypeSet)" + "public com.yahoo.messagebus.Routable decode(com.yahoo.document.serialization.DocumentDeserializer)" ], "fields": [] }, @@ -2717,7 +2709,7 @@ "protected abstract boolean doEncode(com.yahoo.documentapi.messagebus.protocol.DocumentReply, com.yahoo.document.serialization.DocumentSerializer)", "protected abstract com.yahoo.documentapi.messagebus.protocol.DocumentReply doDecode(com.yahoo.document.serialization.DocumentDeserializer)", "public boolean encode(com.yahoo.messagebus.Routable, com.yahoo.document.serialization.DocumentSerializer)", - "public com.yahoo.messagebus.Routable decode(com.yahoo.document.serialization.DocumentDeserializer, com.yahoo.documentapi.messagebus.loadtypes.LoadTypeSet)" + "public com.yahoo.messagebus.Routable decode(com.yahoo.document.serialization.DocumentDeserializer)" ], "fields": [] }, @@ -3127,8 +3119,7 @@ ], "methods": [ "public abstract boolean encode(com.yahoo.messagebus.Routable, com.yahoo.document.serialization.DocumentSerializer)", - "public abstract com.yahoo.messagebus.Routable decode(com.yahoo.document.serialization.DocumentDeserializer, com.yahoo.documentapi.messagebus.loadtypes.LoadTypeSet)", - "public com.yahoo.messagebus.Routable decode(com.yahoo.document.serialization.DocumentDeserializer)" + "public abstract com.yahoo.messagebus.Routable decode(com.yahoo.document.serialization.DocumentDeserializer)" ], "fields": [] }, diff --git a/documentapi/src/main/java/com/yahoo/documentapi/VisitorParameters.java b/documentapi/src/main/java/com/yahoo/documentapi/VisitorParameters.java index c76a25f5c22..76387710c0a 100644 --- a/documentapi/src/main/java/com/yahoo/documentapi/VisitorParameters.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/VisitorParameters.java @@ -4,7 +4,6 @@ package com.yahoo.documentapi; import com.yahoo.document.BucketId; import com.yahoo.document.FixedBucketSpaces; import com.yahoo.document.fieldset.AllFields; -import com.yahoo.documentapi.messagebus.loadtypes.LoadType; import com.yahoo.documentapi.messagebus.protocol.DocumentProtocol; import com.yahoo.messagebus.ThrottlePolicy; import com.yahoo.messagebus.routing.Route; @@ -47,7 +46,6 @@ public class VisitorParameters extends Parameters { private int maxBucketsPerVisitor = 1; private boolean dynamicallyIncreaseMaxBucketsPerVisitor = false; private float dynamicMaxBucketsIncreaseFactor = 2; - private LoadType loadType = LoadType.DEFAULT; // TODO: Remove on Vespa 8 private DocumentProtocol.Priority priority = null; private int traceLevel = 0; private boolean skipBucketsOnFatalErrors = false; @@ -96,7 +94,6 @@ public class VisitorParameters extends Parameters { setMaxFirstPassHits(params.getMaxFirstPassHits()); setMaxTotalHits(params.getMaxTotalHits()); setMaxBucketsPerVisitor(params.getMaxBucketsPerVisitor()); - setLoadType(params.getLoadType()); setPriority(params.getPriority()); setDynamicallyIncreaseMaxBucketsPerVisitor( params.getDynamicallyIncreaseMaxBucketsPerVisitor()); @@ -190,8 +187,6 @@ public class VisitorParameters extends Parameters { public DocumentProtocol.Priority getPriority() { if (priority != null) { return priority; - } else if (loadType != null) { - return loadType.getPriority(); } else { return DocumentProtocol.Priority.NORMAL_3; } @@ -323,22 +318,6 @@ public class VisitorParameters extends Parameters { this.priority = priority; } - /** - * @deprecated load types are deprecated - */ - @Deprecated(forRemoval = true) // TODO: Remove on Vespa 8 - public void setLoadType(LoadType loadType) { - this.loadType = loadType; - } - - /** - * @deprecated load types are deprecated - */ - @Deprecated(forRemoval = true) // TODO: Remove on Vespa 8 - public LoadType getLoadType() { - return loadType; - } - public boolean skipBucketsOnFatalErrors() { return skipBucketsOnFatalErrors; } public void skipBucketsOnFatalErrors(boolean skipBucketsOnFatalErrors) { this.skipBucketsOnFatalErrors = skipBucketsOnFatalErrors; } diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusDocumentAccess.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusDocumentAccess.java index c2e6dde7f60..09b7cf8d9a9 100644 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusDocumentAccess.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusDocumentAccess.java @@ -59,7 +59,7 @@ public class MessageBusDocumentAccess extends DocumentAccess { this.params = params; try { com.yahoo.messagebus.MessageBusParams mbusParams = new com.yahoo.messagebus.MessageBusParams(params.getMessageBusParams()); - mbusParams.addProtocol(new DocumentProtocol(getDocumentTypeManager(), params.getProtocolConfigId(), params.getLoadTypes())); + mbusParams.addProtocol(new DocumentProtocol(getDocumentTypeManager(), params.getProtocolConfigId())); if (System.getProperty("vespa.local", "false").equals("true")) { // set by Application when running locally LocalNetwork network = new LocalNetwork(); bus = new NetworkMessageBus(network, new MessageBus(network, mbusParams)); diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusParams.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusParams.java index bb8c3a3b1b1..c0e5b80dbff 100755 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusParams.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusParams.java @@ -2,7 +2,6 @@ package com.yahoo.documentapi.messagebus; import com.yahoo.documentapi.DocumentAccessParams; -import com.yahoo.documentapi.messagebus.loadtypes.LoadTypeSet; import com.yahoo.documentapi.messagebus.protocol.DocumentProtocol; import com.yahoo.documentapi.messagebus.protocol.DocumentProtocolPoliciesConfig; import com.yahoo.messagebus.SourceSessionParams; @@ -14,7 +13,6 @@ import static java.util.Objects.requireNonNull; /** * @author Einar M R Rosenvinge */ -@SuppressWarnings("removal") // TODO: Remove on Vespa 8 public class MessageBusParams extends DocumentAccessParams { private String routingConfigId = null; @@ -27,29 +25,8 @@ public class MessageBusParams extends DocumentAccessParams { private RPCNetworkParams rpcNetworkParams = new RPCNetworkParams(); private com.yahoo.messagebus.MessageBusParams mbusParams = new com.yahoo.messagebus.MessageBusParams(); private SourceSessionParams sourceSessionParams = new SourceSessionParams(); - private LoadTypeSet loadTypes; // TODO remove on Vespa 8 - public MessageBusParams() { - this(new LoadTypeSet()); - } - - /** - * @deprecated load types are deprecated. Use default constructor instead - */ - @Deprecated(forRemoval = true) // TODO: Remove on Vespa 8 - public MessageBusParams(LoadTypeSet loadTypes) { - this.loadTypes = loadTypes; - } - - /** - * - * @return Returns the set of load types accepted by this Vespa installation - * @deprecated load types are deprecated - */ - @Deprecated(forRemoval = true) // TODO: Remove on Vespa 8 - public LoadTypeSet getLoadTypes() { - return loadTypes; - } + public MessageBusParams() {} /** * Returns the id to resolve to routing config. 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 5e4e87759cb..b50164aefc0 100755 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSession.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSession.java @@ -660,7 +660,6 @@ public class MessageBusVisitorSession implements VisitorSession { msg.setParameters(params.getLibraryParameters()); msg.setRoute(params.getRoute()); msg.setMaxBucketsPerVisitor(params.getMaxBucketsPerVisitor()); - msg.setLoadType(params.getLoadType()); msg.setPriority(params.getPriority()); // TODO: remove on Vespa 8 msg.setRetryEnabled(false); diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/loadtypes/LoadType.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/loadtypes/LoadType.java deleted file mode 100644 index 133736a8542..00000000000 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/loadtypes/LoadType.java +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.documentapi.messagebus.loadtypes; - -import com.yahoo.documentapi.messagebus.protocol.DocumentProtocol; - -/** - * @deprecated load types are deprecated - * @author thomasg - */ -@Deprecated(forRemoval = true) // TODO: Remove on Vespa 8 -public class LoadType { - private int id; - private String name; - private DocumentProtocol.Priority priority; - - public static LoadType DEFAULT = new LoadType(0, "default", DocumentProtocol.Priority.NORMAL_3); - - public LoadType(int id, String name, DocumentProtocol.Priority priority) { - this.id = id; - this.name = name; - this.priority = priority; - } - - @Override - public boolean equals(Object other) { - if (!(other instanceof LoadType)) { - return false; - } - - LoadType o = (LoadType)other; - - return name.equals(o.getName()) && id == o.getId() && priority == o.getPriority(); - } - - @Override - public int hashCode() { - return java.util.Objects.hash(name, id, priority); - } - - public String getName() { return name; } - - public String toString() { return name + " (id " + id + ")"; } - - public DocumentProtocol.Priority getPriority() { return priority; } - - public int getId() { return id; } -} diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/loadtypes/LoadTypeSet.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/loadtypes/LoadTypeSet.java deleted file mode 100644 index a3fbed472f0..00000000000 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/loadtypes/LoadTypeSet.java +++ /dev/null @@ -1,110 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.documentapi.messagebus.loadtypes; - -import com.yahoo.config.subscription.ConfigGetter; -import com.yahoo.vespa.config.content.LoadTypeConfig; -import com.yahoo.documentapi.messagebus.protocol.DocumentProtocol; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.util.HashMap; -import java.util.Map; -import java.util.TreeMap; - -/** - * This class keeps track of all configured load types. - * - * For production use, you should only use the String constructor, - * and supply a valid config id. Only the load types configured will - * be propagated throughout the system, so there is no point in using other - * load types. - * - * For testing, you may want to use the empty constructor and add - * load types yourself with addType(). - * - * @deprecated load types are deprecated - */ -@Deprecated(forRemoval = true) // TODO: Remove on Vespa 8 -@SuppressWarnings("removal") // TODO: Remove on Vespa 8 -public class LoadTypeSet { - - public static final LoadTypeSet EMPTY = new LoadTypeSet(); - - class DualMap { - Map<String, LoadType> nameMap = new TreeMap<String, LoadType>(); - Map<Integer, LoadType> idMap = new HashMap<Integer, LoadType>(); - - void put(LoadType l) { - if (nameMap.containsKey(l.getName()) || idMap.containsKey(l.getId())) { - throw new IllegalArgumentException( - "ID or name conflict when adding " + l); - } - - nameMap.put(l.getName(), l); - idMap.put(l.getId(), l); - } - } - - DualMap map; - - public LoadTypeSet() { - map = new DualMap(); - map.put(LoadType.DEFAULT); - } - - public LoadTypeSet(String configId) { - configure(new ConfigGetter<>(LoadTypeConfig.class).getConfig(configId)); - } - - public LoadTypeSet(LoadTypeConfig loadTypeConfig) { - configure(loadTypeConfig); - } - - public Map<String, LoadType> getNameMap() { - return map.nameMap; - } - - public Map<Integer, LoadType> getIdMap() { - return map.idMap; - } - - /** - * Used by config to generate priorities for a name, and add them to the load type set. - */ - public void addType(String name, String priority) { - try { - MessageDigest algorithm = MessageDigest.getInstance("MD5"); - algorithm.reset(); - algorithm.update(name.getBytes()); - byte messageDigest[] = algorithm.digest(); - - int id = 0; - for (int i = 0; i < 4; i++) { - int temp = ((int)messageDigest[i] & 0xff); - id <<= 8; - id |= temp; - } - - map.put(new LoadType(id, name, DocumentProtocol.Priority.valueOf(priority != null ? priority : "NORMAL_3"))); - } catch (NoSuchAlgorithmException e) { - throw new RuntimeException(e); - } - } - - public void addLoadType(int id, String name, DocumentProtocol.Priority priority) { - map.put(new LoadType(id, name, priority)); - } - - public void configure(LoadTypeConfig config) { - DualMap newMap = new DualMap(); - - // Default should always be available. - newMap.put(LoadType.DEFAULT); - - for (LoadTypeConfig.Type t : config.type()) { - newMap.put(new LoadType(t.id(), t.name(), DocumentProtocol.Priority.valueOf(t.priority()))); - } - - map = newMap; - } -} - diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/loadtypes/package-info.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/loadtypes/package-info.java deleted file mode 100644 index be0f91f0f29..00000000000 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/loadtypes/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -@ExportPackage -package com.yahoo.documentapi.messagebus.loadtypes; - -import com.yahoo.osgi.annotation.ExportPackage; diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentMessage.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentMessage.java index 21f7c243c6f..d4736c391f7 100755 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentMessage.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentMessage.java @@ -1,7 +1,6 @@ // Copyright Yahoo. 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.documentapi.messagebus.loadtypes.LoadType; import com.yahoo.messagebus.Message; import com.yahoo.messagebus.Routable; import com.yahoo.text.Utf8String; @@ -13,7 +12,6 @@ import com.yahoo.text.Utf8String; public abstract class DocumentMessage extends Message { private DocumentProtocol.Priority priority = DocumentProtocol.Priority.NORMAL_3; - private LoadType loadType = LoadType.DEFAULT; // TODO: Remove on Vespa 8 /** * Constructs a new message with no content. @@ -38,10 +36,6 @@ public abstract class DocumentMessage extends Message { DocumentProtocol.Priority pri = this.priority; this.priority = msg.priority; msg.priority = pri; - - LoadType lt = this.loadType; - this.loadType = msg.loadType; - msg.loadType = lt; } } @@ -66,28 +60,6 @@ public abstract class DocumentMessage extends Message { this.priority = priority; } - /** - * @deprecated load types are deprecated - */ - @Deprecated(forRemoval = true) // TODO: Remove on Vespa 8 - @SuppressWarnings("removal") // TODO: Remove on Vespa 8 - public LoadType getLoadType() { - return loadType; - } - - /** - * @deprecated load types are deprecated - */ - @Deprecated(forRemoval = true) // TODO: Remove on Vespa 8 - @SuppressWarnings("removal") // TODO: Remove on Vespa 8 - public void setLoadType(LoadType loadType) { - if (loadType != null) { - this.loadType = loadType; - } else { - this.loadType = LoadType.DEFAULT; - } - } - @Override public int getApproxSize() { return 4 + 1; // type + priority // TODO update on Vespa 8 to not include deprecated fields 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 bab416389dd..0ff578b64d7 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 @@ -6,7 +6,6 @@ import com.yahoo.component.Version; import com.yahoo.component.VersionSpecification; import com.yahoo.document.DocumentTypeManager; import com.yahoo.document.DocumentTypeManagerConfigurer; -import com.yahoo.documentapi.messagebus.loadtypes.LoadTypeSet; import com.yahoo.messagebus.ErrorCode; import com.yahoo.messagebus.Protocol; import com.yahoo.messagebus.Reply; @@ -32,7 +31,6 @@ import static java.util.Objects.requireNonNull; * * @author Simon Thoresen Hult */ -@SuppressWarnings("removal") // TODO: Remove on Vespa 8 public class DocumentProtocol implements Protocol { private static final Logger log = Logger.getLogger(DocumentProtocol.class.getName()); @@ -240,39 +238,21 @@ public class DocumentProtocol implements Protocol { } public DocumentProtocol(DocumentTypeManager docMan) { - this(docMan, null, new LoadTypeSet()); - } - - public DocumentProtocol(DocumentTypeManager docMan, String configId) { - this(docMan, configId, new LoadTypeSet()); + this(docMan, null); } public DocumentProtocol(DocumentTypeManager documentTypeManager, DocumentProtocolPoliciesConfig policiesConfig, DistributionConfig distributionConfig) { - this(requireNonNull(documentTypeManager), null, new LoadTypeSet(), + this(requireNonNull(documentTypeManager), null, requireNonNull(policiesConfig), requireNonNull(distributionConfig)); } - /** - * @deprecated load types are deprecated. Use constructor without LoadTypeSet instead. - */ - @Deprecated(forRemoval = true) // TODO: Remove on Vespa 8 - public DocumentProtocol(DocumentTypeManager documentTypeManager, LoadTypeSet loadTypes, - DocumentProtocolPoliciesConfig policiesConfig, DistributionConfig distributionConfig) { - this(requireNonNull(documentTypeManager), null, requireNonNull(loadTypes), - requireNonNull(policiesConfig), requireNonNull(distributionConfig)); - } - - /** - * @deprecated load types are deprecated. Use constructor without LoadTypeSet instead. - */ - @Deprecated(forRemoval = true) // TODO: Remove on Vespa 8 - public DocumentProtocol(DocumentTypeManager docMan, String configId, LoadTypeSet set) { - this(docMan, configId == null ? "client" : configId, set, null, null); + public DocumentProtocol(DocumentTypeManager docMan, String configId) { + this(docMan, configId == null ? "client" : configId, null, null); } - private DocumentProtocol(DocumentTypeManager docMan, String configId, LoadTypeSet set, + private DocumentProtocol(DocumentTypeManager docMan, String configId, DocumentProtocolPoliciesConfig policiesConfig, DistributionConfig distributionConfig) { if (docMan != null) this.docMan = docMan; @@ -280,7 +260,7 @@ public class DocumentProtocol implements Protocol { this.docMan = new DocumentTypeManager(); DocumentTypeManagerConfigurer.configure(this.docMan, configId); } - this.routableRepository = new RoutableRepository(set); + this.routableRepository = new RoutableRepository(); // When adding factories to this list, please KEEP THEM ORDERED alphabetically like they are now. putRoutingPolicyFactory("AND", new RoutingPolicyFactories.AndPolicyFactory()); 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 42172b04b90..e0d52ced318 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 @@ -9,7 +9,6 @@ import com.yahoo.document.DocumentUpdate; import com.yahoo.document.TestAndSetCondition; import com.yahoo.document.serialization.DocumentDeserializer; import com.yahoo.document.serialization.DocumentSerializer; -import com.yahoo.documentapi.messagebus.loadtypes.LoadTypeSet; import com.yahoo.messagebus.Routable; import com.yahoo.vdslib.DocumentSummary; import com.yahoo.vdslib.SearchResult; @@ -70,18 +69,17 @@ public abstract class RoutableFactories60 { } DocumentMessage msg = (DocumentMessage)obj; out.putByte(null, (byte)(msg.getPriority().getValue())); // TODO: encode default value on Vespa 8 - out.putInt(null, msg.getLoadType().getId()); + out.putInt(null, 0); // Ignored load type. 0 is legacy "default" load type ID. return doEncode(msg, out); } @SuppressWarnings("removal") // TODO: Remove on Vespa 8 - public Routable decode(DocumentDeserializer in, LoadTypeSet loadTypes) { + public Routable decode(DocumentDeserializer in) { byte pri = in.getByte(null); // TODO: ignore on Vespa 8 - int loadType = in.getInt(null); + in.getInt(null); // Ignored load type DocumentMessage msg = doDecode(in); if (msg != null) { msg.setPriority(DocumentProtocol.getPriority(pri)); - msg.setLoadType(loadTypes.getIdMap().get(loadType)); // TODO: ignore on Vespa 8 } return msg; } @@ -132,7 +130,7 @@ public abstract class RoutableFactories60 { } @SuppressWarnings("removal") // TODO: Remove on Vespa 8 - public Routable decode(DocumentDeserializer in, LoadTypeSet loadTypes) { + public Routable decode(DocumentDeserializer in) { byte pri = in.getByte(null); DocumentReply reply = doDecode(in); if (reply != null) { diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableFactory.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableFactory.java index 7baa41e5c6a..bff6cac548e 100755 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableFactory.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableFactory.java @@ -3,7 +3,6 @@ package com.yahoo.documentapi.messagebus.protocol; import com.yahoo.document.serialization.DocumentDeserializer; import com.yahoo.document.serialization.DocumentSerializer; -import com.yahoo.documentapi.messagebus.loadtypes.LoadTypeSet; import com.yahoo.messagebus.Routable; /** @@ -12,7 +11,7 @@ import com.yahoo.messagebus.Routable; * com.yahoo.component.VersionSpecification)} method. </p> * * <p>Notice that no routable type is passed to the - * {@link #decode(DocumentDeserializer, com.yahoo.documentapi.messagebus.loadtypes.LoadTypeSet)} method, so + * {@link #decode(DocumentDeserializer)} method, so * you may NOT share a factory across multiple routable types. To share serialization logic between factory use a common * superclass or composition with a common serialization utility.</p> * @@ -32,21 +31,12 @@ public interface RoutableFactory { boolean encode(Routable obj, DocumentSerializer out); /** - * <p>This method decodes the given byte bufer to a routable.</p> <p>Return false to signal failure.</p> <p>This + * <p>This method decodes the given byte buffer to a routable.</p> <p>Return false to signal failure.</p> <p>This * method is NOT exception safe.</p> * * @param in The buffer to read from. - * @param loadTypes The LoadTypeSet to inject into the Routable. * @return The decoded routable. - * @deprecated load types are deprecated. Use method without LoadTypeSet instead */ - @Deprecated(forRemoval = true) // TODO: Remove on Vespa 8 - @SuppressWarnings("removal") // TODO: Remove on Vespa 8 - Routable decode(DocumentDeserializer in, LoadTypeSet loadTypes); - - @SuppressWarnings("removal") // TODO: Remove on Vespa 8 - default Routable decode(DocumentDeserializer in) { - return decode(in, LoadTypeSet.EMPTY); - } + Routable decode(DocumentDeserializer in); } diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableRepository.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableRepository.java index 2360cbe8bc3..eb6caf5d0f7 100755 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableRepository.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableRepository.java @@ -9,7 +9,6 @@ import com.yahoo.document.serialization.DocumentDeserializer; import com.yahoo.document.serialization.DocumentDeserializerFactory; import com.yahoo.document.serialization.DocumentSerializer; import com.yahoo.document.serialization.DocumentSerializerFactory; -import com.yahoo.documentapi.messagebus.loadtypes.LoadTypeSet; import com.yahoo.io.GrowableByteBuffer; import java.util.logging.Level; import com.yahoo.messagebus.Routable; @@ -34,20 +33,10 @@ final class RoutableRepository { private static final Logger log = Logger.getLogger(RoutableRepository.class.getName()); private final CopyOnWriteHashMap<Integer, VersionMap> factoryTypes = new CopyOnWriteHashMap<>(); private final CopyOnWriteHashMap<CacheKey, RoutableFactory> cache = new CopyOnWriteHashMap<>(); - private LoadTypeSet loadTypes; // TODO remove on Vespa 8 public RoutableRepository() {} /** - * @deprecated load types are deprecated. Use default constructor instead. - */ - @Deprecated(forRemoval = true) // TODO: Remove on Vespa 8 - @SuppressWarnings("removal") // TODO: Remove on Vespa 8 - public RoutableRepository(LoadTypeSet set) { - loadTypes = set; - } - - /** * Decodes a {@link Routable} from the given byte array. This uses the content of the byte array to dispatch the * decode request to the appropriate {@link RoutableFactory} that was previously registered. * @@ -75,7 +64,7 @@ final class RoutableRepository { log.log(Level.SEVERE,"No routable factory found for routable type " + type + " (version " + version + ")."); return null; } - Routable ret = factory.decode(in, loadTypes); + Routable ret = factory.decode(in); if (ret == null) { log.log(Level.SEVERE,"Routable factory " + factory.getClass().getName() + " failed to deserialize " + "routable of type " + type + " (version " + version + ").\nData = " + Arrays.toString(data)); diff --git a/documentapi/src/test/java/com/yahoo/documentapi/VisitorParametersTestCase.java b/documentapi/src/test/java/com/yahoo/documentapi/VisitorParametersTestCase.java index b1187d48374..9b1d8e83804 100644 --- a/documentapi/src/test/java/com/yahoo/documentapi/VisitorParametersTestCase.java +++ b/documentapi/src/test/java/com/yahoo/documentapi/VisitorParametersTestCase.java @@ -2,15 +2,12 @@ package com.yahoo.documentapi; import com.yahoo.document.fieldset.AllFields; -import com.yahoo.documentapi.messagebus.loadtypes.LoadType; import com.yahoo.documentapi.messagebus.protocol.DocumentProtocol; import org.junit.Test; import static org.junit.Assert.*; @SuppressWarnings("removal") // TODO: Remove on Vespa 8 public class VisitorParametersTestCase { - // TODO: Remove on Vespa 8 - private LoadType loadType = new LoadType(3, "samnmax", DocumentProtocol.Priority.HIGH_3); @SuppressWarnings("removal")// TODO: Vespa 8: remove private VisitorParameters createVisitorParameters() { @@ -28,7 +25,6 @@ public class VisitorParametersTestCase { params.setTimeoutMs(1337); params.setMaxPending(111); params.setFieldSet(AllFields.NAME); - params.setLoadType(loadType); // TODO: Remove on Vespa 8 params.setVisitRemoves(true); params.setVisitInconsistentBuckets(true); params.setTraceLevel(9); @@ -45,7 +41,6 @@ public class VisitorParametersTestCase { return params; } - @SuppressWarnings("removal")// TODO: Vespa 8: remove @Test public void testCopyConstructor() { VisitorParameters params = createVisitorParameters(); @@ -65,7 +60,6 @@ public class VisitorParametersTestCase { assertEquals(1337, copy.getTimeoutMs()); assertEquals(111, copy.getMaxPending()); assertEquals(AllFields.NAME, copy.getFieldSet()); - assertEquals(loadType, copy.getLoadType()); assertEquals(true, copy.getVisitRemoves()); assertEquals(true, copy.getVisitInconsistentBuckets()); assertEquals(9, copy.getTraceLevel()); diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSessionTestCase.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSessionTestCase.java index 53545510ae7..97c7147bd86 100755 --- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSessionTestCase.java +++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSessionTestCase.java @@ -14,7 +14,6 @@ import com.yahoo.documentapi.VisitorDataHandler; import com.yahoo.documentapi.VisitorDataQueue; import com.yahoo.documentapi.VisitorParameters; import com.yahoo.documentapi.VisitorResponse; -import com.yahoo.documentapi.messagebus.loadtypes.LoadType; import com.yahoo.documentapi.messagebus.protocol.CreateVisitorMessage; import com.yahoo.documentapi.messagebus.protocol.CreateVisitorReply; import com.yahoo.documentapi.messagebus.protocol.DocumentProtocol; @@ -524,9 +523,6 @@ public class MessageBusVisitorSessionTestCase { if (msg.getMaxBucketsPerVisitor() != 1) { sb.append("max buckets per visitor=").append(msg.getMaxBucketsPerVisitor()).append("\n"); } - if (msg.getLoadType() != LoadType.DEFAULT) { - sb.append("load type=").append(msg.getLoadType().getName()).append("\n"); - } if (msg.getPriority() != DocumentProtocol.Priority.NORMAL_3) { // TODO: remove on Vespa 8 sb.append("priority=").append(msg.getPriority()).append("\n"); } @@ -742,7 +738,6 @@ public class MessageBusVisitorSessionTestCase { params.setTimeoutMs(1337); params.setMaxPending(111); params.setFieldSet(DocIdOnly.NAME); - params.setLoadType(new LoadType(3, "samnmax", DocumentProtocol.Priority.HIGH_3)); // TODO: Remove on Vespa 8 params.setVisitRemoves(true); params.setVisitInconsistentBuckets(true); params.setTraceLevel(9); @@ -772,7 +767,6 @@ public class MessageBusVisitorSessionTestCase { "]\n" + "route=extraterrestrial/highway\n" + "max buckets per visitor=55\n" + - "load type=samnmax\n" + "priority=HIGHEST\n" + "visitor library=CoolVisitor\n" + "trace level=9\n" + diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/loadtypes/test/LoadTypesTestCase.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/loadtypes/test/LoadTypesTestCase.java deleted file mode 100644 index 18269971f88..00000000000 --- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/loadtypes/test/LoadTypesTestCase.java +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.documentapi.messagebus.loadtypes.test; - -import com.yahoo.documentapi.messagebus.loadtypes.LoadTypeSet; -import org.junit.Test; - -import static org.junit.Assert.assertEquals; - -/** - * @author thomasg - */ -@SuppressWarnings("removal") // TODO: Remove on Vespa 8 -// TODO Vespa 8: remove test case once load types are gone -public class LoadTypesTestCase { - - @Test - public void testIdGeneration() { - LoadTypeSet set = new LoadTypeSet(); - set.addType("vespagrim", "VERY_HIGH"); - set.addType("slow", "VERY_LOW"); - set.addType("test", null); - - assertEquals("vespagrim", set.getNameMap().get("vespagrim").getName()); - assertEquals("slow", set.getNameMap().get("slow").getName()); - assertEquals("test", set.getNameMap().get("test").getName()); - assertEquals("default", set.getNameMap().get("default").getName()); - - assertEquals(0xc21803d4, set.getNameMap().get("vespagrim").getId()); - } - -} 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 deecba96aa6..5e8439c9536 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 @@ -143,7 +143,6 @@ public class Messages60TestCase extends MessagesTestBase { private static final String BUCKET_SPACE = "beartato"; @Override - @SuppressWarnings("removal") // TODO: Remove on Vespa 8 public void run() { GetBucketListMessage msg = new GetBucketListMessage(new BucketId(16, 123)); msg.setBucketSpace(BUCKET_SPACE); @@ -152,7 +151,6 @@ public class Messages60TestCase extends MessagesTestBase { for (Language lang : LANGUAGES) { msg = (GetBucketListMessage)deserialize("GetBucketListMessage", DocumentProtocol.MESSAGE_GETBUCKETLIST, lang); assertEquals(new BucketId(16, 123), msg.getBucketId()); - assertEquals("default", msg.getLoadType().getName()); // TODO: Remove on Vespa 8 assertEquals(BUCKET_SPACE, msg.getBucketSpace()); } } @@ -163,10 +161,8 @@ public class Messages60TestCase extends MessagesTestBase { private static final String BUCKET_SPACE = "andrei"; @Override - @SuppressWarnings("removal") // TODO: Remove on Vespa 8 public void run() { StatBucketMessage msg = new StatBucketMessage(new BucketId(16, 123), "id.user=123"); - msg.setLoadType(null); // TODO: Remove on Vespa 8 msg.setBucketSpace(BUCKET_SPACE); assertEquals(BASE_MESSAGE_LENGTH + 27 + serializedLength(BUCKET_SPACE), serialize("StatBucketMessage", msg)); @@ -174,7 +170,6 @@ public class Messages60TestCase extends MessagesTestBase { msg = (StatBucketMessage)deserialize("StatBucketMessage", DocumentProtocol.MESSAGE_STATBUCKET, lang); assertEquals(new BucketId(16, 123), msg.getBucketId()); assertEquals("id.user=123", msg.getDocumentSelection()); - assertEquals("default", msg.getLoadType().getName()); // TODO: Remove on Vespa 8 assertEquals(BUCKET_SPACE, msg.getBucketSpace()); } } diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/MessagesTestBase.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/MessagesTestBase.java index 74d06c05383..f43449646be 100755 --- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/MessagesTestBase.java +++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/MessagesTestBase.java @@ -4,7 +4,6 @@ package com.yahoo.documentapi.messagebus.protocol.test; import com.yahoo.component.Version; import com.yahoo.document.DocumentTypeManager; import com.yahoo.document.DocumentTypeManagerConfigurer; -import com.yahoo.documentapi.messagebus.loadtypes.LoadTypeSet; import com.yahoo.documentapi.messagebus.protocol.DocumentProtocol; import com.yahoo.messagebus.Routable; import org.junit.Test; @@ -19,7 +18,6 @@ import static org.junit.Assert.*; /** * @author Simon Thoresen Hult */ -@SuppressWarnings("removal") // TODO: Remove on Vespa 8 public abstract class MessagesTestBase { protected enum Language { @@ -29,12 +27,10 @@ public abstract class MessagesTestBase { protected static final Set<Language> LANGUAGES = EnumSet.allOf(Language.class); protected final DocumentTypeManager docMan = new DocumentTypeManager(); - protected final LoadTypeSet loadTypes = new LoadTypeSet(); // TODO remove on Vespa 8 - protected final DocumentProtocol protocol = new DocumentProtocol(docMan, null, loadTypes); + protected final DocumentProtocol protocol = new DocumentProtocol(docMan, null); public MessagesTestBase() { DocumentTypeManagerConfigurer.configure(docMan, "file:./test/cfg/testdoc.cfg"); - loadTypes.addLoadType(34, "foo", DocumentProtocol.Priority.NORMAL_2); } @Test |