diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-11-18 13:55:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-18 13:55:39 +0100 |
| commit | da5b0c8a85eb10a0f12af2d0a95ffbab4835a9b9 (patch) | |
| tree | c4d7e4464891a011838485642e6f435141f2e7d0 | |
| parent | a110d898142313cd38aa0605133b3051bd1fef0a (diff) | |
| parent | 3646c57fe14c84ef8c62fade5922dad4f9ae38d3 (diff) | |
Merge pull request #11331 from vespa-engine/bratseth/same-element-not-beta
Move SameElementItem out of beta
| -rw-r--r-- | container-search/src/main/java/com/yahoo/prelude/query/NonReducibleCompositeItem.java | 2 | ||||
| -rw-r--r-- | container-search/src/main/java/com/yahoo/prelude/query/SameElementItem.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/NonReducibleCompositeItem.java b/container-search/src/main/java/com/yahoo/prelude/query/NonReducibleCompositeItem.java index 97d724953ea..3e49df85333 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/NonReducibleCompositeItem.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/NonReducibleCompositeItem.java @@ -14,8 +14,10 @@ import java.util.Optional; * @author bratseth */ public abstract class NonReducibleCompositeItem extends CompositeItem { + @Override public Optional<Item> extractSingleChild() { return Optional.empty(); } + } diff --git a/container-search/src/main/java/com/yahoo/prelude/query/SameElementItem.java b/container-search/src/main/java/com/yahoo/prelude/query/SameElementItem.java index 4a13d24d953..ac4e8b98b03 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/SameElementItem.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/SameElementItem.java @@ -1,7 +1,6 @@ // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.prelude.query; -import com.google.common.annotations.Beta; import com.yahoo.protect.Validator; import java.nio.ByteBuffer; @@ -15,7 +14,6 @@ import java.util.Optional; * * @author baldersheim */ -@Beta public class SameElementItem extends NonReducibleCompositeItem { private final String fieldName; |