More highlighter-related test fixes (#2)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io> Signed-off-by: Nicholas Walter Knize <nknize@apache.org>
nknize · Mar 15, 2022 · 360c7d2 · 360c7d2
1 parent f8e21b5
commit 360c7d2
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 5 deletions.
diff --git a/...is-common/src/test/java/org/opensearch/analysis/common/HighlighterWithAnalyzersTests.java b/...is-common/src/test/java/org/opensearch/analysis/common/HighlighterWithAnalyzersTests.java
@@ -252,7 +252,6 @@ public void testSynonyms() throws IOException {
         }
     }
 
-    @AwaitsFix(bugUrl = "https://github.com/opensearch-project/OpenSearch/issues/2063")
     public void testPhrasePrefix() throws IOException {
         Settings.Builder builder = Settings.builder()
             .put(indexSettings())

diff --git a/...arent-join/src/internalClusterTest/java/org/opensearch/join/query/ChildQuerySearchIT.java b/...arent-join/src/internalClusterTest/java/org/opensearch/join/query/ChildQuerySearchIT.java
@@ -1832,7 +1832,6 @@ public void testHasParentInnerQueryType() {
         assertSearchHits(searchResponse, "child-id");
     }
 
-    @AwaitsFix(bugUrl = "https://github.com/opensearch-project/OpenSearch/issues/2063")
     public void testHighlightersIgnoreParentChild() throws IOException {
         assertAcked(
             prepareCreate("test").addMapping(

diff --git a/...st/java/org/opensearch/search/fetch/subphase/highlight/AnnotatedTextHighlighterTests.java b/...st/java/org/opensearch/search/fetch/subphase/highlight/AnnotatedTextHighlighterTests.java
@@ -215,7 +215,6 @@ public void testAnnotatedTextSingleFieldWithBreakIterator() throws Exception {
         assertHighlightOneDoc("text", markedUpInputs, query, Locale.ROOT, breakIterator, 0, expectedPassages);
     }
 
-    @AwaitsFix(bugUrl = "https://fixbugForLUCENE9")
     public void testAnnotatedTextSingleFieldWithPhraseQuery() throws Exception {
         final String[] markedUpInputs = { "[Donald Trump](Donald+Trump) visited Singapore", "Donald Jr was with Melania Trump" };
         String[] expectedPassages = { "[Donald](_hit_term=donald) [Trump](_hit_term=trump) visited Singapore" };

diff --git a/...lClusterTest/java/org/opensearch/search/fetch/subphase/highlight/HighlighterSearchIT.java b/...lClusterTest/java/org/opensearch/search/fetch/subphase/highlight/HighlighterSearchIT.java
@@ -3301,7 +3301,7 @@ public void testCopyToFields() throws Exception {
         b.endObject().endObject();
         prepareCreate("test").addMapping("type", b).get();
 
-        client().prepareIndex("test", "type")
+        client().prepareIndex("test")
             .setId("1")
             .setSource(jsonBuilder().startObject().field("foo", "how now brown cow").endObject())
             .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE)

diff --git a/server/src/main/java/org/apache/lucene/util/packed/XPackedInts.java b/server/src/main/java/org/apache/lucene/util/packed/XPackedInts.java
@@ -35,7 +35,7 @@
 /**
  * Forked from Lucene 8.x; removed in Lucene 8.9
  *
- * @todo further investigate a better alternative
+ * Todo: further investigate a better alternative
  *
  * Simplistic compression for array of unsigned long values. Each value is {@code >= 0} and {@code
  * <=} a specified maximum value. The values are stored as packed ints, with each value consuming a

diff --git a/server/src/main/java/org/opensearch/index/engine/LuceneChangesSnapshot.java b/server/src/main/java/org/opensearch/index/engine/LuceneChangesSnapshot.java
@@ -289,6 +289,8 @@ private Translog.Operation readDocAsOp(int docIndex) throws IOException {
             : SourceFieldMapper.NAME;
         final FieldsVisitor fields = new FieldsVisitor(true, sourceField);
         leaf.reader().document(segmentDocID, fields);
+        // todo: remove postProcess after removing types and uid from translog
+        fields.postProcess(mapperService);
 
         final Translog.Operation op;
         final boolean isTombstone = parallelArray.isTombStone[docIndex];