google-cloud-pubsub 0.33.2 → 0.34.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-pubsub
 version: !ruby/object:Gem::Version
-  version: 0.33.2
+  version: 0.34.0
 platform: ruby
 authors:
 - Mike Moore
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-29 00:00:00.000000000 Z
+date: 2019-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-core
@@ -157,14 +157,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.59.2
+        version: 0.61.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.59.2
+        version: 0.61.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -240,11 +240,10 @@ files:
 - lib/google/cloud/pubsub/snapshot.rb
 - lib/google/cloud/pubsub/snapshot/list.rb
 - lib/google/cloud/pubsub/subscriber.rb
-- lib/google/cloud/pubsub/subscriber/async_stream_pusher.rb
-- lib/google/cloud/pubsub/subscriber/async_unary_pusher.rb
 - lib/google/cloud/pubsub/subscriber/enumerator_queue.rb
 - lib/google/cloud/pubsub/subscriber/inventory.rb
 - lib/google/cloud/pubsub/subscriber/stream.rb
+- lib/google/cloud/pubsub/subscriber/timed_unary_buffer.rb
 - lib/google/cloud/pubsub/subscription.rb
 - lib/google/cloud/pubsub/subscription/list.rb
 - lib/google/cloud/pubsub/topic.rb
@@ -285,7 +284,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: API Client library for Google Cloud Pub/Sub

data/lib/google/cloud/pubsub/subscriber/async_stream_pusher.rb

@@ -1,223 +0,0 @@
-# Copyright 2017 Google LLC
-#
-# Licensed 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
-#
-#     https://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 "monitor"
-require "concurrent"
-
-module Google
-  module Cloud
-    module Pubsub
-      class Subscriber
-        ##
-        # @private
-        # # AsyncStreamPusher
-        #
-        class AsyncStreamPusher
-          include MonitorMixin
-
-          attr_reader :batch
-          attr_reader :max_bytes, :interval
-
-          def initialize stream, max_bytes: 10000000, interval: 1.0
-            @stream = stream
-
-            @max_bytes = max_bytes
-            @interval = interval
-
-            @cond = new_cond
-
-            # init MonitorMixin
-            super()
-          end
-
-          def acknowledge ack_ids
-            return true if ack_ids.empty?
-
-            synchronize do
-              ack_ids.each do |ack_id|
-                if @batch.nil?
-                  @batch = Batch.new max_bytes: @max_bytes
-                  @batch.ack ack_id
-                else
-                  unless @batch.try_ack ack_id
-                    push_batch_request!
-
-                    @batch = Batch.new max_bytes: @max_bytes
-                    @batch.ack ack_id
-                  end
-                end
-
-                push_batch_request! if @batch.ready?
-              end
-
-              @cond.signal
-            end
-
-            nil
-          end
-
-          def modify_ack_deadline deadline, ack_ids
-            return true if ack_ids.empty?
-
-            synchronize do
-              ack_ids.each do |ack_id|
-                if @batch.nil?
-                  @batch = Batch.new max_bytes: @max_bytes
-                  @batch.delay deadline, ack_id
-                else
-                  unless @batch.try_delay deadline, ack_id
-                    push_batch_request!
-
-                    @batch = Batch.new max_bytes: @max_bytes
-                    @batch.delay deadline, ack_id
-                  end
-                end
-
-                push_batch_request! if @batch.ready?
-              end
-
-              @cond.signal
-            end
-
-            nil
-          end
-          alias delay modify_ack_deadline
-
-          def start
-            synchronize do
-              @stopped = false
-
-              @background_thread ||= Thread.new { run_background }
-            end
-
-            self
-          end
-
-          def stop
-            synchronize do
-              push_batch_request!
-
-              @stopped = true
-              @cond.broadcast
-            end
-
-            self
-          end
-
-          def started?
-            !stopped?
-          end
-
-          def stopped?
-            synchronize { @stopped }
-          end
-
-          protected
-
-          def run_background
-            synchronize do
-              until @stopped
-                if @batch.nil?
-                  @cond.wait # wait until broadcast
-                  next
-                end
-
-                time_from_batch_creation = Time.now - @batch.created_at
-                time_until_next_push = @interval - time_from_batch_creation
-
-                if time_until_next_push <= 0
-                  # interval met, publish the batch...
-                  push_batch_request!
-                  time_until_next_push = nil # wait until broadcast
-                end
-
-                @cond.wait time_until_next_push
-              end
-            end
-          end
-
-          def push_batch_request!
-            return unless @batch
-
-            @stream.push @batch.request
-
-            @batch = nil
-          end
-
-          class Batch
-            attr_reader :max_bytes, :request, :created_at
-
-            def initialize max_bytes: 10000000
-              @max_bytes = max_bytes
-              @request = Google::Pubsub::V1::StreamingPullRequest.new
-              @total_message_bytes = 0
-              @created_at = Time.now
-            end
-
-            def ack ack_id
-              @request.ack_ids << ack_id
-              @total_message_bytes += addl_ack_bytes ack_id
-            end
-
-            def try_ack ack_id
-              addl_bytes = addl_ack_bytes ack_id
-              return false if total_message_bytes + addl_bytes >= @max_bytes
-
-              ack ack_id
-              true
-            end
-
-            def addl_ack_bytes ack_id
-              ack_id.bytesize + 2
-            end
-
-            def delay deadline, ack_id
-              @request.modify_deadline_seconds << deadline
-              @request.modify_deadline_ack_ids << ack_id
-              @total_message_bytes += addl_delay_bytes deadline, ack_id
-            end
-
-            def try_delay deadline, ack_id
-              addl_bytes = addl_delay_bytes deadline, ack_id
-              return false if total_message_bytes + addl_bytes >= @max_bytes
-
-              delay deadline, ack_id
-              true
-            end
-
-            def addl_delay_bytes deadline, ack_id
-              bytes_for_int(deadline) + ack_id.bytesize + 4
-            end
-
-            def bytes_for_int num
-              # Ruby 2.0 does not have Integer#bit_length
-              return [num].pack("s").bytesize unless num.respond_to? :bit_length
-
-              (num.bit_length / 8.0).ceil
-            end
-
-            def ready?
-              total_message_bytes >= @max_bytes
-            end
-
-            def total_message_bytes
-              @total_message_bytes
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/google/cloud/pubsub/subscriber/async_unary_pusher.rb

