elasticgraph-indexer 1.0.1 → 1.0.3.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50d15365cf8ef27c7ec418e662b15c2693d726811825ad81e1765bef3dec58d1
-  data.tar.gz: 61d3e54674ce415e5fd8ba21e850a15c80f43e4725fe29f99a961c03d8c61a38
+  metadata.gz: 14842c73ba7eeb1dd2ded8b395b96b2ca1a397b4cfc901af803f2004141f3bc1
+  data.tar.gz: 7db60416bac8d71edad120569e8abfe55e2884b6844d140109e485b8c9d66d10
 SHA512:
-  metadata.gz: fdcd4764e9070c5379e1f24d895cd760adc6611cd750e17dc6f3c7d441c1ccfd0cb72dea515ad2647b4aa85c583d7d785790071027250aee337eea085159d428
-  data.tar.gz: 2a8908cb7647715cb668f79d9429ff2c47315539f97f354697bef77eb6202a5beec5bf4b998f5188ab380d5892096236166931c2aa6b82cba8ff64fdaea10997
+  metadata.gz: 62ff5ccbd63288683b1b62432714ea9c2d96097116de5c46c6e2048c1231edcbb45e7a9ae4582e3b9e57a015d0331ab8ae2431270bc420da4864f322486aa172
+  data.tar.gz: 45d6e1a8c27040378857d7b0c7a7411b669c9f9c6e4ba31ee7e3307cfd71f48780c842e1f505d4d3b19e1c63fdfdcdee2db2dfb30b9e5feb40a122796a991dbe

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2024 - 2025 Block, Inc.
+Copyright (c) 2024 - 2026 Block, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/elastic_graph/indexer/config.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/indexer/datastore_indexing_router.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at
@@ -8,9 +8,7 @@
 
 require "elastic_graph/constants"
 require "elastic_graph/errors"
-require "elastic_graph/datastore_core/index_config_normalizer"
 require "elastic_graph/indexer/event_id"
-require "elastic_graph/indexer/hash_differ"
 require "elastic_graph/indexer/indexing_failures_error"
 require "elastic_graph/support/threading"
 
@@ -18,38 +16,12 @@ module ElasticGraph
   class Indexer
     # Responsible for routing datastore indexing requests to the appropriate cluster and index.
     class DatastoreIndexingRouter
-      # In this class, we internally cache the datastore mapping for an index definition, so that we don't have to
-      # fetch the mapping from the datastore on each call to `bulk`. It rarely changes and ElasticGraph is designed so that
-      # mapping updates are applied before deploying the indexer with a new mapping.
-      #
-      # However, if an engineer forgets to apply a mapping update before deploying, they'll run into "mappings are incomplete"
-      # errors. They can updated the mapping to fix it, but the use of caching in this class could mean that the fix doesn't
-      # necessarily work right away. The app would have to be deployed or restarted so that the caches are cleared. That could
-      # be annoying.
-      #
-      # To address this issue, we're adding an expiration on the caching of the index mappings. Re-fetching the index
-      # mapping once every few minutes is no big deal and will allow the indexer to recover on its own after a mapping
-      # update has been applied without requiring a deploy or a restart.
-      #
-      # The expiration is a range so that, when we have many processes running, and they all started around the same time,
-      # (say, after a deploy!), they don't all expire their caches in sync, leading to spiky load on the datastore. Instead,
-      # the random distribution of expiration times will spread out the load.
-      MAPPING_CACHE_MAX_AGE_IN_MS_RANGE = (5 * 60 * 1000)..(10 * 60 * 1000)
-
       def initialize(
         datastore_clients_by_name:,
-        mappings_by_index_def_name:,
-        monotonic_clock:,
         logger:
       )
         @datastore_clients_by_name = datastore_clients_by_name
         @logger = logger
-        @monotonic_clock = monotonic_clock
-        @cached_mappings = {}
-
-        @mappings_by_index_def_name = mappings_by_index_def_name.transform_values do |mappings|
-          DatastoreCore::IndexConfigNormalizer.normalize_mappings(mappings)
-        end
       end
 
       # Proxies `client#bulk` by converting `operations` to their bulk
