Merge branch '7.8' of github.com:gchq/stroom

Author: stroomdev66

CHANGELOG.md

@@ -13,6 +13,35 @@ DO NOT ADD CHANGES HERE - ADD THEM USING log_change.sh
 ~~~
 
 
+* Issue **#2334** : Fix split depth for stepping to match the split filter.
+
+* Issue **#4812** : Fix data download issue.
+
+* Issue **#4815** : Add new `currentUser()` related functions `currentUserUuid()`, `currentUserSubjectId()`, `currentUserDisplayName()` and `currentUserFullName()`, so the annotation function can be passed a user UUID to set initial assignment.
+
+* Issue **#4787** : Make text panes use special `__stream_id__` and `__event_id__` columns by default.
+
+* Issue **#4768** : Fix import file path issue.
+
+* Issue **#4767** : Improve null equality treatment in expressions.
+
+* Issue **#4781** : Fix NPE.
+
+* Issue **#4784** : Fix DynamicIndexingFilter values.
+
+* Issue **#4796** : Fix the accidental deletion of rule dup stores by scheduled reports.
+
+* Issue **#4758** : Change the way the duplicate check store works so that it can cope with values larger than 511 bytes.
+
+* Issue **#4788** : Deep copy selection handlers when duplicating dashboard tables.
+
+* Issue **#4791** : Fix numeric comparator in having clause.
+
+* Issue **#4795** : Add missing properties to HTTPAppender.
+
+* Issue **#4808** : Fix issue of proxy forwarding gzipped data inside a proxy zip when client uses header `Compression: gzip`, i.e. lower case value.
+
+
 ## [v7.9-beta.2] - 2025-02-21
 
 * Issue **#4778** : Improve menu text rendering.

gradle/libs.versions.toml

@@ -13,7 +13,7 @@ elasticsearch = "8.12.2"
 httpcore = "4.4.16" # Transient dependency of Elasticsearch
 flyway = "10.0.0"
 guice = "7.0.0"
-gwt = "2.12.1"
+gwt = "2.12.2"
 jackson-swagger = "2.11.1" # Specific version of jackson for use with the swagger plugin
 jmh = "1.37"
 jooq = "3.18.7" # Defined at the top of this file

setProxyLogLevels.sh

@@ -9,7 +9,9 @@ ADMIN_PORT_OVERRIDE=$ADMIN_PORT
 # shellcheck disable=SC1091
 source ./stroom-proxy/stroom-proxy-app/src/dist/config/scripts.env
 
-ADMIN_PORT=${ADMIN_PORT_OVERRIDE:-ADMIN_PORT}
+ADMIN_PORT=${ADMIN_PORT_OVERRIDE:-$ADMIN_PORT}
+
+#echo "ADMIN_PORT: ${ADMIN_PORT}"
 
 # Override jar path for dev
 PATH_TO_JAR="./stroom-proxy/stroom-proxy-app//build/libs/stroom-proxy-app-all.jar" \

stroom-analytics/stroom-analytics-impl/src/main/java/stroom/analytics/impl/DuplicateCheckFactoryImpl.java

@@ -20,7 +20,6 @@
 @Singleton
 public class DuplicateCheckFactoryImpl implements DuplicateCheckFactory {
 
-    private final ByteBufferFactory byteBufferFactory;
     private final DuplicateCheckStoreConfig analyticResultStoreConfig;
     private final DuplicateCheckStorePool<String, DuplicateCheckStore> pool;
 
@@ -30,7 +29,6 @@ public DuplicateCheckFactoryImpl(final DuplicateCheckDirs duplicateCheckDirs,
                                      final DuplicateCheckStoreConfig duplicateCheckStoreConfig,
                                      final DuplicateCheckRowSerde duplicateCheckRowSerde,
                                      final Provider<Executor> executorProvider) {
-        this.byteBufferFactory = byteBufferFactory;
         this.analyticResultStoreConfig = duplicateCheckStoreConfig;
 
         pool = new DuplicateCheckStorePool<>(k -> new DuplicateCheckStore(
@@ -84,9 +82,13 @@ public synchronized DuplicateCheckRows fetchData(final FindDuplicateCheckCriteri
     }
 
     public synchronized Boolean delete(final DeleteDuplicateCheckRequest request) {
-        return pool.use(request.getAnalyticDocUuid(), store -> store.delete(request, byteBufferFactory));
+        return pool.use(request.getAnalyticDocUuid(), store -> store.delete(request));
     }
 
+
+    // --------------------------------------------------------------------------------
+
+
     private static class NoOpDuplicateCheck implements DuplicateCheck {
 
         @Override

stroom-analytics/stroom-analytics-impl/src/main/java/stroom/analytics/impl/DuplicateCheckRowSerde.java

@@ -17,10 +17,17 @@
 import java.util.Arrays;
 import java.util.List;
 
-class DuplicateCheckRowSerde {
+/**
+ * The serialised key is of the form:
+ * <pre>{@code <hash bytes (8)><seq no bytes(variable)>}</pre>
+ */
+public class DuplicateCheckRowSerde {
 
     private static final LambdaLogger LOGGER = LambdaLoggerFactory.getLogger(DuplicateCheckRowSerde.class);
 
+    private static final int HASH_BYTES = Long.BYTES;
+    private static final int MAX_KEY_BYTES = HASH_BYTES + Long.BYTES;
+
     private final ByteBufferFactory byteBufferFactory;
 
     @Inject
@@ -44,7 +51,7 @@ protected long createHash(final byte[] bytes) {
     private LmdbKV createLmdbKV(final byte[] bytes) {
         // Hash the value.
         final long rowHash = createHash(bytes);
-        final ByteBuffer keyByteBuffer = byteBufferFactory.acquire(Long.BYTES);
+        final ByteBuffer keyByteBuffer = byteBufferFactory.acquire(MAX_KEY_BYTES);
         keyByteBuffer.putLong(rowHash);
         keyByteBuffer.flip();
 
@@ -78,4 +85,8 @@ private byte[] serialise(final List<String> values) {
         }
         return bytes;
     }
+
+    public int getKeyLength() {
+        return HASH_BYTES;
+    }
 }