stat-count-client 0.0.1 → 0.0.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 595651505fecffd5f682998e37926c9f741d3c1d
+  data.tar.gz: 7ebed0499b909897e1fecf87b9178ca74354a432
+SHA512:
+  metadata.gz: 69a7038be10efbb2139e4d145815085cea14acc243d0a0db57d50d9ce6b86f36318894b82a58d540d0ee13f7844d6b5678f19cf1406e27879f9190e02a9fb4f7
+  data.tar.gz: 75c9141157a994a2f33474e404dfc5bcb3c3cc45db298bb1af05688be853627f7e002572ec1fa1feadeacf7837e3d4d91779c32b3ea0639a927f6699a854b1e5

data/Gemfile

@@ -1,4 +1,5 @@
 source 'https://rubygems.org'
+source 'http://192.168.3.220:9292/'
 
 # Specify your gem's dependencies in stat-count-client.gemspec
 gemspec

data/doc/collecter.thrift

@@ -0,0 +1,299 @@
+namespace java com.ximalaya.stat.count.thrift
+namespace rb stat.count.thrift
+
+struct Record {
+	1:map<string, string> recordMap
+}
+
+struct CountUnit{
+	1:string id,
+	2:i32 count
+}
+
+struct SimpleCount {
+	1:map<string, list<CountUnit>> counts
+}
+
+struct DateCountUnit {
+	1:string id,
+	2:i32 count,
+	3:i64 timeMills
+}
+
+struct DateCount {
+	1: map<string, list<DateCountUnit>> counts
+}
+
+struct QueryDateUnit {
+	1:string id,
+	2:i32 limit,
+	3:i64 fromDate,
+	4:i64 toDate
+}
+
+struct DateCountQuery {
+	1:map<string, list<QueryDateUnit>> queries
+}
+
+struct QueryUnit {
+	1:string id,
+	2:i32 limit
+}
+
+struct SimpleCountQuery {
+	1:map<string, list<QueryUnit>> queries
+}
+
+struct CountResult {
+	 1:map<string, map<string, i64>> countResults
+}
+
+exception DataCollectionException {
+	1: string message
+}
+
+service RemoteSimpleCountCollecter {
+	 /**
+     * 将name服务的id对象的值增加count。如果服务配置了<code>{@link TimeUnit}</code>,就将当前时间单元的计数值增加count。
+     * @param name 服务名
+     * @param id 对象id
+     * @param count 增加的值
+     * @return 增加后的值，如果服务配有时间单元，返回的是当前时间单元的值
+     * @throws DataCollectionException
+     */
+	i64 incrBy(1:string name, 2:string id, 3:i32 count) throws (1:DataCollectionException dcex),
+	
+	/**
+	 * 根据<code>{@link DateCount}</code>描述的值。对相关的记录增加指定的值。
+	 * @param count 增加计数的参数
+	 * @throws DataCollectionException 无法完成计数服务
+	 */
+	void incrByCountWithDate(1:DateCount dateCount) throws (1:DataCollectionException dcex),
+	
+	/**
+	 * 根据<code>{@link Count}</code>描述的值。对相关的记录增加指定的值。
+	 * @param count 增加计数的参数
+	 * @return 增加的结果，如果服务配有时间单元，返回的是当前时间单元的值
+	 * @throws DataCollectionException
+	 */
+	CountResult incrByCount(1:SimpleCount count) throws (1:DataCollectionException dcex),
+	
+	/**
+	 * 将name服务的id对象值加一.
+	 * @see #incr(String, String, int)
+	 */
+	i64 incr(1:string name, 2:string id) throws (1:DataCollectionException dcex),
+	
+	/**
+	 * 将name服务id对象在date时间计数值增加指定的数值。
+	 * @param name 服务名
+	 * @param id 对象ID
+	 * @param count 增加的数目
+	 * @param date 指定的时间
+	 * @return 指定时间对应时间单元增加后的值
+	 * @throws DataCollectionException
+	 */
+	i64 incrByWithDate(1:string name, 2:string id, 3:i32 count, 4:i64 timeMills) throws (1:DataCollectionException dcex),
+	
+    /**
+     * 将name服务的id对象的减去count。如果服务配置了<code>{@link TimeUnit}</code>,就将当前时间单元的计数值增加count。
+     * @param name 服务名
+     * @param id 对象id
+     * @param count 减去的值
+     * @return 减去后的值，如果服务配有时间单元，返回的是当前时间单元的值
+     * @throws DataCollectionException
+     */
+	i64 decrBy(1:string name, 2:string id, 3:i32 count) throws (1:DataCollectionException dcex),
+	
+	/**
+	 * 将name服务id对象在date时间计数值减去指定的数值。
+	 * @param name 服务名
+	 * @param id 对象ID
+	 * @param count 数目
+	 * @param date 指定的时间
+	 * @return 指定时间对应时间单元减去后的值
+	 * @throws DataCollectionException
+	 */
+	i64 decrByWithDate(1:string name, 2:string id, 3:i32 count, 4:i64 date) throws (1:DataCollectionException dcex),
+	
+	/**
+	 * 将name服务的id对象的减1
+	 * @see #decr(String, String, int)
+	 */
+	i64 decr(1:string name, 2:string id) throws (1:DataCollectionException dcex);
+	
+	/**
+	 * 根据<code>{@link DateCount}</code>描述的值。对相关的记录减去指定的值。
+	 * @param count 减去计数的参数
+	 * @throws DataCollectionException 无法完成计数服务
+	 */
+	void decrByCountWithDate(1:DateCount dateCount) throws (1:DataCollectionException dcex),
+	
+	/**
+	 * 根据<code>{@link Count}</code>描述的值。对相关的记录减去指定的值。
+	 * @param count 减去计数的参数
+	 * @return 减去后的结果，如果服务配有时间单元，返回的是当前时间单元的值
+	 * @throws DataCollectionException
+	 */
+	CountResult decrByCount(1:SimpleCount count) throws (1:DataCollectionException dcex),
+	
+	/**
+	 * 根据<code>{@link DateCount}</code>描述的值。对相关的记录设置值。
+	 * @param count 设置的参数
+	 * @throws DataCollectionException 无法完成计数服务
+	 */
+	void setByCountWithDate(1:DateCount count) throws (1:DataCollectionException dcex),
+	
+	/**
+	 * 根据<code>{@link Count}</code>描述的值。对相关的记录设置值。
+	 * @param count 设置的参数
+	 * @throws DataCollectionException 无法完成计数服务
+	 */
+	void setByCount(1:SimpleCount count) throws (1:DataCollectionException dcex),
+	
+	/**
+	 * 将name服务id对象设置成指定的数值。如果服务配置了<code>{@link TimeUnit}</code>,就将当前时间单元的计数值设置成指定的值。
+	 * @param name 服务名
+	 * @param id 对象ID
+	 * @param count 数目
+	 * @throws DataCollectionException
+	 */
+	void setValue(1:string name, 2:string id, 3:i64 value) throws (1:DataCollectionException dcex),
+	
+	/**
+	 * 将name服务id对象在对应时间的记录设置成指定的数值
+	 * @param name 服务名
+	 * @param id 对象ID
+	 * @param count 数目
+	 * @param date 指定的时间
+	 * @throws DataCollectionException
+	 */
+	void setWithDate(1:string name, 2:string id, 3:i64 value, 4:i64 timeMills) throws (1:DataCollectionException dcex),
+	
+	/**
+	 * 重置name服务id对象的记录数值。
+	 * @param name 服务名
+	 * @param id 对象id
+	 * @throws DataCollectionException
+	 */
+	void reset(1:string name, 2:string id) throws (1:DataCollectionException dcex),
+	
+	/**
+	 * 重置name服务id对象最近limit条数的记录。该服务必须配置有<code>TimeUnit</code>。
+	 * @param name 服务名
+	 * @param id 对象id
+	 * @param limit 条数
+	 * @throws DataCollectionException
+	 */
+	void resetByLimit(1:string name, 2:string id, 3:i32 limit)  throws (1:DataCollectionException dcex),
+	
+	/**
+	 * 获取name服务id对象的计数值。如果有配了<code>TimeUnit</code>，则返回当前时间单元的数值。
+	 * @param name
+	 * @param id
+	 * @return
+	 * @throws DataCollectionException
+	 */
+	i64 get(1:string name, 2:string id) throws (1:DataCollectionException dcex),
+	
+	/**
+	 * 获取那么服务id对象指定条数的记录值的和。该服务必须配有<code>TimeUnit</code>。
+	 * 获取204用户近一个星期内的发帖总数。
+	 * <p>
+	 * 	  collecter.get("paste", "204", 7);
+	 * </p>
+	 * @param name 服务名
+	 * @param id 对象id
+	 * @param limit 时间单元数
+	 * @return 计数总和
+	 * @throws DataCollectionException
+	 */
+	i64 getByLimit(1:string name, 2:string id, 3:i32 limit) throws (1:DataCollectionException dcex),
+	
+	/**
+	 * 批量获取id对象多个服务在limit个数的时间单元内的计数总和
+	 * @param names 多个服务名。
+	 * @param id 对象id
+	 * @param limit 时间单元个数
+	 * @return 和各个服务对应的记录和，顺序和提供的服务名的顺序是一致的。
+	 * @throws DataCollectionException
+	 */
+	list<i64> getByNamesAndLimit(1:list<string> names, 2:string id, 3:i32 limit) throws (1:DataCollectionException dcex),
+	
+	/**
+	 * 批量获取id对象多个服务的计数值。如果配有<code>TimeUnit</code>为当前时间单元的记录值。
+	 * @param names 多个服务名
+	 * @param id 对象id
+	 * @return 和各个服务对应的记录值，顺序和提供的服务名的顺序是一致的。
+	 * @throws DataCollectionException
+	 */
+	list<i64> getByNames(1:list<string> names, 2:string id) throws (1:DataCollectionException dcex),
+	
+	/**
+	 * 批量获取name服务下多个对象的计数值。如果配有<code>TimeUnit</code>为当前时间单元的记录值。
+	 * @param name 服务名
+	 * @param ids 多个对象id
+	 * @return 和各对象对应的记录值。顺序和提供的对象id顺序是一致的。
+	 * @throws DataCollectionException
+	 */
+	list<i64> getByIds(1:string name, 2:list<string> ids) throws (1:DataCollectionException dcex),
+	
+	/**
+	 * 批量获取name服务下多个对象的多条计数总和，
+	 * @param name 服务名
+	 * @param ids 多个对象id
+	 * @param limit 指定条数
+	 * @return 和各对象对应的计数总和。顺序和提供的对象id顺序是一致的。
+	 * @throws DataCollectionException
+	 */
+	list<i64> getByIdsAndLimit(1:string name, 2:list<string> ids, 3:i32 limit) throws (1:DataCollectionException dcex),
+	
+	/**
+	 * 批量获取<code>CountQuery</code>提供的服务，id，时间的记录值之和。
+	 * @param query
+	 * @return 对应的计数之和。
+	 * @throws DataCollectionException
+	 */
+	CountResult getByQuery(1:SimpleCountQuery query) throws (1:DataCollectionException dcex),
+	
+	
+	/**
+	 * 批量获取<code>CountDateQuery</code>提供的服务，id，时间的记录值之和。
+	 * @param query
+	 * @return 对应的计数
+	 * @throws DataCollectionException
+	 */
+    CountResult getByDateQuery(1:DateCountQuery query) throws (1:DataCollectionException dcex),
+	
+	
+	/**
+	 * 根据<code>CountQuery</code>批量删除计数值。
+	 * @param query
+	 * @throws DataCollectionException
+	 */
+	void delByQuery(1:SimpleCountQuery query) throws  (1:DataCollectionException dcex),
+	
+	/**
+	 * 根据<code>CountQuery</code>批量删除计数值。
+	 * @param query
+	 * @throws DataCollectionException
+	 */
+	void delByDateQuery(1:DateCountQuery query) throws (1:DataCollectionException dcex)
+
+	/**
+	 * 添加一个记录值
+	 * @param name 服务名
+	 * @param id 服务对象的ID
+	 * @param record 记录
+	 * @throws DataCollectionException 无法完成统计服务时
+	 */
+	void setRecord(1:string name, 2:string id, 3:Record record)  throws (1:DataCollectionException dcex);
+	
+	/**
+	 * 删除一个记录
+	 * @param name 服务名
+	 * @param id 服务对象的ID
+	 * @throws DataCollectionException 无法完成统计服务时
+	 */
+	void delByKey(1:string name, 2:string id) throws (1:DataCollectionException dcex);
+}

