Skip to content
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

Add JDK-21 to GA worklflows #2481

Merged
merged 1 commit into from
Feb 6, 2024
Merged

Add JDK-21 to GA worklflows #2481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 .github/workflows/integ-tests-with-security.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
strategy:
fail-fast: false
matrix:
java: [ 11, 17 ]
java: [ 11, 17, 21 ]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@reta are we going to start supporting 21 in next 2.x version? Lets suppose if 3.0 release is near by can we skip supporting 2.x? How do we make these decisions?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@reta are we going to start supporting 21 in next 2.x version? Lets suppose if 3.0 release is near by can we skip supporting 2.x? How do we make these decisions?

@vamsi-amazon 2.12.0 is going to be bundled with JDK-21, see please opensearch-project/OpenSearch#10334, opensearch-project/OpenSearch#11003. The context for it - JDK-21 is the next LTS and there is new vector APIs that Apache Lucene and OpenSearch benefit from, including plugins. Thank you.

Copy link
Contributor Author

@reta reta Jan 25, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lets suppose if 3.0 release is near by can we skip supporting 2.x?

I think when 3.0 is out, than 2.x would go to a maintenance mode, as 1.3.x is these days (but fairly speaking, we are just kicking off the discussions to understand when 3.0 could be out). Thank you.


runs-on: ubuntu-latest
container:
Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:
fail-fast: false
matrix:
os: [ windows-latest, macos-latest ]
java: [ 11, 17 ]
java: [ 11, 17, 21 ]

runs-on: ${{ matrix.os }}

Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/sql-test-and-build-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ jobs:
java:
- 11
- 17
- 21
runs-on: ubuntu-latest
container:
# using the same image which is used by opensearch-build team to build the OpenSearch Distribution
Expand Down Expand Up @@ -108,6 +109,8 @@ jobs:
- { os: macos-latest, java: 11}
- { os: windows-latest, java: 17, os_build_args: -x doctest -PbuildPlatform=windows }
- { os: macos-latest, java: 17 }
- { os: windows-latest, java: 21, os_build_args: -x doctest -PbuildPlatform=windows }
- { os: macos-latest, java: 21 }
runs-on: ${{ matrix.entry.os }}

steps:
Expand Down
20 changes: 10 additions & 10 deletions docs/user/dql/functions.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4082,7 +4082,7 @@ Available parameters include:

Example with only ``fields`` and ``query`` expressions, and all other parameters are set default values::

os> select * from books where multi_match(['title'], 'Pooh House');
os> select id, title, author from books where multi_match(['title'], 'Pooh House');
fetched rows / total rows = 2/2
+------+--------------------------+----------------------+
| id | title | author |
Expand All @@ -4093,7 +4093,7 @@ Example with only ``fields`` and ``query`` expressions, and all other parameters

Another example to show how to set custom values for the optional parameters::

os> select * from books where multi_match(['title'], 'Pooh House', operator='AND', analyzer=default);
os> select id, title, author from books where multi_match(['title'], 'Pooh House', operator='AND', analyzer=default);
fetched rows / total rows = 1/1
+------+--------------------------+----------------------+
| id | title | author |
Expand Down Expand Up @@ -4152,7 +4152,7 @@ Available parameters include:

Example with only ``fields`` and ``query`` expressions, and all other parameters are set default values::

os> select * from books where simple_query_string(['title'], 'Pooh House');
os> select id, title, author from books where simple_query_string(['title'], 'Pooh House');
fetched rows / total rows = 2/2
+------+--------------------------+----------------------+
| id | title | author |
Expand All @@ -4163,7 +4163,7 @@ Example with only ``fields`` and ``query`` expressions, and all other parameters

Another example to show how to set custom values for the optional parameters::

os> select * from books where simple_query_string(['title'], 'Pooh House', flags='ALL', default_operator='AND');
os> select id, title, author from books where simple_query_string(['title'], 'Pooh House', flags='ALL', default_operator='AND');
fetched rows / total rows = 1/1
+------+--------------------------+----------------------+
| id | title | author |
Expand Down Expand Up @@ -4214,7 +4214,7 @@ Available parameters include:

Example with only ``fields`` and ``query`` expressions, and all other parameters are set default values::

os> select * from books where query_string(['title'], 'Pooh House');
os> select id, title, author from books where query_string(['title'], 'Pooh House');
fetched rows / total rows = 2/2
+------+--------------------------+----------------------+
| id | title | author |
Expand All @@ -4225,7 +4225,7 @@ Example with only ``fields`` and ``query`` expressions, and all other parameters

Another example to show how to set custom values for the optional parameters::

