Skip to content

Commit 2284234

Browse files
authored
GH-47483: [C++] Bump vendored xxhash to 0.8.3 (#47476)
### Rationale for this change We are using an older version, this might fix the current failure for test-conda-cpp-valgrind failures. The upgrade might also come with some improvements / fixes. ### What changes are included in this PR? Update vendored xxhash to newer version: - https://github.com/Cyan4973/xxHash/releases/tag/v0.8.3 ### Are these changes tested? Yes, via CI. ### Are there any user-facing changes? No * GitHub Issue: #47483 Authored-by: Raúl Cumplido <[email protected]> Signed-off-by: Antoine Pitrou <[email protected]>
1 parent 8ccdbe7 commit 2284234

File tree

4 files changed

+1208
-489
lines changed

4 files changed

+1208
-489
lines changed

cpp/CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -351,6 +351,12 @@ endif()
351351

352352
include(SetupCxxFlags)
353353

354+
if(${CMAKE_CXX_FLAGS_DEBUG} MATCHES "-Og")
355+
# GH-47475: xxhash fails inlining when -Og is used.
356+
# See: https://github.com/Cyan4973/xxHash/issues/943
357+
add_definitions(-DXXH_NO_INLINE_HINTS)
358+
endif()
359+
354360
#
355361
# Linker flags
356362
#

cpp/src/arrow/vendored/xxhash/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@
1717
under the License.
1818
-->
1919

20-
The files in this directory are vendored from xxHash git tag v0.8.2
20+
The files in this directory are vendored from xxHash git tag v0.8.3
2121
(https://github.com/Cyan4973/xxHash).

cpp/src/arrow/vendored/xxhash/xxhash.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* xxHash - Extremely Fast Hash algorithm
3-
* Copyright (C) 2012-2021 Yann Collet
3+
* Copyright (C) 2012-2023 Yann Collet
44
*
55
* BSD 2-Clause License (https://www.opensource.org/licenses/bsd-license.php)
66
*
@@ -32,12 +32,11 @@
3232
* - xxHash source repository: https://github.com/Cyan4973/xxHash
3333
*/
3434

35-
3635
/*
3736
* xxhash.c instantiates functions defined in xxhash.h
3837
*/
3938

40-
#define XXH_STATIC_LINKING_ONLY /* access advanced declarations */
41-
#define XXH_IMPLEMENTATION /* access definitions */
39+
#define XXH_STATIC_LINKING_ONLY /* access advanced declarations */
40+
#define XXH_IMPLEMENTATION /* access definitions */
4241

4342
#include "xxhash.h"

0 commit comments

Comments
 (0)