From 7b003df4524d369c4e2cc2758ac502949e33a590 Mon Sep 17 00:00:00 2001 From: LINxiansheng Date: Thu, 10 Feb 2022 20:07:13 +0800 Subject: [PATCH] Fix some errors --- .../10.sql-reference/4.queries-and-subqueries/3.collection.md | 2 +- .../1.g-v-sql_audit-introduction.md | 2 +- src/clog/ob_log_entry.cpp | 1 - src/clog/ob_log_external_executor_v2.cpp | 4 ++-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/docs/docs-cn/10.sql-reference/4.queries-and-subqueries/3.collection.md b/docs/docs-cn/10.sql-reference/4.queries-and-subqueries/3.collection.md index d40bf7851..b8695eba5 100644 --- a/docs/docs-cn/10.sql-reference/4.queries-and-subqueries/3.collection.md +++ b/docs/docs-cn/10.sql-reference/4.queries-and-subqueries/3.collection.md @@ -19,7 +19,7 @@ -* EXCEPT/MINUS在Ocenabase中，我们同时支持EXCEPT与MINUS，这两者的语义是相同的。这里需要注意的是参加集合操作的各查询结果的列数必须相同，对应的数据类型也必须兼容。对与UNION来说用户可以指定UNION的属性为ALL和DISTINCT/UNIQUE。分别代表集合可重复，和集合不可重复。而其它几种集合操作是不能指定ALL属性的(它们只有DISTINCT属性)。所有的集合操作默认的属性是DISTINCT。在Oceanbase中，集合操作中可以指定order by和 limit子句，但是不允许其他子句的出现，如下图所示 +* EXCEPT/MINUS在OceanBase中，我们同时支持EXCEPT与MINUS，这两者的语义是相同的。这里需要注意的是参加集合操作的各查询结果的列数必须相同，对应的数据类型也必须兼容。对与UNION来说用户可以指定UNION的属性为ALL和DISTINCT/UNIQUE。分别代表集合可重复，和集合不可重复。而其它几种集合操作是不能指定ALL属性的(它们只有DISTINCT属性)。所有的集合操作默认的属性是DISTINCT。在Oceanbase中，集合操作中可以指定order by和 limit子句，但是不允许其他子句的出现，如下图所示 diff --git a/docs/docs-cn/12.sql-optimization-guide-1/4.sql-optimization-1/3.monitor-sql-execution-performance-1/1.g-v-sql_audit-introduction.md b/docs/docs-cn/12.sql-optimization-guide-1/4.sql-optimization-1/3.monitor-sql-execution-performance-1/1.g-v-sql_audit-introduction.md index ae6cc855c..deb7ab740 100644 --- a/docs/docs-cn/12.sql-optimization-guide-1/4.sql-optimization-1/3.monitor-sql-execution-performance-1/1.g-v-sql_audit-introduction.md +++ b/docs/docs-cn/12.sql-optimization-guide-1/4.sql-optimization-1/3.monitor-sql-execution-performance-1/1.g-v-sql_audit-introduction.md @@ -50,7 +50,7 @@ sql_audit 淘汰机制 - * 当 sql_audidt 记录数超过 900 万条时，触发淘汰。 + * 当 sql_audit 记录数超过 900 万条时，触发淘汰。 diff --git a/src/clog/ob_log_entry.cpp b/src/clog/ob_log_entry.cpp index ad7e08170..c1e8ca2ee 100644 --- a/src/clog/ob_log_entry.cpp +++ b/src/clog/ob_log_entry.cpp @@ -515,7 +515,6 @@ DEFINE_GET_SERIALIZE_SIZE(ObCompressedLogEntry) { int64_t size = 0; size += header_.get_serialize_size(); - ; size += header_.get_compressed_data_len(); return size; } diff --git a/src/clog/ob_log_external_executor_v2.cpp b/src/clog/ob_log_external_executor_v2.cpp index 10398aa80..461a0022a 100644 --- a/src/clog/ob_log_external_executor_v2.cpp +++ b/src/clog/ob_log_external_executor_v2.cpp @@ -281,7 +281,7 @@ int ObLogExternalExecutorWithBreakpoint::process_info_entry(const ObPartitionKey EXTLOG_LOG(ERROR, "invalid search type", K(ret), K(search_param)); } if (OB_SUCC(ret)) { - EXTLOG_LOG(TRACE, "process info entry finish succes", K(min_log_id), K(submit_timestamp), K(progress)); + EXTLOG_LOG(TRACE, "process info entry finish success", K(min_log_id), K(submit_timestamp), K(progress)); } else { EXTLOG_LOG(WARN, "process info entry finish error", K(ret), K(min_log_id), K(submit_timestamp), K(progress)); } @@ -1034,7 +1034,7 @@ int ObLogExternalExecutorWithBreakpoint::do_req_start_pos_by_log_id( if (OB_FAIL(id_build_result(req_msg, search_map, progress, response))) { EXTLOG_LOG(WARN, "build result error", K(ret), K(req_msg)); } else { - EXTLOG_LOG(INFO, "build result succes", K(ret), K(req_msg)); + EXTLOG_LOG(INFO, "build result success", K(ret), K(req_msg)); } } if (OB_SUCC(ret)) {