@@ -70,17 +42,11 @@ module ElasticGraph
       #
       # It is the caller's responsibility to deal with any returned failures as this method does not
       # raise an exception in that case.
-      #
-      # Note: before any operations are attempted, the datastore indices are validated for consistency
-      # with the mappings we expect, meaning that no bulk operations will be attempted if that is not up-to-date.
       def bulk(operations, refresh: false)
-        # Before writing these operations, verify their destination index mapping are consistent.
-        validate_mapping_completeness_of!(:accessible_cluster_names_to_index_into, *operations.map(&:destination_index_def).uniq)
-
         ops_by_client = ::Hash.new { |h, k| h[k] = [] } # : ::Hash[DatastoreCore::_Client, ::Array[_Operation]]
         unsupported_ops = ::Set.new # : ::Set[_Operation]
 
-        operations.reject { |op| op.to_datastore_bulk.empty? }.each do |op|
+        operations.each do |op|
           # Note: this intentionally does not use `accessible_cluster_names_to_index_into`.
           # We want to fail with clear error if any clusters are inaccessible instead of silently ignoring
           # the named cluster. The `IndexingFailuresError` provides a clear error.
@@ -290,108 +256,6 @@ module ElasticGraph
             "for document versions:\n\n#{failures.join("\n")}"
         end
       end
-
-      # Queries the datastore mapping(s) for the given index definition(s) to verify that they are up-to-date
-      # with our schema artifacts, raising an error if the datastore mappings are missing fields that we
-      # expect. (Extra fields are allowed, though--we'll just ignore them).
-      #
-      # This is intended for use when you want a strong guarantee before proceeding that the indices are current,
-      # such as before indexing data, or after applying index updates (to "prove" that everything is how it should
-      # be).
-      #
-      # This correctly queries the datastore clusters specified via `index_into_clusters` in config,
-      # but ignores clusters specified via `query_cluster` (since this isn't intended to be used as part
-      # of the query flow).
-      #
-      # For a rollover template, this takes care of verifying the template itself and also any indices that originated
-      # from the template.
-      #
-      # Note also that this caches the datastore mappings, since this is intended to be used to verify an index
-      # before we index data into it, and we do not want to impose a huge performance penalty on that process (requiring
-      # multiple datastore requests before we index each document...). In general, the index mapping only changes
-      # when we make it change, and we deploy and restart ElasticGraph after any index mapping changes, so we do not
-      # need to worry about it mutating during the lifetime of a single process (particularly given the expense of doing
-      # so).
-      def validate_mapping_completeness_of!(index_cluster_name_method, *index_definitions)
-        diffs_by_cluster_and_index_name =
-          index_definitions.reduce({}) do |accum, index_def| # $ ::Hash[[::String, ::String], ::String]
-            accum.merge(mapping_diffs_for(index_def, index_cluster_name_method))
-          end
-
-        if diffs_by_cluster_and_index_name.any?
-          formatted_diffs = diffs_by_cluster_and_index_name.map do |(cluster_name, index_name), diff|
-            <<~EOS
-              On cluster `#{cluster_name}` and index/template `#{index_name}`:
-              #{diff}
-            EOS
-          end.join("\n\n")
-
-          raise Errors::ConfigError, "Datastore index mappings are incomplete compared to the current schema. " \
-            "The diff below uses the datastore index mapping as the base, and shows the expected mapping as a diff. " \
-            "\n\n#{formatted_diffs}"
-        end
-      end
-
-      private
-
-      def mapping_diffs_for(index_definition, index_cluster_name_method)
-        expected_mapping = @mappings_by_index_def_name.fetch(index_definition.name)
-
-        index_definition.public_send(index_cluster_name_method).flat_map do |cluster_name|
-          datastore_client = datastore_client_named(cluster_name)
-
-          cached_mappings_for(index_definition, datastore_client).filter_map do |index, mapping_in_index|
-            if (diff = HashDiffer.diff(mapping_in_index, expected_mapping, ignore_ops: [:-]))
-              [[cluster_name, index.name], diff]
-            end
-          end
-        end.to_h
-      end
-
-      def cached_mappings_for(index_definition, datastore_client)
-        key = [datastore_client, index_definition] # : [DatastoreCore::_Client, DatastoreCore::indexDefinition]
-        cached_mapping = @cached_mappings[key] ||= new_cached_mapping(fetch_mappings_from_datastore(index_definition, datastore_client))
-
-        return cached_mapping.mappings if @monotonic_clock.now_in_ms < cached_mapping.expires_at
-
-        begin
-          fetch_mappings_from_datastore(index_definition, datastore_client).tap do |mappings|
-            @logger.info "Mapping cache expired for #{index_definition.name}; cleared it from the cache and re-fetched the mapping."
-            @cached_mappings[key] = new_cached_mapping(mappings)
-          end
-        rescue => e
-          @logger.warn <<~EOS
-            Mapping cache expired for #{index_definition.name}; attempted to re-fetch it but got an error[1]. Will continue using expired mapping information for now.
-
-            [1] #{e.class}: #{e.message}
-            #{e.backtrace.join("\n")}
-          EOS
-
-          # Update the cached mapping so that the expiration is reset.
-          @cached_mappings[key] = new_cached_mapping(cached_mapping.mappings)
-
-          cached_mapping.mappings
-        end
-      end
-
-      def fetch_mappings_from_datastore(index_definition, datastore_client)
-        # We need to also check any related indices...
-        indices_to_check = [index_definition] + index_definition.related_rollover_indices(datastore_client)
-
-        indices_to_check.to_h do |index|
-          [index, index.mappings_in_datastore(datastore_client)]
-        end
-      end
-
-      def new_cached_mapping(mappings)
-        CachedMapping.new(mappings, @monotonic_clock.now_in_ms + rand(MAPPING_CACHE_MAX_AGE_IN_MS_RANGE).to_i)
-      end
-
-      def datastore_client_named(name)
-        @datastore_clients_by_name.fetch(name)
-      end
-
-      CachedMapping = ::Data.define(:mappings, :expires_at)
     end
   end
 end

