fix lss copy to keep label_set_id order

pp/bare_bones/memory.h

@@ -2,6 +2,7 @@
 
 #include <atomic>
 #include <cstring>
+#include <limits>
 
 #include "preprocess.h"
 #include "type_traits.h"

pp/go/cppbridge/primitives_lss_test.go

@@ -3,7 +3,6 @@ package cppbridge_test
 import (
 	"context"
 	"runtime"
-	"sort"
 	"testing"
 
 	"github.com/prometheus/prometheus/pp/go/model"
@@ -414,15 +413,9 @@ func (s *QueryableLSSSuite) TestCopyAddedSeries() {
 	s.lss.CopyAddedSeries(lssCopy)
 	lssCopy.CopyAddedSeries(lssCopyOfCopy)
 
-	// lssCopy will contain lexicographically sorted labels with new IDs.
-	expectedLabelSets := make([]model.LabelSet, len(s.labelSets))
-	copy(expectedLabelSets, s.labelSets)
-	sort.Slice(expectedLabelSets, func(i, j int) bool {
-		return expectedLabelSets[i].String() < expectedLabelSets[j].String()
-	})
-
 	// Assert
-	s.Equal(labelSetToCppBridgeLabels(expectedLabelSets), lssCopy.GetLabelSets(s.labelSetIDs).LabelsSets())
+	// !!!ATTENTION!!! When copying the added series, the order in which the series are added is preserved.
+	s.Equal(labelSetToCppBridgeLabels(s.labelSets), lssCopy.GetLabelSets(s.labelSetIDs).LabelsSets())
 	s.Equal(emptyLabelsSets, lssCopyOfCopy.GetLabelSets(s.labelSetIDs).LabelsSets())
 }
 
@@ -502,14 +495,8 @@ func (s *QueryableLSSSuite) TestCopyAddedSeriesFromSnapshot() {
 	bitsetSeriesCopy := lssCopy.BitsetSeries()
 	snapshotCopy.CopyAddedSeries(bitsetSeriesCopy, lssCopyOfCopy)
 
-	// lssCopy will contain lexicographically sorted labels with new IDs.
-	expectedLabelSets := make([]model.LabelSet, len(s.labelSets))
-	copy(expectedLabelSets, s.labelSets)
-	sort.Slice(expectedLabelSets, func(i, j int) bool {
-		return expectedLabelSets[i].String() < expectedLabelSets[j].String()
-	})
-
 	// Assert
-	s.Equal(labelSetToCppBridgeLabels(expectedLabelSets), lssCopy.GetLabelSets(s.labelSetIDs).LabelsSets())
+	// !!!ATTENTION!!! When copying the added series, the order in which the series are added is preserved.
+	s.Equal(labelSetToCppBridgeLabels(s.labelSets), lssCopy.GetLabelSets(s.labelSetIDs).LabelsSets())
 	s.Equal(emptyLabelsSets, lssCopyOfCopy.GetLabelSets(s.labelSetIDs).LabelsSets())
 }

pp/series_index/queryable_encoding_bimap.h

@@ -186,25 +186,26 @@ class QueryableEncodingBimapCopier {
   }
 
   void copy_added_series() {
-    BareBones::Vector<uint32_t> ids;
-    ids.reserve(source_.size());
-    std::ranges::copy(ls_id_range_.begin(), ls_id_range_.end(), std::back_inserter(ids));
-
-    sorting_index_.sort(ids);
+    old_new_ids_.clear();
+    old_new_ids_.reserve(source_.size());
 
     Cache<uint32_t> cache;
     cache.reserve(source_.data().label_name_sets_table.size(), source_.data().label_name_sets_table.data().symbols_table.size(), source_.data().symbols_tables);
 
     destination_.reserve(source_);
 
-    for (const auto ls_id : ids) {
+    for (const auto ls_id : ls_id_range_) {
+      old_new_ids_.emplace_back(ls_id, destination_.next_item_index());
       destination_.items_.emplace_back(destination_.data_, source_[ls_id], cache);
     }
+
+    const auto cmp = sorting_index_.get_comparator();
+    std::sort(old_new_ids_.begin(), old_new_ids_.end(), [&](const id_pair& a, const id_pair& b) { return cmp(a.old_id, b.old_id); });
   }
 
   void copy_ls_id_set() {
-    for (uint32_t ls_id_new = 0; ls_id_new < destination_.size(); ++ls_id_new) {
-      destination_.ls_id_set_.emplace_hint_cmp(destination_.ls_id_set_.end(), [&](auto, auto) { return true; }, ls_id_new);
+    for (const auto& p : old_new_ids_) {
+      destination_.ls_id_set_.emplace_hint_cmp(destination_.ls_id_set_.end(), [](auto, auto) { return true; }, p.new_id);
     }
   }
 
@@ -250,10 +251,15 @@ class QueryableEncodingBimapCopier {
   }
 
  private:
+  struct id_pair {
+    uint32_t old_id;
+    uint32_t new_id;
+  };
+
   const DecodingTable& source_;
   const SortingIndex& sorting_index_;
   QueryableEncodingBimap& destination_;
   const SeriesIds& ls_id_range_;
+  BareBones::Vector<id_pair> old_new_ids_;
 };
-
 }  // namespace series_index

pp/series_index/sorting_index.h

@@ -29,6 +29,10 @@ struct SortingIndex {
     sort(container.begin(), container.end());
   }
 
+  PROMPP_ALWAYS_INLINE auto get_comparator() const noexcept {
+    return [this](uint32_t a, uint32_t b) PROMPP_LAMBDA_INLINE { return index[a] < index[b]; };
+  }
+
   Vector<uint32_t> index;
 };
 

werf.yaml

@@ -128,9 +128,9 @@ shell:
     - chown -R 64535:64535 /src/
     - chown -R 64535:64535 /etc/
     - chown -R 64535:64535 /consoles/
-    - chmod 0700 /src/prometheus
-    - chmod 0700 /src/promtool
-    - chmod 0700 /src/prompptool
+    - chmod 0755 /src/prometheus
+    - chmod 0755 /src/promtool
+    - chmod 0755 /src/prompptool
     - |
       touch /bin/prompp
       ln -s /bin/prompp /bin/prometheus