Merge branch '7.3'

Author: at055612

CHANGELOG.md

@@ -13,6 +13,29 @@ DO NOT ADD CHANGES HERE - ADD THEM USING log_change.sh
 ~~~
 
 
+* Issue **#4221** : Remove `id` column from `index_field` and change the primary key to be `(fk_index_field_source_id, name)`. Add retry logic and existing field check when adding fields to mitigate against deadlocks.
+
+* Issue **#4218** : Fix index shard state transition.
+
+* Issue **#4220** : Fix index shard creation.
+
+* Issue **#4217** : Suppress expected shard write errors.
+
+* Issue **#4215** : Fix NPE during context lookup with no context data loaded.
+
+* Issue **#4214** : Fix index shard writer errors.
+
+* Issue **#4203** : Fix event capture getting stuck on buttons.
+
+* Issue **#4204** : Make `indexOf()` and `lastIndexOf()` return `-1` when not found.
+
+* Issue **#4205** : Add `contains()` function.
+
+* Issue **#4209** : Support `and()` function in `eval`.
+
+* Issue **#4212** : Fix shards stuck in opening state.
+
+
 ## [v7.4-beta.2] - 2024-04-10
 
 * Issue **#4161** : Fix cron schedule time UI.

stroom-app/src/main/java/stroom/app/guice/AppModule.java

@@ -4,8 +4,6 @@
 import stroom.cluster.impl.ClusterModule;
 import stroom.dropwizard.common.FilteredHealthCheckServlet;
 import stroom.dropwizard.common.LogLevelInspector;
-import stroom.index.impl.IndexShardWriterExecutorProvider;
-import stroom.index.impl.IndexShardWriterExecutorProviderImpl;
 import stroom.lifecycle.impl.LifecycleServiceModule;
 import stroom.meta.statistics.impl.MetaStatisticsModule;
 import stroom.resource.impl.SessionResourceModule;
