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

Skiplist index now can handle upper and lower bounds and combined with equal and any. hunt leaks now

This commit is contained in:
Michael Hackstein 2015-10-08 13:35:45 +02:00
parent af4ff37334
commit 9639a9e669
1 changed files with 70 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

134
arangod/Indexes/SkiplistIndex.cpp
View File

@ -1186,17 +1186,17 @@ IndexIterator* SkiplistIndex::iteratorForCondition (IndexIteratorContext* contex
// This is not an equalityCheck, set lower or upper // This is not an equalityCheck, set lower or upper
switch (comp->type) { switch (comp->type) {
case triagens::aql::NODE_TYPE_OPERATOR_BINARY_LT: case triagens::aql::NODE_TYPE_OPERATOR_BINARY_LT:
setBorder(false, false);
break;
case triagens::aql::NODE_TYPE_OPERATOR_BINARY_LE:
setBorder(false, true);
break;
case triagens::aql::NODE_TYPE_OPERATOR_BINARY_GT:
setBorder(true, false); setBorder(true, false);
break; break;
case triagens::aql::NODE_TYPE_OPERATOR_BINARY_GE: case triagens::aql::NODE_TYPE_OPERATOR_BINARY_LE:
setBorder(true, true); setBorder(true, true);
break; break;
case triagens::aql::NODE_TYPE_OPERATOR_BINARY_GT:
setBorder(false, false);
break;
case triagens::aql::NODE_TYPE_OPERATOR_BINARY_GE:
setBorder(false, true);
break;
default: default:
// unsupported right now. Should have been rejected by supportsFilterCondition // unsupported right now. Should have been rejected by supportsFilterCondition
TRI_ASSERT(false); TRI_ASSERT(false);
@ -1210,71 +1210,73 @@ IndexIterator* SkiplistIndex::iteratorForCondition (IndexIteratorContext* contex
searchValues.reserve(maxPermutations); searchValues.reserve(maxPermutations);
std::unique_ptr<TRI_index_operator_t> rangeOperator(nullptr); auto buildRangeOperator = [&] () -> TRI_index_operator_t* {
std::unique_ptr<TRI_index_operator_t> rangeOperator(nullptr);
if (lower != nullptr) { if (lower != nullptr) {
TRI_index_operator_type_e type; TRI_index_operator_type_e type;
if (includeLower) { if (includeLower) {
type = TRI_LE_INDEX_OPERATOR; type = TRI_LE_INDEX_OPERATOR;
} }
else { else {
type = TRI_LT_INDEX_OPERATOR; type = TRI_LT_INDEX_OPERATOR;
} }
std::unique_ptr<TRI_json_t> parameter(TRI_CreateArrayJson(TRI_UNKNOWN_MEM_ZONE, 1)); std::unique_ptr<TRI_json_t> parameter(TRI_CreateArrayJson(TRI_UNKNOWN_MEM_ZONE, 1));
if (parameter == nullptr) { if (parameter == nullptr) {
return nullptr; return nullptr;
} }
TRI_PushBack2ArrayJson(parameter.get(), TRI_CopyJson(TRI_UNKNOWN_MEM_ZONE, lower)); TRI_PushBack2ArrayJson(parameter.get(), TRI_CopyJson(TRI_UNKNOWN_MEM_ZONE, lower));
std::cout << parameter.get() << std::endl; std::cout << parameter.get() << std::endl;
rangeOperator.reset(TRI_CreateIndexOperator(type, rangeOperator.reset(TRI_CreateIndexOperator(type,
nullptr,
nullptr,
parameter.get(),
_shaper,
1));
parameter.release();
}
if (upper != nullptr) {
TRI_index_operator_type_e type;
if (includeUpper) {
type = TRI_GE_INDEX_OPERATOR;
}
else {
type = TRI_GT_INDEX_OPERATOR;
}
std::unique_ptr<TRI_json_t> parameter(TRI_CreateArrayJson(TRI_UNKNOWN_MEM_ZONE, 1));
if (parameter == nullptr) {
return nullptr;
}
TRI_PushBack2ArrayJson(parameter.get(), TRI_CopyJson(TRI_UNKNOWN_MEM_ZONE, upper));
std::unique_ptr<TRI_index_operator_t> tmpOp(TRI_CreateIndexOperator(type,
nullptr,
nullptr,
parameter.get(),
_shaper,
1));
parameter.release();
if (rangeOperator == nullptr) {
rangeOperator.reset(tmpOp.release());
}
else {
rangeOperator.reset(TRI_CreateIndexOperator(TRI_AND_INDEX_OPERATOR,
rangeOperator.release(),
tmpOp.get(),
nullptr, nullptr,
nullptr,
parameter.get(),
_shaper, _shaper,
2)); 1));
tmpOp.release(); parameter.release();
} }
}
if (upper != nullptr) {
TRI_index_operator_type_e type;
if (includeUpper) {
type = TRI_GE_INDEX_OPERATOR;
}
else {
type = TRI_GT_INDEX_OPERATOR;
}
std::unique_ptr<TRI_json_t> parameter(TRI_CreateArrayJson(TRI_UNKNOWN_MEM_ZONE, 1));
if (parameter == nullptr) {
return nullptr;
}
TRI_PushBack2ArrayJson(parameter.get(), TRI_CopyJson(TRI_UNKNOWN_MEM_ZONE, upper));
std::unique_ptr<TRI_index_operator_t> tmpOp(TRI_CreateIndexOperator(type,
nullptr,
nullptr,
parameter.get(),
_shaper,
1));
parameter.release();
if (rangeOperator == nullptr) {
rangeOperator.reset(tmpOp.release());
}
else {
rangeOperator.reset(TRI_CreateIndexOperator(TRI_AND_INDEX_OPERATOR,
rangeOperator.release(),
tmpOp.get(),
nullptr,
_shaper,
2));
tmpOp.release();
}
}
return rangeOperator.release();
};
if (usedFields == 0) { if (usedFields == 0) {
// We have a range query based on the first _field // We have a range query based on the first _field
searchValues.emplace_back(rangeOperator.get()); searchValues.emplace_back(buildRangeOperator());
rangeOperator.release();
} }
else { else {
bool done = false; bool done = false;
@ -1302,14 +1304,16 @@ IndexIterator* SkiplistIndex::iteratorForCondition (IndexIteratorContext* contex
_shaper, _shaper,
usedFields)); usedFields));
parameter.release(); parameter.release();
// Note we create a new RangeOperator always.
std::unique_ptr<TRI_index_operator_t> rangeOperator(buildRangeOperator());
if (rangeOperator != nullptr) { if (rangeOperator != nullptr) {
// NOTE: We might have to clone the rangeOperator here!
std::unique_ptr<TRI_index_operator_t> combinedOp(TRI_CreateIndexOperator(TRI_AND_INDEX_OPERATOR, std::unique_ptr<TRI_index_operator_t> combinedOp(TRI_CreateIndexOperator(TRI_AND_INDEX_OPERATOR,
rangeOperator.get(), rangeOperator.get(),
tmpOp.get(), tmpOp.get(),
nullptr, nullptr,
_shaper, _shaper,
2)); 2));
rangeOperator.release();
tmpOp.release(); tmpOp.release();
searchValues.emplace_back(combinedOp.get()); searchValues.emplace_back(combinedOp.get());
combinedOp.release(); combinedOp.release();