From fa51db3117c3e040d54a205fe596a5e37faa52f5 Mon Sep 17 00:00:00 2001 From: spaceoddity91719 Date: Fri, 18 Feb 2022 17:42:05 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0orafce?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v2.1/reference-guide/oracle-plugins/orafce-user-guide.md | 2 +- .../v2.1/reference-guide/oracle-plugins/orafce-user-guide.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/product/en/docs-mogdb/v2.1/reference-guide/oracle-plugins/orafce-user-guide.md b/product/en/docs-mogdb/v2.1/reference-guide/oracle-plugins/orafce-user-guide.md index 81e8a23b..10f445e2 100644 --- a/product/en/docs-mogdb/v2.1/reference-guide/oracle-plugins/orafce-user-guide.md +++ b/product/en/docs-mogdb/v2.1/reference-guide/oracle-plugins/orafce-user-guide.md @@ -42,7 +42,7 @@ Check all schemas: Check functions where some functions include parameters and some functions do not include parameters. The parameter type is boolean. ```sql -\df +\df dbms_output.* ``` Example of functions that do not include parameters: diff --git a/product/zh/docs-mogdb/v2.1/reference-guide/oracle-plugins/orafce-user-guide.md b/product/zh/docs-mogdb/v2.1/reference-guide/oracle-plugins/orafce-user-guide.md index 61f471af..29649bca 100644 --- a/product/zh/docs-mogdb/v2.1/reference-guide/oracle-plugins/orafce-user-guide.md +++ b/product/zh/docs-mogdb/v2.1/reference-guide/oracle-plugins/orafce-user-guide.md @@ -42,7 +42,7 @@ create extension orafce; 检查函数，其中函数分为有参数、无参数，参数类型为boolean。 ```sql -\df +\df dbms_output.* ``` 无参： -- Gitee From b318923d99478ea943191b890d2bf58422289f79 Mon Sep 17 00:00:00 2001 From: spaceoddity91719 Date: Mon, 21 Feb 2022 11:23:01 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E8=A1=A8=E5=92=8C=E7=B3=BB=E7=BB=9F=E8=A7=86=E5=9B=BE=E6=A6=82?= =?UTF-8?q?=E8=BF=B0=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../overview-of-system-catalogs-and-system-views.md | 2 +- .../overview-of-system-catalogs-and-system-views.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/product/en/docs-mogdb/v2.1/reference-guide/system-catalogs-and-system-views/overview-of-system-catalogs-and-system-views.md b/product/en/docs-mogdb/v2.1/reference-guide/system-catalogs-and-system-views/overview-of-system-catalogs-and-system-views.md index 45338f13..f7475b4a 100644 --- a/product/en/docs-mogdb/v2.1/reference-guide/system-catalogs-and-system-views/overview-of-system-catalogs-and-system-views.md +++ b/product/en/docs-mogdb/v2.1/reference-guide/system-catalogs-and-system-views/overview-of-system-catalogs-and-system-views.md @@ -86,7 +86,7 @@ DROP VIEW IF EXISTS test_view; DROP TABLE IF EXISTS table1; ``` -### DELETE VEW +### DELETE VIEW ```sql CREATE TABLE IF NOT EXISTS table1(id int, a char(6), b varchar(6), c varchar(6)); diff --git a/product/zh/docs-mogdb/v2.1/reference-guide/system-catalogs-and-system-views/overview-of-system-catalogs-and-system-views.md b/product/zh/docs-mogdb/v2.1/reference-guide/system-catalogs-and-system-views/overview-of-system-catalogs-and-system-views.md index 741e909d..43fddeaa 100644 --- a/product/zh/docs-mogdb/v2.1/reference-guide/system-catalogs-and-system-views/overview-of-system-catalogs-and-system-views.md +++ b/product/zh/docs-mogdb/v2.1/reference-guide/system-catalogs-and-system-views/overview-of-system-catalogs-and-system-views.md @@ -95,7 +95,7 @@ DROP VIEW IF EXISTS test_view; DROP TABLE IF EXISTS table1; ``` -### DELETE VEW +### DELETE VIEW ```sql CREATE TABLE IF NOT EXISTS table1(id int, a char(6), b varchar(6), c varchar(6)); -- Gitee From ee43ad9cc9c67c1e78608ad1544f1065ef3e07e4 Mon Sep 17 00:00:00 2001 From: travelliu Date: Mon, 28 Feb 2022 14:19:17 +0800 Subject: [PATCH 3/5] build: modify gitee build script --- nginx.conf | 5 +++++ scripts/build_pdf.sh | 37 ++++++++++++++++++++++++++++++++++++- scripts/gitee_build_pr.sh | 16 ++++++++++++---- 3 files changed, 53 insertions(+), 5 deletions(-) diff --git a/nginx.conf b/nginx.conf index a82019a5..bbbb7e08 100644 --- a/nginx.conf +++ b/nginx.conf @@ -42,9 +42,14 @@ http { proxy_ignore_client_abort on; server { listen 80; + # server_name docs.mogdb.io; charset utf-8; root /usr/share/nginx/html/; index index.html; + error_page 404 /404; + location / { + try_files $uri $uri/ =404; + } } include /etc/nginx/conf.d/*.conf; } diff --git a/scripts/build_pdf.sh b/scripts/build_pdf.sh index f9295f6c..187a5a31 100755 --- a/scripts/build_pdf.sh +++ b/scripts/build_pdf.sh @@ -36,6 +36,8 @@ only_build_mogdb=no # 只 构建 mogha～ 文档 only_build_mogha=no +# 只 构建 mogha～ 文档 +only_build_manager=no function h1() { @@ -223,6 +225,32 @@ function generate_mtk_pdf() { done } +managerDocsVersions=("v1.0") + + +declare -A managerZnTitle=( \ + ["toc"]="MogDB-Manager-指南" \ +) + +declare -A managerEnTitle=( \ + ["toc"]="MogDB-Manager-Reference" \ +) + +function generate_manager_pdf() { + for(( i=0;i<${#mogdbDocsLanguages[@]};i++)) + do + language=${mogdbDocsLanguages[i]} + for(( j=0;j<${#managerDocsVersions[@]};j++)) + do + version=${managerDocsVersions[j]} + if [[ "$language" == "zh" ]]; then + _generate_docs_pdf "docs-manager" $language $version managerZnTitle + elif [[ "$language" == "en" ]]; then + _generate_docs_pdf "docs-manager" $language $version managerEnTitle + fi + done + done +} scaDocsVersions=("v4.0" "v4.1") declare -A scaZnTitle=( \ @@ -360,6 +388,7 @@ function _usage() --mvd build mvd docs pdf --mtk build mtk docs pdf --mogha build mogha docs pdf + --manager build manager docs pdf --nobuild not build pdf --tex build tex file -u | --upload upload build pdf to oss @@ -376,7 +405,7 @@ Optnum=$# # NOTE: This requires GNU getopt. On Mac OS X and FreeBSD, you have to install this # separately; see below. -TEMP=$(getopt -o h,u --long help,mtk,sca,mvd,nobuild,mogha,mogdb,upload,tex \ +TEMP=$(getopt -o h,u --long help,mtk,sca,mvd,nobuild,mogha,mogdb,manager,upload,tex \ -n 'buld_pdf' -- "$@") if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi @@ -394,6 +423,7 @@ while true; do --mvd ) build_all=no;only_build_mvd=yes; shift ;; --mogha ) build_all=no;only_build_mogha=yes;shift ;; --mogdb ) build_all=no;only_build_mogdb=yes;shift ;; + --manager ) build_all=no;only_build_manager=yes;shift ;; --tex ) build_tex=yes;shift ;; * ) break ;; esac @@ -429,6 +459,11 @@ if [[ ${nobuild} != "no" ]]; then h1 "Build MogDB " generate_mogdb_pdf fi + # build mogdb pdf + if [[ "${build_all}" == "yes" ]] || [[ "${only_build_manager}" == "yes" ]]; then + h1 "Build MogDB Manager" + generate_manager_pdf + fi fi diff --git a/scripts/gitee_build_pr.sh b/scripts/gitee_build_pr.sh index 53866523..96478eca 100755 --- a/scripts/gitee_build_pr.sh +++ b/scripts/gitee_build_pr.sh @@ -1,5 +1,9 @@ #!/usr/bin/env bash +# export giteePullRequestIid=12 +# export BUILD_DIR=/data/pr +# export giteeSourceBranch=docs-develop + set -e conName="pr_"${giteePullRequestIid} @@ -37,7 +41,7 @@ if [[ ${retCode} != 0 ]]; then exit 1 fi -yarn build +yarn build --verbose # npm run build retCode=$? if [[ ${retCode} != 0 ]]; then @@ -54,7 +58,7 @@ if [ -f ${pr_port_file} ];then else for port in {9001..10000}; do - if [ ` lsof -i:${port} | wc -l` -eq 0 ]; then + if [ `netstat -apn |grep ${port} | wc -l` -eq 0 ]; then pr_port=${port} break fi @@ -66,10 +70,14 @@ if [ ! -n "${pr_port}" ]; then exit 1 fi +cp nginx.conf ${dir}/nginx.conf +sed -i "s/listen 80;/listen ${pr_port};/g" ${dir}/nginx.conf +sed -i "s/# server_name docs.mogdb.io;/server_name docs.mogdb.io;/g" ${dir}/nginx.conf + docker run -d \ - -v `pwd`/nginx.conf:/etc/nginx/nginx.conf \ + -v ${dir}/nginx.conf:/etc/nginx/nginx.conf \ -v ${publicDir}:/usr/share/nginx/html \ - -p ${pr_port}:80 \ + -p ${pr_port}:${pr_port} \ --name ${conName} \ nginx -- Gitee From a985ad2053a19f01aa4b58cc9db9bef51ba15bdd Mon Sep 17 00:00:00 2001 From: travelliu Date: Tue, 1 Mar 2022 17:08:36 +0800 Subject: [PATCH 4/5] mtk: mtk release v2.2.2 --- product/en/docs-mtk/v2.0/release-notes.md | 46 ++++++++++++++++++----- product/zh/docs-mtk/v2.0/release-notes.md | 28 ++++++++++++++ 2 files changed, 65 insertions(+), 9 deletions(-) diff --git a/product/en/docs-mtk/v2.0/release-notes.md b/product/en/docs-mtk/v2.0/release-notes.md index c7a4bdc5..b2eba715 100644 --- a/product/en/docs-mtk/v2.0/release-notes.md +++ b/product/en/docs-mtk/v2.0/release-notes.md @@ -7,19 +7,47 @@ date: 2021-09-13 # Release Notes +## v2.2.2 + +2022-03-01 + +- [mtk_2.2.2_darwin_amd64.tar.gz](https://cdn-mogdb.enmotech.com/mtk/v2.2.2/mtk_2.2.2_darwin_amd64.tar.gz) +- [mtk_2.2.2_darwin_amd64_db2.tar.gz](https://cdn-mogdb.enmotech.com/mtk/v2.2.2/mtk_2.2.2_darwin_amd64_db2.tar.gz) +- [mtk_2.2.2_darwin_arm64.tar.gz](https://cdn-mogdb.enmotech.com/mtk/v2.2.2/mtk_2.2.2_darwin_arm64.tar.gz) +- [mtk_2.2.2_linux_amd64.tar.gz](https://cdn-mogdb.enmotech.com/mtk/v2.2.2/mtk_2.2.2_linux_amd64.tar.gz) +- [mtk_2.2.2_linux_amd64_db2.tar.gz](https://cdn-mogdb.enmotech.com/mtk/v2.2.2/mtk_2.2.2_linux_amd64_db2.tar.gz) +- [mtk_2.2.2_linux_arm64.tar.gz](https://cdn-mogdb.enmotech.com/mtk/v2.2.2/mtk_2.2.2_linux_arm64.tar.gz) +- [mtk_2.2.2_windows_amd64.tar.gz](https://cdn-mogdb.enmotech.com/mtk/v2.2.2/mtk_2.2.2_windows_amd64.tar.gz) +- [mtk_2.2.2_windows_amd64_db2.tar.gz](https://cdn-mogdb.enmotech.com/mtk/v2.2.2/mtk_2.2.2_windows_amd64_db2.tar.gz) +- [mtk_checksums.txt](https://cdn-mogdb.enmotech.com/mtk/v2.2.2/mtk_checksums.txt) + +### Feat + +- Added check if the orafce plugin is installed and skips some syntax conversions +- Disables 'connect by' syntax conversion for BigDB 2.1.0 +- Optimized the migration of Oracle to openGauss/MogDB constraint renaming logic +- Added Oracle table data character set check + +### Fix + +- Code smell and security issues +- Migration of Oracle to MySQL section issue +- Migrated Some Syntax Conversion Issues from Oracle to MogDB 2.1.0 +- DB2 clob length issue + ## v2.2.1 2022-01-20 -- [mtk_2.2.1_darwin_amd64.tar.gz](https://cdn-mogdb.enmotech.com//mtk/v2.2.1/mtk_2.2.1_darwin_amd64.tar.gz) -- [mtk_2.2.1_darwin_amd64_db2.tar.gz](https://cdn-mogdb.enmotech.com//mtk/v2.2.1/mtk_2.2.1_darwin_amd64_db2.tar.gz) -- [mtk_2.2.1_darwin_arm64.tar.gz](https://cdn-mogdb.enmotech.com//mtk/v2.2.1/mtk_2.2.1_darwin_arm64.tar.gz) -- [mtk_2.2.1_linux_amd64.tar.gz](https://cdn-mogdb.enmotech.com//mtk/v2.2.1/mtk_2.2.1_linux_amd64.tar.gz) -- [mtk_2.2.1_linux_amd64_db2.tar.gz](https://cdn-mogdb.enmotech.com//mtk/v2.2.1/mtk_2.2.1_linux_amd64_db2.tar.gz) -- [mtk_2.2.1_linux_arm64.tar.gz](https://cdn-mogdb.enmotech.com//mtk/v2.2.1/mtk_2.2.1_linux_arm64.tar.gz) -- [mtk_2.2.1_windows_amd64.tar.gz](https://cdn-mogdb.enmotech.com//mtk/v2.2.1/mtk_2.2.1_windows_amd64.tar.gz) -- [mtk_2.2.1_windows_amd64_db2.tar.gz](https://cdn-mogdb.enmotech.com//mtk/v2.2.1/mtk_2.2.1_windows_amd64_db2.tar.gz) -- [mtk_checksums.txt](https://cdn-mogdb.enmotech.com//mtk/v2.2.1/mtk_checksums.txt) +- [mtk_2.2.1_darwin_amd64.tar.gz](https://cdn-mogdb.enmotech.com/mtk/v2.2.1/mtk_2.2.1_darwin_amd64.tar.gz) +- [mtk_2.2.1_darwin_amd64_db2.tar.gz](https://cdn-mogdb.enmotech.com/mtk/v2.2.1/mtk_2.2.1_darwin_amd64_db2.tar.gz) +- [mtk_2.2.1_darwin_arm64.tar.gz](https://cdn-mogdb.enmotech.com/mtk/v2.2.1/mtk_2.2.1_darwin_arm64.tar.gz) +- [mtk_2.2.1_linux_amd64.tar.gz](https://cdn-mogdb.enmotech.com/mtk/v2.2.1/mtk_2.2.1_linux_amd64.tar.gz) +- [mtk_2.2.1_linux_amd64_db2.tar.gz](https://cdn-mogdb.enmotech.com/mtk/v2.2.1/mtk_2.2.1_linux_amd64_db2.tar.gz) +- [mtk_2.2.1_linux_arm64.tar.gz](https://cdn-mogdb.enmotech.com/mtk/v2.2.1/mtk_2.2.1_linux_arm64.tar.gz) +- [mtk_2.2.1_windows_amd64.tar.gz](https://cdn-mogdb.enmotech.com/mtk/v2.2.1/mtk_2.2.1_windows_amd64.tar.gz) +- [mtk_2.2.1_windows_amd64_db2.tar.gz](https://cdn-mogdb.enmotech.com/mtk/v2.2.1/mtk_2.2.1_windows_amd64_db2.tar.gz) +- [mtk_checksums.txt](https://cdn-mogdb.enmotech.com/mtk/v2.2.1/mtk_checksums.txt) ### Feat diff --git a/product/zh/docs-mtk/v2.0/release-notes.md b/product/zh/docs-mtk/v2.0/release-notes.md index 88aa0dba..620b9e1d 100644 --- a/product/zh/docs-mtk/v2.0/release-notes.md +++ b/product/zh/docs-mtk/v2.0/release-notes.md @@ -7,6 +7,34 @@ date: 2021-09-17 # 发布记录 +## v2.2.2 + +2022-03-01 + +- [mtk_2.2.2_darwin_amd64.tar.gz](https://cdn-mogdb.enmotech.com/mtk/v2.2.2/mtk_2.2.2_darwin_amd64.tar.gz) +- [mtk_2.2.2_darwin_amd64_db2.tar.gz](https://cdn-mogdb.enmotech.com/mtk/v2.2.2/mtk_2.2.2_darwin_amd64_db2.tar.gz) +- [mtk_2.2.2_darwin_arm64.tar.gz](https://cdn-mogdb.enmotech.com/mtk/v2.2.2/mtk_2.2.2_darwin_arm64.tar.gz) +- [mtk_2.2.2_linux_amd64.tar.gz](https://cdn-mogdb.enmotech.com/mtk/v2.2.2/mtk_2.2.2_linux_amd64.tar.gz) +- [mtk_2.2.2_linux_amd64_db2.tar.gz](https://cdn-mogdb.enmotech.com/mtk/v2.2.2/mtk_2.2.2_linux_amd64_db2.tar.gz) +- [mtk_2.2.2_linux_arm64.tar.gz](https://cdn-mogdb.enmotech.com/mtk/v2.2.2/mtk_2.2.2_linux_arm64.tar.gz) +- [mtk_2.2.2_windows_amd64.tar.gz](https://cdn-mogdb.enmotech.com/mtk/v2.2.2/mtk_2.2.2_windows_amd64.tar.gz) +- [mtk_2.2.2_windows_amd64_db2.tar.gz](https://cdn-mogdb.enmotech.com/mtk/v2.2.2/mtk_2.2.2_windows_amd64_db2.tar.gz) +- [mtk_checksums.txt](https://cdn-mogdb.enmotech.com/mtk/v2.2.2/mtk_checksums.txt) + +### Feat + +- 增加检查orafce插件是否安装并跳过部分语法转换 +- 针对MogDB 2.1.0 禁用`connect by`语法转换 +- 优化迁移Oracle到openGauss/MogDB 约束改名逻辑 +- 增加Oracle表数据字符集检查 + +### Fix + +- 代码异味和安全问题 +- 迁移 Oracle 到 MySQL 部分问题 +- 迁移 Oracle to MogDB 2.1.0 部分语法转换问题 +- DB2 clob 长度问题 + ## v2.2.1 2022-01-20 -- Gitee From 7e2396cfb62040bff39d037f42584dc35827a1bf Mon Sep 17 00:00:00 2001 From: travelliu Date: Tue, 1 Mar 2022 09:17:20 +0000 Subject: [PATCH 5/5] fix: The word error --- product/en/docs-mtk/v2.0/release-notes.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/product/en/docs-mtk/v2.0/release-notes.md b/product/en/docs-mtk/v2.0/release-notes.md index b2eba715..bb72f4a2 100644 --- a/product/en/docs-mtk/v2.0/release-notes.md +++ b/product/en/docs-mtk/v2.0/release-notes.md @@ -23,8 +23,8 @@ date: 2021-09-13 ### Feat -- Added check if the orafce plugin is installed and skips some syntax conversions -- Disables 'connect by' syntax conversion for BigDB 2.1.0 +- Added check if the `orafce` plugin is installed and skips some syntax conversions +- Disables `connect by` syntax conversion for MogDB 2.1.0 - Optimized the migration of Oracle to openGauss/MogDB constraint renaming logic - Added Oracle table data character set check -- Gitee