trisulrp 1.4.2 → 1.4.3

data/VERSION

@@ -1 +1 @@
-1.4.2
+1.4.3

data/lib/trisulrp/trp.pb.rb

@@ -23,10 +23,10 @@ module TRP
   class ReleaseContextRequest < ::ProtocolBuffers::Message; end
   class CounterItemRequest < ::ProtocolBuffers::Message; end
   class CounterItemResponse < ::ProtocolBuffers::Message; end
+  class BulkCounterItemRequest < ::ProtocolBuffers::Message; end
+  class BulkCounterItemResponse < ::ProtocolBuffers::Message; end
   class CounterGroupRequest < ::ProtocolBuffers::Message; end
   class CounterGroupResponse < ::ProtocolBuffers::Message; end
-  class ControlledCounterGroupRequest < ::ProtocolBuffers::Message; end
-  class ControlledCounterGroupResponse < ::ProtocolBuffers::Message; end
   class FilteredDatagramRequest < ::ProtocolBuffers::Message; end
   class FilteredDatagramResponse < ::ProtocolBuffers::Message; end
   class ControlledContextRequest < ::ProtocolBuffers::Message; end
@@ -37,8 +37,6 @@ module TRP
   class CounterGroupInfoResponse < ::ProtocolBuffers::Message; end
   class SessionItemRequest < ::ProtocolBuffers::Message; end
   class SessionItemResponse < ::ProtocolBuffers::Message; end
-  class BulkCounterItemRequest < ::ProtocolBuffers::Message; end
-  class BulkCounterItemResponse < ::ProtocolBuffers::Message; end
   class TopperSnapshotRequest < ::ProtocolBuffers::Message; end
   class TopperSnapshotResponse < ::ProtocolBuffers::Message; end
   class UpdateKeyRequest < ::ProtocolBuffers::Message; end
@@ -156,6 +154,7 @@ module TRP
     required :string, :name, 2
     optional :int64, :bucket_size, 3
     optional ::TRP::TimeInterval, :time_interval, 4
+    optional :int64, :topper_bucket_size, 5
 
     gen_methods! # new fields ignored after this point
   end
@@ -230,8 +229,6 @@ module TRP
     optional ::TRP::CounterItemRequest, :counter_item_request, 8
     optional ::TRP::CounterItemResponse, :counter_item_response, 9
     optional ::TRP::ReleaseContextRequest, :release_context_request, 11
-    optional ::TRP::ControlledCounterGroupRequest, :controlled_counter_group_request, 12
-    optional ::TRP::ControlledCounterGroupResponse, :controlled_counter_group_response, 13
     optional ::TRP::FilteredDatagramRequest, :filtered_datagram_request, 14
     optional ::TRP::FilteredDatagramResponse, :filtered_datagram_response, 15
     optional ::TRP::ControlledContextRequest, :controlled_context_request, 16
@@ -326,6 +323,22 @@ module TRP
     gen_methods! # new fields ignored after this point
   end
 
+  class BulkCounterItemRequest < ::ProtocolBuffers::Message
+    optional :int64, :context, 1, :default => 0
+    required :string, :counter_group, 2
+    required :int64, :meter, 3
+    required ::TRP::TimeInterval, :time_interval, 4
+    repeated :string, :keys, 5
+
+    gen_methods! # new fields ignored after this point
+  end
+
+  class BulkCounterItemResponse < ::ProtocolBuffers::Message
+    repeated ::TRP::KeyStats, :stats, 1
+
+    gen_methods! # new fields ignored after this point
+  end
+
   class CounterGroupRequest < ::ProtocolBuffers::Message
     optional :int64, :context, 1, :default => 0
     required :string, :counter_group, 2
@@ -347,26 +360,6 @@ module TRP
     gen_methods! # new fields ignored after this point
   end
 
-  class ControlledCounterGroupRequest < ::ProtocolBuffers::Message
-    required :string, :dynamic_group_id, 1
-    required :string, :counter_group, 2
-    required :int64, :meter, 3
-    required :int64, :maxitems, 4
-    required :int64, :bucket_ms, 5
-    required :int64, :top_nsize, 6
-    required ::TRP::TimeInterval, :time_interval, 7
-    required :string, :control_counter_id, 9
-    required :string, :control_key, 10
-
-    gen_methods! # new fields ignored after this point
-  end
-
-  class ControlledCounterGroupResponse < ::ProtocolBuffers::Message
-    required :string, :dynamic_group_id, 1
-
-    gen_methods! # new fields ignored after this point
-  end
-
   class FilteredDatagramRequest < ::ProtocolBuffers::Message
     # forward declarations
     class ByFilterExpr < ::ProtocolBuffers::Message; end
@@ -509,23 +502,6 @@ module TRP
     gen_methods! # new fields ignored after this point
   end
 
