stat-count-client 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 595651505fecffd5f682998e37926c9f741d3c1d
-  data.tar.gz: 7ebed0499b909897e1fecf87b9178ca74354a432
+  metadata.gz: 87d871672e40a91293e2b061ef214c03c8f5e6a4
+  data.tar.gz: 379a6cad4f296795eae3fbc21ae97d23d650b496
 SHA512:
-  metadata.gz: 69a7038be10efbb2139e4d145815085cea14acc243d0a0db57d50d9ce6b86f36318894b82a58d540d0ee13f7844d6b5678f19cf1406e27879f9190e02a9fb4f7
-  data.tar.gz: 75c9141157a994a2f33474e404dfc5bcb3c3cc45db298bb1af05688be853627f7e002572ec1fa1feadeacf7837e3d4d91779c32b3ea0639a927f6699a854b1e5
+  metadata.gz: 4b32f31fe751b288e59eabc931bd3d442df8bb7a3bc4dfeeb692accf4abf5f4646f8ae53081dc42e233dac8035649c6a8e0eb077914d91fecfd9ba51043e87c8
+  data.tar.gz: ba2887361ca54a5c429fc2e36ddb5eced14a4d14538d4d17f7539f091f4a1c971ab7a43999fc907e06f8620870126ee8cd2ec108a3b5719990148e889843a624

data/Gemfile.lock

