Skip to content

Split off the values supplier for ScriptDocValues#80635

Merged
jdconrad merged 7 commits intoelastic:masterfrom
jdconrad:sdvsplit
Nov 29, 2021
Merged

Split off the values supplier for ScriptDocValues#80635
jdconrad merged 7 commits intoelastic:masterfrom
jdconrad:sdvsplit

Conversation

@jdconrad
Copy link
Copy Markdown
Contributor

@jdconrad jdconrad commented Nov 10, 2021

This change makes all ScriptDocValues purely a wrapper around a supplier. (Similar to what FieldValues was.) However, there are some important differences:

  1. This is meant to be transitory. As more DocValuesFields are completed, more of the simple suppliers (ones that aren't DocValuesFields) can be removed.
  2. ScriptDocValues is the wrapper rather than the supplier. DocValuesFields are eventually the target suppliers which makes it really easy to remove the simple suppliers once they are no longer necessary.
  3. ScriptDocValues can be easily deprecated and removed without having to move their code to DocValuesFields. Once ScriptDocValues is removed we can remove the supplier code from DocValuesFields.
  4. DelegateDocValuesField ensures that any ScriptDocValues field are not supplied by another DocValuesField with an assert statement. This helps us to identify bugs during testing.
  5. ScriptDocValues no longer have setNextDocId. This helps us identify bugs during compilation.
  6. Conversions will not share/wrap suppliers since the suppliers are transitory.

@jdconrad jdconrad added :Core/Infra/Scripting Scripting abstractions, Painless, and Mustache >refactoring v8.1.0 labels Nov 10, 2021
@elasticmachine elasticmachine added the Team:Core/Infra Meta label for core/infra team label Nov 10, 2021
@elasticmachine
Copy link
Copy Markdown
Collaborator

elasticmachine commented Nov 10, 2021

Pinging @elastic/es-core-infra (Team:Core/Infra)

stu-elastic
stu-elastic approved these changes Nov 29, 2021
View reviewed changes
Copy link
Copy Markdown
Contributor

@stu-elastic stu-elastic left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@jdconrad
Copy link
Copy Markdown
Contributor Author

jdconrad commented Nov 29, 2021

@stu-elastic Thank you for the review! I'm going to merge master into this branch since it's a bit outdated and will commit when CI passes.

@jdconrad jdconrad merged commit 1adb59c into elastic:master Nov 29, 2021
@stu-elastic stu-elastic mentioned this pull request Nov 29, 2021
Closed
weizijun added a commit to weizijun/elasticsearch that referenced this pull request Nov 30, 2021
@weizijun
Merge branch 'upstream/master' into number-support-single-type
91f8003 
* upstream/master: (150 commits)
  Fix ComposableIndexTemplate equals when composed_of is null (elastic#80864)
  Optimize DLS bitset building for matchAll query (elastic#81030)
  URL option for BaseRunAsSuperuserCommand (elastic#81025)
  Less Verbose Serialization of Snapshot Failure in SLM Metadata (elastic#80942)
  Fix shadowed vars pt7 (elastic#80996)
  Fail shards early when we can detect a type missmatch (elastic#79869)
  Delegate Ref Counting to ByteBuf in Netty Transport (elastic#81096)
  Clarify `unassigned.reason` docs (elastic#81017)
  Strip blocks from settings for reindex targets (elastic#80887)
  Split off the values supplier for ScriptDocValues (elastic#80635)
  [ML] Switch message and detail for model snapshot deprecations (elastic#81108)
  [DOCS] Update xrefs for snapshot restore docs (elastic#81023)
  [ML] Updates visiblity of validate API (elastic#81061)
  Track histogram of transport handling times (elastic#80581)
  [ML] Fix datafeed preview with remote indices (elastic#81099)
  [ML] Fix acceptable model snapshot versions in ML deprecation checker (elastic#81060)
  [ML] Add logging for failing PyTorch test (elastic#81044)
  Extending the timeout waiting for snapshot to be ready (elastic#81018)
  [ML] Fix incorrect logging of unexpected model size error (elastic#81089)
  [ML] Make inference timeout test more reliable (elastic#81094)
  ...

# Conflicts:
#	server/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java
weizijun added a commit to weizijun/elasticsearch that referenced this pull request Nov 30, 2021
@weizijun
Merge branch 'upstream/master' into tsdb-required-range-settings
7d3789c 
* upstream/master: (55 commits)
  Fix ComposableIndexTemplate equals when composed_of is null (elastic#80864)
  Optimize DLS bitset building for matchAll query (elastic#81030)
  URL option for BaseRunAsSuperuserCommand (elastic#81025)
  Less Verbose Serialization of Snapshot Failure in SLM Metadata (elastic#80942)
  Fix shadowed vars pt7 (elastic#80996)
  Fail shards early when we can detect a type missmatch (elastic#79869)
  Delegate Ref Counting to ByteBuf in Netty Transport (elastic#81096)
  Clarify `unassigned.reason` docs (elastic#81017)
  Strip blocks from settings for reindex targets (elastic#80887)
  Split off the values supplier for ScriptDocValues (elastic#80635)
  [ML] Switch message and detail for model snapshot deprecations (elastic#81108)
  [DOCS] Update xrefs for snapshot restore docs (elastic#81023)
  [ML] Updates visiblity of validate API (elastic#81061)
  Track histogram of transport handling times (elastic#80581)
  [ML] Fix datafeed preview with remote indices (elastic#81099)
  [ML] Fix acceptable model snapshot versions in ML deprecation checker (elastic#81060)
  [ML] Add logging for failing PyTorch test (elastic#81044)
  Extending the timeout waiting for snapshot to be ready (elastic#81018)
  [ML] Fix incorrect logging of unexpected model size error (elastic#81089)
  [ML] Make inference timeout test more reliable (elastic#81094)
  ...
weizijun added a commit to weizijun/elasticsearch that referenced this pull request Nov 30, 2021
@weizijun
Merge branch 'upstream/master' into update-filter-improve
32ace23 
* upstream/master: (55 commits)
  Fix ComposableIndexTemplate equals when composed_of is null (elastic#80864)
  Optimize DLS bitset building for matchAll query (elastic#81030)
  URL option for BaseRunAsSuperuserCommand (elastic#81025)
  Less Verbose Serialization of Snapshot Failure in SLM Metadata (elastic#80942)
  Fix shadowed vars pt7 (elastic#80996)
  Fail shards early when we can detect a type missmatch (elastic#79869)
  Delegate Ref Counting to ByteBuf in Netty Transport (elastic#81096)
  Clarify `unassigned.reason` docs (elastic#81017)
  Strip blocks from settings for reindex targets (elastic#80887)
  Split off the values supplier for ScriptDocValues (elastic#80635)
  [ML] Switch message and detail for model snapshot deprecations (elastic#81108)
  [DOCS] Update xrefs for snapshot restore docs (elastic#81023)
  [ML] Updates visiblity of validate API (elastic#81061)
  Track histogram of transport handling times (elastic#80581)
  [ML] Fix datafeed preview with remote indices (elastic#81099)
  [ML] Fix acceptable model snapshot versions in ML deprecation checker (elastic#81060)
  [ML] Add logging for failing PyTorch test (elastic#81044)
  Extending the timeout waiting for snapshot to be ready (elastic#81018)
  [ML] Fix incorrect logging of unexpected model size error (elastic#81089)
  [ML] Make inference timeout test more reliable (elastic#81094)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@stu-elastic stu-elastic stu-elastic approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

:Core/Infra/Scripting Scripting abstractions, Painless, and Mustache >refactoring Team:Core/Infra Meta label for core/infra team v8.1.0

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@jdconrad @elasticmachine @stu-elastic