Tweak TextRollingUpgradeIT and MatchOnlyTextRollingUpgradeIT (#135636)

to also run a phrase query.

Author: martijnvg

x-pack/plugin/logsdb/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/MatchOnlyTextRollingUpgradeIT.java

@@ -118,22 +118,23 @@ public void testIndexing() throws Exception {
             // when/then - run some queries and verify results
             ensureGreen(DATA_STREAM);
             search(DATA_STREAM);
+            phraseSearch(DATA_STREAM);
             query(DATA_STREAM);
-
         } else if (isMixedCluster()) {
             // when
             bulkIndex(NUM_REQUESTS, NUM_DOCS_PER_REQUEST);
 
             // when/then
             ensureGreen(DATA_STREAM);
             search(DATA_STREAM);
+            phraseSearch(DATA_STREAM);
             query(DATA_STREAM);
-
         } else if (isUpgradedCluster()) {
             // when/then
             ensureGreen(DATA_STREAM);
             bulkIndex(NUM_REQUESTS, NUM_DOCS_PER_REQUEST);
             search(DATA_STREAM);
+            phraseSearch(DATA_STREAM);
             query(DATA_STREAM);
 
             // when/then continued - force merge all shard segments into one
@@ -244,6 +245,25 @@ void search(String dataStreamName) throws Exception {
         assertThat(totalCount, greaterThanOrEqualTo(NUM_REQUESTS * NUM_DOCS_PER_REQUEST));
     }
 
+    private void phraseSearch(String dataStreamName) throws Exception {
+        var searchRequest = new Request("POST", "/" + dataStreamName + "/_search");
+        searchRequest.addParameter("pretty", "true");
+        searchRequest.setJsonEntity("""
+                {
+                    "query": {
+                        "match_phrase": {
+                            "message": "$smallestMessage"
+                        }
+                    }
+                }
+            """.replace("$smallestMessage", smallestMessage));
+        var response = client().performRequest(searchRequest);
+        assertOK(response);
+        var responseBody = entityAsMap(response);
+        logger.info("{}", responseBody);
+        assertThat(ObjectPath.evaluate(responseBody, "hits.total.value"), greaterThanOrEqualTo(1));
+    }
+
     private void query(String dataStreamName) throws Exception {
         var queryRequest = new Request("POST", "/_query");
         queryRequest.addParameter("pretty", "true");

x-pack/plugin/logsdb/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/TextRollingUpgradeIT.java

@@ -88,7 +88,6 @@ public TextRollingUpgradeIT(@Name("upgradedNodes") int upgradedNodes) {
     }
 
     public void testIndexing() throws Exception {
-
         if (isOldCluster()) {
             // given - enable logsdb and create a template
             startTrial();
@@ -111,22 +110,23 @@ public void testIndexing() throws Exception {
             // when/then - run some queries and verify results
             ensureGreen(DATA_STREAM);
             search(DATA_STREAM);
+            phraseSearch(DATA_STREAM);
             query(DATA_STREAM);
-
         } else if (isMixedCluster()) {
             // when
             bulkIndex(NUM_REQUESTS, NUM_DOCS_PER_REQUEST);
 
             // when/then
             ensureGreen(DATA_STREAM);
             search(DATA_STREAM);
+            phraseSearch(DATA_STREAM);
             query(DATA_STREAM);
-
         } else if (isUpgradedCluster()) {
             // when/then
             ensureGreen(DATA_STREAM);
             bulkIndex(NUM_REQUESTS, NUM_DOCS_PER_REQUEST);
             search(DATA_STREAM);
+            phraseSearch(DATA_STREAM);
             query(DATA_STREAM);
 
             // when/then continued - force merge all shard segments into one
@@ -232,7 +232,7 @@ private void recordSmallestMessage(final String message) {
         }
     }
 
-    void search(String dataStreamName) throws Exception {
+    private void search(String dataStreamName) throws Exception {
         var searchRequest = new Request("POST", "/" + dataStreamName + "/_search");
         searchRequest.addParameter("pretty", "true");
         searchRequest.setJsonEntity("""
@@ -249,6 +249,25 @@ void search(String dataStreamName) throws Exception {
         assertThat(totalCount, greaterThanOrEqualTo(NUM_REQUESTS * NUM_DOCS_PER_REQUEST));
     }
 
+    private void phraseSearch(String dataStreamName) throws Exception {
+        var searchRequest = new Request("POST", "/" + dataStreamName + "/_search");
+        searchRequest.addParameter("pretty", "true");
+        searchRequest.setJsonEntity("""
+                {
+                    "query": {
+                        "match_phrase": {
+                            "message": "$smallestMessage"
+                        }
+                    }
+                }
+            """.replace("$smallestMessage", smallestMessage));
+        var response = client().performRequest(searchRequest);
+        assertOK(response);
+        var responseBody = entityAsMap(response);
+        logger.info("{}", responseBody);
+        assertThat(ObjectPath.evaluate(responseBody, "hits.total.value"), greaterThanOrEqualTo(1));
+    }
+
     private void query(String dataStreamName) throws Exception {
         var queryRequest = new Request("POST", "/_query");
         queryRequest.addParameter("pretty", "true");