Merge branch 'ApsaraDB:POLARDB_11_DEV' into POLARDB_11_DEV

HBKO · Jul 18, 2023 · c8e9302 · c8e9302
2 parents a9ec808 + 95aeb5b
commit c8e9302
Show file tree

Hide file tree

Showing 14 changed files with 6 additions and 164 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/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/external/polar_monitor_preload/expected/polar_monitor_preload.out b/external/polar_monitor_preload/expected/polar_monitor_preload.out
@@ -53,6 +53,8 @@ BEGIN
 	PERFORM 'SELECT accesssharelock from polar_stat_lock';
 	PERFORM 'SELECT accesssharelock from polar_stat_lock';
 	PERFORM 'SELECT accesssharelock from polar_stat_lock'; 
+	-- Normal query statements may not access ProcArray because polar_csn_enable is enabled by default.
+	EXECUTE 'checkpoint';
 
 	SELECT sh_acquire_count INTO STRICT after FROM polar_stat_lwlock WHERE name='ProcArrayLock';
 

diff --git a/external/polar_monitor_preload/sql/polar_monitor_preload.sql b/external/polar_monitor_preload/sql/polar_monitor_preload.sql
@@ -48,6 +48,8 @@ BEGIN
 	PERFORM 'SELECT accesssharelock from polar_stat_lock';
 	PERFORM 'SELECT accesssharelock from polar_stat_lock';
 	PERFORM 'SELECT accesssharelock from polar_stat_lock'; 
+	-- Normal query statements may not access ProcArray because polar_csn_enable is enabled by default.
+	EXECUTE 'checkpoint';
 
 	SELECT sh_acquire_count INTO STRICT after FROM polar_stat_lwlock WHERE name='ProcArrayLock';