Skip to content

Create a sha-256 hash of the shard request cache key #74877

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.

Sign up for GitHub

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

Merged
romseygeek merged 5 commits into from
Sep 13, 2021
Merged

Create a sha-256 hash of the shard request cache key #74877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
693b77b
Create a sha-256 hash of the cache key
Bubbad Jul 1, 2021
7089aad
Review fix - Dont copy bytes
Bubbad Jul 5, 2021
03ebb3d
Fixed broken tests by calculating the cache key in a way that all Byt…
Bubbad Sep 10, 2021
afccdd1
Merge branch 'master' into cache_hash
elasticmachine Sep 10, 2021
37e3799
Use MessageDigests.digest instead of custom function
Bubbad Sep 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/reference/modules/indices/request_cache.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ query-string parameter detailed here.
[discrete]
==== Cache key

The whole JSON body is used as the cache key. This means that if the JSON
A hash of the whole JSON body is used as the cache key. This means that if the JSON
changes -- for instance if keys are output in a different order -- then the
cache key will not be recognised.

Expand Down
5 changes: 3 additions & 2 deletions server/src/main/java/org/elasticsearch/search/internal/ShardSearchRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,10 @@
import org.elasticsearch.core.CheckedFunction;
import org.elasticsearch.core.Nullable;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.bytes.BytesArray;
import org.elasticsearch.common.bytes.BytesReference;
import org.elasticsearch.common.collect.ImmutableOpenMap;
import org.elasticsearch.common.hash.MessageDigests;
import org.elasticsearch.common.io.stream.BytesStreamOutput;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
Expand Down Expand Up @@ -404,8 +406,7 @@ public BytesReference cacheKey(CheckedBiConsumer<ShardSearchRequest, StreamOutpu
if (differentiator != null) {
differentiator.accept(this, out);
}
// copy it over since we don't want to share the thread-local bytes in #scratch
return out.copyBytes();
return new BytesArray(MessageDigests.digest(out.bytes(), MessageDigests.sha256()));
} finally {
out.reset();
}
Expand Down