5.4.15-16724034 release

CONTRIBUTING.md

@@ -22,11 +22,11 @@ Let's use an example to walk through the list.
 
 ### Fork Your Own Branch
 
-There are many PolarDB-X related repositories, take ApasaraDB GalaxySQL and ApasaraDB GalaxyGlue for an example. On Github page of [GalaxySQL](https://github.com/apsaradb/galaxysql) and [GalaxyGlue](https://github.com/apsaradb/galaxyglue), Click **fork** button to create your own galaxysql and galaxyglue repository.
+There are many PolarDB-X related repositories, take PolarDB-X SQL and PolarDB-X Glue for an example. On Github page of [PolarDB-X SQL](https://github.com/polardb/polardbx-sql) and [PolarDB-X Glue](https://github.com/polardbx/polardbx-glue), Click **fork** button to create your own polardbx-sql and polardbx-glue repository.
 
 ### Create Local Repository
 ```bash
-git clone --recursive https://github.com/your_github/galaxysql.git
+git clone --recursive https://github.com/your_github/polardbx-sql.git
 ```
 ### Create a dev Branch (named as your_github_id_feature_name)
 ```bash
@@ -50,7 +50,7 @@ git push --recurse-submodules=on-demand origin your_github_id_feature_name
 ```
 
 ### Create a PR
-Click **New pull request** or **Compare & pull  request** button, choose to compare branches apsaradb/galaxysql and your_github/your_github_id_feature_name, and write PR description.
+Click **New pull request** or **Compare & pull request** button, choose to compare branches polardb/polardbx-sql/main and your_github/your_github_id_feature_name, and write PR description.
 
 ### Address Reviewers' Comments
 Resolve all problems raised by reviewers and update PR.

NOTICE

@@ -1,4 +1,4 @@
-ApsaraDB GalaxySQL
+PolarDB-X SQL
 
 Copyright [2013-2021], Alibaba Group Holding Limited
 

README.md

@@ -1,5 +1,5 @@
 
-[![LICENSE](https://img.shields.io/badge/License-Apache%202.0-green.svg)](https://github.com/ApsaraDB/galaxysql/blob/main/LICENSE)
+[![LICENSE](https://img.shields.io/badge/License-Apache%202.0-green.svg)](https://github.com/polardb/polardbx-sql/blob/main/LICENSE)
 [![Language](https://img.shields.io/badge/Language-Java-blue.svg)](https://www.java.com/)
 
 [中文文档](https://polardbx.com)
@@ -56,7 +56,7 @@ See the [PXD Quick Start](docs/en/quickstart.md).
 ### To quick start with PolarDB-X on Kubernetes
 PolarDB-X provides K8S deployment mode, through which you can customize the configuration of PolarDB-X cluster.
 
-See the [K8S Quick Start](https://github.com/ApsaraDB/galaxykube#quick-start).
+See the [K8S Quick Start](https://github.com/polardb/polardbx-operator#quick-start).
 
 ### To start developing PolarDB-X
 If you want to compile and install PolarDB-X from source code, or start development, you can refer the [Development Guide](docs/en/quickstart-development.md).
@@ -89,22 +89,22 @@ The CDC Node provides change data capture capability that is fully compatible wi
 
 PolarDB-X provides tool to manage the above components through K8S Operator, and the RPC between the CN and DN can be done through private protocol component. The corresponding repositories of these components are as follows.
 
-| **Component Name**        | **Repository** | **Version** |
-|---------------------------| --- |---|
-| CN (Compute Node)         | [galaxysql](https://github.com/ApsaraDB/galaxysql) | v5.4.13-16615127 |
-| GMS (Global Meta Service) | [galaxyengine](https://github.com/ApsaraDB/galaxyengine) | v1.0.2 |
-| DN (Data Node)            | [galaxyengine](https://github.com/ApsaraDB/galaxyengine) | v1.0.2 |
-| CDC (Change Data Capture) | [galaxycdc](https://github.com/ApsaraDB/galaxycdc) | v5.4.13 |
-| RPC                       | [galaxyglue](https://github.com/ApsaraDB/galaxyglue) | v5.4.13-16615127 |
-| K8S Operator              | [galaxykube](https://github.com/ApsaraDB/galaxykube) | v1.2.2 |
+| **Component Name**        | **Repository**                                                    | **Version** |
+|---------------------------|-------------------------------------------------------------------|---|
+| CN (Compute Node)         | [polardbx-sql](https://github.com/polardb/polardbx-sql)           | v5.4.13-16615127 |
+| GMS (Global Meta Service) | [polardbx-engine](https://github.com/polardb/polardbx-engine)     | v1.0.2 |
+| DN (Data Node)            | [polardbx-engine](https://github.com/polardb/polardbx-engine)     | v1.0.2 |
+| CDC (Change Data Capture) | [polardbx-cdc](https://github.com/polardb/polardbx-cdc)           | v5.4.13 |
+| RPC                       | [polardbx-glue](https://github.com/polardb/polardbx-glue)         | v5.4.13-16615127 |
+| K8S Operator              | [polardbx-operator](https://github.com/polardb/polardbx-operator) | v1.2.2 |
 
 
-## What is ApsaraDB GalaxySQL ？
-ApsaraDB GalaxySQL is one component of PolarDB-X, namely CN (Compute Node).
+## What is PolarDB-X SQL ？
+PolarDB-X SQL is one component of PolarDB-X, namely CN (Compute Node).
 
 
 ## Licensing
-ApsaraDB GalaxySQL is under the Apache License 2.0. See the [License](LICENSE) file for details.
+PolarDB-X SQL is under the Apache License 2.0. See the [License](LICENSE) file for details.
 
 
 ## Contributing
@@ -122,4 +122,4 @@ You can join these groups and chats to discuss and ask PolarDB-X related questio
 
 
 ## Acknowledgements
-ApsaraDB GalaxySQL references from many open source projects, such as Calcite, Presto etc. Sincere thanks to these projects and contributors.
+PolarDB-X SQL references from many open source projects, such as Calcite, Presto etc. Sincere thanks to these projects and contributors.

docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM polardbx/galaxybasejava:20221027-sdfa
+FROM polardbx/polardbxbasejava:20221129
 
 WORKDIR /home/admin
 

docker/entrypoint.sh

@@ -14,19 +14,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-GALAXYSQL_HOME=/home/admin/drds-server
+POLARDBX_SQL_HOME=/home/admin/drds-server
 
-function galaxysql_pid() {
-  ps auxf | grep java | grep TddlLauncher | awk '{print $2}'
+function polardbx_sql_pid() {
+  jps | grep Tddl | cut -d ' ' -f 1
 }
 
 function kill_and_clean() {
   local pid
-  pid=$(galaxysql_pid)
+  pid=$(polardbx_sql_pid)
   if [ -n "$pid" ]; then
     kill -9 "$pid"
   fi
-  rm -f $GALAXYSQL_HOME/bin/*.pid
+  rm -f $POLARDBX_SQL_HOME/bin/*.pid
 }
 
 function prepare() {
@@ -36,12 +36,12 @@ function prepare() {
 }
 
 function start_process() {
-  $GALAXYSQL_HOME/bin/startup.sh -w wisp -D
+  $POLARDBX_SQL_HOME/bin/startup.sh -D
 }
 
 last_pid=0
 function report_pid() {
-  pid=$(galaxysql_pid)
+  pid=$(polardbx_sql_pid)
   if [ -z "$pid" ]; then
     echo "Process dead. Exit."
     last_pid=0

docker_build.sh

@@ -15,4 +15,4 @@ esac
 BASE=${bin_abs_path}
 
 cd $BASE/ && mvn -DskipTests clean package install
-docker build -f docker/Dockerfile -t polardbx/galaxysql $BASE/
+docker build -f docker/Dockerfile -t polardbx/polardbx-sql $BASE/

docs/en/quickstart-development.md

@@ -8,17 +8,17 @@ This document explains the development process of PolarDB-X, covering code compi
 
 On your computer, get the source code of PolarDB-X from github repositories:
 
-[GalaxyEngine](https://github.com/ApsaraDB/galaxyengine)
+[PolarDB-X Engine](https://github.com/polardb/polardbx-engine)
 
-[GalaxySQL](https://github.com/ApsaraDB/galaxysql)
+[PolarDB-X SQL](https://github.com/polardb/polardbx-sql)
 
-[GalaxyGlue](https://github.com/ApsaraDB/galaxyglue)
+[PolarDB-X Glue](https://github.com/polardb/polardbx-glue)
 
-[GalaxyCDC](https://github.com/ApsaraDB/galaxycdc)
+[PolarDB-X CDC](https://github.com/polardb/polardbx-cdc)
 
 Check out the `main` branch of each repository.
 
-### Compiling PolarDB-X Data Node (GalaxyEngine)
+### Compiling PolarDB-X Data Node (PolarDB-X Engine)
 
 **Install dependencies on CentOS7**
 
@@ -55,8 +55,8 @@ apt install make automake cmake git bison libaio-dev libncurses-dev libsasl2-dev
 **Compile && Install**
 
 ```bash
-# enter galaxyengine directory
-cd galaxyengine
+# enter polardbx-engine directory
+cd polardbx-engine
 
 # install boost 1.70 (Note: Put boost into the repository to avoid downloading)
 wget https://boostorg.jfrog.io/artifactory/main/release/1.70.0/source/boost_1_70_0.tar.gz
@@ -76,16 +76,16 @@ make -j8
 make install
 ```
 
-### Compiling PolarDB-X Compute Node (GalaxySQL&GalaxyGlue)
+### Compiling PolarDB-X Compute Node (PolarDB-X SQL & PolarDB-X Glue)
 
 ```shell
 # install JDK 1.8 and Maven 3
 
-# make sure polardbx-rpc (galaxyglue) initialized
+# make sure polardbx-rpc (polardbx-glue) initialized
 git submodule update --init
 
-# enter the galaxysql directory 
-cd galaxysql/
+# enter the polardbx-sql directory 
+cd polardbx-sql/
 
 # compile&install
 mvn install -D maven.test.skip=true -D env=release 
@@ -94,10 +94,10 @@ mvn install -D maven.test.skip=true -D env=release
 tar zxvf target/polardbx-server-*-SNAPSHOT.tar.gz
 ```
 
-### Compiling PolarDB-X CDC (GalaxyCDC)
+### Compiling PolarDB-X CDC (PolarDB-X CDC)
 
 ```shell
-cd galaxycdc
+cd polardbx-cdc
 
 # compile&install
 mvn install -D maven.test.skip=true -D env=release 
@@ -107,7 +107,7 @@ tar zxvf polardbx-cdc-assemble/target/polardbx-binlog*.tar.gz
 ```
 
 ### Start PolarDB-X DN
-> NOTE: GalaxyEngine is a derivative work of MySQL, the following will use mysql and galaxyengine without distinction
+> NOTE: PolarDB-X Engine is a derivative work of MySQL, the following will use mysql and polardbx-engine without distinction
 > 
 - This step starts a mysql process that acts as the metadb and DN
 - Refer to the mysql configuration file (my.cnf) in the appendix to modify it accordingly. By default, 4886 is used as mysql port and 32886 as private protocol port

docs/en/quickstart.md

@@ -3,7 +3,7 @@
 To get started with PolarDB-X, you will use the PXD tool. 
 With PXD installed, you can run a PolarDB-X with just one-click.
 > Notes:
-> - PXD is mainly used for test or development, for production environment please use [GalaxyKube](https://github.com/ApsaraDB/galaxykube) to deploy PolarDB-X on K8S.
+> - PXD is mainly used for test or development, for production environment please use [PolarDB-X Operator](https://github.com/polardb/polardbx-operator) to deploy PolarDB-X on K8S.
 
 ## Prerequisites
 Deploying PolarDB-X via PXD tool requires Python3 and Docker to be installed first. 

docs/zh_CN/README.md

@@ -52,7 +52,7 @@ PXD 使用说明参考[这里](quickstart.md)。
 
 2. K8S 部署模式
 
-PolarDB-X 提供 K8S 部署模式，通过该方式，可对 PolarDB-X 集群做更多定制化配置。K8S 部署教程参考[这里](https://github.com/ApsaraDB/galaxykube#quick-start) 。
+PolarDB-X 提供 K8S 部署模式，通过该方式，可对 PolarDB-X 集群做更多定制化配置。K8S 部署教程参考[这里](https://github.com/polardb/polardbx-operator#quick-start) 。
 
 3. 源码编译安装模式
 
@@ -88,23 +88,23 @@ PolarDB-X 采用 Shared-nothing 与存储分离计算架构进行设计，系统
 
 PolarDB-X 提供通过 K8S Operator 方式管理以上4个组件，同时计算节点与存储节点之间可通过私有协议进行 RPC 通信，这些组件对应的仓库如下。
 
-| 组件名称 | 仓库地址 | 版本号             |
-| --- | --- |-----------------|
-| 计算节点（CN, Compute Node） | [galaxysql](https://github.com/ApsaraDB/galaxysql) | v5.4.13-16615127 |
-| 元数据服务（GMS, Global Meta Service） | [galaxyengine](https://github.com/ApsaraDB/galaxyengine) | v1.0.2 |
-| 存储节点（DN, Data Node） | [galaxyengine](https://github.com/ApsaraDB/galaxyengine) | v1.0.2 |
-| 日志节点（CDC, Change Data Capture） | [galaxycdc](https://github.com/ApsaraDB/galaxycdc) | v5.4.13 |
-| 私有协议 | [galaxyglue](https://github.com/ApsaraDB/galaxyglue) |  v5.4.13-16615127 |
-| K8S Operator | [galaxykube](https://github.com/ApsaraDB/galaxykube) | v1.2.2 |
+| 组件名称 | 仓库地址                                                              | 版本号             |
+| --- |-------------------------------------------------------------------|-----------------|
+| 计算节点（CN, Compute Node） | [polardbx-sql](https://github.com/polardb/polardbx-sql)           | v5.4.13-16615127 |
+| 元数据服务（GMS, Global Meta Service） | [polardbx-engine](https://github.com/polardb/polardbx-engine)     | v1.0.2 |
+| 存储节点（DN, Data Node） | [polardbx-engine](https://github.com/polardb/polardbx-engine)     | v1.0.2 |
+| 日志节点（CDC, Change Data Capture） | [polardbx-cdc](https://github.com/polardb/polardbx-cdc)           | v5.4.13 |
+| 私有协议 | [polardbx-glue](https://github.com/polardb/polardbx-glue)         |  v5.4.13-16615127 |
+| K8S Operator | [polardbx-operator](https://github.com/polardb/polardbx-operator) | v1.2.2 |
 
 
 
-## 什么是 ApsaraDB GalaxySQL ？
-GalaxySQL 是 PolarDB-X 的计算节点（CN, Compute Node）。
+## 什么是 PolarDB-X SQL ？
+PolarDB-X SQL 是 PolarDB-X 的计算节点（CN, Compute Node）。
 
 
 ## License
-ApsaraDB GalaxySQL 采用 Apache License 2.0 协议。协议详情参看 [License](../../LICENSE) 文件。
+PolarDB-X SQL 采用 Apache License 2.0 协议。协议详情参看 [License](../../LICENSE) 文件。
 
 
 ## 贡献
@@ -120,7 +120,7 @@ ApsaraDB GalaxySQL 采用 Apache License 2.0 协议。协议详情参看 [Licens
 
 
 ## 致谢
-ApsaraDB GalaxySQL 中引用或借鉴了很多开源社区的代码，例如 Calcite、Presto 等，真诚感谢这些项目和贡献人员。
+PolarDB-X SQL 中引用或借鉴了很多开源社区的代码，例如 Calcite、Presto 等，真诚感谢这些项目和贡献人员。
 ## 
 
 

docs/zh_CN/quickstart-development.md

@@ -7,14 +7,14 @@
 
 ### 准备工作
 
-- 下载 [GalaxyEngine](https://github.com/ApsaraDB/galaxyengine) 代码，main分支
-- 下载 [GalaxySQL](https://github.com/ApsaraDB/galaxysql) 代码，main分支
-- 下载 [GalaxyGlue](https://github.com/ApsaraDB/galaxyglue) 代码，main分支
-- 下载 [GalaxyCDC](https://github.com/ApsaraDB/galaxycdc) 代码，main分支
+- 下载 [PolarDB-X Engine](https://github.com/polardb/polardbx-engine) 代码，main 分支
+- 下载 [PolarDB-X SQL](https://github.com/polardb/polardbx-sql) 代码，main 分支
+- 下载 [PolarDB-X Glue](https://github.com/polardb/polardbx-glue) 代码，main 分支
+- 下载 [PolarDB-X CDC](https://github.com/polardb/polardbx-cdc) 代码，main 分支
 
-### 编译 PolarDB-X DN (存储节点，代号GalaxyEngine)
+### 编译 PolarDB-X DN (存储节点，代号 PolarDB-X Engine)
 
-此步骤编译和安装GalaxyEngine（mysql）
+此步骤编译和安装 PolarDB-X Engine（mysql）
 
 **安装依赖（CentOS7)**
 
@@ -50,8 +50,8 @@ apt install make automake cmake git bison libaio-dev libncurses-dev libsasl2-dev
 **编译**
 
 ```bash
-# 进入 galaxyengine 代码路径
-cd galaxyengine
+# 进入 polardbx-engine 代码路径
+cd polardbx-engine
 
 # 安装boost1.70 (注：把boost放到仓库里避免下载）
 wget https://boostorg.jfrog.io/artifactory/main/release/1.70.0/source/boost_1_70_0.tar.gz
@@ -72,16 +72,16 @@ make install
 ```
 
 
-### 编译 PolarDB-X CN (计算节点，代号GalaxySQL)
-此步骤编译和安装galaxysql & galaxyglue代码。
+### 编译 PolarDB-X CN (计算节点，代号 PolarDB-X SQL)
+此步骤编译和安装 polardbx-sql & polardbx-glue代码。
 ```yaml
 # 安装依赖 JDK 1.8 和 Maven 3
 # 配置 Maven 仓库地址
 
 # 进入代码目录 
-cd galaxysql/
+cd polardbx-sql/
 
-# 确保 polardbx-rpc 子模块 (GalaxyGlue) 已初始化
+# 确保 polardbx-rpc 子模块 (PolarDB-X Glue) 已初始化
 git submodule update --init
 
 # 编译打包
@@ -91,8 +91,8 @@ mvn install -D skipTests=true -D env=release
 tar zxvf target/polardbx-server-5.4.13-SNAPSHOT.tar.gz
 ```
 
-### 编译 PolarDB-X CDC（日志节点，代号GalaxyCDC）
-此步骤编译和安装 galaxycdc 代码。
+### 编译 PolarDB-X CDC（日志节点，代号 PolarDB-X CDC）
+此步骤编译和安装 polardbx-cdc 代码。
 ```yaml
 # 进入CDC代码
 

docs/zh_CN/quickstart-how-to-debug-cn.md

@@ -8,10 +8,10 @@
 
 ### 源码下载
 
-下载 [GalaxySQL](https://github.com/ApsaraDB/galaxysql) 代码，main分支
+下载 [PolarDB-X SQL](https://github.com/polardb/polardbx-sql) 代码，main 分支
 
 ``` shell
-git clone https://github.com/ApsaraDB/galaxysql
+git clone https://github.com/polardb/polardbx-sql
 ```
 
 ### 安装依赖
@@ -22,9 +22,9 @@ git clone https://github.com/ApsaraDB/galaxysql
 # 安装依赖 JDK 1.8 和 Maven 3
 
 # 进入代码目录 
-cd galaxysql/
+cd polardbx-sql/
 
-# 确保 polardbx-rpc 子模块 (GalaxyGlue) 已初始化
+# 确保 polardbx-rpc 子模块 (PolarDB-X Glue) 已初始化
 git submodule update --init
 
 # 编译打包
@@ -119,4 +119,4 @@ mysql -h127.1 -P8527 -upolardbx_root
 
 ![image-20220627221138507](../images/success_output.png)
 
-FYI: 系统运行日志在galaxysql同级目录的logs文件夹中。
+FYI: 系统运行日志在 polardbx-sql 同级目录的 logs 文件夹中。

docs/zh_CN/quickstart-oss.md

@@ -1,7 +1,7 @@
 # 快速配置OSS存储
 
 - 首先源码编译安装 PolarDB-X，可参考[源码编译部署](quickstart-development.md)
-- 或者通过K8S构建出 PolarDB-X集群，可参考[K8S部署](http://www.github.com/ApsaraDB/galaxykube/blob/main/docs/zh/deploy/quick-start.md)
+- 或者通过K8S构建出 PolarDB-X集群，可参考[K8S部署](http://www.github.com/polardb/polardbx-operator/blob/main/docs/zh/deploy/quick-start.md)
 
 安装完成后连接PolarDB-X集群，通过如下SQL命令进行OSS存储初始化: