Merge branch 'master' of https://gitee.com/lishifu_db/openGauss-server

.clang-format

@@ -0,0 +1,85 @@
+---
+Language: Cpp
+# BasedOnStyle:	LLVM
+SortIncludes: false
+AccessModifierOffset: -4
+DerivePointerAlignment: false
+PointerAlignment: Left
+ConstructorInitializerIndentWidth: 4
+AlignEscapedNewlinesLeft: true
+AlignTrailingComments: true
+AllowShortBlocksOnASingleLine: false
+AllowShortFunctionsOnASingleLine: false
+AllowShortIfStatementsOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakTemplateDeclarations: true
+BinPackArguments: false
+AlwaysBreakBeforeMultilineStrings: false
+BreakBeforeBinaryOperators: None
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: false
+BinPackParameters: true
+ColumnLimit:    120
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+DerivePointerBinding: true
+ExperimentalAutoDetectBinPacking: false
+IndentCaseLabels: true
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+ObjCSpaceBeforeProtocolList: false
+PenaltyBreakBeforeFirstCallParameter: 1
+PenaltyBreakComment: 200
+PenaltyBreakString: 1000
+PenaltyBreakFirstLessLess: 120
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 200
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+PointerBindsToType: true
+Cpp11BracedListStyle: true
+Standard:        Auto
+IndentWidth:     4
+TabWidth:        4
+UseTab:          Never
+BreakBeforeBraces: Custom
+BraceWrapping:   
+  AfterClass:      false
+  AfterControlStatement: false
+  AfterEnum:       false
+  AfterFunction:   true
+  AfterNamespace:  false
+  AfterObjCDeclaration: false
+  AfterStruct:     false
+  AfterUnion:      false
+  AfterExternBlock: false
+  BeforeCatch:     false
+  BeforeElse:      false
+  IndentBraces:    false
+  SplitEmptyFunction: false
+  SplitEmptyRecord: false
+  SplitEmptyNamespace: false
+IndentFunctionDeclarationAfterType: true
+SpacesInParentheses: false
+SpacesInAngles: false
+SpaceInEmptyParentheses: false
+SpacesInCStyleCastParentheses: false
+SpaceAfterControlStatementKeyword: true
+SpaceBeforeAssignmentOperators: true
+SpacesBeforeTrailingComments: 2
+ContinuationIndentWidth: 4
+CommentPragmas:  '^lint'
+MacroBlockBegin: "</span>
+
+^ *PROG *$|</span>
+
+CATCH_ALL_ERROR.*$"
+MacroBlockEnd: "</span>
+
+^ *END_PROG *$|</span>
+
+END_CATCH_ERROR$"
+AlignAfterOpenBracket: DontAlign
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+...

README.md

@@ -5,7 +5,7 @@
     - [Creating a Configuration File](#creating-a-configuration-file)
     - [Initializing the Installation Environment](#initializing-the-installation-environment)
 - [Executing Installation](#executing-installation)
-  [Uninstalling the opeinGauss](#uninstalling-the-openGauss)
+-  [Uninstalling the openGauss](#uninstalling-the-openGauss)
 - [Compilation](#compilation)
     - [Overview](#overview)
     - [OS and Software Dependency Requirements](#os-and-software-dependency-requirements)
@@ -47,7 +47,7 @@ Bind NIC interrupts to different cores and bind cores to different background th
 
 **ARM Optimization**
 
-Optimize atomic operations based on ARM platform LSE instructions, impletmenting efficient operation of critical sections.
+Optimize atomic operations based on ARM platform LSE instructions, implementing efficient operation of critical sections.
 
 **SQL Bypass**
 
@@ -405,7 +405,7 @@ build.sh in openGauss-server is an important script tool during compilation. It
 The following table describes the parameters.
 
 | Option      | Default Value                | Parameter                      | Description                                                  |
-| :----- | :--------------------------- | :----------------------------- | :--------------------------------------- |
+| :----- | :--------------------------- | :----------------------------- | :----------------------------------------------------------- |
 | -h      | Do not use this option.      | -                              | Help menu.                                                   |
 | -m      | release                      | [debug \| release \| memcheck] | Selects the target version.                                  |
 | -3rd      | ${Code directory}/binarylibs | [binarylibs path]              | Specifies the path of binarylibs. The path must be an absolute path. |
@@ -533,7 +533,7 @@ Compilation log: **make_compile.log**
 
 Please read the chapter **Compiling by build.sh** first to understand the usage of build.sh and how to compile openGauss by using the script.
 
-Now you can compile the installation package with just adding a option `-pkg`.
+Now you can compile the installation package with just adding an option `-pkg`.
 
 ```
 [user@linux openGauss-server]$ sh build.sh -m [debug | release | memcheck] -3rd [binarylibs path] -pkg

src/bin/gs_guc/cluster_guc.cpp

@@ -11,7 +11,8 @@
  * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
  * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
  * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
- * See the Mulan PSL v2 for more details. *---------------------------------------------------------------------------------------
+ * See the Mulan PSL v2 for more details.
+ * ---------------------------------------------------------------------------------------
  *
  *  cluster_guc.cpp
  *        Interfaces for analysis manager of PDK tool.

src/gausskernel/dbmind/xtuner/Readme.md

@@ -27,11 +27,13 @@ pip install -r requirements.txt
 ## Dependencies
 
     python3.5+
-    tensorflow==1.15.2
+    tensorflow>=2.2.0
-    keras-rl
+    keras-rl2
-    keras
+    keras>=2.4.0
     paramiko
 
+**Suggest:** Firstly, please upgrade your pip. ```python -m pip install --upgrade pip```
+
 ## Start tuning
 1. Start your database instance first;
 2. Choose a benchmark(TPC-C, TPC-H, etc.) and store data in your database;

src/gausskernel/dbmind/xtuner/requirements.txt

@@ -1,4 +1,4 @@
-tensorflow==1.15.2
+tensorflow>=2.2.0
-keras-rl
+keras-rl2
-keras<=2.2.5
+keras>=2.4.0
 paramiko

src/gausskernel/storage/access/dfs/dfs_query.cpp

@@ -299,7 +299,7 @@ static Oid GetOperatorByTypeId(Oid typeID, Oid accessMethodId, int16 strategyNum
 /*
  * Parse the fileNames string from the split List.
  * @_in_out param splitList: point to the original split List, which may contain multiple files.
- * @_in param currentFileName: point to the first file or the only file like '/user/file1.orc' (new buffer).
+ * @_in param currentFileName: point to the first file.
  * @return Return the split parsed from the list.
  */
 SplitInfo *ParseFileSplitList(List **splitList, char **currentFileName)

src/include/access/dfs/dfs_query.h

@@ -1024,7 +1024,7 @@ DfsPrivateItem *MakeDfsPrivateItem(List *columnList, List *targetList, List *res
 /*
  * Parse the fileNames string from the split List.
  * @_in_out param splitList: point to the original split List, which may contain multiple files.
- * @_in param currentFileName: point to the first file or the only file '/user/demai/file1.orc' (new buffer).
+ * @_in param currentFileName: point to the first file.
  * @return Return the split parsed from the list.
  */
 SplitInfo *ParseFileSplitList(List **splitList, char **currentFileName);