elasticgraph-graphql 0.18.0.0 → 0.18.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b19df00bc750f39aa2cbccab58af18c6cb2a2329017e9d0aa8f889dce5b1c377
-  data.tar.gz: 8308fce167bd7cf625bb7b82f2f717c174ffa12655b1df77e58e37369b8d6294
+  metadata.gz: b9832ca5ee58e052ef3428907d2bc277cdeba8b567eb3a3861609d0b97799ff7
+  data.tar.gz: 74f29fcd9a89007b34a2b4be5ba332dabc4ff7cb38585a0173e89541061a65a6
 SHA512:
-  metadata.gz: c983f82a5da8da47c2f8146337b9425623d1ebfacf0e2f93db706cd53e465725f12cc43fe4e49d2b7885422a428e7744ae61642264941d3d497eb4d4fd3bc9f6
-  data.tar.gz: 277958b0fee144f62342f2e3081f4ebbb9a7529456e62a2b5183ad8fe93f2cca7fd5013cbe9bf461fceee46d5f42cea8149d40b624410fbb9498267e78d1dedb
+  metadata.gz: 9ff8132bb4c647b2f23669d7c8e5993da3550b83fc15113ebcd0234a19f6f1faf79bfe2127c03d5cf19f39beadf3f96abcbbd18e99df22dd6bba3d1931e86524
+  data.tar.gz: 7ac54e755f0d20da132d7ff2ca03a9c3f61b2c182c781408e50ba9ac2e20c45a12dbf6dd235010b73675ee8b6be1bc7d352d868dd8c0aa982671b85e23bf41ed

data/lib/elastic_graph/graphql/aggregation/nested_sub_aggregation.rb

@@ -7,6 +7,7 @@
 # frozen_string_literal: true
 
 require "elastic_graph/graphql/aggregation/field_path_encoder"
+require "elastic_graph/support/memoizable_data"
 
 module ElasticGraph
   class GraphQL
@@ -14,14 +15,23 @@ module ElasticGraph
       # Represents a sub-aggregation on a `nested` field.
       # For the relevant Elasticsearch docs, see:
       # https://www.elastic.co/guide/en/elasticsearch/reference/8.10/search-aggregations-bucket-nested-aggregation.html
-      class NestedSubAggregation < ::Data.define(:nested_path, :query)
+      class NestedSubAggregation < Support::MemoizableData.define(:nested_path, :query)
+        # The nested path in the GraphQL query from the parent aggregation to this-subaggregation, encoded
+        # for use as a hash key.
+        #
+        # This key will be unique in the scope of the parent aggregation query, and thus suitable as a key
+        # in a sub-aggregations hash.
+        def nested_path_key
+          @nested_path_key ||= FieldPathEncoder.encode(nested_path.map(&:name_in_graphql_query))
+        end
+
         def build_agg_hash(filter_interpreter, parent_queries:)
           detail = query.build_agg_detail(filter_interpreter, field_path: nested_path, parent_queries: parent_queries)
           return {} if detail.nil?
 
