Support retrieved_from: :doc_values for direct leaf fields

config/schema/artifacts/datastore_config.yaml

@@ -1520,6 +1520,7 @@ index_templates:
           enabled: true
         _source:
           excludes:
+          - workspace_id2
           - internal_name
           - internal_details.*
       settings:
@@ -1570,6 +1571,9 @@ indices:
           value: Address
       _size:
         enabled: true
+      _source:
+        excludes:
+        - full_address
     settings:
       index.mapping.ignore_malformed: false
       index.mapping.coerce: false

config/schema/artifacts/runtime_metadata.yaml

@@ -1933,6 +1933,7 @@ index_definitions_by_name:
       __counts.shapes|type:
         source: __self
       full_address:
+        retrieved_from: doc_values
         source: __self
       geo_location.lat:
         source: __self
@@ -3211,6 +3212,7 @@ index_definitions_by_name:
       weight_in_ng_str:
         source: __self
       workspace_id2:
+        retrieved_from: doc_values
         source: __self
       workspace_name:
         source: workspace
@@ -3342,9 +3344,6 @@ object_types_by_name:
       cursor:
         resolver:
           name: object_without_lookahead
-      highlights:
-        resolver:
-          name: object_without_lookahead
       node:
         resolver:
           name: object_without_lookahead
@@ -3356,11 +3355,6 @@ object_types_by_name:
       timestamps:
         resolver:
           name: object_with_lookahead
-  AddressHighlights:
-    graphql_fields_by_name:
-      full_address:
-        resolver:
-          name: get_record_field_value
   AddressTimestamps:
     graphql_fields_by_name:
       created_at:
@@ -5951,10 +5945,6 @@ object_types_by_name:
         name_in_index: widget_workspace_id3
         resolver:
           name: get_record_field_value
-      workspace_id:
-        name_in_index: workspace_id2
-        resolver:
-          name: get_record_field_value
       workspace_name:
         resolver:
           name: get_record_field_value
@@ -9155,10 +9145,6 @@ object_types_by_name:
         name_in_index: the_opts
         resolver:
           name: get_record_field_value
-      workspace_id:
-        name_in_index: workspace_id2
-        resolver:
-          name: get_record_field_value
       workspace_name:
         resolver:
           name: get_record_field_value
@@ -9732,9 +9718,6 @@ object_types_by_name:
       fees:
         resolver:
           name: get_record_field_value
-      full_address:
-        resolver:
-          name: get_record_field_value
       id:
         resolver:
           name: get_record_field_value
@@ -9773,10 +9756,6 @@ object_types_by_name:
         name_in_index: the_opts
         resolver:
           name: get_record_field_value
-      workspace_id:
-        name_in_index: workspace_id2
-        resolver:
-          name: get_record_field_value
       workspace_name:
         resolver:
           name: get_record_field_value

config/schema/artifacts/schema.graphql

