Skip to content
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

Jump to bottom

fix(query): correcly escape LogicalPlan-to-String backslashes #1732

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

fix(query): correcly escape LogicalPlan-to-String backslashes #1732

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions coordinator/src/main/scala/filodb.coordinator/queryplanner/LogicalPlanParser.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,12 @@ object LogicalPlanParser {

def miscellaneousFnToQuery(lp: ApplyMiscellaneousFunction): String = {
val prefix = s"${lp.function.entryName}$OpeningRoundBracket${convertToQuery(lp.vectors)}"
if(lp.stringArgs.isEmpty) s"$prefix$ClosingRoundBracket"
else s"$prefix$Comma${lp.stringArgs.map(Quotes + _ + Quotes).mkString(Comma)}$ClosingRoundBracket"
if (lp.stringArgs.isEmpty) {
s"$prefix$ClosingRoundBracket"
} else {
val escapedArgs = lp.stringArgs.map(Quotes + StringEscapeUtils.escapeJava(_) + Quotes)
s"$prefix$Comma${escapedArgs.mkString(Comma)}$ClosingRoundBracket"
}
}

def scalarVaryingDoubleToQuery(lp: ScalarVaryingDoublePlan): String = {
Expand Down
19 changes: 16 additions & 3 deletions coordinator/src/test/scala/filodb.coordinator/queryplanner/PlannerHierarchySpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,15 +120,16 @@ class PlannerHierarchySpec extends AnyFunSpec with Matchers with PlanValidationS
if (shardColumnFilters.exists(f => f.column == "_ns_" && f.filter.isInstanceOf[EqualsRegex])) {
// to ensure that tests dont call something else that is not configured
require(shardColumnFilters.exists(f => f.column == "_ns_" && f.filter.isInstanceOf[EqualsRegex]
&& (
f.filter.asInstanceOf[EqualsRegex].pattern.toString == ".*Ns"
|| f.filter.asInstanceOf[EqualsRegex].pattern.toString == "localNs.*")))
&& Set(".*Ns", "localNs.*", "remoteNs.*").contains(f.filter.asInstanceOf[EqualsRegex].pattern.toString)))

val nsCol = shardColumnFilters.find(_.column == "_ns_").get
if (nsCol.filter.asInstanceOf[EqualsRegex].pattern.toString == "localNs.*") {
Seq(
Seq(ColumnFilter("_ws_", Equals("demo")), ColumnFilter("_ns_", Equals("localNs"))),
Seq(ColumnFilter("_ws_", Equals("demo")), ColumnFilter("_ns_", Equals("localNs1")))
)
} else if (nsCol.filter.asInstanceOf[EqualsRegex].pattern.toString == "remoteNs.*") {
Seq(Seq(ColumnFilter("_ws_", Equals("demo")), ColumnFilter("_ns_", Equals("remoteNs"))))
} else {
Seq(
Seq(ColumnFilter("_ws_", Equals("demo")), ColumnFilter("_ns_", Equals("localNs"))),
Expand Down Expand Up @@ -233,6 +234,18 @@ class PlannerHierarchySpec extends AnyFunSpec with Matchers with PlanValidationS
validatePlan(execPlan, expected)
}

it("should correctly interpret escaped backslashes and add escapes for miscellaneous funcs") {
val lp = Parser.queryRangeToLogicalPlan(
"""label_replace(foo{_ws_="my-ws", _ns_=~"remoteNs.*", otherFilter=~"foo\\.*"}, "newLabel", "$1", "sourceLabel", "(value-\\d+)-.*")""",
TimeStepParams(startSeconds, step, endSeconds), Antlr)
val execPlan = rootPlanner.materialize(lp, QueryContext(
origQueryParams = queryParams,
plannerParams = PlannerParams(processMultiPartition = true)))
val expected =
"""E~PromQlRemoteExec(PromQlQueryParams(label_replace(foo{otherFilter=~"foo\\.*",_ws_="demo",_ns_="remoteNs"},"newLabel","$1","sourceLabel","(value-\\d+)-.*"),1633913330,300,1634777330,None,false), PlannerParams(filodb,None,None,None,None,60000,PerQueryLimits(1000000,18000000,100000,100000,300000000,1000000,200000000),PerQueryLimits(50000,15000000,50000,50000,150000000,500000,100000000),None,None,None,false,86400000,86400000,false,true,false,false,true,10,false), queryEndpoint=remotePartition-url, requestTimeoutMs=10000) on InProcessPlanDispatcher(QueryConfig(10 seconds,300000,1,50,antlr,true,true,None,Some(10000),None,None,25,true,false,true,Set(),Some(plannerSelector),Map(filodb-query-exec-metadataexec -> 65536, filodb-query-exec-aggregate-large-container -> 65536),RoutingConfig(false,1800000 milliseconds,true,0)))""".stripMargin
validatePlan(execPlan, expected)
}

it("Plan with unary expression should be equals to its binary counterpart2.") {
val unaryExpressions = List("""-foo{_ws_ = "demo", _ns_ = "localNs"}""", """+foo{_ws_ = "demo", _ns_ = "localNs"}""",
"""-(foo{_ws_ = "demo", _ns_ = "localNs"} - bar{_ws_ = "demo", _ns_ = "localNs"})""",
Expand Down