-
Notifications
You must be signed in to change notification settings - Fork 222
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1870 from an1310/1521_m
#1521: Configure which fields are indexed in the Ditto search index per namespace pattern
- Loading branch information
Showing
20 changed files
with
1,360 additions
and
506 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,4 +15,4 @@ | |
| <option name="Make" enabled="true" /> | ||
| </method> | ||
| </configuration> | ||
| </component> | ||
| </component> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
86 changes: 86 additions & 0 deletions
86
.../eclipse/ditto/internal/models/signalenrichment/SearchIndexingSignalEnrichmentFacade.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| /* | ||
| * Copyright (c) 2024 Contributors to the Eclipse Foundation | ||
| * | ||
| * See the NOTICE file(s) distributed with this work for additional | ||
| * information regarding copyright ownership. | ||
| * | ||
| * This program and the accompanying materials are made available under the | ||
| * terms of the Eclipse Public License 2.0 which is available at | ||
| * http://www.eclipse.org/legal/epl-2.0 | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 | ||
| */ | ||
| package org.eclipse.ditto.internal.models.signalenrichment; | ||
|
|
||
| import static org.eclipse.ditto.base.model.common.ConditionChecker.checkNotNull; | ||
|
|
||
| import java.util.HashMap; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.concurrent.Executor; | ||
| import java.util.regex.Pattern; | ||
|
|
||
| import org.apache.pekko.japi.Pair; | ||
| import org.eclipse.ditto.internal.utils.cache.config.CacheConfig; | ||
| import org.eclipse.ditto.json.JsonFieldSelector; | ||
|
|
||
| /** | ||
| * Extension of {@code DittoCachingSignalEnrichmentFacade} that allows a selected map of selected indexes grouped by | ||
| * namespace to be added to the signal enrichment cache. | ||
| */ | ||
| public final class SearchIndexingSignalEnrichmentFacade extends DittoCachingSignalEnrichmentFacade { | ||
|
|
||
| private final List<Pair<Pattern, JsonFieldSelector>> selectedIndexes; | ||
| private final Map<String, JsonFieldSelector> selectedIndexesCache; | ||
|
|
||
| private SearchIndexingSignalEnrichmentFacade( | ||
| final List<Pair<Pattern, JsonFieldSelector>> selectedIndexes, | ||
| final SignalEnrichmentFacade cacheLoaderFacade, | ||
| final CacheConfig cacheConfig, | ||
| final Executor cacheLoaderExecutor, | ||
| final String cacheNamePrefix) { | ||
|
|
||
| super(cacheLoaderFacade, cacheConfig, cacheLoaderExecutor, cacheNamePrefix); | ||
|
|
||
| this.selectedIndexes = List.copyOf(selectedIndexes); | ||
| selectedIndexesCache = new HashMap<>(); | ||
| } | ||
|
|
||
| /** | ||
| * Returns a new {@code SearchIndexingSignalEnrichmentFacade} instance. | ||
| * | ||
| * @param selectedIndexes The selected indexes to be loaded into the search context | ||
| * @param cacheLoaderFacade the facade whose argument-result-pairs we are caching. | ||
| * @param cacheConfig the cache configuration to use for the cache. | ||
| * @param cacheLoaderExecutor the executor to use in order to asynchronously load cache entries. | ||
| * @param cacheNamePrefix the prefix to use as cacheName of the cache. | ||
| * @throws NullPointerException if any argument is null. | ||
| */ | ||
| public static SearchIndexingSignalEnrichmentFacade newInstance( | ||
| final List<Pair<Pattern, JsonFieldSelector>> selectedIndexes, | ||
| final SignalEnrichmentFacade cacheLoaderFacade, | ||
| final CacheConfig cacheConfig, | ||
| final Executor cacheLoaderExecutor, | ||
| final String cacheNamePrefix) { | ||
|
|
||
| return new SearchIndexingSignalEnrichmentFacade( | ||
| checkNotNull(selectedIndexes, "selectedIndexes"), | ||
| checkNotNull(cacheLoaderFacade, "cacheLoaderFacade"), | ||
| checkNotNull(cacheConfig, "cacheConfig"), | ||
| checkNotNull(cacheLoaderExecutor, "cacheLoaderExecutor"), | ||
| checkNotNull(cacheNamePrefix, "cacheNamePrefix")); | ||
| } | ||
|
|
||
| @Override | ||
| protected JsonFieldSelector determineSelector(final String namespace) { | ||
|
|
||
| if (!selectedIndexesCache.containsKey(namespace)) { | ||
| // We iterate through the list and return the first JsonFieldSelector that matches the namespace pattern. | ||
| selectedIndexes.stream() | ||
| .filter(pair -> pair.first().matcher(namespace).matches()) | ||
| .findFirst() | ||
| .ifPresent(pair -> selectedIndexesCache.put(namespace, pair.second())); | ||
| } | ||
| return selectedIndexesCache.get(namespace); | ||
| } | ||
| } |
Oops, something went wrong.