From 6dc5713218aa08977177e5c62e4746734dc38c1a Mon Sep 17 00:00:00 2001 From: Luegg Date: Thu, 21 Oct 2021 15:05:57 +0200 Subject: [PATCH 1/2] SQL: Adjust JDBC docs to use milliseconds for timeouts Resolves #79480 --- docs/reference/sql/endpoints/jdbc.asciidoc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/reference/sql/endpoints/jdbc.asciidoc b/docs/reference/sql/endpoints/jdbc.asciidoc index 7b0e74cd4951a..ca49599bc1815 100644 --- a/docs/reference/sql/endpoints/jdbc.asciidoc +++ b/docs/reference/sql/endpoints/jdbc.asciidoc @@ -88,20 +88,20 @@ Timezone used by the driver _per connection_ indicated by its `ID`. [discrete] ===== Network -`connect.timeout` (default 30s):: -Connection timeout (in seconds). That is the maximum amount of time waiting to make a connection to the server. +`connect.timeout` (default 30000ms):: +Connection timeout (in milliseconds). That is the maximum amount of time waiting to make a connection to the server. -`network.timeout` (default 60s):: -Network timeout (in seconds). That is the maximum amount of time waiting for the network. +`network.timeout` (default 60000ms):: +Network timeout (in milliseconds). That is the maximum amount of time waiting for the network. -`page.timeout` (default 45s):: -Page timeout (in seconds). That is the maximum amount of time waiting for a page. +`page.timeout` (default 45000ms):: +Page timeout (in milliseconds). That is the maximum amount of time waiting for a page. `page.size` (default 1000):: Page size (in entries). The number of results returned per page by the server. -`query.timeout` (default 90s):: -Query timeout (in seconds). That is the maximum amount of time waiting for a query to return. +`query.timeout` (default 90000ms):: +Query timeout (in milliseconds). That is the maximum amount of time waiting for a query to return. [[jdbc-cfg-auth]] [discrete] From 6787a060958d78a6f85ddf5c52901913c7239ffa Mon Sep 17 00:00:00 2001 From: Luegg Date: Tue, 26 Oct 2021 09:38:05 +0200 Subject: [PATCH 2/2] remove time unit from default values --- docs/reference/sql/endpoints/jdbc.asciidoc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/reference/sql/endpoints/jdbc.asciidoc b/docs/reference/sql/endpoints/jdbc.asciidoc index ca49599bc1815..ca9f45f0a77c2 100644 --- a/docs/reference/sql/endpoints/jdbc.asciidoc +++ b/docs/reference/sql/endpoints/jdbc.asciidoc @@ -88,19 +88,19 @@ Timezone used by the driver _per connection_ indicated by its `ID`. [discrete] ===== Network -`connect.timeout` (default 30000ms):: +`connect.timeout` (default `30000`):: Connection timeout (in milliseconds). That is the maximum amount of time waiting to make a connection to the server. -`network.timeout` (default 60000ms):: +`network.timeout` (default `60000`):: Network timeout (in milliseconds). That is the maximum amount of time waiting for the network. -`page.timeout` (default 45000ms):: +`page.timeout` (default `45000`):: Page timeout (in milliseconds). That is the maximum amount of time waiting for a page. -`page.size` (default 1000):: +`page.size` (default `1000`):: Page size (in entries). The number of results returned per page by the server. -`query.timeout` (default 90000ms):: +`query.timeout` (default `90000`):: Query timeout (in milliseconds). That is the maximum amount of time waiting for a query to return. [[jdbc-cfg-auth]] @@ -115,7 +115,7 @@ Query timeout (in milliseconds). That is the maximum amount of time waiting for [discrete] ==== SSL -`ssl` (default false):: Enable SSL +`ssl` (default `false`):: Enable SSL `ssl.keystore.location`:: key store (if used) location @@ -150,7 +150,7 @@ will be - typically the first in natural ascending order) for fields with multip [discrete] ==== Additional -`validate.properties` (default true):: If disabled, it will ignore any misspellings or unrecognizable properties. When enabled, an exception +`validate.properties` (default `true`):: If disabled, it will ignore any misspellings or unrecognizable properties. When enabled, an exception will be thrown if the provided property cannot be recognized.