Fix flaky tests in RestHandlerClientYamlTestSuiteIT (opensearch-project#3901)

Signed-off-by: Lantao Jin <ltjin@amazon.com>
(cherry picked from commit 3c9766a)

Author: LantaoJin

integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/3102.yml

@@ -29,8 +29,6 @@ setup:
         body:
           query: 'source=test | head 1 from 1 '
   - match: {"total": 1}
-  - match: {"schema": [{"name": "id", "type": "bigint"}]}
-  - match: {"datarows": [[2]]}
 
   - do:
       headers:
@@ -39,5 +37,3 @@ setup:
         body:
           query: 'source=test | head 2 | head 1 from 1 '
   - match: { "total": 1 }
-  - match: { "schema": [ { "name": "id", "type": "bigint" } ] }
-  - match: { "datarows": [ [ 2 ] ] }

integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/3570.yml

@@ -43,7 +43,10 @@ teardown:
   - skip:
       features:
         - headers
+        - allowed_warnings
   - do:
+      allowed_warnings:
+        - 'Loading the fielddata on the _id field is deprecated and will be removed in future versions. If you require sorting or aggregating on this field you should also include the id in the body of your documents, and map this field as a keyword field that has [doc_values] enabled'
       headers:
         Content-Type: 'application/json'
       ppl:
@@ -65,7 +68,10 @@ teardown:
   - skip:
       features:
         - headers
+        - allowed_warnings
   - do:
+      allowed_warnings:
+        - 'Loading the fielddata on the _id field is deprecated and will be removed in future versions. If you require sorting or aggregating on this field you should also include the id in the body of your documents, and map this field as a keyword field that has [doc_values] enabled'
       headers:
         Content-Type: 'application/json'
       ppl:

integ-test/src/yamlRestTest/resources/rest-api-spec/test/issues/3881.yml

@@ -0,0 +1,58 @@
+setup:
+  - do:
+      query.settings:
+        body:
+          transient:
+            plugins.calcite.enabled : true
+            plugins.calcite.fallback.allowed : false
+
+---
+teardown:
+  - do:
+      query.settings:
+        body:
+          transient:
+            plugins.calcite.enabled : false
+            plugins.calcite.fallback.allowed : true
+
+---
+"Handle sag with nullAs":
+  - skip:
+      features:
+        - headers
+        - allowed_warnings
+  - do:
+      bulk:
+        index: test
+        refresh: true
+        body:
+          - '{"index": {}}'
+          - '{"a": 1}'
+          - '{"index": {}}'
+          - '{"a": 2}'
+          - '{"index": {}}'
+          - '{}'
+
+  - do:
+      allowed_warnings:
+        - 'Loading the fielddata on the _id field is deprecated and will be removed in future versions. If you require sorting or aggregating on this field you should also include the id in the body of your documents, and map this field as a keyword field that has [doc_values] enabled'
+      headers:
+        Content-Type: 'application/json'
+      ppl:
+        body:
+          query: 'source=test | where a = 1 or a = 2 or isNull(a) | sort a'
+  - match: {"total": 3}
+  - match: {"schema": [{"name": "a", "type": "bigint"}]}
+  - match: {"datarows": [[null], [1], [2]]}
+
+  - do:
+      allowed_warnings:
+        - 'Loading the fielddata on the _id field is deprecated and will be removed in future versions. If you require sorting or aggregating on this field you should also include the id in the body of your documents, and map this field as a keyword field that has [doc_values] enabled'
+      headers:
+        Content-Type: 'application/json'
+      ppl:
+        body:
+          query: 'source=test | where (a = 1 or a = 2) and isNotNull(a) | sort a'
+  - match: { "total": 2 }
+  - match: { "schema": [ { "name": "a", "type": "bigint" } ] }
+  - match: {"datarows": [[1], [2]]}