github / searchkick

Download as
Browse Code ยป

Commit dbf75158648b6a4c70c55e88f832b16ed4f61560

Authored by Andrew Kane
1 parent fb3cb339
Exists in master and in 5 other branches allow_missing, conversions_v2, lazy_index_name, scope_attributes, synonyms_ci

Improved OpenSearch code [skip ci]

Showing 3 changed files with 9 additions and 3 deletions   Show diff stats
lib/searchkick.rb
  Diff comments   View file @dbf7515
... ... @@ -80,7 +80,7 @@ module Searchkick
80 80 end
81 81  
82 82 def self.server_version
83   - @server_version ||= opensearch? ? "7.10.2" : server_info["version"]["number"]
  83 + @server_version ||= server_info["version"]["number"]
84 84 end
85 85  
86 86 def self.opensearch?
... ... @@ -91,7 +91,11 @@ module Searchkick
91 91 end
92 92  
93 93 def self.server_below?(version)
94   - Gem::Version.new(server_version.split("-")[0]) < Gem::Version.new(version.split("-")[0])
  94 + if opensearch?
  95 + Gem::Version.new("7.10.2") < Gem::Version.new(version.split("-")[0])
  96 + else
  97 + Gem::Version.new(server_version.split("-")[0]) < Gem::Version.new(version.split("-")[0])
  98 + end
95 99 end
96 100  
97 101 # memoize for performance
... ...
test/search_synonyms_test.rb
  Diff comments   View file @dbf7515
... ... @@ -60,6 +60,8 @@ class SearchSynonymsTest &lt; Minitest::Test
60 60 end
61 61  
62 62 def test_reload_synonyms
  63 + skip if Searchkick.opensearch?
  64 +
63 65 if Searchkick.server_below?("7.3.0")
64 66 error = assert_raises(Searchkick::Error) do
65 67 Speaker.search_index.reload_synonyms
... ...
test/test_helper.rb
  Diff comments   View file @dbf7515
... ... @@ -19,7 +19,7 @@ Searchkick.index_suffix = ENV[&quot;TEST_ENV_NUMBER&quot;] # for parallel tests
19 19 # add to elasticsearch-7.0.0/config/
20 20 Searchkick.wordnet_path = "wn_s.pl" if ENV["WORDNET"]
21 21  
22   -puts "Running against Elasticsearch #{Searchkick.server_version}"
  22 +puts "Running against #{Searchkick.opensearch? ? "OpenSearch" : "Elasticsearch"} #{Searchkick.server_version}"
23 23  
24 24 Searchkick.redis =
25 25 if defined?(ConnectionPool)
... ...