ARROW-14897: [CI][C++] Upgrade Clang Tools to 12 from 8

apache · Nov 28, 2021 · ef93600 · ef93600
1 parent d722f50
commit ef93600
Show file tree

Hide file tree

Showing 481 changed files with 1,088 additions and 1,161 deletions.
diff --git a/.clang-format b/.clang-format
@@ -15,6 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 ---
-BasedOnStyle:  Google
-DerivePointerAlignment: false
+BasedOnStyle: Google
 ColumnLimit: 90
+DerivePointerAlignment: false
diff --git a/.env b/.env
@@ -46,7 +46,7 @@ UBUNTU=20.04
 FEDORA=33
 PYTHON=3.6
 LLVM=12
-CLANG_TOOLS=8
+CLANG_TOOLS=12
 GO=1.15
 NODE=14
 MAVEN=3.5.4

diff --git a/ci/docker/ubuntu-20.04-cpp.dockerfile b/ci/docker/ubuntu-20.04-cpp.dockerfile
@@ -39,11 +39,11 @@ RUN if [ "${llvm}" -gt "10" ]; then \
           wget && \
       wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \
       echo "deb https://apt.llvm.org/focal/ llvm-toolchain-focal-${llvm} main" > \
-         /etc/apt/sources.list.d/llvm.list && \
-      if [ "${clang_tools}" != "${llvm}" -a "${clang_tools}" -gt 10 ]; then \
-        echo "deb https://apt.llvm.org/focal/ llvm-toolchain-focal-${clang_tools} main" > \
-           /etc/apt/sources.list.d/clang-tools.list; \
-      fi \
+         /etc/apt/sources.list.d/llvm.list; \
+    fi && \
+    if [ "${clang_tools}" != "${llvm}" -a "${clang_tools}" -gt 10 ]; then \
+      echo "deb https://apt.llvm.org/focal/ llvm-toolchain-focal-${clang_tools} main" > \
+         /etc/apt/sources.list.d/clang-tools.list; \
     fi && \
     apt-get update -y -q && \
     apt-get install -y -q --no-install-recommends \

diff --git a/cpp/examples/arrow/flight_grpc_example.cc b/cpp/examples/arrow/flight_grpc_example.cc
@@ -15,14 +15,14 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include <signal.h>
-#include <cstdlib>
-#include <iostream>
-
 #include <arrow/api.h>
 #include <arrow/flight/api.h>
 #include <gflags/gflags.h>
 #include <grpc++/grpc++.h>
+#include <signal.h>
+
+#include <cstdlib>
+#include <iostream>
 
 #include "examples/arrow/helloworld.grpc.pb.h"
 #include "examples/arrow/helloworld.pb.h"

diff --git a/cpp/src/arrow/adapters/tensorflow/convert.h b/cpp/src/arrow/adapters/tensorflow/convert.h
@@ -19,9 +19,8 @@
 
 #include <memory>
 
-#include "tensorflow/core/framework/op.h"
-
 #include "arrow/type.h"
+#include "tensorflow/core/framework/op.h"
 
 // These utilities are supposed to be included in TensorFlow operators
 // that need to be compiled separately from Arrow because of ABI issues.

diff --git a/cpp/src/arrow/array/array_binary_test.cc b/cpp/src/arrow/array/array_binary_test.cc
@@ -15,15 +15,15 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <gmock/gmock-matchers.h>
+#include <gtest/gtest.h>
+
 #include <cstdint>
 #include <cstring>
 #include <memory>
 #include <string>
 #include <vector>
 
-#include <gmock/gmock-matchers.h>
-#include <gtest/gtest.h>
-
 #include "arrow/array.h"
 #include "arrow/array/builder_binary.h"
 #include "arrow/buffer.h"

diff --git a/cpp/src/arrow/array/array_dict_test.cc b/cpp/src/arrow/array/array_dict_test.cc
@@ -15,15 +15,15 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <gtest/gtest.h>
+
 #include <array>
 #include <cstdint>
 #include <memory>
 #include <ostream>
 #include <string>
 #include <vector>
 
-#include <gtest/gtest.h>
-
 #include "arrow/array.h"
 #include "arrow/array/builder_decimal.h"
 #include "arrow/array/builder_dict.h"

