sereal 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06153f3bc1df8650c81eff2d5ef44f260920830c
-  data.tar.gz: e6e3e806787c10d2511ff7ea63256f922a45b0f3
+  metadata.gz: 8247824a3c96a8a8a0ef7a190fed6d8517ba85dc
+  data.tar.gz: 6e8edec6c3143ecd94fb22d6c96bb33664fd706b
 SHA512:
-  metadata.gz: 278c31a6754bd905858874e88d3cd87ed88986dbec21e3d7a5544d8b3fd7fab2d011ac3f7e22aff808a412e5b900e8f8d12427e8c1b3d05823cba271075b7379
-  data.tar.gz: a10efcc28da1409da425e6e6c222712fdaa7d62bee525728d9ea9b1edfc2a34ea0b14cb358fd98540063b4af1623f5e3b5995d0f17c251f044e67243513bea21
+  metadata.gz: a09768f1a182fa25eaae541c8af2e8396910eaccd1e9e08d313d7b5b98fe6aa098cd95de0c4dd88061683135b91a9c273f32489f8ab941cac2b74f4e0e1763cf
+  data.tar.gz: 611c0cb5a659adf051a0478bd9c621d2cc325d404db686e989217f6a9a755e2495e3697ff6b4f0999e6b38f9b8a5642f83842b6d456609647422ef48a53b15bc

data/bin/rsrl

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 begin
-  require File.join(File.dirname(__FILE__),'..','lib','sereal')
+  require File.join(".",File.dirname(__FILE__),'..','lib','sereal')
 rescue LoadError
   require 'sereal'
 end

data/ext/sereal/buffer.h

@@ -10,16 +10,22 @@ static inline void s_free_data_if_not_mine(sereal_t *s) {
     }
 }
 
