RUBY-2059 Depend on bson 4.4.2 for the benefit of driver 2.10 (#1617)

p-mongo · p · p · commit 224cf16ccccd · 2020-01-07T00:53:28.000-05:00
Co-authored-by: Oleg Pudeyev &lt;p@users.noreply.github.com&gt;
diff --git a/.evergreen/config.yml b/.evergreen/config.yml
@@ -574,6 +574,7 @@ axes:
         display_name: "2.6"
         variables:
            VERSION: "2.6"
+  
   - id: fcv
     display_name: FCV
     values:
@@ -597,6 +598,7 @@ axes:
         display_name: Sharded
         variables:
            TOPOLOGY: "sharded_cluster"
+  
   - id: "auth-and-ssl"
     display_name: Authentication and SSL
     values:
@@ -620,6 +622,7 @@ axes:
         variables:
            AUTH: "noauth"
            SSL: "nossl"
+  
   - id: "ruby"
     display_name: Ruby Version
     # Local TLS tests run on all Ruby versions, thus no versions should be
@@ -653,6 +656,7 @@ axes:
         display_name: jruby-9.2
         variables:
            RVM_RUBY: "jruby-9.2"
+  
   - id: "os"
     display_name: OS
     values:
@@ -665,48 +669,67 @@ axes:
       - id: rhel70
         display_name: "RHEL 7.0"
         run_on: rhel70-small
+  
   - id: "compressor"
     display_name: Compressor
     values:
       - id: "zlib"
         display_name: Zlib
         variables:
            COMPRESSOR: "zlib"
+  
   - id: retry-reads
     display_name: Retry Reads
     values:
       - id: no-retry-reads
         display_name: No Retry Reads
         variables:
           RETRY_READS: 'false'
+  
   - id: retry-writes
     display_name: Retry Writes
     values:
       - id: no-retry-writes
         display_name: No Retry Writes
         variables:
           RETRY_WRITES: 'false'
+  
   - id: lint
     display_name: Lint
     values:
       - id: on
         display_name: On
         variables:
           LINT: '1'
+  
   - id: "as"
     display_name: ActiveSupport
     values:
       - id: "as"
         display_name: AS
         variables:
           WITH_ACTIVE_SUPPORT: true
+  
+  - id: bson
+    display_name: BSON
+    values:
+      - id: min
+        display_name: min
+        variables:
+          BSON: min
+      - id: master
+        display_name: master
+        variables:
+          BSON: master
+  
   - id: "single-mongos"
     display_name: Single Mongos
     values:
       - id: "single-mongos"
         display_name: Single Mongos
         variables:
           SINGLE_MONGOS: 'true'
+  
   - id: storage-engine
     display_name: Storage Engine
     values:
@@ -900,6 +923,17 @@ buildvariants:
   tasks:
      - name: "test"
 
+- matrix_name: "bson"
+  matrix_spec:
+    ruby: ruby-2.6
+    mongodb-version: '4.2'
+    topology: replica-set
+    bson: "*"
+    os: rhel70
+  display_name: "AS ${mongodb-version} ${topology} ${ruby} ${bson}"
+  tasks:
+     - name: "test"
+
 -
   matrix_name: "3.6-with-3.4-fcv"
   matrix_spec:
diff --git a/.evergreen/functions.sh b/.evergreen/functions.sh
@@ -80,6 +80,12 @@ set_env_vars() {
 
   # JRUBY_OPTS were initially set for Mongoid
   export JRUBY_OPTS="--server -J-Xms512m -J-Xmx2G"
+  
+  if test "$BSON" = min; then
+    export BUNDLE_GEMFILE=gemfiles/bson_min.gemfile
+  elif test "$BSON" = master; then
+    export BUNDLE_GEMFILE=gemfiles/bson_master.gemfile
+  fi
 }
 
 setup_ruby() {
diff --git a/Gemfile b/Gemfile
@@ -1,43 +1,7 @@
 source 'https://rubygems.org'
 
 gemspec
-gem 'yard'
 
-group :development, :testing do
-  gem 'jruby-openssl', platforms: :jruby
-  gem 'json', platforms: :jruby
-  # Explicitly specify each rspec dependency so that we can use
-  # rspec-mocks-diag instead of rspec-mocks
-  #gem 'rspec', '~> 3.0'
-  gem 'rspec-core', '~> 3.0'
-  gem 'mime-types', '~> 1.25'
-  gem 'activesupport'
-  gem 'rake'
-  gem 'httparty'
+require_relative './gemfiles/standard'
 
-  gem 'byebug', platforms: :mri
-
-  # for benchmark tests
-  gem 'yajl-ruby', require: 'yajl', platforms: :mri
-  gem 'celluloid', platforms: :mri, require: false
-  gem 'timers'
-end
-
-group :testing do
-  gem 'timecop'
-  gem 'ice_nine'
-  gem 'rubydns', platforms: :mri
-  gem 'rspec-retry'
-  gem 'rspec-expectations', '~> 3.0'
-  gem 'rspec-mocks-diag', '~> 3.0'
-  gem 'rfc'
-  gem 'fuubar'
-  gem 'timeout-interrupt', platforms: :mri
-  gem 'concurrent-ruby', platforms: :jruby
-end
-
-group :development do
-  gem 'ruby-prof', :platforms => :mri
-  gem 'pry-rescue'
-  gem 'pry-nav'
-end
+standard_dependencies
diff --git a/gemfiles/bson_master.gemfile b/gemfiles/bson_master.gemfile
@@ -0,0 +1,8 @@
+source "https://rubygems.org"
+gemspec path: '..'
+
+gem 'bson', git: 'https://github.com/mongodb/bson-ruby'
+
+require_relative './standard'
+
+standard_dependencies
diff --git a/gemfiles/bson_min.gemfile b/gemfiles/bson_min.gemfile
@@ -0,0 +1,8 @@
+source "https://rubygems.org"
+gemspec path: '..'
+
+gem 'bson', '4.4.2'
+
+require_relative './standard'
+
+standard_dependencies
diff --git a/gemfiles/standard.rb b/gemfiles/standard.rb
@@ -0,0 +1,43 @@
+def standard_dependencies
+  gem 'yard'
+  gem 'ffi'
+
+  group :development, :testing do
+    gem 'jruby-openssl', platforms: :jruby
+    gem 'json', platforms: :jruby
+    # Explicitly specify each rspec dependency so that we can use
+    # rspec-mocks-diag instead of rspec-mocks
+    #gem 'rspec', '~> 3.0'
+    gem 'rspec-core', '~> 3.0'
+    gem 'mime-types', '~> 1.25'
+    gem 'activesupport'
+    gem 'rake'
+    gem 'httparty'
+
+    gem 'byebug', platforms: :mri
+
+    # for benchmark tests
+    gem 'yajl-ruby', require: 'yajl', platforms: :mri
+    gem 'celluloid', platforms: :mri, require: false
+    gem 'timers'
+  end
+
+  group :testing do
+    gem 'timecop'
+    gem 'ice_nine'
+    gem 'rubydns', platforms: :mri
+    gem 'rspec-retry'
+    gem 'rspec-expectations', '~> 3.0'
+    gem 'rspec-mocks-diag', '~> 3.0'
+    gem 'rfc'
+    gem 'fuubar'
+    gem 'timeout-interrupt', platforms: :mri
+    gem 'concurrent-ruby', platforms: :jruby
+  end
+
+  group :development do
+    gem 'ruby-prof', :platforms => :mri
+    gem 'pry-rescue'
+    gem 'pry-nav'
+  end
+end
diff --git a/lib/mongo/cursor/builder/kill_cursors_command.rb b/lib/mongo/cursor/builder/kill_cursors_command.rb
@@ -92,7 +92,14 @@ def update_cursors(spec, ids)
           #
           # @since 2.3.0
           def get_cursors_list(spec)
-            spec[:selector][:cursors].map(&:value)
+            spec[:selector][:cursors].map do |value|
+              if value.respond_to?(:value)
+                # bson-ruby >= 4.6.0
+                value = value.value
+              else
+                value = value.instance_variable_get('@integer')
+              end
+            end
           end
         end
       end
diff --git a/lib/mongo/cursor/builder/op_kill_cursors.rb b/lib/mongo/cursor/builder/op_kill_cursors.rb
@@ -87,7 +87,14 @@ def update_cursors(spec, ids)
           #
           # @since 2.3.0
           def get_cursors_list(spec)
-            spec[:cursor_ids].map(&:value)
+            spec[:cursor_ids].map do |value|
+              if value.respond_to?(:value)
+                # bson-ruby >= 4.6.0
+                value.value
+              else
+                value.instance_variable_get('@integer')
+              end
+            end
           end
         end
       end
diff --git a/lib/mongo/protocol/serializers.rb b/lib/mongo/protocol/serializers.rb
@@ -110,7 +110,12 @@ module Int32
         # @return [String] Buffer with serialized value.
         def self.serialize(buffer, value, validating_keys = BSON::Config.validating_keys?)
           if value.is_a?(BSON::Int32)
-            value = value.value
+            if value.respond_to?(:value)
+              # bson-ruby >= 4.6.0
+              value = value.value
+            else
+              value = value.instance_variable_get('@integer')
+            end
           end
           buffer.put_int32(value)
         end
@@ -138,7 +143,12 @@ module Int64
         # @return [ String ] Buffer with serialized value.
         def self.serialize(buffer, value, validating_keys = BSON::Config.validating_keys?)
           if value.is_a?(BSON::Int64)
-            value = value.value
+            if value.respond_to?(:value)
+              # bson-ruby >= 4.6.0
+              value = value.value
+            else
+              value = value.instance_variable_get('@integer')
+            end
           end
           buffer.put_int64(value)
         end
diff --git a/mongo.gemspec b/mongo.gemspec
@@ -40,5 +40,5 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = ">= 2.3"
 
-  s.add_dependency 'bson', '>=4.6.0', '<5.0.0'
+  s.add_dependency 'bson', '>=4.4.2', '<5.0.0'
 end
diff --git a/spec/integration/cursor_reaping_spec.rb b/spec/integration/cursor_reaping_spec.rb
@@ -59,7 +59,8 @@
       client.cluster.instance_variable_get('@periodic_executor').execute
 
       started_event = EventSubscriber.started_events.detect do |event|
-        event.command['killCursors'] && event.command['cursors'].map(&:value).include?(cursor_id)
+        event.command['killCursors'] &&
+        event.command['cursors'].map { |c| Utils.int64_value(c) }.include?(cursor_id)
       end
 
       expect(started_event).not_to be_nil
diff --git a/spec/mongo/bulk_write_spec.rb b/spec/mongo/bulk_write_spec.rb
@@ -1924,11 +1924,11 @@
             end
 
             let(:first_txn_number) do
-              started_events[-2].command['txnNumber'].value
+              Utils.int64_value(started_events[-2].command['txnNumber'])
             end
 
             let(:second_txn_number) do
-              started_events[-1].command['txnNumber'].value
+              Utils.int64_value(started_events[-1].command['txnNumber'])
             end
 
             it 'inserts the documents' do
diff --git a/spec/mongo/cursor/builder/op_kill_cursors_spec.rb b/spec/mongo/cursor/builder/op_kill_cursors_spec.rb
@@ -0,0 +1,56 @@
+require 'spec_helper'
+
+describe Mongo::Cursor::Builder::OpKillCursors do
+
+  let(:reply) do
+    Mongo::Protocol::Reply.allocate.tap do |reply|
+      allow(reply).to receive(:cursor_id).and_return(8000)
+    end
+  end
+
+  let(:result) do
+    Mongo::Operation::Result.new(reply)
+  end
+
+  let(:view) do
+    Mongo::Collection::View.new(
+      authorized_collection,
+      {},
+      tailable: true,
+      max_time_ms: 100
+    )
+  end
+
+  let(:cursor) do
+    Mongo::Cursor.new(view, result, authorized_primary)
+  end
+
+  let(:builder) do
+    described_class.new(cursor)
+  end
+
+  describe '#specification' do
+
+    let(:specification) do
+      builder.specification
+    end
+
+    it 'includes the cursor ids' do
+      expect(specification[:cursor_ids]).to eq([BSON::Int64.new(8000)])
+    end
+
+    it 'includes the database name' do
+      expect(specification[:db_name]).to eq(SpecConfig.instance.test_db)
+    end
+
+    it 'includes the collection name' do
+      expect(specification[:coll_name]).to eq(TEST_COLL)
+    end
+  end
+
+  describe '.get_cursors_list' do
+    it 'returns integer cursor ids' do
+      expect(described_class.get_cursors_list(builder.specification)).to eq([8000])
+    end
+  end
+end
diff --git a/spec/support/command_monitoring.rb b/spec/support/command_monitoring.rb
@@ -135,7 +135,7 @@ def hash_matches?(actual, expected)
         if expected.keys.first == '$numberLong'
           converted = expected.values.first.to_i
           if actual.is_a?(BSON::Int64)
-            actual = actual.value
+            actual = Utils.int64_value(actual)
           elsif actual.is_a?(BSON::Int32)
             return false
           end
diff --git a/spec/support/utils.rb b/spec/support/utils.rb