-  class BulkCounterItemRequest < ::ProtocolBuffers::Message
-    optional :int64, :context, 1, :default => 0
-    required :string, :counter_group, 2
-    required :int64, :meter, 3
-    required ::TRP::TimeInterval, :time_interval, 4
-    repeated :string, :keys, 5
-
-    gen_methods! # new fields ignored after this point
-  end
-
-  class BulkCounterItemResponse < ::ProtocolBuffers::Message
-    repeated ::TRP::KeyStats, :stats, 1
-    repeated ::TRP::KeyDetails, :details, 2
-
-    gen_methods! # new fields ignored after this point
-  end
-
   class TopperSnapshotRequest < ::ProtocolBuffers::Message
     optional :int64, :context, 1, :default => 0
     required :string, :counter_group, 2

data/lib/trisulrp/trp.proto

@@ -1,7 +1,7 @@
 // Trisul Remote Protocol (TRP) definition
 // Based on Google Protocol Buffers
 // (c) 2010-11, Unleash Networks (http://www.unleashnetworks.com)
-// $Rev: 3576 $
+// $Rev: 4886 $
 package TRP;
 
 message Timestamp  {
@@ -57,6 +57,7 @@ message CounterGroupDetails {
     required string         name=2;
     optional int64          bucket_size=3;
     optional TimeInterval   time_interval=4;
+    optional int64          topper_bucket_size=5;
 }
 
 enum AuthLevel {
@@ -141,8 +142,6 @@ message Message {
     optional CounterItemRequest counter_item_request=8;
     optional CounterItemResponse counter_item_response=9;
     optional ReleaseContextRequest release_context_request=11; 
-    optional ControlledCounterGroupRequest controlled_counter_group_request=12; 
-    optional ControlledCounterGroupResponse controlled_counter_group_response=13; 
     optional FilteredDatagramRequest filtered_datagram_request=14;
     optional FilteredDatagramResponse filtered_datagram_response=15;
     optional ControlledContextRequest controlled_context_request=16;
@@ -231,6 +230,23 @@ message CounterItemResponse{
     required KeyStats       stats=1;
 }
 
+
+//////////////////////////////////////////
+// BulkCounterItemRequest
+message BulkCounterItemRequest{
+    optional int64          context=1[default=0];
+    required string         counter_group=2;
+    required int64          meter=3;
+    required TimeInterval   time_interval=4;
+    repeated string         keys=5;
+}
+
+//////////////////////////////////////////
+// BulkCounterItemResponse
+message BulkCounterItemResponse{
+    repeated KeyStats       stats=1;
+}
+
 ///////////////////////////////
 // CounterGroupRequest 
 message CounterGroupRequest{
@@ -244,7 +260,7 @@ message CounterGroupRequest{
 }
 
 ///////////////////////////////
-// CounterItemRequest 
+// CounterGroupResponse  
 message  CounterGroupResponse{
     required int64          context=1;
     required string         counter_group=2;
@@ -252,22 +268,6 @@ message  CounterGroupResponse{
     repeated KeyDetails     keys=6;
 }
 
-message ControlledCounterGroupRequest{
-    required string         dynamic_group_id=1;                 
-    required string         counter_group=2;                
-    required int64          meter=3;
-    required int64          maxitems=4;                               
-    required int64          bucket_ms=5;                              
-    required int64          top_nsize=6;                            
-    required TimeInterval   time_interval=7;                   
-    required string         control_counter_id=9;               
-    required string         control_key=10;   
-}
-
-message ControlledCounterGroupResponse{
-    required string         dynamic_group_id=1;
-}
-
 
 ///////////////////////////////
 // FilteredDatagramRequest
@@ -395,24 +395,6 @@ message SessionItemResponse{
 
     repeated Item           items=3;
 }
-
-//////////////////////////////////////////
-// BulkCounterItemRequest
-message BulkCounterItemRequest{
-    optional int64          context=1[default=0];
-    required string         counter_group=2;
-    required int64          meter=3;
-    required TimeInterval   time_interval=4;
-    repeated string         keys=5;
-}
-
-//////////////////////////////////////////
-// BulkCounterItemResponse
-message BulkCounterItemResponse{
-    repeated KeyStats       stats=1;
-    repeated KeyDetails     details=2;
-}
-
 ///////////////////////////////////////////
 /// TopperSnapshotRequest
 message TopperSnapshotRequest{

data/trisulrp.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{trisulrp}
-  s.version = "1.4.2"
+  s.version = "1.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["vivek"]
-  s.date = %q{2012-03-06}
+  s.date = %q{2012-04-28}
   s.description = %q{This gem deals about the trisul remote protocol}
   s.email = %q{vivek_rajagopal@yahoo.com}
   s.extra_rdoc_files = [

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 4
-  - 2
-  version: 1.4.2
+  - 3
+  version: 1.4.3
 platform: ruby
 authors: 
 - vivek
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-06 00:00:00 +05:30
+date: 2012-04-28 00:00:00 +05:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -152,7 +152,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 253128015
+      hash: 880184751
       segments: 
       - 0
       version: "0"