Dropped support for Elasticsearch 7 and OpenSearch 1

ankane · ankane · commit c8a650b1767c · 2025-10-04T16:19:44.000-07:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -24,16 +24,13 @@ jobs:
           - ruby: 3.3
             gemfile: gemfiles/opensearch2.gemfile
             opensearch: 2.19.2
-          - ruby: 3.2
-            gemfile: gemfiles/opensearch1.gemfile
-            opensearch: 1.3.20
           - ruby: 3.3
             gemfile: gemfiles/mongoid9.gemfile
-            elasticsearch: 7.17.29
+            elasticsearch: 8
             mongodb: true
           - ruby: 3.2
             gemfile: gemfiles/mongoid8.gemfile
-            elasticsearch: 7.0.0
+            elasticsearch: 8
             mongodb: true
     runs-on: ubuntu-latest
     env:
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 6.0.0 (unreleased)
+
+- Dropped support for Elasticsearch 7 and OpenSearch 1
+
 ## 5.5.2 (2025-05-20)
 
 - Fixed `scope` option for partial reindex
diff --git a/gemfiles/activerecord71.gemfile b/gemfiles/activerecord71.gemfile
@@ -8,7 +8,7 @@ gem "sqlite3", "< 2"
 gem "activerecord", "~> 7.1.0"
 gem "actionpack", "~> 7.1.0"
 gem "activejob", "~> 7.1.0", require: "active_job"
-gem "elasticsearch", "~> 7"
+gem "elasticsearch", "~> 8"
 gem "redis-client"
 gem "connection_pool"
 gem "kaminari"
diff --git a/gemfiles/mongoid8.gemfile b/gemfiles/mongoid8.gemfile
@@ -7,7 +7,7 @@ gem "minitest", ">= 5"
 gem "mongoid", "~> 8", "< 8.1.3"
 gem "activejob", require: "active_job"
 gem "redis"
-gem "elasticsearch", "~> 7"
+gem "elasticsearch", "~> 8"
 gem "actionpack"
 gem "kaminari"
 gem "gemoji-parser"
diff --git a/gemfiles/opensearch1.gemfile b/gemfiles/opensearch1.gemfile
diff --git a/lib/searchkick/index.rb b/lib/searchkick/index.rb
@@ -192,7 +192,6 @@ def reload_synonyms
       if Searchkick.opensearch?
         client.transport.perform_request "POST", "_plugins/_refresh_search_analyzers/#{CGI.escape(name)}"
       else
-        raise Error, "Requires Elasticsearch 7.3+" if Searchkick.server_below?("7.3.0")
         begin
           client.transport.perform_request("GET", "#{CGI.escape(name)}/_reload_search_analyzers")
         rescue => e
diff --git a/lib/searchkick/index_options.rb b/lib/searchkick/index_options.rb
@@ -578,9 +578,9 @@ def add_search_synonyms(settings)
         if search_synonyms.is_a?(String)
           synonym_graph = {
             type: "synonym_graph",
-            synonyms_path: search_synonyms
+            synonyms_path: search_synonyms,
+            updateable: true
           }
-          synonym_graph[:updateable] = true unless below73?
         else
           synonym_graph = {
             type: "synonym_graph",
@@ -628,9 +628,5 @@ def default_type
     def default_analyzer
       :searchkick_index
     end
-
-    def below73?
-      Searchkick.server_below?("7.3.0")
-    end
   end
 end
diff --git a/lib/searchkick/query.rb b/lib/searchkick/query.rb
@@ -374,7 +374,6 @@ def prepare
             field_misspellings = misspellings && (!misspellings_fields || misspellings_fields.include?(base_field(field)))
 
             if field == "_all" || field.end_with?(".analyzed")
-              shared_options[:cutoff_frequency] = 0.001 unless operator.to_s == "and" || field_misspellings == false || (!below73? && !track_total_hits?) || match_type == :match_phrase || !below80? || Searchkick.opensearch?
               qs << shared_options.merge(analyzer: "searchkick_search")
 
               # searchkick_search and searchkick_search2 are the same for some languages
@@ -457,20 +456,14 @@ def prepare
 
         models = Array(options[:models])
         if models.any? { |m| m != m.searchkick_klass }
-          # aliases are not supported with _index in ES below 7.5
-          # see https://github.com/elastic/elasticsearch/pull/46640
-          if below75?
-            Searchkick.warn("Passing child models to models option throws off hits and pagination - use type option instead")
-          else
-            index_type_or =
-              models.map do |m|
-                v = {_index: m.searchkick_index.name}
-                v[:type] = m.searchkick_index.klass_document_type(m, true) if m != m.searchkick_klass
-                v
-              end
+          index_type_or =
+            models.map do |m|
+              v = {_index: m.searchkick_index.name}
+              v[:type] = m.searchkick_index.klass_document_type(m, true) if m != m.searchkick_klass
+              v
+            end
 
-            where[:or] = Array(where[:or]) + [index_type_or]
-          end
+          where[:or] = Array(where[:or]) + [index_type_or]
         end
 
         # start everything as efficient filters
@@ -1113,11 +1106,7 @@ def where_filters(where)
                 regex = regex.gsub(/(?<!\\)%/, ".*").gsub(/(?<!\\)_/, ".").gsub("\\%", "%").gsub("\\_", "_")
 
                 if op == :ilike
-                  if below710?
-                    raise ArgumentError, "ilike requires Elasticsearch 7.10+"
-                  else
-                    filters << {regexp: {field => {value: regex, flags: "NONE", case_insensitive: true}}}
-                  end
+                  filters << {regexp: {field => {value: regex, flags: "NONE", case_insensitive: true}}}
                 else
                   filters << {regexp: {field => {value: regex, flags: "NONE"}}}
                 end
@@ -1201,14 +1190,7 @@ def term_filters(field, value)
           source = "#{source}.*"
         end
 
-        if below710?
-          if value.casefold?
-            raise ArgumentError, "Case-insensitive flag does not work with Elasticsearch < 7.10"
-          end
-          {regexp: {field => {value: source, flags: "NONE"}}}
-        else
-          {regexp: {field => {value: source, flags: "NONE", case_insensitive: value.casefold?}}}
-        end
+        {regexp: {field => {value: source, flags: "NONE", case_insensitive: value.casefold?}}}
       else
         # TODO add this for other values
         if value.as_json.is_a?(Enumerable)
@@ -1300,22 +1282,6 @@ def body_options
       options[:body_options] || {}
     end
 
-    def below73?
-      Searchkick.server_below?("7.3.0")
-    end
-
-    def below75?
-      Searchkick.server_below?("7.5.0")
-    end
-
-    def below710?
-      Searchkick.server_below?("7.10.0")
-    end
-
-    def below80?
-      Searchkick.server_below?("8.0.0")
-    end
-
     def below90?
       Searchkick.server_below?("9.0.0")
     end
diff --git a/test/aggs_test.rb b/test/aggs_test.rb
@@ -113,7 +113,7 @@ def test_aggs_group_by_date
           products_per_year: {
             date_histogram: {
               field: :created_at,
-              interval_key => :year
+              calendar_interval: :year
             }
           }
         }
@@ -241,7 +241,7 @@ def search_aggregate_by_day_with_time_zone(query, time_zone = '-8:00')
         products_per_day: {
           date_histogram: {
             field: :created_at,
-            interval_key => :day,
+            calendar_interval: :day,
             time_zone: time_zone
           }
         }
@@ -263,8 +263,4 @@ def store_multiple_aggs(options)
       [field, buckets_as_hash(filtered_agg)]
     end
   end
-
-  def interval_key
-    Searchkick.server_below?("7.4.0") ? :interval : :calendar_interval
-  end
 end
diff --git a/test/inheritance_test.rb b/test/inheritance_test.rb
@@ -104,16 +104,8 @@ def test_inherited_and_non_inherited_models
     store_names ["Bear C"]
     Animal.reindex
     assert_equal 2, Searchkick.search("bear", models: [Cat, Product]).size
-
-    # hits and pagination will be off with this approach (for now)
-    # ideal case is add where conditions (index a, type a OR index b)
-    # however, we don't know the exact index name and aliases don't work for filters
-    # see https://github.com/elastic/elasticsearch/issues/23306
-    # show warning for now
-    # alternative is disallow inherited models with models option
-    expected = Searchkick.server_below?("7.5.0") ? 3 : 2
-    assert_equal expected, Searchkick.search("bear", models: [Cat, Product]).hits.size
-    assert_equal expected, Searchkick.search("bear", models: [Cat, Product], per_page: 1).total_pages
+    assert_equal 2, Searchkick.search("bear", models: [Cat, Product]).hits.size
+    assert_equal 2, Searchkick.search("bear", models: [Cat, Product], per_page: 1).total_pages
   end
 
   # TODO move somewhere better
