Merge pull request #908 from oceanbase/merge_422bp1_into_main

merge dev/4.2.2 into main

Author: yizhouxw

.secignore

@@ -99,6 +99,7 @@
   http://pmd.sourceforge.net*
   https://pmd.github.io*
   http://ns.adobe.com*
+  https://farm-ce.oss-cn-heyuan.aliyuncs.com
 
 
 --------------------------------------------------------

CHANGELOG-zh-CN.md

@@ -1,5 +1,30 @@
 # OceanBase Developer Center (ODC) CHANGELOG
 
+## 4.2.2 bp (2023-11-23)
+
+### 缺陷修复
+
+数据归档
+
+- 数据归档子任务开始运行后更新限流器配置无法生效
+- 数据清理任务没有运行
+
+数据脱敏
+
+- 自动扫描敏感列场景下输入恶意识别规则会导致正则表达式拒绝服务
+
+SQL 执行
+
+- MySQL 模式下以科学计数法展示 NUMBER 类型的数据
+
+PL 运行
+
+- 无法查看游标的内容
+
+SQL-Check
+
+- 数据库没有报语法错的时候 SQL-Check 依然会提示语法错误
+
 ## 4.2.2 (2023-11-07)
 
 ### 功能变化

CHANGELOG.md

@@ -1,5 +1,30 @@
 # OceanBase Developer Center (ODC) CHANGELOG
 
+## 4.2.2 bp (2023-11-23)
+
+### Bug fixes
+
+Data archiving
+
+- After the data archiving subtask starts running, updating the current limiter configuration cannot take effect.
+- Data cleaning task is not running
+
+Data desensitization
+
+- Entering malicious identification rules in the scenario of automatic scanning of sensitive columns will result in a denial of service by regular expressions
+
+SQL execution
+
+- Display NUMBER type data in scientific notation in MySQL mode
+
+PL run
+
+- Unable to view the contents of the cursor
+
+SQL-Check
+
+- When the database does not report syntax errors, SQL-Check will still prompt syntax errors.
+
 ## 4.2.2 (2023-11-07)
 
 ### Feature

CHANGELOG.rst

@@ -1,6 +1,44 @@
 (unreleased)
 ------------
 
