thrift 0.0.751142 → 0.0.810255.1

data/CHANGELOG

@@ -1,2 +1,4 @@
 
-v0.0.751142. Initial release
+v0.0.810255.1. Fixes for Ruby 1.9.
+
+v0.0.789419. Initial release

data/Manifest

@@ -1,22 +1,20 @@
 CHANGELOG
-COPYING
-LICENSE
-Makefile.am
 Manifest
-README
 Rakefile
-benchmark/Benchmark.thrift
+README
+setup.rb
 benchmark/benchmark.rb
+benchmark/Benchmark.thrift
 benchmark/client.rb
-benchmark/gen-rb/BenchmarkService.rb
-benchmark/gen-rb/Benchmark_constants.rb
-benchmark/gen-rb/Benchmark_types.rb
 benchmark/server.rb
 benchmark/thin_server.rb
 ext/binary_protocol_accelerated.c
 ext/binary_protocol_accelerated.h
+ext/compact_protocol.c
+ext/compact_protocol.h
 ext/constants.h
 ext/extconf.rb
+ext/macros.h
 ext/memory_buffer.c
 ext/memory_buffer.h
 ext/protocol.c
@@ -26,53 +24,58 @@ ext/struct.h
 ext/thrift_native.c
 lib/thrift.rb
 lib/thrift/client.rb
-lib/thrift/deprecation.rb
+lib/thrift/core_ext.rb
 lib/thrift/exceptions.rb
 lib/thrift/processor.rb
-lib/thrift/protocol.rb
-lib/thrift/protocol/binaryprotocol.rb
-lib/thrift/protocol/binaryprotocolaccelerated.rb
-lib/thrift/protocol/tbinaryprotocol.rb
-lib/thrift/protocol/tprotocol.rb
-lib/thrift/serializer.rb
-lib/thrift/server.rb
-lib/thrift/server/httpserver.rb
-lib/thrift/server/nonblockingserver.rb
-lib/thrift/server/thttpserver.rb
-lib/thrift/server/tserver.rb
 lib/thrift/struct.rb
-lib/thrift/thrift.rb
-lib/thrift/transport.rb
-lib/thrift/transport/httpclient.rb
-lib/thrift/transport/socket.rb
-lib/thrift/transport/thttpclient.rb
-lib/thrift/transport/tsocket.rb
-lib/thrift/transport/ttransport.rb
-lib/thrift/transport/unixsocket.rb
+lib/thrift/thrift_native.rb
 lib/thrift/types.rb
-setup.rb
-spec/ThriftSpec.thrift
-spec/backwards_compatibility_spec.rb
-spec/binaryprotocol_spec.rb
-spec/binaryprotocol_spec_shared.rb
-spec/binaryprotocolaccelerated_spec.rb
+lib/thrift/core_ext/fixnum.rb
+lib/thrift/protocol/base_protocol.rb
+lib/thrift/protocol/binary_protocol.rb
+lib/thrift/protocol/binary_protocol_accelerated.rb
+lib/thrift/protocol/compact_protocol.rb
+lib/thrift/serializer/deserializer.rb
+lib/thrift/serializer/serializer.rb
+lib/thrift/server/base_server.rb
+lib/thrift/server/mongrel_http_server.rb
+lib/thrift/server/nonblocking_server.rb
+lib/thrift/server/simple_server.rb
+lib/thrift/server/thread_pool_server.rb
+lib/thrift/server/threaded_server.rb
+lib/thrift/transport/base_server_transport.rb
+lib/thrift/transport/base_transport.rb
+lib/thrift/transport/buffered_transport.rb
+lib/thrift/transport/framed_transport.rb
+lib/thrift/transport/http_client_transport.rb
+lib/thrift/transport/io_stream_transport.rb
+lib/thrift/transport/memory_buffer_transport.rb
+lib/thrift/transport/server_socket.rb
+lib/thrift/transport/socket.rb
+lib/thrift/transport/unix_server_socket.rb
+lib/thrift/transport/unix_socket.rb
+script/proto_benchmark.rb
+script/read_struct.rb
+script/write_struct.rb
+spec/base_protocol_spec.rb
+spec/base_transport_spec.rb
+spec/binary_protocol_accelerated_spec.rb
+spec/binary_protocol_spec.rb
+spec/binary_protocol_spec_shared.rb
 spec/client_spec.rb
