diff options
5 files changed, 2 insertions, 23 deletions
diff --git a/document/src/main/java/com/yahoo/document/select/rule/ArithmeticNode.java b/document/src/main/java/com/yahoo/document/select/rule/ArithmeticNode.java index c14957c94a4..2297c5228d4 100644 --- a/document/src/main/java/com/yahoo/document/select/rule/ArithmeticNode.java +++ b/document/src/main/java/com/yahoo/document/select/rule/ArithmeticNode.java @@ -5,6 +5,7 @@ import com.yahoo.document.BucketIdFactory; import com.yahoo.document.datatypes.NumericFieldValue; import com.yahoo.document.select.BucketSet; import com.yahoo.document.select.Context; +import com.yahoo.document.select.Result; import com.yahoo.document.select.Visitor; import java.util.List; diff --git a/document/src/main/java/com/yahoo/document/select/rule/IdNode.java b/document/src/main/java/com/yahoo/document/select/rule/IdNode.java index f0f8815d467..214d55a4bd8 100644 --- a/document/src/main/java/com/yahoo/document/select/rule/IdNode.java +++ b/document/src/main/java/com/yahoo/document/select/rule/IdNode.java @@ -39,14 +39,6 @@ public class IdNode implements ExpressionNode { return this; } - public short getWidthBits() { - return widthBits; - } - - public short getDivisionBits() { - return divisionBits; - } - @Override public BucketSet getBucketSet(BucketIdFactory factory) { return null; @@ -81,12 +73,9 @@ public class IdNode implements ExpressionNode { return id.getScheme().getDocType(); } throw new IllegalStateException("Document id doesn't have doc type."); - } else if (field.equalsIgnoreCase("order")) { - // TODO Remove from grammar on VESPA 8 } else { throw new IllegalStateException("Identifier field '" + field + "' is not supported."); } - return null; } @Override 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 cba93f5716a..1f3810f9a02 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 @@ -228,7 +228,7 @@ public abstract class RoutableFactories60 { buf.put(null, b); } - buf.putInt(null, 0); + buf.putInt(null, 0); // unused ordering spec buf.putInt(null, msg.getMaxBucketsPerVisitor()); return encodeBucketSpace(msg.getBucketSpace(), buf); } diff --git a/storage/src/vespa/storage/distributor/operations/external/visitoroperation.cpp b/storage/src/vespa/storage/distributor/operations/external/visitoroperation.cpp index f777f5de7c3..3aadce4d18e 100644 --- a/storage/src/vespa/storage/distributor/operations/external/visitoroperation.cpp +++ b/storage/src/vespa/storage/distributor/operations/external/visitoroperation.cpp @@ -566,12 +566,6 @@ VisitorOperation::pickTargetNode( return potentialNodes.front().getNode(); } -bool -VisitorOperation::parseDocumentSelection(DistributorMessageSender& ) -{ - return true; -} - void VisitorOperation::onStart(DistributorMessageSender& sender) { @@ -579,10 +573,6 @@ VisitorOperation::onStart(DistributorMessageSender& sender) return; } - if (!parseDocumentSelection(sender)) { - return; - } - expandBucket(); startNewVisitors(sender); diff --git a/storage/src/vespa/storage/distributor/operations/external/visitoroperation.h b/storage/src/vespa/storage/distributor/operations/external/visitoroperation.h index abf00c51f12..ebb5ed4c6aa 100644 --- a/storage/src/vespa/storage/distributor/operations/external/visitoroperation.h +++ b/storage/src/vespa/storage/distributor/operations/external/visitoroperation.h @@ -100,7 +100,6 @@ private: const std::vector<uint16_t>& triedNodes); void attemptToParseOrderingSelector(); bool documentSelectionMayHaveOrdering() const; - bool parseDocumentSelection(DistributorMessageSender& sender); bool maySendNewStorageVisitors() const noexcept; void startNewVisitors(DistributorMessageSender& sender); void initializeActiveNodes(); |