Addressing PR comments

filodb · Feb 1, 2024 · f2f2375 · f2f2375
1 parent 4137b63
commit f2f2375
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/coordinator/src/main/scala/filodb.coordinator/queryplanner/DefaultPlanner.scala b/coordinator/src/main/scala/filodb.coordinator/queryplanner/DefaultPlanner.scala
@@ -744,12 +744,6 @@ object PlannerUtil extends StrictLogging {
    * @return updated metric name without the last occurence of _bucket
    */
   def replaceLastBucketOccurenceStringFromMetricName(metricName: String): String = {
-    val lastIndexBucket = metricName.lastIndexOf("_bucket")
-    if (lastIndexBucket > -1) {
-      metricName.patch(lastIndexBucket, "", 7)
-    }
-    else {
-      metricName
-    }
+    metricName.replaceAll("_bucket$", "")
   }
 }
diff --git a/coordinator/src/test/scala/filodb.coordinator/queryplanner/PlannerUtilSpec.scala b/coordinator/src/test/scala/filodb.coordinator/queryplanner/PlannerUtilSpec.scala
@@ -96,11 +96,11 @@ class PlannerUtilSpec  extends AnyFunSpec with Matchers {
   }
 
   it(" replaceLastBucketFromMetricName should replace bucket names correctly") {
-    PlannerUtil.replaceLastBucketFromMetricName("test_metric_bucket") shouldEqual "test_metric"
-    PlannerUtil.replaceLastBucketFromMetricName("test_bucket_bucket") shouldEqual "test_bucket"
-    PlannerUtil.replaceLastBucketFromMetricName("my_bucket_bucket_bucket_bucket") shouldEqual
+    PlannerUtil.replaceLastBucketOccurenceStringFromMetricName("test_metric_bucket") shouldEqual "test_metric"
+    PlannerUtil.replaceLastBucketOccurenceStringFromMetricName("test_bucket_bucket") shouldEqual "test_bucket"
+    PlannerUtil.replaceLastBucketOccurenceStringFromMetricName("my_bucket_bucket_bucket_bucket") shouldEqual
       "my_bucket_bucket_bucket"
-    PlannerUtil.replaceLastBucketFromMetricName("testbucket") shouldEqual "testbucket"
-    PlannerUtil.replaceLastBucketFromMetricName("testBucket_bucket") shouldEqual "testBucket"
+    PlannerUtil.replaceLastBucketOccurenceStringFromMetricName("testbucket") shouldEqual "testbucket"
+    PlannerUtil.replaceLastBucketOccurenceStringFromMetricName("testBucket_bucket") shouldEqual "testBucket"
   }
 }