Bump clang-format version to 11

There were no code changes associated with this version bump.

Also, fix path intent file in fmt script.

.clang-format

@@ -4,13 +4,15 @@ AccessModifierOffset: -4
 AlignAfterOpenBracket: Align
 AlignConsecutiveMacros: false
 AlignConsecutiveAssignments: false
+AlignConsecutiveBitFields: false
 AlignConsecutiveDeclarations: false
 AlignEscapedNewlines: Left
-AlignOperands:   true
+AlignOperands:   Align
 AlignTrailingComments: true
 AllowAllArgumentsOnNextLine: true
 AllowAllConstructorInitializersOnNextLine: true
 AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortEnumsOnASingleLine: true
 AllowShortBlocksOnASingleLine: Never
 AllowShortCaseLabelsOnASingleLine: false
 AllowShortFunctionsOnASingleLine: None
@@ -26,7 +28,7 @@ BinPackParameters: true
 BraceWrapping:
   AfterCaseLabel:  true
   AfterClass:      true
-  AfterControlStatement: true
+  AfterControlStatement: Always
   AfterEnum:       true
   AfterFunction:   true
   AfterNamespace:  true
@@ -36,6 +38,8 @@ BraceWrapping:
   AfterExternBlock: false
   BeforeCatch:     true
   BeforeElse:      true
+  BeforeLambdaBody: false
+  BeforeWhile:     false
   IndentBraces:    false
   SplitEmptyFunction: true
   SplitEmptyRecord: true
@@ -88,10 +92,13 @@ IncludeCategories:
 IncludeIsMainRegex: '([-_](test|unittest))?$'
 IncludeIsMainSourceRegex: ''
 IndentCaseLabels: true
+IndentCaseBlocks: false
 IndentGotoLabels: true
 IndentPPDirectives: None
+IndentExternBlock: AfterExternBlock
 IndentWidth:     4
 IndentWrappedFunctionNames: false
+InsertTrailingCommas: None
 JavaScriptQuotes: Leave
 JavaScriptWrapImports: true
 KeepEmptyLinesAtTheStartOfBlocks: false
@@ -101,6 +108,7 @@ MaxEmptyLinesToKeep: 3
 NamespaceIndentation: None
 ObjCBinPackProtocolList: Never
 ObjCBlockIndentWidth: 2
+ObjCBreakBeforeNestedBlockParam: true
 ObjCSpaceAfterProperty: false
 ObjCSpaceBeforeProtocolList: true
 PenaltyBreakAssignment: 2
@@ -138,6 +146,8 @@ RawStringFormats:
       - PARSE_TEXT_PROTO
       - ParseTextOrDie
       - ParseTextProtoOrDie
+      - ParseTestProto
+      - ParsePartialTestProto
     CanonicalDelimiter: ''
     BasedOnStyle:    google
 ReflowComments:  false
@@ -169,5 +179,9 @@ StatementMacros:
 TabWidth:        4
 UseCRLF:         false
 UseTab:          Always
+WhitespaceSensitiveMacros:
+  - STRINGIZE
+  - PP_STRINGIZE
+  - BOOST_PP_STRINGIZE
 ...
 

CMakeLists.txt

@@ -6,7 +6,7 @@ project(gpopt LANGUAGES CXX C)
 set(CMAKE_CXX_STANDARD 98)
 set(GPORCA_VERSION_MAJOR 3)
 set(GPORCA_VERSION_MINOR 116)
-set(GPORCA_VERSION_PATCH 1)
+set(GPORCA_VERSION_PATCH 2)
 set(GPORCA_VERSION_STRING "${GPORCA_VERSION_MAJOR}.${GPORCA_VERSION_MINOR}.${GPORCA_VERSION_PATCH}")
 
 # Whenever an ABI-breaking change is made to GPORCA, this should be incremented.

concourse/check_format.yml

@@ -3,7 +3,7 @@ image_resource:
   type: registry-image
   source:
     repository: gcr.io/data-orca/clang-toolchain
-    tag: 0.1
+    tag: 0.2
 
 inputs:
   - name: orca_src
@@ -12,4 +12,4 @@ run:
   path: scripts/fmt
   args: [ chk ]
 params:
-  CLANG_FORMAT: clang-format-10
+  CLANG_FORMAT: clang-format-11

scripts/fmt

@@ -28,7 +28,7 @@ set -e -u -o pipefail
 # against it.
 if ((BASH_VERSINFO[0] < 4)); then false; fi
 
-readonly INTENT=src/backend/gporca/clang-format.intent.yaml
+readonly INTENT=clang-format.intent.yaml
 : "${CLANG_FORMAT:=clang-format}"
 
 gen() {