Skip to content

Extract common JDBC configurations into their own fragment #8643

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

Merged
hashhar merged 2 commits into from
Aug 4, 2021
Merged

Extract common JDBC configurations into their own fragment #8643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
41949fa
Include JDBC type mapping fragment in all applicable connectors
hashhar Jul 23, 2021
674dda1
Split general configuration properties to their own fragment
hashhar Jul 23, 2021
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
9 changes: 9 additions & 0 deletions docs/src/main/sphinx/connector/clickhouse.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ appropriate for your setup:
connection-user=exampleuser
connection-password=examplepassword

.. include:: jdbc-common-configurations.fragment

Multiple ClickHouse servers
^^^^^^^^^^^^^^^^^^^^^^^^^^^

Expand Down Expand Up @@ -115,6 +117,13 @@ Property Name Default Value Description
Currently the connector only supports ``Log`` and ``MergeTree`` table engines
in create table statement. ``ReplicatedMergeTree`` engine is not yet supported.
Copy link
Copy Markdown
Contributor

@m57lyra m57lyra Aug 2, 2021

Choose a reason for hiding this comment

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

CREATE TABLE

Copy link
Copy Markdown
Member Author

@hashhar hashhar Aug 2, 2021

Choose a reason for hiding this comment

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

Pre-existing. Noted down, will fix in a later change. I'd like to keep this PR isolated to just mechanical splitting of things without changing unrelated things.


.. _clickhouse-type-mapping:

Type mapping
------------

.. include:: jdbc-type-mapping.fragment

Pushdown
--------

Expand Down
9 changes: 9 additions & 0 deletions docs/src/main/sphinx/connector/druid.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,15 @@ secured by basic authentication by updating the URL and adding credentials:
Now you can access your Druid database in Trino with the ``druiddb`` catalog
name from the properties file.

.. include:: jdbc-common-configurations.fragment

.. _druid-type-mapping:

Type mapping
------------

.. include:: jdbc-type-mapping.fragment

.. _druid-sql-support:

SQL support
Expand Down
27 changes: 27 additions & 0 deletions docs/src/main/sphinx/connector/jdbc-common-configurations.fragment
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
General configuration properties
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

Comment thread
hashhar marked this conversation as resolved.
Outdated
The following table describes general configuration properties for the
connector:

.. list-table::
:widths: 30, 40, 30
:header-rows: 1

* - Property name
- Description
- Default value
* - ``case-insensitive-name-matching``
- Support case insensitive database and collection names
Comment thread
hashhar marked this conversation as resolved.
Outdated
- False
* - ``case-insensitive-name-matching.cache-ttl``
-
- 1 minute
* - ``metadata.cache-ttl``
- Duration for which metadata, including table and column statistics, is
cached
Comment thread
hashhar marked this conversation as resolved.
Outdated
- 0 (disabled caching)
* - ``metadata.cache-missing``
- Cache the fact that metadata, including table and column statistics, is
not available
Comment thread
hashhar marked this conversation as resolved.
Outdated
- False
14 changes: 0 additions & 14 deletions docs/src/main/sphinx/connector/jdbc-type-mapping.fragment
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,3 @@ cached in Trino.
- Allow forced mapping of comma separated lists of data types to convert to
unbounded ``VARCHAR``
-
* - ``case-insensitive-name-matching``
- Support case insensitive database and collection names
- False
* - ``case-insensitive-name-matching.cache-ttl``
-
- 1 minute
* - ``metadata.cache-ttl``
- Duration for which metadata, including table and column statistics, is
cached
- 0 (disabled caching)
* - ``metadata.cache-missing``
- Cache the fact that metadata, including table and column statistics, is
not available
- False
2 changes: 2 additions & 0 deletions docs/src/main/sphinx/connector/memsql.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ connection properties as appropriate for your setup:
connection-user=root
connection-password=secret

.. include:: jdbc-common-configurations.fragment

