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

Stuff

This commit is contained in:
Simon Grätzer 2019-10-15 13:24:35 +02:00
parent 4fa7b43595
commit c4811b29be
No known key found for this signature in database
GPG Key ID: E4736AA091116E5C
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
3rdParty/fuerte/src/vst.cpp vendored
View File

@ -484,12 +484,10 @@ RequestHeader requestHeaderFromSlice(VPackSlice const& headerSlice) {
header.restVerb =
static_cast<RestVerb>(headerSlice.at(3).getInt()); // rest verb
header.path = headerSlice.at(4).copyString(); // request (path)
for (auto const& it :
VPackObjectIterator(headerSlice.at(5))) { // query params
for (auto it : VPackObjectIterator(headerSlice.at(5))) { // query params
header.parameters.emplace(it.key.copyString(), it.value.copyString());
}
for (auto const& it :
VPackObjectIterator(headerSlice.at(6))) { // meta (headers)
for (auto it : VPackObjectIterator(headerSlice.at(6))) { // meta (headers)
header.addMeta(it.key.copyString(), it.value.copyString());
}
return header;

9
arangod/Cluster/ClusterMethods.cpp
View File

@ -1850,7 +1850,7 @@ int fetchEdgesFromEngines(transaction::Methods& trx,
continue;
}
arangodb::velocypack::StringRef idRef(id);
auto resE = cache.insert({idRef, e});
auto resE = cache.emplace(idRef, e);
if (resE.second) {
// This edge is not yet cached.
allCached = false;
@ -1924,8 +1924,7 @@ int fetchEdgesFromEngines(
// Response has invalid format
return TRI_ERROR_HTTP_CORRUPTED_JSON;
}
read += Helper::getNumericValue<size_t>(resSlice,
"readIndex", 0);
read += Helper::getNumericValue<size_t>(resSlice, "readIndex", 0);
bool allCached = true;
VPackSlice edges = resSlice.get("edges");
@ -1938,7 +1937,7 @@ int fetchEdgesFromEngines(
continue;
}
arangodb::velocypack::StringRef idRef(id);
auto resE = cache.insert({idRef, e});
auto resE = cache.emplace(idRef, e);
if (resE.second) {
// This edge is not yet cached.
allCached = false;
@ -2021,7 +2020,7 @@ void fetchVerticesFromEngines(
}
bool cached = false;
for (auto const& pair : VPackObjectIterator(resSlice)) {
for (auto const& pair : VPackObjectIterator(resSlice, true)) {
arangodb::velocypack::StringRef key(pair.key);
if (vertexIds.erase(key) == 0) {
// We either found the same vertex twice,

2
lib/Zip/unzip.cpp
View File

@ -1085,7 +1085,7 @@ unzGetCurrentFileInfo(unzFile file, unz_file_info* pfile_info, char* szFileName,
pfile_info->internal_fa = file_info64.internal_fa;
pfile_info->external_fa = file_info64.external_fa;
pfile_info->tmu_date = file_info64.tmu_date,
pfile_info->tmu_date = file_info64.tmu_date;
pfile_info->compressed_size = (uLong)file_info64.compressed_size;
pfile_info->uncompressed_size = (uLong)file_info64.uncompressed_size;