diff --git a/cpp/src/arrow/array/array_list_test.cc b/cpp/src/arrow/array/array_list_test.cc
@@ -15,14 +15,14 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
 #include <cstdint>
 #include <cstring>
 #include <memory>
 #include <vector>
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
 #include "arrow/array.h"
 #include "arrow/array/builder_nested.h"
 #include "arrow/array/util.h"

diff --git a/cpp/src/arrow/array/array_test.cc b/cpp/src/arrow/array/array_test.cc
@@ -15,6 +15,9 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <gmock/gmock-matchers.h>
+#include <gtest/gtest.h>
+
 #include <algorithm>
 #include <cmath>
 #include <cstdint>
@@ -27,9 +30,6 @@
 #include <utility>
 #include <vector>
 
-#include <gmock/gmock-matchers.h>
-#include <gtest/gtest.h>
-
 #include "arrow/array/array_base.h"
 #include "arrow/array/array_binary.h"
 #include "arrow/array/array_decimal.h"

diff --git a/cpp/src/arrow/array/array_view_test.cc b/cpp/src/arrow/array/array_view_test.cc
@@ -15,11 +15,11 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include <gtest/gtest.h>
+
 #include <memory>
 #include <string>
 
-#include <gtest/gtest.h>
-
 #include "arrow/array/array_base.h"
 #include "arrow/array/array_dict.h"
 #include "arrow/array/array_nested.h"

diff --git a/cpp/src/arrow/array/concatenate_test.cc b/cpp/src/arrow/array/concatenate_test.cc
@@ -15,6 +15,10 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include "arrow/array/concatenate.h"
+
+#include <gtest/gtest.h>
+
 #include <algorithm>
 #include <array>
 #include <cstdint>
@@ -28,11 +32,8 @@
 #include <utility>
 #include <vector>
 
-#include <gtest/gtest.h>
-
 #include "arrow/array.h"
 #include "arrow/array/builder_binary.h"
-#include "arrow/array/concatenate.h"
 #include "arrow/buffer.h"
 #include "arrow/status.h"
 #include "arrow/testing/gtest_common.h"

diff --git a/cpp/src/arrow/array/dict_internal.h b/cpp/src/arrow/array/dict_internal.h
@@ -17,8 +17,6 @@
 
 #pragma once
 
-#include "arrow/array/builder_dict.h"
-
 #include <cstdint>
 #include <limits>
 #include <memory>
@@ -27,6 +25,7 @@
 #include <vector>
 
 #include "arrow/array.h"
+#include "arrow/array/builder_dict.h"
 #include "arrow/buffer.h"
 #include "arrow/status.h"
 #include "arrow/type.h"

diff --git a/cpp/src/arrow/array/diff_test.cc b/cpp/src/arrow/array/diff_test.cc
@@ -15,6 +15,10 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include "arrow/array/diff.h"
+
+#include <gtest/gtest.h>
+
 #include <algorithm>
 #include <cstdint>
 #include <cstring>
@@ -25,10 +29,7 @@
 #include <type_traits>
 #include <vector>
 
-#include <gtest/gtest.h>
-
 #include "arrow/array.h"
-#include "arrow/array/diff.h"
 #include "arrow/compute/api.h"
 #include "arrow/status.h"
 #include "arrow/testing/gtest_common.h"

diff --git a/cpp/src/arrow/buffer_test.cc b/cpp/src/arrow/buffer_test.cc
@@ -15,6 +15,10 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include "arrow/buffer.h"
+
+#include <gtest/gtest.h>
+
 #include <algorithm>
 #include <cstdint>
 #include <cstring>
@@ -24,9 +28,6 @@
 #include <utility>
 #include <vector>
 
-#include <gtest/gtest.h>
-
-#include "arrow/buffer.h"
 #include "arrow/buffer_builder.h"
 #include "arrow/device.h"
 #include "arrow/io/interfaces.h"

diff --git a/cpp/src/arrow/builder_benchmark.cc b/cpp/src/arrow/builder_benchmark.cc
@@ -23,14 +23,13 @@
 #include <string>
 #include <vector>
 
-#include "benchmark/benchmark.h"
-
 #include "arrow/builder.h"
 #include "arrow/memory_pool.h"
 #include "arrow/testing/gtest_util.h"
 #include "arrow/util/bit_util.h"
 #include "arrow/util/decimal.h"
 #include "arrow/util/string_view.h"
