Remove LegacyESVersion.V_6_3_x constants #1691
Conversation
nknize
added
v2.0.0
|
Can one of the admins verify this patch? |
|
❌ Gradle Check failure 55dc879c063d8fef7410ea101587c3aaa72bbf95 |
There's a logger issue. Going to revert that change for now and address separately. |
nknize
force-pushed
the
remove/6.3Constant
branch
from
55dc879 to
a7154ae
Compare
|
✅ Gradle Check success a7154aebe49b5ac20578bda08233c9cef70a6f7a |
|
@adnapibar To ensure this isn't a random success I'm going to keep splitting this into a few separate removal PRs until this is isolated to just the transport layer. |
nknize
force-pushed
the
remove/6.3Constant
branch
from
a7154ae to
db91366
Compare
|
❌ Gradle Check failure db91366f761e29524c4822a63b54f68e936b1717 |
| @@ -243,8 +243,6 @@ public ShardSearchRequest(StreamInput in) throws IOException { | |||
| clusterAlias = in.readOptionalString(); | |||
| if (in.getVersion().onOrAfter(LegacyESVersion.V_7_0_0)) { | |||
| allowPartialSearchResults = in.readBoolean(); | |||
| } else if (in.getVersion().onOrAfter(LegacyESVersion.V_6_3_0)) { | |||
There was a problem hiding this comment.
@nknize I think we have an issue here, the in.readOptionalBoolean(); should be followed for the version prior to LegacyESVersion.V_7_0_0, it looks like we have to use V_6_4_0 instead of removing the condition altogether:
} else if (in.getVersion().onOrAfter(LegacyESVersion.V_6_4_0)) {
allowPartialSearchResults = in.readOptionalBoolean();
}
WDYT?
There was a problem hiding this comment.
That logic path won't ever be executed.
minIndexCompatVersion for OpenSearch 2.0.0 is ES 7.0.0 and minCompatVersion is ES 7.10.0 so a Mixed cluster of OpenSearch 2.0.0 and ES 6.x nodes or indexes is not possible. The first if condition in this version will always be true.
This PR is the next in a line of incremental "remove all 6.x logic" PRs.
This commit removes LegacyESVersion.V_6_3_x constants including all pre-release versions and bug fixes. Signed-off-by: Nicholas Walter Knize <nknize@apache.org>
nknize
force-pushed
the
remove/6.3Constant
branch
from
db91366 to
036520c
Compare
This PR removes
LegacyESVersion.V_6_3_xconstants including allpre-release versions and bug fixes.
closes #1688