OAK-11555 Elastic: support dot in property and function names

Author: thomasmueller

oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexDefinition.java

@@ -319,23 +319,18 @@ public float getSimilarityTagsBoost() {
      */
     public String getElasticKeyword(String propertyName) {
         List<PropertyDefinition> propertyDefinitions = propertiesByName.get(propertyName);
+        String field = ElasticIndexUtils.fieldName(propertyName);
         if (propertyDefinitions == null) {
             // if there are no property definitions we return the default keyword name
             // this can happen for properties that were not explicitly defined (eg: created with a regex)
             ElasticPropertyDefinition pd = getMatchingRegexPropertyDefinition(propertyName);
-            if (pd != null) {
-                if (pd.isFlattened()) {
-                    String fieldName = ElasticIndexUtils.fieldName(propertyName);
-                    String flattenedFieldName = FieldNames.FLATTENED_FIELD_PREFIX +
-                            ElasticIndexUtils.fieldName(pd.nodeName) + "." + fieldName;
-                    return flattenedFieldName;
-                }
+            if (pd != null && pd.isFlattened()) {
+                return FieldNames.FLATTENED_FIELD_PREFIX +
+                        ElasticIndexUtils.fieldName(pd.nodeName) + "." + field;
+            } else {
+                return field + ".keyword";
             }
-            String fieldName = ElasticIndexUtils.fieldName(propertyName);
-            return fieldName + ".keyword";
         }
-
-        String field = ElasticIndexUtils.fieldName(propertyName);
         // it's ok to look at the first property since we are sure they all have the same type
         int type = propertyDefinitions.get(0).getType();
         if (isAnalyzable.apply(type) && isAnalyzed(propertyDefinitions)) {

oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/ElasticRequestHandler.java

@@ -649,16 +649,20 @@ private ObjectBuilder<BoolQuery> inference(BoolQuery.Builder b, String propertyN
     }
 
     private Stream<NestedQuery> dynamicScoreQueries(String text) {
-        return elasticIndexDefinition.getDynamicBoostProperties().stream().map(pd -> NestedQuery.of(n -> n
-                .path(ElasticIndexUtils.fieldName(pd.nodeName))
-                .query(q -> q.functionScore(s -> s
+        return elasticIndexDefinition.getDynamicBoostProperties().stream()
+            .map(pd -> {
+                String field = ElasticIndexUtils.fieldName(pd.nodeName);
+                return NestedQuery.of(n -> n
+                    .path(field)
+                    .query(q -> q.functionScore(s -> s
                         .boost(DYNAMIC_BOOST_WEIGHT)
                         .query(fq -> fq.match(m -> m.field(
-                                ElasticIndexUtils.fieldName(pd.nodeName) + ".value").
+                                field + ".value").
                                 query(FieldValue.of(text))))
                         .functions(f -> f.fieldValueFactor(fv -> fv.field(
-                                ElasticIndexUtils.fieldName(pd.nodeName) + ".boost")))))
-                .scoreMode(ChildScoreMode.Avg))
+                                field + ".boost")))))
+                    .scoreMode(ChildScoreMode.Avg));
+            }
         );
     }
 

oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/async/facets/ElasticStatisticalFacetAsyncProvider.java

@@ -49,6 +49,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * An {@link ElasticFacetProvider} extension that performs random sampling on the result set to compute facets.
@@ -75,11 +76,11 @@ public class ElasticStatisticalFacetAsyncProvider implements ElasticFacetProvide
 
         this.elasticResponseHandler = elasticResponseHandler;
         this.isAccessible = isAccessible;
-        Set<String> elasticFieldNames = elasticRequestHandler.facetFields().
-                map(p -> ElasticIndexUtils.fieldName(p)).
-                collect(Collectors.toSet());
         this.facetFields = elasticRequestHandler.facetFields().
                 collect(Collectors.toSet());
+        Set<String> elasticFieldNames = facetFields.stream().
+                map(ElasticIndexUtils::fieldName).
+                collect(Collectors.toSet());
 
         SearchRequest searchRequest = SearchRequest.of(srb -> srb.index(indexDefinition.getIndexAlias())
                 .trackTotalHits(thb -> thb.enabled(true))