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

feat(query): delete validation for "split" queries contain binary joins with offsets #1910

Merged
merged 7 commits into from
Dec 13, 2024
Merged

feat(query): delete validation for "split" queries contain binary joins with offsets #1910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5659d3e
delete validation for "split" queries contain binary joins with offsets
Dec 10, 2024
b5aa44b
delete validation for "split" queries contain binary joins with offsets
Dec 10, 2024
b83e947
delete validation for "split" queries contain binary joins with offsets
Dec 10, 2024
b6b9633
delete corresponding tests
Dec 11, 2024
cf5cf8c
add test for split query with offset binary joins
Dec 11, 2024
875e639
increase maxRemoteRawExportTimeRange
Dec 11, 2024
0114747
updated tests
Dec 12, 2024
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
27 changes: 0 additions & 27 deletions coordinator/src/main/scala/filodb.coordinator/queryplanner/MultiPartitionPlanner.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,30 +567,6 @@ class MultiPartitionPlanner(val partitionLocationProvider: PartitionLocationProv
}}
}

/**
* Throws a BadQueryException if any of the following conditions hold:
* (1) the plan spans more than one non-metric shard key prefix.
* (2) the plan contains at least one BinaryJoin, and any of its BinaryJoins contain an offset.
* @param splitLeafPlan must contain leaf plans that individually span multiple partitions.
*/
private def validateSplitLeafPlan(splitLeafPlan: LogicalPlan): Unit = {
val baseErrorMessage = "This query contains selectors that individually read data from multiple partitions. " +
"This is likely because a selector's data was migrated between partitions. "
if (hasBinaryJoin(splitLeafPlan) && getOffsetMillis(splitLeafPlan).exists(_ > 0)) {
throw new BadQueryException( baseErrorMessage +
"These \"split\" queries cannot contain binary joins with offsets."
)
}
lazy val hasMoreThanOneNonMetricShardKey =
LogicalPlanUtils.resolvePipeConcatenatedShardKeyFilters(splitLeafPlan, dataset.options.nonMetricShardColumns)
.filter(_.nonEmpty).distinct.size > 1
if (hasMoreThanOneNonMetricShardKey) {
throw new BadQueryException( baseErrorMessage +
"These \"split\" queries are not supported if they contain multiple non-metric shard keys."
)
}
}

/**
* Materializes a LogicalPlan with leaves that individually span multiple partitions.
* All "split-leaf" plans will fail to materialize (throw a BadQueryException) if they
Expand All @@ -601,9 +577,6 @@ class MultiPartitionPlanner(val partitionLocationProvider: PartitionLocationProv
//scalastyle:off method.length
private def materializeSplitLeafPlan(logicalPlan: LogicalPlan,
qContext: QueryContext): PlanResult = {
// TODO: Reassess this validate, we should also support binary joins in split leaf as long as they are within
// the limits of max range of data exported
validateSplitLeafPlan(logicalPlan)
Boyuan-Yu marked this conversation as resolved.
Show resolved Hide resolved
val qParams = qContext.origQueryParams.asInstanceOf[PromQlQueryParams]
// get a mapping of assignments to time-ranges to query
val lookbackMs = getLookBackMillis(logicalPlan).max
Expand Down
14 changes: 1 addition & 13 deletions coordinator/src/test/scala/filodb.coordinator/queryplanner/MultiPartitionPlannerSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import filodb.prometheus.ast.TimeStepParams
import filodb.prometheus.parse.Parser
import filodb.query.BinaryOperator.{ADD, LAND}
import filodb.query.InstantFunctionId.Ln
import filodb.query.{BadQueryException, LabelCardinality, LogicalPlan, PlanValidationSpec, SeriesKeysByFilters, TsCardinalities}
import filodb.query.{LabelCardinality, LogicalPlan, PlanValidationSpec, SeriesKeysByFilters, TsCardinalities}
import filodb.query.exec._

class MultiPartitionPlannerSpec extends AnyFunSpec with Matchers with PlanValidationSpec{
Expand Down Expand Up @@ -1712,18 +1712,6 @@ class MultiPartitionPlannerSpec extends AnyFunSpec with Matchers with PlanValida
validatePlan(execPlan2, expectedPlanWithRemoteExec1)


val query4 = "sum(rate(test{job = \"app\"}[10m])) + sum(rate(bar{job = \"app\"}[5m] offset 5m))"
val lp4 = Parser.queryRangeToLogicalPlan(query4, TimeStepParams(2000, stepSecs, 10000))

val promQlQueryParams4 = PromQlQueryParams(query4, 1000, 100, 10000)
intercept[BadQueryException] {
// Expecting to see Exception when we use BinaryJoin with offsets, technically this too should not be a big deal
// as we need to identify the right window, however this was not supported even before the change and it is ok to
// leave it unaddressed in the first phase as its just Binary joins with offsets
engine.materialize(lp4, QueryContext(origQueryParams = promQlQueryParams4, plannerParams =
PlannerParams(processMultiPartition = true)))
}


// Planner with period of uncertainty should still generate steps that are aligned with start and step,
// that is should be snapped correctly
Expand Down
Loading
Loading