data/doc/gen.txt

@@ -0,0 +1 @@
+thrift -out /workspaces/ruby/stat-count-client/lib/stat-count-client/thrift --gen rb /workspaces/ruby/stat-count-client/doc/collecter.thrift

data/lib/config_loader.rb

@@ -8,11 +8,6 @@
 #  log.level: info
 
 module ConfigLoader
-  begin
-    LOADER = YAML.load_file("../config/stat-count-client.yaml");
-    CONFIG = LOADER['stat.count']
-  rescue => err
-      CONFIG = {}
-      puts "can't load config file stat-count-client.yaml, you need to init statcountclient with config hash"
-  end
+  LOADER = YAML.load_file("../config/stat-count-client.yaml");
+  CONFIG = LOADER['stat.count']
 end

data/lib/hessian_data_utils.rb

@@ -28,13 +28,6 @@ module Hessian
            }
            hash
          end
-
-         def java_class_name(java_package)
-           index =  self.class.name.rindex "::"
-           index = (index.nil?) ?  0 : index+2
-           simple_name = self.class.name[index..-1]
-           java_package.nil? ? simple_name : java_package + "." + simple_name
-         end
        end
   end
 end

data/lib/logger_factory.rb

@@ -7,25 +7,20 @@ require "monitor"
 class LoggerFactory
     include ConfigLoader
     @@logger = nil
