Gh 4365 stroomql case sens fields 7.6

build.gradle

@@ -179,6 +179,7 @@ ext.libs = [
         commons_lang                        : "org.apache.commons:commons-lang3", // version controlled by dropwizard-dependencies
         commons_pool2                       : "org.apache.commons:commons-pool2:2.12.0",
         commons_text                        : "org.apache.commons:commons-text", // version controlled by dropwizard-dependencies
+        commons_collections4                : "org.apache.commons:commons-collections4:4.4", // Not in dropwizard-dependencies
         classgraph                          : "io.github.classgraph:classgraph:4.8.146",
         curator_client                      : "org.apache.curator:curator-client:$versions.curator",
         curator_framework                   : "org.apache.curator:curator-framework:$versions.curator",

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

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2024 Crown Copyright
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package stroom.analytics.impl;
 
 import stroom.analytics.rule.impl.AnalyticRuleStore;
@@ -47,6 +63,7 @@
 import stroom.util.logging.LambdaLogger;
 import stroom.util.logging.LambdaLoggerFactory;
 import stroom.util.shared.ResultPage;
+import stroom.util.shared.string.CIKey;
 import stroom.view.shared.ViewDoc;
 
 import jakarta.inject.Inject;
@@ -248,7 +265,7 @@ private LmdbDataStore createStore(final SearchRequest searchRequest) {
         final FieldIndex fieldIndex = new FieldIndex();
 
         // Create a parameter map.
-        final Map<String, String> paramMap = ParamUtil.createParamMap(searchRequest.getQuery().getParams());
+        final Map<CIKey, String> paramMap = ParamUtil.createParamMap(searchRequest.getQuery().getParams());
 
         // Create error consumer.
         final ErrorConsumer errorConsumer = new ErrorConsumerImpl();
@@ -274,7 +291,7 @@ private LmdbDataStore createAnalyticLmdbDataStore(final QueryKey queryKey,
                                                       final TableSettings tableSettings,
                                                       final ExpressionContext expressionContext,
                                                       final FieldIndex fieldIndex,
-                                                      final Map<String, String> paramMap,
+                                                      final Map<CIKey, String> paramMap,
                                                       final DataStoreSettings dataStoreSettings,
                                                       final ErrorConsumer errorConsumer) {
         final AnalyticResultStoreConfig storeConfig = analyticStoreConfigProvider.get();

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

@@ -18,6 +18,8 @@
 
 import stroom.datasource.api.v2.QueryField;
 import stroom.docref.DocRef;
+import stroom.util.shared.string.CIKey;
+import stroom.util.shared.string.CIKeys;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -34,35 +36,28 @@ public class AnalyticFields {
             .name(ANALYTICS_STORE_TYPE)
             .build();
 
-    public static final String NAME = "Name";
-    public static final String UUID = "UUID";
-    public static final String TIME = "Time";
-    public static final String VALUE = "Value";
-    private static final List<QueryField> FIELDS = new ArrayList<>();
-    private static final Map<String, QueryField> FIELD_MAP;
-
     // Times
-    public static final QueryField TIME_FIELD = QueryField.createDate(TIME);
-
-    public static final QueryField NAME_FIELD = QueryField.createText(NAME);
-    public static final QueryField UUID_FIELD = QueryField.createText(UUID);
-    public static final QueryField VALUE_FIELD = QueryField.createText(VALUE);
-
-    static {
-        FIELDS.add(TIME_FIELD);
-        FIELDS.add(NAME_FIELD);
-        FIELDS.add(UUID_FIELD);
-        FIELDS.add(VALUE_FIELD);
-
-        FIELD_MAP = FIELDS.stream()
-                .collect(Collectors.toMap(QueryField::getFldName, Function.identity()));
-    }
+    public static final QueryField TIME_FIELD = QueryField.createDate(CIKeys.TIME, true);
+    public static final QueryField NAME_FIELD = QueryField.createText(CIKeys.NAME, true);
+    public static final QueryField UUID_FIELD = QueryField.createText(CIKeys.UUID, true);
+    public static final QueryField VALUE_FIELD = QueryField.createText(CIKeys.VALUE, true);
+
+    private static final List<QueryField> FIELDS = List.of(
+            TIME_FIELD,
+            NAME_FIELD,
+            UUID_FIELD,
+            VALUE_FIELD);
+
+    private static final Map<CIKey, QueryField> FIELD_NAME_TO_FIELD_MAP = FIELDS.stream()
+            .collect(Collectors.toMap(
+                    QueryField::getFldNameAsCIKey,
+                    Function.identity()));
 
     public static List<QueryField> getFields() {
         return new ArrayList<>(FIELDS);
     }
 
-    public static Map<String, QueryField> getFieldMap() {
-        return FIELD_MAP;
+    public static Map<CIKey, QueryField> getFieldMap() {
+        return FIELD_NAME_TO_FIELD_MAP;
     }
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Crown Copyright
+ * Copyright 2024 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,7 +12,6 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
  */
 
 package stroom.analytics.impl;
@@ -62,6 +61,7 @@
 import stroom.util.concurrent.UncheckedInterruptedException;
 import stroom.util.logging.LambdaLogger;
 import stroom.util.logging.LambdaLoggerFactory;
+import stroom.util.shared.string.CIKey;
 
 import jakarta.inject.Inject;
 
@@ -148,10 +148,10 @@ private void doSearch(final TaskContext parentContext,
             final List<CompletableFuture<Void>> futures = new ArrayList<>();
             try {
                 final FieldIndex fieldIndex = coprocessors.getFieldIndex();
-                final Map<String, QueryField> fieldMap = AnalyticFields.getFieldMap();
+                final Map<CIKey, QueryField> fieldMap = AnalyticFields.getFieldMap();
                 final QueryField[] fieldArray = new QueryField[fieldIndex.size()];
                 for (int i = 0; i < fieldArray.length; i++) {
-                    final String fieldName = fieldIndex.getField(i);
+                    final CIKey fieldName = fieldIndex.getFieldAsCIKey(i);
                     final QueryField field = fieldMap.get(fieldName);
                     if (field == null) {
                         throw new RuntimeException("Field '" + fieldName + "' is not valid for this datasource");
@@ -331,7 +331,7 @@ public TableResultConsumer errors(final List<String> errors) {
         public TableResultConsumer columns(final List<Column> columns) {
             this.columns = columns;
             fieldIndex = new FieldIndex();
-            columns.forEach(column -> fieldIndex.create(column.getName()));
+            columns.forEach(column -> fieldIndex.create(column.getNameAsCIKey()));
             return this;
         }
 
@@ -357,11 +357,11 @@ public TableResultConsumer addRow(final Row row) {
                 }
                 final String value = sb.toString();
 
-                final Map<String, Object> attributeMap = new HashMap<>();
-                attributeMap.put(AnalyticFields.NAME_FIELD.getFldName(), analyticRuleDoc.getName());
-                attributeMap.put(AnalyticFields.UUID_FIELD.getFldName(), analyticRuleDoc.getUuid());
-                attributeMap.put(AnalyticFields.TIME_FIELD.getFldName(), time);
-                attributeMap.put(AnalyticFields.VALUE_FIELD.getFldName(), value);
+                final Map<CIKey, Object> attributeMap = new HashMap<>();
+                attributeMap.put(AnalyticFields.NAME_FIELD.getFldNameAsCIKey(), analyticRuleDoc.getName());
+                attributeMap.put(AnalyticFields.UUID_FIELD.getFldNameAsCIKey(), analyticRuleDoc.getUuid());
+                attributeMap.put(AnalyticFields.TIME_FIELD.getFldNameAsCIKey(), time);
+                attributeMap.put(AnalyticFields.VALUE_FIELD.getFldNameAsCIKey(), value);
 
                 if (expressionMatcher.match(attributeMap, expression)) {
                     hitCount.increment();

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

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2024 Crown Copyright
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package stroom.analytics.impl;
 
 import stroom.analytics.shared.AnalyticRuleDoc;
@@ -9,7 +25,6 @@
 import stroom.query.common.v2.CompiledColumns;
 import stroom.query.common.v2.format.ColumnFormatter;
 import stroom.query.common.v2.format.FormatterFactory;
-import stroom.query.language.functions.FieldIndex;
 import stroom.query.language.functions.Generator;
 import stroom.query.language.functions.Val;
 import stroom.query.language.functions.ValuesConsumer;
@@ -18,6 +33,7 @@
 import stroom.util.NullSafe;
 import stroom.util.date.DateUtil;
 import stroom.util.shared.Severity;
+import stroom.util.shared.query.FieldNames;
 
 import jakarta.inject.Inject;
 import jakarta.inject.Provider;
@@ -198,9 +214,9 @@ private void writeRecord(final ColumnValue[] columnValues) {
             NullSafe.consume(columnValue, ColumnValue::val, val -> {
                 final Column column = columnValue.column();
                 final String columnName = column.getName();
-                if (FieldIndex.isStreamIdFieldName(columnName)) {
+                if (FieldNames.isStreamIdFieldName(columnName)) {
                     streamId.set(getSafeLong(val));
-                } else if (FieldIndex.isEventIdFieldName(columnName)) {
+                } else if (FieldNames.isEventIdFieldName(columnName)) {
                     eventId.set(getSafeLong(val));
                 } else {
                     final String fieldValStr = fieldFormatter.format(column, val);

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

@@ -76,6 +76,7 @@
 import stroom.util.shared.ResultPage;
 import stroom.util.shared.Severity;
 import stroom.util.shared.scheduler.Schedule;
+import stroom.util.shared.string.CIKey;
 
 import jakarta.inject.Inject;
 import jakarta.inject.Provider;
@@ -208,7 +209,7 @@ private void execAnalytic(final AnalyticRuleDoc analytic,
                 .builder()
                 .ownerDocRef(analytic.asDocRef())
                 .enabled(true)
-                .nodeName(StringMatch.equals(nodeInfo.getThisNodeName(), true))
+                .nodeName(StringMatch.equalsIgnoreCase(nodeInfo.getThisNodeName()))
                 .build();
 
         final ResultPage<ExecutionSchedule> executionSchedules = executionScheduleDao.fetchExecutionSchedule(request);
@@ -366,7 +367,7 @@ private boolean process(final AnalyticRuleDoc analytic,
                     // Now consume all results as detections.
                     final TableSettings tableSettings = resultRequest.getMappings().getFirst();
                     final List<Column> columns = tableSettings.getColumns();
-                    final Map<String, String> paramMap = ParamUtil
+                    final Map<CIKey, String> paramMap = ParamUtil
                             .createParamMap(mappedRequest.getQuery().getParams());
                     final CompiledColumns compiledColumns = CompiledColumns.create(
                             expressionContext,

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Crown Copyright
+ * Copyright 2024 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,7 +12,6 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
  */
 
 package stroom.analytics.impl;
@@ -41,6 +40,7 @@
 import stroom.util.concurrent.UncheckedInterruptedException;
 import stroom.util.logging.LambdaLogger;
 import stroom.util.logging.LambdaLoggerFactory;
+import stroom.util.shared.string.CIKey;
 
 import jakarta.inject.Inject;
 import jakarta.inject.Provider;
@@ -116,7 +116,7 @@ private Optional<AnalyticFieldListConsumer> createEventConsumer(final StreamingA
         final ExpressionContext expressionContext = expressionContextFactory
                 .createContext(searchRequest);
         final TableSettings tableSettings = searchRequest.getResultRequests().getFirst().getMappings().getFirst();
-        final Map<String, String> paramMap = ParamUtil.createParamMap(searchRequest.getQuery().getParams());
+        final Map<CIKey, String> paramMap = ParamUtil.createParamMap(searchRequest.getQuery().getParams());
         final CompiledColumns compiledColumns = CompiledColumns.create(expressionContext,
                 tableSettings.getColumns(),
                 paramMap);
@@ -135,6 +135,7 @@ private Optional<AnalyticFieldListConsumer> createEventConsumer(final StreamingA
         try {
             final Provider<DetectionConsumer> detectionConsumerProvider =
                     detectionConsumerFactory.create(analytic.analyticRuleDoc());
+
             detectionConsumerProxy.setAnalyticRuleDoc(analytic.analyticRuleDoc());
             detectionConsumerProxy.setCompiledColumns(compiledColumns);
             detectionConsumerProxy.setDetectionsConsumerProvider(detectionConsumerProvider);
@@ -162,6 +163,10 @@ private Optional<AnalyticFieldListConsumer> createEventConsumer(final StreamingA
         }
     }
 
+
+    // --------------------------------------------------------------------------------
+
+
     private static class NullFieldListConsumer implements AnalyticFieldListConsumer {
 
         @Override

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

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2024 Crown Copyright
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package stroom.analytics.impl;
 
 import stroom.analytics.impl.AnalyticDataStores.AnalyticDataStore;
@@ -61,6 +77,7 @@
 import stroom.util.logging.LogExecutionTime;
 import stroom.util.logging.LogUtil;
 import stroom.util.shared.UserRef;
+import stroom.util.shared.string.CIKey;
 import stroom.util.shared.time.SimpleDuration;
 import stroom.util.shared.time.TimeUnit;
 import stroom.util.time.SimpleDurationUtil;
@@ -362,7 +379,7 @@ private void processStream(final DocRef pipelineDocRef,
                                final List<TableBuilderAnalytic> analytics,
                                final Meta meta,
                                final TaskContext parentTaskContext) {
-        final Map<String, Object> metaAttributeMap = MetaAttributeMapUtil
+        final Map<CIKey, Object> metaAttributeMap = MetaAttributeMapUtil
                 .createAttributeMap(meta);
 
         final List<AnalyticFieldListConsumer> fieldListConsumers = new ArrayList<>();
@@ -477,7 +494,7 @@ private AnalyticFieldListConsumer createLmdbConsumer(final TableBuilderAnalytic
 
     private boolean ignoreStream(final TableBuilderAnalytic analytic,
                                  final Meta meta,
-                                 final Map<String, Object> metaAttributeMap) {
+                                 final Map<CIKey, Object> metaAttributeMap) {
         final TableBuilderAnalyticTrackerData trackerData = analytic.trackerData;
         final long minStreamId = trackerData.getMinStreamId();
         final long minCreateTime =

stroom-analytics/stroom-analytics-rule-impl/src/main/java/stroom/analytics/rule/impl/AnalyticRuleStoreImpl.java

@@ -304,8 +304,10 @@ public List<DocRef> list() {
     }
 
     @Override
-    public List<DocRef> findByNames(final List<String> name, final boolean allowWildCards) {
-        return store.findByNames(name, allowWildCards);
+    public List<DocRef> findByNames(final List<String> names,
+                                    final boolean allowWildCards,
+                                    final boolean isCaseSensitive) {
+        return store.findByNames(names, allowWildCards, isCaseSensitive);
     }
 
     @Override

stroom-annotation/stroom-annotation-api/build.gradle

@@ -4,6 +4,7 @@ dependencies {
     implementation project(':stroom-core-shared')
     implementation project(':stroom-docref')
     implementation project(':stroom-query:stroom-query-api')
+    implementation project(':stroom-util-shared')
 
     implementation libs.jackson_annotations
 }