Merge pull request #4847 from gchq/gh-4844_vis_parent_filter_issue

#4844 Fix issue where vis parent table filters are not applied to the…

Author: stroomdev66

stroom-query/stroom-query-common/src/main/java/stroom/query/common/v2/FlatResultCreator.java

@@ -35,6 +35,7 @@
 import stroom.query.language.functions.ExpressionContext;
 import stroom.query.language.functions.FieldIndex;
 import stroom.query.language.functions.Val;
+import stroom.query.language.functions.ValNull;
 import stroom.query.language.functions.ref.ErrorConsumer;
 import stroom.util.NullSafe;
 import stroom.util.concurrent.UncheckedInterruptedException;
@@ -49,6 +50,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Predicate;
 
@@ -430,7 +432,42 @@ public DataStore map(final DataStore dataStore,
                     parent.getAggregateFilter(),
                     dataStore.getDateTimeSettings(),
                     expressionPredicateFactory);
-            final Predicate<Val[]> predicate = filter.orElse(vals -> true);
+            final Consumer<Item> consumer = filter.map(predicate -> (Consumer<Item>) item -> {
+                final List<Column> parentColumns = parent.getColumns();
+                final Val[] parentValues = new Val[parentColumns.size()];
+                for (int i = 0; i < parentValues.length; i++) {
+                    // TODO : @66 Currently evaluating more values than will be needed as we don't know what is
+                    //  needed by the filter.
+                    parentValues[i] = item.getValue(i);
+                }
+
+                if (predicate.test(parentValues)) {
+                    final Val[] values = new Val[parentFieldIndices.length];
+                    for (int i = 0; i < parentFieldIndices.length; i++) {
+                        final int index = parentFieldIndices[i];
+                        if (index != -1) {
+                            // TODO : @66 Currently evaluating more values than will be needed.
+                            values[i] = parentValues[index];
+                        } else {
+                            values[i] = ValNull.INSTANCE;
+                        }
+                    }
+                    childDataStore.accept(Val.of(values));
+                }
+            }).orElseGet(() -> item -> {
+                final Val[] values = new Val[parentFieldIndices.length];
+                for (int i = 0; i < parentFieldIndices.length; i++) {
+                    final int index = parentFieldIndices[i];
+                    if (index != -1) {
+                        // TODO : @66 Currently evaluating more values than will be needed.
+                        final Val val = item.getValue(index);
+                        values[i] = val;
+                    } else {
+                        values[i] = ValNull.INSTANCE;
+                    }
+                }
+                childDataStore.accept(Val.of(values));
+            });
 
             // Get top level items.
             // TODO : Add an option to get detail level items rather than root level items.
@@ -440,22 +477,7 @@ public DataStore map(final DataStore dataStore,
                     OpenGroups.NONE,
                     timeFilter,
                     IdentityItemMapper.INSTANCE,
-                    item -> {
-                        final Val[] values = new Val[parentFieldIndices.length];
-                        for (int i = 0; i < parentFieldIndices.length; i++) {
-                            final int index = parentFieldIndices[i];
-                            if (index != -1) {
-                                // TODO : @66 Currently evaluating more values than will be needed.
-                                final Val val = item.getValue(index);
-                                values[i] = val;
-                            }
-                        }
-
-                        // Filter values.
-                        if (predicate.test(values)) {
-                            childDataStore.accept(Val.of(values));
-                        }
-                    },
+                    consumer,
                     null);
 
             return childDataStore;

stroom-query/stroom-query-common/src/main/java/stroom/query/common/v2/ResultStore.java

@@ -16,7 +16,6 @@
 
 package stroom.query.common.v2;
 
-import stroom.dictionary.api.WordListProvider;
 import stroom.query.api.v2.SearchRequest;
 import stroom.query.api.v2.SearchRequestSource;
 import stroom.query.api.v2.SearchResponse;

unreleased_changes/20250402_101138_155__4844.md

@@ -0,0 +1,24 @@
+* Issue **#4844** : Fix issue where vis parent table filters are not applied to the right data values.
+
+
+```sh
+# ********************************************************************************
+# Issue title: selection filter tables with viz are failing to set viz data on update
+# Issue link:  https://github.com/gchq/stroom/issues/4844
+# ********************************************************************************
+
+# ONLY the top line will be included as a change entry in the CHANGELOG.
+# The entry should be in GitHub flavour markdown and should be written on a SINGLE
+# line with no hard breaks. You can have multiple change files for a single GitHub issue.
+# The  entry should be written in the imperative mood, i.e. 'Fix nasty bug' rather than
+# 'Fixed nasty bug'.
+#
+# Examples of acceptable entries are:
+#
+#
+# * Issue **123** : Fix bug with an associated GitHub issue in this repository
+#
+# * Issue **namespace/other-repo#456** : Fix bug with an associated GitHub issue in another repository
+#
+# * Fix bug with no associated GitHub issue.
+```