-          query_names = parent_queries.map(&:name) + [query.name]
+          parent_query_names = parent_queries.map(&:name)
           {
-            Key.encode(query_names) => {
+            Key.encode(parent_query_names + [nested_path_key]) => {
               "nested" => {"path" => FieldPathEncoder.encode(nested_path.filter_map(&:name_in_index))},
               "aggs" => detail.clauses,
               "meta" => detail.meta.merge({

data/lib/elastic_graph/graphql/aggregation/query.rb

@@ -9,6 +9,7 @@
 require "elastic_graph/graphql/aggregation/key"
 require "elastic_graph/graphql/datastore_query"
 require "elastic_graph/graphql/filtering/field_path"
+require "elastic_graph/support/hash_util"
 
 module ElasticGraph
   class GraphQL
@@ -62,7 +63,7 @@ module ElasticGraph
 
           filter_detail(filter_interpreter, field_path) do
             grouping_adapter.grouping_detail_for(self) do
-              computations_detail.merge(sub_aggregation_detail(filter_interpreter, queries))
+              Support::HashUtil.disjoint_merge(computations_detail, sub_aggregation_detail(filter_interpreter, queries))
             end
           end
         end
@@ -114,7 +115,10 @@ module ElasticGraph
         end
 
         def build_inner_aggregation_detail(collection, &block)
-          collection.map(&block).reduce({}, :merge)
+          initial = {} # : ::Hash[::String, untyped]
+          collection.map(&block).reduce(initial) do |accum, hash|
+            Support::HashUtil.disjoint_merge(accum, hash)
+          end
         end
       end
 

data/lib/elastic_graph/graphql/aggregation/query_adapter.rb

@@ -15,6 +15,7 @@ require "elastic_graph/graphql/aggregation/path_segment"
 require "elastic_graph/graphql/aggregation/query"
 require "elastic_graph/graphql/aggregation/script_term_grouping"
 require "elastic_graph/graphql/schema/arguments"
+require "elastic_graph/support/hash_util"
 require "elastic_graph/support/memoizable_data"
 
 module ElasticGraph
@@ -303,22 +304,25 @@ module ElasticGraph
         end
 
         def build_sub_aggregations_from(node_node, parent_nested_path: [])
-          build_clauses_from(node_node.selection(element_names.sub_aggregations)) do |node, field, field_path|
-            if field.type.elasticgraph_category == :nested_sub_aggregation_connection
-              nested_path = parent_nested_path + field_path
-              nested_sub_agg = NestedSubAggregation.new(
-                nested_path: nested_path,
-                query: build_aggregation_query_for(
-                  node,
-                  field: field,
-                  grouping_adapter: sub_aggregation_grouping_adapter,
-                  nested_path: nested_path
+          key_sub_agg_pairs =
+            build_clauses_from(node_node.selection(element_names.sub_aggregations)) do |node, field, field_path|
+              if field.type.elasticgraph_category == :nested_sub_aggregation_connection
+                nested_path = parent_nested_path + field_path
+                nested_sub_agg = NestedSubAggregation.new(
+                  nested_path: nested_path,
+                  query: build_aggregation_query_for(
+                    node,
+                    field: field,
+                    grouping_adapter: sub_aggregation_grouping_adapter,
+                    nested_path: nested_path
+                  )
                 )
-              )
 
-              [[nested_sub_agg.query.name, nested_sub_agg]]
+                [[nested_sub_agg.nested_path_key, nested_sub_agg]] # : ::Array[[::String, NestedSubAggregation]]
+              end
             end
-          end.to_h
+
+          Support::HashUtil.strict_to_h(key_sub_agg_pairs)
         end
 
         def build_paginator_for(node)

data/lib/elastic_graph/graphql/aggregation/resolvers/aggregated_values.rb

@@ -8,6 +8,7 @@
 
 require "elastic_graph/graphql/aggregation/key"
 require "elastic_graph/graphql/aggregation/path_segment"
+require "elastic_graph/support/hash_util"
 
 module ElasticGraph
   class GraphQL
@@ -27,7 +28,7 @@ module ElasticGraph
               function_name: field.name_in_index.to_s
             )
 
-            result = bucket.fetch(key.encode)
+            result = Support::HashUtil.verbose_fetch(bucket, key.encode)
 
             # Aggregated value results always have a `value` key; in addition, for `date` field, they also have a `value_as_string`.
             # In that case, `value` is a number (e.g. ms since epoch) whereas `value_as_string` is a formatted value. ElasticGraph

data/lib/elastic_graph/graphql/aggregation/resolvers/grouped_by.rb

@@ -7,6 +7,7 @@
 # frozen_string_literal: true
 
 require "elastic_graph/graphql/aggregation/field_path_encoder"
+require "elastic_graph/support/hash_util"
 
 module ElasticGraph
   class GraphQL
@@ -21,7 +22,8 @@ module ElasticGraph
             new_field_path = field_path + [PathSegment.for(field: field, lookahead: lookahead)]
             return with(field_path: new_field_path) if field.type.object?
 
-            bucket.fetch("key").fetch(FieldPathEncoder.encode(new_field_path.map(&:name_in_graphql_query)))
+            bucket_entry = Support::HashUtil.verbose_fetch(bucket, "key")
+            Support::HashUtil.verbose_fetch(bucket_entry, FieldPathEncoder.encode(new_field_path.map(&:name_in_graphql_query)))
           end
         end
       end

data/lib/elastic_graph/graphql/aggregation/resolvers/sub_aggregations.rb

@@ -7,17 +7,19 @@
 # frozen_string_literal: true
 
 require "elastic_graph/graphql/aggregation/composite_grouping_adapter"
+require "elastic_graph/graphql/aggregation/field_path_encoder"
 require "elastic_graph/graphql/aggregation/key"
 require "elastic_graph/graphql/aggregation/non_composite_grouping_adapter"
 require "elastic_graph/graphql/aggregation/resolvers/count_detail"
 require "elastic_graph/graphql/decoded_cursor"
 require "elastic_graph/graphql/resolvers/resolvable_value"
+require "elastic_graph/support/hash_util"
 
 module ElasticGraph
   class GraphQL
     module Aggregation
       module Resolvers
-        class SubAggregations < ::Data.define(:schema_element_names, :sub_aggregations, :parent_queries, :sub_aggs_by_name, :field_path)
+        class SubAggregations < ::Data.define(:schema_element_names, :sub_aggregations, :parent_queries, :sub_aggs_by_agg_key, :field_path)
           def can_resolve?(field:, object:)
             true
           end
@@ -27,25 +29,26 @@ module ElasticGraph
             new_field_path = field_path + [path_segment]
             return with(field_path: new_field_path) unless field.type.elasticgraph_category == :nested_sub_aggregation_connection
 
-            aggregation_name = path_segment.name_in_graphql_query
-            sub_agg_query = sub_aggregations.fetch(aggregation_name).query
+            sub_agg_key = FieldPathEncoder.encode(new_field_path.map(&:name_in_graphql_query))
+            sub_agg_query = Support::HashUtil.verbose_fetch(sub_aggregations, sub_agg_key).query
 
             RelayConnectionBuilder.build_from_buckets(
               query: sub_agg_query,
               parent_queries: parent_queries,
               schema_element_names: schema_element_names,
               field_path: new_field_path
-            ) { extract_buckets(aggregation_name, args) }
+            ) { extract_buckets(sub_agg_key, args) }
           end
 
           private
 
-          def extract_buckets(aggregation_name, args)
+          def extract_buckets(aggregation_field_path, args)
             # When the client passes `first: 0`, we omit the sub-aggregation from the query body entirely,
-            # and it wont' be in `sub_aggs_by_name`. Instead, we can just return an empty list of buckets.
+            # and it wont' be in `sub_aggs_by_agg_key`. Instead, we can just return an empty list of buckets.
             return [] if args[schema_element_names.first] == 0
 
-            sub_agg = sub_aggs_by_name.fetch(Key.encode(parent_queries.map(&:name) + [aggregation_name]))
+            sub_agg_key = Key.encode(parent_queries.map(&:name) + [aggregation_field_path])
+            sub_agg = Support::HashUtil.verbose_fetch(sub_aggs_by_agg_key, sub_agg_key)
             meta = sub_agg.fetch("meta")
 
             # When the sub-aggregation node of the GraphQL query has a `filter` argument, the direct sub-aggregation returned by

data/lib/elastic_graph/graphql/resolvers/relay_connection.rb

@@ -8,6 +8,7 @@
 
 require "elastic_graph/graphql/aggregation/resolvers/relay_connection_builder"
 require "elastic_graph/graphql/resolvers/relay_connection/search_response_adapter_builder"
+require "elastic_graph/support/hash_util"
 
 module ElasticGraph
   class GraphQL
@@ -33,7 +34,7 @@ module ElasticGraph
           Aggregation::Resolvers::RelayConnectionBuilder.build_from_search_response(
             schema_element_names: schema_element_names,
             search_response: search_response,
-            query: query.aggregations.fetch(agg_name)
+            query: Support::HashUtil.verbose_fetch(query.aggregations, agg_name)
           )
         end
       end

data/lib/elastic_graph/graphql.rb

@@ -171,7 +171,6 @@ module ElasticGraph
     # @private
     def datastore_query_adapters
       @datastore_query_adapters ||= begin
-        require "elastic_graph/graphql/aggregation/non_composite_grouping_adapter"
         require "elastic_graph/graphql/aggregation/query_adapter"
         require "elastic_graph/graphql/query_adapter/filters"
         require "elastic_graph/graphql/query_adapter/pagination"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticgraph-graphql
 version: !ruby/object:Gem::Version
-  version: 0.18.0.0
+  version: 0.18.0.1
 platform: ruby
 authors:
 - Myron Marston
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-08-27 00:00:00.000000000 Z
+date: 2024-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop-factory_bot
@@ -278,28 +278,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.0.0
+        version: 0.18.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.0.0
+        version: 0.18.0.1
 - !ruby/object:Gem::Dependency
   name: elasticgraph-schema_artifacts
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.0.0
+        version: 0.18.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.0.0
+        version: 0.18.0.1
 - !ruby/object:Gem::Dependency
   name: graphql
   requirement: !ruby/object:Gem::Requirement
@@ -326,70 +326,70 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.0.0
+        version: 0.18.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.0.0
+        version: 0.18.0.1
 - !ruby/object:Gem::Dependency
   name: elasticgraph-elasticsearch
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.0.0
+        version: 0.18.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.0.0
+        version: 0.18.0.1
 - !ruby/object:Gem::Dependency
   name: elasticgraph-opensearch
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.0.0
+        version: 0.18.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.0.0
+        version: 0.18.0.1
 - !ruby/object:Gem::Dependency
   name: elasticgraph-indexer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.0.0
+        version: 0.18.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.0.0
+        version: 0.18.0.1
 - !ruby/object:Gem::Dependency
   name: elasticgraph-schema_definition
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.0.0
+        version: 0.18.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.0.0
+        version: 0.18.0.1
 description: 
 email:
 - myron@squareup.com