From 294beaf4910a8547ae05928dc6c695339b327df7 Mon Sep 17 00:00:00 2001 From: Alex Theimer Date: Wed, 24 Jan 2024 20:18:15 -0800 Subject: [PATCH] TMP --- .../filodb.coordinator/queryplanner/LogicalPlanUtils.scala | 6 ++---- .../queryplanner/PartitionLocationPlanner.scala | 2 -- query/src/test/scala/filodb/query/PlanValidationSpec.scala | 4 +++- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/coordinator/src/main/scala/filodb.coordinator/queryplanner/LogicalPlanUtils.scala b/coordinator/src/main/scala/filodb.coordinator/queryplanner/LogicalPlanUtils.scala index 5e869b9e92..32f7b707cf 100644 --- a/coordinator/src/main/scala/filodb.coordinator/queryplanner/LogicalPlanUtils.scala +++ b/coordinator/src/main/scala/filodb.coordinator/queryplanner/LogicalPlanUtils.scala @@ -1,12 +1,10 @@ package filodb.coordinator.queryplanner -import scala.collection.{mutable, Seq} +import scala.collection.{Seq, mutable} import scala.collection.mutable.ArrayBuffer - import com.typesafe.scalalogging.StrictLogging - import filodb.core.TargetSchemaProvider -import filodb.core.query.{ColumnFilter, QueryContext, QueryUtils, RangeParams} +import filodb.core.query.{ColumnFilter, Filter, QueryContext, QueryUtils, RangeParams} import filodb.core.query.Filter.{Equals, EqualsRegex} import filodb.prometheus.ast.SubqueryUtils import filodb.prometheus.ast.Vectors.PromMetricLabel diff --git a/coordinator/src/main/scala/filodb.coordinator/queryplanner/PartitionLocationPlanner.scala b/coordinator/src/main/scala/filodb.coordinator/queryplanner/PartitionLocationPlanner.scala index e48f97d4dd..0d87afec41 100644 --- a/coordinator/src/main/scala/filodb.coordinator/queryplanner/PartitionLocationPlanner.scala +++ b/coordinator/src/main/scala/filodb.coordinator/queryplanner/PartitionLocationPlanner.scala @@ -7,8 +7,6 @@ import filodb.core.query.Filter.{Equals, EqualsRegex} import filodb.query.LogicalPlan import filodb.query.exec.{ExecPlan, PromQlRemoteExec} -object PartitionLocationPlanner { - /** * Abstract class for planners that need getPartitions functionality. * diff --git a/query/src/test/scala/filodb/query/PlanValidationSpec.scala b/query/src/test/scala/filodb/query/PlanValidationSpec.scala index 356e5c154f..c51a898531 100644 --- a/query/src/test/scala/filodb/query/PlanValidationSpec.scala +++ b/query/src/test/scala/filodb/query/PlanValidationSpec.scala @@ -1,11 +1,13 @@ package filodb.query +import com.typesafe.scalalogging.StrictLogging import org.scalatest.matchers.should.Matchers import filodb.query.exec.ExecPlan + import scala.collection.mutable -trait PlanValidationSpec extends Matchers { +trait PlanValidationSpec extends Matchers with StrictLogging { private def getIndent(line: String): Int = { line.prefixLength(c => c == '-')