fbcode/thrift/

Reviewed By: iahs

Differential Revision: D95161022

fbshipit-source-id: 839bb9f55754a335804269ca25deac49a652483d

Author: aristidisp

third-party/thrift/src/thrift/lib/cpp2/test/ObjectTest.thrift

@@ -43,7 +43,9 @@ struct BoolList {
 struct MyStruct {
   1: optional Foo foo;
   2: optional list<Foo> foo_vector;
+  @thrift.AllowUnsafeNonSealedKeyType
   3: optional set<Foo> foo_set;
+  @thrift.AllowUnsafeNonSealedKeyType
   4: optional map<Foo, i32> foo_key_map;
   5: optional map<i32, Foo> foo_value_map;
   6: optional AdaptedFoo foo_adapted;

third-party/thrift/src/thrift/lib/cpp2/test/except.thrift

@@ -47,6 +47,7 @@ struct MyArgs {
   @thrift.AllowUnsafeRequiredFieldQualifier
   6: required map<i32, Inner> mi;
   @thrift.AllowUnsafeRequiredFieldQualifier
+  @thrift.AllowUnsafeNonSealedKeyType
   7: required map<Inner, i32> complex_key;
 }
 
@@ -70,6 +71,7 @@ struct MyArgs2 {
   4: optional map<string, i32> m;
   5: optional list<Inner2> li;
   6: optional map<i32, Inner2> mi;
+  @thrift.AllowUnsafeNonSealedKeyType
   7: optional map<Inner2, i32> complex_key;
 }
 

third-party/thrift/src/thrift/lib/cpp2/util/test/DebugTree.thrift

@@ -85,6 +85,7 @@ struct SharedPtr {
 }
 
 typedef list<MyDef> MyDefList
+@thrift.AllowUnsafeNonSealedKeyType
 typedef set<MyDef> MyDefSet
 typedef map<i32, MyDef> MyDefMap
 

third-party/thrift/src/thrift/lib/py3/test/pickle_thrift.thrift

@@ -43,8 +43,10 @@ exception nested_pickle_exception {
 struct struct_container {
   1: list<easy_pickle> list_easy;
   # @lint-ignore THRIFTCHECKS
+  @thrift.AllowUnsafeNonSealedKeyType
   2: set<easy_pickle> set_easy;
   # @lint-ignore THRIFTCHECKS
+  @thrift.AllowUnsafeNonSealedKeyType
   3: map<easy_pickle, easy_pickle> map_easy_easy;
   4: list<list<easy_pickle>> list_list_easy;
   # @lint-ignore THRIFTCHECKS
@@ -61,15 +63,19 @@ struct struct_container {
 union union_container {
   1: list<easy_pickle> list_easy;
   # @lint-ignore THRIFTCHECKS
+  @thrift.AllowUnsafeNonSealedKeyType
   2: set<easy_pickle> set_easy;
   # @lint-ignore THRIFTCHECKS
+  @thrift.AllowUnsafeNonSealedKeyType
   3: map<easy_pickle, easy_pickle> map_easy_easy;
 }
 
 exception exception_container {
   1: list<easy_pickle> list_easy;
   # @lint-ignore THRIFTCHECKS
+  @thrift.AllowUnsafeNonSealedKeyType
   2: set<easy_pickle> set_easy;
   # @lint-ignore THRIFTCHECKS
+  @thrift.AllowUnsafeNonSealedKeyType
   3: map<easy_pickle, easy_pickle> map_easy_easy;
 }

third-party/thrift/src/thrift/lib/python/test/containers.thrift

@@ -81,6 +81,7 @@ struct Sets {
   97: set<binary> binarySet;
   93: set<IOBuf> iobufSet;
   # @lint-ignore THRIFTCHECKS
+  @thrift.AllowUnsafeNonSealedKeyType
   2: set<Foo> structSet;
   47: set<Color> colorSet;
 }
@@ -103,6 +104,7 @@ struct Maps {
   97: map<binary, binary> binaryMap;
   93: map<IOBuf, IOBuf> iobufMap;
   # @lint-ignore THRIFTCHECKS
+  @thrift.AllowUnsafeNonSealedKeyType
   2: map<Foo, Foo> structMap;
   47: map<Color, Color> colorMap;
 }

third-party/thrift/src/thrift/lib/python/test/refs.thrift

@@ -27,10 +27,12 @@ struct ComplexRef {
   3: optional list<i16> list_basetype_ref;
   4: optional list<ComplexRef> list_recursive_ref;
   5: optional set<i16> set_basetype_ref;
+  @thrift.AllowUnsafeNonSealedKeyType
   6: optional set<ComplexRef> set_recursive_ref;
   7: optional map<i16, i16> map_basetype_ref;
   8: optional map<i16, ComplexRef> map_recursive_ref;
   9: optional list<ComplexRef> list_shared_ref;
+  @thrift.AllowUnsafeNonSealedKeyType
   10: optional set<ComplexRef> set_const_shared_ref;
   11: optional ComplexRef recursive;
 }

third-party/thrift/src/thrift/lib/python/test/sets.thrift

@@ -29,6 +29,7 @@ namespace py3 python_test
 typedef string AtoIValue
 
 typedef list<i32> I32List
+@thrift.AllowUnsafeNonSealedKeyType
 typedef set<easy> EasySet
 typedef set<i32> SetI32
 typedef set<AtoIValue> SetAtoIValue

third-party/thrift/src/thrift/lib/python/test/testing.thrift

@@ -104,6 +104,7 @@ typedef float Float
 typedef double Double
 @thrift.AllowLegacyTypedefUri
 typedef list<easy> EasyList
+@thrift.AllowUnsafeNonSealedKeyType
 @thrift.AllowLegacyTypedefUri
 typedef set<easy> EasySet
 @thrift.AllowLegacyTypedefUri
@@ -487,6 +488,7 @@ union ReservedUnion {
 }
 
 struct EdgeCaseStruct {
+  @thrift.AllowUnsafeNonSealedKeyType
   1: map<Reserved, list<i64>> reservedValues;
 }
 
@@ -522,6 +524,7 @@ struct SortedSets {
   2: set<string> strings;
   // @lint-ignore THRIFTCHECKS
   @python.DeprecatedSortSetOnSerialize
+  @thrift.AllowUnsafeNonSealedKeyType
   3: set<easy> easies;
   @python.DeprecatedSortSetOnSerialize
   4: set<Color> colors;
@@ -534,6 +537,7 @@ struct SortedMaps {
   2: map<string, string> strings;
   // @lint-ignore THRIFTCHECKS
   @python.DeprecatedKeySortMapOnSerialize
+  @thrift.AllowUnsafeNonSealedKeyType
   3: map<easy, easy> easies;
   @python.DeprecatedSortSetOnSerialize
   4: map<Color, Color> colors;
@@ -550,6 +554,7 @@ struct ComplexRef {
   @cpp.Ref{type = cpp.RefType.Unique}
   5: optional set<i16> set_basetype_ref;
   @cpp.Ref{type = cpp.RefType.Unique}
+  @thrift.AllowUnsafeNonSealedKeyType
   6: optional set<ComplexRef> set_recursive_ref;
   @cpp.Ref{type = cpp.RefType.Unique}
   7: optional map<i16, i16> map_basetype_ref;
@@ -558,6 +563,7 @@ struct ComplexRef {
   @cpp.Ref{type = cpp.RefType.SharedMutable}
   9: optional list<ComplexRef> list_shared_ref;
   @cpp.Ref{type = cpp.RefType.Shared}
+  @thrift.AllowUnsafeNonSealedKeyType
   10: optional set<ComplexRef> set_const_shared_ref;
   @thrift.Box
   11: optional ComplexRef recursive;
@@ -575,6 +581,7 @@ struct Complex {
   8: ComplexUnion val_union;
   9: list<i64> val_list;
   // @lint-ignore THRIFTCHECKS
+  @thrift.AllowUnsafeNonSealedKeyType
   10: optional set<easy> val_set;
   11: map<string, binary> val_map;
   // @lint-ignore THRIFTCHECKS

third-party/thrift/src/thrift/lib/rust/src/dep_tests/test_thrift.thrift

@@ -35,6 +35,7 @@ struct SubStruct {
   @thrift.AllowUnsafeRequiredFieldQualifier
   2: required string req_def = "IAMREQ";
   // @lint-ignore THRIFTCHECKS
+  @thrift.AllowUnsafeNonSealedKeyType
   3: optional map<Small, i32> key_map;
   4: binary bin;
 }

third-party/thrift/src/thrift/lib/thrift/protocol_detail.thrift

@@ -110,12 +110,14 @@ union Value {
     reason = "Set can only have integer/string/binary/enum values",
   }
   @cpp.AllowLegacyNonOptionalRef
+  @thrift.AllowUnsafeNonSealedKeyType
   15: set<Value> setValue;
 
   // TODO(dokwon): Migrate to @thrift.Box after resolving incomplete type.
   @cpp.Ref{type = cpp.RefType.Unique}
   @cpp.Type{template = "::folly::F14FastMap"}
   @hack.SkipCodegen{reason = "Map keys can only be integer/string/binary/enum"}
   @cpp.AllowLegacyNonOptionalRef
+  @thrift.AllowUnsafeNonSealedKeyType
   16: map<Value, Value> mapValue;
 }