[Backport 2.x] Add Support for Hybrid Query Type

[opensearch-trigger-bot]

Backport 821dae6 from #850.

[VachaShah]

@vibrantvarun Can you please take a look at the failures in integration tests?

[vibrantvarun]

Hey @VachaShah I forgot to add a check to run hybrid query integ test >=2.10 OS version. Now what are my options to not make 2.x and main divergent and put the check in main as well as 2.x?

cc: @reta

[reta]

Hey @VachaShah I forgot to add a check to run hybrid query integ test >=2.10 OS version. Now what are my options to not make 2.x and main divergent and put the check in main as well as 2.x?

We do have cases when version of OpenSearch matters [1], fe you may use assumeTrue to filter out the tests which are not relevant:

        assumeTrue(
            "The PIT is supported in OpenSearch 2.4.0 and later",
            Version.fromString(version).onOrAfter(Version.fromString("2.4.0"))
        );

[1]

opensearch-java/java-client/src/test/java11/org/opensearch/client/opensearch/integTest/AbstractCatClientIT.java

Line 246 in 6986852

assumeTrue(

[vibrantvarun]

@reta so shall I add the assume true in the backport PR (2.x) or create a new PR on main?

[reta]

@reta so shall I add the assume true in the backport PR (2.x) or create a new PR on main?

I think main is fine, we could limit the change to 2.x only, @VachaShah does it make sense? thank you

[vibrantvarun]

I have a suggestion,

we can merge the fix on main with a new PR and then manually create a backport PR with 2 commits and merge on 2.x
cc: @VachaShah

[VachaShah]

@reta so shall I add the assume true in the backport PR (2.x) or create a new PR on main?

I think main is fine, we could limit the change to 2.x only, @VachaShah does it make sense? thank you

That makes sense! Thanks @reta!

[VachaShah]

@vibrantvarun Can you resolve the conflicts?