From e0a3ae5eb516db2143957b70b4b1034f6b0f4704 Mon Sep 17 00:00:00 2001 From: Andriy Redko Date: Fri, 18 Feb 2022 12:11:37 -0500 Subject: [PATCH] More highlighter-related test fixes Signed-off-by: Andriy Redko --- .../analysis/common/HighlighterWithAnalyzersTests.java | 1 - .../java/org/opensearch/join/query/ChildQuerySearchIT.java | 1 - .../fetch/subphase/highlight/AnnotatedTextHighlighterTests.java | 1 - .../main/java/org/apache/lucene/util/packed/XPackedInts.java | 2 +- 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/HighlighterWithAnalyzersTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/HighlighterWithAnalyzersTests.java index 9d2d24516d7b4..bc7dd3b110287 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/HighlighterWithAnalyzersTests.java +++ b/modules/analysis-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/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/query/ChildQuerySearchIT.java b/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/query/ChildQuerySearchIT.java index 43eea12e38cac..2972b170e07b7 100644 --- a/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/query/ChildQuerySearchIT.java +++ b/modules/parent-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/plugins/mapper-annotated-text/src/test/java/org/opensearch/search/fetch/subphase/highlight/AnnotatedTextHighlighterTests.java b/plugins/mapper-annotated-text/src/test/java/org/opensearch/search/fetch/subphase/highlight/AnnotatedTextHighlighterTests.java index 8af1a91a867ec..fe75566c315a1 100644 --- a/plugins/mapper-annotated-text/src/test/java/org/opensearch/search/fetch/subphase/highlight/AnnotatedTextHighlighterTests.java +++ b/plugins/mapper-annotated-text/src/test/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/server/src/main/java/org/apache/lucene/util/packed/XPackedInts.java b/server/src/main/java/org/apache/lucene/util/packed/XPackedInts.java index 36dd066c8030e..9a277a7b5f2f4 100644 --- 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