@@ -0,0 +1,23 @@
+PATH
+  remote: .
+  specs:
+    stat-count-client (0.0.2)
+      hessian2
+      thrift-client
+
+GEM
+  remote: https://rubygems.org/
+  remote: http://192.168.3.220:9292/
+  specs:
+    bigdecimal (1.2.1)
+    hessian2 (2.0.0)
+      bigdecimal
+    thrift (0.9.1)
+    thrift-client (0.0.5)
+      thrift (~> 0.9.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  stat-count-client!

data/lib/stat-count-client/config_loader.rb

@@ -8,6 +8,10 @@
 #  log.level: info
 
 module ConfigLoader
-  LOADER = YAML.load_file("../config/stat-count-client.yaml");
-  CONFIG = LOADER['stat.count']
+    begin
+      LOADER = YAML.load_file(File.join(File.dirname(__FILE__),"../config","stat-count-client.yaml"));
+      CONFIG = LOADER['stat.count']
+    rescue
+        CONFIG = {}
+    end
 end

data/lib/stat-count-client/thrift_client.rb

@@ -15,22 +15,16 @@ module Stat
           include Stat::Count::Thrift
           @@logger = LoggerFactory.getLogger("StatCountThriftClient")
 
-          def initialize(servers=nil, config=nil)
-            servers ||= ENV['stat.count.domain'] ||  ConfigLoader::CONFIG['thrift.domain'] || "localhost:9090"             
-            config ||= ConfigLoader::CONFIG['thrift.config']
-            if config.nil?
-              config[:client_class] = RemoteSimpleCountCollecter::Client
-              config[:application_exception_classes] = DataCollectionException
-            else
-               client_class = config['client_class'] || "RemoteSimpleCountCollecter::Client"
-               config[:client_class] = eval(client_class)
-               application_exception_classes_strs = config['application_exception_classes'] || ["DataCollectionException"]
-               application_exception_classe=application_exception_classes_strs.collect { |class_str|
-                  eval(class_str)
-               }
-               config[:application_exception_classes] = application_exception_classe
-               init(servers, config)
+          def initialize(config=nil) 
+            config ||= ConfigLoader::CONFIG['thrift'] || {}
+            config['servers'] ||='localhost:9090'
+            config['client_class'] ||= 'Stat::Count::Thrift::RemoteSimpleCountCollecter::Client'
+            config['application_exception_classes'] ||= 'Stat::Count::Thrift::DataCollectionException'
+            config['timeout'] ||= 10
+            if !config['size'].nil? && config['size'] > 1
+              config['pool_timeout'] = 12
             end
+            init(config)
           end
 
 
@@ -136,12 +130,11 @@ module Stat
 
 
           private
-           def init(servers, config)
-                @@logger.info("Init Stat count client connect to thrift url: #{servers}, config: #{config}")
-                puts servers
-                puts config
+           def init(config)
+                @@logger.info("Init Stat count client connect to thrift config: #{config}")
+                puts "StatCount init config #{config}"
                 begin
-                  @client = ThriftClient.new(servers, config)
+                  @client = ThriftClient.new(config)
 
                   @client.add_callback(:on_exception) { |method_name, e|
                     @@logger.error("call #{method_name} fails! cause by: #{e.message}, " + "\n" + e.backtrace.join("\n"))

data/lib/stat-count-client/version.rb

@@ -1,7 +1,7 @@
 module Stat
   module Count
     module Client
-      VERSION = "0.0.2"
+      VERSION = "0.0.3"
     end
   end
 end

data/test/benchmark.rb

@@ -0,0 +1,45 @@
+$:.unshift File.join(File.dirname(__FILE__),"..","lib")
+$:.unshift File.join(File.dirname(__FILE__),"..")
+
+require "rubygems"
+require "hessian2"
+require "stat-count-client"
+require_relative "count_mother"
+require 'benchmark'
+
+iterations = 100000
+def reset(client)
+    client.reset("test", "1")
+    client.reset("testHour", "2")
+    client.reset("testDay", "3")
+end
+
+client = Stat::Count::Client::ThriftStatCountClient.new({"servers" => "localhost:9095"});
+Benchmark.bm do |bm|
+  # joining an array of strings
+  bm.report do
+    iterations.times do
+         reset(client)
+         count = CountMother.createIncrCount
+         countResult = client.incrByCount(count)
+         # puts countResult.getResult()
+    end
+  end
+end
+
+
+client = Stat::Count::Client::StatCountClient.new("http://localhost:8080/stat-count-runtime/hessian/remoteSimpleCountCollecter");
+Benchmark.bm do |bm|
+  # joining an array of strings
+  bm.report do
+    iterations.times do
+         reset(client)
+         count = CountMother.createIncrCount
+         countResult = client.incrByCount(count)
+         # puts countResult.getResult()
+    end
+  end
+end
+
+
+

data/test/thrift_count_client_test.rb

@@ -14,7 +14,7 @@ class TC_StatCountClientTest < Test::Unit::TestCase
   # Called before every test method runs. Can be used
   # to set up fixture information.
   def setup
-    @client = ThriftStatCountClient.new("localhost:9095");
+    @client = ThriftStatCountClient.new({"servers" => "localhost:9095"});
   end
 
   # Called after every test method runs. Can be used to tear

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stat-count-client
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - gavin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-02 00:00:00.000000000 Z
+date: 2013-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hessian2
@@ -46,17 +46,16 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - Rakefile
 - README.md
+- test/benchmark.rb
 - test/count_mother.rb
 - test/stat_ccount_client_test.rb
 - test/stat_count_client_test.rb
 - test/test.rb
 - test/thrift_count_client_test.rb
-- lib/config_loader.rb
-- lib/hessian_data_utils.rb
-- lib/logger_factory.rb
 - lib/stat-count-client/config_loader.rb
 - lib/stat-count-client/hessian/stat_data_utils.rb
 - lib/stat-count-client/hessian_client.rb
@@ -95,6 +94,7 @@ signing_key:
 specification_version: 4
 summary: stat count client
 test_files:
+- test/benchmark.rb
 - test/count_mother.rb
 - test/stat_ccount_client_test.rb
 - test/stat_count_client_test.rb

data/lib/config_loader.rb

@@ -1,13 +0,0 @@
-#encoding: UTF-8
-
-#Example
-#stat.count:
-#  hessian.domain: http://localhost:8080/stat-count-runtime/hessian/remoteSimpleCountCollecter
-#  hessian.java.package:  com.ximalaya.stat.count.data
-#  log.file: D:/log/stat/stat-count-ruby.log
-#  log.level: info
-
-module ConfigLoader
-  LOADER = YAML.load_file("../config/stat-count-client.yaml");
-  CONFIG = LOADER['stat.count']
-end

data/lib/hessian_data_utils.rb

@@ -1,33 +0,0 @@
-#encoding: UTF-8
-
-module Hessian
-   module Data
-       module Utils
-         def to_hash_unit
-           hash = {}
-           instance_variables.each {|var| hash[var.to_s.delete("@")] = instance_variable_get(var) }
-           hash
-         end
-
-         def to_hash_map
-           hash = {}
-           instance_variables.each {|var|
-             internal_hash = {}
-             map = instance_variable_get(var)
-             map.each { |key, list|
-               newList = nil
-               list.each { |unit|
-                 if (newList.nil?)
-                   newList = Array.new
-                 end
-                 newList << unit.to_hessian
-               }
-               internal_hash[key] = newList
-             }
-             hash[var.to_s.delete("@")] = internal_hash
-           }
-           hash
-         end
-       end
-  end
-end

data/lib/logger_factory.rb

@@ -1,32 +0,0 @@
-#encoding: UTF-8
-
-require "logger"
-require "config_loader"
-require "monitor"
-
-class LoggerFactory
-    include ConfigLoader
-    @@logger = nil
-    def self.getLogger(name)
-       if @@logger.nil?
-         @monitor = Monitor.new
-         @monitor.synchronize do
-           if @@logger.nil?
-             log_path = CONFIG['log.file.'+name];
-             if(log_path.nil?)
-                log_path = "../log"
-             end
-
-             log_level = CONFIG['log.level.'+name]
-             if(log_level.nil?)
-               log_level = "error";
-             end
-             logger = Logger.new(log_path,'daily')
-             logger.level = Logger::const_get(log_level.upcase)
-             @@logger = logger;
-           end
-         end
-       end
-       @@logger
-    end
-end