Skip to content

Commit

Permalink
Merge pull request #177 from niklas88/fix_is_finished_removal
Browse files Browse the repository at this point in the history
Fix use of ResultTable::isFinished() fixes build
  • Loading branch information
joka921 committed Jan 23, 2019
2 parents 5e598f6 + f948735 commit dc18f9e
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/engine/QueryExecutionTree.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ void QueryExecutionTree::writeResultToStreamAsJson(

// _____________________________________________________________________________
size_t QueryExecutionTree::getCostEstimate() {
if (_cachedResult && _cachedResult->isFinished()) {
if (_cachedResult && _cachedResult->status() == ResultTable::FINISHED) {
// result is pinned in cache. Nothing to compute
return 0;
}
Expand All @@ -204,7 +204,7 @@ size_t QueryExecutionTree::getCostEstimate() {
// _____________________________________________________________________________
size_t QueryExecutionTree::getSizeEstimate() {
if (_sizeEstimate == std::numeric_limits<size_t>::max()) {
if (_cachedResult && _cachedResult->isFinished()) {
if (_cachedResult && _cachedResult->status() == ResultTable::FINISHED) {
_sizeEstimate = _cachedResult->size();
} else if (_qec) {
_sizeEstimate = _rootOperation->getSizeEstimate();
Expand All @@ -220,7 +220,7 @@ size_t QueryExecutionTree::getSizeEstimate() {

// _____________________________________________________________________________
bool QueryExecutionTree::knownEmptyResult() {
if (_cachedResult && _cachedResult->isFinished()) {
if (_cachedResult && _cachedResult->status() == ResultTable::FINISHED) {
return _cachedResult->size() == 0;
}
return _rootOperation->knownEmptyResult();
Expand Down

0 comments on commit dc18f9e

Please sign in to comment.