+static inline void s_init_tracker(sereal_t *s) {
+    if (s->tracked == Qnil) {
+        s->tracked = rb_hash_new();
+        rb_gc_mark(s->tracked);
+    }
+}
+
 static inline void s_reset_tracker(sereal_t *s) {
-    if (s->tracked != Qnil)
-        rb_gc_unregister_address(&s->tracked);
-    s->tracked = Qnil;
+    if (s->tracked != Qnil) {
+        rb_hash_clear(s->tracked);
+    }
 }
 
 static inline void s_destroy(sereal_t *s) {
     if (!s)
         return;
-
     s_reset_tracker(s);
     s_free_data_if_not_mine(s);
     free(s);
@@ -31,6 +37,7 @@ static inline void *s_realloc_or_raise(sereal_t *s, void *p, u32 n) {
         s_raise(s,rb_eNoMemError,"memory allocation failure for %d bytes",n);
     return buf;
 }
+
 static inline void *s_alloc_or_raise(sereal_t *s,u32 n) {
     return s_realloc_or_raise(s,NULL,n);
 }

data/ext/sereal/decode.c

@@ -205,10 +205,7 @@ VALUE sereal_to_rb_object(sereal_t *s) {
 
         VALUE decoded = (*READERS[t])(s,t);
         if (tracked) {
-            if (s->tracked == Qnil) {
-                s->tracked = rb_hash_new();
-                rb_gc_register_address(&s->tracked);
-            }
+            s_init_tracker(s);
             rb_hash_aset(s->tracked,INT2FIX(pos),decoded);
         }
         return decoded;
@@ -225,6 +222,7 @@ VALUE method_sereal_decode(VALUE self, VALUE args) {
     u8 have_block = rb_block_given_p();
     sereal_t *s = s_create();
     u64 offset = 0;
+
     if (TYPE(payload) == T_FILE) {
         if (!have_block)
             s_raise(s,rb_eTypeError,"block is required when reading from a stream")

data/ext/sereal/encode.c

@@ -216,10 +216,38 @@ static void s_append_nil(sereal_t *s, VALUE object) {
     s_append_u8(s,SRL_HDR_UNDEF);
 }
 
+static void s_append_refp(sereal_t *s, VALUE object) {
+    u32 pos = FIX2LONG(object);
+    s_append_hdr_with_varint(s,SRL_HDR_REFP,pos - s->hdr_end + 1);
+    u8 *reference = s_get_p_at_pos(s,pos,0);
+    *reference |= SRL_HDR_TRACK_FLAG;
+}
+
 /* writer function pointers */
 static void rb_object_to_sereal(sereal_t *s, VALUE object) {
     S_RECURSE_INC(s);
+    u32 pos = s->pos;
+
+    if (s->tracked != Qnil &&
+        TYPE(object) == T_ARRAY  ||
+        TYPE(object) == T_HASH   ||
+        TYPE(object) == T_SYMBOL ||
+        TYPE(object) == T_STRING) {
+
+        if (s->tracked != Qnil) {
+            VALUE id = rb_obj_id(object);
+            VALUE stored_position = rb_hash_aref(s->tracked,id);
+            if (stored_position != Qnil) {
+                s_append_refp(s,stored_position);
+                goto out;
+            } else {
+                rb_hash_aset(s->tracked,id,INT2FIX(pos));
+            }
+        }
+    }
+
     (*WRITER[TYPE(object)])(s,object);
+out:
     S_RECURSE_DEC(s);
 }
 
@@ -249,6 +277,7 @@ VALUE method_sereal_encode(VALUE self, VALUE args) {
     VALUE compress = Qfalse;
     if (argc == 2)
         compress = rb_ary_shift(args);
+
     u8 do_compress;
     u8 version = SRL_PROTOCOL_VERSION;
 
@@ -257,7 +286,10 @@ VALUE method_sereal_encode(VALUE self, VALUE args) {
     } else {
         do_compress = (compress == Qtrue ? 1 : 0);
     }
-
+    if (do_compress & __REF) {
+        do_compress &= ~__REF;
+        s_init_tracker(s);
+    }
     switch(do_compress) {
         case __SNAPPY:
             version |= SRL_PROTOCOL_ENCODING_SNAPPY;
@@ -269,6 +301,7 @@ VALUE method_sereal_encode(VALUE self, VALUE args) {
         default:
             version |= SRL_PROTOCOL_ENCODING_RAW;
     }
+
     // setup header
     s_append_u32(s,SRL_MAGIC_STRING_LILIPUTIAN);
     s_append_u8(s,version);
@@ -276,6 +309,7 @@ VALUE method_sereal_encode(VALUE self, VALUE args) {
     u32 s_header_len = s->pos;
 
     // serialize
+    s->hdr_end = s->pos;
     rb_object_to_sereal(s,payload);
 
     // compress
@@ -311,7 +345,7 @@ VALUE method_sereal_encode(VALUE self, VALUE args) {
                  compressed + s_header_len + un_compressed_len_varint,
                  compressed_len_varint);
 
-        u8 *start = s_get_p_at_pos(s,s_header_len,1);
+        u8 *start = s_get_p_at_pos(s,s_header_len,0);
         u8 *working_buf = s_alloc_or_raise(s,CSNAPPY_WORKMEM_BYTES);
         csnappy_compress(start,
                          s_body_len,

data/ext/sereal/sereal.c

@@ -15,6 +15,20 @@ void Init_sereal();
  * SNAPPY_INCR encoded objects can be appended into one output and then the
  * decoder will know what to do.
  *
+ * Sereal.encode(object,Sereal::REF)
+ * or Sereal::REF|Sereal::SNAPPY_INC, or Sereal::REF|Sereal::SNAPPY
+ *
+ * when encoding will try to use Sereal's REFP tag to transmit only the
+ * the original object's offset in the packet.
+ * So:
+ *    one = [ 1,2,3,4,5 ]
+ *    two = [ one, one ]
+ *    Sereal.encode(two,Sereal::REF)
+ * will send 'one' only once, and one REFP that points to the first one
+ * it uses one.object_id as a hash key in a local tracker hash
+ * and if it sees this object_id again it just sends the offset.
+ *
+ *
  *   Sereal.decode(blob) - returns the decoded object
  *   
  * If the blob contains multiple compressed
@@ -41,7 +55,6 @@ void Init_sereal();
  *    end
  *
  */
-
 void Init_sereal() {
         Sereal = rb_define_class("Sereal", rb_cObject);
         rb_define_singleton_method(Sereal, "encode", method_sereal_encode, -2);
@@ -49,6 +62,7 @@ void Init_sereal() {
         rb_define_const(Sereal, "SNAPPY",INT2NUM(__SNAPPY));
         rb_define_const(Sereal, "SNAPPY_INCR",INT2NUM(__SNAPPY_INCR));
         rb_define_const(Sereal, "RAW",INT2NUM(__RAW));
+        rb_define_const(Sereal, "REF",INT2NUM(__REF));
         s_init_writers();
 }
 

data/ext/sereal/sereal.h

@@ -53,6 +53,7 @@ do {                                    \
 
 #define FLAG_NOT_MINE 1
 #define FLAG_STREAM   2
+#define FLAG_REF      4
 struct _sereal {
     u8 *data;
     u32 size;
@@ -92,5 +93,6 @@ VALUE method_sereal_decode(VALUE self, VALUE payload);
 #define __RAW           0
 #define __SNAPPY        1
 #define __SNAPPY_INCR   2
+#define __REF           4
 #define __MIN_SIZE      6
 #endif

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sereal
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Borislav Nikolov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-02 00:00:00.000000000 Z
+date: 2014-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler