sparsam 0.2.3 → 0.2.8

data/ext/serializer.h

@@ -1,6 +1,4 @@
 #ifndef __SERIALIZER_H__
-#include <ruby.h>
-#include <ruby/intern.h>
 #ifndef NUM2SHORT
 #define NUM2SHORT NUM2INT
 #endif
@@ -20,12 +18,13 @@ enum TOType {
 
 enum ValidateStrictness { normal = 0, strict = 1, recursive = 2 };
 
-void serializer_free(void *data);
-void *serializer_create();
-void serializer_init(void *serializer, int protocol, void *str_arg1,
+void serializer_free(void* data);
+void* serializer_create();
+void serializer_init(void* serializer, int protocol, void* str_arg1,
                      uint32_t len);
 
 VALUE serializer_readStruct(VALUE self, VALUE klass);
+VALUE serializer_readUnion(VALUE self, VALUE klass);
 VALUE serializer_writeStruct(VALUE self, VALUE klass, VALUE data);
 
 VALUE cache_fields(VALUE self, VALUE klass);
@@ -37,18 +36,36 @@ void initialize_constants();
 void initialize_runtime_constants();
 
 #ifdef __cplusplus
-} // end extern "C"
+}  // end extern "C"
 
+#include <thrift/protocol/TProtocol.h>
+#include <thrift/transport/TBufferTransports.h>
 #include <boost/shared_ptr.hpp>
 #include <map>
 #include <string>
-#include <thrift/protocol/TProtocol.h>
-#include <thrift/transport/TBufferTransports.h>
 #include <unordered_set>
 #include "third-party/sparsepp/sparsepp/spp.h"
 
 using ::apache::thrift::protocol::TType;
 
+// transposed from:
+// https://github.com/apache/thrift/blob/0.10.0/lib/cpp/src/thrift/protocol/TProtocol.h#L176
+// with: https://gist.github.com/andyfangdz/d4d52daa9f8a75223e76e92657036bb0
+// fun fact: it's not sorted there
+const std::string TTypeNames[] = {
+    "T_STOP",   "T_VOID",    "T_BOOL", "T_BYTE or T_I08",
+    "T_DOUBLE", "T_UNKNOWN", "T_I16",  "T_UNKNOWN",
+    "T_I32",    "T_U64",     "T_I64",  "T_STRING or T_UTF7",
+    "T_STRUCT", "T_MAP",     "T_SET",  "T_LIST",
+    "T_UTF8",   "T_UTF16"};
+
+const size_t TTypeMaxID = sizeof(TTypeNames) / sizeof(TTypeNames[0]);
+
+const std::string TTypeUnknown = "T_UNKNOWN";
+
+#define TTypeName(typeId) \
+  (typeId < TTypeMaxID ? TTypeNames[typeId] : TTypeUnknown)
+
 typedef uint16_t FieldIdIndex;
 typedef uint16_t KlassIndex;
 
