thrift-client 0.1.0 → 0.3.4

data/test/test_config.rb

@@ -0,0 +1,54 @@
+$:.unshift File.expand_path("../../lib", __FILE__)
+$:.unshift File.expand_path("../../test", __FILE__)
+
+require "test/unit"
+require "thrift_client"
+require "foobar/common_service"
+
+class ClientTest < Test::Unit::TestCase
+  include Test::Unit::Assertions
+
+  def setup
+    super
+    @config = {
+      "protocol" => "binary",
+      "transport" => "socket",
+      "framed" => false,
+      "disconnect_exception_classes" => nil,
+      "application_exception_classes" => nil,
+      "size" => 1,
+      "timeout" => 10,
+      "multiplexed" => false,
+      "client_class" => nil,
+      "servers" => ""
+    }
+    puts "\nsetup"
+  end
+
+  def test_config
+    assert_raise ArgumentError do
+      client = ThriftClient.new(@config)
+    end
+    @config["client_class"] = "231"
+    assert_raise ArgumentError do
+      client = ThriftClient.new(@config)
+    end
+    @config["client_class"] = "Test::CommonService::"
+    assert_raise ArgumentError do
+      client = ThriftClient.new(@config)
+    end
+    @config["client_class"] = "Test::CommonService::Client"
+    assert_raise ArgumentError do
+      client = ThriftClient.new(@config)
+    end
+    @config["servers"] = "127.0.0.1:9000"
+    assert_nothing_raised ArgumentError do
+      client = ThriftClient.new(@config)
+    end
+  end
+
+  def teardown
+    super
+    puts "teardown"
+  end
+end

data/test/test_connection_pool.rb

@@ -0,0 +1,43 @@
+$:.unshift File.expand_path("../../lib", __FILE__)
+$:.unshift File.expand_path("../../test", __FILE__)
+
+require "test/unit"
+require "thrift_client/connection_pool"
+require "thrift_client/pool/thread_connection_pool"
+require "thrift_client/pool/fiber_connection_pool"
+
+class ConnectionPoolTest < Test::Unit::TestCase
+  include Test::Unit::Assertions
+  def setup
+    super
+    puts "setup"
+  end
+
+  def test_thread_connection_pool
+    pool = ThreadConnectionPool.new(:size => 5){
+      # sleep(1)
+      Time.now.to_s
+    }
+    threads = Array.new(200){
+      Thread.new {
+        # sleep(1)
+        pool.execute { |conn|
+          puts conn
+          # sleep(1)
+        }
+      }
+    }
+    sleep(5)
+    # threads.each { | thread |
+    #   p thread
+    #   thread.run
+    #   # thread.join
+    # }
+    # Thread.main.join
+  end
+
+  def teardown
+    super
+    puts "teardown"
+  end
+end

data/test/test_eventmachine_transprot.rb

