Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit522b6c9

Browse files
committed
Merge branch 'feature/supervised-aql-value' of github.com:arangodb/arangodb into feature/supervised-aggregator
2 parentsbaf508d +1dcc568 commit522b6c9

File tree

4 files changed

+85
-71
lines changed

4 files changed

+85
-71
lines changed

‎.circleci/base_config.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -522,6 +522,8 @@ jobs:
522522
arch="<<parameters.arch>>"
523523
if test "$arch" == "x64"; then
524524
arch="amd64"
525+
elif test "$arch" == "aarch64"; then
526+
arch="arm64"
525527
fi
526528
curl -s -L -o build/bin/arangodb "https://github.com/arangodb-helper/arangodb/releases/download/$STARTER_REV/arangodb-linux-$arch"
527529
chmod a+x build/bin/arangodb

‎CMakeLists.txt‎

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
3333
option(SKIP_PACKAGING""OFF)
3434

3535
# enable frontend build
36-
option(USE_FRONTEND"build the browser-based frontend (requires yarn and nodejs)"ON)
36+
option(USE_FRONTEND"build the browser-based frontend (requires yarn and nodejs)"${USE_V8})
3737

3838
# be verbose about flags used
3939
option(VERBOSE"be verbose about flags used"OFF)
@@ -162,7 +162,7 @@ if(USE_ENTERPRISE)
162162
add_definitions("-DUSE_ENTERPRISE=1")
163163
endif()
164164

