From 693c1b453ac2e6734cd4ba9d90e2a9baeb816415 Mon Sep 17 00:00:00 2001 From: Surya Sashank Nistala Date: Mon, 27 Nov 2023 15:31:35 -0800 Subject: [PATCH] Revert "add 'fields' parameter in doc level query object. (#546) (#551)" This reverts commit d92419dd20bc1041ea58b2ff0176dacbe135352f. --- .../commons/alerting/model/DocLevelQuery.kt | 18 ------------------ .../opensearch/commons/alerting/TestHelpers.kt | 2 +- .../action/GetFindingsResponseTests.kt | 4 ++-- .../commons/alerting/model/WriteableTests.kt | 11 ----------- 4 files changed, 3 insertions(+), 32 deletions(-) diff --git a/src/main/kotlin/org/opensearch/commons/alerting/model/DocLevelQuery.kt b/src/main/kotlin/org/opensearch/commons/alerting/model/DocLevelQuery.kt index 576be89b..a12b3240 100644 --- a/src/main/kotlin/org/opensearch/commons/alerting/model/DocLevelQuery.kt +++ b/src/main/kotlin/org/opensearch/commons/alerting/model/DocLevelQuery.kt @@ -14,7 +14,6 @@ import java.util.UUID data class DocLevelQuery( val id: String = UUID.randomUUID().toString(), val name: String, - val fields: List, val query: String, val tags: List = mutableListOf() ) : BaseModel { @@ -31,7 +30,6 @@ data class DocLevelQuery( constructor(sin: StreamInput) : this( sin.readString(), // id sin.readString(), // name - sin.readStringList(), // fields sin.readString(), // query sin.readStringList() // tags ) @@ -40,7 +38,6 @@ data class DocLevelQuery( return mapOf( QUERY_ID_FIELD to id, NAME_FIELD to name, - FIELDS_FIELD to fields, QUERY_FIELD to query, TAGS_FIELD to tags ) @@ -50,7 +47,6 @@ data class DocLevelQuery( override fun writeTo(out: StreamOutput) { out.writeString(id) out.writeString(name) - out.writeStringCollection(fields) out.writeString(query) out.writeStringCollection(tags) } @@ -68,7 +64,6 @@ data class DocLevelQuery( companion object { const val QUERY_ID_FIELD = "id" const val NAME_FIELD = "name" - const val FIELDS_FIELD = "fields" const val QUERY_FIELD = "query" const val TAGS_FIELD = "tags" const val NO_ID = "" @@ -81,7 +76,6 @@ data class DocLevelQuery( lateinit var query: String lateinit var name: String val tags: MutableList = mutableListOf() - val fields: MutableList = mutableListOf() XContentParserUtils.ensureExpectedToken(XContentParser.Token.START_OBJECT, xcp.currentToken(), xcp) while (xcp.nextToken() != XContentParser.Token.END_OBJECT) { @@ -107,24 +101,12 @@ data class DocLevelQuery( tags.add(tag) } } - FIELDS_FIELD -> { - XContentParserUtils.ensureExpectedToken( - XContentParser.Token.START_ARRAY, - xcp.currentToken(), - xcp - ) - while (xcp.nextToken() != XContentParser.Token.END_ARRAY) { - val field = xcp.text() - fields.add(field) - } - } } } return DocLevelQuery( id = id, name = name, - fields = fields, query = query, tags = tags ) diff --git a/src/test/kotlin/org/opensearch/commons/alerting/TestHelpers.kt b/src/test/kotlin/org/opensearch/commons/alerting/TestHelpers.kt index 3889d1d6..a4f880a9 100644 --- a/src/test/kotlin/org/opensearch/commons/alerting/TestHelpers.kt +++ b/src/test/kotlin/org/opensearch/commons/alerting/TestHelpers.kt @@ -383,7 +383,7 @@ fun randomDocLevelQuery( name: String = "${RandomNumbers.randomIntBetween(Random(), 0, 5)}", tags: List = mutableListOf(0..RandomNumbers.randomIntBetween(Random(), 0, 10)).map { RandomStrings.randomAsciiLettersOfLength(Random(), 10) } ): DocLevelQuery { - return DocLevelQuery(id = id, query = query, name = name, tags = tags, fields = listOf("*")) + return DocLevelQuery(id = id, query = query, name = name, tags = tags) } fun randomDocLevelMonitorInput( diff --git a/src/test/kotlin/org/opensearch/commons/alerting/action/GetFindingsResponseTests.kt b/src/test/kotlin/org/opensearch/commons/alerting/action/GetFindingsResponseTests.kt index 1a8b2bdb..8d40492a 100644 --- a/src/test/kotlin/org/opensearch/commons/alerting/action/GetFindingsResponseTests.kt +++ b/src/test/kotlin/org/opensearch/commons/alerting/action/GetFindingsResponseTests.kt @@ -24,7 +24,7 @@ internal class GetFindingsResponseTests { "monitor_id1", "monitor_name1", "test_index1", - listOf(DocLevelQuery("1", "myQuery", listOf(), "fieldA:valABC", listOf())), + listOf(DocLevelQuery("1", "myQuery", "fieldA:valABC", listOf())), Instant.now() ) val findingDocument1 = FindingDocument("test_index1", "doc1", true, "document 1 payload") @@ -43,7 +43,7 @@ internal class GetFindingsResponseTests { "monitor_id2", "monitor_name2", "test_index2", - listOf(DocLevelQuery("1", "myQuery", listOf(), "fieldA:valABC", listOf())), + listOf(DocLevelQuery("1", "myQuery", "fieldA:valABC", listOf())), Instant.now() ) val findingDocument21 = FindingDocument("test_index2", "doc21", true, "document 21 payload") diff --git a/src/test/kotlin/org/opensearch/commons/alerting/model/WriteableTests.kt b/src/test/kotlin/org/opensearch/commons/alerting/model/WriteableTests.kt index a66d7222..b605cfbe 100644 --- a/src/test/kotlin/org/opensearch/commons/alerting/model/WriteableTests.kt +++ b/src/test/kotlin/org/opensearch/commons/alerting/model/WriteableTests.kt @@ -10,7 +10,6 @@ import org.opensearch.commons.alerting.randomAction import org.opensearch.commons.alerting.randomActionExecutionPolicy import org.opensearch.commons.alerting.randomBucketLevelTrigger import org.opensearch.commons.alerting.randomChainedAlertTrigger -import org.opensearch.commons.alerting.randomDocLevelQuery import org.opensearch.commons.alerting.randomDocumentLevelTrigger import org.opensearch.commons.alerting.randomQueryLevelMonitor import org.opensearch.commons.alerting.randomQueryLevelTrigger @@ -113,16 +112,6 @@ class WriteableTests { Assertions.assertEquals(trigger, newTrigger, "Round tripping DocumentLevelTrigger doesn't work") } - @Test - fun `test doc-level query as stream`() { - val dlq = randomDocLevelQuery() - val out = BytesStreamOutput() - dlq.writeTo(out) - val sin = StreamInput.wrap(out.bytes().toBytesRef().bytes) - val newDlq = DocLevelQuery.readFrom(sin) - Assertions.assertEquals(dlq, newDlq, "Round tripping DocLevelQuery doesn't work") - } - @Test fun `test chained alert trigger as stream`() { val trigger = randomChainedAlertTrigger()