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

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

This commit is contained in:
Andreas Streichardt 2016-04-14 15:30:34 +02:00
parent 10461fe369 05db051950
commit 3160b3cccb
12 changed files with 67 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
3rdParty/OpenSSL/CMakeLists.txt vendored
View File

@ -42,12 +42,13 @@ if (WIN32 AND NOT SSL_NUGET)
set(OPENSSL_EXT "")
endif ()
if (${BITS} EQUAL 64)
set(OPENSSL_LIB_DIR "${OPENSSL_ROOT_DIR}/lib64")
else ()
set(OPENSSL_LIB_DIR "${OPENSSL_ROOT_DIR}/lib")
if (NOT ${OPENSSL_LIB_DIR)
set(OPENSSL_LIB_DIR "${OPENSSL_ROOT_DIR}/lib/VC")
endif ()
message(STATUS "OPENSSL_LIB_DIR = ${OPENSSL_LIB_DIR}")
message(STATUS "OPENSSL_ROOT_DIR = ${OPENSSL_ROOT_DIR}")
set(OPENSSL_LIBRARIES
debug "${OPENSSL_LIB_DIR}/ssleay32MTd.lib;${OPENSSL_LIB_DIR}/libeay32MTd.lib"
optimized "${OPENSSL_LIB_DIR}/ssleay32MT.lib;${OPENSSL_LIB_DIR}/libeay32MT.lib"

2
Documentation/man/man8/arangod.8
View File

@ -1,4 +1,4 @@
.TH arangod 8 "3.0.0-devel" "ArangoDB" "ArangoDB"
.TH arangod 8 "3.0.x-devel" "ArangoDB" "ArangoDB"
.SH NAME
arangod - the ArangoDB database server
.SH SYNOPSIS

2
Documentation/man/man8/foxx-manager.8
View File

@ -1,4 +1,4 @@
.TH foxx-manager 8 "3.0.0-devel" "ArangoDB" "ArangoDB"
.TH foxx-manager 8 "3.0.x-devel" "ArangoDB" "ArangoDB"
.SH NAME
foxx-manager - a Foxx application manager for ArangoDB
.SH SYNOPSIS

2
Documentation/man/man8/rcarangod.8
View File

@ -1,4 +1,4 @@
.TH rcarangod 8 "3.0.0-devel" "ArangoDB" "ArangoDB"
.TH rcarangod 8 "3.0.x-devel" "ArangoDB" "ArangoDB"
.SH NAME
rcarangod - control script for the ArangoDB database server
.SH SYNOPSIS

7
arangod/Agency/Store.cpp
View File

@ -302,7 +302,12 @@ template<> bool Node::handle<SET> (VPackSlice const& slice) {
LOG_TOPIC(WARN, Logger::AGENCY) << slice.toJson();
return false;
}
*this = slice.get("new");
Slice val = slice.get("new");
if (val.isObject()) {
this->applies(val);
} else {
*this = val;
}
if (slice.hasKey("ttl")) {
VPackSlice ttl_v = slice.get("ttl");
if (ttl_v.isNumber()) {

30
cmake/FindOpenSSL.cmake
View File

@ -69,7 +69,24 @@ if(OPENSSL_USE_STATIC_LIBS)
endif()
endif()
if (WIN32)
# 32-bit not officially supported anymore anyway
set(SSL_BITS "x64")
# v140 corresponds to VS 2015
set(SSL_NUGET_DIR "lib/native/v140/windesktop/msvcstl/dyn/rt-dyn")
set(SSL_NUGET_ROOT "$ENV{USERPROFILE}/.nuget/packages/openssl.v140.windesktop.msvcstl.dyn.rt-dyn.${SSL_BITS}")
if (NOT OPENSSL_ROOT_DIR AND IS_DIRECTORY ${SSL_NUGET_ROOT})
# find latest version based on folder name and assign to OPENSSL_ROOT_DIR
FILE(GLOB dirlist RELATIVE ${SSL_NUGET_ROOT} ${SSL_NUGET_ROOT}/*)
list(SORT dirlist)
list(LENGTH dirlist listlength)
math(EXPR lastindex "${listlength}-1")
list(GET dirlist ${lastindex} latestversion)
set(OPENSSL_ROOT_DIR
"${SSL_NUGET_ROOT}/${latestversion}"
)
endif()
if (IS_DIRECTORY "${OPENSSL_ROOT_DIR}/build/native/")
set(SSL_NUGET TRUE)
else()
@ -77,24 +94,26 @@ if (WIN32)
endif()
if (OPENSSL_ROOT_DIR AND SSL_NUGET)
message("Found nuGET installation of OpenSSL!")
set(SSL_BITS "x64")
# its an openssl downloaded via nuget!
set(OPENSSL_INCLUDE "${OPENSSL_ROOT_DIR}/build/native/include")
set(_OPENSSL_ROOT_HINTS "${OPENSSL_ROOT_DIR}/build/native/include")
set(OPENSSL_LIB_DIR "${OPENSSL_ROOT_DIR}/lib/native/v140/windesktop/msvcstl/dyn/rt-dyn/${SSL_BITS}")
set(OPENSSL_LIB_DIR "${OPENSSL_ROOT_DIR}/${SSL_NUGET_DIR}/${SSL_BITS}")
set(_OPENSSL_ROOT_HINTS "${OPENSSL_ROOT_DIR}/build/native/include")
set(_OPENSSL_ROOT_PATHS
"${OPENSSL_ROOT_DIR}/build/native/include"
"${OPENSSL_ROOT_DIR}/lib/native/v140/windesktop/msvcstl/dyn/rt-dyn/${SSL_BITS}/")
"${OPENSSL_ROOT_DIR}/${SSL_NUGET_DIR}/${SSL_BITS}/")
else()
# http://www.slproweb.com/products/Win32OpenSSL.html
set(_OPENSSL_ROOT_HINTS
${OPENSSL_ROOT_DIR}
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (64-bit)_is1;Inno Setup: App Path]"
ENV OPENSSL_ROOT_DIR
$ENV{OPENSSL_ROOT_DIR}
)
set(_OPENSSL_ROOT_PATHS
$ENV{PATH}
)
file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _programfiles)
set(_OPENSSL_ROOT_PATHS
@ -106,6 +125,9 @@ if (WIN32)
"C:/OpenSSL-Win64/"
)
unset(_programfiles)
# none of the above will actually set OPENSSL_ROOT_DIR, but one could
# simply use the parent dir of the include dir (defined further below!)
#get_filename_component(OPENSSL_ROOT_DIR ${OPENSSL_INCLUDE_DIR} DIRECTORY)
endif()
else ()
set(_OPENSSL_ROOT_HINTS

6
js/apps/system/_admin/aardvark/APP/frontend/scss/_pure.scss
View File

@ -11,7 +11,7 @@
font-weight: 600;
&:hover {
background-color: $c-white;
background-color: $c-white;
cursor: default;
}
}
@ -26,12 +26,12 @@
.pure-table-row {
border-bottom: 1px solid $c-content-border;
font-weight: 100;
color: $c-pure-text;
font-weight: 100;
line-height: 40px;
&:hover {
background-color: rgb(239, 240, 235);
background-color: rgb(239, 240, 235);
cursor: pointer;
}

13
js/apps/system/_admin/aardvark/APP/frontend/scss/_resizing.scss
View File

@ -1,11 +1,11 @@
.resizecontainer {
@extend %clear-float;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
box-sizing: border-box;
padding: {
left: 10px;
right: 10px;
right: 10px;
};
}
@ -37,20 +37,13 @@
display: none;
}
}
.navmenu {
}
}
@media (min-width: 739px) and (max-width: 1041px) {
#arangoCollectionUl a {
}
}
@media (min-width: 1042px) and (max-width: 1284px) {
#arangoCollectionUl a {
}
}
@for $i from 1 through 11 {
@ -561,7 +554,7 @@
div.contentWrapper {
padding-bottom: 42px;
padding-bottom: 42px;
}
div.centralRow {

6
js/apps/system/_admin/aardvark/APP/frontend/scss/_screenSizes.scss
View File

@ -68,11 +68,13 @@
margin-bottom: 10px;
}
#repl-numbers, #repl-progress, #repl-ticks {
#repl-numbers,
#repl-progress,
#repl-ticks {
width: 100% !important;
}
//NAVIGATION
//NAVIGATION
.collection-dropdown {

10
js/apps/system/_admin/aardvark/APP/frontend/scss/_subNavbar.scss
View File

@ -8,17 +8,10 @@
list-style: none;
margin: 0;
&.bottom {
height: 40px;
}
&.top {
height: 60px;
}
&.top {
//background-color: $c-navbar-main-color;
background-color: $c-bluegrey-dark;
height: 60px;
width: 100%;
li {
@ -28,6 +21,7 @@
&.bottom {
border-bottom: 2px solid $c-bluegrey-nontransp;
height: 40px;
width: 100%;
li {

6
js/client/modules/@arangodb/testing.js
View File

@ -1337,7 +1337,11 @@ function startInstanceAgency(instanceInfo, protocol, options,
addArgs, testname, rootDir) {
const N = options.agencySize;
if (options.agencyWaitForSync === undefined) {
options.agencyWaitForSync = true;
}
const wfs = options.agencyWaitForSync;
for (let i = 0; i < N; i++) {
let instanceArgs = _.clone(addArgs);
instanceArgs["agency.id"] = String(i);
@ -1360,6 +1364,8 @@ function startInstanceAgency(instanceInfo, protocol, options,
let dir = fs.join(rootDir, 'agency-' + i);
fs.makeDirectoryRecursive(dir);
console.log("fucks", instanceArgs);
instanceInfo.arangods.push(startArango(protocol, options, instanceArgs, testname, rootDir));
}

9
js/client/tests/agency/agency-test.js
View File

@ -198,6 +198,15 @@ function agencyTestSuite () {
assertEqual(readAndCheck([["a/y"]]), [{"a":{"y":12}}]);
sleep(1100);
assertEqual(readAndCheck([["a/y"]]), [{"a":{"y":12}}]);
writeAndCheck([[{"foo/bar":{"op":"set","new":{"baz":12}}}]]);
assertEqual(readAndCheck([["/foo/bar/baz"]]), [{"foo":{"bar":{"baz":12}}}]);
assertEqual(readAndCheck([["/foo/bar"]]), [{"foo":{"bar":{"baz":12}}}]);
assertEqual(readAndCheck([["/foo"]]), [{"foo":{"bar":{"baz":12}}}]);
writeAndCheck([[{"foo/bar":{"op":"set","new":{"baz":12},"ttl":1}}]]);
sleep(1000);
assertEqual(readAndCheck([["/foo"]]), [{"foo":{}}]);
assertEqual(readAndCheck([["/foo/bar"]]), [{"foo":{}}]);
assertEqual(readAndCheck([["/foo/bar/baz"]]), [{"foo":{}}]);
},
testOpNew : function () {