From 6fc1ff126a404df89dd51297bae9caecf9b67634 Mon Sep 17 00:00:00 2001
From: Sylwester Lachiewicz <slachiewicz@apache.org>
Date: Mon, 28 Sep 2026 21:04:51 +0200
Subject: [PATCH] THRIFT-6219: ci(cpp): Check formatting of changed C++ lines
 only Client: cpp

The added .clang-format options describe lib/cpp as it is written, so
formatting a change no longer rewrites lines it did not touch. Do not
drop them without reformatting lib/cpp in the same change.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 .clang-format                                |  8 +++
 .github/workflows/cpp-format.yml             | 68 ++++++++++++++++++++
 lib/cpp/src/thrift/protocol/TBase64Utils.cpp |  2 +
 3 files changed, 78 insertions(+)
 create mode 100644 .github/workflows/cpp-format.yml

diff --git a/.clang-format b/.clang-format
index a62eef8576c..0a4871e456a 100644
--- a/.clang-format
+++ b/.clang-format
@@ -52,5 +52,13 @@ CommentPragmas:  '^ IWYU pragma:'
 ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
 SpaceBeforeParens: ControlStatements
 DisableFormat:   false
+FixNamespaceComments: false
+ReflowComments: false
+SortIncludes: Never
+BinPackArguments: false
+SortUsingDeclarations: false
+SpacesInLineCommentPrefix:
+  Minimum: 0
+  Maximum: -1
 ...
 
diff --git a/.github/workflows/cpp-format.yml b/.github/workflows/cpp-format.yml
new file mode 100644
index 00000000000..b6784c71fd8
--- /dev/null
+++ b/.github/workflows/cpp-format.yml
@@ -0,0 +1,68 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# THRIFT-6219: most of lib/cpp predates .clang-format, so formatting whole
+# files would rewrite code the pull request never touched. Only the lines the
+# pull request changes are checked. The version is pinned because clang-format
+# releases differ in their output.
+
+name: "C++ formatting"
+
+on:
+  pull_request:
+    paths:
+      - ".clang-format"
+      - "lib/cpp/**"
+      - ".github/workflows/cpp-format.yml"
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+jobs:
+  clang-format:
+    name: clang-format on changed lines
+    runs-on: ubuntu-24.04
+    timeout-minutes: 10
+    steps:
+      # The pull_request checkout is the merge commit, so its first parent is
+      # the base branch and HEAD^ is exactly what the pull request changes.
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          fetch-depth: 2
+          persist-credentials: false
+
+      - name: Install clang-format 18
+        run: |
+          if ! command -v git-clang-format-18 >/dev/null; then
+            sudo apt-get update -qq
+            sudo apt-get install -y -qq clang-format-18
+          fi
+          clang-format-18 --version
+
+      - name: Check changed lines in lib/cpp
+        run: |
+          # .tcc is not in git-clang-format's default extension list.
+          if ! git-clang-format-18 --binary clang-format-18 \
+                 --extensions c,cc,cpp,cxx,h,hh,hpp,tcc \
+                 --diff HEAD^ -- lib/cpp; then
+            echo "::error::Changed lines in lib/cpp do not match .clang-format. Run 'git clang-format --binary clang-format-18 --extensions c,cc,cpp,cxx,h,hh,hpp,tcc origin/master -- lib/cpp' and amend the commit."
+            exit 1
+          fi
diff --git a/lib/cpp/src/thrift/protocol/TBase64Utils.cpp b/lib/cpp/src/thrift/protocol/TBase64Utils.cpp
index 7474f5af8ce..ff017f1b37f 100644
--- a/lib/cpp/src/thrift/protocol/TBase64Utils.cpp
+++ b/lib/cpp/src/thrift/protocol/TBase64Utils.cpp
@@ -42,6 +42,7 @@ void base64_encode(const uint8_t* in, uint32_t len, uint8_t* buf) {
   }
 }
 
+// clang-format off
 static const uint8_t kBase64DecodeTable[256] = {
     0xff,
     0xff,
@@ -300,6 +301,7 @@ static const uint8_t kBase64DecodeTable[256] = {
     0xff,
     0xff,
 };
+// clang-format on
 
 void base64_decode(uint8_t* buf, uint32_t len) {
   buf[0] = (kBase64DecodeTable[buf[0]] << 2) | (kBase64DecodeTable[buf[1]] >> 4);