Set term vector flags to false for ._index_prefix field (#1901). (#3119)

* Set term vector flags to false for ._index_prefix field (#1901). Signed-off-by: Vesa Pehkonen <[email protected]> * Replaced the FieldType copy ctor with ctor for the prefix field and replaced setting the field type parameters with setIndexOptions(). (#1901) Signed-off-by: Vesa Pehkonen <[email protected]> * Added tests for term vectors. (#1901) Signed-off-by: Vesa Pehkonen <[email protected]> * Fixed code formatting error. Signed-off-by: Vesa Pehkonen <[email protected]> Co-authored-by: sdp <[email protected]>
opensearch-project · May 26, 2022 · e647525 · e647525
1 parent 1e6dd56
commit e647525
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 8 deletions.
diff --git a/...s/mapper-extras/src/main/java/org/opensearch/index/mapper/SearchAsYouTypeFieldMapper.java b/...s/mapper-extras/src/main/java/org/opensearch/index/mapper/SearchAsYouTypeFieldMapper.java
@@ -205,8 +205,8 @@ public SearchAsYouTypeFieldMapper build(Mapper.BuilderContext context) {
             ft.setIndexAnalyzer(analyzers.getIndexAnalyzer());
 
             // set up the prefix field
-            FieldType prefixft = new FieldType(fieldType);
-            prefixft.setStoreTermVectors(false);
+            FieldType prefixft = new FieldType();
+            prefixft.setIndexOptions(fieldType.indexOptions());
             prefixft.setOmitNorms(true);
             prefixft.setStored(false);
             final String fullName = buildFullName(context);

diff --git a/...per-extras/src/test/java/org/opensearch/index/mapper/SearchAsYouTypeFieldMapperTests.java b/...per-extras/src/test/java/org/opensearch/index/mapper/SearchAsYouTypeFieldMapperTests.java
@@ -352,15 +352,30 @@ public void testIndex() throws IOException {
     }
 
     public void testTermVectors() throws IOException {
-        DocumentMapper mapper = createDocumentMapper(fieldMapping(b -> b.field("type", "search_as_you_type").field("term_vector", "yes")));
+        String[] termVectors = {
+            "yes",
+            "with_positions",
+            "with_offsets",
+            "with_positions_offsets",
+            "with_positions_payloads",
+            "with_positions_offsets_payloads" };
+
+        for (String termVector : termVectors) {
+            DocumentMapper mapper = createDocumentMapper(
+                fieldMapping(b -> b.field("type", "search_as_you_type").field("term_vector", termVector))
+            );
 
-        assertTrue(getRootFieldMapper(mapper, "field").fieldType().fieldType.storeTermVectors());
+            assertTrue(getRootFieldMapper(mapper, "field").fieldType().fieldType.storeTermVectors());
 
-        Stream.of(getShingleFieldMapper(mapper, "field._2gram"), getShingleFieldMapper(mapper, "field._3gram"))
-            .forEach(m -> assertTrue("for " + m.name(), m.fieldType.storeTermVectors()));
+            Stream.of(getShingleFieldMapper(mapper, "field._2gram"), getShingleFieldMapper(mapper, "field._3gram"))
+                .forEach(m -> assertTrue("for " + m.name(), m.fieldType.storeTermVectors()));
 
-        PrefixFieldMapper prefixFieldMapper = getPrefixFieldMapper(mapper, "field._index_prefix");
-        assertFalse(prefixFieldMapper.fieldType.storeTermVectors());
+            PrefixFieldMapper prefixFieldMapper = getPrefixFieldMapper(mapper, "field._index_prefix");
+            assertFalse(prefixFieldMapper.fieldType.storeTermVectors());
+            assertFalse(prefixFieldMapper.fieldType.storeTermVectorOffsets());
+            assertFalse(prefixFieldMapper.fieldType.storeTermVectorPositions());
+            assertFalse(prefixFieldMapper.fieldType.storeTermVectorPayloads());
+        }
     }
 
     public void testNorms() throws IOException {