@@ -0,0 +1,146 @@
+$:.unshift File.expand_path("../../lib", __FILE__)
+$:.unshift File.expand_path("../../test", __FILE__)
+
+require "test/unit"
+require "thrift_client"
+require 'thrift'
+require 'yaml'
+require "foobar/handler"
+require "helper"
+require 'em-synchrony'
+require 'em-synchrony/fiber_iterator'
+
+class EventMachineTransprotTest < Test::Unit::TestCase
+  include Test::Unit::Assertions
+  def setup
+    super
+    root = File.expand_path("../..", __FILE__)
+    @config = YAML.load_file(File.join(root, 'test/thrift_config.yaml'))
+    puts "setup"
+  end
+
+  def test_eventmachine_transport_performence
+    em_use = 0
+    no_em_use = 0
+    EM.synchrony do
+      client = ThriftClient.new(@config['em_test'])
+      start = Time.now
+      EM::Synchrony::FiberIterator.new(0...100, 50).each do |i|
+        client.wait(1)
+      end
+      stop = Time.now
+      em_use = stop - start
+      EM.stop
+    end
+    EM.synchrony do
+      client = ThriftClient.new(@config['no_em_test'])
+      start = Time.now
+      EM::Synchrony::FiberIterator.new(0...100, 50).each do |i|
+          client.wait(1)
+      end
+      stop = Time.now
+      no_em_use = stop - start
+      EM.stop
+    end
+    # assert(em_use < no_em_use)
+    puts "eventmachine use #{em_use}"
+    puts "no eventmachine use #{no_em_use}"
+  end
+
+  def test_eventmachine_transport_availability
+    EM.synchrony do
+      client = ThriftClient.new(@config['em_availability_test'])
+        client.getBar
+        client.getBar
+      EM.stop
+    end
+    EM.synchrony do
+      client = ThriftClient.new(@config['em_availability_test'])
+      start = Time.now
+      EM::Synchrony::FiberIterator.new(0...1000, 50).each do |i|
+        puts "do"
+        bar = Test::Bar.new
+        bar.a = i.to_s
+        bar.b = i
+        bar.c = true
+        bar.d = i.to_f
+        bar.e = i
+        ret = client.putBar bar
+        assert(ret)
+      end
+      stop = Time.now
+      em_use = stop - start
+      puts em_use
+      EM.stop
+    end
+
+    EM.synchrony do
+      client = ThriftClient.new(@config['em_availability_test'])
+      start = Time.now
+      EM::Synchrony::FiberIterator.new(0...1000, 50).each do |i|
+        bar = client.getBar
+        assert_equal("1111111111",bar.a)
+        assert_equal(11111111,bar.b)
+        assert_equal(false,bar.c)
+        assert_equal(1111111.232323,bar.d)
+        assert_equal(111111111111111,bar.e)
+      end
+      stop = Time.now
+      em_use = stop - start
+      puts em_use
+      EM.stop
+    end
+  end
+
+  def test_eventmachine_reconnect
+    puts "should start new server on port 9001"
+    # sleep(5)
+    EM.synchrony do
+      client = ThriftClient.new(@config['em_availability_test'])
+
+      assert_nothing_raised do
+        bar = client.getBar
+        puts bar.inspect
+        assert_equal("1111111111",bar.a)
+        assert_equal(11111111,bar.b)
+        assert_equal(false,bar.c)
+        assert_equal(1111111.232323,bar.d)
+        assert_equal(111111111111111,bar.e)
+      end
+
+      puts "should shutdown new server on port 9001"
+      sleep(3)
+
+      assert_raise Thrift::TransportException do
+        client.getBar
+      end
+
+      puts "should start new server on port 9001"
+      sleep(5)
+
+      assert_nothing_raised do
+        client.getBar
+      end
+    EM.stop
+    end
+  end
+
+  def test_timer
+    puts "should start new server on port 9001"
+    # sleep(5)
+    EM.synchrony do
+      client = ThriftClient.new(@config['em_test'])
+      i = 0
+      # EM::Synchrony::FiberIterator.new(0...1000, 1000).each do |i|
+        client.timeout
+      # end
+      EM.stop
+    end
+  end
+
+  def teardown
+    super
+    # Test::Helper.shutdown_server
+    puts "teardown"
+  end
+end

data/test/test_multiplexed.rb

@@ -0,0 +1,62 @@
+$:.unshift File.expand_path("../../lib", __FILE__)
+$:.unshift File.expand_path("../../test", __FILE__)
+
+require "test/unit"
+require 'thrift'
+require "thrift_client"
+require "foobar/handler"
+require "helper"
+require 'yaml'
+
+class MultiplexedTest < Test::Unit::TestCase
+  include Test::Unit::Assertions
+  def setup
+    super
+    root = File.expand_path("../..", __FILE__)
+    @config = YAML.load_file(File.join(root, 'test/thrift_config.yaml'))
+    Test::Helper.start_server
+    puts "setup"
+  end
+
+  def test_multiplexed
+    client = ThriftClient.new(@config['multiplexed_test'])
+    puts "test start"
+
+    foo = client.getFoo
+    assert_equal(200000, foo.first)
+    assert_equal(222222222222222, foo.second)
+    assert_equal(2.2, foo.third)
+    assert_equal("222", foo.fourth)
+
+    assert_raise do
+      client.ping
+    end
+    puts "test stop"
+  end
+
+  def test_error_multiplexed
+    client = ThriftClient.new(@config['multiplexed_error_test'])
+    assert_raise do
+      client.getFoo
+    end
+  end
+
+  def test_profile
+    client = ThriftClient.new({"transport" => "eventmachine","size"=>50,"client_class" => "Passport::Thrift::RemoteUserProfileService::Client","servers" => "192.168.1.173:9100"})
+    EM.synchrony do
+      start = Time.now
+      EM::Synchrony::FiberIterator.new(0...100, 50).each do |i|
+        client.queryUserBasicInfo(3033)
+      end
+      stop = Time.now
+      em_use = stop - start
+      EM.stop
+    end
+  end
+
+  def teardown
+    super
+    Test::Helper.shutdown_server
+    puts "teardown"
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thrift-client
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.4
 platform: ruby
 authors:
 - Ted Wang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-24 00:00:00.000000000 Z
