8000 Feature/backport arangosearch 3.4 (#6985) · arangodb/arangodb@2b46285 · GitHub
[go: up one dir, main page]
Skip to content

Commit 2b46285

Browse files
author
Andrey Abramov
authored
Feature/backport arangosearch 3.4 (#6985)
* issue 485.1: reduce scope of lock in FlushFeature (#6943) * issue 493.1: update iresearch to changeset 15f561dee5865ead83663ef056d7bbcc38636fb2 (#6947) * issue 493.2: trigger termination of long-running consolidation on shutdown request * Feature/update iresearch 2 (#6984) * update iresearch sources * another update * update iresearch * fix segfault in log message * update iresearch * update iresearch * update iresearch * remove noexcept * improve logging * update iresearch
1 parent 1493848 commit 2b46285

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+6405
-2353
lines changed

‎3rdParty/iresearch/appveyor.yml

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ build:
1111

1212
environment:
1313
BOOST_VERSION: default
14-
CMAKE_OPTIONS: -DUSE_TESTS=On -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DMSVC_BUILD_THREADS=16 -D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING=1 # _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING required for GTEST/MSVC2017
14+
CMAKE_OPTIONS: -DUSE_TESTS=On -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DMSVC_BUILD_THREADS=16
1515
CMAKE_BUILD_OPTIONS: --config %CONFIGURATION%
1616
matrix:
1717
############################################################################
@@ -126,28 +126,28 @@ environment:
126126

127127
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
128128
BUILD_TYPE: shared
129-
TEST_OPTIONS: --gtest_filter=fs_index_test*:mmap_index_test*
129+
TEST_OPTIONS: --gtest_filter=fs_index_test*
130130
VSINSTALL: "Microsoft Visual Studio\\2017\\Community\\VC\\Auxiliary\\Build"
131131
BOOST_ROOT: C:/Libraries/boost_1_64_0
132132
CONFIGURATION: Release
133133

134134
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
135135
BUILD_TYPE: shared
136-
TEST_OPTIONS: --gtest_filter=*:-:fs_index_test*:-:mmap_index_test*
136+
TEST_OPTIONS: --gtest_filter=*:-:fs_index_test*
137137
VSINSTALL: "Microsoft Visual Studio\\2017\\Community\\VC\\Auxiliary\\Build"
138138
BOOST_ROOT: C:/Libraries/boost_1_64_0
139139
CONFIGURATION: Release
140140

141141
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
142142
BUILD_TYPE: static
143-
TEST_OPTIONS: --gtest_filter=fs_index_test*:mmap_index_test*
143+
TEST_OPTIONS: --gtest_filter=fs_index_test*
144144
VSINSTALL: "Microsoft Visual Studio\\2017\\Community\\VC\\Auxiliary\\Build"
145145
BOOST_ROOT: C:/Libraries/boost_1_64_0
146146
CONFIGURATION: Release
147147

148148
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
149149
BUILD_TYPE: static
150-
TEST_OPTIONS: --gtest_filter=*:-:fs_index_test*:-:mmap_index_test*
150+
TEST_OPTIONS: --gtest_filter=*:-:fs_index_test*
151151
VSINSTALL: "Microsoft Visual Studio\\2017\\Community\\VC\\Auxiliary\\Build"
152152
BOOST_ROOT: C:/Libraries/boost_1_64_0
153153
CONFIGURATION: Release
@@ -180,12 +180,6 @@ install:
180180
- cd %GTEST_DIR%
181181
- appveyor-retry git fetch --tags
182182
- appveyor-retry git checkout tags/release-1.8.0
183-
- cd googletest
184-
# - mkdir build && cd build
185-
# - cmake -g %APPVEYOR_BUILD_WORKER_IMAGE% -Ax64 -Dgtest_force_shared_crt=ON -DINSTALL_GTEST=ON -DBUILD_GMOCK=OFF -DCMAKE_DEBUG_POSTFIX="" ..
186-
# - cmake --build . %CMAKE_BUILD_OPTIONS%
187-
# - mkdir %GTEST_DIR%\googletest\lib
188-
# - move /Y %CONFIGURATION%\* %GTEST_DIR%\googletest\lib || true
189183
- set GTEST_ROOT=%GTEST_DIR%\googletest
190184

191185
############################################################################

‎3rdParty/iresearch/cmake/FindGTestLocal.cmake

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,20 @@ if (GTEST_INCLUDE_DIR AND GTEST_SRC_DIR_GTEST AND GTEST_SRC_DIR_CMAKE)
8484
EXCLUDE_FROM_ALL # do not build unused targets
8585
)
8686

87-
if (MSVC)
88-
target_compile_options(gtest
89-
PRIVATE "$<$<CONFIG:Debug>:/MDd>$<$<NOT:$<CONFIG:Debug>>:/MD>"
90-
)
91-
92-
target_compile_options(gtest_main
93-
PRIVATE "$<$<CONFIG:Debug>:/MDd>$<$<NOT:$<CONFIG:Debug>>:/MD>"
94-
)
95-
endif()
87+
if (MSVC)
88+
# when compiling or linking against GTEST on MSVC2017 the following
89+
# definition is required: /D _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING
90+
91+
target_compile_options(gtest
92+
PRIVATE "$<$<CONFIG:Debug>:/MDd>$<$<NOT:$<CONFIG:Debug>>:/MD>"
93+
PRIVATE "/D _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING"
94+
)
95+
96+
target_compile_options(gtest_main
97+
PRIVATE "$<$<CONFIG:Debug>:/MDd>$<$<NOT:$<CONFIG:Debug>>:/MD>"
98+
PRIVATE "/D _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING"
99+
)
100+
endif()
96101

97102
set(GTEST_LIBRARIES gtest)
98103
set(GTEST_MAIN_LIBRARIES gtest_main)

‎3rdParty/iresearch/core/analysis/token_streams.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,9 @@ bool string_token_stream::next() {
128128
bytes_ref numeric_token_stream::numeric_term::value(
129129
bstring& buf,
130130
NumericType type,
131-
decltype(numeric_token_stream::numeric_term::val_) val,
132-
uint32_t shift) {
131+
value_t val,
132+
uint32_t shift
133+
) {
133134
switch (type) {
134135
case NT_LONG: {
135136
typedef numeric_utils::numeric_traits<int64_t> traits_t;
@@ -276,4 +277,4 @@ bool null_token_stream::next() {
276277
return value;
277278
}
278279

279-
NS_END
280+
NS_END

‎3rdParty/iresearch/core/analysis/token_streams.hpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -244,13 +244,14 @@ class IRESEARCH_API numeric_token_stream final
244244

245245
private:
246246
enum NumericType { NT_LONG = 0, NT_DBL, NT_INT, NT_FLOAT };
247+
union value_t {
248+
uint64_t i64;
249+
uint32_t i32;
250+
};
247251

248252
IRESEARCH_API_PRIVATE_VARIABLES_BEGIN
249253
bstring data_;
250-
union {
251-
uint64_t i64;
252-
uint32_t i32;
253-
} val_;
254+
value_t val_;
254255
NumericType type_;
255256
uint32_t step_;
256257
uint32_t shift_;
@@ -259,7 +260,7 @@ class IRESEARCH_API numeric_token_stream final
259260
static irs::bytes_ref value(
260261
bstring& buf,
261262
NumericType type,
262-
decltype(val_) val,
263+
value_t val,
263264
uint32_t shift
264265
);
265266
}; // numeric_term

0 commit comments

Comments
 (0)
0