-spec/deprecation_spec.rb
+spec/compact_protocol_spec.rb
 spec/exception_spec.rb
-spec/gen-rb/NonblockingService.rb
-spec/gen-rb/ThriftSpec_constants.rb
-spec/gen-rb/ThriftSpec_types.rb
-spec/httpclient_spec.rb
-spec/httpserver_spec.rb
-spec/nonblockingserver_spec.rb
+spec/http_client_spec.rb
+spec/mongrel_http_server_spec.rb
+spec/nonblocking_server_spec.rb
 spec/processor_spec.rb
-spec/protocol_spec.rb
 spec/serializer_spec.rb
+spec/server_socket_spec.rb
 spec/server_spec.rb
 spec/socket_spec.rb
 spec/socket_spec_shared.rb
 spec/spec_helper.rb
 spec/struct_spec.rb
-spec/transport_spec.rb
+spec/ThriftSpec.thrift
 spec/types_spec.rb
-spec/unixsocket_spec.rb
+spec/unix_socket_spec.rb

data/README

@@ -1,7 +1,25 @@
 Thrift Ruby Software Library
-    by Kevin Ballard, Kevin Clark, Mark Slee
     http://incubator.apache.org/thrift/
 
+== LICENSE:
+
+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.
+
 == DESCRIPTION:
 
 Thrift is a strongly-typed language-agnostic RPC system.
@@ -23,8 +41,3 @@ thrift software package.
 This section should get written by someone with the time and inclination.
 In the meantime, look at existing code, such as the benchmark or the tutorial
 in the full thrift distribution.
-
-== LICENSE:
-
-Thrift is distributed under the Apache Software License.
-Please see the included LICENSE file.

data/Rakefile

@@ -79,7 +79,7 @@ begin
   Echoe.new('thrift') do |p|
     p.author = ['Kevin Ballard', 'Kevin Clark', 'Mark Slee', 'Evan Weaver']
     p.project = "fauna"
-    p.summary = "Ruby libraries for Thrift (a language-agnostic RPC system)"
+    p.summary = "Ruby libraries for Thrift, with fixes."
     p.include_rakefile = true
     p.url = "http://blog.evanweaver.com/files/doc/fauna/thrift/"
     p.docs_host = "blog.evanweaver.com:~/www/bax/public/files/doc/"

data/benchmark/Benchmark.thrift

@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
 namespace rb ThriftBenchmark
 
 service BenchmarkService {

data/benchmark/benchmark.rb

@@ -1,8 +1,25 @@
+#
+# 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.
+#
+
 require 'rubygems'
 $:.unshift File.dirname(__FILE__) + '/../lib'
 require 'thrift'
-require 'thrift/server/nonblockingserver'
-require 'thrift/transport/unixsocket'
 require 'stringio'
 
 HOST = '127.0.0.1'
@@ -214,7 +231,7 @@ class BenchmarkManager
   }
 
   def tabulate(fmt, *labels_and_values)
-    labels = labels_and_values.map { |(l,)| Array === l ? l.first : l }
+    labels = labels_and_values.map { |l| Array === l ? l.first : l }
     label_width = labels.inject(0) { |w,l| l.size > w ? l.size : w }
     labels_and_values.each do |(l,v)|
       f = fmt

data/benchmark/client.rb

@@ -1,8 +1,26 @@
+#
+# 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.
+#
+
 $:.unshift File.dirname(__FILE__) + '/../lib'
 require 'thrift'
-require 'thrift/server/nonblockingserver'
 $:.unshift File.dirname(__FILE__) + "/gen-rb"
