Sort the process histories according to the reduced id

To have the order stable, independent of the hardware of the node where the file was produced.

Author: makortel

IOPool/Common/bin/EdmProvDump.cc

@@ -793,6 +793,14 @@ void ProvenanceDumper::work_() {
   }
 
   if (!phv_.empty()) {
+    // (Re-)Sort according to reduced history ID in order to have a
+    // stable order with respect to hardware differences
+    std::ranges::stable_sort(phv_, {}, [](auto const& history) {
+      auto copy = history;
+      copy.reduce();
+      return copy.id();
+    });
+
     for (auto const& history : phv_) {
       for (auto const& process : history) {
         phc_.push_back(process);

IOPool/Common/test/unit_test_outputs/provdump_complex_final.log

@@ -14,14 +14,14 @@ History: {
   FINAL [1]
 }
 History: {
-  PROD1 [2]
+  PROD1 [3]
   MERGE [2]
   INTERMEDIATE [1]
   SPLIT [2]
   FINAL [1]
 }
 History: {
-  PROD1 [3]
+  PROD1 [2]
   MERGE [2]
   INTERMEDIATE [1]
   SPLIT [2]
@@ -30,34 +30,34 @@ History: {
 ---------Processes---------
 Process: PROD1 [1]
   PSet id: 6c63e586d4f6517ea1ec649e9eecf4b6
-  accelerators: test-one
+  accelerators: test-two
 
 Process: PROD1 [2]
   PSet id: b6a0b924ba604501a5436d5102a43418
   accelerators: cpu
 
 Process: PROD1 [3]
   PSet id: 6c63e586d4f6517ea1ec649e9eecf4b6
-  accelerators: test-two
+  accelerators: test-one
 
 Process: MERGE [1]
-  PSet id: df290421e5db9b54108985d98d780a9f
+  PSet id: cbaeb7a2de5d7cab57c899cc270bc5e0
   accelerators: cpu
 
 Process: MERGE [2]
-  PSet id: cbaeb7a2de5d7cab57c899cc270bc5e0
+  PSet id: df290421e5db9b54108985d98d780a9f
   accelerators: cpu
 
 Process: INTERMEDIATE [1]
   PSet id: 78ab4ebc3b62f905cf875c3d2f3e697b
   accelerators: cpu
 
 Process: SPLIT [1]
-  PSet id: 3072d8ea12f0d2269baf3e3075394fac
+  PSet id: 948ea93d681cce4262de72dd886fdc2b
   accelerators: cpu
 
 Process: SPLIT [2]
-  PSet id: 948ea93d681cce4262de72dd886fdc2b
+  PSet id: 3072d8ea12f0d2269baf3e3075394fac
   accelerators: cpu
 
 Process: FINAL [1]
@@ -169,7 +169,7 @@ Module: TriggerResults MERGE
  }
 
 Module: intVectorProducer MERGE
- Process: MERGE [1]
+ Process: MERGE [2]
  PSet id:069ebcaafc2423e72b81399666f0fa6f
  products: {
   ints_intVectorProducer__MERGE. BranchID 2485751069
@@ -182,7 +182,7 @@ Module: intVectorProducer MERGE
   delta: int32 tracked  = 0
   ivalue: int32 tracked  = 11
  }
- Process: MERGE [2]
+ Process: MERGE [1]
  PSet id:df9967266015a84cb07cb6490005dc1e
  products: {
   ints_intVectorProducer__MERGE. BranchID 2485751069
@@ -313,7 +313,7 @@ Module: TriggerResults SPLIT
  }
 
 Module: intVectorProducer SPLIT
- Process: SPLIT [1]
+ Process: SPLIT [2]
  PSet id:069ebcaafc2423e72b81399666f0fa6f
  products: {
   ints_intVectorProducer__SPLIT. BranchID 3967080626
@@ -326,7 +326,7 @@ Module: intVectorProducer SPLIT
   delta: int32 tracked  = 0
   ivalue: int32 tracked  = 11
  }
- Process: SPLIT [2]
+ Process: SPLIT [1]
  PSet id:386c301f701ba1a2d59426b6bcd9df0d
  products: {
   ints_intVectorProducer__SPLIT. BranchID 3967080626

IOPool/Common/test/unit_test_outputs/provdump_complex_intermediate.log

@@ -11,26 +11,26 @@ History: {
 }
 History: {
   PROD1 [3]
-  MERGE [1]
+  MERGE [2]
   INTERMEDIATE [1]
 }
 History: {
-  PROD1 [1]
-  MERGE [2]
+  PROD1 [3]
+  MERGE [1]
   INTERMEDIATE [1]
 }
 ---------Processes---------
 Process: PROD1 [1]
-  PSet id: b6a0b924ba604501a5436d5102a43418
-  accelerators: cpu
+  PSet id: 6c63e586d4f6517ea1ec649e9eecf4b6
+  accelerators: test-two
 
 Process: PROD1 [2]
   PSet id: 6c63e586d4f6517ea1ec649e9eecf4b6
   accelerators: test-one
 
 Process: PROD1 [3]
-  PSet id: 6c63e586d4f6517ea1ec649e9eecf4b6
-  accelerators: test-two
+  PSet id: b6a0b924ba604501a5436d5102a43418
+  accelerators: cpu
 
 Process: MERGE [1]
   PSet id: cbaeb7a2de5d7cab57c899cc270bc5e0
@@ -202,7 +202,7 @@ Module: intProducerU PROD1
  }
 
 Module: intVectorProducer PROD1
- Process: PROD1 [1]
+ Process: PROD1 [3]
  PSet id:069ebcaafc2423e72b81399666f0fa6f
  products: {
   ints_intVectorProducer__PROD1. BranchID 315054627
@@ -215,7 +215,7 @@ Module: intVectorProducer PROD1
   delta: int32 tracked  = 0
   ivalue: int32 tracked  = 11
  }
- Process: PROD1 [2] [3]
+ Process: PROD1 [1] [2]
  PSet id:df9967266015a84cb07cb6490005dc1e
  products: {
   ints_intVectorProducer__PROD1. BranchID 315054627

IOPool/Common/test/unit_test_outputs/provdump_complex_merge.log

@@ -9,13 +9,13 @@ History: {
 }
 ---------Processes---------
 Process: PROD1 [1]
-  PSet id: 6c63e586d4f6517ea1ec649e9eecf4b6
-  accelerators: test-one
-
-Process: PROD1 [2]
   PSet id: b6a0b924ba604501a5436d5102a43418
   accelerators: cpu
 
+Process: PROD1 [2]
+  PSet id: 6c63e586d4f6517ea1ec649e9eecf4b6
+  accelerators: test-one
+
 Process: MERGE [1]
   PSet id: df290421e5db9b54108985d98d780a9f
   accelerators: cpu
@@ -132,7 +132,7 @@ Module: intProducerU PROD1
  }
 
 Module: intVectorProducer PROD1
- Process: PROD1 [2]
+ Process: PROD1 [1]
  PSet id:069ebcaafc2423e72b81399666f0fa6f
  products: {
   ints_intVectorProducer__PROD1. BranchID 315054627
@@ -145,7 +145,7 @@ Module: intVectorProducer PROD1
   delta: int32 tracked  = 0
   ivalue: int32 tracked  = 11
  }
- Process: PROD1 [1]
+ Process: PROD1 [2]
  PSet id:df9967266015a84cb07cb6490005dc1e
  products: {
   ints_intVectorProducer__PROD1. BranchID 315054627