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:
Michael Hackstein 2016-04-13 15:57:58 +02:00
parent 1352e3d682 2c7cfac728
commit 656c784bfe
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
3rdParty/V8/CMakeLists.txt vendored
View File

@ -61,14 +61,24 @@ list(APPEND V8_GYP_ARGS
## ICU EXPORTS ## ICU EXPORTS
################################################################################ ################################################################################
set(ICU_VERSION set(ICU_COMPACT_VERSION
"54.1" "54"
CACHE INTERNAL CACHE INTERNAL
"ICU: Version" "ICU: compact Version"
) )
set(ICU_VERSION
"${ICU_COMPACT_VERSION}.1"
CACHE INTERNAL
"ICU: Version"
)
set(ICU_BASEDIR ${V8_DIR}/third_party/icu/source)
set(ICU_DT "${ICU_BASEDIR}/data/in/icudtl.dat")
set(ICU_DT_DEST "icudt${ICU_COMPACT_VERSION}l.dat")
set(ICU_INCLUDE_DIR set(ICU_INCLUDE_DIR
${V8_DIR}/third_party/icu/source/common;${V8_DIR}/third_party/icu/source/i18n;${V8_DIR}/third_party/icu/source/io ${ICU_BASEDIR}/common;${ICU_BASEDIR}/i18n;${ICU_BASEDIR}/io
CACHE INTERNAL CACHE INTERNAL
"ICU: include path" "ICU: include path"
FORCE FORCE
@ -449,3 +459,6 @@ else ()
set(LINK_DIRECTORIES "${LINK_DIRECTORIES}" PARENT_SCOPE) set(LINK_DIRECTORIES "${LINK_DIRECTORIES}" PARENT_SCOPE)
endif() endif()
install(FILES ${ICU_DT}
DESTINATION "share/arangodb/"
RENAME ${ICU_DT_DEST})

10
arangod/Agency/Store.cpp
View File

@ -192,7 +192,7 @@ NodeType Node::type() const {
// lh-value at path vector // lh-value at path vector
Node& Node::operator ()(std::vector<std::string> const& pv) { Node& Node::operator ()(std::vector<std::string> const& pv) {
if (pv.size()) { if (pv.size()) {
std::string const key = pv.at(0); std::string const& key = pv.at(0);
if (_children.find(key) == _children.end()) { if (_children.find(key) == _children.end()) {
_children[key] = std::make_shared<Node>(key, this); _children[key] = std::make_shared<Node>(key, this);
} }
@ -207,7 +207,7 @@ Node& Node::operator ()(std::vector<std::string> const& pv) {
// rh-value at path vector // rh-value at path vector
Node const& Node::operator ()(std::vector<std::string> const& pv) const { Node const& Node::operator ()(std::vector<std::string> const& pv) const {
if (pv.size()) { if (pv.size()) {
std::string const key = pv.at(0); std::string const& key = pv.at(0);
if (_children.find(key) == _children.end()) { if (_children.find(key) == _children.end()) {
throw StoreException( throw StoreException(
std::string("Node ") + key + std::string(" not found")); std::string("Node ") + key + std::string(" not found"));
@ -866,14 +866,16 @@ void Store::dumpToBuilder (Builder& builder) const {
} }
} }
{ {
VPackObjectBuilder guard(&builder); VPackArrayBuilder garray(&builder);
for (auto const& i : _observer_table) { for (auto const& i : _observer_table) {
VPackObjectBuilder guard(&builder);
builder.add(i.first, VPackValue(i.second)); builder.add(i.first, VPackValue(i.second));
} }
} }
{ {
VPackObjectBuilder guard(&builder); VPackArrayBuilder garray(&builder);
for (auto const& i : _observed_table) { for (auto const& i : _observed_table) {
VPackObjectBuilder guard(&builder);
builder.add(i.first, VPackValue(i.second)); builder.add(i.first, VPackValue(i.second));
} }
} }