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

Replaced doc_mptr_copy with doc_mptr which is the correct type in this case.

This commit is contained in:
Michael Hackstein 2016-02-01 11:40:18 +01:00
parent 8fad43282d
commit e0455850fc
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arangod/Indexes/EdgeIndex.cpp
View File

@ -541,7 +541,7 @@ int EdgeIndex::batchInsert(arangodb::Transaction* trx,
void EdgeIndex::lookup(arangodb::Transaction* trx,
TRI_edge_index_iterator_t const* edgeIndexIterator,
std::vector<TRI_doc_mptr_copy_t>& result,
TRI_doc_mptr_copy_t*& next, size_t batchSize) {
TRI_doc_mptr_t*& next, size_t batchSize) {
auto callback =
[&result](TRI_doc_mptr_t* data) -> void { result.emplace_back(*(data)); };
@ -557,7 +557,7 @@ void EdgeIndex::lookup(arangodb::Transaction* trx,
TRI_ASSERT(false);
}
if (found != nullptr && found->size() != 0) {
next = static_cast<TRI_doc_mptr_copy_t*>(found->back());
next = found->back();
}
} else {
if (edgeIndexIterator->_direction == TRI_EDGE_OUT) {
@ -568,7 +568,7 @@ void EdgeIndex::lookup(arangodb::Transaction* trx,
TRI_ASSERT(false);
}
if (found != nullptr && found->size() != 0) {
next = static_cast<TRI_doc_mptr_copy_t*>(found->back());
next = found->back();
} else {
next = nullptr;
}

2
arangod/Indexes/EdgeIndex.h
View File

@ -124,7 +124,7 @@ class EdgeIndex final : public Index {
//////////////////////////////////////////////////////////////////////////////
void lookup(arangodb::Transaction*, TRI_edge_index_iterator_t const*,
std::vector<TRI_doc_mptr_copy_t>&, TRI_doc_mptr_copy_t*&, size_t);
std::vector<TRI_doc_mptr_copy_t>&, TRI_doc_mptr_t*&, size_t);
int batchInsert(arangodb::Transaction*,
std::vector<TRI_doc_mptr_t const*> const*,

4
arangod/V8Server/V8Traverser.cpp
View File

@ -932,7 +932,7 @@ void DepthFirstTraverser::setStartVertex(
}
}
}
_enumerator.reset(new PathEnumerator<EdgeInfo, VertexId, TRI_doc_mptr_copy_t>(
_enumerator.reset(new PathEnumerator<EdgeInfo, VertexId, TRI_doc_mptr_t>(
_edgeGetter, _getVertex, v));
_done = false;
}
@ -981,7 +981,7 @@ EdgeIndex* DepthFirstTraverser::EdgeGetter::getEdgeIndex(
void DepthFirstTraverser::EdgeGetter::operator()(VertexId const& startVertex,
std::vector<EdgeInfo>& edges,
TRI_doc_mptr_copy_t*& last,
TRI_doc_mptr_t*& last,
size_t& eColIdx, bool& dir) {
std::string eColName;
TRI_edge_direction_e direction;

4
arangod/V8Server/V8Traverser.h
View File

@ -213,7 +213,7 @@ class DepthFirstTraverser : public Traverser {
//////////////////////////////////////////////////////////////////////////////
void operator()(VertexId const&, std::vector<EdgeInfo>&,
TRI_doc_mptr_copy_t*&, size_t&, bool&);
TRI_doc_mptr_t*&, size_t&, bool&);
private:
@ -262,7 +262,7 @@ class DepthFirstTraverser : public Traverser {
//////////////////////////////////////////////////////////////////////////////
std::unique_ptr<arangodb::basics::PathEnumerator<
EdgeInfo, VertexId, TRI_doc_mptr_copy_t>> _enumerator;
EdgeInfo, VertexId, TRI_doc_mptr_t>> _enumerator;
//////////////////////////////////////////////////////////////////////////////
/// @brief internal getter to extract an edge