5.4.15-16669515 release

polardb · Oct 28, 2022 · 6d37a4c · 6d37a4c
1 parent dc955f8
commit 6d37a4c
Show file tree

Hide file tree

Showing 2,941 changed files with 238,718 additions and 49,038 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
diff --git a/.github/workflows/build_and_unit_test.yaml b/.github/workflows/build_and_unit_test.yaml
diff --git a/.github/workflows/dml_ddl_test.yaml b/.github/workflows/dml_ddl_test.yaml
diff --git a/...er/privileges/PolarCreateUserHandler.java → codestyle/format.sh b/...er/privileges/PolarCreateUserHandler.java → codestyle/format.sh
diff --git a/codestyle/format_lab.sh b/codestyle/format_lab.sh
@@ -2,17 +2,19 @@
 
 baseDir=`pwd`/
 commit=`git merge-base origin/polardbx_opensource HEAD`
-files=`git diff --name-only ${commit} | grep '.java' | grep -v 'polardbx-calcite' | grep -v 'polardbx-rpc/src/main/java/com/mysql/cj'| grep -v 'com/alibaba/polardbx/rpc/cdc'| xargs -I {} echo ${baseDir}{}` 
+files=`git diff --name-only ${commit} | grep '.java' | grep -v 'polardbx-calcite' | grep -v 'polardbx-rpc/src/main/java/com/mysql/cj'| grep -v 'com/alibaba/polardbx/rpc/cdc'| xargs -I {} echo ${baseDir}{}`
 count=0
 batchFile=''
 for file in $files; do
-	count=$((($count + 1) % 100))
-	batchFile=$batchFile' '$file
-	if [[ $count -eq 0 ]]; then
-		/home/admin/idea/bin/format.sh -s ${baseDir}'codestyle/codestyle-idea.xml' -m '*.java' ${batchFile}
-		batchFile=''
+  if [ -f "$file" ]; then
+	  count=$((($count + 1) % 100))
+	  batchFile=$batchFile' '$file
+	  if [[ $count -eq 0 ]]; then
+		  /home/admin/idea/bin/format.sh -s ${baseDir}'codestyle/codestyle-idea.xml' -m '*.java' ${batchFile}
+		  batchFile=''
+	  fi
+	  trap "echo Exited!; exit;" SIGINT SIGTERM
 	fi
-	trap "echo Exited!; exit;" SIGINT SIGTERM
 done
 
 if [[ ! -z $batchFile ]]; then

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM polardbx/galaxybasejava:v20220621
+FROM polardbx/galaxybasejava:20221027-sdfa
 
 WORKDIR /home/admin
 

diff --git a/docs/en/quickstart-development.md b/docs/en/quickstart-development.md
@@ -215,7 +215,7 @@ polardbx.instance.id=polardbx-polardbx
 mem_size=16000
 metaDb_url=jdbc:mysql://127.0.0.1:4886/polardbx_meta_db_polardbx?useSSL=false
 metaDb_username=my_polarx
-metaDb_password=HMqvkvXZtT7XedA6t2IWY8+D7fJWIJir/mIY1Nf1b58=
+metaDbPasswd=HMqvkvXZtT7XedA6t2IWY8+D7fJWIJir/mIY1Nf1b58=
 polarx_url=jdbc:mysql://127.0.0.1:8527/__cdc__
 polarx_username=polardbx_root
 polarx_password=H1AzXc2NmCs61dNjH5nMvA==

diff --git a/docs/zh_CN/quickstart-development.md b/docs/zh_CN/quickstart-development.md
@@ -213,7 +213,7 @@ polardbx.instance.id=polardbx-polardbx
 mem_size=16000
 metaDb_url=jdbc:mysql://127.0.0.1:4886/polardbx_meta_db_polardbx?useSSL=false
 metaDb_username=my_polarx
-metaDb_password=HMqvkvXZtT7XedA6t2IWY8+D7fJWIJir/mIY1Nf1b58=
+metaDbPasswd=HMqvkvXZtT7XedA6t2IWY8+D7fJWIJir/mIY1Nf1b58=
 polarx_url=jdbc:mysql://127.0.0.1:8527/__cdc__
 polarx_username=polardbx_root
 polarx_password=H1AzXc2NmCs61dNjH5nMvA==

diff --git a/docs/zh_CN/quickstart-how-to-debug-cn.md b/docs/zh_CN/quickstart-how-to-debug-cn.md
@@ -99,10 +99,6 @@ metaDbPasswd=+row16HHcsxn1JZ4YKcsrzjxOg1WZcRLUgba/IRagfc=
 
 添加Idea的环境变量`dnPasswordKey`，默认使用asdf1234ghjk5678
 
-将Idea中`Preference - Build,Execution,Deployment - Build tools - maven - importing - VM options for importer`设置为`-Xmx2048m -Xms2048m`
-
-将Idea中`Preference-Compiler-Build process heap size`设置为4096
-
 ![add_env_variable](../images/add_env_variable.png)
 
 ### 运行TddlLauncher.java