diff --git a/docs/v0.8/en/reference/sql/information-schema/schemata.md b/docs/v0.8/en/reference/sql/information-schema/schemata.md index 468f89afa..b4fdc9e80 100644 --- a/docs/v0.8/en/reference/sql/information-schema/schemata.md +++ b/docs/v0.8/en/reference/sql/information-schema/schemata.md @@ -18,8 +18,8 @@ The output is as follows: | default_character_set_name | String | | NO | | FIELD | | default_collation_name | String | | NO | | FIELD | | sql_path | String | | YES | | FIELD | +| options | String | | YES | | FIELD | +----------------------------+--------+------+------+---------+---------------+ -5 rows in set (0.00 sec) ``` ```sql @@ -27,14 +27,14 @@ SELECT * FROM SCHEMATA; ``` ```sql -+--------------+--------------------+----------------------------+------------------------+----------+ -| catalog_name | schema_name | default_character_set_name | default_collation_name | sql_path | -+--------------+--------------------+----------------------------+------------------------+----------+ -| greptime | greptime_private | utf8 | utf8_bin | NULL | -| greptime | information_schema | utf8 | utf8_bin | NULL | -| greptime | public | utf8 | utf8_bin | NULL | -+--------------+--------------------+----------------------------+------------------------+----------+ -3 rows in set (0.01 sec) ++--------------+--------------------+----------------------------+------------------------+----------+-------------+ +| catalog_name | schema_name | default_character_set_name | default_collation_name | sql_path | options | ++--------------+--------------------+----------------------------+------------------------+----------+-------------+ +| greptime | greptime_private | utf8 | utf8_bin | NULL | | +| greptime | information_schema | utf8 | utf8_bin | NULL | | +| greptime | public | utf8 | utf8_bin | NULL | | +| greptime | test | utf8 | utf8_bin | NULL | ttl='7days' | ++--------------+--------------------+----------------------------+------------------------+----------+-------------+ ``` Fields in the `SCHEMATA` table are described as follows: @@ -44,3 +44,4 @@ Fields in the `SCHEMATA` table are described as follows: - `default_character_set_name`: The default character set of the database. - `default_collation_name`: The default collation of the database. - `sql_path`: The value of this item is always `NULL`. +- `options`: Extending column in GreptimeDB. The database options. diff --git a/docs/v0.8/en/reference/sql/show.md b/docs/v0.8/en/reference/sql/show.md index eba9e8275..c97b20f4a 100644 --- a/docs/v0.8/en/reference/sql/show.md +++ b/docs/v0.8/en/reference/sql/show.md @@ -7,7 +7,7 @@ The `SHOW` keyword provides database and table information. Show all databases: ```sql -SHOW DATABASES; +SHOW [FULL] DATABASES; ``` ```sql @@ -31,6 +31,24 @@ Show databases by `where` expr: SHOW DATABASES WHERE Schemas='test_public_schema'; ``` +Show all databases with options: + +```sql +create database with(ttl='7d'); +SHOW FULL DATABASES; +``` + +```sql ++--------------------+-------------+ +| Database | Options | ++--------------------+-------------+ +| greptime_private | | +| information_schema | | +| public | | +| test | ttl='7days' | ++--------------------+-------------+ +``` + ## SHOW TABLES Show all tables: diff --git a/docs/v0.8/en/summary.yml b/docs/v0.8/en/summary.yml index 807c91b9d..0bdda7999 100644 --- a/docs/v0.8/en/summary.yml +++ b/docs/v0.8/en/summary.yml @@ -75,7 +75,9 @@ - admin - configuration - capacity-plan - - back-up-&-restore-data + - Disaster-Recovery: + - overview + - back-up-&-restore-data - kubernetes - gtctl - run-on-android diff --git a/docs/v0.8/en/user-guide/operations/admin.md b/docs/v0.8/en/user-guide/operations/admin.md index 354987199..2208ce2cd 100644 --- a/docs/v0.8/en/user-guide/operations/admin.md +++ b/docs/v0.8/en/user-guide/operations/admin.md @@ -7,7 +7,7 @@ This document addresses strategies and practices used in the operation of Grepti * [Installation](/getting-started/installation/overview.md) for GreptimeDB and the [g-t-control](./gtctl.md) command line tool. * Database Configuration, please read the [Configuration](./configuration.md) reference. * [Monitoring](./monitoring.md) and [Tracing](./tracing.md) for GreptimeDB. -* GreptimeDB [Backup & Restore methods](./back-up-\&-restore-data.md). +* GreptimeDB [Disaster Recovery](./disaster-recovery/overview.md). ### Runtime information diff --git a/docs/v0.8/en/user-guide/operations/back-up-&-restore-data.md b/docs/v0.8/en/user-guide/operations/disaster-recovery/back-up-&-restore-data.md similarity index 100% rename from docs/v0.8/en/user-guide/operations/back-up-&-restore-data.md rename to docs/v0.8/en/user-guide/operations/disaster-recovery/back-up-&-restore-data.md diff --git a/docs/v0.8/en/user-guide/operations/disaster-recovery/overview.md b/docs/v0.8/en/user-guide/operations/disaster-recovery/overview.md new file mode 100644 index 000000000..bbf8186b5 --- /dev/null +++ b/docs/v0.8/en/user-guide/operations/disaster-recovery/overview.md @@ -0,0 +1,3 @@ +# Overview + +* [Backup & restore data](./back-up-&-restore-data.md) \ No newline at end of file diff --git a/docs/v0.8/en/user-guide/operations/overview.md b/docs/v0.8/en/user-guide/operations/overview.md index 8f05d624a..a22941a66 100644 --- a/docs/v0.8/en/user-guide/operations/overview.md +++ b/docs/v0.8/en/user-guide/operations/overview.md @@ -1,11 +1,13 @@ # Operations +* [Administration](./admin.md) * [Configuration](./configuration.md) +* [Capacity Plan](./capacity-plan.md) +* [Disaster Recovery](./disaster-recovery/overview.md) * [Kubernetes](./kubernetes.md) * [gtctl](./gtctl.md) +* [Running on Android](./run-on-android.md) * [Monitoring](./monitoring.md) * [Tracing](./tracing.md) - \ No newline at end of file +* [Remote WAL](./remote-wal/quick-start.md) +* [Region Migration](./region-migration.md) diff --git a/docs/v0.8/zh/reference/sql/information-schema/schemata.md b/docs/v0.8/zh/reference/sql/information-schema/schemata.md index 30592eef0..2e24f414c 100644 --- a/docs/v0.8/zh/reference/sql/information-schema/schemata.md +++ b/docs/v0.8/zh/reference/sql/information-schema/schemata.md @@ -18,8 +18,8 @@ DESC SCHEMATA; | default_character_set_name | String | | NO | | FIELD | | default_collation_name | String | | NO | | FIELD | | sql_path | String | | YES | | FIELD | +| options | String | | YES | | FIELD | +----------------------------+--------+------+------+---------+---------------+ -5 rows in set (0.00 sec) ``` ```sql @@ -27,14 +27,14 @@ SELECT * FROM SCHEMATA; ``` ```sql -+--------------+--------------------+----------------------------+------------------------+----------+ -| catalog_name | schema_name | default_character_set_name | default_collation_name | sql_path | -+--------------+--------------------+----------------------------+------------------------+----------+ -| greptime | greptime_private | utf8 | utf8_bin | NULL | -| greptime | information_schema | utf8 | utf8_bin | NULL | -| greptime | public | utf8 | utf8_bin | NULL | -+--------------+--------------------+----------------------------+------------------------+----------+ -3 rows in set (0.01 sec) ++--------------+--------------------+----------------------------+------------------------+----------+-------------+ +| catalog_name | schema_name | default_character_set_name | default_collation_name | sql_path | options | ++--------------+--------------------+----------------------------+------------------------+----------+-------------+ +| greptime | greptime_private | utf8 | utf8_bin | NULL | | +| greptime | information_schema | utf8 | utf8_bin | NULL | | +| greptime | public | utf8 | utf8_bin | NULL | | +| greptime | test | utf8 | utf8_bin | NULL | ttl='7days' | ++--------------+--------------------+----------------------------+------------------------+----------+-------------+ ``` `SCHEMATA` 表中的字段描述如下: @@ -44,3 +44,4 @@ SELECT * FROM SCHEMATA; - `default_character_set_name`:数据库的默认字符集。 - `default_collation_name`:数据库的默认排序规则。 - `sql_path`:该项的值始终为 `NULL`。 +- `options`: GreptimeDB 扩展字段,数据库的配置参数。 diff --git a/docs/v0.8/zh/reference/sql/show.md b/docs/v0.8/zh/reference/sql/show.md index 2619b05c3..e0e0b2a7d 100644 --- a/docs/v0.8/zh/reference/sql/show.md +++ b/docs/v0.8/zh/reference/sql/show.md @@ -7,7 +7,7 @@ 展示所有数据库: ```sql -SHOW DATABASES; +SHOW [FULL] DATABASES; ``` ```sql @@ -31,6 +31,24 @@ SHOW DATABASES LIKE 'p%'; SHOW DATABASES WHERE Schemas='test_public_schema'; ``` +展示所有数据库,包括它们的选项: + +```sql +create database with(ttl='7d'); +SHOW FULL DATABASES; +``` + +```sql ++--------------------+-------------+ +| Database | Options | ++--------------------+-------------+ +| greptime_private | | +| information_schema | | +| public | | +| test | ttl='7days' | ++--------------------+-------------+ +``` + ## SHOW TABLES 展示所有表: diff --git a/docs/v0.8/zh/summary-i18n.yml b/docs/v0.8/zh/summary-i18n.yml index dcdc4068c..946482be9 100644 --- a/docs/v0.8/zh/summary-i18n.yml +++ b/docs/v0.8/zh/summary-i18n.yml @@ -33,4 +33,6 @@ back-up-&-restore-data: 备份和恢复 SDK: SDK SQL: SQL FAQ-and-Others: 常见问题及其他 -Release-Notes: Release-Notes +Release-Notes: Release Notes +Disaster-Recovery: 灾难恢复 +Upgrade: 升级 diff --git a/docs/v0.8/zh/user-guide/operations/admin.md b/docs/v0.8/zh/user-guide/operations/admin.md index 90aceb389..5cf8c6ad8 100644 --- a/docs/v0.8/zh/user-guide/operations/admin.md +++ b/docs/v0.8/zh/user-guide/operations/admin.md @@ -7,7 +7,7 @@ * GreptimeDB 的 [安装](/getting-started/installation/overview.md) 和 [g-t-control](./gtctl.md) 命令行工具。 * 数据库配置,请阅读 [配置](./configuration.md) 参考。 * GreptimeDB 的 [监控](./monitoring.md) 和 [链路追踪](./tracing.md)。 -* GreptimeDB 的 [备份与恢复方法](./back-up-\&-restore-data.md)。 +* GreptimeDB 的 [灾难恢复方案](./disaster-recovery/overview.md)。 ### 运行时信息 diff --git a/docs/v0.8/zh/user-guide/operations/back-up-&-restore-data.md b/docs/v0.8/zh/user-guide/operations/disaster-recovery/back-up-&-restore-data.md similarity index 100% rename from docs/v0.8/zh/user-guide/operations/back-up-&-restore-data.md rename to docs/v0.8/zh/user-guide/operations/disaster-recovery/back-up-&-restore-data.md diff --git a/docs/v0.8/zh/user-guide/operations/disaster-recovery/overview.md b/docs/v0.8/zh/user-guide/operations/disaster-recovery/overview.md new file mode 100644 index 000000000..ea9cae76c --- /dev/null +++ b/docs/v0.8/zh/user-guide/operations/disaster-recovery/overview.md @@ -0,0 +1,3 @@ +# 概述 + +* GreptimeDB 的 [备份与恢复方法](./back-up-\&-restore-data.md) \ No newline at end of file diff --git a/docs/v0.8/zh/user-guide/operations/overview.md b/docs/v0.8/zh/user-guide/operations/overview.md index 1333ed77b..7d49a80b4 100644 --- a/docs/v0.8/zh/user-guide/operations/overview.md +++ b/docs/v0.8/zh/user-guide/operations/overview.md @@ -1 +1,11 @@ -TODO +* [管理](./admin.md) +* [配置 GreptimeDB](./configuration.md) +* [容量规划](./capacity-plan.md) +* [灾难恢复](./disaster-recovery/overview.md) +* [Kubernetes](./kubernetes.md) +* [gtctl](./gtctl.md) +* [在 Android 平台运行](./run-on-android.md) +* [监控](./monitoring.md) +* [Tracing](./tracing.md) +* [Remote WAL](./remote-wal/quick-start.md) +* [Region 迁移](./region-migration.md)