@@ -31,7 +29,6 @@ protected void configure() {
         install(new SQLStatisticSearchModule());
         install(new SessionResourceModule());
         install(new JerseyModule());
-        bind(IndexShardWriterExecutorProvider.class).to(IndexShardWriterExecutorProviderImpl.class);
 
         HasSystemInfoBinder.create(binder())
                 .bind(LogLevelInspector.class);

stroom-app/src/main/resources/ui/favicon.ico

@@ -0,0 +1,16 @@
+{
+  "short_name": "Stroom",
+  "name": "Stroom",
+  "icons": [
+    {
+      "src": "favicon.svg",
+      "sizes": "any",
+      "type": "image/svg+xml",
+      "purpose": "any"
+    }
+  ],
+  "start_url": "./index.html",
+  "display": "standalone",
+  "theme_color": "#000000",
+  "background_color": "#ffffff"
+}

stroom-app/src/main/resources/ui/favicon.svg

@@ -31,7 +31,6 @@
 import stroom.data.store.api.Store;
 import stroom.docref.DocRef;
 import stroom.index.VolumeTestConfigModule;
-import stroom.index.mock.MockIndexShardWriterExecutorModule;
 import stroom.meta.api.MetaService;
 import stroom.meta.shared.FindMetaCriteria;
 import stroom.meta.shared.Meta;
@@ -66,7 +65,6 @@
 @IncludeModule(MockMetaStatisticsModule.class)
 @IncludeModule(stroom.test.DatabaseTestControlModule.class)
 @IncludeModule(JerseyModule.class)
-@IncludeModule(MockIndexShardWriterExecutorModule.class)
 class AbstractAnalyticsTest extends StroomIntegrationTest {
 
     static final SimpleDuration INSTANT = SimpleDuration

stroom-app/src/main/resources/ui/manifest.json

@@ -25,7 +25,6 @@
 import stroom.app.guice.JerseyModule;
 import stroom.app.uri.UriFactoryModule;
 import stroom.index.VolumeTestConfigModule;
-import stroom.index.mock.MockIndexShardWriterExecutorModule;
 import stroom.meta.statistics.impl.MockMetaStatisticsModule;
 import stroom.node.api.NodeInfo;
 import stroom.resource.impl.ResourceModule;
@@ -52,7 +51,6 @@
 @IncludeModule(MockMetaStatisticsModule.class)
 @IncludeModule(stroom.test.DatabaseTestControlModule.class)
 @IncludeModule(JerseyModule.class)
-@IncludeModule(MockIndexShardWriterExecutorModule.class)
 class TestRepeatedTableBuilderAnalytics extends AbstractAnalyticsTest {
 
     @Inject

stroom-app/src/main/resources/ui/noauth/swagger-ui-dist/favicon.ico

@@ -28,7 +28,6 @@
 import stroom.app.uri.UriFactoryModule;
 import stroom.docref.DocRef;
 import stroom.index.VolumeTestConfigModule;
-import stroom.index.mock.MockIndexShardWriterExecutorModule;
 import stroom.meta.statistics.impl.MockMetaStatisticsModule;
 import stroom.node.api.NodeInfo;
 import stroom.resource.impl.ResourceModule;
@@ -54,7 +53,6 @@
 @IncludeModule(MockMetaStatisticsModule.class)
 @IncludeModule(stroom.test.DatabaseTestControlModule.class)
 @IncludeModule(JerseyModule.class)
-@IncludeModule(MockIndexShardWriterExecutorModule.class)
 class TestScheduledQueryAnalytics extends AbstractAnalyticsTest {
 
     @Inject

stroom-app/src/test/java/stroom/analytics/AbstractAnalyticsTest.java

@@ -25,7 +25,6 @@
 import stroom.app.uri.UriFactoryModule;
 import stroom.docref.DocRef;
 import stroom.index.VolumeTestConfigModule;
-import stroom.index.mock.MockIndexShardWriterExecutorModule;
 import stroom.meta.shared.MetaFields;
 import stroom.meta.statistics.impl.MockMetaStatisticsModule;
 import stroom.node.api.NodeInfo;
@@ -56,7 +55,6 @@
 @IncludeModule(MockMetaStatisticsModule.class)
 @IncludeModule(stroom.test.DatabaseTestControlModule.class)
 @IncludeModule(JerseyModule.class)
-@IncludeModule(MockIndexShardWriterExecutorModule.class)
 class TestStreamingAnalytics extends AbstractAnalyticsTest {
 
     @Inject

stroom-app/src/test/java/stroom/analytics/TestRepeatedTableBuilderAnalytics.java

@@ -25,7 +25,6 @@
 import stroom.app.guice.JerseyModule;
 import stroom.app.uri.UriFactoryModule;
 import stroom.index.VolumeTestConfigModule;
-import stroom.index.mock.MockIndexShardWriterExecutorModule;
 import stroom.meta.statistics.impl.MockMetaStatisticsModule;
 import stroom.node.api.NodeInfo;
 import stroom.resource.impl.ResourceModule;
@@ -49,7 +48,6 @@
 @IncludeModule(MockMetaStatisticsModule.class)
 @IncludeModule(stroom.test.DatabaseTestControlModule.class)
 @IncludeModule(JerseyModule.class)
-@IncludeModule(MockIndexShardWriterExecutorModule.class)
 class TestTableBuilderAnalytics extends AbstractAnalyticsTest {
 
     @Inject

stroom-app/src/test/java/stroom/analytics/TestScheduledQueryAnalytics.java

@@ -32,7 +32,6 @@
 import stroom.index.impl.IndexShardWriterCache;
 import stroom.index.impl.IndexVolumeService;
 import stroom.index.impl.selection.VolumeConfig;
-import stroom.index.mock.MockIndexShardWriterExecutorModule;
 import stroom.meta.api.MetaService;
 import stroom.meta.statistics.impl.MockMetaStatisticsModule;
 import stroom.processor.impl.ProcessorTaskQueueManager;
@@ -84,8 +83,7 @@ void testPerformance() {
                 MockSecurityContextModule.class,
                 MockMetaStatisticsModule.class,
                 stroom.test.DatabaseTestControlModule.class,
-                JerseyModule.class,
-                MockIndexShardWriterExecutorModule.class};
+                JerseyModule.class};
         Module[] instances = new Module[moduleClasses.length];
         for (int i = 0; i < moduleClasses.length; i++) {
             final int pos = i;