+New
+~~~
+- Feat(notification): support send notification when schedule job failed
+  (#711) [LuckyLeo]
+- Feat(jdbc): upgrade jdbc to 2.4.7.1 (#761) [LuckyLeo]
+- Feat(ob-sql-parser): supports insert statement and add timeout
+  settings (#754) [IL MARE]
+
+Fix
+~~~
+- Fix(migrate): failed to start up when there is no users or
+  organizations (#860) [IL MARE]
+- Fix(dlm):update limiter failed after data-delete job was created.
+  (#840) [guowl3]
+- Fix(data-security): regex column recognization rule may suffer ReDos 2
+  (#848) [XiaoYang]
+- Fix(data-security): regex column recognization rule may suffer ReDos
+  (#843) [XiaoYang]
+- Fix(dlm): data delete failed after data archived. (#735) [guowl3]
+- Fix(name): change resource name length limit from 64 to 128 (#839)
+  [XiaoYang]
+- Fix(security): add white list for security scanning and modify mysql
+  pl parser's g4 (#837) [IL MARE]
+- Fix(sql-execute): fix number data display error format (#764) [IL
+  MARE]
+- Fix(pldebug): pldebug monitor does not exit block process exiting
+  (#765) [yizhou]
+- Fix(pl): fix column name is wrong when viewing cursor's content (#757)
+  [IL MARE]
+- Fix(sql-check): avoid reporting syntax error when sql is executed
+  successfully (#748) [IL MARE]
+- Fix(web): response header content-type would be application/xml while
+  using RestTemplate (#722) [pynzzZ]
+
+
+v4.2.2 (2023-11-07)
+-------------------
+
 New
 ~~~
 - Feat(dlm):support breakpoint recovery (#635) [guowl3]
@@ -36,6 +74,18 @@ Changes
 
 Fix
 ~~~
+- Fix(dlm):wrong order status when task is rollback (#707) [guowl3]
+- Fix(sql-execute): no trace id when sql executing failed (#700)
+  [LuckyLeo]
+- Fix(SSO):saved SSO intergration test login failed (#698) [Ang]
+- Fix(SSO):saved SSO intergration test login failed (#698) [Ang]
+- Fix(SSO):saved SSO intergration test login failed (#698) [Ang]
+- Fix(sql-parser): failed to report syntax error if the input's any
+  prefix is grammatical (#699) [IL MARE]
+- Fix(datasource): make 'socketTimeout' and 'connectTimeout' settings
+  work for backend datasource (#691) [IL MARE]
+- Fix(result-set-export): get wrong filename for result-set export task
+  on cloud (#685) [LuckyLeo]
 - Fix(dlm): submit task got condition not supported error while
   condition contains subquery (#668) [guowl3]
 - Fix(database-change): failed to view a scheduled database change task

client

@@ -4,22 +4,46 @@
 
 cd $(dirname "$0") || exit 1
 
+function get_cpu_arch() {
+    local cpu_arch=$(uname -m)
+    case "$cpu_arch" in
+    x86*)
+        cpu_arch="amd64"
+        ;;
+    aarch*)
+        cpu_arch="arm64"
+        ;;
+    *)
+        cpu_arch="unknown"
+        ;;
+    esac
+    echo "${cpu_arch}"
+}
+
+function get_odc_version() {
+    local odc_version=$(cat "../odc-server-VER.txt" | sed 's/[ \s\t\n\r]*//g')
+    echo "${odc_version}"
+}
+
 main() {
 
     local register="docker.io"
     local namespace="oceanbase"
     local app_name=odc
     local image_name=${register}/${namespace}/${app_name}
-    local image_tag=${2:-"latest"}
+    local image_tag=${2:-$(get_odc_version)}
+    local cpu_arch=$(get_cpu_arch)
+
+    echo "image_name=${image_name}, image_tag=${image_tag}, cpu_arch=${cpu_arch}"
 
     case $1 in
-    build-odc)
+    build)
         if [ ! -e resources/*.rpm ]; then
             echo "There is no rpm packages in \"resources\""
             echo "run \"../../script/build_rpm.sh\" to create rpm and copy to resources/"
             exit 1
         fi
-        docker build -t ${image_name}:${image_tag} -f odc/Dockerfile .
+        docker build --build-arg "ARCH=${cpu_arch}" -t ${image_name}:${image_tag} -f odc/Dockerfile .
         ;;
     tag)
         docker tag ${image_name}:${image_tag} ${image_name}:latest
@@ -32,15 +56,21 @@ main() {
         fi
         docker login --username=${username} ${register}
         ;;
+    save)
+        echo "save docker image to resources/odc-${image_tag}-${cpu_arch}.tar.gz"
+        docker save ${image_name}:${image_tag} |
+            gzip > resources/odc-${image_tag}-${cpu_arch}.tar.gz
+        ;;
     push)
         docker tag ${image_name}:${image_tag} ${image_name}:latest
         docker push ${image_name}:${image_tag}
         docker push ${image_name}:latest
         ;;
     *)
-        echo "Usage: build.sh build-odc [ <IMAGE_TAG> ]"
+        echo "Usage: build.sh build <IMAGE_TAG:odc_version>"
         echo "       build.sh login <USERNAME>"
-        echo "       build.sh push [ <IMAGE_TAG> ]"
+        echo "       build.sh push <IMAGE_TAG:odc_version>"
+        echo "       build.sh save <IMAGE_TAG:odc_version>"
         ;;
     esac
 }

distribution/docker/build.sh

@@ -4,7 +4,11 @@
 #            the jdk version used in docker is java-1.8.0-openjdk-1.8.0.262
 # 2021-7-15：sync centos7 base image to aliyun docker reg for build stablility
 # 2022-05-10：base image change to anolisos8 for avoid system vulnerabilities
-FROM docker.io/openanolis/anolisos:8.6-x86_64
+# 2023-11-09: one Dockerfile for different cpu architectures, amd64 and arm64
+ARG ARCH=amd64
+FROM docker.io/openanolis/anolisos:8.6-x86_64 AS amd64-base
+FROM docker.io/openanolis/anolisos:8.6-aarch64 AS arm64-base
+FROM ${ARCH}-base AS base
 
 # set labels
 LABEL maintainer="ODC <[email protected]>"

distribution/docker/odc/Dockerfile

@@ -231,6 +231,16 @@ When plaintext configuration is identified, EncryptableConfiguration will automa
 
 ## 3.1 jar build and run
 
+### 3.1.1 Dependent component installation
+
+ODC relies on 2 self-developed components, which you can see in `lib` respectively. In the official release, if these two components are modified, we will upload them to the maven central warehouse for reference in advance, but during the development process, we will reference them through local installation. You need to manually install these two components locally before building, otherwise the build may not be successful. You can complete the installation of dependent components through the following shell script:
+
+```shell
+script/build_libs.sh
+```
+
+### 3.1.2 Build and start
+
 Build or run scripts locate at `script` directory.
 
 Build
@@ -316,7 +326,7 @@ The first run will fail because there are no startup parameters configured, and
 When starting ODC Server, add the following configuration to the startup options, which will automatically pull in the front-end resources.
 
 ```shell
---ODC_INDEX_PAGE_URI=http://alipay-rmsdeploy-image.cn-hangzhou.alipay.aliyun-inc.com/oceanbase/odc/release-4.2.0/index.html
+--ODC_INDEX_PAGE_URI=http://static-resource-server/dev-4.2.2/index.html
 ```
 
 ### 3.3.1 Run arguments
@@ -329,7 +339,21 @@ Notice here we use Spring environment variables arguments `--`, not VM options
 --ODC_DATABASE_PASSWORD=your_metadb_password --server.port=8989
 ```
 
-### 3.3.2 Configuration
+### 3.3.2 Build support components
+
+First, you need to complete the installation of dependent components according to the instructions in Chapter 3.1.1. If you have already completed this step, please ignore it.
+
+Next, you need to complete the build of the ODC plugin. You can see them in the `server/plugins` and `server/starters` directories. You can complete the build through the following shell command:
+
+```shell
+mvn clean package -Dmaven.test.skip=true
+```
+
+The building of the plugin is integrated into the ODC building process. By default, you can see these built plugins in the `distribution/plugins` and `distribution/starters` directories:
+
+![image.png](./images/odc-plugins-starters.png)
+
+### 3.3.3 Configuration
 
 Run OdcServer
 ![image.png](../en-US/images/idea-run-configuration-start-odc-server.png)

docs/en-US/DEVELOPER_GUIDE.md

@@ -203,6 +203,16 @@ odc.mysql.default.commandline=your_mysql_test_server_mysql_cli_commandline
 
 ## 3.1 jar 构建和启动
 
+### 3.1.1 依赖组件安装
+
+ODC 依赖 2 个自研组件，您可以分别在`lib`目录下看到它们。在正式的发布中，如果对这 2 个组件进行了修改，我们会提前将其上传至 maven 中央仓库以供引用，但是在开发过程中我们是通过本地安装的方式进行引用的。您在构建之前需要手动将这 2 个组件安装到本地，否则可能会导致构建不成功。您可以通过以下 shell 脚本完成依赖组件的安装：
+
+```shell
+script/build_libs.sh
+```
+
+### 3.1.2 构建和启动
+
 构建和启动可以使用 `script` 目录的脚本实现，过程如下
 
 构建
@@ -288,7 +298,7 @@ OdcServer 类是 odc-server 程序入口，可直接运行。
 启动 ODC Server 时在启动项中添加如下配置，会自动拉取前端资源。
 
 ```shell
---ODC_INDEX_PAGE_URI=http://alipay-rmsdeploy-image.cn-hangzhou.alipay.aliyun-inc.com/oceanbase/odc/release-4.2.0/index.html
+--ODC_INDEX_PAGE_URI=http://static-resource-server/dev-4.2.2/index.html
 ```
 
 ### 3.3.1 启动参数
@@ -299,7 +309,21 @@ OdcServer 类是 odc-server 程序入口，可直接运行。
 --ODC_DATABASE_HOST=your_metadb_host --ODC_DATABASE_PORT=your_metadb_port --ODC_DATABASE_NAME=your_metadb_database --ODC_DATABASE_USERNAME=your_metadb_user --ODC_DATABASE_PASSWORD=your_metadb_password --server.port=8989
 ```
 
-### 3.3.2 配置过程
+### 3.3.2 构建支持组件
+
+首先您需要按照 3.1.1 章节的指引完成依赖组件的安装，如果您已经完成了这一步，请忽略。
+
+接下来，您需要完成 ODC 插件的构建，您可以在`server/plugins`以及`server/starters`目录中看到它们，您可以通过以下 shell 命令完成构建：
+
+```shell
+mvn clean package -Dmaven.test.skip=true
+```
+
+插件的构建是集成在 ODC 的构建过程中的。默认情况下，您可以在`distribution/plugins`以及`distribution/starters`目录中看到这些构建完成的插件：
+
+![image.png](../en-US/images/odc-plugins-starters.png)
+
+### 3.3.3 配置过程
 
 运行 OdcServer
 ![image.png](../en-US/images/idea-run-configuration-start-odc-server.png)