Skip to content

UNOMI-637 : do not create mapping for property type if not necessary #469

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jsinovassin merged 2 commits into from
Aug 2, 2022
Merged

UNOMI-637 : do not create mapping for property type if not necessary #469

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7c7b62
UNOMI-637 : do not create mapping for property type if not necessary
jsinovassin Aug 2, 2022
016be97
feedbacks
jsinovassin Aug 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions .../java/org/apache/unomi/persistence/elasticsearch/ElasticSearchPersistenceServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1438,13 +1438,19 @@ public void createMapping(String type, String source) {

public void setPropertyMapping(final PropertyType property, final String itemType) {
try {
Map<String, Object> propertyMapping = createPropertyMapping(property);
if (propertyMapping.isEmpty()) {
return;
}

Map<String, Map<String, Object>> mappings = getPropertiesMapping(itemType);
if (mappings == null) {
mappings = new HashMap<>();
}
Map<String, Object> subMappings = mappings.computeIfAbsent("properties", k -> new HashMap<>());
Map<String, Object> subSubMappings = (Map<String, Object>) subMappings.computeIfAbsent("properties", k -> new HashMap<>());
mergePropertiesMapping(subSubMappings, createPropertyMapping(property));

mergePropertiesMapping(subSubMappings, propertyMapping);

Map<String, Object> mappingsWrapper = new HashMap<>();
mappingsWrapper.put("properties", mappings);
Expand All @@ -1461,8 +1467,8 @@ private Map<String, Object> createPropertyMapping(final PropertyType property) {
final HashMap<String, Object> definition = new HashMap<>();

if (esType == null) {
logger.warn("No predefined type found for property[" + property.getValueTypeId() + "], letting ES decide");
// we don't have a fixed type for that property so let ES decide it
logger.warn("No predefined type found for property[{}], no mapping will be created", property.getValueTypeId());
return Collections.emptyMap();
} else {
definition.put("type", esType);
if ("text".equals(esType)) {
Expand All @@ -1479,7 +1485,10 @@ private Map<String, Object> createPropertyMapping(final PropertyType property) {
if ("set".equals(property.getValueTypeId())) {
Map<String, Object> childProperties = new HashMap<>();
property.getChildPropertyTypes().forEach(childType -> {
mergePropertiesMapping(childProperties, createPropertyMapping(childType));
Map<String, Object> propertyMapping = createPropertyMapping(childType);
if (!propertyMapping.isEmpty()) {
mergePropertiesMapping(childProperties, propertyMapping);
}
});
definition.put("properties", childProperties);
}
Expand Down