Merge branch 'main' into feature/database-options

GreptimeTeam · Jun 20, 2024 · d062aae · d062aae
2 parents b1e74fa + 9eda1d1
commit d062aae
Show file tree

Hide file tree

Showing 8 changed files with 164 additions and 132 deletions.
diff --git a/docs/nightly/en/faq-and-others/faq.md b/docs/nightly/en/faq-and-others/faq.md
diff --git a/docs/nightly/en/user-guide/concepts/features-that-you-concern.md b/docs/nightly/en/user-guide/concepts/features-that-you-concern.md
@@ -21,7 +21,13 @@ CREATE TABLE IF NOT EXISTS temperatures(
 
 The TTL of temperatures is set to be seven days. 
 
-You can refer to the TTL option of the table create statement [here](/reference/sql/create).
+Since 0.8, the database level `TTL` is supported too.
+
+```sql
+CREATE DATABASE test with(ttl='7d');
+```
+
+You can refer to the TTL option of the database and table create statement [here](/reference/sql/create).
 
 ## What are the compression rates of GreptimeDB?
 
@@ -42,7 +48,7 @@ GreptimeDB resolves this issue by:
 
 ## Does GreptimeDB support continuous aggregate or downsampling?
 
-It doesn't, but we have a new project `GreptimeFlow` for it, please refer to the [tracking issue](https://github.com/GreptimeTeam/greptimedb/issues/3187).
+Since 0.8, GreptimeDB added a new function called `Flow`, which is used for continuous aggregation. Please read the [user guide](/user-guide/continuous-aggregation/overview).
 
 ## Can I store data in object storage in the cloud?
 

diff --git a/docs/nightly/zh/summary-i18n.yml b/docs/nightly/zh/summary-i18n.yml
@@ -32,3 +32,4 @@ Administration: 管理
 back-up-&-restore-data: 备份和恢复
 SDK: SDK
 SQL: SQL
+FAQ-and-Others: 常见问题及其他
diff --git a/docs/nightly/zh/user-guide/concepts/features-that-you-concern.md b/docs/nightly/zh/user-guide/concepts/features-that-you-concern.md
@@ -21,7 +21,13 @@ CREATE TABLE IF NOT EXISTS temperatures(
 
 在上述 SQL 中 `temperatures` 表的 TTL 被设置为 7 天。
 
-你可以在[这里](/reference/sql/create)参考表创建语句的 TTL 选项。
+从 0.8 版本开始，也支持数据库级别的 `TTL`。
+
+```sql
+CREATE DATABASE test WITH (ttl='7d');
+```
+
+你可以在[这里](/reference/sql/create)参考数据库和表创建语句的 TTL 选项。
 
 ## GreptimeDB 的压缩率是多少？
 
@@ -41,7 +47,7 @@ GreptimeDB 通过以下方式解决这个问题：
 
 ## GreptimeDB 支持连续聚合或降采样吗？
 
-不支持，但是我们已经启动了一个项目 `GreptimeFlow` 正在研发，请查看 [tracking issue](https://github.com/GreptimeTeam/greptimedb/issues/3187)。
+从 0.8 版本开始，GreptimeDB 添加了一个名为 `Flow` 的新功能，用于连续聚合和降采样等场景。请阅读[用户指南](/user-guide/continuous-aggregation/overview)获取更多信息。
 
 ## 我可以在云的对象存储中存储数据吗？
 

diff --git a/docs/v0.8/en/faq-and-others/faq.md b/docs/v0.8/en/faq-and-others/faq.md
diff --git a/docs/v0.8/en/user-guide/concepts/features-that-you-concern.md b/docs/v0.8/en/user-guide/concepts/features-that-you-concern.md
@@ -21,7 +21,13 @@ CREATE TABLE IF NOT EXISTS temperatures(
 
 The TTL of temperatures is set to be seven days. 
 
-You can refer to the TTL option of the table create statement [here](/reference/sql/create).
+Since 0.8, the database level `TTL` is supported too.
+
+```sql
+CREATE DATABASE test with(ttl='7d');
+```
+
+You can refer to the TTL option of the database and table create statement [here](/reference/sql/create).
 
 ## What are the compression rates of GreptimeDB?
 
@@ -42,7 +48,7 @@ GreptimeDB resolves this issue by:
 
 ## Does GreptimeDB support continuous aggregate or downsampling?
 
-It doesn't, but we have a new project `GreptimeFlow` for it, please refer to the [tracking issue](https://github.com/GreptimeTeam/greptimedb/issues/3187).
+Since 0.8, GreptimeDB added a new function called `Flow`, which is used for continuous aggregation. Please read the [user guide](/user-guide/continuous-aggregation/overview).
 
 ## Can I store data in object storage in the cloud?
 

diff --git a/docs/v0.8/zh/summary-i18n.yml b/docs/v0.8/zh/summary-i18n.yml
@@ -32,3 +32,4 @@ Administration: 管理
 back-up-&-restore-data: 备份和恢复
 SDK: SDK
 SQL: SQL
+FAQ-and-Others: 常见问题及其他
diff --git a/docs/v0.8/zh/user-guide/concepts/features-that-you-concern.md b/docs/v0.8/zh/user-guide/concepts/features-that-you-concern.md
@@ -21,7 +21,13 @@ CREATE TABLE IF NOT EXISTS temperatures(
 
 在上述 SQL 中 `temperatures` 表的 TTL 被设置为 7 天。
 
-你可以在[这里](/reference/sql/create)参考表创建语句的 TTL 选项。
+从 0.8 版本开始，也支持数据库级别的 `TTL`。
+
+```sql
+CREATE DATABASE test WITH (ttl='7d');
+```
+
+你可以在[这里](/reference/sql/create)参考数据库和表创建语句的 TTL 选项。
 
 ## GreptimeDB 的压缩率是多少？
 
@@ -41,7 +47,7 @@ GreptimeDB 通过以下方式解决这个问题：
 
 ## GreptimeDB 支持连续聚合或降采样吗？
 
-不支持，但是我们已经启动了一个项目 `GreptimeFlow` 正在研发，请查看 [tracking issue](https://github.com/GreptimeTeam/greptimedb/issues/3187)。
+从 0.8 版本开始，GreptimeDB 添加了一个名为 `Flow` 的新功能，用于连续聚合和降采样等场景。请阅读[用户指南](/user-guide/continuous-aggregation/overview)获取更多信息。
 
 ## 我可以在云的对象存储中存储数据吗？