os> select * from books where query_string(['title'], 'Pooh House', default_operator='AND');
os> select id, title, author from books where query_string(['title'], 'Pooh House', default_operator='AND');
fetched rows / total rows = 1/1
+------+--------------------------+----------------------+
| id | title | author |
Expand Down Expand Up @@ -4276,7 +4276,7 @@ Available parameters include:

Example with only ``query_expressions``, and all other parameters are set default values::

os> select * from books where query('title:Pooh House');
os> select id, title, author from books where query('title:Pooh House');
fetched rows / total rows = 2/2
+------+--------------------------+----------------------+
| id | title | author |
Expand All @@ -4287,7 +4287,7 @@ Example with only ``query_expressions``, and all other parameters are set defaul

Another example to show how to set custom values for the optional parameters::

os> select * from books where query('title:Pooh House', default_operator='AND');
os> select id, title, author from books where query('title:Pooh House', default_operator='AND');
fetched rows / total rows = 1/1
+------+--------------------------+----------------------+
| id | title | author |
Expand Down Expand Up @@ -4321,15 +4321,15 @@ The `score_query` and `scorequery` functions are alternative names for the `scor

Example boosting score::

os> select *, _score from books where score(query('title:Pooh House', default_operator='AND'), 2.0);
os> select id, title, author, _score from books where score(query('title:Pooh House', default_operator='AND'), 2.0);
fetched rows / total rows = 1/1
+------+--------------------------+----------------------+-----------+
| id | title | author | _score |
|------+--------------------------+----------------------+-----------|
| 1 | The House at Pooh Corner | Alan Alexander Milne | 1.5884793 |
+------+--------------------------+----------------------+-----------+

os> select *, _score from books where score(query('title:Pooh House', default_operator='AND'), 5.0) OR score(query('title:Winnie', default_operator='AND'), 1.5);
os> select id, title, author, _score from books where score(query('title:Pooh House', default_operator='AND'), 5.0) OR score(query('title:Winnie', default_operator='AND'), 1.5);
fetched rows / total rows = 2/2
+------+--------------------------+----------------------+-----------+
| id | title | author | _score |
Expand Down
12 changes: 6 additions & 6 deletions docs/user/ppl/functions/relevance.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ Available parameters include:

Example with only ``fields`` and ``query`` expressions, and all other parameters are set default values::

os> source=books | where multi_match(['title'], 'Pooh House');
os> source=books | where multi_match(['title'], 'Pooh House') | fields id, title, author;
fetched rows / total rows = 2/2
+------+--------------------------+----------------------+
| id | title | author |
Expand All @@ -184,7 +184,7 @@ Example with only ``fields`` and ``query`` expressions, and all other parameters

Another example to show how to set custom values for the optional parameters::

os> source=books | where multi_match(['title'], 'Pooh House', operator='AND', analyzer=default);
os> source=books | where multi_match(['title'], 'Pooh House', operator='AND', analyzer=default) | fields id, title, author;
fetched rows / total rows = 1/1
+------+--------------------------+----------------------+
| id | title | author |
Expand Down Expand Up @@ -226,7 +226,7 @@ Available parameters include:

Example with only ``fields`` and ``query`` expressions, and all other parameters are set default values::

os> source=books | where simple_query_string(['title'], 'Pooh House');
os> source=books | where simple_query_string(['title'], 'Pooh House') | fields id, title, author;
fetched rows / total rows = 2/2
+------+--------------------------+----------------------+
| id | title | author |
Expand All @@ -237,7 +237,7 @@ Example with only ``fields`` and ``query`` expressions, and all other parameters

Another example to show how to set custom values for the optional parameters::

os> source=books | where simple_query_string(['title'], 'Pooh House', flags='ALL', default_operator='AND');
os> source=books | where simple_query_string(['title'], 'Pooh House', flags='ALL', default_operator='AND') | fields id, title, author;
fetched rows / total rows = 1/1
+------+--------------------------+----------------------+
| id | title | author |
Expand Down Expand Up @@ -333,7 +333,7 @@ Available parameters include:

Example with only ``fields`` and ``query`` expressions, and all other parameters are set default values::

os> source=books | where query_string(['title'], 'Pooh House');
os> source=books | where query_string(['title'], 'Pooh House') | fields id, title, author;
fetched rows / total rows = 2/2
+------+--------------------------+----------------------+
| id | title | author |
Expand All @@ -344,7 +344,7 @@ Example with only ``fields`` and ``query`` expressions, and all other parameters

Another example to show how to set custom values for the optional parameters::

os> source=books | where query_string(['title'], 'Pooh House', default_operator='AND');
os> source=books | where query_string(['title'], 'Pooh House', default_operator='AND') | fields id, title, author;
fetched rows / total rows = 1/1
+------+--------------------------+----------------------+
| id | title | author |
Expand Down
Loading