165-
# enable V8/JavaScript in executables.
165+
# enable V8/JavaScript in executables.
166166
# note that V8 will always be built, regardless of the value of this option.
167167
# this is required because the V8 build step also builds ICU, which is needed
168168
# in all programs.
@@ -276,7 +276,7 @@ configure_file(
276276
################################################################################
277277

278278
function(determine_repository_version source_dir build_repository have_build_repository)
279-
# Get commit hash
279+
# Get commit hash
280280
execute_process(
281281
WORKING_DIRECTORY${source_dir}
282282
COMMAND${GIT_EXE} rev-parse --short HEAD
@@ -511,7 +511,7 @@ CheckCompilerVersion(
511511
16.0# Clang
512512
)
513513

514-
if(CMAKE_COMPILER_IS_CLANG)
514+
if(CMAKE_COMPILER_IS_CLANG)
515515
list(APPEND BASE_LIBS atomic)
516516
endif()
517517

@@ -815,7 +815,7 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
815815
# might fails when we use additional compiler flags like fcoverage...
816816
set(BASE_FLAGS"-Wall -Wextra -Wno-unused-parameter -Wno-deprecated-declarations -Wno-error=unused-command-line-argument${BASE_FLAGS}")
817817
set(EXTRA_CXX_FLAGS"-Wnon-virtual-dtor")
818-
818+
819819
if(CMAKE_CXX_COMPILER_VERSIONVERSION_GREATER_EQUAL"11.0")
820820
# clang 11 and higher supports -Wsuggest-override. older versions don't
821821
set(EXTRA_CXX_FLAGS"-Wsuggest-override${EXTRA_CXX_FLAGS}")
@@ -844,7 +844,7 @@ endif()
844844

845845
# c
846846
# note: when building one of the build types, CMake will automatically combine
847-
# the base flags from CMAKE_C_FLAGS with build type-specific flags in
847+
# the base flags from CMAKE_C_FLAGS with build type-specific flags in
848848
# CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE}.
849849
# there is no need to repeat the base flags in the build-type specific flags!
850850
set(CMAKE_C_FLAGS""CACHEINTERNAL"default C compiler flags")
@@ -855,7 +855,7 @@ set(CMAKE_C_FLAGS_RELWITHDEBINFO "${DEBUGINFO_FLAGS} -O3 -fno-omit-frame-point
855855

856856
# cxx
857857
# note: when building one of the build types, CMake will automatically combine
858-
# the base flags from CMAKE_CXX_FLAGS with build type-specific flags in
858+
# the base flags from CMAKE_CXX_FLAGS with build type-specific flags in
859859
# CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}.
860860
# there is no need to repeat the base flags in the build-type specific flags!
861861
set(CMAKE_CXX_FLAGS""CACHEINTERNAL"default C++ compiler flags")
@@ -1054,7 +1054,7 @@ if(STATIC_EXECUTABLES)
10541054
else()
10551055
set(BLA_STATICOff)
10561056
set(BLA_VENDOR OpenBLAS)
1057-
1057+
10581058
# Setting this is necessary because we want to bind to gcc library
10591059
# since the LLVM OpenMP implementation fails in our CI
10601060
# This is related to this issue (https://github.com/llvm/llvm-project/issues/137136)
@@ -1065,7 +1065,7 @@ else()
10651065
OUTPUT_VARIABLE LIBGOMP_PATH
10661066
OUTPUT_STRIP_TRAILING_WHITESPACE
10671067
)
1068-
1068+
10691069
if(EXISTS"${LIBGOMP_PATH}")
10701070
message(STATUS"Found libgomp:${LIBGOMP_PATH}")
10711071
set(OpenMP_gomp_LIBRARY"${LIBGOMP_PATH}")
@@ -1075,23 +1075,23 @@ else()
10751075
message(STATUS"Found libgomp via find_library:${LIBGOMP_LIBRARY}")
10761076
set(OpenMP_gomp_LIBRARY"${LIBGOMP_LIBRARY}")
10771077
endif()
1078-
1078+
10791079
set(OpenMP_C_FLAGS"-fopenmp=libgomp")
10801080
set(OpenMP_CXX_FLAGS"-fopenmp=libgomp")
10811081
set(OpenMP_C_LIB_NAMES"gomp;pthread")
10821082
set(OpenMP_CXX_LIB_NAMES"gomp;pthread")
10831083
set(OpenMP_pthread_LIBRARY"pthread")
1084-
1084+
10851085
find_package(OpenMP REQUIRED)
1086-
1086+
10871087
message(STATUS"OpenMP_CXX_VERSION:${OpenMP_CXX_VERSION}")
10881088
message(STATUS"OpenMP_CXX_FLAGS:${OpenMP_CXX_FLAGS}")
10891089
message(STATUS"OpenMP_CXX_LIB_NAMES:${OpenMP_CXX_LIB_NAMES}")
10901090
message(STATUS"OpenMP_gomp_LIBRARY:${OpenMP_gomp_LIBRARY}")
10911091
message(STATUS"OpenMP_omp_LIBRARY:${OpenMP_omp_LIBRARY}")
10921092
message(STATUS"OpenMP_pthread_LIBRARY:${OpenMP_pthread_LIBRARY}")
10931093
message(STATUS"OpenMP_CXX_LIBRARIES:${OpenMP_CXX_LIBRARIES}")
1094-
1094+
10951095

10961096
find_package(LAPACK)
10971097
find_package(BLAS)
@@ -1157,6 +1157,9 @@ endforeach()
11571157
add_subdirectory(Documentation)
11581158
include(ArangoDBInstall)
11591159
if(USE_FRONTEND)
1160+
if(NOT(USE_V8))
1161+
message(FATAL_ERROR"Can't build frontend without V8")
1162+
endif()
11601163
include(frontend/aardvark)
11611164
endif()
11621165
if(NOT(SKIP_PACKAGING))
@@ -1203,7 +1206,7 @@ foreach(m IN LISTS ERROR_FILES)
12031206
endforeach()
12041207

12051208
add_custom_target(errorfilesALLDEPENDS${ERROR_FILES_GEN})
1206-
1209+
12071210
set(EXIT_CODE_FILES
12081211
lib/Basics/exitcodes.h
12091212
js/common/bootstrap/exitcodes.js

‎arangod/Aql/AqlValue.cpp‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -983,6 +983,11 @@ void AqlValue::destroy() noexcept {
983983
delete _data.rangeMeta.range;
984984
break;
985985
case VPACK_SUPERVISED_SLICE: {
986+
if (_data.supervisedSliceMeta.pointer ==nullptr) {
987+
// to prevent duplicate deletion
988+
erase();
989+
return;
990+
}
986991
auto len = _data.supervisedSliceMeta.getLength();
987992
deallocateSupervised(_data.supervisedSliceMeta.pointer, len);
988993
_data.supervisedSliceMeta.pointer =nullptr;

‎cmake/ArangoDBInstall.cmake‎

Lines changed: 61 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ endif ()
1414

1515
# debug info directory:
1616
if (${CMAKE_INSTALL_LIBDIR}STREQUAL"usr/lib64")
17-
# some systems have weird places for usr/lib:
17+
# some systems have weird places for usr/lib:
1818
set(CMAKE_INSTALL_DEBINFO_DIR"usr/lib/debug/")
1919
else ()
2020
set(CMAKE_INSTALL_DEBINFO_DIR"${CMAKE_INSTALL_LIBDIR}/debug/")
@@ -69,64 +69,68 @@ add_custom_target (love
6969

7070
include(InstallArangoDBJSClient)
7171

72-
################################################################################
73-
### @brief install server-side JavaScript files
74-
################################################################################
72+
if(USE_V8)
73+
################################################################################
74+
### @brief install server-side JavaScript files
75+
################################################################################
7576

76-
# js/apps/system/_admin/aardvark/APP/manifest.json list files must be included
77-
install(
78-
DIRECTORY
79-
${PROJECT_SOURCE_DIR}/js/actions
80-
${PROJECT_SOURCE_DIR}/js/apps
81-
${PROJECT_SOURCE_DIR}/js/server
82-
DESTINATION${CMAKE_INSTALL_DATAROOTDIR_ARANGO}/${ARANGODB_JS_VERSION}
83-
REGEX"^.*/aardvark/APP/frontend.*$"EXCLUDE
84-
REGEX"^.*/aardvark/APP/react.*$"EXCLUDE
85-
REGEX"^.*/js/server/assets/swagger/*.map$"EXCLUDE
86-
REGEX"^.*/.bin"EXCLUDE
87-
)
88-
89-
set(APP_FILES
90-
"frontend/img"
91-
"react/build"
92-
)
93-
94-
set(app_files_source_dir${PROJECT_SOURCE_DIR}/js/apps/system/_admin/aardvark/APP)
95-
set(app_files_target_dir${CMAKE_INSTALL_DATAROOTDIR_ARANGO}/${ARANGODB_JS_VERSION}/apps/system/_admin/aardvark/APP)
96-
97-
foreach (file${APP_FILES})
98-
get_filename_component(parent${file}DIRECTORY)
99-
if(IS_DIRECTORY${app_files_source_dir}/${file})
100-
install(
101-
DIRECTORY
102-
${app_files_source_dir}/${file}
103-
DESTINATION
104-
${app_files_target_dir}/${parent}
105-
)
106-
else()
107-
install(
108-
FILES
109-
${app_files_source_dir}/${file}
110-
DESTINATION
111-
${app_files_target_dir}/${parent}
112-
)
113-
endif()
114-
endforeach()
77+
# js/apps/system/_admin/aardvark/APP/manifest.json list files must be included
78+
install(
79+
DIRECTORY
80+
${PROJECT_SOURCE_DIR}/js/actions
81+
${PROJECT_SOURCE_DIR}/js/apps
82+
${PROJECT_SOURCE_DIR}/js/server
83+
DESTINATION${CMAKE_INSTALL_DATAROOTDIR_ARANGO}/${ARANGODB_JS_VERSION}
84+
REGEX"^.*/aardvark/APP/frontend.*$"EXCLUDE
85+
REGEX"^.*/aardvark/APP/react.*$"EXCLUDE
86+
REGEX"^.*/js/server/assets/swagger/*.map$"EXCLUDE
87+
REGEX"^.*/.bin"EXCLUDE
88+
)
11589

116-
install(
117-
FILES
118-
${ARANGODB_SOURCE_DIR}/js/JS_SHA1SUM.txt
119-
DESTINATION
120-
${CMAKE_INSTALL_DATAROOTDIR_ARANGO}/${ARANGODB_JS_VERSION}
121-
)
90+
if(USE_FRONTEND)
91+
set(APP_FILES
92+
"frontend/img"
93+
"react/build"
94+
)
95+
96+
set(app_files_source_dir${PROJECT_SOURCE_DIR}/js/apps/system/_admin/aardvark/APP)
97+
set(app_files_target_dir${CMAKE_INSTALL_DATAROOTDIR_ARANGO}/${ARANGODB_JS_VERSION}/apps/system/_admin/aardvark/APP)
98+
99+
foreach (file${APP_FILES})
100+
get_filename_component(parent${file}DIRECTORY)
101+
if(IS_DIRECTORY${app_files_source_dir}/${file})
102+
install(
103+
DIRECTORY
104+
${app_files_source_dir}/${file}
105+
DESTINATION
106+
${app_files_target_dir}/${parent}
107+
)
108+
else()
109+
install(
110+
FILES
111+
${app_files_source_dir}/${file}
112+
DESTINATION
113+
${app_files_target_dir}/${parent}
114+
)
115+
endif()
116+
endforeach()
117+
endif()
122118

123-
if (USE_ENTERPRISE)
124119
install(
125-
DIRECTORY${PROJECT_SOURCE_DIR}/enterprise/js/server
126-
DESTINATION${CMAKE_INSTALL_DATAROOTDIR_ARANGO}/${ARANGODB_JS_VERSION}
127-
REGEX"^.*/aardvark/APP/node_modules$"EXCLUDE
120+
FILES
121+
${ARANGODB_SOURCE_DIR}/js/JS_SHA1SUM.txt
122+
DESTINATION
123+
${CMAKE_INSTALL_DATAROOTDIR_ARANGO}/${ARANGODB_JS_VERSION}
128124
)
129-
endif ()
125+
126+
if (USE_ENTERPRISE)
127+
install(
128+
DIRECTORY${PROJECT_SOURCE_DIR}/enterprise/js/server
129+
DESTINATION${CMAKE_INSTALL_DATAROOTDIR_ARANGO}/${ARANGODB_JS_VERSION}
130+
REGEX"^.*/aardvark/APP/node_modules$"EXCLUDE
131+
)
132+
endif ()
133+
endif()
130134

131135
################################################################################
132136
### @brief install log directory
@@ -195,7 +199,7 @@ if (UNIX)
195199
OUTPUT_STRIP_TRAILING_WHITESPACE
196200
)
197201
set(IS_SYSTEMD_INSTALL 1)
198-
202+
199203
# set prefix
200204
if (CMAKE_INSTALL_PREFIXANDNOT"${CMAKE_INSTALL_PREFIX}"STREQUAL"/")
201205
set(SYSTEMD_UNIT_DIR"${CMAKE_INSTALL_PREFIX}/${SYSTEMD_UNIT_DIR}/")
@@ -215,7 +219,7 @@ if (UNIX)
215219
else ()
216220
message(STATUS"-- systemd not found")
217221
endif(SYSTEMD_FOUND)
218-
endif(NOT PKG_CONFIG_FOUND)
222+
endif(NOT PKG_CONFIG_FOUND)
219223
endif(UNIX)
220224
################################################################################
221225
### @brief propagate the locations into our programms:
@@ -261,7 +265,7 @@ install(FILES "${CMAKE_SOURCE_DIR}/Installation/arangodb-helper"
261265
install(FILES"${CMAKE_SOURCE_DIR}/Installation/arangodb-helper"
262266
DESTINATION"${INSTALL_ICU_DT_DEST}"
263267
RENAME arangodb-update-db)
264-
268+
265269
install(FILES${TZ_DATA_FILES}
266270
DESTINATION"${INSTALL_TZDATA_DEST}")
267271

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp