TMP

filodb · Jan 21, 2024 · fd34b37 · fd34b37
1 parent 585b658
commit fd34b37
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/spark-jobs/src/main/scala/filodb/downsampler/chunk/BatchExporter.scala b/spark-jobs/src/main/scala/filodb/downsampler/chunk/BatchExporter.scala
@@ -3,16 +3,13 @@ package filodb.downsampler.chunk
 import java.security.MessageDigest
 import java.text.SimpleDateFormat
 import java.util.Date
-
 import scala.collection.mutable
 import scala.util.matching.Regex
-
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.module.scala.DefaultScalaModule
 import kamon.Kamon
 import org.apache.spark.sql.Row
 import org.apache.spark.sql.types.{DoubleType, LongType, StringType, StructField, StructType}
-
 import filodb.core.binaryrecord2.RecordSchema
 import filodb.core.metadata.Column.ColumnType.{DoubleColumn, HistogramColumn}
 import filodb.core.metadata.Schemas
@@ -24,6 +21,9 @@ import filodb.downsampler.chunk.BatchExporter.{DATE_REGEX_MATCHER, LABEL_REGEX_M
 import filodb.memory.format.{TypedIterator, UnsafeUtils}
 import filodb.memory.format.vectors.LongIterator
 
+
+import scala.util.Random
+
 case class ExportRule(allowFilterGroups: Seq[Seq[ColumnFilter]],
                       blockFilterGroups: Seq[Seq[ColumnFilter]],
                       dropLabels: Seq[String])
@@ -187,7 +187,9 @@ case class BatchExporter(downsamplerSettings: DownsamplerSettings, userStartTime
    */
   def getPartitionByValues(partKeyMap: collection.Map[String, String]): Iterator[String] = {
     partitionByValuesTemplate.iterator.zipWithIndex.map{ case (value, i) =>
-      if (partitionByValuesIndicesWithTemplate.contains(i)) {
+      if (i == 0) {
+        "ws" + Random.nextInt(3).toString
+      } else if (partitionByValuesIndicesWithTemplate.contains(i)) {
         LABEL_REGEX_MATCHER.replaceAllIn(partitionByValuesTemplate(i), matcher => partKeyMap(matcher.group(1)))
       } else {
         value

diff --git a/spark-jobs/src/main/scala/filodb/downsampler/chunk/DownsamplerMain.scala b/spark-jobs/src/main/scala/filodb/downsampler/chunk/DownsamplerMain.scala
@@ -158,7 +158,7 @@ class Downsampler(settings: DownsamplerSettings) extends Serializable {
         if (settings.exportIsEnabled) {
           batchExporter.getExportRows(readablePartsBatch)
         } else Iterator.empty
-      }.map(row => row.)
+      }
 
     val repartitioned = spark
       .createDataFrame(rdd, batchExporter.exportSchema)