Skip to content

Commit

Permalink
RUBY-2202 Deprecate geoHaystack and geoSearch (#1878)
Browse files Browse the repository at this point in the history
Co-authored-by: Oleg Pudeyev <oleg@bsdpower.com>
  • Loading branch information
p-mongo and p committed Apr 20, 2020
1 parent b4f49da commit fa0e344
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 1 deletion.
1 change: 1 addition & 0 deletions lib/mongo/index.rb
Expand Up @@ -49,6 +49,7 @@ module Index
# Specify a geoHaystack index.
#
# @since 2.0.0
# @deprecated
GEOHAYSTACK = 'geoHaystack'.freeze

# Encodes a text index.
Expand Down
8 changes: 7 additions & 1 deletion lib/mongo/index/view.rb
Expand Up @@ -151,8 +151,14 @@ def create_one(keys, options = {})
def create_many(*models)
client.send(:with_session, @options) do |session|
server = next_primary(nil, session)
indexes = normalize_models(models.flatten, server)
indexes.each do |index|
if index[:bucketSize] || index['bucketSize']
client.log_warn("Haystack indexes (bucketSize index option) are deprecated as of MongoDB 4.4")
end
end
spec = {
indexes: normalize_models(models.flatten, server),
indexes: indexes,
db_name: database.name,
coll_name: collection.name,
session: session
Expand Down
38 changes: 38 additions & 0 deletions spec/mongo/index/view_spec.rb
Expand Up @@ -505,6 +505,25 @@
end
end
end

context 'when using bucket option' do

let(:spec) do
{ 'any' => 1 }
end

let(:result) do
view.create_many([key: spec, bucket_size: 1])
end

it 'warns of deprecation' do
RSpec::Mocks.with_temporary_scope do
view.client.should receive(:log_warn).and_call_original

result
end
end
end
end

describe '#create_one' do
Expand Down Expand Up @@ -592,6 +611,25 @@
expect(result).to be_successful
end
end

context 'when using bucket option' do

let(:spec) do
{ 'any' => 1 }
end

let(:result) do
view.create_one(spec, bucket_size: 1)
end

it 'warns of deprecation' do
RSpec::Mocks.with_temporary_scope do
view.client.should receive(:log_warn).and_call_original

result
end
end
end
end

context 'when index creation fails' do
Expand Down

0 comments on commit fa0e344

Please sign in to comment.