groot/rdict: use []T for disk storage of std::set<T>

go-hep · Feb 16, 2022 · 22da515 · 22da515
1 parent 34d6347
commit 22da515
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/groot/rdict/type.go b/groot/rdict/type.go
@@ -235,7 +235,7 @@ func TypeFromSE(ctx rbytes.StreamerInfoContext, se rbytes.StreamerElement) (refl
 					"could not find key type %q for std::{,multi,unordered_}set %q: %w", kname, typename, err,
 				)
 			}
-			return reflect.MapOf(key, reflect.TypeOf(struct{}{})), nil
+			return reflect.SliceOf(key), nil
 
 		case rmeta.STLmap, rmeta.STLunorderedmap, rmeta.STLmultimap, rmeta.STLunorderedmultimap:
 			var (
@@ -454,7 +454,7 @@ func typeFromTypeName(ctx rbytes.StreamerInfoContext, typename string, typevers
 		if err != nil {
 			return nil, err
 		}
-		return reflect.MapOf(kt, reflect.TypeOf(struct{}{})), nil
+		return reflect.SliceOf(kt), nil
 
 	case hasStdPrefix(typename, "map", "multimap", "unordered_map", "unordered_multimap"):
 		enames := rmeta.CxxTemplateFrom(typename).Args

diff --git a/groot/rdict/type_test.go b/groot/rdict/type_test.go
@@ -250,7 +250,7 @@ func TestTypeFromSI(t *testing.T) {
 					EName: "set<int>",
 				}.New(), rmeta.STLset, rmeta.Object),
 			}),
-			want: reflect.TypeOf((*map[int32]struct{})(nil)).Elem(),
+			want: reflect.TypeOf((*[]int32)(nil)).Elem(),
 		},
 		{
 			name: "multiset<int>",
@@ -262,7 +262,7 @@ func TestTypeFromSI(t *testing.T) {
 					EName: "set<int>",
 				}.New(), rmeta.STLmultiset, rmeta.Object),
 			}),
-			want: reflect.TypeOf((*map[int32]struct{})(nil)).Elem(),
+			want: reflect.TypeOf((*[]int32)(nil)).Elem(),
 		},
 		{
 			name: "unordered_set<int>",
@@ -274,7 +274,7 @@ func TestTypeFromSI(t *testing.T) {
 					EName: "unordered_set<int>",
 				}.New(), rmeta.STLunorderedset, rmeta.Object),
 			}),
-			want: reflect.TypeOf((*map[int32]struct{})(nil)).Elem(),
+			want: reflect.TypeOf((*[]int32)(nil)).Elem(),
 		},
 		{
 			name: "unordered_multiset<int>",
@@ -286,7 +286,7 @@ func TestTypeFromSI(t *testing.T) {
 					EName: "unordered_multiset<int>",
 				}.New(), rmeta.STLunorderedmultiset, rmeta.Object),
 			}),
-			want: reflect.TypeOf((*map[int32]struct{})(nil)).Elem(),
+			want: reflect.TypeOf((*[]int32)(nil)).Elem(),
 		},
 		{
 			name: "map<int,float>",