oap-project · zhouyuan · Dec 23, 2021 · Dec 23, 2021
diff --git a/cpp/cmake_modules/DefineOptions.cmake b/cpp/cmake_modules/DefineOptions.cmake
@@ -238,7 +238,7 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
 
   define_option(ARROW_JNI "Build the Arrow JNI lib" OFF)
 
-  define_option(ARROW_JNIUTIL "Build Arrow JNI utilities" ON)
+  define_option(ARROW_JNIUTIL "Build Arrow JNI utilities" OFF)
 
   define_option(ARROW_JSON "Build Arrow with JSON support (requires RapidJSON)" OFF)
 

diff --git a/cpp/src/arrow/adapters/orc/adapter.cc b/cpp/src/arrow/adapters/orc/adapter.cc
@@ -438,8 +438,9 @@ class ORCFileReader::Impl {
     return Status::OK();
   }
 
-  Status NextBatchReader(int64_t batch_size, const std::vector<std::string>& include_names,
-                          std::shared_ptr<RecordBatchReader>* out) {
+  Status NextBatchReader(int64_t batch_size,
+                         const std::vector<std::string>& include_names,
+                         std::shared_ptr<RecordBatchReader>* out) {
     liborc::RowReaderOptions opts;
     if (!include_names.empty()) {
       RETURN_NOT_OK(SelectNames(&opts, include_names));
@@ -559,8 +560,8 @@ Status ORCFileReader::NextStripeReader(int64_t batch_size,
 }
 
 Status ORCFileReader::NextBatchReader(int64_t batch_size,
-                                       const std::vector<std::string>& include_names,
-                                       std::shared_ptr<RecordBatchReader>* out) {
+                                      const std::vector<std::string>& include_names,
+                                      std::shared_ptr<RecordBatchReader>* out) {
   return impl_->NextBatchReader(batch_size, include_names, out);
 }
 

diff --git a/cpp/src/arrow/adapters/orc/adapter.h b/cpp/src/arrow/adapters/orc/adapter.h
@@ -174,8 +174,9 @@ class ARROW_EXPORT ORCFileReader {
   ///
   /// \param[in] include_indices the selected field names to read
   /// \param[out] out the returned stripe reader
-  Status NextBatchReader(int64_t batch_size, const std::vector<std::string>& include_names,
-                          std::shared_ptr<RecordBatchReader>* out);
+  Status NextBatchReader(int64_t batch_size,
+                         const std::vector<std::string>& include_names,
+                         std::shared_ptr<RecordBatchReader>* out);
 
   /// \brief The number of stripes in the file
   int64_t NumberOfStripes();

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/buffer.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_union_test.cc b/cpp/src/arrow/array/array_union_test.cc
@@ -15,10 +15,10 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include <string>
-
 #include <gtest/gtest.h>
 
+#include <string>
+
 #include "arrow/array.h"
 #include "arrow/array/builder_nested.h"
 #include "arrow/array/builder_union.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/status.h"
 #include "arrow/testing/gtest_common.h"
 #include "arrow/testing/gtest_util.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_test.cc b/cpp/src/arrow/compute/exec_test.cc
@@ -15,27 +15,27 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include <cstring>
-#include <memory>
-#include <vector>
+#include "arrow/compute/exec.h"
 
 #include <gtest/gtest.h>
 
-#include "arrow/testing/gtest_util.h"
-#include "arrow/testing/random.h"
+#include <cstring>
+#include <memory>
+#include <vector>
 
 #include "arrow/array/array_base.h"
 #include "arrow/array/data.h"
 #include "arrow/buffer.h"
 #include "arrow/chunked_array.h"
-#include "arrow/compute/exec.h"
 #include "arrow/compute/exec_internal.h"
 #include "arrow/compute/function.h"
 #include "arrow/compute/kernel.h"
 #include "arrow/compute/registry.h"
 #include "arrow/memory_pool.h"
 #include "arrow/scalar.h"
 #include "arrow/status.h"
+#include "arrow/testing/gtest_util.h"
+#include "arrow/testing/random.h"
 #include "arrow/type.h"
 #include "arrow/util/bit_util.h"
 #include "arrow/util/bitmap_ops.h"

diff --git a/cpp/src/arrow/compute/function_benchmark.cc b/cpp/src/arrow/compute/function_benchmark.cc
@@ -15,15 +15,14 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "benchmark/benchmark.h"
-
 #include "arrow/array/array_base.h"
 #include "arrow/compute/api.h"
 #include "arrow/memory_pool.h"
 #include "arrow/scalar.h"
 #include "arrow/testing/gtest_util.h"
 #include "arrow/testing/random.h"
 #include "arrow/util/benchmark_util.h"
+#include "benchmark/benchmark.h"
 
 namespace arrow {
 

diff --git a/cpp/src/arrow/compute/function_test.cc b/cpp/src/arrow/compute/function_test.cc
@@ -15,13 +15,14 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include "arrow/compute/function.h"
+
+#include <gtest/gtest.h>
+
 #include <memory>
 #include <string>
 #include <vector>
 
-#include <gtest/gtest.h>
-
-#include "arrow/compute/function.h"
 #include "arrow/compute/kernel.h"
 #include "arrow/datum.h"
 #include "arrow/status.h"