Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of https://github.com/arangodb/arangodb into devel

This commit is contained in:
jsteemann 2016-07-18 11:44:23 +02:00
parent b9b01b4c77 49d8a963cd
commit ade4b411b2
4 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
3rdParty/rocksdb/rocksdb/CMakeLists.txt vendored
View File

@ -168,13 +168,30 @@ if (CMAKE_COMPILER_IS_GNUCC)
if (VERBOSE) if (VERBOSE)
message(STATUS "Compiler type GNU: ${CMAKE_CXX_COMPILER}") message(STATUS "Compiler type GNU: ${CMAKE_CXX_COMPILER}")
endif () endif ()
# "-momit-leaf-frame-pointer" option not available not on ARM
SET(OPT_momit_leaf_frame_pointer "-momit-leaf-frame-pointer")
if(CMAKE_TARGET_ARCHITECTURES MATCHES "armv7"
OR CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "armv7l" )
SET(OPT_momit_leaf_frame_pointer "")
endif()
if (VERBOSE)
message(STATUS "CMAKE_TARGET_ARCHITECTURES:" ${CMAKE_TARGET_ARCHITECTURES})
message(STATUS "CMAKE_HOST_SYSTEM_PROCESSOR:" ${CMAKE_HOST_SYSTEM_PROCESSOR})
message(STATUS "OPT_momit_leaf_frame_pointer:" ${OPT_momit_leaf_frame_pointer})
endif ()
# -DSNAPPY -DZLIB # -DSNAPPY -DZLIB
if (SOLARIS OR DARWIN) if (SOLARIS OR DARWIN)
set(ROCKSDB_MALLOC_USABLE_SIZE "") set(ROCKSDB_MALLOC_USABLE_SIZE "")
else() else()
set(ROCKSDB_MALLOC_USABLE_SIZE "-DROCKSDB_MALLOC_USABLE_SIZE") set(ROCKSDB_MALLOC_USABLE_SIZE "-DROCKSDB_MALLOC_USABLE_SIZE")
endif() endif()
set(BASE_FLAGS "${BASE_FLAGS} -W -Wextra -Wall -Wsign-compare -Wshadow -Wno-unused-parameter -fno-omit-frame-pointer -momit-leaf-frame-pointer -fno-builtin-memcmp -Woverloaded-virtual -Wnon-virtual-dtor -Wno-missing-field-initializers ${ROCKSDB_MALLOC_USABLE_SIZE} -isystem -fPIC -D${OS_DEFINE} ${POSIX_FLAG}") set(BASE_FLAGS "${BASE_FLAGS} -W -Wextra -Wall -Wsign-compare -Wshadow -Wno-unused-parameter -fno-omit-frame-pointer ${OPT_momit_leaf_frame_pointer} -fno-builtin-memcmp -Woverloaded-virtual -Wnon-virtual-dtor -Wno-missing-field-initializers ${ROCKSDB_MALLOC_USABLE_SIZE} -isystem -fPIC -D${OS_DEFINE} ${POSIX_FLAG}")
set(CMAKE_C_FLAGS "-g" CACHE INTERNAL "default C compiler flags") set(CMAKE_C_FLAGS "-g" CACHE INTERNAL "default C compiler flags")
set(CMAKE_C_FLAGS_DEBUG "-O0 -g -Werror" CACHE INTERNAL "C debug flags") set(CMAKE_C_FLAGS_DEBUG "-O0 -g -Werror" CACHE INTERNAL "C debug flags")

11
Documentation/Examples/RestFetchUserDatabaseList.generated Normal file
View File

@ -0,0 +1,11 @@
shell> curl --dump - http://localhost:8529/_api/user/anotherAdmin@secapp/database/
HTTP/<span class="hljs-number">1.1</span> <span class="hljs-number">200</span> OK
content-type: application/json; charset=utf<span class="hljs-number">-8</span>
{
<span class="hljs-string">"result"</span> : {
},
<span class="hljs-string">"error"</span> : <span class="hljs-literal">false</span>,
<span class="hljs-string">"code"</span> : <span class="hljs-number">200</span>
}

2
lib/Basics/HybridLogicalClock.cpp
View File

@ -26,7 +26,7 @@
char arangodb::basics::HybridLogicalClock::encodeTable[65] char arangodb::basics::HybridLogicalClock::encodeTable[65]
= "-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; = "-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
char arangodb::basics::HybridLogicalClock::decodeTable[256] signed char arangodb::basics::HybridLogicalClock::decodeTable[256]
= {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, // 0 - 15 = {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, // 0 - 15
-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, // 16 - 31 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, // 16 - 31
-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0,-1,-1, // 32 - 47 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0,-1,-1, // 32 - 47

4
lib/Basics/HybridLogicalClock.h
View File

@ -127,7 +127,7 @@ class HybridLogicalClock {
} }
uint64_t r = 0; uint64_t r = 0;
for (size_t i = 0; i < len; i++) { for (size_t i = 0; i < len; i++) {
char c = decodeTable[static_cast<uint8_t>(p[i])]; signed char c = decodeTable[static_cast<uint8_t>(p[i])];
if (c < 0) { if (c < 0) {
return 0; return 0;
} }
@ -159,7 +159,7 @@ class HybridLogicalClock {
static char encodeTable[65]; static char encodeTable[65];
static char decodeTable[256]; static signed char decodeTable[256];
}; };