#4858 Fix Plan B query field error

stroomdev66 · stroomdev66 · commit 2579e7d4e79d · 2025-04-11T11:14:29.000+01:00
diff --git a/stroom-core-client-widget/src/main/java/stroom/item/client/SelectionList.java b/stroom-core-client-widget/src/main/java/stroom/item/client/SelectionList.java
@@ -258,6 +258,11 @@ public void init(final SelectionListModel<T, I> model) {
         refresh(false, false);
     }
 
+    public void refresh() {
+        quickFilter.clear();
+        refresh(true, true);
+    }
+
     public void destroy() {
         if (model != null) {
             lastFilter = null;
diff --git a/stroom-core-client-widget/src/main/java/stroom/item/client/SelectionPopup.java b/stroom-core-client-widget/src/main/java/stroom/item/client/SelectionPopup.java
@@ -51,6 +51,10 @@ public void init(final SelectionListModel<T, I> model) {
         selectionList.init(model);
     }
 
+    public void refresh() {
+        selectionList.refresh();
+    }
+
     public MultiSelectionModel<I> getSelectionModel() {
         return selectionList.getSelectionModel();
     }
diff --git a/stroom-core-client/src/main/java/stroom/dashboard/client/table/TablePresenter.java b/stroom-core-client/src/main/java/stroom/dashboard/client/table/TablePresenter.java
@@ -390,11 +390,15 @@ protected void onUnbind() {
 
     private void onAddColumn(final ClickEvent event) {
         if (currentSearchModel != null) {
-            columnSelectionListModel.setDataSourceRef(currentSearchModel.getIndexLoader().getLoadedDataSourceRef());
+            final DocRef dataSource = currentSearchModel.getIndexLoader().getLoadedDataSourceRef();
+            final boolean changedDataSource = !Objects.equals(columnSelectionListModel.getDataSourceRef(), dataSource);
+            columnSelectionListModel.setDataSourceRef(dataSource);
 
             if (addColumnPopup == null) {
                 addColumnPopup = new SelectionPopup<>();
                 addColumnPopup.init(columnSelectionListModel);
+            } else if (changedDataSource) {
+                addColumnPopup.refresh();
             }
 
             final Element target = event.getNativeEvent().getEventTarget().cast();
diff --git a/stroom-core-client/src/main/java/stroom/query/client/presenter/DynamicColumnSelectionListModel.java b/stroom-core-client/src/main/java/stroom/query/client/presenter/DynamicColumnSelectionListModel.java
@@ -209,6 +209,10 @@ public void setDataSourceRef(final DocRef dataSourceRef) {
         this.dataSourceRef = dataSourceRef;
     }
 
+    public DocRef getDataSourceRef() {
+        return dataSourceRef;
+    }
+
     @Override
     public void reset() {
         lastCriteria = null;
diff --git a/stroom-state/stroom-planb-impl/src/main/java/stroom/planb/impl/db/AbstractDb.java b/stroom-state/stroom-planb-impl/src/main/java/stroom/planb/impl/db/AbstractDb.java
@@ -10,6 +10,7 @@
 import stroom.lmdb2.LmdbEnvDir;
 import stroom.lmdb2.LmdbKeySequence;
 import stroom.query.api.v2.Column;
+import stroom.query.api.v2.ExpressionUtil;
 import stroom.query.api.v2.Format;
 import stroom.query.common.v2.ExpressionPredicateFactory;
 import stroom.query.common.v2.ExpressionPredicateFactory.ValueFunctionFactories;
@@ -37,7 +38,9 @@
 import java.nio.ByteBuffer;
 import java.nio.file.Path;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Optional;
+import java.util.Set;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.Consumer;
@@ -492,6 +495,10 @@ public void search(final ExpressionCriteria criteria,
                        final DateTimeSettings dateTimeSettings,
                        final ExpressionPredicateFactory expressionPredicateFactory,
                        final ValuesConsumer consumer) {
+        // Ensure we have fields for all expression criteria.
+        final List<String> fields = ExpressionUtil.fields(criteria.getExpression());
+        fields.forEach(fieldIndex::create);
+
         final ValueFunctionFactories<Val[]> valueFunctionFactories = createValueFunctionFactories(fieldIndex);
         final Optional<Predicate<Val[]>> optionalPredicate = expressionPredicateFactory
                 .create(criteria.getExpression(), valueFunctionFactories, dateTimeSettings);
diff --git a/stroom-state/stroom-planb-impl/src/main/java/stroom/planb/impl/db/RangedStateDb.java b/stroom-state/stroom-planb-impl/src/main/java/stroom/planb/impl/db/RangedStateDb.java
@@ -45,11 +45,14 @@ public static RangedStateDb create(final Path path,
                                        final ByteBufferFactory byteBufferFactory,
                                        final PlanBDoc doc,
                                        final boolean readOnly) {
-        if (doc.getSettings() instanceof final RangedStateSettings rangedStateSettings) {
-            return new RangedStateDb(path, byteBufferFactory, rangedStateSettings, readOnly);
-        } else {
-            throw new RuntimeException("No ranged state settings provided");
+        return new RangedStateDb(path, byteBufferFactory, getSettings(doc), readOnly);
+    }
+
+    private static RangedStateSettings getSettings(final PlanBDoc doc) {
+        if (doc.getSettings() instanceof final RangedStateSettings settings) {
+            return settings;
         }
+        return RangedStateSettings.builder().build();
     }
 
     public Optional<RangedState> getState(final RangedStateRequest request) {
diff --git a/stroom-state/stroom-planb-impl/src/main/java/stroom/planb/impl/db/SessionDb.java b/stroom-state/stroom-planb-impl/src/main/java/stroom/planb/impl/db/SessionDb.java
@@ -7,6 +7,7 @@
 import stroom.lmdb2.BBKV;
 import stroom.planb.shared.PlanBDoc;
 import stroom.planb.shared.SessionSettings;
+import stroom.query.api.v2.ExpressionUtil;
 import stroom.query.common.v2.ExpressionPredicateFactory;
 import stroom.query.common.v2.ExpressionPredicateFactory.ValueFunctionFactories;
 import stroom.query.language.functions.FieldIndex;
@@ -25,6 +26,7 @@
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.function.Function;
@@ -58,18 +60,25 @@ public static SessionDb create(final Path path,
                                    final ByteBufferFactory byteBufferFactory,
                                    final PlanBDoc doc,
                                    final boolean readOnly) {
-        if (doc.getSettings() instanceof final SessionSettings sessionSettings) {
-            return new SessionDb(path, byteBufferFactory, sessionSettings, readOnly);
-        } else {
-            throw new RuntimeException("No session settings provided");
+        return new SessionDb(path, byteBufferFactory, getSettings(doc), readOnly);
+    }
+
+    private static SessionSettings getSettings(final PlanBDoc doc) {
+        if (doc.getSettings() instanceof final SessionSettings settings) {
+            return settings;
         }
+        return SessionSettings.builder().build();
     }
 
     public void search(final ExpressionCriteria criteria,
                        final FieldIndex fieldIndex,
                        final DateTimeSettings dateTimeSettings,
                        final ExpressionPredicateFactory expressionPredicateFactory,
                        final ValuesConsumer consumer) {
+        // Ensure we have fields for all expression criteria.
+        final List<String> fields = ExpressionUtil.fields(criteria.getExpression());
+        fields.forEach(fieldIndex::create);
+
         final ValueFunctionFactories<Val[]> valueFunctionFactories = createValueFunctionFactories(fieldIndex);
         final Optional<Predicate<Val[]>> optionalPredicate = expressionPredicateFactory
                 .create(criteria.getExpression(), valueFunctionFactories, dateTimeSettings);
diff --git a/stroom-state/stroom-planb-impl/src/main/java/stroom/planb/impl/db/StateDb.java b/stroom-state/stroom-planb-impl/src/main/java/stroom/planb/impl/db/StateDb.java
@@ -20,9 +20,9 @@ public class StateDb extends AbstractDb<Key, StateValue> {
     }
 
     public StateDb(final Path path,
-            final ByteBufferFactory byteBufferFactory,
-            final StateSettings settings,
-            final boolean readOnly) {
+                   final ByteBufferFactory byteBufferFactory,
+                   final StateSettings settings,
+                   final boolean readOnly) {
         super(
                 path,
                 byteBufferFactory,
@@ -36,11 +36,14 @@ public static StateDb create(final Path path,
                                  final ByteBufferFactory byteBufferFactory,
                                  final PlanBDoc doc,
                                  final boolean readOnly) {
-        if (doc.getSettings() instanceof final StateSettings stateSettings) {
-            return new StateDb(path, byteBufferFactory, stateSettings, readOnly);
-        } else {
-            throw new RuntimeException("No state settings provided");
+        return new StateDb(path, byteBufferFactory, getSettings(doc), readOnly);
+    }
+
+    private static StateSettings getSettings(final PlanBDoc doc) {
+        if (doc.getSettings() instanceof final StateSettings settings) {
+            return settings;
         }
+        return StateSettings.builder().build();
     }
 
     public Optional<State> getState(final StateRequest request) {
diff --git a/stroom-state/stroom-planb-impl/src/main/java/stroom/planb/impl/db/TemporalRangedStateDb.java b/stroom-state/stroom-planb-impl/src/main/java/stroom/planb/impl/db/TemporalRangedStateDb.java
@@ -45,11 +45,14 @@ public static TemporalRangedStateDb create(final Path path,
                                                final ByteBufferFactory byteBufferFactory,
                                                final PlanBDoc doc,
                                                final boolean readOnly) {
-        if (doc.getSettings() instanceof final TemporalRangedStateSettings temporalRangedStateSettings) {
-            return new TemporalRangedStateDb(path, byteBufferFactory, temporalRangedStateSettings, readOnly);
-        } else {
-            throw new RuntimeException("No temporal ranged state settings provided");
+        return new TemporalRangedStateDb(path, byteBufferFactory, getSettings(doc), readOnly);
+    }
+
+    private static TemporalRangedStateSettings getSettings(final PlanBDoc doc) {
+        if (doc.getSettings() instanceof final TemporalRangedStateSettings settings) {
+            return settings;
         }
+        return TemporalRangedStateSettings.builder().build();
     }
 
     public Optional<TemporalRangedState> getState(final TemporalRangedStateRequest request) {
diff --git a/stroom-state/stroom-planb-impl/src/main/java/stroom/planb/impl/db/TemporalStateDb.java b/stroom-state/stroom-planb-impl/src/main/java/stroom/planb/impl/db/TemporalStateDb.java
@@ -45,11 +45,14 @@ public static TemporalStateDb create(final Path path,
                                          final ByteBufferFactory byteBufferFactory,
                                          final PlanBDoc doc,
                                          final boolean readOnly) {
-        if (doc.getSettings() instanceof final TemporalStateSettings temporalStateSettings) {
-            return new TemporalStateDb(path, byteBufferFactory, temporalStateSettings, readOnly);
-        } else {
-            throw new RuntimeException("No temporal state settings provided");
+        return new TemporalStateDb(path, byteBufferFactory, getSettings(doc), readOnly);
+    }
+
+    private static TemporalStateSettings getSettings(final PlanBDoc doc) {
+        if (doc.getSettings() instanceof final TemporalStateSettings settings) {
+            return settings;
         }
+        return TemporalStateSettings.builder().build();
     }
 
     public Optional<TemporalState> getState(final TemporalStateRequest request) {
diff --git a/unreleased_changes/20250411_100423_979__4858.md b/unreleased_changes/20250411_100423_979__4858.md
@@ -0,0 +1,24 @@
+* Issue **#4858** : Fix Plan B query field error.
+
+
+```sh
+# ********************************************************************************
+# Issue title: using PlanB as Data Source for a Dashboard gives Query error
+# Issue link:  https://github.com/gchq/stroom/issues/4858
+# ********************************************************************************
+
+# 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.
+```

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,10 @@ public void init(final SelectionListModel<T, I> model) {`
`51`	`51`	`selectionList.init(model);`
`52`	`52`	`}`
`53`	`53`
	`54`	`+ public void refresh() {`
	`55`	`+ selectionList.refresh();`
	`56`	`+ }`
	`57`	`+`
`54`	`58`	`public MultiSelectionModel<I> getSelectionModel() {`
`55`	`59`	`return selectionList.getSelectionModel();`
`56`	`60`	`}`