Skip to content

Reenable bwc tests for #76475 #76576

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
merged 2 commits into from
Aug 16, 2021
Merged

Reenable bwc tests for #76475 #76576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1796979
Reenable bwc tests for #76475
imotov Aug 16, 2021
b8c868c
Merge branch 'master' into nullable-doc-count-error-bwc-on
elasticmachine Aug 16, 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
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,9 @@ tasks.register("verifyVersions") {
* after the backport of the backcompat code is complete.
*/

boolean bwc_tests_enabled = false
boolean bwc_tests_enabled = true
// place a PR link here when committing bwc changes:
String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/pull/76475"
String bwc_tests_disabled_issue = ""
/*
* FIPS 140-2 behavior was fixed in 7.11.0. Before that there is no way to run elasticsearch in a
* JVM that is properly configured to be in fips mode with BCFIPS. For now we need to disable
Expand Down
4 changes: 2 additions & 2 deletions ...src/main/java/org/elasticsearch/search/aggregations/bucket/terms/InternalMappedTerms.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ protected InternalMappedTerms(String name, BucketOrder reduceOrder, BucketOrder
*/
protected InternalMappedTerms(StreamInput in, Bucket.Reader<B> bucketReader) throws IOException {
super(in);
if (in.getVersion().onOrAfter(Version.V_8_0_0)) { // todo fix after backport
if (in.getVersion().onOrAfter(Version.V_7_15_0)) {
if (in.readBoolean()) {
docCountError = in.readZLong();
} else {
Expand All @@ -70,7 +70,7 @@ protected InternalMappedTerms(StreamInput in, Bucket.Reader<B> bucketReader) thr

@Override
protected final void writeTermTypeInfoTo(StreamOutput out) throws IOException {
if (out.getVersion().onOrAfter(Version.V_8_0_0)) { // todo fix after backport
if (out.getVersion().onOrAfter(Version.V_7_15_0)) {
if (docCountError != null) {
out.writeBoolean(true);
out.writeZLong(docCountError);
Expand Down