data/lib/elastic_graph/indexer/event_id.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/indexer/failed_event_error.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/indexer/hash_differ.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/indexer/indexing_failures_error.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/indexer/indexing_preparers/date_time.rb

@@ -0,0 +1,41 @@
+# Copyright 2024 - 2026 Block, Inc.
+#
+# Use of this source code is governed by an MIT-style
+# license that can be found in the LICENSE file or at
+# https://opensource.org/licenses/MIT.
+#
+# frozen_string_literal: true
+
+require "elastic_graph/constants"
+require "time"
+
+module ElasticGraph
+  class Indexer
+    module IndexingPreparers
+      class DateTime
+        # Here we normalize DateTime strings to consistent 3-digit millisecond precision.
+        # This is critical for min/max value tracking which uses string comparison via
+        # Painless's `.compareTo()` method.
+        #
+        # Without consistent precision, string comparison produces incorrect results:
+        #   "2025-12-19T04:15:47.53Z" vs "2025-12-19T04:15:47.531Z"
+        #                        ^                              ^
+        #                       'Z' (ASCII 90)  >  '1' (ASCII 49)
+        #
+        # This would incorrectly determine that `.53Z > .531Z`.
+        #
+        # By normalizing all DateTime values to 3-digit precision, we ensure:
+        #   "2025-12-19T04:15:47.530Z" < "2025-12-19T04:15:47.531Z"
+        def self.prepare_for_indexing(value)
+          return value if value.nil?
+          time = ::Time.iso8601(value)
+          time.getutc.iso8601(DATE_TIME_PRECISION)
+        rescue ::ArgumentError, ::TypeError
+          # If the value is not a valid ISO8601 string, return it as-is
+          # and let the datastore reject it if necessary.
+          value
+        end
+      end
+    end
+  end
+end

data/lib/elastic_graph/indexer/indexing_preparers/integer.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/indexer/indexing_preparers/no_op.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/indexer/indexing_preparers/untyped.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/indexer/operation/count_accumulator.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/indexer/operation/factory.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at
@@ -70,7 +70,7 @@ module ElasticGraph
           # behavior is in the event of a tie (highly unlikely, there shouldn't be a gap in available json schema versions), the higher version
           # should be selected. So to get that behavior, the list is sorted in descending order.
           #
