You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by pa...@apache.org on 2024/01/23 02:46:59 UTC
(doris) branch master updated: [chore](docs) fix some docs wrong & add important comment & fe start config for old machine (#29742)
This is an automated email from the ASF dual-hosted git repository.
panxiaolei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 5fe0e6c215f [chore](docs) fix some docs wrong & add important comment & fe start config for old machine (#29742)
5fe0e6c215f is described below
commit 5fe0e6c215f096ad044e8a2450816ebac1b58502
Author: zclllyybb <zh...@selectdb.com>
AuthorDate: Tue Jan 23 10:46:51 2024 +0800
[chore](docs) fix some docs wrong & add important comment & fe start config for old machine (#29742)
fix some docs wrong & add important comment & fe start config for old machine
---
be/src/vec/sink/writer/vtablet_writer.h | 12 +++++++-----
conf/fe.conf | 2 +-
docs/en/docs/install/source-install/compilation-arm.md | 3 +++
.../docs/sql-manual/sql-reference/Data-Types/DATETIME.md | 7 ++++---
docs/zh-CN/docs/install/source-install/compilation-arm.md | 3 +++
.../docs/sql-manual/sql-reference/Data-Types/DATETIME.md | 14 +++++++-------
6 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/be/src/vec/sink/writer/vtablet_writer.h b/be/src/vec/sink/writer/vtablet_writer.h
index 68534cd3a16..e9ae83ae484 100644
--- a/be/src/vec/sink/writer/vtablet_writer.h
+++ b/be/src/vec/sink/writer/vtablet_writer.h
@@ -233,14 +233,15 @@ public:
_slave_tablet_nodes[tablet_id] = slave_nodes;
}
- // build a request and build corresponding connect to BE.
+ // this function is NON_REENTRANT
+ Status init(RuntimeState* state);
+ /// these two functions will call open_internal. should keep that clear --- REENTRANT
+ // build corresponding connect to BE. NON-REENTRANT
void open();
- // for auto partition, we use this to open more tablet.
+ // for auto partition, we use this to open more tablet. KEEP IT REENTRANT
void incremental_open();
-
- Status init(RuntimeState* state);
-
// this will block until all request transmission which were opened or incremental opened finished.
+ // this function will called multi times. NON_REENTRANT
Status open_wait();
Status add_block(vectorized::Block* block, const Payload* payload, bool is_append = false);
@@ -407,6 +408,7 @@ protected:
using AddBlockReq = std::pair<std::unique_ptr<vectorized::MutableBlock>,
std::shared_ptr<PTabletWriterAddBlockRequest>>;
std::queue<AddBlockReq> _pending_blocks;
+ // send block to slave BE rely on this. dont reconstruct it.
std::shared_ptr<WriteBlockCallback<PTabletWriterAddBlockResult>> _send_block_callback = nullptr;
bool _is_incremental;
diff --git a/conf/fe.conf b/conf/fe.conf
index b1151585db7..a8d30963890 100644
--- a/conf/fe.conf
+++ b/conf/fe.conf
@@ -30,7 +30,7 @@ LOG_DIR = ${DORIS_HOME}/log
# JAVA_OPTS="-Dsun.security.krb5.debug=true -Djavax.security.auth.useSubjectCredsOnly=false -Xss4m -Xmx8192m -XX:+UseMembar -XX:SurvivorRatio=8 -XX:MaxTenuringThreshold=7 -XX:+PrintGCDateStamps -XX:+PrintGCDetails -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:+CMSClassUnloadingEnabled -XX:-CMSParallelRemarkEnabled -XX:CMSInitiatingOccupancyFraction=80 -XX:SoftRefLRUPolicyMSPerMB=0 -Xloggc:$DORIS_HOME/log/fe.gc.log.$CUR_DATE"
# G1 JAVA OPTS
-JAVA_OPTS="-Djavax.security.auth.useSubjectCredsOnly=false -Xss4m -Xmx8192m -XX:+UseG1GC -XX:MaxGCPauseMillis=200 -XX:+PrintGCDateStamps -XX:+PrintGCDetails -Xloggc:$DORIS_HOME/log/fe.gc.log.$CUR_DATE -Dlog4j2.formatMsgNoLookups=true"
+JAVA_OPTS="-Djavax.security.auth.useSubjectCredsOnly=false -Xss4m -Xmx8192m -XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -XX:MaxGCPauseMillis=200 -XX:+PrintGCDateStamps -XX:+PrintGCDetails -Xloggc:$DORIS_HOME/log/fe.gc.log.$CUR_DATE -Dlog4j2.formatMsgNoLookups=true"
# For jdk 9+, this JAVA_OPTS_FOR_JDK_9 will be used as default CMS JVM options
# JAVA_OPTS_FOR_JDK_9="-Dsun.security.krb5.debug=true -Djavax.security.auth.useSubjectCredsOnly=false -Xss4m -Xmx8192m -XX:SurvivorRatio=8 -XX:MaxTenuringThreshold=7 -XX:+CMSClassUnloadingEnabled -XX:-CMSParallelRemarkEnabled -XX:CMSInitiatingOccupancyFraction=80 -XX:SoftRefLRUPolicyMSPerMB=0 -Xlog:gc*:$DORIS_HOME/log/fe.gc.log.$CUR_DATE:time"
diff --git a/docs/en/docs/install/source-install/compilation-arm.md b/docs/en/docs/install/source-install/compilation-arm.md
index 6a828752192..51c7118e2c7 100644
--- a/docs/en/docs/install/source-install/compilation-arm.md
+++ b/docs/en/docs/install/source-install/compilation-arm.md
@@ -24,6 +24,9 @@ specific language governing permissions and limitations
under the License.
-->
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
# Compile with ARM
This topic is about how to compile Doris on the ARM64 platform.
diff --git a/docs/en/docs/sql-manual/sql-reference/Data-Types/DATETIME.md b/docs/en/docs/sql-manual/sql-reference/Data-Types/DATETIME.md
index 554c9e634a0..609ca416f1d 100644
--- a/docs/en/docs/sql-manual/sql-reference/Data-Types/DATETIME.md
+++ b/docs/en/docs/sql-manual/sql-reference/Data-Types/DATETIME.md
@@ -33,6 +33,7 @@ DATETIME
</version>
### Description
+
DATETIME([P])
Date and time type.
The optional parameter P indicates the time precision and the value range is [0, 6], that is, it supports up to 6 decimal places (microseconds). 0 when not set.
@@ -41,13 +42,13 @@ The form of printing is 'yyyy-MM-dd HH:mm:ss.SSSSSS'
### note
- DATETIME supports temporal precision up to microseconds. When parsing imported DATETIME type data using the BE side (e.g. using Stream load, Spark load, etc.), or using the FE side with the [Nereids](../../../query-acceleration/nereids) on, decimals exceeding the current precision will be **rounded**.
- DATETIME reads support resolving the time zone in the format of the original DATETIME literal followed by the time zone:
+DATETIME supports temporal precision up to microseconds. When parsing imported DATETIME type data using the BE side (e.g. using Stream load, Spark load, etc.), or using the FE side with the [Nereids](../../../query-acceleration/nereids) on, decimals exceeding the current precision will be **rounded**.
+DATETIME reads support resolving the time zone in the format of the original DATETIME literal followed by the time zone:
```sql
<date> <time>[<timezone>]
```
- For the specific supported formats for `<timezone>`, see [timezone](../../../advanced/time-zone). Note that the `DATE`, `DATEV2`, `DATETIME`, and `DATETIMEV2` types **don't** contain time zone information. For example, if an input time string "2012-12-12 08:00:00+08:00" is parsed and converted to the current time zone "+02:00", and the actual value "2012-12-12 02:00:00" is stored in the DATETIME column, the value itself will not change, no matter how much the cluster environment vari [...]
+For the specific supported formats for `<timezone>`, see [timezone](../../../advanced/time-zone). Note that the `DATE`, `DATEV2`, `DATETIME`, and `DATETIMEV2` types **don't** contain time zone information. For example, if an input time string "2012-12-12 08:00:00+08:00" is parsed and converted to the current time zone "+02:00", and the actual value "2012-12-12 02:00:00" is stored in the DATETIME column, the value itself will not change, no matter how much the cluster environment variable [...]
### example
diff --git a/docs/zh-CN/docs/install/source-install/compilation-arm.md b/docs/zh-CN/docs/install/source-install/compilation-arm.md
index 1aab7134484..522509a11fb 100644
--- a/docs/zh-CN/docs/install/source-install/compilation-arm.md
+++ b/docs/zh-CN/docs/install/source-install/compilation-arm.md
@@ -24,6 +24,9 @@ specific language governing permissions and limitations
under the License.
-->
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
# Apache Doris Arm 架构编译
本文档介绍如何在 ARM64 平台上编译 Doris。
diff --git a/docs/zh-CN/docs/sql-manual/sql-reference/Data-Types/DATETIME.md b/docs/zh-CN/docs/sql-manual/sql-reference/Data-Types/DATETIME.md
index d819db31baa..8b5565fe4ab 100644
--- a/docs/zh-CN/docs/sql-manual/sql-reference/Data-Types/DATETIME.md
+++ b/docs/zh-CN/docs/sql-manual/sql-reference/Data-Types/DATETIME.md
@@ -34,21 +34,21 @@ DATETIMEV2
### description
- DATETIME([P])
- 日期时间类型，可选参数P表示时间精度，取值范围是[0, 6]，即最多支持6位小数（微秒）。不设置时为0。
- 取值范围是['0000-01-01 00:00:00[.000000]', '9999-12-31 23:59:59[.999999]'].
- 打印的形式是'yyyy-MM-dd HH:mm:ss.SSSSSS'
+DATETIME([P])
+日期时间类型，可选参数P表示时间精度，取值范围是[0, 6]，即最多支持6位小数（微秒）。不设置时为0。
+取值范围是['0000-01-01 00:00:00[.000000]', '9999-12-31 23:59:59[.999999]'].
+打印的形式是'yyyy-MM-dd HH:mm:ss.SSSSSS'
### note
- DATETIME 支持了最多到微秒的时间精度。在使用 BE 端解析导入的 DATETIME 类型数据时（如使用Stream load、Spark load等），或开启[新优化器](../../../query-acceleration/nereids)后在 FE 端解析 DATETIME 类型数据时，将会对超出当前精度的小数进行**四舍五入**。
+DATETIME 支持了最多到微秒的时间精度。在使用 BE 端解析导入的 DATETIME 类型数据时（如使用Stream load、Spark load等），或开启[新优化器](../../../query-acceleration/nereids)后在 FE 端解析 DATETIME 类型数据时，将会对超出当前精度的小数进行**四舍五入**。
- DATETIME 读入时支持解析时区，格式为原本 DATETIME 字面量后紧贴时区：
+DATETIME 读入时支持解析时区，格式为原本 DATETIME 字面量后紧贴时区：
```sql
<date> <time>[<timezone>]
```
- 关于`<timezone>`的具体支持格式，请见[时区](../../../advanced/time-zone)。需要注意的是，`DATE`, `DATEV2`, `DATETIME`, `DATETIMEV2` 类型均**不**包含时区信息。例如，一个输入的时间字符串 "2012-12-12 08:00:00+08:00" 经解析并转换至当前时区 "+02:00"，得到实际值 "2012-12-12 02:00:00" 后存储于 DATETIME 列中，则之后无论本集群环境变量如何改变，该值本身都不会发生变化。
+关于`<timezone>`的具体支持格式，请见[时区](../../../advanced/time-zone)。需要注意的是，`DATE`, `DATEV2`, `DATETIME`, `DATETIMEV2` 类型均**不**包含时区信息。例如，一个输入的时间字符串 "2012-12-12 08:00:00+08:00" 经解析并转换至当前时区 "+02:00"，得到实际值 "2012-12-12 02:00:00" 后存储于 DATETIME 列中，则之后无论本集群环境变量如何改变，该值本身都不会发生变化。
### example
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org