@@ -61,38 +78,41 @@ typedef struct FieldBegin {
 
 typedef struct FieldInfo {
   TType ftype;
-  VALUE klass; // set if TTYPE is struct or union
-  ID ivarName; // set if field is on struct
-  VALUE symName; // set if field is on struct/union
+  VALUE klass;    // set if TTYPE is struct or union
+  ID ivarName;    // set if field is on struct
+  VALUE symName;  // set if field is on struct/union
   bool isOptional;
   bool isBinaryString;
-  FieldInfo *elementType; // element of list or set, or map
-  FieldInfo *keyType;     // type of key in maps
+  FieldInfo* elementType;  // element of list or set, or map
+  FieldInfo* keyType;      // type of key in maps
 } FieldInfo;
 
-typedef std::map<FieldID, FieldInfo *> FieldInfoMap;
-typedef spp::sparse_hash_map<VALUE, FieldInfoMap *> KlassFieldsCache;
+typedef std::map<FieldID, FieldInfo*> FieldInfoMap;
+typedef spp::sparse_hash_map<VALUE, FieldInfoMap*> KlassFieldsCache;
 
 class ThriftSerializer {
-public:
+ public:
   ThriftSerializer(){};
+  // clang-format off
   boost::shared_ptr< ::apache::thrift::protocol::TProtocol > tprot;
   boost::shared_ptr< ::apache::thrift::transport::TMemoryBuffer > tmb;
+  // clang-format on
 
   VALUE readStruct(VALUE klass);
+  VALUE readUnion(VALUE klass);
   void writeStruct(VALUE klass, VALUE data);
 
-private:
-  VALUE readUnion(VALUE klass);
-  VALUE readAny(TType ttype, FieldInfo *field_info);
-  void writeAny(TType ttype, FieldInfo *field_info, VALUE data, VALUE outer_struct, VALUE field_sym);
+ private:
+  VALUE readAny(TType ttype, FieldInfo* field_info);
+  void writeAny(TType ttype, FieldInfo* field_info, VALUE data,
+                VALUE outer_struct, VALUE field_sym);
   void skip_n_type(uint32_t n, TType ttype);
   void skip_n_pair(uint32_t n, TType type_a, TType type_b);
 };
 
-FieldInfoMap *FindOrCreateFieldInfoMap(VALUE klass);
-FieldInfo *CreateFieldInfo(VALUE field_map_entry);
-FieldInfoMap *CreateFieldInfoMap(VALUE klass);
+FieldInfoMap* FindOrCreateFieldInfoMap(VALUE klass);
+FieldInfo* CreateFieldInfo(VALUE field_map_entry);
+FieldInfoMap* CreateFieldInfoMap(VALUE klass);
 
 #endif
 #endif

data/lib/sparsam/deserializer.rb

@@ -2,7 +2,11 @@ module Sparsam
   module Deserializer
     def self.deserialize(klass, serialized_string, prot = Sparsam::CompactProtocol)
       s = Sparsam::Serializer.new(prot, serialized_string)
-      s.deserialize(klass)
+      if klass <= Sparsam::Union
+        s.deserializeUnion(klass)
+      else
+        s.deserialize(klass)
+      end
     end
   end
 end

data/lib/sparsam/struct.rb

@@ -16,6 +16,8 @@ module Sparsam
         reader = name_to_accessors(info[:name]).reader
         return false unless send(reader) == other.send(reader)
       end
+
+      true
     end
     alias_method :eql?, :==
   end

data/spec/gen-ruby/user_types.rb

@@ -13,15 +13,51 @@ module Magic
   Blue = 3
   Green = 4
   VALUE_MAP = {0 => "Black", 1 => "White", 2 => "Red", 3 => "Blue", 4 => "Green"}
+  INVERTED_VALUE_MAP = {"Black" => 0, "White" => 1, "Red" => 2, "Blue" => 3, "Green" => 4}
   VALID_VALUES = Set.new([Black, White, Red, Blue, Green]).freeze
 end
 
 class US < ::Sparsam::Struct
   FIELDS = {
-    1 => {:type => ::Sparsam::Types::I32, :name => 'id_i32', :optional => true},
-    2 => {:type => ::Sparsam::Types::STRING, :name => 'id_s', :default => %q"id_s default", :binary => true, :optional => true},
-    3 => {:type => ::Sparsam::Types::SET, :name => 'string_set', :element => {:type => ::Sparsam::Types::STRING}, :optional => true},
-    4 => {:type => ::Sparsam::Types::SET, :name => 'int_set', :element => {:type => ::Sparsam::Types::I32}, :optional => true}
+    1 => {
+      :type => ::Sparsam::Types::I32,
+      :name => 'id_i32',
+      :optional => true,
+      :annotations => {
+      },
+    },
+    2 => {
+      :type => ::Sparsam::Types::STRING,
+      :name => 'id_s',
+      :default => %q"id_s default",
+:binary => true,
+      :optional => true,
+      :annotations => {
+      },
+    },
+    3 => {
+      :type => ::Sparsam::Types::SET,
+      :name => 'string_set',
+:element => {
+        :type => ::Sparsam::Types::STRING,
+      },
+      :optional => true,
+      :annotations => {
+      },
+    },
+    4 => {
+      :type => ::Sparsam::Types::SET,
+      :name => 'int_set',
+:element => {
+        :type => ::Sparsam::Types::I32,
+      },
+      :optional => true,
+      :annotations => {
+      },
+    }
+  }
+
+  ANNOTATIONS = {
   }
 
   init_thrift_struct(self)
@@ -29,8 +65,23 @@ end
 
 class UN < ::Sparsam::Union
   FIELDS = {
-    1 => {:type => ::Sparsam::Types::I32, :name => 'id_i32', :optional => true},
-    2 => {:type => ::Sparsam::Types::STRING, :name => 'id_s', :optional => true}
+    1 => {
+      :type => ::Sparsam::Types::I32,
+      :name => 'id_i32',
+      :optional => true,
+      :annotations => {
+      },
+    },
+    2 => {
+      :type => ::Sparsam::Types::STRING,
+      :name => 'id_s',
+      :optional => true,
+      :annotations => {
+      },
+    }
+  }
+
+  ANNOTATIONS = {
   }
 
   init_thrift_struct(self)
@@ -38,16 +89,107 @@ end
 
 class SS < ::Sparsam::Struct
   FIELDS = {
-    1 => {:type => ::Sparsam::Types::I32, :name => 'id_i32', :optional => true},
-    2 => {:type => ::Sparsam::Types::STRING, :name => 'id_s', :optional => true},
-    3 => {:type => ::Sparsam::Types::STRUCT, :name => 'us_i', :class => ::US, :optional => true},
-    4 => {:type => ::Sparsam::Types::SET, :name => 'us_s', :element => {:type => ::Sparsam::Types::STRUCT, :class => ::US}, :optional => true},
-    5 => {:type => ::Sparsam::Types::LIST, :name => 's_l', :element => {:type => ::Sparsam::Types::STRING}, :optional => true},
-    6 => {:type => ::Sparsam::Types::MAP, :name => 'mappy', :key => {:type => ::Sparsam::Types::I32}, :value => {:type => ::Sparsam::Types::STRING}, :optional => true},
-    7 => {:type => ::Sparsam::Types::BYTE, :name => 'byte_field', :optional => true},
-    8 => {:type => ::Sparsam::Types::STRUCT, :name => 'un_field', :class => ::UN, :optional => true},
-    9 => {:type => ::Sparsam::Types::I32, :name => 'magic_field', :optional => true, :enum_class => ::Magic},
-    10 => {:type => ::Sparsam::Types::MAP, :name => 'troll', :key => {:type => ::Sparsam::Types::I32}, :value => {:type => ::Sparsam::Types::MAP, :key => {:type => ::Sparsam::Types::I32}, :value => {:type => ::Sparsam::Types::I32}}, :optional => true}
+    1 => {
+      :type => ::Sparsam::Types::I32,
+      :name => 'id_i32',
+      :optional => true,
+      :annotations => {
+      },
+    },
+    2 => {
+      :type => ::Sparsam::Types::STRING,
+      :name => 'id_s',
+      :optional => true,
+      :annotations => {
+      },
+    },
+    3 => {
+      :type => ::Sparsam::Types::STRUCT,
+      :name => 'us_i',
+      :class => ::US,
+      :optional => true,
+      :annotations => {
+      },
+    },
+    4 => {
+      :type => ::Sparsam::Types::SET,
+      :name => 'us_s',
+:element => {
+        :type => ::Sparsam::Types::STRUCT,
+        :class => ::US,
+      },
+      :optional => true,
+      :annotations => {
+      },
+    },
+    5 => {
+      :type => ::Sparsam::Types::LIST,
+      :name => 's_l',
+:element => {
+        :type => ::Sparsam::Types::STRING,
+      },
+      :optional => true,
+      :annotations => {
+      },
+    },
+    6 => {
+      :type => ::Sparsam::Types::MAP,
+      :name => 'mappy',
+:key => {
+        :type => ::Sparsam::Types::I32,
+      },
+:value => {
+        :type => ::Sparsam::Types::STRING,
+      },
+      :optional => true,
+      :annotations => {
+      },
+    },
+    7 => {
+      :type => ::Sparsam::Types::BYTE,
+      :name => 'byte_field',
+      :optional => true,
+      :annotations => {
+      },
+    },
+    8 => {
+      :type => ::Sparsam::Types::STRUCT,
+      :name => 'un_field',
+      :class => ::UN,
+      :optional => true,
+      :annotations => {
+      },
+    },
+    9 => {
+      :type => ::Sparsam::Types::I32,
+      :name => 'magic_field',
+      :optional => true,
+      :enum_class => ::Magic      ,
+      :annotations => {
+      },
+    },
+    10 => {
+      :type => ::Sparsam::Types::MAP,
+      :name => 'troll',
+:key => {
+        :type => ::Sparsam::Types::I32,
+      },
+:value => {
+        :type => ::Sparsam::Types::MAP,
+:key => {
+          :type => ::Sparsam::Types::I32,
+        },
+:value => {
+          :type => ::Sparsam::Types::I32,
+        },
+      },
+      :optional => true,
+      :annotations => {
+      },
+    }
+  }
+
+  ANNOTATIONS = {
   }
 
   init_thrift_struct(self)
@@ -55,7 +197,15 @@ end
 
 class MiniRequired < ::Sparsam::Struct
   FIELDS = {
-    1 => {:type => ::Sparsam::Types::I32, :name => 'id_i32'}
+    1 => {
+      :type => ::Sparsam::Types::I32,
+      :name => 'id_i32',
+      :annotations => {
+      },
+    }
+  }
+
+  ANNOTATIONS = {
   }
 
   init_thrift_struct(self)
@@ -63,15 +213,135 @@ end
 
 class EasilyInvalid < ::Sparsam::Struct
   FIELDS = {
-    1 => {:type => ::Sparsam::Types::STRUCT, :name => 'tail', :class => ::EasilyInvalid, :optional => true},
-    2 => {:type => ::Sparsam::Types::SET, :name => 's_self', :element => {:type => ::Sparsam::Types::STRUCT, :class => ::EasilyInvalid}, :optional => true},
-    3 => {:type => ::Sparsam::Types::LIST, :name => 'l_self', :element => {:type => ::Sparsam::Types::STRUCT, :class => ::EasilyInvalid}, :optional => true},
-    4 => {:type => ::Sparsam::Types::MAP, :name => 'mappy1', :key => {:type => ::Sparsam::Types::STRUCT, :class => ::EasilyInvalid}, :value => {:type => ::Sparsam::Types::I32}, :optional => true},
-    5 => {:type => ::Sparsam::Types::MAP, :name => 'mappy2', :key => {:type => ::Sparsam::Types::I32}, :value => {:type => ::Sparsam::Types::STRUCT, :class => ::EasilyInvalid}, :optional => true},
-    6 => {:type => ::Sparsam::Types::MAP, :name => 'mappy3', :key => {:type => ::Sparsam::Types::STRUCT, :class => ::EasilyInvalid}, :value => {:type => ::Sparsam::Types::STRUCT, :class => ::EasilyInvalid}, :optional => true},
-    7 => {:type => ::Sparsam::Types::LIST, :name => 'sure', :element => {:type => ::Sparsam::Types::MAP, :key => {:type => ::Sparsam::Types::SET, :element => {:type => ::Sparsam::Types::I32}}, :value => {:type => ::Sparsam::Types::MAP, :key => {:type => ::Sparsam::Types::I32}, :value => {:type => ::Sparsam::Types::SET, :element => {:type => ::Sparsam::Types::LIST, :element => {:type => ::Sparsam::Types::MAP, :key => {:type => ::Sparsam::Types::STRUCT, :class => ::EasilyInvalid}, :value => {:type => ::Sparsam::Types::STRING}}}}}}, :optional => true},
-    8 => {:type => ::Sparsam::Types::STRUCT, :name => 'required_stuff', :class => ::MiniRequired, :optional => true},
-    9 => {:type => ::Sparsam::Types::I32, :name => 'id_i32', :optional => true}
+    1 => {
+      :type => ::Sparsam::Types::STRUCT,
+      :name => 'tail',
+      :class => ::EasilyInvalid,
+      :optional => true,
+      :annotations => {
+      },
+    },
+    2 => {
+      :type => ::Sparsam::Types::SET,
+      :name => 's_self',
+:element => {
+        :type => ::Sparsam::Types::STRUCT,
+        :class => ::EasilyInvalid,
+      },
+      :optional => true,
+      :annotations => {
+      },
+    },
+    3 => {
+      :type => ::Sparsam::Types::LIST,
+      :name => 'l_self',
+:element => {
+        :type => ::Sparsam::Types::STRUCT,
+        :class => ::EasilyInvalid,
+      },
+      :optional => true,
+      :annotations => {
+      },
+    },
+    4 => {
+      :type => ::Sparsam::Types::MAP,
+      :name => 'mappy1',
+:key => {
+        :type => ::Sparsam::Types::STRUCT,
+        :class => ::EasilyInvalid,
+      },
+:value => {
+        :type => ::Sparsam::Types::I32,
+      },
+      :optional => true,
+      :annotations => {
+      },
+    },
+    5 => {
+      :type => ::Sparsam::Types::MAP,
+      :name => 'mappy2',
+:key => {
+        :type => ::Sparsam::Types::I32,
+      },
+:value => {
+        :type => ::Sparsam::Types::STRUCT,
+        :class => ::EasilyInvalid,
+      },
+      :optional => true,
+      :annotations => {
+      },
+    },
+    6 => {
+      :type => ::Sparsam::Types::MAP,
+      :name => 'mappy3',
+:key => {
+        :type => ::Sparsam::Types::STRUCT,
+        :class => ::EasilyInvalid,
+      },
+:value => {
+        :type => ::Sparsam::Types::STRUCT,
+        :class => ::EasilyInvalid,
+      },
+      :optional => true,
+      :annotations => {
+      },
+    },
+    7 => {
+      :type => ::Sparsam::Types::LIST,
+      :name => 'sure',
+:element => {
+        :type => ::Sparsam::Types::MAP,
+:key => {
+          :type => ::Sparsam::Types::SET,
+:element => {
+            :type => ::Sparsam::Types::I32,
+          },
+        },
+:value => {
+          :type => ::Sparsam::Types::MAP,
+:key => {
+            :type => ::Sparsam::Types::I32,
+          },
+:value => {
+            :type => ::Sparsam::Types::SET,
+:element => {
+              :type => ::Sparsam::Types::LIST,
+:element => {
+                :type => ::Sparsam::Types::MAP,
+:key => {
+                  :type => ::Sparsam::Types::STRUCT,
+                  :class => ::EasilyInvalid,
+                },
+:value => {
+                  :type => ::Sparsam::Types::STRING,
+                },
+              },
+            },
+          },
+        },
+      },
+      :optional => true,
+      :annotations => {
+      },
+    },
+    8 => {
+      :type => ::Sparsam::Types::STRUCT,
+      :name => 'required_stuff',
+      :class => ::MiniRequired,
+      :optional => true,
+      :annotations => {
+      },
+    },
+    9 => {
+      :type => ::Sparsam::Types::I32,
+      :name => 'id_i32',
+      :optional => true,
+      :annotations => {
+      },
+    }
+  }
+
+  ANNOTATIONS = {
   }
 
   init_thrift_struct(self)
@@ -79,8 +349,23 @@ end
 
 class NotSS < ::Sparsam::Struct
   FIELDS = {
-    1 => {:type => ::Sparsam::Types::STRING, :name => 'id_s', :optional => true},
-    3 => {:type => ::Sparsam::Types::I32, :name => 'id_i32', :optional => true}
+    1 => {
+      :type => ::Sparsam::Types::STRING,
+      :name => 'id_s',
+      :optional => true,
+      :annotations => {
+      },
+    },
+    3 => {
+      :type => ::Sparsam::Types::I32,
+      :name => 'id_i32',
+      :optional => true,
+      :annotations => {
+      },
+    }
+  }
+
+  ANNOTATIONS = {
   }
 
   init_thrift_struct(self)
@@ -88,9 +373,30 @@ end
 
 class NotSS_plus < ::Sparsam::Struct
   FIELDS = {
-    1 => {:type => ::Sparsam::Types::STRING, :name => 'id_s', :optional => true},
-    2 => {:type => ::Sparsam::Types::STRING, :name => 'id_s2', :optional => true},
-    3 => {:type => ::Sparsam::Types::I32, :name => 'id_i32', :optional => true}
+    1 => {
+      :type => ::Sparsam::Types::STRING,
+      :name => 'id_s',
+      :optional => true,
+      :annotations => {
+      },
+    },
+    2 => {
+      :type => ::Sparsam::Types::STRING,
+      :name => 'id_s2',
+      :optional => true,
+      :annotations => {
+      },
+    },
+    3 => {
+      :type => ::Sparsam::Types::I32,
+      :name => 'id_i32',
+      :optional => true,
+      :annotations => {
+      },
+    }
+  }
+
+  ANNOTATIONS = {
   }
 
   init_thrift_struct(self)
@@ -101,26 +407,200 @@ class Nothing < ::Sparsam::Struct
 
   }
 
+  ANNOTATIONS = {
+  }
+
   init_thrift_struct(self)
 end
 
 class EveryType < ::Sparsam::Struct
   FIELDS = {
-    1 => {:type => ::Sparsam::Types::BOOL, :name => 'a_bool', :optional => true},
-    2 => {:type => ::Sparsam::Types::BYTE, :name => 'a_byte', :optional => true},
-    3 => {:type => ::Sparsam::Types::I16, :name => 'an_i16', :optional => true},
-    4 => {:type => ::Sparsam::Types::I32, :name => 'an_i32', :optional => true},
-    5 => {:type => ::Sparsam::Types::I64, :name => 'an_i64', :optional => true},
-    6 => {:type => ::Sparsam::Types::DOUBLE, :name => 'a_double', :optional => true},
-    7 => {:type => ::Sparsam::Types::STRING, :name => 'a_binary', :binary => true, :optional => true},
-    8 => {:type => ::Sparsam::Types::STRING, :name => 'a_string', :optional => true},
-    9 => {:type => ::Sparsam::Types::LIST, :name => 'an_i64_list', :element => {:type => ::Sparsam::Types::I64}, :optional => true},
-    10 => {:type => ::Sparsam::Types::SET, :name => 'an_i64_set', :element => {:type => ::Sparsam::Types::I64}, :optional => true},
-    11 => {:type => ::Sparsam::Types::MAP, :name => 'an_i64_map', :key => {:type => ::Sparsam::Types::I64}, :value => {:type => ::Sparsam::Types::I64}, :optional => true},
-    12 => {:type => ::Sparsam::Types::LIST, :name => 'a_list_of_i64_maps', :element => {:type => ::Sparsam::Types::MAP, :key => {:type => ::Sparsam::Types::I64}, :value => {:type => ::Sparsam::Types::I64}}, :optional => true},
-    13 => {:type => ::Sparsam::Types::MAP, :name => 'a_map_of_i64_maps', :key => {:type => ::Sparsam::Types::MAP, :key => {:type => ::Sparsam::Types::I64}, :value => {:type => ::Sparsam::Types::I64}}, :value => {:type => ::Sparsam::Types::MAP, :key => {:type => ::Sparsam::Types::I64}, :value => {:type => ::Sparsam::Types::I64}}, :optional => true},
-    14 => {:type => ::Sparsam::Types::STRUCT, :name => 'a_struct', :class => ::US, :optional => true},
-    15 => {:type => ::Sparsam::Types::STRUCT, :name => 'a_union', :class => ::UN, :optional => true}
+    1 => {
+      :type => ::Sparsam::Types::BOOL,
+      :name => 'a_bool',
+      :optional => true,
+      :annotations => {
+      },
+    },
+    2 => {
+      :type => ::Sparsam::Types::BYTE,
+      :name => 'a_byte',
+      :optional => true,
+      :annotations => {
+      },
+    },
+    3 => {
+      :type => ::Sparsam::Types::I16,
+      :name => 'an_i16',
+      :optional => true,
+      :annotations => {
+      },
+    },
+    4 => {
+      :type => ::Sparsam::Types::I32,
+      :name => 'an_i32',
+      :optional => true,
+      :annotations => {
+      },
+    },
+    5 => {
+      :type => ::Sparsam::Types::I64,
+      :name => 'an_i64',
+      :optional => true,
+      :annotations => {
+      },
+    },
+    6 => {
+      :type => ::Sparsam::Types::DOUBLE,
+      :name => 'a_double',
+      :optional => true,
+      :annotations => {
+      },
+    },
+    7 => {
+      :type => ::Sparsam::Types::STRING,
+      :name => 'a_binary',
+:binary => true,
+      :optional => true,
+      :annotations => {
+      },
+    },
+    8 => {
+      :type => ::Sparsam::Types::STRING,
+      :name => 'a_string',
+      :optional => true,
+      :annotations => {
+      },
+    },
+    9 => {
+      :type => ::Sparsam::Types::LIST,
+      :name => 'an_i64_list',
+:element => {
+        :type => ::Sparsam::Types::I64,
+      },
+      :optional => true,
+      :annotations => {
+      },
+    },
+    10 => {
+      :type => ::Sparsam::Types::SET,
+      :name => 'an_i64_set',
+:element => {
+        :type => ::Sparsam::Types::I64,
+      },
+      :optional => true,
+      :annotations => {
+      },
+    },
+    11 => {
+      :type => ::Sparsam::Types::MAP,
+      :name => 'an_i64_map',
+:key => {
+        :type => ::Sparsam::Types::I64,
+      },
+:value => {
+        :type => ::Sparsam::Types::I64,
+      },
+      :optional => true,
+      :annotations => {
+      },
+    },
+    12 => {
+      :type => ::Sparsam::Types::LIST,
+      :name => 'a_list_of_i64_maps',
+:element => {
+        :type => ::Sparsam::Types::MAP,
+:key => {
+          :type => ::Sparsam::Types::I64,
+        },
+:value => {
+          :type => ::Sparsam::Types::I64,
+        },
+      },
+      :optional => true,
+      :annotations => {
+      },
+    },
+    13 => {
+      :type => ::Sparsam::Types::MAP,
+      :name => 'a_map_of_i64_maps',
+:key => {
+        :type => ::Sparsam::Types::MAP,
+:key => {
+          :type => ::Sparsam::Types::I64,
+        },
+:value => {
+          :type => ::Sparsam::Types::I64,
+        },
+      },
+:value => {
+        :type => ::Sparsam::Types::MAP,
+:key => {
+          :type => ::Sparsam::Types::I64,
+        },
+:value => {
+          :type => ::Sparsam::Types::I64,
+        },
+      },
+      :optional => true,
+      :annotations => {
+      },
+    },
+    14 => {
+      :type => ::Sparsam::Types::STRUCT,
+      :name => 'a_struct',
+      :class => ::US,
+      :optional => true,
+      :annotations => {
+      },
+    },
+    15 => {
+      :type => ::Sparsam::Types::STRUCT,
+      :name => 'a_union',
+      :class => ::UN,
+      :optional => true,
+      :annotations => {
+      },
+    }
+  }
+
+  ANNOTATIONS = {
+  }
+
+  init_thrift_struct(self)
+end
+
+class RecursiveStruct < ::Sparsam::Struct
+  FIELDS = {
+    1 => {
+      :type => ::Sparsam::Types::I64,
+      :name => 'id',
+      :optional => true,
+      :annotations => {
+      },
+    },
+    2 => {
+      :type => ::Sparsam::Types::STRUCT,
+      :name => 'self_struct',
+      :class => ::RecursiveStruct,
+      :optional => true,
+      :annotations => {
+      },
+    },
+    3 => {
+      :type => ::Sparsam::Types::LIST,
+      :name => 'self_list',
+:element => {
+        :type => ::Sparsam::Types::STRUCT,
+        :class => ::RecursiveStruct,
+      },
+      :optional => true,
+      :annotations => {
+      },
+    }
+  }
+
+  ANNOTATIONS = {
   }
 
   init_thrift_struct(self)
@@ -128,7 +608,16 @@ end
 
 class SimpleException < ::Sparsam::ApplicationException
   FIELDS = {
-    1 => {:type => ::Sparsam::Types::STRING, :name => 'message', :optional => true}
+    1 => {
+      :type => ::Sparsam::Types::STRING,
+      :name => 'message',
+      :optional => true,
+      :annotations => {
+      },
+    }
+  }
+
+  ANNOTATIONS = {
   }
 
   init_thrift_struct(self)
@@ -136,8 +625,23 @@ end
 
 class WithFieldsException < ::Sparsam::ApplicationException
   FIELDS = {
-    1 => {:type => ::Sparsam::Types::I64, :name => 'an_i64', :optional => true},
-    2 => {:type => ::Sparsam::Types::STRING, :name => 'message', :optional => true}
+    1 => {
+      :type => ::Sparsam::Types::I64,
+      :name => 'an_i64',
+      :optional => true,
+      :annotations => {
+      },
+    },
+    2 => {
+      :type => ::Sparsam::Types::STRING,
+      :name => 'message',
+      :optional => true,
+      :annotations => {
+      },
+    }
+  }
+
+  ANNOTATIONS = {
   }
 
   init_thrift_struct(self)