-require 'BenchmarkService'
+require 'benchmark_service'
 
 class Client
   def initialize(host, port, clients_per_process, calls_per_client, log_exceptions)

data/benchmark/server.rb

@@ -1,8 +1,26 @@
+#
+# 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.
+#
+
 $:.unshift File.dirname(__FILE__) + '/../lib'
 require 'thrift'
-require 'thrift/server/nonblockingserver'
 $:.unshift File.dirname(__FILE__) + "/gen-rb"
-require 'BenchmarkService'
+require 'benchmark_service'
 
 module Server
   include Thrift
@@ -22,8 +40,8 @@ module Server
     handler = BenchmarkHandler.new
     processor = ThriftBenchmark::BenchmarkService::Processor.new(handler)
     transport = ServerSocket.new(host, port)
-    transportFactory = FramedTransportFactory.new
-    args = [processor, transport, transportFactory, nil, 20]
+    transport_factory = FramedTransportFactory.new
+    args = [processor, transport, transport_factory, nil, 20]
     if serverClass == NonblockingServer
       logger = Logger.new(STDERR)
       logger.level = Logger::WARN

data/benchmark/thin_server.rb

@@ -1,8 +1,26 @@
+#
+# 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.
+#
+
 $:.unshift File.dirname(__FILE__) + '/../lib'
 require 'thrift'
-require 'thrift/server/nonblockingserver'
 $:.unshift File.dirname(__FILE__) + "/gen-rb"
-require 'BenchmarkService'
+require 'benchmark_service'
 HOST = 'localhost'
 PORT = 42587
 
@@ -20,7 +38,7 @@ end
 handler = BenchmarkHandler.new
 processor = ThriftBenchmark::BenchmarkService::Processor.new(handler)
 transport = Thrift::ServerSocket.new(HOST, PORT)
-transportFactory = Thrift::FramedTransportFactory.new
+transport_factory = Thrift::FramedTransportFactory.new
 logger = Logger.new(STDERR)
 logger.level = Logger::WARN
-Thrift::NonblockingServer.new(processor, transport, transportFactory, nil, 20, logger).serve
+Thrift::NonblockingServer.new(processor, transport, transport_factory, nil, 20, logger).serve

data/ext/binary_protocol_accelerated.c