diff --git a/test/misspellings_test.rb b/test/misspellings_test.rb
@@ -13,21 +13,13 @@ def test_distance
 
   def test_prefix_length
     store_names ["ap", "api", "apt", "any", "nap", "ah", "ahi"]
-    if prefix_length_misspellings_off?
-      assert_search "ap", ["ap"], misspellings: {prefix_length: 2}
-    else
-      assert_search "ap", ["ap", "api", "apt"], misspellings: {prefix_length: 2}
-    end
+    assert_search "ap", ["ap", "api", "apt"], misspellings: {prefix_length: 2}
     assert_search "api", ["ap", "api", "apt"], misspellings: {prefix_length: 2}
   end
 
   def test_prefix_length_operator
     store_names ["ap", "api", "apt", "any", "nap", "ah", "aha"]
-    if prefix_length_misspellings_off?
-      assert_search "ap ah", ["ap", "ah"], operator: "or", misspellings: {prefix_length: 2}
-    else
-      assert_search "ap ah", ["ap", "ah", "api", "apt", "aha"], operator: "or", misspellings: {prefix_length: 2}
-    end
+    assert_search "ap ah", ["ap", "ah", "api", "apt", "aha"], operator: "or", misspellings: {prefix_length: 2}
     assert_search "api ahi", ["ap", "api", "apt", "ah", "aha"], operator: "or", misspellings: {prefix_length: 2}
   end
 
@@ -110,10 +102,4 @@ def test_field_word_start
     store_names ["Sriracha"]
     assert_search "siracha", ["Sriracha"], fields: [{name: :word_middle}], misspellings: {fields: [:name]}
   end
-
-  private
-
-  def prefix_length_misspellings_off?
-    Searchkick.opensearch? ? Searchkick.server_below?("2.0.0", true) : Searchkick.server_below?("8.0.0")
-  end
 end
diff --git a/test/pagination_test.rb b/test/pagination_test.rb
@@ -230,6 +230,6 @@ def test_pit
   private
 
   def pit_supported?
-    Searchkick.opensearch? ? !Searchkick.server_below?("2.4.0", true) : !Searchkick.server_below?("7.10.0")
+    Searchkick.opensearch? ? !Searchkick.server_below?("2.4.0", true) : true
   end
 end
diff --git a/test/search_synonyms_test.rb b/test/search_synonyms_test.rb
@@ -65,18 +65,11 @@ def test_multiple_words_expanded
   end
 
   def test_reload_synonyms
-    if Searchkick.server_below?("7.3.0")
-      error = assert_raises(Searchkick::Error) do
-        Speaker.searchkick_index.reload_synonyms
-      end
-      assert_equal "Requires Elasticsearch 7.3+", error.message
-    else
-      Speaker.searchkick_index.reload_synonyms
-    end
+    Speaker.searchkick_index.reload_synonyms
   end
 
   def test_reload_synonyms_better
-    skip unless ENV["ES_PATH"] && !Searchkick.server_below?("7.3.0")
+    skip unless ENV["ES_PATH"]
 
     write_synonyms("test,hello")
 
diff --git a/test/where_test.rb b/test/where_test.rb
@@ -146,14 +146,7 @@ def test_regexp_anchored
   def test_regexp_case
     store_names ["abcde"]
     assert_search "*", [], where: {name: /\AABCDE\z/}
-    if case_insensitive_supported?
-      assert_search "*", ["abcde"], where: {name: /\AABCDE\z/i}
-    else
-      error = assert_raises(ArgumentError) do
-        assert_search "*", [], where: {name: /\AABCDE\z/i}
-      end
-      assert_equal "Case-insensitive flag does not work with Elasticsearch < 7.10", error.message
-    end
+    assert_search "*", ["abcde"], where: {name: /\AABCDE\z/i}
   end
 
   def test_prefix
@@ -217,39 +210,26 @@ def test_like_optional_operators
   end
 
   def test_ilike