-          selected_json_schema_version = available_json_schema_versions.sort.reverse.min_by { |it| (requested_json_schema_version - it).abs }
+          selected_json_schema_version = available_json_schema_versions.sort.reverse.min_by { |version| (requested_json_schema_version - version).abs }
 
           if selected_json_schema_version != requested_json_schema_version
             logger.info({

data/lib/elastic_graph/indexer/operation/result.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/indexer/operation/update.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/indexer/processor.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/indexer/record_preparer.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/indexer/spec_support/event_matcher.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/indexer/test_support/converters.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at

data/lib/elastic_graph/indexer.rb

@@ -1,4 +1,4 @@
-# Copyright 2024 - 2025 Block, Inc.
+# Copyright 2024 - 2026 Block, Inc.
 #
 # Use of this source code is governed by an MIT-style
 # license that can be found in the LICENSE file or at
@@ -47,8 +47,6 @@ module ElasticGraph
         require "elastic_graph/indexer/datastore_indexing_router"
         DatastoreIndexingRouter.new(
           datastore_clients_by_name: datastore_core.clients_by_name,
-          mappings_by_index_def_name: schema_artifacts.index_mappings_by_index_def_name,
-          monotonic_clock: monotonic_clock,
           logger: datastore_core.logger
         )
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elasticgraph-indexer
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.3.rc1
 platform: ruby
 authors:
 - Myron Marston
@@ -17,42 +17,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.3.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.3.rc1
 - !ruby/object:Gem::Dependency
   name: elasticgraph-schema_artifacts
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.3.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.3.rc1
 - !ruby/object:Gem::Dependency
   name: elasticgraph-support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.3.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.3.rc1
 - !ruby/object:Gem::Dependency
   name: hashdiff
   requirement: !ruby/object:Gem::Requirement
@@ -60,6 +60,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -67,62 +70,65 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: elasticgraph-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.3.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.3.rc1
 - !ruby/object:Gem::Dependency
   name: elasticgraph-elasticsearch
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.3.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.3.rc1
 - !ruby/object:Gem::Dependency
   name: elasticgraph-opensearch
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.3.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.3.rc1
 - !ruby/object:Gem::Dependency
   name: elasticgraph-schema_definition
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.3.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.3.rc1
 email:
 - myron@squareup.com
 executables: []
@@ -138,6 +144,7 @@ files:
 - lib/elastic_graph/indexer/failed_event_error.rb
 - lib/elastic_graph/indexer/hash_differ.rb
 - lib/elastic_graph/indexer/indexing_failures_error.rb
+- lib/elastic_graph/indexer/indexing_preparers/date_time.rb
 - lib/elastic_graph/indexer/indexing_preparers/integer.rb
 - lib/elastic_graph/indexer/indexing_preparers/no_op.rb
 - lib/elastic_graph/indexer/indexing_preparers/untyped.rb
@@ -154,10 +161,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/block/elasticgraph/issues
-  changelog_uri: https://github.com/block/elasticgraph/releases/tag/v1.0.1
-  documentation_uri: https://block.github.io/elasticgraph/api-docs/v1.0.1/
+  changelog_uri: https://github.com/block/elasticgraph/releases/tag/v1.0.3.rc1
+  documentation_uri: https://block.github.io/elasticgraph/api-docs/v1.0.3.rc1/
   homepage_uri: https://block.github.io/elasticgraph/
-  source_code_uri: https://github.com/block/elasticgraph/tree/v1.0.1/elasticgraph-indexer
+  source_code_uri: https://github.com/block/elasticgraph/tree/v1.0.3.rc1/elasticgraph-indexer
   gem_category: core
 rdoc_options: []
 require_paths:
@@ -169,14 +176,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '3.4'
   - - "<"
     - !ruby/object:Gem::Version
-      version: '3.5'
+      version: '4.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Indexes ElasticGraph data into a datastore.
 test_files: []