Skip to content

temporarily putting PPL Alerting serde behind 3.6 check #951

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
toepkerd wants to merge 1 commit into
base: main
Choose a base branch
from
Open

temporarily putting PPL Alerting serde behind 3.6 check #951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/main/kotlin/org/opensearch/commons/alerting/model/Alert.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,12 +417,14 @@ data class Alert(
executionId = sin.readOptionalString(),
associatedAlertIds = sin.readStringList(),
clusters = sin.readOptionalStringList(),
query = if (sin.version.onOrAfter(Version.V_3_7_0)) {
// TODO: change to 3.7 when alerting version bump happens
query = if (sin.version.onOrAfter(Version.V_3_6_0)) {
sin.readOptionalString()
} else {
null
},
queryResults = if (sin.version.onOrAfter(Version.V_3_7_0)) {
// TODO: change to 3.7 when alerting version bump happens
queryResults = if (sin.version.onOrAfter(Version.V_3_6_0)) {
sin.readList { input -> suppressWarning(input.readMap()) }
} else {
listOf()
Expand Down Expand Up @@ -470,7 +472,8 @@ data class Alert(
out.writeOptionalString(executionId)
out.writeStringCollection(associatedAlertIds)
out.writeOptionalStringArray(clusters?.toTypedArray())
if (out.version.onOrAfter(Version.V_3_7_0)) {
// TODO: change to 3.7 when alerting version bump happens
if (out.version.onOrAfter(Version.V_3_6_0)) {
out.writeOptionalString(query)
out.writeCollection(queryResults) { output, map ->
output.writeMap(map)
Expand Down
12 changes: 8 additions & 4 deletions src/main/kotlin/org/opensearch/commons/alerting/model/MonitorRunResult.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,8 @@ data class InputRunResults(
out.writeMap(map)
}

if (out.version.onOrAfter(Version.V_3_7_0)) {
// TODO: change to 3.7 when alerting version bump happens
if (out.version.onOrAfter(Version.V_3_6_0)) {
out.writeVInt(pplBaseQueryResults.size)
for (datarow in pplBaseQueryResults) {
out.writeMap(datarow)
Expand All @@ -149,18 +150,21 @@ data class InputRunResults(
for (i in 0 until count) {
list.add(suppressWarning(sin.readMap())) // result(map)
}
val pplCount = if (sin.version.onOrAfter(Version.V_3_7_0)) {
// TODO: change to 3.7 when alerting version bump happens
val pplCount = if (sin.version.onOrAfter(Version.V_3_6_0)) {
sin.readVInt()
} else {
0
}
val pplList = mutableListOf<Map<String, Any?>>()
if (sin.version.onOrAfter(Version.V_3_7_0)) {
// TODO: change to 3.7 when alerting version bump happens
if (sin.version.onOrAfter(Version.V_3_6_0)) {
for (i in 0 until pplCount) {
pplList.add(suppressWarning(sin.readMap())) // pplResults
}
}
val pplNumResults = if (sin.version.onOrAfter(Version.V_3_7_0)) {
// TODO: change to 3.7 when alerting version bump happens
val pplNumResults = if (sin.version.onOrAfter(Version.V_3_6_0)) {
sin.readOptionalLong()
} else {
null
Expand Down
6 changes: 4 additions & 2 deletions src/main/kotlin/org/opensearch/commons/alerting/model/QueryLevelTriggerRunResult.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ open class QueryLevelTriggerRunResult(
error = sin.readException(),
triggered = sin.readBoolean(),
actionResults = sin.readMap() as MutableMap<String, ActionRunResult>,
pplCustomQueryResults = if (sin.version.onOrAfter(Version.V_3_7_0)) {
// TODO: change to 3.7 when alerting version bump happens
pplCustomQueryResults = if (sin.version.onOrAfter(Version.V_3_6_0)) {
sin.readList { it.readMap() }
} else {
listOf()
Expand Down Expand Up @@ -62,7 +63,8 @@ open class QueryLevelTriggerRunResult(
super.writeTo(out)
out.writeBoolean(triggered)
out.writeMap(actionResults as Map<String, ActionRunResult>)
if (out.version.onOrAfter(Version.V_3_7_0)) {
// TODO: change to 3.7 when alerting version bump happens
if (out.version.onOrAfter(Version.V_3_6_0)) {
out.writeCollection(pplCustomQueryResults) { stream, map -> stream.writeMap(map) }
}
}
Expand Down
Loading