8000 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel · gauravkumar37/arangodb@ead3f17 · GitHub
[go: up one dir, main page]
Skip to content

Commit ead3f17

Browse files
neunhoefneunhoef
committed
Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel
2 parents c2ce2c5 + bf16086 commit ead3f17

File tree

23 files changed

+152
-219
lines changed

23 files changed

+152
-219
lines changed

‎3rdParty/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,6 @@ add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/zlib/zlib-1.2.8)
9393
## SNAPPY
9494
################################################################################
9595

96-
set(SKIP_INSTALL_ALL ON)
97-
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/snappy/google-snappy-d53de18)
9896

9997
################################################################################
10098
## ROCKSDB
@@ -104,6 +102,8 @@ if (USE_ROCKSDB)
104102
if (${JEMALLOC_FOUND})
105103
# set(USE_JEMALLOC_DEFAULT 1)
106104
endif()
105+
set(SKIP_INSTALL_ALL ON)
106+
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/snappy/google-snappy-d53de18)
107107
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/rocksdb/)
108108
endif ()
109109

‎3rdParty/rocksdb/rocksdb/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
33
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
cmake_minimum_required(VERSION 2.6)
3030
project(rocksdb)
3131

32+
SET(SNAPPY 1)
32
include(${CMAKE_CURRENT_SOURCE_DIR}/thirdparty.inc)
3334
IF (WIN32)
3435
execute_process(COMMAND powershell -Command "Get-Date -format MM_dd_yyyy" OUTPUT_VARIABLE DATE)

‎3rdParty/rocksdb/rocksdb/thirdparty.inc

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#
44
# Edit these lines to set defaults for use of external libraries
55
#
6+
67
if (NOT "${USE_GFLAGS_DEFAULT}")
78
set(USE_GFLAGS_DEFAULT 0) # GFLAGS is disabled by default, enable with -DGFLAGS=1 cmake command line agrument
89
endif()
@@ -85,10 +86,11 @@ endif ()
8586
#
8687
# Edit these 4 lines to define paths to Snappy
8788
#
88-
set(SNAPPY_HOME $ENV{THIRDPARTY_HOME}/Snappy.Library)
89-
set(SNAPPY_INCLUDE ${SNAPPY_HOME}/inc/inc)
90-
set(SNAPPY_LIB_DEBUG ${SNAPPY_HOME}/bin/debug/amd64/snappy.lib)
91-
set(SNAPPY_LIB_RELEASE ${SNAPPY_HOME}/bin/retail/amd64/snappy.lib)
89+
set(SNAPPY_HOME ${CMAKE_SOURCE_DIR}/3rdParty/snappy/google-snappy-d53de18/)
90+
set(SNAPPY_INCLUDE ${SNAPPY_HOME})
91+
list(APPEND SNAPPY_INCLUDE ${CMAKE_BINARY_DIR}/3rdParty/snappy/google-snappy-d53de18/)
92+
set(SNAPPY_LIB_DEBUG snappystatic)
93+
set(SNAPPY_LIB_RELEASE snappystatic)
9294

9395
#
9496
# Don't touch these lines

‎3rdParty/snappy/google-snappy-d53de18/CMakeLists.txt

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -148,30 +148,3 @@ set(SNAPPY_SRCS
148148
)
149149

150150
add_library(snappystatic STATIC ${SNAPPY_SRCS} ${SNAPPY_PUBLIC_HDRS} ${SNAPPY_PRIVATE_HDRS})
151-
152-
153-
if (WINDOWS)
154-
set(SNAPPY_LIBS
155-
snappystatic
156-
CACHE INTERNAL
157-
"${PROJECT_NAME}: Libraries"
158-
)
159-
160-
list(APPEND LINK_DIRECTORIES "${snappystatic_BINARY_DIR}")
161-
else ()
162-
set(SNAPPY_LIBS
163-
snappystatic
164-
CACHE INTERNAL
165-
"${PROJECT_NAME}: Libraries"
166-
)
167-
168-
list(APPEND LINK_DIRECTORIES "${snappystatic_BINARY_DIR}")
169-
endif ()
170-
171-
set(SNAPPY_INCLUDE_DIR
172-
${PROJECT_SOURCE_DIR} ${PROJECT_BINARY_DIR}
173-
CACHE INTERNAL
174-
"${PROJECT_NAME}: Include Directories"
175-
)
176-
177-
set(LINK_DIRECTORIES "${LINK_DIRECTORIES}" PARENT_SCOPE)

