You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ko...@apache.org on 2022/06/08 01:11:54 UTC
[arrow] branch master updated: ARROW-16609: [C++] xxhash not installed into dist/lib/include when building C++ (#13282)
This is an automated email from the ASF dual-hosted git repository.
kou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new c32a1d17d6 ARROW-16609: [C++] xxhash not installed into dist/lib/include when building C++ (#13282)
c32a1d17d6 is described below
commit c32a1d17d69fb3d435de4b4c6e93de51e0dc3ab4
Author: Alenka Frim <Al...@users.noreply.github.com>
AuthorDate: Wed Jun 8 03:11:48 2022 +0200
ARROW-16609: [C++] xxhash not installed into dist/lib/include when building C++ (#13282)
This PR changes CMakeLists .txt files so that `xxhash`, `portable-snippets` are also installed. Plus it changes the name of `int_util_internal.h` to `int_util_overflow.h` for the same reason.
This step is needed for Python code to be moved to PyArrow in https://issues.apache.org/jira/browse/ARROW-16340.
Authored-by: Alenka Frim <fr...@gmail.com>
Signed-off-by: Sutou Kouhei <ko...@clear-code.com>
---
cpp/src/arrow/array/concatenate.cc | 2 +-
cpp/src/arrow/array/data.cc | 2 +-
cpp/src/arrow/array/validate.cc | 2 +-
cpp/src/arrow/buffer.cc | 2 +-
cpp/src/arrow/compute/kernels/aggregate_test.cc | 2 +-
.../compute/kernels/base_arithmetic_internal.h | 2 +-
cpp/src/arrow/compute/kernels/hash_aggregate.cc | 2 +-
.../arrow/compute/kernels/hash_aggregate_test.cc | 2 +-
cpp/src/arrow/compute/kernels/scalar_arithmetic.cc | 2 +-
cpp/src/arrow/dataset/partition.cc | 2 +-
cpp/src/arrow/memory_pool.cc | 2 +-
cpp/src/arrow/pretty_print.cc | 2 +-
cpp/src/arrow/python/python_to_arrow.cc | 2 +-
cpp/src/arrow/tensor.cc | 2 +-
cpp/src/arrow/util/basic_decimal.cc | 2 +-
cpp/src/arrow/util/decimal.cc | 2 +-
cpp/src/arrow/util/int_util.h | 17 ++++++++
.../{int_util_internal.h => int_util_overflow.h} | 36 -----------------
cpp/src/arrow/util/int_util_test.cc | 2 +-
cpp/src/arrow/util/slice_util_internal.h | 46 ++++++++++++++++++++++
cpp/src/arrow/vendored/CMakeLists.txt | 2 +
.../{ => portable-snippets}/CMakeLists.txt | 6 +--
cpp/src/arrow/vendored/{ => xxhash}/CMakeLists.txt | 6 +--
cpp/src/parquet/arrow/reader_internal.cc | 2 +-
cpp/src/parquet/column_reader.cc | 2 +-
cpp/src/parquet/encoding.cc | 2 +-
cpp/src/parquet/file_reader.cc | 2 +-
27 files changed, 88 insertions(+), 67 deletions(-)
diff --git a/cpp/src/arrow/array/concatenate.cc b/cpp/src/arrow/array/concatenate.cc
index ec6da9c3e5..9f77fbb5f4 100644
--- a/cpp/src/arrow/array/concatenate.cc
+++ b/cpp/src/arrow/array/concatenate.cc
@@ -39,7 +39,7 @@
#include "arrow/util/bitmap_ops.h"
#include "arrow/util/checked_cast.h"
#include "arrow/util/int_util.h"
-#include "arrow/util/int_util_internal.h"
+#include "arrow/util/int_util_overflow.h"
#include "arrow/util/logging.h"
#include "arrow/visit_type_inline.h"
diff --git a/cpp/src/arrow/array/data.cc b/cpp/src/arrow/array/data.cc
index 5a21447397..9dfc76c01c 100644
--- a/cpp/src/arrow/array/data.cc
+++ b/cpp/src/arrow/array/data.cc
@@ -29,9 +29,9 @@
#include "arrow/status.h"
#include "arrow/type.h"
#include "arrow/util/bitmap_ops.h"
-#include "arrow/util/int_util_internal.h"
#include "arrow/util/logging.h"
#include "arrow/util/macros.h"
+#include "arrow/util/slice_util_internal.h"
namespace arrow {
diff --git a/cpp/src/arrow/array/validate.cc b/cpp/src/arrow/array/validate.cc
index 158d7a1185..96f8cdef07 100644
--- a/cpp/src/arrow/array/validate.cc
+++ b/cpp/src/arrow/array/validate.cc
@@ -28,7 +28,7 @@
#include "arrow/util/bitmap_ops.h"
#include "arrow/util/checked_cast.h"
#include "arrow/util/decimal.h"
-#include "arrow/util/int_util_internal.h"
+#include "arrow/util/int_util_overflow.h"
#include "arrow/util/logging.h"
#include "arrow/util/utf8.h"
#include "arrow/visit_data_inline.h"
diff --git a/cpp/src/arrow/buffer.cc b/cpp/src/arrow/buffer.cc
index 5d9faeb7ed..e7566354d1 100644
--- a/cpp/src/arrow/buffer.cc
+++ b/cpp/src/arrow/buffer.cc
@@ -24,8 +24,8 @@
#include "arrow/result.h"
#include "arrow/status.h"
#include "arrow/util/bit_util.h"
-#include "arrow/util/int_util_internal.h"
#include "arrow/util/logging.h"
+#include "arrow/util/slice_util_internal.h"
#include "arrow/util/string.h"
namespace arrow {
diff --git a/cpp/src/arrow/compute/kernels/aggregate_test.cc b/cpp/src/arrow/compute/kernels/aggregate_test.cc
index d96cdad86d..faae139c13 100644
--- a/cpp/src/arrow/compute/kernels/aggregate_test.cc
+++ b/cpp/src/arrow/compute/kernels/aggregate_test.cc
@@ -38,7 +38,7 @@
#include "arrow/type_traits.h"
#include "arrow/util/bitmap_reader.h"
#include "arrow/util/checked_cast.h"
-#include "arrow/util/int_util_internal.h"
+#include "arrow/util/int_util_overflow.h"
#include "arrow/testing/gtest_util.h"
#include "arrow/testing/matchers.h"
diff --git a/cpp/src/arrow/compute/kernels/base_arithmetic_internal.h b/cpp/src/arrow/compute/kernels/base_arithmetic_internal.h
index 1707ed7c13..f416881ccb 100644
--- a/cpp/src/arrow/compute/kernels/base_arithmetic_internal.h
+++ b/cpp/src/arrow/compute/kernels/base_arithmetic_internal.h
@@ -23,7 +23,7 @@
#include "arrow/type.h"
#include "arrow/type_traits.h"
#include "arrow/util/decimal.h"
-#include "arrow/util/int_util_internal.h"
+#include "arrow/util/int_util_overflow.h"
#include "arrow/util/macros.h"
namespace arrow {
diff --git a/cpp/src/arrow/compute/kernels/hash_aggregate.cc b/cpp/src/arrow/compute/kernels/hash_aggregate.cc
index d9ffcda596..5b92dac237 100644
--- a/cpp/src/arrow/compute/kernels/hash_aggregate.cc
+++ b/cpp/src/arrow/compute/kernels/hash_aggregate.cc
@@ -49,7 +49,7 @@
#include "arrow/util/checked_cast.h"
#include "arrow/util/cpu_info.h"
#include "arrow/util/int128_internal.h"
-#include "arrow/util/int_util_internal.h"
+#include "arrow/util/int_util_overflow.h"
#include "arrow/util/make_unique.h"
#include "arrow/util/task_group.h"
#include "arrow/util/tdigest.h"
diff --git a/cpp/src/arrow/compute/kernels/hash_aggregate_test.cc b/cpp/src/arrow/compute/kernels/hash_aggregate_test.cc
index 35b4592e19..932bda4891 100644
--- a/cpp/src/arrow/compute/kernels/hash_aggregate_test.cc
+++ b/cpp/src/arrow/compute/kernels/hash_aggregate_test.cc
@@ -51,7 +51,7 @@
#include "arrow/util/async_generator.h"
#include "arrow/util/bitmap_reader.h"
#include "arrow/util/checked_cast.h"
-#include "arrow/util/int_util_internal.h"
+#include "arrow/util/int_util_overflow.h"
#include "arrow/util/key_value_metadata.h"
#include "arrow/util/logging.h"
#include "arrow/util/thread_pool.h"
diff --git a/cpp/src/arrow/compute/kernels/scalar_arithmetic.cc b/cpp/src/arrow/compute/kernels/scalar_arithmetic.cc
index 0742fb32c5..3138fb6974 100644
--- a/cpp/src/arrow/compute/kernels/scalar_arithmetic.cc
+++ b/cpp/src/arrow/compute/kernels/scalar_arithmetic.cc
@@ -31,7 +31,7 @@
#include "arrow/type.h"
#include "arrow/type_traits.h"
#include "arrow/util/decimal.h"
-#include "arrow/util/int_util_internal.h"
+#include "arrow/util/int_util_overflow.h"
#include "arrow/util/macros.h"
#include "arrow/visit_scalar_inline.h"
diff --git a/cpp/src/arrow/dataset/partition.cc b/cpp/src/arrow/dataset/partition.cc
index 6b4d601db0..89d90c758f 100644
--- a/cpp/src/arrow/dataset/partition.cc
+++ b/cpp/src/arrow/dataset/partition.cc
@@ -34,7 +34,7 @@
#include "arrow/dataset/dataset_internal.h"
#include "arrow/filesystem/path_util.h"
#include "arrow/scalar.h"
-#include "arrow/util/int_util_internal.h"
+#include "arrow/util/int_util_overflow.h"
#include "arrow/util/logging.h"
#include "arrow/util/make_unique.h"
#include "arrow/util/string_view.h"
diff --git a/cpp/src/arrow/memory_pool.cc b/cpp/src/arrow/memory_pool.cc
index 2fab6f3825..9130b29748 100644
--- a/cpp/src/arrow/memory_pool.cc
+++ b/cpp/src/arrow/memory_pool.cc
@@ -36,7 +36,7 @@
#include "arrow/status.h"
#include "arrow/util/bit_util.h"
#include "arrow/util/debug.h"
-#include "arrow/util/int_util_internal.h"
+#include "arrow/util/int_util_overflow.h"
#include "arrow/util/io_util.h"
#include "arrow/util/logging.h" // IWYU pragma: keep
#include "arrow/util/optional.h"
diff --git a/cpp/src/arrow/pretty_print.cc b/cpp/src/arrow/pretty_print.cc
index 01d7f21290..25392a069c 100644
--- a/cpp/src/arrow/pretty_print.cc
+++ b/cpp/src/arrow/pretty_print.cc
@@ -38,7 +38,7 @@
#include "arrow/type_traits.h"
#include "arrow/util/checked_cast.h"
#include "arrow/util/formatting.h"
-#include "arrow/util/int_util_internal.h"
+#include "arrow/util/int_util_overflow.h"
#include "arrow/util/key_value_metadata.h"
#include "arrow/util/string.h"
#include "arrow/util/string_view.h"
diff --git a/cpp/src/arrow/python/python_to_arrow.cc b/cpp/src/arrow/python/python_to_arrow.cc
index 0379cf7e9e..024c9c575c 100644
--- a/cpp/src/arrow/python/python_to_arrow.cc
+++ b/cpp/src/arrow/python/python_to_arrow.cc
@@ -41,7 +41,7 @@
#include "arrow/util/checked_cast.h"
#include "arrow/util/converter.h"
#include "arrow/util/decimal.h"
-#include "arrow/util/int_util_internal.h"
+#include "arrow/util/int_util_overflow.h"
#include "arrow/util/logging.h"
#include "arrow/python/datetime.h"
diff --git a/cpp/src/arrow/tensor.cc b/cpp/src/arrow/tensor.cc
index dd99370c97..f20a057b1e 100644
--- a/cpp/src/arrow/tensor.cc
+++ b/cpp/src/arrow/tensor.cc
@@ -31,7 +31,7 @@
#include "arrow/type.h"
#include "arrow/type_traits.h"
#include "arrow/util/checked_cast.h"
-#include "arrow/util/int_util_internal.h"
+#include "arrow/util/int_util_overflow.h"
#include "arrow/util/logging.h"
#include "arrow/visit_type_inline.h"
diff --git a/cpp/src/arrow/util/basic_decimal.cc b/cpp/src/arrow/util/basic_decimal.cc
index 116f6d1f0c..b8f218ede9 100644
--- a/cpp/src/arrow/util/basic_decimal.cc
+++ b/cpp/src/arrow/util/basic_decimal.cc
@@ -31,7 +31,7 @@
#include "arrow/util/config.h" // for ARROW_USE_NATIVE_INT128
#include "arrow/util/endian.h"
#include "arrow/util/int128_internal.h"
-#include "arrow/util/int_util_internal.h"
+#include "arrow/util/int_util_overflow.h"
#include "arrow/util/logging.h"
#include "arrow/util/macros.h"
diff --git a/cpp/src/arrow/util/decimal.cc b/cpp/src/arrow/util/decimal.cc
index d35223a1f4..7bda91cf10 100644
--- a/cpp/src/arrow/util/decimal.cc
+++ b/cpp/src/arrow/util/decimal.cc
@@ -33,7 +33,7 @@
#include "arrow/util/endian.h"
#include "arrow/util/formatting.h"
#include "arrow/util/int128_internal.h"
-#include "arrow/util/int_util_internal.h"
+#include "arrow/util/int_util_overflow.h"
#include "arrow/util/logging.h"
#include "arrow/util/macros.h"
#include "arrow/util/value_parsing.h"
diff --git a/cpp/src/arrow/util/int_util.h b/cpp/src/arrow/util/int_util.h
index e8728ccaca..e631f4dc1e 100644
--- a/cpp/src/arrow/util/int_util.h
+++ b/cpp/src/arrow/util/int_util.h
@@ -21,6 +21,7 @@
#include <type_traits>
#include "arrow/status.h"
+
#include "arrow/util/visibility.h"
namespace arrow {
@@ -113,5 +114,21 @@ Status CheckIntegersInRange(const Datum& datum, const Scalar& bound_lower,
ARROW_EXPORT
Status IntegersCanFit(const Datum& datum, const DataType& target_type);
+/// Upcast an integer to the largest possible width (currently 64 bits)
+
+template <typename Integer>
+typename std::enable_if<
+ std::is_integral<Integer>::value && std::is_signed<Integer>::value, int64_t>::type
+UpcastInt(Integer v) {
+ return v;
+}
+
+template <typename Integer>
+typename std::enable_if<
+ std::is_integral<Integer>::value && std::is_unsigned<Integer>::value, uint64_t>::type
+UpcastInt(Integer v) {
+ return v;
+}
+
} // namespace internal
} // namespace arrow
diff --git a/cpp/src/arrow/util/int_util_internal.h b/cpp/src/arrow/util/int_util_overflow.h
similarity index 79%
rename from cpp/src/arrow/util/int_util_internal.h
rename to cpp/src/arrow/util/int_util_overflow.h
index 8a19876f2b..de58d116ae 100644
--- a/cpp/src/arrow/util/int_util_internal.h
+++ b/cpp/src/arrow/util/int_util_overflow.h
@@ -114,41 +114,5 @@ SignedInt SafeLeftShift(SignedInt u, Shift shift) {
return static_cast<SignedInt>(static_cast<UnsignedInt>(u) << shift);
}
-/// Upcast an integer to the largest possible width (currently 64 bits)
-
-template <typename Integer>
-typename std::enable_if<
- std::is_integral<Integer>::value && std::is_signed<Integer>::value, int64_t>::type
-UpcastInt(Integer v) {
- return v;
-}
-
-template <typename Integer>
-typename std::enable_if<
- std::is_integral<Integer>::value && std::is_unsigned<Integer>::value, uint64_t>::type
-UpcastInt(Integer v) {
- return v;
-}
-
-static inline Status CheckSliceParams(int64_t object_length, int64_t slice_offset,
- int64_t slice_length, const char* object_name) {
- if (ARROW_PREDICT_FALSE(slice_offset < 0)) {
- return Status::IndexError("Negative ", object_name, " slice offset");
- }
- if (ARROW_PREDICT_FALSE(slice_length < 0)) {
- return Status::IndexError("Negative ", object_name, " slice length");
- }
- int64_t offset_plus_length;
- if (ARROW_PREDICT_FALSE(
- internal::AddWithOverflow(slice_offset, slice_length, &offset_plus_length))) {
- return Status::IndexError(object_name, " slice would overflow");
- }
- if (ARROW_PREDICT_FALSE(offset_plus_length > object_length)) {
- return Status::IndexError(object_name, " slice would exceed ", object_name,
- " length");
- }
- return Status::OK();
-}
-
} // namespace internal
} // namespace arrow
diff --git a/cpp/src/arrow/util/int_util_test.cc b/cpp/src/arrow/util/int_util_test.cc
index fc6f069242..d20640060b 100644
--- a/cpp/src/arrow/util/int_util_test.cc
+++ b/cpp/src/arrow/util/int_util_test.cc
@@ -29,7 +29,7 @@
#include "arrow/testing/random.h"
#include "arrow/type.h"
#include "arrow/util/int_util.h"
-#include "arrow/util/int_util_internal.h"
+#include "arrow/util/int_util_overflow.h"
namespace arrow {
namespace internal {
diff --git a/cpp/src/arrow/util/slice_util_internal.h b/cpp/src/arrow/util/slice_util_internal.h
new file mode 100644
index 0000000000..8b8d3d1836
--- /dev/null
+++ b/cpp/src/arrow/util/slice_util_internal.h
@@ -0,0 +1,46 @@
+// 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.
+
+#pragma once
+
+#include "arrow/util/int_util_overflow.h"
+
+namespace arrow {
+namespace internal {
+
+static inline Status CheckSliceParams(int64_t object_length, int64_t slice_offset,
+ int64_t slice_length, const char* object_name) {
+ if (ARROW_PREDICT_FALSE(slice_offset < 0)) {
+ return Status::IndexError("Negative ", object_name, " slice offset");
+ }
+ if (ARROW_PREDICT_FALSE(slice_length < 0)) {
+ return Status::IndexError("Negative ", object_name, " slice length");
+ }
+ int64_t offset_plus_length;
+ if (ARROW_PREDICT_FALSE(
+ internal::AddWithOverflow(slice_offset, slice_length, &offset_plus_length))) {
+ return Status::IndexError(object_name, " slice would overflow");
+ }
+ if (ARROW_PREDICT_FALSE(offset_plus_length > object_length)) {
+ return Status::IndexError(object_name, " slice would exceed ", object_name,
+ " length");
+ }
+ return Status::OK();
+}
+
+} // namespace internal
+} // namespace arrow
diff --git a/cpp/src/arrow/vendored/CMakeLists.txt b/cpp/src/arrow/vendored/CMakeLists.txt
index 0fdabc49f7..3be026aeaa 100644
--- a/cpp/src/arrow/vendored/CMakeLists.txt
+++ b/cpp/src/arrow/vendored/CMakeLists.txt
@@ -20,3 +20,5 @@ arrow_install_all_headers("arrow/vendored")
add_subdirectory(datetime)
add_subdirectory(double-conversion)
add_subdirectory(pcg)
+add_subdirectory(portable-snippets)
+add_subdirectory(xxhash)
diff --git a/cpp/src/arrow/vendored/CMakeLists.txt b/cpp/src/arrow/vendored/portable-snippets/CMakeLists.txt
similarity index 85%
copy from cpp/src/arrow/vendored/CMakeLists.txt
copy to cpp/src/arrow/vendored/portable-snippets/CMakeLists.txt
index 0fdabc49f7..432b0d2dcb 100644
--- a/cpp/src/arrow/vendored/CMakeLists.txt
+++ b/cpp/src/arrow/vendored/portable-snippets/CMakeLists.txt
@@ -15,8 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-arrow_install_all_headers("arrow/vendored")
-
-add_subdirectory(datetime)
-add_subdirectory(double-conversion)
-add_subdirectory(pcg)
+arrow_install_all_headers("arrow/vendored/portable-snippets")
diff --git a/cpp/src/arrow/vendored/CMakeLists.txt b/cpp/src/arrow/vendored/xxhash/CMakeLists.txt
similarity index 85%
copy from cpp/src/arrow/vendored/CMakeLists.txt
copy to cpp/src/arrow/vendored/xxhash/CMakeLists.txt
index 0fdabc49f7..25d2fa4598 100644
--- a/cpp/src/arrow/vendored/CMakeLists.txt
+++ b/cpp/src/arrow/vendored/xxhash/CMakeLists.txt
@@ -15,8 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-arrow_install_all_headers("arrow/vendored")
-
-add_subdirectory(datetime)
-add_subdirectory(double-conversion)
-add_subdirectory(pcg)
+arrow_install_all_headers("arrow/vendored/xxhash")
diff --git a/cpp/src/parquet/arrow/reader_internal.cc b/cpp/src/parquet/arrow/reader_internal.cc
index d8aad0d0f2..64fcc45180 100644
--- a/cpp/src/parquet/arrow/reader_internal.cc
+++ b/cpp/src/parquet/arrow/reader_internal.cc
@@ -41,7 +41,7 @@
#include "arrow/util/bit_util.h"
#include "arrow/util/checked_cast.h"
#include "arrow/util/endian.h"
-#include "arrow/util/int_util_internal.h"
+#include "arrow/util/int_util_overflow.h"
#include "arrow/util/logging.h"
#include "arrow/util/string_view.h"
#include "arrow/util/ubsan.h"
diff --git a/cpp/src/parquet/column_reader.cc b/cpp/src/parquet/column_reader.cc
index 4f82992aeb..8982de7032 100644
--- a/cpp/src/parquet/column_reader.cc
+++ b/cpp/src/parquet/column_reader.cc
@@ -38,7 +38,7 @@
#include "arrow/util/bit_util.h"
#include "arrow/util/checked_cast.h"
#include "arrow/util/compression.h"
-#include "arrow/util/int_util_internal.h"
+#include "arrow/util/int_util_overflow.h"
#include "arrow/util/logging.h"
#include "arrow/util/rle_encoding.h"
#include "parquet/column_page.h"
diff --git a/cpp/src/parquet/encoding.cc b/cpp/src/parquet/encoding.cc
index af0e543c3e..6af7af50cb 100644
--- a/cpp/src/parquet/encoding.cc
+++ b/cpp/src/parquet/encoding.cc
@@ -39,7 +39,7 @@
#include "arrow/util/byte_stream_split.h"
#include "arrow/util/checked_cast.h"
#include "arrow/util/hashing.h"
-#include "arrow/util/int_util_internal.h"
+#include "arrow/util/int_util_overflow.h"
#include "arrow/util/logging.h"
#include "arrow/util/rle_encoding.h"
#include "arrow/util/string_view.h"
diff --git a/cpp/src/parquet/file_reader.cc b/cpp/src/parquet/file_reader.cc
index 51f90b1730..8086b0a280 100644
--- a/cpp/src/parquet/file_reader.cc
+++ b/cpp/src/parquet/file_reader.cc
@@ -30,7 +30,7 @@
#include "arrow/io/memory.h"
#include "arrow/util/checked_cast.h"
#include "arrow/util/future.h"
-#include "arrow/util/int_util_internal.h"
+#include "arrow/util/int_util_overflow.h"
#include "arrow/util/logging.h"
#include "arrow/util/ubsan.h"
#include "parquet/column_reader.h"