noiseless 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7fb5d9afa49be27d359d92a2fdf24999d488f8a7d865547452ea10b7aae67850
-  data.tar.gz: da2fb4b847d7c1b53bb17b7b0a588d2a1660006cbe9413af0b657282087ad681
+  metadata.gz: f66be9c1d81e3b887f0c0d4485381c4535f087f8365e2581c4c41d89cdba0934
+  data.tar.gz: 1565bffbcfb554d2b6afcc78ebb1ded79c5c58a8f157b1e25ccd9a449cd2abe2
 SHA512:
-  metadata.gz: 32b345fcc0ac56e25765f628c1ab8dd7dd03740e9a1a12bbcf5e13e9ce5078ef9ad57581f2b0a0f445f4d4b543559e01ceb50dd1a0dae86e7db5d35440b8e3c8
-  data.tar.gz: da9518b7381e61a16d7efef22e2d8d585b895b2e644820099403781c86ee9c7b541cf2ee00bad6cac7c40830764fd30aa841dd685dd9c63cb4ed227a1ed7ce8a
+  metadata.gz: 4a7e23f4eb136bc6c0dc457dcb6f267e000269aceddd6450264ac489429dda2e20c7b382b32c2ab2a91271faeccee419a5c72530e3781087a9f630e8bd16a15d
+  data.tar.gz: 605cf0980142cbe65692b9ef8d2a543969578620fa17b35e069a0344ac1a5ca5947781c6d9cf617203408a73e11cd08626c000d046e4a7a9839508919de8d463

data/lib/noiseless/adapter.rb

@@ -9,6 +9,17 @@ module Noiseless
     include Instrumentation
     include Introspection
 
+    GEO_FILTER_KEYS = %i[geo_distance geo_bounding_box geo_polygon geo_shape].freeze
+    RANGE_OPERATORS = %i[gte lte gt lt].freeze
+
+    # Aggregation types that require a field (or script) to execute.
+    FIELD_BASED_AGG_TYPES = %i[
+      terms rare_terms significant_terms missing
+      avg sum min max cardinality value_count stats extended_stats
+      percentiles percentile_ranks histogram date_histogram
+      geohash_grid geotile_grid geo_distance
+    ].freeze
+
     def initialize(hosts: [], **connection_params)
       @hosts = hosts
       @connection_params = connection_params.dup
@@ -61,6 +72,14 @@ module Noiseless
       end
     end
 
+    def refresh_index(index_name)
+      Async do
+        instrument(:refresh_index, index: index_name) do
+          execute_refresh_index(index_name)
+        end
+      end
+    end
+
     def index_exists?(index_name)
       Async do
         execute_index_exists?(index_name)
@@ -189,11 +208,32 @@ module Noiseless
       {
         bool: {
           must: must_queries,
-          filter: bool_node.filter.map { |f| { term: { f.field => f.value } } }
+          filter: bool_node.filter.map { |f| build_filter_clause(f) }
         }.reject { |_, v| v.empty? }
       }
     end
 
+    def build_filter_clause(node)
+      value = node.value
+      case value
+      when Hash
+        keys = value.keys.map(&:to_sym)
+        if keys.intersect?(GEO_FILTER_KEYS)
+          # Geo filters are already complete query clauses, e.g.
+          # { geo_distance: { distance: "100km", location: { lat:, lon: } } }
+          value
+        elsif (keys - RANGE_OPERATORS).empty?
+          { range: { node.field => value } }
+        else
+          { term: { node.field => value } }
+        end
+      when Array
+        { terms: { node.field => value } }
+      else
+        { term: { node.field => value } }
+      end
+    end
+
     def build_sort_hash(sort_nodes)
       return [] if sort_nodes.empty?
 
@@ -224,12 +264,12 @@ module Noiseless
       end
       error = payload.is_a?(Hash) ? payload["error"] : nil
       reason = if error.is_a?(Hash)
-                 [ error["type"], error["reason"] ].compact.join(": ")
-      elsif error
+                 [error["type"], error["reason"]].compact.join(": ")
+               elsif error
                  error.to_s
-      else
+               else
                  "HTTP #{response.status}"
-      end
+               end
       message = context ? "#{context}: #{reason}" : reason
       raise error_class.new(message, status: response.status, error_type: error.is_a?(Hash) ? error["type"] : nil)
     end
@@ -259,6 +299,10 @@ module Noiseless
       { acknowledged: true }
     end
 
+    def execute_refresh_index(_index_name)
+      { "acknowledged" => true }
+    end
+
     def execute_index_exists?(_index_name)
       true
     end
@@ -328,6 +372,10 @@ module Noiseless
       agg_body[:field] = agg.field if agg.field
       agg_body.merge!(agg.options)
 
+      # Convention: an unqualified field-based aggregation targets the field
+      # named after the aggregation itself.
+      agg_body[:field] = agg.name if !agg_body.key?(:field) && !agg_body.key?(:script) && FIELD_BASED_AGG_TYPES.include?(agg.type.to_sym)
+
       result[agg.type] = agg_body
 
       # Add sub-aggregations if any

data/lib/noiseless/adapters/execution_modules/es_compatible_execution.rb

@@ -32,6 +32,10 @@ module Noiseless
 
         def execute_delete_index(index_name, **_opts)
           response = delete_request("/#{index_name}")
+          # Deleting an absent index is idempotent, matching official ES/OS
+          # clients' ignore-404 behaviour.
+          return { "acknowledged" => true, "result" => "not_found" } if response.status == 404
+
           parse_json_response!(response, context: "delete index #{index_name}")
         ensure
           response&.close
@@ -64,6 +68,10 @@ module Noiseless
 
         def execute_delete_document(index, id, **_opts)
           response = delete_request("/#{index}/_doc/#{id}")
+          # 404 covers both a missing document and a missing index; either way
+          # the delete is idempotent.
+          return { "_index" => index, "_id" => id, "result" => "not_found" } if response.status == 404
+
           parse_json_response!(response, context: "delete document #{index}/#{id}")
         ensure
           response&.close

data/lib/noiseless/adapters/indices_api.rb

@@ -19,7 +19,7 @@ module Noiseless
 
       def refresh(index:)
         # Refresh the index to make documents immediately searchable
-        @adapter.send(:execute_refresh_index, index)
+        @adapter.refresh_index(index).wait
       end
     end
   end

data/lib/noiseless/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Noiseless
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: noiseless
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Abdelkader Boudih
@@ -294,7 +294,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Async-first Rails search abstraction with multi-backend support
 test_files: []