Merge pull request #398 from ApsaraDB/POLARDB_11_DEV

merge: 20230713
ApsaraDB · Jul 13, 2023 · 5c5e5ae · 5c5e5ae
2 parents 512dc5b + 30c702b
commit 5c5e5ae
Show file tree

Hide file tree

Showing 17 changed files with 7 additions and 169 deletions.
diff --git a/README-CN.md b/README-CN.md
@@ -79,7 +79,7 @@ psql -h 127.0.0.1 -c 'select version();'
 
 ## 参与贡献
 
-我们诚挚欢迎社区参与 PolarDB 的贡献，无论是代码还是文档。在线文档中的 [参与社区](https://apsaradb.github.io/PolarDB-for-PostgreSQL/zh/contributing/code-of-conduct.html) 提供了关于贡献流程与规范的更多信息。
+我们诚挚欢迎社区参与 PolarDB 的贡献，无论是代码还是文档。
 
 以下是贡献者列表（由 [contrib.rocks](https://contrib.rocks) 支持）：
 

diff --git a/README.md b/README.md
@@ -79,7 +79,7 @@ If you want to explore or develop documentation locally, see [Document Contribut
 
 ## Contributing
 
-You are welcome to make contributions to PolarDB, no matter code or documentation. We appreciate all the contributions. For more information about how to start development and pull requests, see [Community](https://apsaradb.github.io/PolarDB-for-PostgreSQL/contributing/code-of-conduct.html).
+You are welcome to make contributions to PolarDB, no matter code or documentation.
 
 Here are the contributors:
 

diff --git a/docs/.vuepress/configs/navbar/en.ts b/docs/.vuepress/configs/navbar/en.ts
@@ -98,10 +98,6 @@ export const en: NavbarConfig = [
     text: "Contributing",
     link: "/contributing/",
     children: [
-      {
-        text: "Code of Conduct",
-        link: "/contributing/code-of-conduct.html",
-      },
       {
         text: "Contributing Docs",
         link: "/contributing/contributing-polardb-docs.html",

diff --git a/docs/.vuepress/configs/navbar/zh.ts b/docs/.vuepress/configs/navbar/zh.ts
@@ -132,10 +132,6 @@ export const zh: NavbarConfig = [
     text: "参与社区",
     link: "/zh/contributing/",
     children: [
-      {
-        text: "行为准则",
-        link: "/zh/contributing/code-of-conduct.html",
-      },
       {
         text: "贡献文档",
         link: "/zh/contributing/contributing-polardb-docs.html",

diff --git a/docs/.vuepress/configs/sidebar/en.ts b/docs/.vuepress/configs/sidebar/en.ts
@@ -102,7 +102,6 @@ export const en: SidebarConfig = {
         "/contributing/contributing-polardb-kernel.md",
         "/contributing/contributing-polardb-docs.md",
         "/contributing/coding-style.md",
-        "/contributing/code-of-conduct.md",
       ],
     },
   ],

diff --git a/docs/.vuepress/configs/sidebar/zh.ts b/docs/.vuepress/configs/sidebar/zh.ts
@@ -144,7 +144,6 @@ export const zh: SidebarConfig = {
         "/zh/contributing/contributing-polardb-kernel.md",
         "/zh/contributing/contributing-polardb-docs.md",
         "/zh/contributing/coding-style.md",
-        "/zh/contributing/code-of-conduct.md",
       ],
     },
   ],

diff --git a/docs/README.md b/docs/README.md
@@ -112,7 +112,6 @@ psql -h 127.0.0.1 -c 'select version();'
   <div class="feature">
     <h3>Contributing</h3>
     <ul style="position: relative;z-index: 10;">
-      <li><a href="./contributing/code-of-conduct.html">Code of Conduct</a></li>
       <li><a href="./contributing/contributing-polardb-docs.html">Contributing Documentation</a></li>
       <li><a href="./contributing/contributing-polardb-kernel.html">Contributing Code</a></li>
       <li><a href="./contributing/coding-style">Coding Style</a></li>

diff --git a/docs/contributing/code-of-conduct.md b/docs/contributing/code-of-conduct.md
diff --git a/docs/contributing/contributing-polardb-kernel.md b/docs/contributing/contributing-polardb-kernel.md
@@ -11,7 +11,6 @@ New features will be merged to `POLARDB_11_DEV`, and will be merged to `POLARDB_
 
 ## Before Contributing
 
-- Read and follow our [Code of Conduct](./code-of-conduct.md).
 - Sign the [CLA](https://gist.github.com/alibaba-oss/151a13b0a72e44ba471119c7eb737d74) of PolarDB for PostgreSQL
 
 ## Contributing

diff --git a/docs/deploying/storage-curvebs.md b/docs/deploying/storage-curvebs.md
@@ -193,7 +193,7 @@ chunkserver_services:
   config:
     listen.ip: ${service_host}
     listen.port: 82${format_replicas_sequence} # 8200,8201,8202
-    data_dir: /data/chunkserver${service_replicas_sequence} # /data/chunkserver0, /data/chunksever1
+    data_dir: /data/chunkserver${service_replicas_sequence} # /data/chunkserver0, /data/chunkserver1
     copysets: 100
   deploy:
     - host: ${machine1}

diff --git a/docs/theory/arch-htap.md b/docs/theory/arch-htap.md
@@ -72,7 +72,7 @@ PxScan 算子扫描出来的数据会通过 Shuffle 算子来重分布。重分
 
 ![image.png](../imgs/htap-4-1-consistency.png)
 
-任意选择一个节点作为 Coordinator 节点，它的 ReadLSN 会作为约定的 LSN，从所有 MPP 节点的快照版本号中选择最小的版本号作为全局约定的快照版本号。通过 LSN 的回放等待和 Global Snaphot 同步机制，确保在任何一个节点发起 MPP 查询时，数据和快照均能达到一致可用的状态。
+任意选择一个节点作为 Coordinator 节点，它的 ReadLSN 会作为约定的 LSN，从所有 MPP 节点的快照版本号中选择最小的版本号作为全局约定的快照版本号。通过 LSN 的回放等待和 Global Snapshot 同步机制，确保在任何一个节点发起 MPP 查询时，数据和快照均能达到一致可用的状态。
 
 ![image.png](../imgs/htap-4-2-serverless.png)
 

diff --git a/docs/theory/arch-overview.md b/docs/theory/arch-overview.md
@@ -8,7 +8,7 @@ minute: 35
 
 <ArticleInfo :frontmatter=$frontmatter></ArticleInfo>
 
-PolarDB PostgreSQL (hereafter simplified as PolarDB) is a stable, reliable, scalable, highly available, and secure enterprise-grade database service that is independently developed by Alibaba Cloud to help you increase security compliance and cost-effectiveness. PolarDB is compatible with PostgreSQL and Oracle. It runs in a proprietary compute-storage separation architecture of Alibaba Cloud to support the horizontal scaling of the storage and computing capabilities.
+PolarDB for PostgreSQL (hereafter simplified as PolarDB) is a stable, reliable, scalable, highly available, and secure enterprise-grade database service that is independently developed by Alibaba Cloud to help you increase security compliance and cost-effectiveness. PolarDB is 100% compatible with PostgreSQL. It runs in a proprietary compute-storage separation architecture of Alibaba Cloud to support the horizontal scaling of the storage and computing capabilities.
 
 PolarDB can process a mix of online transaction processing (OLTP) workloads and online analytical processing (OLAP) workloads in parallel. PolarDB also provides a wide range of innovative multi-model database capabilities to help you process, analyze, and search for diversified data, such as spatio-temporal, GIS, image, vector, and graph data.
 

diff --git a/docs/zh/README.md b/docs/zh/README.md
@@ -119,7 +119,6 @@ psql -h 127.0.0.1 -c 'select version();'
   <div class="feature">
     <h3>社区贡献</h3>
     <ul style="position: relative;z-index: 10;">
-      <li><a href="./contributing/code-of-conduct.html">行为准则</a></li>
       <li><a href="./contributing/contributing-polardb-docs.html">贡献文档</a></li>
       <li><a href="./contributing/contributing-polardb-kernel.html">贡献代码</a></li>
       <li><a href="./contributing/coding-style">编码风格</a></li>

diff --git a/docs/zh/contributing/code-of-conduct.md b/docs/zh/contributing/code-of-conduct.md
diff --git a/docs/zh/contributing/contributing-polardb-kernel.md b/docs/zh/contributing/contributing-polardb-kernel.md
@@ -11,7 +11,6 @@ PolarDB for PostgreSQL 基于 PostgreSQL 和其它开源项目进行开发，我
 
 ## 贡献代码之前
 
-- 阅读并遵守我们的 [行为准则](./code-of-conduct.md)
 - 签署 PolarDB for PostgreSQL 的 [CLA](https://gist.github.com/alibaba-oss/151a13b0a72e44ba471119c7eb737d74)
 
 ## 贡献流程

diff --git a/docs/zh/deploying/storage-curvebs.md b/docs/zh/deploying/storage-curvebs.md
@@ -193,7 +193,7 @@ chunkserver_services:
   config:
     listen.ip: ${service_host}
     listen.port: 82${format_replicas_sequence} # 8200,8201,8202
-    data_dir: /data/chunkserver${service_replicas_sequence} # /data/chunkserver0, /data/chunksever1
+    data_dir: /data/chunkserver${service_replicas_sequence} # /data/chunkserver0, /data/chunkserver1
     copysets: 100
   deploy:
     - host: ${machine1}

diff --git a/docs/zh/theory/arch-overview.md b/docs/zh/theory/arch-overview.md
@@ -8,7 +8,7 @@ minute: 35
 
 <ArticleInfo :frontmatter=$frontmatter></ArticleInfo>
 
-PolarDB PostgreSQL（以下简称 PolarDB）是一款阿里云自主研发的企业级数据库产品，采用计算存储分离架构，兼容 PostgreSQL 与 Oracle。PolarDB 的存储与计算能力均可横向扩展，具有高可靠、高可用、弹性扩展等企业级数据库特性。同时，PolarDB 具有大规模并行计算能力，可以应对 OLTP 与 OLAP 混合负载；还具有时空、向量、搜索、图谱等多模创新特性，可以满足企业对数据处理日新月异的新需求。
+PolarDB for PostgreSQL（以下简称 PolarDB）是一款阿里云自主研发的企业级数据库产品，采用计算存储分离架构，100% 兼容 PostgreSQL。PolarDB 的存储与计算能力均可横向扩展，具有高可靠、高可用、弹性扩展等企业级数据库特性。同时，PolarDB 具有大规模并行计算能力，可以应对 OLTP 与 OLAP 混合负载；还具有时空、向量、搜索、图谱等多模创新特性，可以满足企业对数据处理日新月异的新需求。
 
 PolarDB 支持多种部署形态：存储计算分离部署、X-Paxos 三节点部署、本地盘部署。