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

simplifications

This commit is contained in:
jsteemann 2018-05-27 19:47:48 +02:00
parent cee529727c
commit bc87837778
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arangod/Cluster/ClusterComm.h
View File

@ -369,7 +369,7 @@ struct ClusterCommRequest {
ClusterCommRequest(std::string const& dest, rest::RequestType type,
std::string const& path,
std::shared_ptr<std::string const> body,
std::shared_ptr<std::string const> const& body,
std::unique_ptr<std::unordered_map<std::string, std::string>> headers)
: destination(dest),
requestType(type),

5
arangod/ClusterEngine/ClusterIndex.cpp
View File

@ -229,7 +229,6 @@ bool ClusterIndex::supportsFilterCondition(
SimpleAttributeEqualityMatcher matcher(this->_fields);
return matcher.matchOne(this, node, reference, itemsInIndex, estimatedItems,
estimatedCost);
break;
}
case TRI_IDX_TYPE_SKIPLIST_INDEX: {
@ -246,7 +245,6 @@ bool ClusterIndex::supportsFilterCondition(
// same for both engines
return PersistentIndexAttributeMatcher::supportsFilterCondition(this, node, reference, itemsInIndex,
estimatedItems, estimatedCost);
break;
}
case TRI_IDX_TYPE_UNKNOWN:
@ -287,7 +285,6 @@ bool ClusterIndex::supportsSortCondition(
case TRI_IDX_TYPE_EDGE_INDEX: {
return Index::supportsSortCondition(sortCondition, reference, itemsInIndex,
estimatedCost, coveredAttributes);
break;
}
case TRI_IDX_TYPE_SKIPLIST_INDEX:{
@ -304,7 +301,6 @@ bool ClusterIndex::supportsSortCondition(
// same for both indexes
return PersistentIndexAttributeMatcher::supportsSortCondition(this, sortCondition, reference, itemsInIndex,
estimatedCost, coveredAttributes);
break;
}
case TRI_IDX_TYPE_UNKNOWN:
@ -358,7 +354,6 @@ aql::AstNode* ClusterIndex::specializeCondition(
}
case TRI_IDX_TYPE_PERSISTENT_INDEX: {
return PersistentIndexAttributeMatcher::specializeCondition(this, node, reference);
break;
}
case TRI_IDX_TYPE_UNKNOWN:

3
arangod/ClusterEngine/ClusterTransactionCollection.cpp
View File

@ -36,7 +36,8 @@ ClusterTransactionCollection::ClusterTransactionCollection(
int nestingLevel)
: TransactionCollection(trx, cid, accessType),
_lockType(AccessMode::Type::NONE),
_nestingLevel(nestingLevel) {}
_nestingLevel(nestingLevel),
_usageLocked(false) {}
ClusterTransactionCollection::~ClusterTransactionCollection() {}