[ntuple] test automatic schema evolution of collections

Author: jblomer

tree/ntuple/test/CMakeLists.txt

@@ -38,6 +38,11 @@ ROOT_GENERATE_DICTIONARY(RNTupleDescriptorDict ${CMAKE_CURRENT_SOURCE_DIR}/RNTup
 
 ROOT_ADD_GTEST(ntuple_endian ntuple_endian.cxx LIBRARIES ROOTNTuple)
 ROOT_ADD_GTEST(ntuple_evolution_type ntuple_evolution_type.cxx LIBRARIES ROOTNTuple)
+ROOT_GENERATE_DICTIONARY(STLContainerEvolutionDict ${CMAKE_CURRENT_SOURCE_DIR}/STLContainerEvolution.hxx
+                         MODULE ntuple_evolution_type
+                         LINKDEF STLContainerEvolutionLinkDef.h
+                         OPTIONS -inlineInputHeader
+                         DEPENDENCIES CustomStruct)
 if(NOT MSVC)
   # These unit tests rely on fork(), which is not available on Windows.
   ROOT_ADD_GTEST(ntuple_evolution_shape ntuple_evolution_shape.cxx LIBRARIES ROOTNTuple)

tree/ntuple/test/STLContainerEvolution.hxx

@@ -0,0 +1,39 @@
+#ifndef ROOT_RNTuple_Test_STLContainerEvolution
+#define ROOT_RNTuple_Test_STLContainerEvolution
+
+#include <map>
+#include <set>
+#include <unordered_set>
+#include <unordered_map>
+#include <utility>
+#include <vector>
+
+// The following std::hash specializations allow for creating unordered sets of pairs in the Collections test.
+// It is a quick but bad hash but for this test though it should be ok.
+template <>
+struct std::hash<std::pair<int, int>> {
+   std::size_t operator()(const std::pair<int, int> &p) const noexcept
+   {
+      std::size_t h1 = std::hash<int>{}(p.first);
+      std::size_t h2 = std::hash<int>{}(p.second);
+      return h1 ^ (h2 << 1);
+   }
+};
+
+template <>
+struct std::hash<std::pair<short int, short int>> {
+   std::size_t operator()(const std::pair<short int, short int> &p) const noexcept
+   {
+      std::size_t h1 = std::hash<short int>{}(p.first);
+      std::size_t h2 = std::hash<short int>{}(p.second);
+      return h1 ^ (h2 << 1);
+   }
+};
+
+template <typename T>
+struct CollectionProxy {
+   using ValueType = T;
+   std::vector<T> v; //!
+};
+
+#endif

tree/ntuple/test/STLContainerEvolutionLinkDef.h

@@ -0,0 +1,40 @@
+#ifdef __CLING__
+
+#pragma link C++ class std::set<int>+;
+#pragma link C++ class std::set<short int>+;
+#pragma link C++ class std::set<std::pair<int, int>>+;
+#pragma link C++ class std::set<std::pair<short int, short int>>+;
+
+#pragma link C++ class std::unordered_set<int>+;
+#pragma link C++ class std::unordered_set<short int>+;
+#pragma link C++ class std::unordered_set<std::pair<int, int>>+;
+#pragma link C++ class std::unordered_set<std::pair<short int, short int>>+;
+
+#pragma link C++ class std::multiset<int>+;
+#pragma link C++ class std::multiset<short int>+;
+#pragma link C++ class std::multiset<std::pair<int, int>>+;
+#pragma link C++ class std::multiset<std::pair<short int, short int>>+;
+
+#pragma link C++ class std::unordered_multiset<int>+;
+#pragma link C++ class std::unordered_multiset<short int>+;
+#pragma link C++ class std::unordered_multiset<std::pair<int, int>>+;
+#pragma link C++ class std::unordered_multiset<std::pair<short int, short int>>+;
+
+#pragma link C++ class std::map<int, int>+;
+#pragma link C++ class std::map<short int, short int>+;
+
+#pragma link C++ class std::unordered_map<int, int>+;
+#pragma link C++ class std::unordered_map<short int, short int>+;
+
+#pragma link C++ class std::multimap<int, int>+;
+#pragma link C++ class std::multimap<short int, short int>+;
+
+#pragma link C++ class std::unordered_multimap<int, int>+;
+#pragma link C++ class std::unordered_multimap<short int, short int>+;
+
+#pragma link C++ class CollectionProxy<int>+;
+#pragma link C++ class CollectionProxy<short int>+;
+#pragma link C++ class CollectionProxy<std::pair<int, int>>+;
+#pragma link C++ class CollectionProxy<std::pair<short int, short int>>+;
+
+#endif