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

Forward port changelog changes and typo fixes from #6303 (#6410)

This commit is contained in:
Simran 2018-09-10 17:03:06 +02:00 committed by Jan
parent 7bc9c5539f
commit 62069735b0
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG
View File

@ -8,10 +8,14 @@ v3.4.0-rc.1
* upgraded bundled Snappy compression library to 1.1.7
* fixed issue #5941 if using breath first search in traversals uniqueness checks
* fixed issue #5941 if using breadth first search in traversals uniqueness checks
on path (vertices and edges) have not been applied. In SmartGraphs the checks
have been executed properly.
* added more detailed progress output to arangorestore, showing the percentage of
how much data is restored for bigger collections plus a set of overview statistics
after each processed collection
* added option `--rocksdb.use-file-logging` to enable writing of RocksDB's own
informational LOG files into RocksDB's database directory.

6
arangod/Graph/BreadthFirstEnumerator.cpp
View File

@ -239,14 +239,14 @@ bool BreadthFirstEnumerator::pathContainsVertex(size_t index, StringRef vertex)
while (true) {
TRI_ASSERT(index < _schreier.size());
auto const& step = _schreier[index];
// Massive logic error, only valid pointers should inserted in _schreier
// Massive logic error, only valid pointers should be inserted into _schreier
TRI_ASSERT(step != nullptr);
if (step->vertex == vertex) {
// We have the given vertex on this path
return true;
}
if (index == 0) {
//We have checked the compelte path
// We have checked the complete path
return false;
}
index = step->sourceIdx;
@ -258,7 +258,7 @@ bool BreadthFirstEnumerator::pathContainsEdge(size_t index, graph::EdgeDocumentT
while (index != 0) {
TRI_ASSERT(index < _schreier.size());
auto const& step = _schreier[index];
// Massive logic error, only valid pointers should inserted in _schreier
// Massive logic error, only valid pointers should be inserted into _schreier
TRI_ASSERT(step != nullptr);
if (step->edge.equals(edge)) {
// We have the given vertex on this path