Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use FallbackSyntheticSourceBlockLoader for shape and geo_shape #124927

Merged
merged 7 commits into from
Mar 18, 2025

Conversation

lkts
Copy link
Contributor

@lkts lkts commented Mar 14, 2025

This PR adds a generic implementation of FallbackSyntheticSourceBlockLoader for all spatial fields and uses them for shape and geo_shape. Points are not included to limit the size of the change.

This PR also integrates new shape fields into the LogsDB challenge tests as a proof of concept of defining new field types outside of the main data generation code base. It required a rework of some parts of data generation and testing infra.

@lkts lkts added >enhancement auto-backport Automatically create backport pull requests when merged :StorageEngine/Mapping The storage related side of mappings v8.19.0 labels Mar 14, 2025
@lkts lkts requested review from martijnvg and dnhatn March 14, 2025 21:45
@elasticsearchmachine
Copy link
Collaborator

Pinging @elastic/es-storage-engine (Team:StorageEngine)

@elasticsearchmachine
Copy link
Collaborator

Hi @lkts, I've created a changelog YAML for you.

lkts and others added 3 commits March 14, 2025 14:46

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
fix
Copy link
Member

@martijnvg martijnvg left a comment

Choose a reason for hiding this comment

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

Thanks Sasha 👍 - good to see geoshape being added to test data generation.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
Copy link
Member

@dnhatn dnhatn left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks Sasha!

@lkts lkts merged commit 033d28e into elastic:main Mar 18, 2025
17 checks passed
@lkts lkts deleted the synthetic_source_block_loader_geo2 branch March 18, 2025 15:49
@elasticsearchmachine
Copy link
Collaborator

💔 Backport failed

Status Branch Result
8.x Commit could not be cherrypicked due to conflicts

You can use sqren/backport to manually backport by running backport --upstream elastic/elasticsearch --pr 124927

@lkts
Copy link
Contributor Author

lkts commented Mar 18, 2025

#122891 is not backported, that's why the backport fails

@lkts
Copy link
Contributor Author

lkts commented Mar 18, 2025

I am going to backport only test changes from #122891 here since it was not intended to be backported

@lkts
Copy link
Contributor Author

lkts commented Mar 18, 2025

💚 All backports created successfully

Status Branch Result
8.x

Questions ?

Please refer to the Backport tool documentation

lkts added a commit that referenced this pull request Mar 19, 2025

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
…124927) (#125164)

* Use FallbackSyntheticSourceBlockLoader for shape and geo_shape (#124927)

(cherry picked from commit 033d28e)

# Conflicts:
#	server/src/test/java/org/elasticsearch/index/mapper/blockloader/BooleanFieldBlockLoaderTests.java
#	server/src/test/java/org/elasticsearch/index/mapper/blockloader/DateFieldBlockLoaderTests.java
#	server/src/test/java/org/elasticsearch/index/mapper/blockloader/KeywordFieldBlockLoaderTests.java
#	test/framework/src/main/java/org/elasticsearch/index/mapper/BlockLoaderTestCase.java
#	test/framework/src/main/java/org/elasticsearch/index/mapper/NumberFieldBlockLoaderTestCase.java

* fix merge

* fix

* fix more

* fix more

* properly sync BlockLoaderTestCase

* iter

* iter

* [CI] Auto commit changes from spotless

* f

* f

---------

Co-authored-by: elasticsearchmachine <infra-root+elasticsearchmachine@elastic.co>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
auto-backport Automatically create backport pull requests when merged backport pending >enhancement :StorageEngine/Mapping The storage related side of mappings Team:StorageEngine v8.19.0 v9.1.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants