From 4cfb837df2f8bba6e23539c99a49e9891edf1339 Mon Sep 17 00:00:00 2001 From: Joe Lodin Date: Mon, 8 Aug 2022 14:31:24 -0400 Subject: [PATCH] Add MERGE to SQL support documentation --- docs/src/main/sphinx/connector/delta-lake.rst | 4 ++-- docs/src/main/sphinx/connector/hive.rst | 6 ++++-- docs/src/main/sphinx/connector/iceberg.rst | 1 + docs/src/main/sphinx/connector/kudu.rst | 1 + docs/src/main/sphinx/language/sql-support.rst | 1 + 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/docs/src/main/sphinx/connector/delta-lake.rst b/docs/src/main/sphinx/connector/delta-lake.rst index 3a0e8deb27a3..6226931431ee 100644 --- a/docs/src/main/sphinx/connector/delta-lake.rst +++ b/docs/src/main/sphinx/connector/delta-lake.rst @@ -498,8 +498,8 @@ The following example uses all three table properties:: Updating data ^^^^^^^^^^^^^ -You can use the connector to :doc:`/sql/insert`, :doc:`/sql/delete` and -:doc:`/sql/update` data in Delta Lake tables. +You can use the connector to :doc:`/sql/insert`, :doc:`/sql/delete`, +:doc:`/sql/update`, and :doc:`/sql/merge` data in Delta Lake tables. Write operations are supported for tables stored on the following systems: diff --git a/docs/src/main/sphinx/connector/hive.rst b/docs/src/main/sphinx/connector/hive.rst index 177d7e5ccf1d..da2869e66f3a 100644 --- a/docs/src/main/sphinx/connector/hive.rst +++ b/docs/src/main/sphinx/connector/hive.rst @@ -800,8 +800,8 @@ Data management ^^^^^^^^^^^^^^^ The :ref:`sql-data-management` functionality includes support for ``INSERT``, -``UPDATE``, and ``DELETE`` statements, with the exact support depending on the -storage system, file format, and metastore: +``UPDATE``, ``DELETE``, and ``MERGE`` statements, with the exact support +depending on the storage system, file format, and metastore: When connecting to a Hive metastore version 3.x, the Hive connector supports reading from and writing to insert-only and ACID tables, with full support for @@ -815,6 +815,8 @@ which the ``WHERE`` clause may match arbitrary sets of rows. :doc:`/sql/update` is only supported for transactional Hive tables with format ORC. ``UPDATE`` of partition or bucket columns is not supported. +:doc:`/sql/merge` is only supported for ACID tables. + ACID tables created with `Hive Streaming Ingest `_ are not supported. diff --git a/docs/src/main/sphinx/connector/iceberg.rst b/docs/src/main/sphinx/connector/iceberg.rst index 7930b2df5b98..b6a7c3855719 100644 --- a/docs/src/main/sphinx/connector/iceberg.rst +++ b/docs/src/main/sphinx/connector/iceberg.rst @@ -215,6 +215,7 @@ supports the following features: * :doc:`/sql/insert` * :doc:`/sql/delete`, see also :ref:`iceberg-delete` * :doc:`/sql/update` +* :doc:`/sql/merge` * :ref:`sql-schema-table-management`, see also :ref:`iceberg-tables` * :ref:`sql-materialized-view-management`, see also :ref:`iceberg-materialized-views` diff --git a/docs/src/main/sphinx/connector/kudu.rst b/docs/src/main/sphinx/connector/kudu.rst index 334735657a4f..506afd52f355 100644 --- a/docs/src/main/sphinx/connector/kudu.rst +++ b/docs/src/main/sphinx/connector/kudu.rst @@ -268,6 +268,7 @@ statements, the connector supports the following features: * :doc:`/sql/insert`, see also :ref:`kudu-insert` * :doc:`/sql/delete` +* :doc:`/sql/merge` * :doc:`/sql/create-table`, see also :ref:`kudu-create-table` * :doc:`/sql/create-table-as` * :doc:`/sql/drop-table` diff --git a/docs/src/main/sphinx/language/sql-support.rst b/docs/src/main/sphinx/language/sql-support.rst index 4274c8c1d540..3e35a8baa956 100644 --- a/docs/src/main/sphinx/language/sql-support.rst +++ b/docs/src/main/sphinx/language/sql-support.rst @@ -89,6 +89,7 @@ Data management * :doc:`/sql/update` * :doc:`/sql/delete` * :doc:`/sql/truncate` +* :doc:`/sql/merge` .. _sql-materialized-view-management: