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

fixing comparison of bounds.

This commit is contained in:
James 2014-08-21 18:40:02 +02:00
parent 89ba89bf77
commit fecaccf37f
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
arangod/Aql/ExecutionNode.h
View File

@ -932,8 +932,10 @@ namespace triagens {
// tighter than right, 0 that they are equal, 1 that right is tighter than // tighter than right, 0 that they are equal, 1 that right is tighter than
// left. For example, (x<1) is tighter than (x<=1) and (x>1) is tighter // left. For example, (x<1) is tighter than (x<=1) and (x>1) is tighter
// than (x>=1) . . . // than (x>=1) . . .
// lowhigh should be -1 if the comparison is of lower bounds,
// and 1 if it is of upper bounds . . .
static int CompareRangeInfoBound (RangeInfoBound const* left, static int CompareRangeInfoBound (RangeInfoBound const* left,
RangeInfoBound const* right) { RangeInfoBound const* right, int lowhigh) {
if (left == nullptr) { if (left == nullptr) {
return (right == nullptr ? 0 : 1); return (right == nullptr ? 0 : 1);
} }
@ -943,9 +945,9 @@ namespace triagens {
int cmp = TRI_CompareValuesJson(left->_bound.json(), right->_bound.json()); int cmp = TRI_CompareValuesJson(left->_bound.json(), right->_bound.json());
if (cmp == 0 && (left->_include != right->_include)) { if (cmp == 0 && (left->_include != right->_include)) {
cmp = (left->_include?1:-1); return (left->_include?1:-1);
} }
return cmp; return cmp * lowhigh;
}; };
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -1008,24 +1010,33 @@ namespace triagens {
return; return;
} }
if(CompareRangeInfoBound(newRange->_low, oldRange->_low) == -1){ //this case is not covered by those below . . .
if (oldRange->is1ValueRangeInfo() && newRange->is1ValueRangeInfo()) {
if (!TRI_CheckSameValueJson(oldRange->_low->_bound.json(),
newRange->_low->_bound.json())) {
oldRange->_valid = false;
return;
}
}
if (CompareRangeInfoBound(newRange->_low, oldRange->_low, -1) == -1) {
oldRange->_low = newRange->_low; oldRange->_low = newRange->_low;
} }
if(CompareRangeInfoBound(newRange->_high, oldRange->_high) == -1){ if (CompareRangeInfoBound(newRange->_high, oldRange->_high, 1) == -1) {
oldRange->_high = newRange->_high; oldRange->_high = newRange->_high;
} }
// check the new range bounds are valid // check the new range bounds are valid
if( oldRange->_low != nullptr && oldRange->_high != nullptr){ if (oldRange->_low != nullptr && oldRange->_high != nullptr) {
int cmp = TRI_CompareValuesJson(oldRange->_low->_bound.json(), int cmp = TRI_CompareValuesJson(oldRange->_low->_bound.json(),
oldRange->_high->_bound.json()); oldRange->_high->_bound.json());
if (cmp == 1 || (cmp == 0 && if (cmp == 1 || (cmp == 0 &&
!(oldRange->_low->_include == true && oldRange->_high->_include == true ))){ !(oldRange->_low->_include == true && oldRange->_high->_include == true ))) {
// range invalid // range invalid
oldRange->_valid = false; oldRange->_valid = false;
} }
} }
} }
size_t size () const { size_t size () const {

1
arangod/Aql/OptimizerRules.cpp
View File

@ -206,6 +206,7 @@ class FilterToEnumCollFinder : public WalkerWorker<ExecutionNode> {
auto noRes = new NoResultsNode(newPlan->nextId()); auto noRes = new NoResultsNode(newPlan->nextId());
newPlan->registerNode(noRes); newPlan->registerNode(noRes);
newPlan->insertDependency(x, noRes); newPlan->insertDependency(x, noRes);
_out.push_back(newPlan);
} }
} }
} }