diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-03-28 09:47:19 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2023-03-28 09:47:19 +0200 |
commit | c8d9a23044e71dbfb6e4839e1b77052a1f319fe1 (patch) | |
tree | 412e754cd1f58e3918c8687c312224b9d3dff366 /container-search/src | |
parent | 3d06fbbe40ecbc930dd01bc03324a6cd889f96e4 (diff) |
Allow composites with uniqueId to included as well.
Diffstat (limited to 'container-search/src')
-rw-r--r-- | container-search/src/main/java/com/yahoo/prelude/query/CompositeItem.java | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/CompositeItem.java b/container-search/src/main/java/com/yahoo/prelude/query/CompositeItem.java index 3f0bcf177dc..30c02944f19 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/CompositeItem.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/CompositeItem.java @@ -239,22 +239,20 @@ public abstract class CompositeItem extends Item { } private static int countUniqueId(Item tree) { - if (tree.hasUniqueID()) { - return 1; - } else if (tree instanceof CompositeItem asComposite) { - int sum = 0; + int sum = tree.hasUniqueID() ? 1 : 0; + if (tree instanceof CompositeItem asComposite) { for (Iterator<Item> i = asComposite.getItemIterator(); i.hasNext();) { sum += countUniqueId(i.next()); } - return sum; } - return 0; + return sum; } private static void taggingFlatten(Item tree, List<Item> container) { if (tree.hasUniqueID()) { container.add(tree); - } else if (tree instanceof CompositeItem asComposite) { + } + if (tree instanceof CompositeItem asComposite) { for (Iterator<Item> i = asComposite.getItemIterator(); i.hasNext();) { taggingFlatten(i.next(), container); } |