-    if case_insensitive_supported?
-      store_names ["Product ABC", "Product DEF"]
-      assert_search "product", ["Product ABC"], where: {name: {ilike: "%abc%"}}
-      assert_search "product", ["Product ABC"], where: {name: {ilike: "%abc"}}
-      assert_search "product", [], where: {name: {ilike: "abc"}}
-      assert_search "product", [], where: {name: {ilike: "abc%"}}
-      assert_search "product", [], where: {name: {ilike: "abc%"}}
-      assert_search "product", ["Product ABC"], where: {name: {ilike: "Product_abc"}}
-    else
-      error = assert_raises(ArgumentError) do
-        Product.search("*", where: {name: {ilike: "%abc%"}})
-      end
-      assert_equal "ilike requires Elasticsearch 7.10+", error.message
-    end
+    store_names ["Product ABC", "Product DEF"]
+    assert_search "product", ["Product ABC"], where: {name: {ilike: "%abc%"}}
+    assert_search "product", ["Product ABC"], where: {name: {ilike: "%abc"}}
+    assert_search "product", [], where: {name: {ilike: "abc"}}
+    assert_search "product", [], where: {name: {ilike: "abc%"}}
+    assert_search "product", [], where: {name: {ilike: "abc%"}}
+    assert_search "product", ["Product ABC"], where: {name: {ilike: "Product_abc"}}
   end
 
   def test_ilike_escape
-    skip unless case_insensitive_supported?
-
     store_names ["Product 100%", "Product B"]
     assert_search "product", ["Product 100%"], where: {name: {ilike: "% 100\\%"}}
   end
 
   def test_ilike_special_characters
-    skip unless case_insensitive_supported?
-
     store_names ["Product ABC\"", "Product B"]
     assert_search "product", ["Product ABC\""], where: {name: {ilike: "%abc\""}}
   end
 
   def test_ilike_optional_operators
-    skip unless case_insensitive_supported?
-
     store_names ["Product A&B", "Product B", "Product <3", "Product @Home"]
     assert_search "product", ["Product A&B"], where: {name: {ilike: "%a&b"}}
     assert_search "product", ["Product <3"], where: {name: {ilike: "%<%"}}
@@ -369,20 +349,10 @@ def test_geo_polygon
       {lat: 27.122789, lon: -94.125535},
       {lat: 27.12278, lon: -125.496146}
     ]
-    _, _stderr = capture_io do
-      assert_search "san", ["San Francisco", "San Antonio"], where: {location: {geo_polygon: {points: polygon}}}
-    end
-    # only warns for elasticsearch gem < 8
-    # unless Searchkick.server_below?("7.12.0")
-    #   assert_match "Deprecated field [geo_polygon] used", stderr
-    # end
-
-    # Field [location] is not of type [geo_shape] but of type [geo_point] error for previous versions
-    unless Searchkick.server_below?("7.14.0")
-      polygon << polygon.first
-      # see test/geo_shape_test.rb for other geo_shape tests
-      assert_search "san", ["San Francisco", "San Antonio"], where: {location: {geo_shape: {type: "polygon", coordinates: [polygon]}}}
-    end
+    assert_search "san", ["San Francisco", "San Antonio"], where: {location: {geo_polygon: {points: polygon}}}
+
+    polygon << polygon.first
+    assert_search "san", ["San Francisco", "San Antonio"], where: {location: {geo_shape: {type: "polygon", coordinates: [polygon]}}}
   end
 
   def test_top_left_bottom_right
@@ -448,8 +418,4 @@ def test_nested
     ]
     assert_search "product", ["Product A"], where: {"details.year" => 2016}
   end
-
-  def case_insensitive_supported?
-    !Searchkick.server_below?("7.10.0")
-  end
 end

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ def test_aggs_group_by_date`
`113`	`113`	`products_per_year: {`
`114`	`114`	`date_histogram: {`
`115`	`115`	`field: :created_at,`
`116`		`- interval_key => :year`
	`116`	`+ calendar_interval: :year`
`117`	`117`	`}`
`118`	`118`	`}`
`119`	`119`	`}`
`@@ -241,7 +241,7 @@ def search_aggregate_by_day_with_time_zone(query, time_zone = '-8:00')`
`241`	`241`	`products_per_day: {`
`242`	`242`	`date_histogram: {`
`243`	`243`	`field: :created_at,`
`244`		`- interval_key => :day,`
	`244`	`+ calendar_interval: :day,`
`245`	`245`	`time_zone: time_zone`
`246`	`246`	`}`
`247`	`247`	`}`
`@@ -263,8 +263,4 @@ def store_multiple_aggs(options)`
`263`	`263`	`[field, buckets_as_hash(filtered_agg)]`
`264`	`264`	`end`
`265`	`265`	`end`
`266`		`-`
`267`		`- def interval_key`
`268`		`- Searchkick.server_below?("7.4.0") ? :interval : :calendar_interval`
`269`		`- end`
`270`	`266`	`end`