+#include "benchmark/benchmark.h"
 
 namespace arrow {
 

diff --git a/cpp/src/arrow/c/bridge_benchmark.cc b/cpp/src/arrow/c/bridge_benchmark.cc
@@ -17,8 +17,6 @@
 
 #include <cstdint>
 
-#include "benchmark/benchmark.h"
-
 #include "arrow/array.h"
 #include "arrow/c/bridge.h"
 #include "arrow/c/helpers.h"
@@ -27,6 +25,7 @@
 #include "arrow/testing/gtest_util.h"
 #include "arrow/type.h"
 #include "arrow/util/key_value_metadata.h"
+#include "benchmark/benchmark.h"
 
 namespace arrow {
 

diff --git a/cpp/src/arrow/c/bridge_test.cc b/cpp/src/arrow/c/bridge_test.cc
@@ -15,6 +15,11 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include "arrow/c/bridge.h"
+
+#include <gmock/gmock-matchers.h>
+#include <gtest/gtest.h>
+
 #include <cerrno>
 #include <deque>
 #include <functional>
@@ -23,10 +28,6 @@
 #include <utility>
 #include <vector>
 
-#include <gmock/gmock-matchers.h>
-#include <gtest/gtest.h>
-
-#include "arrow/c/bridge.h"
 #include "arrow/c/helpers.h"
 #include "arrow/c/util_internal.h"
 #include "arrow/ipc/json_simple.h"

diff --git a/cpp/src/arrow/chunked_array_test.cc b/cpp/src/arrow/chunked_array_test.cc
@@ -15,13 +15,14 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include "arrow/chunked_array.h"
+
+#include <gtest/gtest.h>
+
 #include <cstdint>
 #include <memory>
 #include <vector>
 
-#include <gtest/gtest.h>
-
-#include "arrow/chunked_array.h"
 #include "arrow/scalar.h"
 #include "arrow/status.h"
 #include "arrow/testing/gtest_common.h"

diff --git a/cpp/src/arrow/compare_benchmark.cc b/cpp/src/arrow/compare_benchmark.cc
@@ -19,15 +19,14 @@
 #include <string>
 #include <vector>
 
-#include "benchmark/benchmark.h"
-
 #include "arrow/array.h"
 #include "arrow/compare.h"
 #include "arrow/testing/gtest_util.h"
 #include "arrow/testing/random.h"
 #include "arrow/util/benchmark_util.h"
 #include "arrow/util/logging.h"
 #include "arrow/util/macros.h"
+#include "benchmark/benchmark.h"
 
 namespace arrow {
 

diff --git a/cpp/src/arrow/compute/exec/aggregate_node.cc b/cpp/src/arrow/compute/exec/aggregate_node.cc
@@ -15,14 +15,13 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "arrow/compute/exec/exec_plan.h"
-
 #include <mutex>
 #include <sstream>
 #include <thread>
 #include <unordered_map>
 
 #include "arrow/compute/exec.h"
+#include "arrow/compute/exec/exec_plan.h"
 #include "arrow/compute/exec/options.h"
 #include "arrow/compute/exec/util.h"
 #include "arrow/compute/exec_internal.h"

diff --git a/cpp/src/arrow/compute/exec/expression_benchmark.cc b/cpp/src/arrow/compute/exec/expression_benchmark.cc
@@ -15,14 +15,13 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "benchmark/benchmark.h"
-
 #include "arrow/compute/cast.h"
 #include "arrow/compute/exec/expression.h"
 #include "arrow/compute/exec/test_util.h"
 #include "arrow/dataset/partition.h"
 #include "arrow/testing/gtest_util.h"
 #include "arrow/type.h"
+#include "benchmark/benchmark.h"
 
 namespace arrow {
 namespace compute {

diff --git a/cpp/src/arrow/compute/exec/expression_internal.h b/cpp/src/arrow/compute/exec/expression_internal.h
@@ -15,14 +15,13 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "arrow/compute/exec/expression.h"
-
 #include <unordered_map>
 #include <unordered_set>
 #include <vector>
 
 #include "arrow/compute/api_scalar.h"
 #include "arrow/compute/cast.h"
+#include "arrow/compute/exec/expression.h"
 #include "arrow/compute/registry.h"
 #include "arrow/record_batch.h"
 #include "arrow/table.h"