‎CMakeLists.txt

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,11 @@ option(USE_ROCKSDB
155155

156156
if (USE_ROCKSDB)
157157
add_definitions("-DARANGODB_ENABLE_ROCKSDB=1")
158+
else ()
159+
set(ROCKSDB_LIBS "")
158160
endif ()
159161

162+
160163
################################################################################
161164
## EXTERNAL PROGRAMS
162165
################################################################################
@@ -167,13 +170,6 @@ else ()
167170
set(MAKE make)
168171
endif ()
169172

170-
if (USE_ROCKSDB)
171-
find_package(Snappy)
172-
else ()
173-
set(SNAPPY_STATIC_LIB "")
174-
set(ROCKSDB_LIBS "")
175-
endif ()
176-
177173
find_package(PythonInterp 2 REQUIRED)
178174
get_filename_component(PYTHON_EXECUTABLE "${PYTHON_EXECUTABLE}" REALPATH)
179175

‎arangod/Aql/Functions.cpp

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,36 +22,37 @@
2222
////////////////////////////////////////////////////////////////////////////////
2323

2424
#include "Functions.h"
25+
26+
#include <velocypack/Collection.h>
27+
#include <velocypack/Dumper.h>
28+
#include <velocypack/Iterator.h>
29+
#include <velocypack/velocypack-aliases.h>
30+
2531
#include "Aql/Function.h"
2632
#include "Aql/Query.h"
2733
#include "Basics/Exceptions.h"
28-
#include "Basics/fpconv.h"
2934
#include "Basics/ScopeGuard.h"
3035
#include "Basics/StringBuffer.h"
31-
#include "Basics/tri-strings.h"
3236
#include "Basics/Utf8Helper.h"
33-
#include "Basics/VelocyPackHelper.h"
3437
#include "Basics/VPackStringBufferAdapter.h"
38+
#include "Basics/VelocyPackHelper.h"
39+
#include "Basics/fpconv.h"
40+
#include "Basics/tri-strings.h"
3541
#include "FulltextIndex/fulltext-index.h"
36-
#include "FulltextIndex/fulltext-result.h"
3742
#include "FulltextIndex/fulltext-query.h"
38-
#include "Indexes/Index.h"
43+
#include "FulltextIndex/fulltext-result.h"
3944
#include "Indexes/EdgeIndex.h"
4045
#include "Indexes/FulltextIndex.h"
4146
#include "Indexes/GeoIndex2.h"
42-
#include "Rest/SslInterface.h"
47+
#include "Indexes/Index.h"
48+
#include "Ssl/SslInterface.h"
4349
#include "Utils/OperationCursor.h"
4450
#include "Utils/OperationOptions.h"
4551
#include "Utils/OperationResult.h"
4652
#include "Utils/Transaction.h"
4753
#include "V8Server/V8Traverser.h"
4854
#include "VocBase/KeyGenerator.h"
4955

50-
#include <velocypack/Collection.h>
51-
#include <velocypack/Dumper.h>
52-
#include <velocypack/Iterator.h>
53-
#include <velocypack/velocypack-aliases.h>
54-
5556
using namespace arangodb;
5657
using namespace arangodb::aql;
5758

‎arangod/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,6 @@ target_link_libraries(${BIN_ARANGOD}
331331
${MSVC_LIBS}
332332
${V8_LIBS}
333333
${ROCKSDB_LIBS}
334-
${SNAPPY_STATIC_LIB}
335334
${SYSTEM_LIBRARIES}
336335
)
337336

‎arangod/HttpServer/HttpsCommTask.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@
2626

2727
#include <openssl/err.h>
2828

29-
#include "Logger/Logger.h"
30-
#include "Basics/socket-utils.h"
31-
#include "Basics/ssl-helper.h"
3229
#include "Basics/StringBuffer.h"
30+
#include "Basics/socket-utils.h"
3331
#include "HttpServer/HttpsServer.h"
32+
#include "Logger/Logger.h"
3433
#include "Scheduler/Scheduler.h"
34+
#include "Ssl/ssl-helper.h"
3535

3636
using namespace arangodb;
3737
using namespace arangodb::rest;

‎arangod/RestServer/RestServerFeature.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,10 @@
2222

2323
#include "RestServerFeature.h"
2424

25-
#include "ApplicationFeatures/SslFeature.h"
26-
#include "Aql/RestAqlHandler.h"
2725
#include "Agency/AgencyFeature.h"
2826
#include "Agency/RestAgencyHandler.h"
2927
#include "Agency/RestAgencyPrivHandler.h"
28+
#include "Aql/RestAqlHandler.h"
3029
#include "Cluster/AgencyCallbackRegistry.h"
3130
#include "Cluster/ClusterComm.h"
3231
#include "Cluster/ClusterFeature.h"
@@ -66,6 +65,7 @@
6665
#include "RestServer/QueryRegistryFeature.h"
6766
#include "RestServer/ServerFeature.h"
6867
#include "Scheduler/SchedulerFeature.h"
68+
#include "Ssl/SslFeature.h"
6969
#include "V8Server/V8DealerFeature.h"
7070
#include "VocBase/server.h"
7171

‎arangod/RestServer/arangod.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
#include "ApplicationFeatures/NonceFeature.h"
3232
#include "ApplicationFeatures/PrivilegeFeature.h"
3333
#include "ApplicationFeatures/ShutdownFeature.h"
34-
#include "ApplicationFeatures/SslFeature.h"
3534
#include "ApplicationFeatures/SupervisorFeature.h"
3635
#include "ApplicationFeatures/TempFeature.h"
3736
#include "ApplicationFeatures/V8PlatformFeature.h"
@@ -60,6 +59,7 @@
6059
#include "RestServer/UnitTestsFeature.h"
6160
#include "RestServer/UpgradeFeature.h"
6261
#include "Scheduler/SchedulerFeature.h"
62+
#include "Ssl/SslFeature.h"
6363
#include "Statistics/StatisticsFeature.h"
6464
#include "V8Server/FoxxQueuesFeature.h"
6565
#include "V8Server/V8DealerFeature.h"

0 commit comments

Comments
 (0)
0