Merged
Conversation
Collaborator
|
Pinging @elastic/es-core-infra (Team:Core/Infra) |
Contributor
Author
|
@mosche - Is this something like what you had in mind? |
mosche
requested changes
Jul 22, 2025
Contributor
mosche
left a comment
There was a problem hiding this comment.
Thanks @prdoyle, functionally this looks correct except for the missing assert in isCompressed . Looks like this even fixes some inconsistencies where uncompress might have thrown NotXContentException rather than NotCompressedException.
Though, I think we should try to not expose checkXContentType, adding a new deprecated method smells a bit. Can we keep that internal?
server/src/main/java/org/elasticsearch/common/compress/CompressorFactory.java
Outdated
Show resolved
Hide resolved
server/src/main/java/org/elasticsearch/common/compress/CompressorFactory.java
Outdated
Show resolved
Hide resolved
server/src/main/java/org/elasticsearch/common/compress/CompressorFactory.java
Outdated
Show resolved
Hide resolved
Contributor
Author
|
Ok @mosche I've force-pushed a less ambitious change, with three commits:
|
prdoyle
commented
Jul 23, 2025
| throws IOException { | ||
| Objects.requireNonNull(xContentType); | ||
| Compressor compressor = CompressorFactory.compressorForUnknownXContentType(bytes); | ||
| Compressor compressor = CompressorFactory.compressor(bytes); |
Contributor
Author
There was a problem hiding this comment.
In this case, the one call site I didn't change is the bug fix!
Collaborator
💚 Backport successful
|
prdoyle
added a commit
to prdoyle/elasticsearch
that referenced
this pull request
Jul 24, 2025
* Refactor: split out non-detecting compressor method * Unit test * Fix createParser not to detect XContentType
elasticsearchmachine
pushed a commit
that referenced
this pull request
Jul 24, 2025
szybia
added a commit
to szybia/elasticsearch
that referenced
this pull request
Jul 25, 2025
…king * upstream/main: (90 commits) Register a blob cache long counter metric for total evicted regions (elastic#131862) Move plan attribute resolution to its own component (elastic#131830) Make restore support multi-project (elastic#131661) Use logically more correct expression (elastic#131869) [ES|QL] Change equals and hashcode for ConstantNullBlock (elastic#131817) Update `TransportVersion` to support a new model (elastic#131488) Correct slow log user for RCS 2.0 (elastic#130140) Revert "Remove 8.17 from dev branches" Mute org.elasticsearch.compute.aggregation.ValuesBytesRefGroupingAggregatorFunctionTests testSomeFiltered elastic#131878 Remove 8.17 from dev branches Revert "CompressorFactory.compressor (elastic#131655)" (elastic#131866) Add fast path for single value in VALUES aggregator (elastic#130510) Resolve inference release tests failing due to missing feature flag (elastic#131841) [Docs] Replace placeholder URLs (elastic#131309) CompressorFactory.compressor (elastic#131655) add availability info for speed loading setting (elastic#131714) [Logstash] Move `elastic_integration` plugin usage to ES logstash-bridge. (elastic#131486) Migrate x-pack-enrich legacy rest tests to new test framework (elastic#131743) Fix plugin example test failures due to deprecation warning (elastic#131819) Remove deprecated function isNotNullAndFoldable (elastic#130944) ...
prdoyle
added a commit
that referenced
this pull request
Aug 5, 2025
Contributor
Author
|
For the record... The backport didn't fail; I canceled it when I realized I needed to revert this in |
prdoyle
added a commit
to prdoyle/elasticsearch
that referenced
this pull request
Aug 5, 2025
This reinstates elastic#131655.
elasticsearchmachine
pushed a commit
that referenced
this pull request
Aug 5, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
CompressorFactory.compressorwas over-eager in detecting XContent type even when the type was already known.CompressorFactory.compressmethodFixes #131605.