sparsam 0.2.5 → 0.2.9

data/ext/serializer.h

@@ -18,9 +18,9 @@ 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);
@@ -36,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;
 
@@ -60,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 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/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