This is an automated email from the ASF dual-hosted git repository.
luzhijing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris-website.git
The following commit(s) were added to refs/heads/master by this push:
new 5b7792c461 [Revert](timezone) Remove a function of timezone and its
documents (#684)
5b7792c461 is described below
commit 5b7792c461359307e386e3ad6b8c634f2463e874
Author: zclllyybb <zhaochan...@selectdb.com>
AuthorDate: Thu Jun 6 10:19:56 2024 +0800
[Revert](timezone) Remove a function of timezone and its documents (#684)
master pr: https://github.com/apache/doris/pull/35316
---
docs/admin-manual/config/be-config.md | 5 -----
docs/query/query-variables/time-zone.md | 6 +++---
.../current/admin-manual/config/be-config.md | 5 -----
.../current/query/query-variables/time-zone.md | 6 +++---
.../version-2.0/admin-manual/config/be-config.md | 5 -----
.../version-2.0/query/query-variables/time-zone.md | 6 +++---
.../version-2.1/admin-manual/config/be-config.md | 5 -----
.../version-2.1/query/query-variables/time-zone.md | 6 +++---
versioned_docs/version-2.0/admin-manual/config/be-config.md | 5 -----
versioned_docs/version-2.0/query/query-variables/time-zone.md | 6 +++---
versioned_docs/version-2.1/admin-manual/config/be-config.md | 5 -----
versioned_docs/version-2.1/query/query-variables/time-zone.md | 6 +++---
12 files changed, 18 insertions(+), 48 deletions(-)
diff --git a/docs/admin-manual/config/be-config.md
b/docs/admin-manual/config/be-config.md
index b5cb83898f..f9ecb79611 100644
--- a/docs/admin-manual/config/be-config.md
+++ b/docs/admin-manual/config/be-config.md
@@ -1500,8 +1500,3 @@ Indicates how many tablets failed to load in the data
directory. At the same tim
* Description: Doris comes with its own time zone database. If the time zone
file is not found in the system directory, the data in that directory is
enabled.
* Default: "${DORIS_HOME}/zoneinfo"
-
-#### `use_doris_tzfile`
-
-* Description: Whether to use the time zone database that comes with Doris
directly. Enabled to stop trying to find in the system directory.
-* Default: false
diff --git a/docs/query/query-variables/time-zone.md
b/docs/query/query-variables/time-zone.md
index 5742240536..56f355dfa0 100644
--- a/docs/query/query-variables/time-zone.md
+++ b/docs/query/query-variables/time-zone.md
@@ -52,7 +52,7 @@ The time zone data contains the name of the time zone, the
corresponding time of
1. the directory returned by command `TZDIR`. If was not supported, the
directory `/usr/share/zoneinfo`.
2. the `zoneinfo` directory generated under the Doris BE deployment directory.
The `resource/zoneinfo.tar.gz` directory from the Doris Repository.
-Look up the above data sources in order and use the current item if found. If
the BE configuration item `use_doris_tzfile` is true, the search for the first
item is skipped. If neither is found, the Doris BE will fail to start, please
rebuild the BE correctly or get the distribution.
+Look up the above data sources in order and use the current item if found. If
neither is found, the Doris BE will fail to start, please rebuild the BE
correctly or get the distribution.
## Impact of time zone
@@ -227,7 +227,7 @@ Depending on the package manager used by the current
operating system, you can u
> sudo apt update tzdata
```
-The data updated in this way is located under the system `$TZDIR` (typically
`usr/share/zoneinfo`). If `use_doris_tzfile = true`, the user should overwrite
it to the `zoneinfo` directory in the BE deployment directory.
+The data updated in this way is located under the system `$TZDIR` (typically
`usr/share/zoneinfo`).
2. pull the IANA time zone database manually (recommended)
@@ -237,7 +237,7 @@ Most Linux distributions have a package manager where
tzdata is not synchronised
wget https://www.iana.org/time-zones/repository/tzdb-latest.tar.lz
```
-Then generate the specific zoneinfo data according the README file in the
extracted folder. The generated data should be copied to `$TZDIR` or to the BE
deployment directory, depending on the value of the BE config
`use_doris_tzfile`.
+Then generate the specific zoneinfo data according the README file in the
extracted folder. The generated data should be copied to override `$TZDIR`
folder.
Please note that all the above operations **must** be restarted **on the
corresponding BE to take effect after they are done on the BE machine.
diff --git
a/i18n/zh-CN/docusaurus-plugin-content-docs/current/admin-manual/config/be-config.md
b/i18n/zh-CN/docusaurus-plugin-content-docs/current/admin-manual/config/be-config.md
index 4d2bc6f86e..1728818c37 100644
---
a/i18n/zh-CN/docusaurus-plugin-content-docs/current/admin-manual/config/be-config.md
+++
b/i18n/zh-CN/docusaurus-plugin-content-docs/current/admin-manual/config/be-config.md
@@ -1499,8 +1499,3 @@ load tablets from header failed, failed tablets size:
xxx, path=xxx
* 描述：Doris 自带的时区数据库。如果系统目录下未找到时区文件，则启用该目录下的数据。
* 默认值："${DORIS_HOME}/zoneinfo"
-
-#### `use_doris_tzfile`
-
-* 描述：是否直接使用 Doris 自带的时区数据库。开启后不再尝试查找系统目录。
-* 默认值：false
diff --git
a/i18n/zh-CN/docusaurus-plugin-content-docs/current/query/query-variables/time-zone.md
b/i18n/zh-CN/docusaurus-plugin-content-docs/current/query/query-variables/time-zone.md
index 083ef5ff81..9e4f3dac48 100644
---
a/i18n/zh-CN/docusaurus-plugin-content-docs/current/query/query-variables/time-zone.md
+++
b/i18n/zh-CN/docusaurus-plugin-content-docs/current/query/query-variables/time-zone.md
@@ -52,7 +52,7 @@ Doris 内部存在以下两个时区相关参数：
2. Doris BE 部署目录下生成的 `zoneinfo` 目录。产生自 Doris Repository 下的
`resource/zoneinfo.tar.gz`
-按顺序查找以上数据源，如果找到则使用当前项。如果 BE 配置项 `use_doris_tzfile` 为 true，则跳过对第一项的查找。如均未找到，则
Doris BE 将启动失败，请重新正确构建 BE 或获取发行版。
+按顺序查找以上数据源，如果找到则使用当前项。如均未找到，则 Doris BE 将启动失败，请重新正确构建 BE 或获取发行版。
## 时区的影响
@@ -226,7 +226,7 @@ Doris 目前兼容各时区下的数据向 Doris 中进行导入。而由于 Dor
> sudo apt update tzdata
```
-该方式更新的数据位于系统 `$TZDIR` 下（一般为 `usr/share/zoneinfo`）。如果 `use_doris_tzfile =
true`，则用户应当将其覆盖至 BE 部署目录下的 `zoneinfo` 目录。
+该方式更新的数据位于系统 `$TZDIR` 下（一般为 `usr/share/zoneinfo`）。
2. 直接拉取 IANA 时区数据库（推荐）
@@ -236,7 +236,7 @@ Doris 目前兼容各时区下的数据向 Doris 中进行导入。而由于 Dor
wget https://www.iana.org/time-zones/repository/tzdb-latest.tar.lz
```
-然后根据解压后文件夹中的 README 文件，生成具体的 zoneinfo 数据。生成的数据应当拷贝至 `$TZDIR` 还是 BE 部署目录，取决于 BE
config `use_doris_tzfile` 的值。
+然后根据解压后文件夹中的 README 文件，生成具体的 zoneinfo 数据。生成的数据应当拷贝并覆盖 `$TZDIR` 目录。
请注意，以上所有操作在 BE 所在机器上完成后，都**必须重启**对应 BE 才能生效。
diff --git
a/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.0/admin-manual/config/be-config.md
b/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.0/admin-manual/config/be-config.md
index 691e47b629..ed50a6168f 100644
---
a/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.0/admin-manual/config/be-config.md
+++
b/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.0/admin-manual/config/be-config.md
@@ -1539,8 +1539,3 @@ load tablets from header failed, failed tablets size:
xxx, path=xxx
* 描述：Doris 自带的时区数据库。如果系统目录下未找到时区文件，则启用该目录下的数据。
* 默认值："${DORIS_HOME}/zoneinfo"
-
-#### `use_doris_tzfile`
-
-* 描述：是否直接使用 Doris 自带的时区数据库。开启后不再尝试查找系统目录。
-* 默认值：false
diff --git
a/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.0/query/query-variables/time-zone.md
b/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.0/query/query-variables/time-zone.md
index 3260be4a9e..e8e0fcb092 100644
---
a/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.0/query/query-variables/time-zone.md
+++
b/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.0/query/query-variables/time-zone.md
@@ -52,7 +52,7 @@ Doris 内部存在以下两个时区相关参数：
2. Doris BE 部署目录下生成的 `zoneinfo` 目录。产生自 Doris Repository 下的
`resource/zoneinfo.tar.gz`
-按顺序查找以上数据源，如果找到则使用当前项。如果 BE 配置项 `use_doris_tzfile` 为 true，则跳过对第一项的查找。如均未找到，则
Doris BE 将启动失败，请重新正确构建 BE 或获取发行版。
+按顺序查找以上数据源，如果找到则使用当前项。如均未找到，则 Doris BE 将启动失败，请重新正确构建 BE 或获取发行版。
## 时区的影响
@@ -227,7 +227,7 @@ Doris 目前兼容各时区下的数据向 Doris 中进行导入。而由于 Dor
> sudo apt update tzdata
```
-该方式更新的数据位于系统 `$TZDIR` 下（一般为 `usr/share/zoneinfo`）。如果 `use_doris_tzfile =
true`，则用户应当将其覆盖至 BE 部署目录下的 `zoneinfo` 目录。
+该方式更新的数据位于系统 `$TZDIR` 下（一般为 `usr/share/zoneinfo`）。
2. 直接拉取 IANA 时区数据库（推荐）
@@ -237,7 +237,7 @@ Doris 目前兼容各时区下的数据向 Doris 中进行导入。而由于 Dor
wget https://www.iana.org/time-zones/repository/tzdb-latest.tar.lz
```
-然后根据解压后文件夹中的 README 文件，生成具体的 zoneinfo 数据。生成的数据应当拷贝至 `$TZDIR` 还是 BE 部署目录，取决于 BE
config `use_doris_tzfile` 的值。
+然后根据解压后文件夹中的 README 文件，生成具体的 zoneinfo 数据。生成的数据应当拷贝并覆盖 `$TZDIR` 目录。
请注意，以上所有操作在 BE 所在机器上完成后，都**必须重启**对应 BE 才能生效。
diff --git
a/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.1/admin-manual/config/be-config.md
b/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.1/admin-manual/config/be-config.md
index 4d2bc6f86e..1728818c37 100644
---
a/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.1/admin-manual/config/be-config.md
+++
b/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.1/admin-manual/config/be-config.md
@@ -1499,8 +1499,3 @@ load tablets from header failed, failed tablets size:
xxx, path=xxx
* 描述：Doris 自带的时区数据库。如果系统目录下未找到时区文件，则启用该目录下的数据。
* 默认值："${DORIS_HOME}/zoneinfo"
-
-#### `use_doris_tzfile`
-
-* 描述：是否直接使用 Doris 自带的时区数据库。开启后不再尝试查找系统目录。
-* 默认值：false
diff --git
a/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.1/query/query-variables/time-zone.md
b/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.1/query/query-variables/time-zone.md
index 083ef5ff81..9e4f3dac48 100644
---
a/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.1/query/query-variables/time-zone.md
+++
b/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.1/query/query-variables/time-zone.md
@@ -52,7 +52,7 @@ Doris 内部存在以下两个时区相关参数：
2. Doris BE 部署目录下生成的 `zoneinfo` 目录。产生自 Doris Repository 下的
`resource/zoneinfo.tar.gz`
-按顺序查找以上数据源，如果找到则使用当前项。如果 BE 配置项 `use_doris_tzfile` 为 true，则跳过对第一项的查找。如均未找到，则
Doris BE 将启动失败，请重新正确构建 BE 或获取发行版。
+按顺序查找以上数据源，如果找到则使用当前项。如均未找到，则 Doris BE 将启动失败，请重新正确构建 BE 或获取发行版。
## 时区的影响
@@ -226,7 +226,7 @@ Doris 目前兼容各时区下的数据向 Doris 中进行导入。而由于 Dor
> sudo apt update tzdata
```
-该方式更新的数据位于系统 `$TZDIR` 下（一般为 `usr/share/zoneinfo`）。如果 `use_doris_tzfile =
true`，则用户应当将其覆盖至 BE 部署目录下的 `zoneinfo` 目录。
+该方式更新的数据位于系统 `$TZDIR` 下（一般为 `usr/share/zoneinfo`）。
2. 直接拉取 IANA 时区数据库（推荐）
@@ -236,7 +236,7 @@ Doris 目前兼容各时区下的数据向 Doris 中进行导入。而由于 Dor
wget https://www.iana.org/time-zones/repository/tzdb-latest.tar.lz
```
-然后根据解压后文件夹中的 README 文件，生成具体的 zoneinfo 数据。生成的数据应当拷贝至 `$TZDIR` 还是 BE 部署目录，取决于 BE
config `use_doris_tzfile` 的值。
+然后根据解压后文件夹中的 README 文件，生成具体的 zoneinfo 数据。生成的数据应当拷贝并覆盖 `$TZDIR` 目录。
请注意，以上所有操作在 BE 所在机器上完成后，都**必须重启**对应 BE 才能生效。
diff --git a/versioned_docs/version-2.0/admin-manual/config/be-config.md
b/versioned_docs/version-2.0/admin-manual/config/be-config.md
index 10d5f0369a..ab52dc35d6 100644
--- a/versioned_docs/version-2.0/admin-manual/config/be-config.md
+++ b/versioned_docs/version-2.0/admin-manual/config/be-config.md
@@ -1505,8 +1505,3 @@ Indicates how many tablets failed to load in the data
directory. At the same tim
* Description: Doris comes with its own time zone database. If the time zone
file is not found in the system directory, the data in that directory is
enabled.
* Default: "${DORIS_HOME}/zoneinfo"
-
-#### `use_doris_tzfile`
-
-* Description: Whether to use the time zone database that comes with Doris
directly. Enabled to stop trying to find in the system directory.
-* Default: false
diff --git a/versioned_docs/version-2.0/query/query-variables/time-zone.md
b/versioned_docs/version-2.0/query/query-variables/time-zone.md
index 5742240536..56f355dfa0 100644
--- a/versioned_docs/version-2.0/query/query-variables/time-zone.md
+++ b/versioned_docs/version-2.0/query/query-variables/time-zone.md
@@ -52,7 +52,7 @@ The time zone data contains the name of the time zone, the
corresponding time of
1. the directory returned by command `TZDIR`. If was not supported, the
directory `/usr/share/zoneinfo`.
2. the `zoneinfo` directory generated under the Doris BE deployment directory.
The `resource/zoneinfo.tar.gz` directory from the Doris Repository.
-Look up the above data sources in order and use the current item if found. If
the BE configuration item `use_doris_tzfile` is true, the search for the first
item is skipped. If neither is found, the Doris BE will fail to start, please
rebuild the BE correctly or get the distribution.
+Look up the above data sources in order and use the current item if found. If
neither is found, the Doris BE will fail to start, please rebuild the BE
correctly or get the distribution.
## Impact of time zone
@@ -227,7 +227,7 @@ Depending on the package manager used by the current
operating system, you can u
> sudo apt update tzdata
```
-The data updated in this way is located under the system `$TZDIR` (typically
`usr/share/zoneinfo`). If `use_doris_tzfile = true`, the user should overwrite
it to the `zoneinfo` directory in the BE deployment directory.
+The data updated in this way is located under the system `$TZDIR` (typically
`usr/share/zoneinfo`).
2. pull the IANA time zone database manually (recommended)
@@ -237,7 +237,7 @@ Most Linux distributions have a package manager where
tzdata is not synchronised
wget https://www.iana.org/time-zones/repository/tzdb-latest.tar.lz
```
-Then generate the specific zoneinfo data according the README file in the
extracted folder. The generated data should be copied to `$TZDIR` or to the BE
deployment directory, depending on the value of the BE config
`use_doris_tzfile`.
+Then generate the specific zoneinfo data according the README file in the
extracted folder. The generated data should be copied to override `$TZDIR`
folder.
Please note that all the above operations **must** be restarted **on the
corresponding BE to take effect after they are done on the BE machine.
diff --git a/versioned_docs/version-2.1/admin-manual/config/be-config.md
b/versioned_docs/version-2.1/admin-manual/config/be-config.md
index b5cb83898f..f9ecb79611 100644
--- a/versioned_docs/version-2.1/admin-manual/config/be-config.md
+++ b/versioned_docs/version-2.1/admin-manual/config/be-config.md
@@ -1500,8 +1500,3 @@ Indicates how many tablets failed to load in the data
directory. At the same tim
* Description: Doris comes with its own time zone database. If the time zone
file is not found in the system directory, the data in that directory is
enabled.
* Default: "${DORIS_HOME}/zoneinfo"
-
-#### `use_doris_tzfile`
-
-* Description: Whether to use the time zone database that comes with Doris
directly. Enabled to stop trying to find in the system directory.
-* Default: false
diff --git a/versioned_docs/version-2.1/query/query-variables/time-zone.md
b/versioned_docs/version-2.1/query/query-variables/time-zone.md
index 5742240536..56f355dfa0 100644
--- a/versioned_docs/version-2.1/query/query-variables/time-zone.md
+++ b/versioned_docs/version-2.1/query/query-variables/time-zone.md
@@ -52,7 +52,7 @@ The time zone data contains the name of the time zone, the
corresponding time of
1. the directory returned by command `TZDIR`. If was not supported, the
directory `/usr/share/zoneinfo`.
2. the `zoneinfo` directory generated under the Doris BE deployment directory.
The `resource/zoneinfo.tar.gz` directory from the Doris Repository.
-Look up the above data sources in order and use the current item if found. If
the BE configuration item `use_doris_tzfile` is true, the search for the first
item is skipped. If neither is found, the Doris BE will fail to start, please
rebuild the BE correctly or get the distribution.
+Look up the above data sources in order and use the current item if found. If
neither is found, the Doris BE will fail to start, please rebuild the BE
correctly or get the distribution.
## Impact of time zone
@@ -227,7 +227,7 @@ Depending on the package manager used by the current
operating system, you can u
> sudo apt update tzdata
```
-The data updated in this way is located under the system `$TZDIR` (typically
`usr/share/zoneinfo`). If `use_doris_tzfile = true`, the user should overwrite
it to the `zoneinfo` directory in the BE deployment directory.
+The data updated in this way is located under the system `$TZDIR` (typically
`usr/share/zoneinfo`).
2. pull the IANA time zone database manually (recommended)
@@ -237,7 +237,7 @@ Most Linux distributions have a package manager where
tzdata is not synchronised
wget https://www.iana.org/time-zones/repository/tzdb-latest.tar.lz
```
-Then generate the specific zoneinfo data according the README file in the
extracted folder. The generated data should be copied to `$TZDIR` or to the BE
deployment directory, depending on the value of the BE config
`use_doris_tzfile`.
+Then generate the specific zoneinfo data according the README file in the
extracted folder. The generated data should be copied to override `$TZDIR`
folder.
Please note that all the above operations **must** be restarted **on the
corresponding BE to take effect after they are done on the BE machine.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