+date: 2014-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thrift
@@ -16,34 +16,48 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.9.1
 description: Thrift client
 email: ted@ximalaya.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/thrift_client/abstract_server.rb
-- lib/thrift_client/abstract_thrift_client.rb
-- lib/thrift_client/multi_client_server.rb
-- lib/thrift_client/single_client_server.rb
-- lib/thrift_client/thrift.rb
 - lib/thrift_client.rb
-- test/client_test.rb
-- test/foobar_constants.rb
-- test/foobar_service.rb
-- test/foobar_types.rb
-- test/multiplexed_protocol_test.rb
-- test/multiplexed_server.rb
+- lib/thrift_client/abstract_thrift_client.rb
+- lib/thrift_client/pool.rb
+- lib/thrift_client/pool/fiber_connection_pool.rb
+- lib/thrift_client/pool/thread_connection_pool.rb
+- lib/thrift_client/server.rb
+- lib/thrift_client/thrift/client.rb
+- lib/thrift_client/thrift/processor.rb
+- lib/thrift_client/thrift/protocol.rb
+- lib/thrift_client/thrift/struct.rb
+- lib/thrift_client/thrift/transport.rb
+- test/em_test.rb
+- test/foobar/bar_service.rb
+- test/foobar/common_service.rb
+- test/foobar/foo_service.rb
+- test/foobar/foobar_constants.rb
+- test/foobar/foobar_types.rb
+- test/foobar/handler.rb
+- test/helper.rb
 - test/options_config_test.rb
-- test/server.rb
+- test/passport.rb
+- test/start_server.rb
+- test/test.rb
+- test/test_client.rb
+- test/test_config.rb
+- test/test_connection_pool.rb
+- test/test_eventmachine_transprot.rb
+- test/test_multiplexed.rb
 homepage: http://www.ximalaya.com
 licenses:
 - MIT2.0
@@ -64,16 +78,25 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A Thrift client wrapper that encapsulates some common behavior.
 test_files:
-- test/client_test.rb
-- test/foobar_constants.rb
-- test/foobar_service.rb
-- test/foobar_types.rb
-- test/multiplexed_protocol_test.rb
-- test/multiplexed_server.rb
+- test/em_test.rb
+- test/foobar/bar_service.rb
+- test/foobar/common_service.rb
+- test/foobar/foo_service.rb
+- test/foobar/foobar_constants.rb
+- test/foobar/foobar_types.rb
+- test/foobar/handler.rb
+- test/helper.rb
 - test/options_config_test.rb
-- test/server.rb
+- test/passport.rb
+- test/start_server.rb
+- test/test.rb
+- test/test_client.rb
+- test/test_config.rb
+- test/test_connection_pool.rb
+- test/test_eventmachine_transprot.rb
+- test/test_multiplexed.rb

data/lib/thrift_client/multi_client_server.rb

@@ -1,59 +0,0 @@
-require 'thread'
-require 'timeout'
-=begin
-  multi client connection thrift server encapsulation
-=end
-class MultiClientServer < AbstractServer
-
-  def initialize(connect_string, options = {})
-    super
-    @pool_timeout = @options[:pool_timeout]
-    @pool = Array.new(@options[:size]) { client = create_client }
-    @mutex = Mutex.new
-    @resource = ConditionVariable.new
-  end
-
-  def active?
-    active = false
-    @pool.each {|client| active = client.open?; break if active}
-    return active
-  end
-
-  def destroy
-    @pool.each {|client| client.close if client}
-  end
-
-  def get_client
-    client = pop
-    if @test_on_borrow
-      if check_client(client)
-        return client
-      else
-        return nil
-      end
-    else
-      client
-    end
-  end
-
-  def return_client(client)
-    client = create_client unless client.open?
-    @mutex.synchronize do
-      @pool.push client
-      @resource.broadcast
-    end
-  end
-
-  private 
-  def pop
-    deadline = Time.now + @pool_timeout
-    @mutex.synchronize do
-      loop do
-        return @pool.pop unless @pool.empty?
-        to_wait = deadline - Time.now
-        raise Timeout::Error, "Waited #{@pool_timeout} seconds" if to_wait <= 0 and @pool_timeout > 0
-        @resource.wait(@mutex, to_wait)
-      end
-    end
-  end
-end