Multiple SingleStore servers
^^^^^^^^^^^^^^^^^^^^^^^^^^^^

Expand Down
2 changes: 2 additions & 0 deletions docs/src/main/sphinx/connector/mysql.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ determine the user credentials for the connection, often a service user. You can
use :doc:`secrets </security/secrets>` to avoid actual values in the catalog
properties files.

.. include:: jdbc-common-configurations.fragment

Multiple MySQL servers
^^^^^^^^^^^^^^^^^^^^^^

Expand Down
2 changes: 2 additions & 0 deletions docs/src/main/sphinx/connector/oracle.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ To disable connection pooling, update properties to include the following:

oracle.connection-pool.enabled=false

.. include:: jdbc-common-configurations.fragment

Multiple Oracle servers
^^^^^^^^^^^^^^^^^^^^^^^

Expand Down
16 changes: 9 additions & 7 deletions docs/src/main/sphinx/connector/phoenix.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,7 @@ For HBase 2.x and Phoenix 5.x (5.1.0 or later) use:

connector.name=phoenix5

Configuration properties
------------------------

The following configuration properties are available:
The following Phoenix-specific configuration properties are available:

Copy link
Copy Markdown
Contributor

@rosewms rosewms Aug 2, 2021

Choose a reason for hiding this comment

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

I'd rephrase to remove "are available" it sounds awkward. I'd recommend something like:

Review the available Phoenix-specific configuration properties:

================================================== ========== ===================================================================================
Property Name Required Description
Expand All @@ -61,6 +58,8 @@ Property Name Required Description
connection properties. These files must exist on the machines running Trino.
================================================== ========== ===================================================================================

.. include:: jdbc-common-configurations.fragment
Comment thread
hashhar marked this conversation as resolved.
Outdated

Querying Phoenix tables
-------------------------

Expand All @@ -87,8 +86,10 @@ Finally, you can access the ``clicks`` table in the ``web`` schema::
If you used a different name for your catalog properties file, use
that catalog name instead of ``phoenix`` in the above examples.

Data types
----------
.. _phoenix-type-mapping:

Type mapping
------------

The data type mappings are as follows:

Expand Down Expand Up @@ -116,6 +117,7 @@ variable length ``VARBINARY`` data type. There is no way to create a
Phoenix table in Trino that uses the ``BINARY`` data type, as Trino
does not have an equivalent type.

.. include:: jdbc-type-mapping.fragment

Table properties - Phoenix
--------------------------
Expand Down Expand Up @@ -182,4 +184,4 @@ Property Name Default Value Description
SQL support
-----------

.. include:: sql-delete-limitation.fragment
.. include:: sql-delete-limitation.fragment
2 changes: 2 additions & 0 deletions docs/src/main/sphinx/connector/postgresql.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ determine the user credentials for the connection, often a service user. You can
use :doc:`secrets </security/secrets>` to avoid actual values in the catalog
properties files.

.. include:: jdbc-common-configurations.fragment

Multiple PostgreSQL databases or servers
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

Expand Down
2 changes: 2 additions & 0 deletions docs/src/main/sphinx/connector/redshift.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ connection properties as appropriate for your setup:
connection-user=root
connection-password=secret

.. include:: jdbc-common-configurations.fragment

Multiple Redshift databases or clusters
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

Expand Down
4 changes: 4 additions & 0 deletions docs/src/main/sphinx/connector/sqlserver.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ determine the user credentials for the connection, often a service user. You can
use :doc:`secrets </security/secrets>` to avoid actual values in the catalog
properties files.

.. include:: jdbc-common-configurations.fragment

Multiple SQL Server databases or servers
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

Expand Down Expand Up @@ -112,6 +114,8 @@ SQL Server Type Trino Type
Complete list of `SQL Server data types
<https://msdn.microsoft.com/en-us/library/ms187752.aspx>`_.

.. include:: jdbc-type-mapping.fragment

.. _sqlserver-sql-support:

SQL support
Expand Down