-    def self.getLogger(name, log_path=nil, log_level=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 = CONFIG['log.file.'+name];
-               if(log_path.nil?)
-                 log_path = "../log"
-               end
+                log_path = "../log"
              end
 
-              if log_level.nil?
-                log_level = CONFIG['log.level.'+name]
-                if(log_level.nil?)
-                  log_level = "error";
-                end
-              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;

data/lib/stat-count-client.rb

@@ -1,335 +1,5 @@
 #encoding: UTF-8
 
 require "stat-count-client/version"
-require "yaml"
-require "config_loader"
-require "logger_factory"
-require "singleton"
-require "hessian_data_utils"
-
-
-module Stat
-  module Count
-    module Data
-      class QueryUnit
-        include Hessian::Data::Utils
-        include ConfigLoader
-
-        attr :id, true
-        attr :limit, true
-
-        def to_hash
-            to_hash_unit
-        end
-
-        def to_hessian
-          Hessian2::TypeWrapper.new(java_class_name("com.ximalaya.stat.count.data"), to_hash)
-        end
-      end
-
-      class CountUnit
-        include Hessian::Data::Utils
-        include ConfigLoader
-
-        attr :id, true
-        attr :count, true
-
-        def to_hash
-            to_hash_unit
-        end
-
-        def to_hessian
-          Hessian2::TypeWrapper.new(java_class_name("com.ximalaya.stat.count.data"), to_hash)
-        end
-      end
-
-      class DateQueryUnit < QueryUnit
-        attr :fromDate, true
-        attr :toDate, true
-      end
-
-      class DateCountUnit < CountUnit
-        attr :date, true
-
-        def to_hessian
-          Hessian2::TypeWrapper.new(java_class_name("com.ximalaya.stat.count.data"), to_hash)
-        end
-      end
-
-      class SimpleCount
-        include Hessian::Data::Utils
-        include ConfigLoader
-
-        attr_accessor :counts
-
-        def initialize
-          @counts = Hash.new
-        end
-
-        def addCount(name, id, count=1, countUnit=nil)
-          countUnitList = @counts[name]
-          if (countUnitList.nil?)
-            countUnitList = Array.new
-            @counts[name] = countUnitList
-          end
-
-          if (countUnit.nil?)
-            countUnit = CountUnit.new
-          end
-          countUnit.id = id
-          countUnit.count = count
-          countUnitList << countUnit
-          self
-        end
-
-        def getCounts
-          @counts
-        end
-
-        def getCountsSize
-          @counts.length
-        end
-
-        def to_hash
-          to_hash_map
-        end
-
-        def to_hessian
-            Hessian2::TypeWrapper.new(java_class_name("com.ximalaya.stat.count.data"), to_hash)
-        end
-      end
-
-      class DateCount < SimpleCount
-        def addCountWithDate(name, id, count=1, date=Time.now)
-          dateCountUnit = DateCountUnit.new
-          dateCountUnit.date = date
-          addCount(name, id, count, dateCountUnit)
-          self
-        end
-
-        def to_hessian
-          Hessian2::TypeWrapper.new(java_class_name("com.ximalaya.stat.count.data"), to_hash)
-        end
-      end
-
-      class SimpleCountQuery
-        include Hessian::Data::Utils
-        include ConfigLoader
-
-        attr_accessor :queries
-
-        def initialize
-          @queries = Hash.new
-        end
-
-        def addQuery(name, id, limit=1, queryUnit=nil)
-          queryUnitList = @queries[name]
-
-          if(queryUnitList.nil?)
-            queryUnitList = Array.new
-            @queries[name] = queryUnitList
-          end
-
-          if(queryUnit.nil?)
-            queryUnit = QueryUnit.new
-          end
-
-          queryUnit.id = id
-          queryUnit.limit = limit
-          queryUnitList << queryUnit
-          self
-        end
-
-        def getQueries
-          @queries
-        end
-
-        def to_hash
-            to_hash_map
-        end
-
-        def to_hessian
-          Hessian2::TypeWrapper.new(java_class_name("com.ximalaya.stat.count.data"), to_hash)
-        end
-      end
-
-      class DateCountQuery < SimpleCountQuery
-        def addQueryWithDate(name, id, fromDate, toDate, limit=1)
-          queryUnit = DateQueryUnit.new
-          addQuery(name, id, limit, queryUnit)
-          self
-        end
-
-        def to_hessian
-          Hessian2::TypeWrapper.new(java_class_name("com.ximalaya.stat.count.data"), to_hash)
-        end
-      end
-
-      class CountResult
-        attr_accessor :countResults
-
-        def initialize(hash)
-          @countResults = hash['countResults']
-        end
-
-        def getResult(name=nil, id=nil)
-          if(name.nil?)
-             return @countResults
-          end
-
-          countHash = @countResults[name]
-          if(countHash.nil?)
-            raise ArgumentError,"服务的名称: " + name + " 不存在!"
-          end
-
-          if (id.nil?)
-            return countHash
-          end
-
-          count = countHash[id]
-          if(count.nil?)
-            railse ArgumentError,"业务ID: "+id +" 不存在"
-          end
-          count
-        end
-      end
-
-  end
-
-  module Client
-    class StatCountClient
-      include Stat::Count::Data
-      include ConfigLoader
-
-      def initialize(config={})
-        @hessian_url = config['hessian.domain'];
-        if (@hessian_url.nil?)
-          @hessian_url ||= ENV['stat.count.domain']
-          @hessian_url ||= CONFIG['hessian.domain']
-        end
-        @logger = LoggerFactory.getLogger("StatCountClient", config['log.file.StatCountClient'], config['log.level.StatCountClient'])
-
-        init(@hessian_url)
-      end
-
-      def incrByCountWithDate(dateCount)
-        wrapper = dateCount.to_hessian
-        @client.incrByCountWithDate(wrapper)
-      end
-
-      def incrByCount(count)
-         wrapper = count.to_hessian
-         countResult = @client.incrByCount(wrapper)
-         CountResult.new(countResult)
-      end
-
-      def incr(name, id, count=1, date=nil)
-        if(date.nil?)
-          @client.incrBy(name,id, count)
-        else
-          @client.incrByWithDate(name, id, count, date)
-        end
-      end
-
-      def decr(name, id, count=1, date=nil)
-         if(date.nil?)
-           @client.decrBy(name, id, count)
-         else
-           @client.decrByWithDate(name, id, count, date)
-         end
-      end
-
-      def decrByCount(count)
-        wrapper = count.to_hessian
-        count_result = @client.decrByCount(wrapper)
-        CountResult.new(count_result)
-      end
-
-      def decrByCountWithDate(dateCount)
-        wrapper = dateCount.to_hessian
-        @client.decrByCountWithDate(wrapper)
-      end
-
-      def setByCountWithDate(dateCount)
-        wrapper = dateCount.to_hessian
-        @client.setByCountWithDate(wrapper)
-      end
-
-      def setByCount(count)
-        wrapper = count.to_hessian
-        @client.setByCount(wrapper)
-      end
-
-      def  set(name,id, value, date=nil)
-        if(date.nil?)
-          @client.set(name, id, value)
-        else
-          @client.setWithDate(name,id, value,date)
-        end
-      end
-
-      def reset(name, id, limit=1)
-        @client.resetByLimit(name, id, limit)
-      end
-
-      def get(name, id, limit=1)
-        @client.getByLimit(name, id, limit)
-      end
-
-      def getByNames(name, id, limit=1)
-        @client.getByNamesAndLimit(name, id, limit)
-      end
-
-      def getByIds(name, ids, limit=1)
-        @client.getByIdsAndLimit(name, ids, limit)
-      end
-
-      def getByQuery(query)
-        wrapper = query.to_hessian
-        countResult = @client.getByQuery(wrapper)
-        CountResult.new(countResult)
-    end
-
-    def getByDateQuery(dateQuery)
-       wrapper = dateQuery.to_hessian
-       countResult = @client.getByDateQuery(wrapper)
-       CountResult.new(countResult)
-    end
-
-      def delByQuery(query)
-       wrapper = query.to_hessian
-       @client.delByQuery(wrapper)
-      end
-
-      def delByDateQuery(dateQuery)
-        wrapper = dateQuery.to_hessian
-        @client.delByDateQuery(wrapper)
-      end
-
-      def getHello
-        @client.getHello()
-      end
-
-      def getHello1
-        @client.getHello1()
-      end
-
-      private
-      def init(hessian_url)
-        if(hessian_url.nil?)
-          raise ArgumentError.new("hessian url is null or empty")
-        end
-
-        @logger.info("Init Stat count client connect to hessian url: #{hessian_url}")
-        begin
-          @client = Hessian2::HessianClient.new(@hessian_url)
-        rescue => err
-          @logger.error("init hessian service fails!", err)
-          raise err
-        end
-      end
-
-    end
-  end
-end
-end
+require "stat-count-client/hessian_client"
+require "stat-count-client/thrift_client"