10000 Merge branch 'feature-iresearch' of https://github.com/arangodb/arang… · arangodb/arangodb@0b6744f · GitHub
[go: up one dir, main page]
Skip to content

Commit 0b6744f

Browse files
ObiWahnObiWahn
committed
Merge branch 'feature-iresearch' of https://github.com/arangodb/arangodb into feature/iresearch/cmake
* 'feature-iresearch' of https://github.com/arangodb/arangodb: (65 commits) fix build error when not in maintainer mode more tests for IResearchQuery execution Added token-based AQL integration tests. Documentation/migrate cookbook devel 32 (#3290) ensure can get IResearckLink from an Index in a release build fixed cleanup of docker build Feature/jenkins pipeline (#3293) Feature/branch docker images (#3269) Changed FlushThread to start after recovery finishes. cleanup a few cases of fatal errors (#3274) fix buffer overrun (#3292) Bug fix/fixes 1909 (#3285) more tests on IResearch query execution if we successfully deleted the directory don't re-attempt. (#3288) port 7d6f146 - wait for queue to be actually run. (#3287) Added rename test for iResearch. Removed superfluous wait call in AQL test. Disabled FlushThread while in recovery. Fix Foxx queue test (#3286) more tests for IResearch query execution ...
2 parents 61ecca7 + d79ead2 commit 0b6744f

File tree

414 files changed

+20668
-12475
lines changed

Some content is hidden

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

414 files changed

+20668
-12475
lines changed

‎.gitignore

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
tags
22
build
3-
core-.*
3+
/core.*
44
*.vim
55
.deps
66
.dirstamp
@@ -36,7 +36,7 @@ testsStarted
3636
soc-pokec-*
3737

3838
build.sh
39-
build*/
39+
/build*/
4040
Build64/
4141
Build32/
4242
Debug64/
@@ -105,11 +105,13 @@ js/apps/system/_admin/aardvark/APP/frontend/build/libs.js.gz
105105
js/apps/system/_admin/aardvark/APP/frontend/build/style.css
106106
js/apps/system/_admin/aardvark/APP/frontend/build/scripts.html.part
107107

108+
# this is intentionally ignored, as the file is generated by
109+
# shell-database.js.in
108110
js/common/tests/shell/shell-database.js
109111
.gdb-history
110112
npm-debug.log
111113

112-
log-*
114+
/log-*
113115
data-*
114116
databases
115117
cluster-init

‎3rdParty/.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
*.ao
22
*.d
3-
*.1
4-
*.8
53
*.pc
64

75
libev/.libs/

‎3rdParty/jemalloc/CMakeLists.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,11 @@ include(ExternalProject)
55

66
# set version and paths
77
set(JEMALLOC_VERSION "5.0.1")
8-
# set(JEMALLOC_VERSION "3.6.0")
98
set(JEMALLOC_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/v${JEMALLOC_VERSION}")
109
set(JEMALLOC_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/v${JEMALLOC_VERSION}")
1110

1211
# export to paths to parent scope
1312
set(JEMALLOC_VERSION "${JEMALLOC_VERSION}" PARENT_SCOPE)
14-
set(JEMALLOC_HOME "${JEMALLOC_BINARY_DIR}" PARENT_SCOPE)
1513

1614
# copy files into binary directory
1715
file(
@@ -73,5 +71,6 @@ if (LINUX OR DARWIN)
7371
&& cp -a ${JEMALLOC_BINARY_DIR}/lib/libjemalloc.a ${CMAKE_CURRENT_BINARY_DIR}/lib
7472
)
7573

76-
set(JEMALLOC_LIB "${JEMALLOC_BINARY_DIR}/lib/libjemalloc.a" PARENT_SCOPE)
74+
set(JEMALLOC_HOME "${CMAKE_CURRENT_BINARY_DIR}" PARENT_SCOPE)
75+
set(JEMALLOC_LIB "${CMAKE_CURRENT_BINARY_DIR}/lib/libjemalloc.a" PARENT_SCOPE)
7776
endif ()

0 commit comments

Comments
 (0)
0