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.

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

SQL: swap JDBC page.timeout and query.timeout properties in query requests #79491

Merged
merged 3 commits into from
Oct 27, 2021

Conversation

Luegg
Copy link
Contributor

@Luegg Luegg commented Oct 19, 2021

resolves #79430

This PR makes sure that the configuration parameters are passed correctly into the query request.

@Luegg Luegg marked this pull request as ready for review October 20, 2021 15:31
@elasticmachine elasticmachine added the Team:QL (Deprecated) Meta label for query languages team label Oct 20, 2021
@elasticmachine
Copy link
Collaborator

Pinging @elastic/es-ql (Team:QL)

Copy link
Member

@costin costin left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

@astefan astefan left a comment

Choose a reason for hiding this comment

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

LGTM

@@ -23,8 +23,8 @@ RequestMeta queryTimeout(long timeout) {
return this;
}

RequestMeta timeout(long timeout) {
this.timeoutInMs = timeout;
RequestMeta pageTimeout(long timeout) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this method used anywhere?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

it's not, I thought I could keep it for consistency though.

Copy link
Contributor

@bpintea bpintea left a comment

Choose a reason for hiding this comment

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

LGTM

@Luegg Luegg added the auto-backport-and-merge Automatically create backport pull requests and merge when ready label Oct 27, 2021
@Luegg Luegg merged commit 76ab406 into elastic:master Oct 27, 2021
@Luegg Luegg deleted the fix/jdbcTimeouts branch October 27, 2021 12:35
Luegg pushed a commit to Luegg/elasticsearch that referenced this pull request Oct 27, 2021
…uests (elastic#79491)

* SQL: swap JDBC page.timeout and query.timeout properties in query requests

resolves elastic#79430

* rm reference to elastic#79480 from spec
@elasticsearchmachine
Copy link
Collaborator

💔 Backport failed

Status Branch Result
8.0 The branch "8.0" is invalid or doesn't exist
7.16

You can use sqren/backport to manually backport by running backport --upstream elastic/elasticsearch --pr 79491

Luegg pushed a commit to Luegg/elasticsearch that referenced this pull request Dec 17, 2021
…uests (elastic#79491)

* SQL: swap JDBC page.timeout and query.timeout properties in query requests

resolves elastic#79430

* rm reference to elastic#79480 from spec
# Conflicts:
#	x-pack/plugin/sql/jdbc/src/main/java/org/elasticsearch/xpack/sql/jdbc/JdbcHttpClient.java
#	x-pack/plugin/sql/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/JdbcConfigurationDataSourceTests.java
elasticsearchmachine pushed a commit that referenced this pull request Dec 20, 2021
…ery requests (#79491) (#81878)

* SQL: swap JDBC page.timeout and query.timeout properties in query requests (#79491)

* SQL: swap JDBC page.timeout and query.timeout properties in query requests

resolves #79430

* rm reference to #79480 from spec
# Conflicts:
#	x-pack/plugin/sql/jdbc/src/main/java/org/elasticsearch/xpack/sql/jdbc/JdbcHttpClient.java
#	x-pack/plugin/sql/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/JdbcConfigurationDataSourceTests.java

* fix backport

* fix formatting
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
:Analytics/SQL SQL querying auto-backport-and-merge Automatically create backport pull requests and merge when ready >bug Team:QL (Deprecated) Meta label for query languages team v7.16.0 v8.0.0-beta1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

SQL: JDBC driver swaps page.timeout and query.timeout properties
7 participants