@@ -1,271 +0,0 @@
-# Copyright 2018 Google LLC
-#
-# Licensed 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
-#
-#     https://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 "monitor"
-require "concurrent"
-
-module Google
-  module Cloud
-    module Pubsub
-      class Subscriber
-        ##
-        # @private
-        # # AsyncUnaryPusher
-        #
-        class AsyncUnaryPusher
-          include MonitorMixin
-
-          attr_reader :batch
-          attr_reader :max_bytes, :interval
-
-          def initialize stream, max_bytes: 10000000, interval: 1.0
-            @stream = stream
-
-            @max_bytes = max_bytes
-            @interval = interval
-
-            @cond = new_cond
-
-            # init MonitorMixin
-            super()
-          end
-
-          def acknowledge ack_ids
-            return true if ack_ids.empty?
-
-            synchronize do
-              ack_ids.each do |ack_id|
-                if @batch.nil?
-                  @batch = Batch.new max_bytes: @max_bytes
-                  @batch.ack ack_id
-                else
-                  unless @batch.try_ack ack_id
-                    push_batch_request!
-
-                    @batch = Batch.new max_bytes: @max_bytes
-                    @batch.ack ack_id
-                  end
-                end
-
-                push_batch_request! if @batch.ready?
-              end
-
-              @cond.signal
-            end
-
-            nil
-          end
-
-          def modify_ack_deadline deadline, ack_ids
-            return true if ack_ids.empty?
-
-            synchronize do
-              ack_ids.each do |ack_id|
-                if @batch.nil?
-                  @batch = Batch.new max_bytes: @max_bytes
-                  @batch.delay deadline, ack_id
-                else
-                  unless @batch.try_delay deadline, ack_id
-                    push_batch_request!
-
-                    @batch = Batch.new max_bytes: @max_bytes
-                    @batch.delay deadline, ack_id
-                  end
-                end
-
-                push_batch_request! if @batch.ready?
-              end
-
-              @cond.signal
-            end
-
-            nil
-          end
-          alias delay modify_ack_deadline
-
-          def start
-            synchronize do
-              @stopped = false
-
-              @background_thread ||= Thread.new { run_background }
-            end
-
-            self
-          end
-
-          def stop
-            synchronize do
-              push_batch_request!
-
-              @stopped = true
-              @cond.broadcast
-            end
-
-            self
-          end
-
-          def started?
-            !stopped?
-          end
-
-          def stopped?
-            synchronize { @stopped }
-          end
-
-          protected
-
-          def run_background
-            synchronize do
-              until @stopped
-                if @batch.nil?
-                  @cond.wait # wait until broadcast
-                  next
-                end
-
-                time_from_batch_creation = Time.now - @batch.created_at
-                time_until_next_push = @interval - time_from_batch_creation
-
-                if time_until_next_push <= 0
-                  # interval met, publish the batch...
-                  push_batch_request!
-                  time_until_next_push = nil # wait until broadcast
-                end
-
-                @cond.wait time_until_next_push
-              end
-            end
-          end
-
-          def push_batch_request!
-            return unless @batch
-
-            sub_name = @stream.subscriber.subscription_name
-            service = @stream.subscriber.service
-
-            if @batch.ack?
-              ack_ids = @batch.ack_ids
-              push_change_request do
-                service.acknowledge sub_name, *ack_ids
-              end
-            end
-            if @batch.delay?
-              @batch.modify_deadline_hash.each do |delay_seconds, delay_ack_ids|
-                push_change_request do
-                  service.modify_ack_deadline sub_name,
-                                              delay_ack_ids,
-                                              delay_seconds
-                end
-              end
-            end
-
-            @batch = nil
-          end
-
-          def push_change_request
-            return unless @stream.push_thread_pool.running?
-
-            Concurrent::Future.new(executor: @stream.push_thread_pool) do
-              begin
-                yield
-              rescue StandardError => push_error
-                @stream.subscriber.error! push_error
-              end
-            end.execute
-          end
-
-          class Batch
-            attr_reader :max_bytes, :request, :created_at
-
-            def initialize max_bytes: 10000000
-              @max_bytes = max_bytes
-              @request = Google::Pubsub::V1::StreamingPullRequest.new
-              @total_message_bytes = 0
-              @created_at = Time.now
-            end
-
-            def ack ack_id
-              @request.ack_ids << ack_id
-              @total_message_bytes += addl_ack_bytes ack_id
-            end
-
-            def try_ack ack_id
-              addl_bytes = addl_ack_bytes ack_id
-              return false if total_message_bytes + addl_bytes >= @max_bytes
-
-              ack ack_id
-              true
-            end
-
-            def addl_ack_bytes ack_id
-              ack_id.bytesize + 2
-            end
-
-            def delay deadline, ack_id
-              @request.modify_deadline_seconds << deadline
-              @request.modify_deadline_ack_ids << ack_id
-              @total_message_bytes += addl_delay_bytes deadline, ack_id
-            end
-
-            def try_delay deadline, ack_id
-              addl_bytes = addl_delay_bytes deadline, ack_id
-              return false if total_message_bytes + addl_bytes >= @max_bytes
-
-              delay deadline, ack_id
-              true
-            end
-
-            def addl_delay_bytes deadline, ack_id
-              bytes_for_int(deadline) + ack_id.bytesize + 4
-            end
-
-            def bytes_for_int num
-              # Ruby 2.0 does not have Integer#bit_length
-              return [num].pack("s").bytesize unless num.respond_to? :bit_length
-
-              (num.bit_length / 8.0).ceil
-            end
-
-            def ready?
-              total_message_bytes >= @max_bytes
-            end
-
-            def ack?
-              @request.ack_ids.any?
-            end
-
-            def delay?
-              @request.modify_deadline_ack_ids.any?
-            end
-
-            def ack_ids
-              @request.ack_ids
-            end
-
-            def modify_deadline_hash
-              grouped_hash = @request.modify_deadline_ack_ids.zip(
-                @request.modify_deadline_seconds
-              ).group_by { |_ack_id, seconds| seconds }
-              Hash[grouped_hash.map { |k, v| [k, v.map(&:first)] }]
-            end
-
-            def total_message_bytes
-              @total_message_bytes
-            end
-          end
-        end
-      end
-    end
-  end
-end