This is an automated email from the ASF dual-hosted git repository.
roryqi pushed a commit to branch cherry-pick-f4d61784-to-branch-1.2
in repository https://gitbox.apache.org/repos/asf/gravitino.git
The following commit(s) were added to
refs/heads/cherry-pick-f4d61784-to-branch-1.2 by this push:
new 0299eb055a docs
0299eb055a is described below
commit 0299eb055a720b907bd491162730c794f9a4b176
Author: Rory <[email protected]>
AuthorDate: Sat Apr 25 10:06:21 2026 +0800
docs
---
docs/iceberg-rest-service.md | 20 --------------------
1 file changed, 20 deletions(-)
diff --git a/docs/iceberg-rest-service.md b/docs/iceberg-rest-service.md
index 4ee9953ed8..196e0160f0 100644
--- a/docs/iceberg-rest-service.md
+++ b/docs/iceberg-rest-service.md
@@ -107,19 +107,6 @@ The Gravitino Iceberg REST catalog service uses the memory
catalog backend by de
#### JDBC backend configuration
-<<<<<<< HEAD
-| Configuration item | Description
| Default value | Required | Since Version |
-|-----------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------|--------------------------|----------|---------------|
-| `gravitino.iceberg-rest.catalog-backend` | The Catalog backend of the
Gravitino Iceberg REST catalog service. Use the value **`jdbc`** for the JDBC
catalog backend. | `memory` | Yes | 0.2.0
|
-| `gravitino.iceberg-rest.uri` | The JDBC connection address,
such as `jdbc:postgresql://127.0.0.1:5432` for Postgres, or
`jdbc:mysql://127.0.0.1:3306/` for mysql. | (none) | Yes
| 0.2.0 |
-| `gravitino.iceberg-rest.warehouse` | The warehouse directory of
JDBC catalog. Set the HDFS prefix if using HDFS, such as
`hdfs://127.0.0.1:9000/user/hive/warehouse-jdbc` | (none) |
Yes | 0.2.0 |
-| `gravitino.iceberg-rest.catalog-backend-name` | The catalog name passed to
underlying Iceberg catalog backend. Catalog name in JDBC backend is used to
isolate namespace and tables. | `jdbc` for JDBC backend | No | 0.5.2
|
-| `gravitino.iceberg-rest.jdbc-user` | The username of the JDBC
connection.
| (none) | No | 0.2.0
|
-| `gravitino.iceberg-rest.jdbc-password` | The password of the JDBC
connection.
| (none) | No | 0.2.0
|
-| `gravitino.iceberg-rest.jdbc-initialize` | Whether to initialize the
meta tables when creating the JDBC catalog.
| `true` | No | 0.2.0
|
-| `gravitino.iceberg-rest.jdbc-driver` | `com.mysql.jdbc.Driver` or
`com.mysql.cj.jdbc.Driver` for MySQL, `org.postgresql.Driver` for PostgreSQL.
| (none) | Yes | 0.3.0
|
-| `gravitino.iceberg-rest.jdbc-schema-version` | The schema version of the
JDBC catalog. Set to `V1` to enable view support. Once the underlying database
is migrated to V1, this property is no longer required on subsequent restarts.
| `V0` | No | 1.2.0 |
-=======
| Configuration item | Description
| Default value
| Required | Since Version |
|-----------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------|----------|---------------|
| `gravitino.iceberg-rest.catalog-backend` | The Catalog backend of the
Gravitino Iceberg REST catalog service. Use the value **`jdbc`** for the JDBC
catalog backend.
| `memory`
| Yes | 0.2.0 |
@@ -131,7 +118,6 @@ The Gravitino Iceberg REST catalog service uses the memory
catalog backend by de
| `gravitino.iceberg-rest.jdbc-initialize` | Whether to initialize the
meta tables when creating the JDBC catalog.
| `true`
| No | 0.2.0 |
| `gravitino.iceberg-rest.jdbc-driver` | `com.mysql.jdbc.Driver` or
`com.mysql.cj.jdbc.Driver` for MySQL, `org.postgresql.Driver` for PostgreSQL.
| (none)
| Yes | 0.3.0 |
| `gravitino.iceberg-rest.jdbc-schema-version` | The schema version of the
JDBC catalog. Defaults to `V1` to enable view support. Set to `V0` only if you
need to opt out of view support. Once the underlying database is migrated to
V1, this property is no longer required on subsequent restarts. | `V1`
| No | 1.2.0 |
->>>>>>> f4d61784c ([#10851] improvement(iceberg): Change default Iceberg JDBC
schema version to v1 (#10852))
If you have a JDBC Iceberg catalog prior, you must set `catalog-backend-name`
to keep consistent with your Jdbc Iceberg catalog name to operate the prior
namespace and tables.
@@ -474,15 +460,9 @@ Please set the `gravitino.iceberg-rest.warehouse`
parameter to `{storage_prefix}
View operations are supported when using the JDBC catalog backend with schema
version `V1`. The default schema version is now `V1`, so view support is
enabled out of the box. Iceberg will automatically migrate the database schema
on the first restart and detect the migration on all subsequent restarts.
-<<<<<<< HEAD
-| Configuration item | Description
| Default value |
Required | Since Version |
-|----------------------------------------------|--------------------------------------------------------------------------------------------|---------------|----------|---------------|
-| `gravitino.iceberg-rest.jdbc-schema-version` | The schema version of the
JDBC catalog backend. Set to `V1` to enable view operations. | `V0`
| No | 1.2.0 |
-=======
| Configuration item | Description
| Default value | Required | Since Version |
|----------------------------------------------|----------------------------------------------------------------------------------------------------------------------|---------------|----------|---------------|
| `gravitino.iceberg-rest.jdbc-schema-version` | The schema version of the
JDBC catalog backend. Defaults to `V1` to enable view operations. Set to `V0`
to opt out. | `V1` | No | 1.2.0 |
->>>>>>> f4d61784c ([#10851] improvement(iceberg): Change default Iceberg JDBC
schema version to v1 (#10852))
### Other Apache Iceberg catalog properties