@@ -1,14 +1,28 @@
+/**
+ * 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 <stdbool.h>
 #include <stdint.h>
 #include <constants.h>
 #include <struct.h>
-
-#define GET_TRANSPORT(obj) rb_ivar_get(obj, transport_ivar_id)
-#define GET_STRICT_READ(obj) rb_ivar_get(obj, strict_read_ivar_id)
-#define GET_STRICT_WRITE(obj) rb_ivar_get(obj, strict_write_ivar_id)
-#define WRITE(obj, data, length) rb_funcall(obj, write_method_id, 1, rb_str_new(data, length))
-#define CHECK_NIL(obj) if (NIL_P(obj)) { rb_raise(rb_eStandardError, "nil argument not allowed!");}
+#include "macros.h"
 
 VALUE rb_thrift_binary_proto_native_qmark(VALUE self) {
   return Qtrue;
@@ -62,7 +76,7 @@ static void write_i64_direct(VALUE trans, int64_t value) {
 }
 
 static void write_string_direct(VALUE trans, VALUE str) {
-  write_i32_direct(trans, RSTRING(str)->len);
+  write_i32_direct(trans, RSTRING_LEN(str));
   rb_funcall(trans, write_method_id, 1, str);
 }
 
@@ -108,7 +122,7 @@ VALUE rb_thrift_binary_proto_write_message_begin(VALUE self, VALUE name, VALUE t
     write_i32_direct(trans, FIX2INT(seqid));
   } else {
     write_string_direct(trans, name);
-    write_byte_direct(trans, type);
+    write_byte_direct(trans, FIX2INT(type));
     write_i32_direct(trans, FIX2INT(seqid));
   }
   
@@ -186,7 +200,7 @@ VALUE rb_thrift_binary_proto_write_double(VALUE self, VALUE dub) {
     double f;
     int64_t t;
   } transfer;
-  transfer.f = RFLOAT(rb_Float(dub))->value;
+  transfer.f = RFLOAT_VALUE(rb_Float(dub));
   write_i64_direct(GET_TRANSPORT(self), transfer.t);
 
   return Qnil;
@@ -195,8 +209,6 @@ VALUE rb_thrift_binary_proto_write_double(VALUE self, VALUE dub) {
 VALUE rb_thrift_binary_proto_write_string(VALUE self, VALUE str) {
   CHECK_NIL(str);
   VALUE trans = GET_TRANSPORT(self);
-  // write_i32_direct(trans, RSTRING(str)->len);
-  // rb_funcall(trans, write_method_id, 1, str);
   write_string_direct(trans, str);
   return Qnil;
 }
@@ -205,28 +217,27 @@ VALUE rb_thrift_binary_proto_write_string(VALUE self, VALUE str) {
 // interface reading methods
 //---------------------------------------
 
-#define READ(obj, length) rb_funcall(GET_TRANSPORT(obj), read_method_id, 1, INT2FIX(length)) 
-
 VALUE rb_thrift_binary_proto_read_string(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);
 
 static char read_byte_direct(VALUE self) {
-  return (RSTRING(READ(self, 1))->ptr)[0];
+  VALUE buf = READ(self, 1);
+  return RSTRING_PTR(buf)[0];
 }
 
 static int16_t read_i16_direct(VALUE self) {
   VALUE buf = READ(self, 2);
-  return (int16_t)(((uint8_t)(RSTRING(buf)->ptr[1])) | ((uint16_t)((RSTRING(buf)->ptr[0]) << 8)));
+  return (int16_t)(((uint8_t)(RSTRING_PTR(buf)[1])) | ((uint16_t)((RSTRING_PTR(buf)[0]) << 8)));
 }
 
 static int32_t read_i32_direct(VALUE self) {
   VALUE buf = READ(self, 4);
-  return ((uint8_t)(RSTRING(buf)->ptr[3])) | 
-    (((uint8_t)(RSTRING(buf)->ptr[2])) << 8) | 
-    (((uint8_t)(RSTRING(buf)->ptr[1])) << 16) | 
-    (((uint8_t)(RSTRING(buf)->ptr[0])) << 24);
+  return ((uint8_t)(RSTRING_PTR(buf)[3])) | 
+    (((uint8_t)(RSTRING_PTR(buf)[2])) << 8) | 
+    (((uint8_t)(RSTRING_PTR(buf)[1])) << 16) | 
+    (((uint8_t)(RSTRING_PTR(buf)[0])) << 24);
 }
 
 static int64_t read_i64_direct(VALUE self) {
@@ -289,7 +300,7 @@ VALUE rb_thrift_binary_proto_read_message_begin(VALUE self) {
       rb_exc_raise(get_protocol_exception(INT2FIX(BAD_VERSION), rb_str_new2("No version identifier, old protocol client?")));
     }
     name = READ(self, version);
-    type = rb_thrift_binary_proto_read_byte(self);
+    type = read_byte_direct(self);
     seqid = rb_thrift_binary_proto_read_i32(self);
   }
   
@@ -325,7 +336,7 @@ VALUE rb_thrift_binary_proto_read_set_begin(VALUE self) {
 
 VALUE rb_thrift_binary_proto_read_bool(VALUE self) {
   char byte = read_byte_direct(self);
-  return byte == 1 ? Qtrue : Qfalse;
+  return byte != 0 ? Qtrue : Qfalse;
 }
 
 VALUE rb_thrift_binary_proto_read_byte(VALUE self) {

data/ext/binary_protocol_accelerated.h

@@ -1 +1,20 @@
+/*
+ * 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_binary_protocol_accelerated();