From c874d1a363ca1ef3869361fbeded089a5d86b18f Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Lesaint?= Date: Thu, 13 Jul 2017 16:01:33 +0200 Subject: [PATCH] SONAR-8798 make MetaIndex.value stored to be able to retrieve it --- .../src/main/java/org/sonar/server/es/NewIndex.java | 12 ++++++++++-- .../server/es/metadata/MetadataIndexDefinition.java | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/server/sonar-server/src/main/java/org/sonar/server/es/NewIndex.java b/server/sonar-server/src/main/java/org/sonar/server/es/NewIndex.java index 42071805208..de4e4377b98 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/es/NewIndex.java +++ b/server/sonar-server/src/main/java/org/sonar/server/es/NewIndex.java @@ -203,6 +203,7 @@ public class NewIndex { private boolean disableNorms = false; private boolean termVectorWithPositionOffsets = false; private SortedMap subFields = Maps.newTreeMap(); + private boolean store = false; private KeywordFieldBuilder(NewIndexType indexType, String fieldName) { this.indexType = indexType; @@ -256,13 +257,19 @@ public class NewIndex { return this; } + public KeywordFieldBuilder store() { + this.store = true; + return this; + } + public NewIndexType build() { Map hash = new TreeMap<>(); if (subFields.isEmpty()) { hash.putAll(ImmutableMap.of( "type", FIELD_TYPE_KEYWORD, "index", disableSearch ? INDEX_NOT_SEARCHABLE : INDEX_SEARCHABLE, - "norms", String.valueOf(!disableNorms))); + "norms", String.valueOf(!disableNorms), + "store", String.valueOf(store))); } else { hash.put("type", "multi_field"); @@ -283,7 +290,8 @@ public class NewIndex { multiFields.put(fieldName, ImmutableMap.of( "type", FIELD_TYPE_KEYWORD, "index", INDEX_SEARCHABLE, - "norms", "false" + "norms", "false", + "store", String.valueOf(store) )); hash.put("fields", multiFields); diff --git a/server/sonar-server/src/main/java/org/sonar/server/es/metadata/MetadataIndexDefinition.java b/server/sonar-server/src/main/java/org/sonar/server/es/metadata/MetadataIndexDefinition.java index bdffcf6b5eb..4eb744e5b59 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/es/metadata/MetadataIndexDefinition.java +++ b/server/sonar-server/src/main/java/org/sonar/server/es/metadata/MetadataIndexDefinition.java @@ -44,6 +44,6 @@ public class MetadataIndexDefinition { NewIndex.NewIndexType mapping = index.createType(INDEX_TYPE_METADATA.getType()); - mapping.keywordFieldBuilder(FIELD_VALUE).disableSearch().build(); + mapping.keywordFieldBuilder(FIELD_VALUE).disableSearch().store().build(); } } -- 2.39.5