Merge branch 'devel' of https://github.com/arangodb/arangodb into devel

jsteemann · jsteemann · commit cbcf0423ce73 · 2015-12-23T15:33:54.000+01:00
diff --git a/arangod/Aql/TraversalNode.cpp b/arangod/Aql/TraversalNode.cpp
@@ -512,7 +512,10 @@ double TraversalNode::estimateCost (size_t& nrItems) const {
       }
     }
   }
-  nrItems = incoming * pow(expectedEdgesPerDepth, _maxDepth);
+  nrItems = static_cast<size_t>(incoming * pow(expectedEdgesPerDepth, _maxDepth));
+  if (nrItems == 0 && incoming > 0) {
+    nrItems = 1; // min value
+  }
   return depCost + nrItems;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -512,7 +512,10 @@ double TraversalNode::estimateCost (size_t& nrItems) const {`
`512`	`512`	`}`
`513`	`513`	`}`
`514`	`514`	`}`
`515`		`- nrItems = incoming * pow(expectedEdgesPerDepth, _maxDepth);`
	`515`	`+ nrItems = static_cast<size_t>(incoming * pow(expectedEdgesPerDepth, _maxDepth));`
	`516`	`+ if (nrItems == 0 && incoming > 0) {`
	`517`	`+ nrItems = 1; // min value`
	`518`	`+ }`
`516`	`519`	`return depCost + nrItems;`
`517`	`520`	`}`
`518`	`521`