@@ -155,11 +155,6 @@ type AddressEdge {
   """
   cursor: Cursor
 
-  """
-  Specific search highlights for this `Address`, providing matching snippets for the requested fields.
-  """
-  highlights: AddressHighlights
-
   """
   The `Address` of this edge.
   """
@@ -238,16 +233,6 @@ type AddressGroupedBy {
   timestamps: AddressTimestampsGroupedBy
 }
 
-"""
-Type used to request desired `Address` search highlight fields.
-"""
-type AddressHighlights {
-  """
-  Search highlights for the `full_address`, providing snippets of the matching text.
-  """
-  full_address: [String!]!
-}
-
 """
 Enumerates the ways `Address`s can be sorted.
 """
@@ -7957,11 +7942,6 @@ type NamedEntityHighlights {
   """
   widget_workspace_id: [String!]!
 
-  """
-  Search highlights for the `workspace_id`, providing snippets of the matching text.
-  """
-  workspace_id: [String!]!
-
   """
   Search highlights for the `workspace_name`, providing snippets of the matching text.
   """
@@ -18532,11 +18512,6 @@ type WidgetHighlights {
   """
   the_options: WidgetOptionsHighlights
 
-  """
-  Search highlights for the `workspace_id`, providing snippets of the matching text.
-  """
-  workspace_id: [String!]!
-
   """
   Search highlights for the `workspace_name`, providing snippets of the matching text.
   """
@@ -19700,11 +19675,6 @@ type WidgetOrAddressHighlights {
   """
   fees: MoneyHighlights
 
-  """
-  Search highlights for the `full_address`, providing snippets of the matching text.
-  """
-  full_address: [String!]!
-
   """
   Search highlights for the `id`, providing snippets of the matching text.
   """
@@ -19765,11 +19735,6 @@ type WidgetOrAddressHighlights {
   """
   the_options: WidgetOptionsHighlights
 
-  """
-  Search highlights for the `workspace_id`, providing snippets of the matching text.
-  """
-  workspace_id: [String!]!
-
   """
   Search highlights for the `workspace_name`, providing snippets of the matching text.
   """

config/schema/artifacts_with_apollo/datastore_config.yaml

@@ -1520,6 +1520,7 @@ index_templates:
           enabled: true
         _source:
           excludes:
+          - workspace_id2
           - internal_name
           - internal_details.*
       settings:
@@ -1570,6 +1571,9 @@ indices:
           value: Address
       _size:
         enabled: true
+      _source:
+        excludes:
+        - full_address
     settings:
       index.mapping.ignore_malformed: false
       index.mapping.coerce: false

config/schema/artifacts_with_apollo/runtime_metadata.yaml

@@ -1962,6 +1962,7 @@ index_definitions_by_name:
       __counts.shapes|type:
         source: __self
       full_address:
+        retrieved_from: doc_values
         source: __self
       geo_location.lat:
         source: __self
@@ -3240,6 +3241,7 @@ index_definitions_by_name:
       weight_in_ng_str:
         source: __self
       workspace_id2:
+        retrieved_from: doc_values
         source: __self
       workspace_name:
         source: workspace
@@ -3371,9 +3373,6 @@ object_types_by_name:
       cursor:
         resolver:
           name: object_without_lookahead
-      highlights:
-        resolver:
-          name: object_without_lookahead
       node:
         resolver:
           name: object_without_lookahead
@@ -3385,11 +3384,6 @@ object_types_by_name:
       timestamps:
         resolver:
           name: object_with_lookahead
-  AddressHighlights:
-    graphql_fields_by_name:
-      full_address:
-        resolver:
-          name: get_record_field_value
   AddressTimestamps:
     graphql_fields_by_name:
       created_at:
@@ -6074,10 +6068,6 @@ object_types_by_name:
         name_in_index: widget_workspace_id3
         resolver:
           name: get_record_field_value
-      workspace_id:
-        name_in_index: workspace_id2
-        resolver:
-          name: get_record_field_value
       workspace_name:
         resolver:
           name: get_record_field_value
@@ -9284,10 +9274,6 @@ object_types_by_name:
         name_in_index: the_opts
         resolver:
           name: get_record_field_value
-      workspace_id:
-        name_in_index: workspace_id2
-        resolver:
-          name: get_record_field_value
       workspace_name:
         resolver:
           name: get_record_field_value
@@ -9861,9 +9847,6 @@ object_types_by_name:
       fees:
         resolver:
           name: get_record_field_value
-      full_address:
-        resolver:
-          name: get_record_field_value
       id:
         resolver:
           name: get_record_field_value
@@ -9902,10 +9885,6 @@ object_types_by_name:
         name_in_index: the_opts
         resolver:
           name: get_record_field_value
-      workspace_id:
-        name_in_index: workspace_id2
-        resolver:
-          name: get_record_field_value
       workspace_name:
         resolver:
           name: get_record_field_value

config/schema/artifacts_with_apollo/schema.graphql

@@ -188,11 +188,6 @@ type AddressEdge {
   """
   cursor: Cursor
 
-  """
-  Specific search highlights for this `Address`, providing matching snippets for the requested fields.
-  """
-  highlights: AddressHighlights
-
   """
   The `Address` of this edge.
   """
@@ -271,16 +266,6 @@ type AddressGroupedBy {
   timestamps: AddressTimestampsGroupedBy
 }
 
-"""
-Type used to request desired `Address` search highlight fields.
-"""
-type AddressHighlights {
-  """
-  Search highlights for the `full_address`, providing snippets of the matching text.
-  """
-  full_address: [String!]!
-}
-
 """
 Enumerates the ways `Address`s can be sorted.
 """
@@ -8239,11 +8224,6 @@ type NamedEntityHighlights {
   """
   widget_workspace_id: [String!]!
 
-  """
-  Search highlights for the `workspace_id`, providing snippets of the matching text.
-  """
-  workspace_id: [String!]!
-
   """
   Search highlights for the `workspace_name`, providing snippets of the matching text.
   """
@@ -18855,11 +18835,6 @@ type WidgetHighlights {
   """
   the_options: WidgetOptionsHighlights
 
-  """
-  Search highlights for the `workspace_id`, providing snippets of the matching text.
-  """
-  workspace_id: [String!]!
-
   """
   Search highlights for the `workspace_name`, providing snippets of the matching text.
   """
@@ -20023,11 +19998,6 @@ type WidgetOrAddressHighlights {
   """
   fees: MoneyHighlights
 
-  """
-  Search highlights for the `full_address`, providing snippets of the matching text.
-  """
-  full_address: [String!]!
-
   """
   Search highlights for the `id`, providing snippets of the matching text.
   """
@@ -20088,11 +20058,6 @@ type WidgetOrAddressHighlights {
   """
   the_options: WidgetOptionsHighlights
 
-  """
-  Search highlights for the `workspace_id`, providing snippets of the matching text.
-  """
-  workspace_id: [String!]!
-
   """
   Search highlights for the `workspace_name`, providing snippets of the matching text.
   """

config/schema/widgets.rb

@@ -88,8 +88,8 @@
     t.field "id", "ID!"
 
     # Here we use an alternate name for this field since it's the routing field and want to verify
-    # that `name_in_index` works correctly on routing fields.
-    t.field "workspace_id", "ID", name_in_index: "workspace_id2"
+    # that `name_in_index` works correctly on routing fields, including when fetched from doc values.
+    t.field "workspace_id", "ID", name_in_index: "workspace_id2", retrieved_from: :doc_values
 
     # It's a bit funny we have both `amount_cents` and `cost` but it's nice to be able to test
     # aggregations on both a root numeric field and on a nested one, so we are keeping both here.
@@ -448,7 +448,7 @@
     # We use `indexing_only: true` here to verify that `id` can be an indexing-only field.
     t.field "id", "ID!", indexing_only: true
 
-    t.field "full_address", "String!"
+    t.field "full_address", "String!", retrieved_from: :doc_values
     t.field "timestamps", "AddressTimestamps"
     t.field "geo_location", "GeoLocation"