Skip to content

Merge fixes from patch branch back into main#139721

Merged
jordan-powers merged 6 commits intoelastic:mainfrom
jordan-powers:bring-serverless-fixes-into-main
Dec 18, 2025
Merged

Merge fixes from patch branch back into main#139721
jordan-powers merged 6 commits intoelastic:mainfrom
jordan-powers:bring-serverless-fixes-into-main

Conversation

@jordan-powers
Copy link
Copy Markdown
Contributor

Bring the fixes from #139532, #139636, and #139670 back into main.
We need to remember to do this before the next serverless release!

romseygeek and others added 6 commits December 15, 2025 23:45
…tic#139532)

We can't detect whether or not we are in serverless during default
value setup because we don't have node settings at this point.  This
removes all serverless/stateful detection logic from here, as the
various different index structure changes made during development
were never released and we can use some much simpler checks.
* Revert "Remove BWC shim for a broken commit"

This reverts commit 5cc9804.

* Fix indexversion range check on hostname skippers
…39538) (elastic#139700)

Sorts against integer fields in pre-8.19 indexes are rewritten to use 
LongComparators to stay consistent with pre-written index metadata. 
These also need to always expect multi-valued fields.  elastic#139293
incorrectly  built single-valued sorts in certain circumstances, which
would then  throw runtime errors.
@elasticsearchmachine
Copy link
Copy Markdown
Collaborator

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

@romseygeek
Copy link
Copy Markdown
Contributor

I think this also needs to go into the 9.3 branch?

@martijnvg
Copy link
Copy Markdown
Member

I think this also needs to go into the 9.3 branch?

Yes.

@martijnvg martijnvg added v9.3.1 auto-backport Automatically create backport pull requests when merged labels Dec 18, 2025
Copy link
Copy Markdown
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.

LGTM

@jordan-powers jordan-powers merged commit fd2713f into elastic:main Dec 18, 2025
35 checks passed
jordan-powers added a commit to jordan-powers/elasticsearch that referenced this pull request Dec 18, 2025
@elasticsearchmachine
Copy link
Copy Markdown
Collaborator

💚 Backport successful

Status Branch Result
9.3

elasticsearchmachine pushed a commit that referenced this pull request Dec 18, 2025
szybia added a commit to szybia/elasticsearch that referenced this pull request Dec 19, 2025
* upstream/main: (253 commits)
  Adds ST_SIMPLIFY geo spatial function (elastic#136309)
  Take control of max clause count verification in Lucene searcher (elastic#139752)
  [ML] Unmute Inference Test (elastic#139765)
  Parameterize the vector operation benchmark tests (elastic#139735)
  Fix node reduction pushdown tests for release tests (elastic#139548)
  Fix flakiness in TSDataGenerationHelper (elastic#139759)
  CPS: Copy existing resolved index expressions when constructing a new `SearchRequest` from an existing one (elastic#139596)
  Add release notes for v9.1.9 release (elastic#139674)
  Add lucene query for wildcards on high cardinality keyword fields. (elastic#139746)
  Suppress Tika entitlement warnings from AWT (elastic#139711)
  Check field storage when synthetic source is enabled, in tests (elastic#139715)
  Refactor VectorSimilarityType to know about its corresponding Function (elastic#139678)
  Merge fixes from patch branch back into main (elastic#139721)
  Define native bulk operations for vector square distance (elastic#139198)
  Use LongUpDownCounter for Linked Project Error Metrics (elastic#139657)
  ESQL: Add javadoc that explains version-aware planning (elastic#139706)
  Add helper to pick node for reindex relocation (elastic#139081)
  Fix auth serialization randomized version test (elastic#139182)
  ES|QL - Add parsing, preanalysis and analysis timing information to profile (elastic#139540)
  Mute org.elasticsearch.persistent.ClusterPersistentTasksCustomMetadataTests testMinVersionSerialization elastic#139741
  ...
@jordan-powers jordan-powers deleted the bring-serverless-fixes-into-main branch January 15, 2026 16:09
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 >non-issue :StorageEngine/Mapping The storage related side of mappings Team:StorageEngine v9.3.1 v9.4.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants