thrift 0.9.0 → 0.9.1

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MzRjZDcyMTAwY2Y3MTJkYTU2Mzk1MzdmYWYyOWFiMzAwOWU3NzYwZA==
+  data.tar.gz: !binary |-
+    N2Y2MDQ4ZjBhYWM1N2IyOGI2ODE5NDYzNzBjZmRmYTI0NDIxODc1MQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    NWE1NzdmMDg3NjdiZGQzNjdkNzhhYzE1NTVkOGMxN2NlMzRmMmUxZDQ1NWNj
+    ZTUyNGM1YWRjNjM0MDViMWUzMWVjMzY5YzhiNzBhYWJmODk5OGUwODk3NjRh
+    NTgwNzdhZjIyYWJiZTMxZmJlODdlYzlmYjQ2MWI5ZGU2NmVmZDE=
+  data.tar.gz: !binary |-
+    YTE1ODAyOTM5M2E4OGFlMmYyNDFjYjVkMTcyMjA4MDEzM2I1MmE3ZDg2ZmIy
+    MGVjYjFhM2VlOGZlM2U2YjM0YzdkZTgxYmJjNmExMDIyNTIyNDc4MGY5ZjUx
+    MjhiY2Y3NzM5NGIwZGE5MWMyOTY2ZmU0YWI3YzI4MTYwMzg1Nzc=

data/ext/binary_protocol_accelerated.c

@@ -79,7 +79,7 @@ static void write_i64_direct(VALUE trans, int64_t value) {
 
 static void write_string_direct(VALUE trans, VALUE str) {
   if (TYPE(str) != T_STRING) {
-    rb_raise(rb_eStandardError, "Value should be a string");    
+    rb_raise(rb_eStandardError, "Value should be a string");
   }
   str = convert_to_utf8_byte_buffer(str);
   write_i32_direct(trans, RSTRING_LEN(str));
@@ -219,11 +219,21 @@ VALUE rb_thrift_binary_proto_write_string(VALUE self, VALUE str) {
   return Qnil;
 }
 
+VALUE rb_thrift_binary_proto_write_binary(VALUE self, VALUE buf) {
+  CHECK_NIL(buf);
+  VALUE trans = GET_TRANSPORT(self);
+  buf = force_binary_encoding(buf);
+  write_i32_direct(trans, RSTRING_LEN(buf));
+  rb_funcall(trans, write_method_id, 1, buf);
+  return Qnil;
+}
+
 //---------------------------------------
 // interface reading methods
 //---------------------------------------
 
 VALUE rb_thrift_binary_proto_read_string(VALUE self);
+VALUE rb_thrift_binary_proto_read_binary(VALUE self);
 VALUE rb_thrift_binary_proto_read_byte(VALUE self);
 VALUE rb_thrift_binary_proto_read_i32(VALUE self);
 VALUE rb_thrift_binary_proto_read_i16(VALUE self);
@@ -381,11 +391,15 @@ VALUE rb_thrift_binary_proto_read_double(VALUE self) {
 }
 
 VALUE rb_thrift_binary_proto_read_string(VALUE self) {
-  int size = read_i32_direct(self);
-  VALUE buffer = READ(self, size);
+  VALUE buffer = rb_thrift_binary_proto_read_binary(self);
   return convert_to_string(buffer);
 }
 
+VALUE rb_thrift_binary_proto_read_binary(VALUE self) {
+  int size = read_i32_direct(self);
+  return READ(self, size);
+}
+
 void Init_binary_protocol_accelerated() {
   VALUE thrift_binary_protocol_class = rb_const_get(thrift_module, rb_intern("BinaryProtocol"));
 
@@ -410,6 +424,7 @@ void Init_binary_protocol_accelerated() {
   rb_define_method(bpa_class, "write_i64",           rb_thrift_binary_proto_write_i64, 1);
   rb_define_method(bpa_class, "write_double",        rb_thrift_binary_proto_write_double, 1);
   rb_define_method(bpa_class, "write_string",        rb_thrift_binary_proto_write_string, 1);
+  rb_define_method(bpa_class, "write_binary",        rb_thrift_binary_proto_write_binary, 1);
   // unused methods
   rb_define_method(bpa_class, "write_message_end", rb_thrift_binary_proto_write_message_end, 0);
   rb_define_method(bpa_class, "write_struct_begin", rb_thrift_binary_proto_write_struct_begin, 1);
@@ -431,6 +446,7 @@ void Init_binary_protocol_accelerated() {
   rb_define_method(bpa_class, "read_i64",            rb_thrift_binary_proto_read_i64, 0);
   rb_define_method(bpa_class, "read_double",         rb_thrift_binary_proto_read_double, 0);
   rb_define_method(bpa_class, "read_string",         rb_thrift_binary_proto_read_string, 0);
+  rb_define_method(bpa_class, "read_binary",         rb_thrift_binary_proto_read_binary, 0);
   // unused methods
   rb_define_method(bpa_class, "read_message_end", rb_thrift_binary_proto_read_message_end, 0);
   rb_define_method(bpa_class, "read_struct_begin", rb_thift_binary_proto_read_struct_begin, 0);

data/ext/compact_protocol.c

@@ -167,6 +167,7 @@ static void write_collection_begin(VALUE transport, VALUE elem_type, VALUE size_
 
 VALUE rb_thrift_compact_proto_write_i32(VALUE self, VALUE i32);
 VALUE rb_thrift_compact_proto_write_string(VALUE self, VALUE str);
+VALUE rb_thrift_compact_proto_write_binary(VALUE self, VALUE buf);
 
 VALUE rb_thrift_compact_proto_write_message_end(VALUE self) {
   return Qnil;
@@ -305,10 +306,16 @@ VALUE rb_thrift_compact_proto_write_double(VALUE self, VALUE dub) {
 }
 
 VALUE rb_thrift_compact_proto_write_string(VALUE self, VALUE str) {
-  VALUE transport = GET_TRANSPORT(self);
   str = convert_to_utf8_byte_buffer(str);
-  write_varint32(transport, RSTRING_LEN(str));
-  WRITE(transport, RSTRING_PTR(str), RSTRING_LEN(str));
+  rb_thrift_compact_proto_write_binary(self, str);
+  return Qnil;
+}
+
+VALUE rb_thrift_compact_proto_write_binary(VALUE self, VALUE buf) {
+  buf = force_binary_encoding(buf);
+  VALUE transport = GET_TRANSPORT(self);
+  write_varint32(transport, RSTRING_LEN(buf));
+  WRITE(transport, RSTRING_PTR(buf), RSTRING_LEN(buf));
   return Qnil;
 }
 
@@ -319,6 +326,7 @@ VALUE rb_thrift_compact_proto_write_string(VALUE self, VALUE str) {
 #define is_bool_type(ctype) (((ctype) & 0x0F) == CTYPE_BOOLEAN_TRUE || ((ctype) & 0x0F) == CTYPE_BOOLEAN_FALSE)
 
 VALUE rb_thrift_compact_proto_read_string(VALUE self);
+VALUE rb_thrift_compact_proto_read_binary(VALUE self);
 VALUE rb_thrift_compact_proto_read_byte(VALUE self);
 VALUE rb_thrift_compact_proto_read_i32(VALUE self);
 VALUE rb_thrift_compact_proto_read_i16(VALUE self);
@@ -547,20 +555,24 @@ VALUE rb_thrift_compact_proto_read_double(VALUE self) {
 }
 
 VALUE rb_thrift_compact_proto_read_string(VALUE self) {
-  int64_t size = read_varint64(self);
-  VALUE buffer = READ(self, size);
+  VALUE buffer = rb_thrift_compact_proto_read_binary(self);
   return convert_to_string(buffer);
 }
 
+VALUE rb_thrift_compact_proto_read_binary(VALUE self) {
+  int64_t size = read_varint64(self);
+  return READ(self, size);
+}
+
 static void Init_constants() {
   thrift_compact_protocol_class = rb_const_get(thrift_module, rb_intern("CompactProtocol"));
-  
+
   VERSION = rb_num2ll(rb_const_get(thrift_compact_protocol_class, rb_intern("VERSION")));
   VERSION_MASK = rb_num2ll(rb_const_get(thrift_compact_protocol_class, rb_intern("VERSION_MASK")));
   TYPE_MASK = rb_num2ll(rb_const_get(thrift_compact_protocol_class, rb_intern("TYPE_MASK")));
   TYPE_SHIFT_AMOUNT = FIX2INT(rb_const_get(thrift_compact_protocol_class, rb_intern("TYPE_SHIFT_AMOUNT")));
   PROTOCOL_ID = FIX2INT(rb_const_get(thrift_compact_protocol_class, rb_intern("PROTOCOL_ID")));
-  
+
   last_field_id = rb_intern("@last_field");
   boolean_field_id = rb_intern("@boolean_field");
   bool_value_id = rb_intern("@bool_value");
@@ -583,6 +595,7 @@ static void Init_rb_methods() {
   rb_define_method(thrift_compact_protocol_class, "write_i64",           rb_thrift_compact_proto_write_i64, 1);
   rb_define_method(thrift_compact_protocol_class, "write_double",        rb_thrift_compact_proto_write_double, 1);
   rb_define_method(thrift_compact_protocol_class, "write_string",        rb_thrift_compact_proto_write_string, 1);
+  rb_define_method(thrift_compact_protocol_class, "write_binary",        rb_thrift_compact_proto_write_binary, 1);
 
   rb_define_method(thrift_compact_protocol_class, "write_message_end", rb_thrift_compact_proto_write_message_end, 0);
   rb_define_method(thrift_compact_protocol_class, "write_struct_begin", rb_thrift_compact_proto_write_struct_begin, 1);
@@ -605,6 +618,7 @@ static void Init_rb_methods() {
   rb_define_method(thrift_compact_protocol_class, "read_i64",            rb_thrift_compact_proto_read_i64, 0);
   rb_define_method(thrift_compact_protocol_class, "read_double",         rb_thrift_compact_proto_read_double, 0);
   rb_define_method(thrift_compact_protocol_class, "read_string",         rb_thrift_compact_proto_read_string, 0);
+  rb_define_method(thrift_compact_protocol_class, "read_binary",         rb_thrift_compact_proto_read_binary, 0);
 
   rb_define_method(thrift_compact_protocol_class, "read_message_end", rb_thrift_compact_proto_read_message_end, 0);
   rb_define_method(thrift_compact_protocol_class, "read_struct_begin",  rb_thrift_compact_proto_read_struct_begin, 0);

data/ext/constants.h

@@ -48,7 +48,6 @@ extern ID write_list_begin_method_id;
 extern ID write_list_end_method_id;
 extern ID write_set_begin_method_id;
 extern ID write_set_end_method_id;
-extern ID size_method_id;
 extern ID read_bool_method_id;
 extern ID read_byte_method_id;
 extern ID read_i16_method_id;
@@ -67,15 +66,12 @@ extern ID read_struct_end_method_id;
 extern ID read_field_begin_method_id;
 extern ID read_field_end_method_id;
 extern ID keys_method_id;
-extern ID entries_method_id; 
-extern ID name_method_id; 
-extern ID sort_method_id;
+extern ID entries_method_id;
 extern ID write_field_stop_method_id;
 extern ID skip_method_id;
 extern ID write_method_id;
 extern ID read_all_method_id;
 extern ID read_into_buffer_method_id;
-extern ID native_qmark_method_id;
 extern ID force_binary_encoding_id;
 extern ID convert_to_utf8_byte_buffer_id;
 extern ID convert_to_string_id;

data/ext/extconf.rb

@@ -24,7 +24,7 @@ else
 
   $ARCH_FLAGS = Config::CONFIG['CFLAGS'].scan( /(-arch )(\S+)/ ).map{|x,y| x + y + ' ' }.join('')
 
-  $CFLAGS = "-g -O2 -Wall -Werror " + $ARCH_FLAGS
+  $CFLAGS = "-fsigned-char -g -O2 -Wall -Werror " + $ARCH_FLAGS
 
   have_func("strlcpy", "string.h")
 

data/ext/protocol.c

@@ -1,185 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#include <ruby.h>
-#include <protocol.h>
-#include <stdbool.h>
-#include <constants.h>
-#include <struct.h>
-
-static VALUE skip(VALUE self, int ttype) {
-  if (ttype == TTYPE_STOP) {
-    return Qnil;
-  } else if (ttype == TTYPE_BOOL) {
-    rb_funcall(self, read_bool_method_id, 0);
-  } else if (ttype == TTYPE_BYTE) {
-    rb_funcall(self, read_byte_method_id, 0);
-  } else if (ttype == TTYPE_I16) {
-    rb_funcall(self, read_i16_method_id, 0);
-  } else if (ttype == TTYPE_I32) {
-    rb_funcall(self, read_i32_method_id, 0);
-  } else if (ttype == TTYPE_I64) {
-    rb_funcall(self, read_i64_method_id, 0);
-  } else if (ttype == TTYPE_DOUBLE) {
-    rb_funcall(self, read_double_method_id, 0);
-  } else if (ttype == TTYPE_STRING) {
-    rb_funcall(self, read_string_method_id, 0);
-  } else if (ttype == TTYPE_STRUCT) {
-    rb_funcall(self, read_struct_begin_method_id, 0);
-    while (true) {
-      VALUE field_header = rb_funcall(self, read_field_begin_method_id, 0);
-      if (NIL_P(field_header) || FIX2INT(rb_ary_entry(field_header, 1)) == TTYPE_STOP ) {
-        break;
-      } 
-      skip(self, FIX2INT(rb_ary_entry(field_header, 1)));
-      rb_funcall(self, read_field_end_method_id, 0);
-    }
-    rb_funcall(self, read_struct_end_method_id, 0);
-  } else if (ttype == TTYPE_MAP) {
-    int i;
-    VALUE map_header = rb_funcall(self, read_map_begin_method_id, 0);
-    int ktype = FIX2INT(rb_ary_entry(map_header, 0));
-    int vtype = FIX2INT(rb_ary_entry(map_header, 1));
-    int size = FIX2INT(rb_ary_entry(map_header, 2));
-    
-    for (i = 0; i < size; i++) {
-      skip(self, ktype);
-      skip(self, vtype);
-    }
-    rb_funcall(self, read_map_end_method_id, 0);
-  } else if (ttype == TTYPE_LIST || ttype == TTYPE_SET) {
-    int i;
-    VALUE collection_header = rb_funcall(self, ttype == TTYPE_LIST ? read_list_begin_method_id : read_set_begin_method_id, 0);
-    int etype = FIX2INT(rb_ary_entry(collection_header, 0));
-    int size = FIX2INT(rb_ary_entry(collection_header, 1));
-    for (i = 0; i < size; i++) {
-      skip(self, etype);
-    }
-    rb_funcall(self, ttype == TTYPE_LIST ? read_list_end_method_id : read_set_end_method_id, 0);
-  } else {
-    rb_raise(rb_eNotImpError, "don't know how to skip type %d", ttype);
-  }
-
-  return Qnil;
-}
-
-VALUE rb_thrift_protocol_native_qmark(VALUE self) {
-  return Qfalse;
-}
-
-VALUE rb_thrift_protocol_skip(VALUE protocol, VALUE ttype) {
-  return skip(protocol, FIX2INT(ttype));
-}
-
-VALUE rb_thrift_write_message_end(VALUE self) {
-  return Qnil;
-}
-
-VALUE rb_thrift_write_struct_begin(VALUE self, VALUE name) {
-  return Qnil;
-}
-
-VALUE rb_thrift_write_struct_end(VALUE self) {
-  return Qnil;
-}
-
-VALUE rb_thrift_write_field_end(VALUE self) {
-  return Qnil;
-}
-
-VALUE rb_thrift_write_map_end(VALUE self) {
-  return Qnil;
-}
-
-VALUE rb_thrift_write_list_end(VALUE self) {
-  return Qnil;
-}
-
-VALUE rb_thrift_write_set_end(VALUE self) {
-  return Qnil;
-}
-
-VALUE rb_thrift_read_message_end(VALUE self) {
-  return Qnil;
-}
-
-VALUE rb_thift_read_struct_begin(VALUE self) {
-  return Qnil;
-}
-
-VALUE rb_thift_read_struct_end(VALUE self) {
-  return Qnil;
-}
-
-VALUE rb_thift_read_field_end(VALUE self) {
-  return Qnil;
-}
-
-VALUE rb_thift_read_map_end(VALUE self) {
-  return Qnil;
-}
-
-VALUE rb_thift_read_list_end(VALUE self) {
-  return Qnil;
-}
-
-VALUE rb_thift_read_set_end(VALUE self) {
-  return Qnil;
-}
-
-void Init_protocol() {
-  VALUE c_protocol = rb_const_get(thrift_module, rb_intern("BaseProtocol"));
-  
-  rb_define_method(c_protocol, "skip", rb_thrift_protocol_skip, 1);
-  rb_define_method(c_protocol, "write_message_end", rb_thrift_write_message_end, 0);
-  rb_define_method(c_protocol, "write_struct_begin", rb_thrift_write_struct_begin, 1);
-  rb_define_method(c_protocol, "write_struct_end", rb_thrift_write_struct_end, 0);
-  rb_define_method(c_protocol, "write_field_end", rb_thrift_write_field_end, 0);
-  rb_define_method(c_protocol, "write_map_end", rb_thrift_write_map_end, 0);
-  rb_define_method(c_protocol, "write_list_end", rb_thrift_write_list_end, 0);
-  rb_define_method(c_protocol, "write_set_end", rb_thrift_write_set_end, 0);
-  rb_define_method(c_protocol, "read_message_end", rb_thrift_read_message_end, 0);
-  rb_define_method(c_protocol, "read_struct_begin", rb_thift_read_struct_begin, 0);
-  rb_define_method(c_protocol, "read_struct_end", rb_thift_read_struct_end, 0);
-  rb_define_method(c_protocol, "read_field_end", rb_thift_read_field_end, 0);
-  rb_define_method(c_protocol, "read_map_end", rb_thift_read_map_end, 0);
-  rb_define_method(c_protocol, "read_list_end", rb_thift_read_list_end, 0);
-  rb_define_method(c_protocol, "read_set_end", rb_thift_read_set_end, 0);
-  rb_define_method(c_protocol, "native?", rb_thrift_protocol_native_qmark, 0);
-  
-  // native_proto_method_table *npmt;
-  // npmt = ALLOC(native_proto_method_table);
-  // npmt->write_message_end = rb_thrift_write_message_end;
-  // npmt->write_struct_begin = rb_thrift_write_struct_begin;
-  // npmt->write_struct_end = rb_thrift_write_struct_end;
-  // npmt->write_field_end = rb_thrift_write_field_end;
-  // npmt->write_map_end = rb_thrift_write_map_end;
-  // npmt->write_list_end = rb_thrift_write_list_end;
-  // npmt->write_set_end = rb_thrift_write_set_end;
-  // npmt->read_message_end = rb_thrift_read_message_end;
-  // npmt->read_struct_begin = rb_thift_read_struct_begin;
-  // npmt->read_struct_end = rb_thift_read_struct_end;
-  // npmt->read_field_end = rb_thift_read_field_end;
-  // npmt->read_map_end = rb_thift_read_map_end;
-  // npmt->read_list_end = rb_thift_read_list_end;
-  // npmt->read_set_end = rb_thift_read_set_end;
-  // 
-  // VALUE method_table_object = Data_Wrap_Struct(rb_cObject, 0, free, npmt);
-  // rb_const_set(c_protocol, rb_intern("@native_method_table"), method_table_object);
-}

data/ext/protocol.h

@@ -1,20 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-void Init_protocol();

data/ext/struct.c

@@ -627,9 +627,6 @@ static VALUE rb_thrift_union_read(VALUE self, VALUE protocol) {
     rb_raise(rb_eRuntimeError, "too many fields in union!");
   }
 
-  // read field end
-  default_read_field_end(protocol);
-
   // read struct end
   default_read_struct_end(protocol);
 

data/ext/thrift_native.c

@@ -22,7 +22,6 @@
 #include <struct.h>
 #include <binary_protocol_accelerated.h>
 #include <compact_protocol.h>
-#include <protocol.h>
 #include <memory_buffer.h>
 
 // cached classes/modules
@@ -64,7 +63,6 @@ ID write_list_begin_method_id;
 ID write_list_end_method_id;
 ID write_set_begin_method_id;
 ID write_set_end_method_id;
-ID size_method_id;
 ID read_bool_method_id;
 ID read_byte_method_id;
 ID read_i16_method_id;
@@ -83,15 +81,12 @@ ID read_struct_end_method_id;
 ID read_field_begin_method_id;
 ID read_field_end_method_id;
 ID keys_method_id;
-ID entries_method_id; 
-ID name_method_id; 
-ID sort_method_id;
+ID entries_method_id;
 ID write_field_stop_method_id;
 ID skip_method_id;
 ID write_method_id;
 ID read_all_method_id;
 ID read_into_buffer_method_id;
-ID native_qmark_method_id;
 ID force_binary_encoding_id;
 ID convert_to_utf8_byte_buffer_id;
 ID convert_to_string_id;
@@ -151,7 +146,6 @@ void Init_thrift_native() {
   write_list_end_method_id = rb_intern("write_list_end");
   write_set_begin_method_id = rb_intern("write_set_begin");
   write_set_end_method_id = rb_intern("write_set_end");
-  size_method_id = rb_intern("size");
   read_bool_method_id = rb_intern("read_bool");
   read_byte_method_id = rb_intern("read_byte");
   read_i16_method_id = rb_intern("read_i16");
@@ -171,14 +165,11 @@ void Init_thrift_native() {
   read_field_end_method_id = rb_intern("read_field_end");
   keys_method_id = rb_intern("keys");
   entries_method_id = rb_intern("entries");
-  name_method_id = rb_intern("name");
-  sort_method_id = rb_intern("sort");
   write_field_stop_method_id = rb_intern("write_field_stop");
   skip_method_id = rb_intern("skip");
   write_method_id = rb_intern("write");
   read_all_method_id = rb_intern("read_all");
   read_into_buffer_method_id = rb_intern("read_into_buffer");
-  native_qmark_method_id = rb_intern("native?");
   force_binary_encoding_id = rb_intern("force_binary_encoding");
   convert_to_utf8_byte_buffer_id = rb_intern("convert_to_utf8_byte_buffer");
   convert_to_string_id = rb_intern("convert_to_string");
@@ -197,7 +188,6 @@ void Init_thrift_native() {
   element_sym = ID2SYM(rb_intern("element"));
   class_sym = ID2SYM(rb_intern("class"));
 
-  Init_protocol();
   Init_struct();
   Init_binary_protocol_accelerated();
   Init_compact_protocol();