8000 fixed issue #4185: On execution of FULLTEXT search / AQL query db is … by jsteemann · Pull Request #4239 · arangodb/arangodb · GitHub
[go: up one dir, main page]
Skip to content

fixed issue #4185: On execution of FULLTEXT search / AQL query db is … #4239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 15, 2018
Merged

fixed issue #4185: On execution of FULLTEXT search / AQL query db is … #4239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
03ae15a
fixed issue #4185: On execution of FULLTEXT search / AQL query db is …
jsteemann Jan 5, 2018
114b8d2
cherry picked #3d6e266
graetzer Jan 8, 2018
f643d0a
Make FULLTEXT throw again
graetzer Jan 8, 2018
b050cc9
Fixing some remaining issues with non existing collections
graetzer Jan 9, 2018
1c996d3
Changing warning to exception to satisfy test
graetzer Jan 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 36 additions & 15 deletions arangod/Aql/OptimizerRules.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
#include "Graph/TraverserOptions.h"
#include "Indexes/Index.h"
#include "Transaction/Methods.h"
#include "VocBase/Methods/Collections.h"

#include <boost/optional.hpp>
#include <tuple>
Expand Down Expand Up @@ -4446,10 +4447,14 @@ void arangodb::aql::inlineSubqueriesRule(Optimizer* opt,
opt->addPlan(std::move(plan), rule, modified);
}

static bool isValueTypeString(AstNode* node) {
static bool isValueTypeString(AstNode const* node) {
return (node->type == NODE_TYPE_VALUE && node->value.type == VALUE_TYPE_STRING);
}

static bool isValueTypeCollection(AstNode const* node) {
return node->type == NODE_TYPE_COLLECTION || isValueTypeString(node);
}

static bool isValueTypeNumber(AstNode* node) {
return (node->type == NODE_TYPE_VALUE && (node->value.type == VALUE_TYPE_INT ||
node->value.type == VALUE_TYPE_DOUBLE));
Expand Down Expand Up @@ -4492,40 +4497,39 @@ static bool applyFulltextOptimization(EnumerateListNode* elnode,
AstNode* attrArg = fargs->getMember(1);
AstNode* queryArg = fargs->getMember(2);
AstNode* limitArg = fargs->numMembers() == 4 ? fargs->getMember(3) : nullptr;
if ((collArg->type != NODE_TYPE_COLLECTION && !isValueTypeString(collArg)) ||
!isValueTypeString(attrArg) || !isValueTypeString(queryArg) ||
if (!isValueTypeCollection(collArg) || !isValueTypeString(attrArg) ||
!isValueTypeString(queryArg) || // (... || queryArg->type == NODE_TYPE_REFERENCE)
(limitArg != nullptr && !isValueTypeNumber(limitArg))) {
return false;
}

std::string name = collArg->getString();
TRI_vocbase_t* vocbase = plan->getAst()->query()->vocbase();
aql::Collections* colls = plan->getAst()->query()->collections();
aql::Collection const* coll = colls->add(name, AccessMode::Type::READ);
std::vector<basics::AttributeName> field;
TRI_ParseAttributeString(attrArg->getString(), field, /*allowExpansion*/false);
if (field.empty()) {
return false;
}

//check for suitiable indexes
std::shared_ptr<LogicalCollection> logical = coll->getCollection();
// check for suitable indexes
std::shared_ptr<arangodb::Index> index;
for (auto idx : logical->getIndexes()) {
if (idx->type() == arangodb::Index::IndexType::TRI_IDX_TYPE_FULLTEXT_INDEX) {
TRI_ASSERT(idx->fields().size() == 1);
if (basics::AttributeName::isIdentical(idx->fields()[0], field, false)) {
index = idx;
break;
methods::Collections::lookup(vocbase, name, [&](LogicalCollection* logical) {
for (auto idx : logical->getIndexes()) {
if (idx->type() == arangodb::Index::IndexType::TRI_IDX_TYPE_FULLTEXT_INDEX) {
TRI_ASSERT(idx->fields().size() == 1);
if (basics::AttributeName::isIdentical(idx->fields()[0], field, false)) {
index = idx;
break;
}
}
}
}
});
if (!index) { // no index found
return false;
}

Ast* ast = plan->getAst();
AstNode* args = ast->createNodeArray(2);
AstNode* args = ast->createNodeArray(3 + (limitArg != nullptr ? 0 : 1));
args->addMember(ast->clone(collArg)); // only so createNodeFunctionCall doesn't throw
args->addMember(attrArg);
args->addMember(queryArg);
Expand All @@ -4538,6 +4542,19 @@ static bool applyFulltextOptimization(EnumerateListNode* elnode,
condition->andCombine(cond);
condition->normalize(plan);

// we assume by now that collection `name` exists
aql::Collections* colls = plan->getAst()->query()->collections();
aql::Collection* coll = colls->get(name);
if (coll == nullptr) { // TODO: cleanup this mess
coll = colls->add(name, AccessMode::Type::READ);
if (!ServerState::instance()->isCoordinator()) {
TRI_ASSERT(coll != nullptr);
coll->setCollection(vocbase->lookupCollection(name));
// FIXME: does this need to happen in the coordinator?
plan->getAst()->query()->trx()->addCollectionAtRuntime(name);
}
}

auto indexNode = new IndexNode(plan, plan->nextId(), vocbase,
coll, elnode->outVariable(),
std::vector<transaction::Methods::IndexHandle>{
Expand All @@ -4546,6 +4563,9 @@ static bool applyFulltextOptimization(EnumerateListNode* elnode,
plan->registerNode(indexNode);
condition.release();
plan->replaceNode(elnode, indexNode);
// mark removable, because it will not throw for most params
// FIXME: technically we need to validate the query parameter
calcNode->canRemoveIfThrows(true);

if (limitArg != nullptr && limitNode == nullptr) { // add LIMIT
size_t limit = static_cast<size_t>(limitArg->getIntValue());
Expand All @@ -4560,6 +4580,7 @@ static bool applyFulltextOptimization(EnumerateListNode* elnode,
}
limitNode->addDependency(indexNode);
}

return true;
}

Expand Down
39 changes: 17 additions & 22 deletions arangod/MMFiles/MMFilesAqlFunctions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,31 +178,27 @@ AqlValue MMFilesAqlFunctions::Fulltext(

AqlValue collectionValue = ExtractFunctionParameterValue(trx, parameters, 0);
if (!collectionValue.isString()) {
RegisterWarning(query, "FULLTEXT", TRI_ERROR_QUERY_FUNCTION_ARGUMENT_TYPE_MISMATCH);
return AqlValue(AqlValueHintNull());
THROW_ARANGO_EXCEPTION_PARAMS(TRI_ERROR_QUERY_FUNCTION_ARGUMENT_TYPE_MISMATCH, "FULLTEXT");
}
std::string const cname(collectionValue.slice().copyString());

AqlValue attribute = ExtractFunctionParameterValue(trx, parameters, 1);
if (!attribute.isString()) {
RegisterWarning(query, "FULLTEXT", TRI_ERROR_QUERY_FUNCTION_ARGUMENT_TYPE_MISMATCH);
return AqlValue(AqlValueHintNull());
THROW_ARANGO_EXCEPTION_PARAMS(TRI_ERROR_QUERY_FUNCTION_ARGUMENT_TYPE_MISMATCH, "FULLTEXT");
}
std::string const attributeName(attribute.slice().copyString());

AqlValue queryValue = ExtractFunctionParameterValue(trx, parameters, 2);
if (!queryValue.isString()) {
RegisterWarning(query, "FULLTEXT", TRI_ERROR_QUERY_FUNCTION_ARGUMENT_TYPE_MISMATCH);
return AqlValue(AqlValueHintNull());
THROW_ARANGO_EXCEPTION_PARAMS(TRI_ERROR_QUERY_FUNCTION_ARGUMENT_TYPE_MISMATCH, "FULLTEXT");
}
std::string const queryString = queryValue.slice().copyString();

size_t maxResults = 0; // 0 means "all results"
if (parameters.size() >= 4) {
AqlValue limit = ExtractFunctionParameterValue(trx, parameters, 3);
if (!limit.isNull(true) && !limit.isNumber()) {
RegisterWarning(query, "FULLTEXT", TRI_ERROR_QUERY_FUNCTION_ARGUMENT_TYPE_MISMATCH);
return AqlValue(AqlValueHintNull());
THROW_ARANGO_EXCEPTION_PARAMS(TRI_ERROR_QUERY_FUNCTION_ARGUMENT_TYPE_MISMATCH, "FULLTEXT");
}
if (limit.isNumber()) {
int64_t value = limit.toInt64(trx);
Expand All @@ -212,15 +208,16 @@ AqlValue MMFilesAqlFunctions::Fulltext(
}
}

// add the collection to the query for proper cache handling
query->collections()->add(cname, AccessMode::Type::READ);
TRI_voc_cid_t cid = trx->resolver()->getCollectionIdLocal(cname);
trx->addCollectionAtRuntime(cid, cname);
LogicalCollection* collection = trx->documentCollection(cid);
if (collection == nullptr) {
RegisterWarning(query, "FULLTEXT", TRI_ERROR_ARANGO_COLLECTION_NOT_FOUND);
return AqlValue(AqlValueHintNull());
if (cid == 0) {
THROW_ARANGO_EXCEPTION_FORMAT(TRI_ERROR_ARANGO_COLLECTION_NOT_FOUND, "%s",
cname.c_str());
}
// add the collection to the query for proper cache handling
query->collections()->add(cname, AccessMode::Type::READ);
trx->addCollectionAtRuntime(cid, cname, AccessMode::Type::READ);
LogicalCollection const* collection = trx->documentCollection(cid);
TRI_ASSERT(collection != nullptr);

// split requested attribute name on '.' character to create a proper
// vector of AttributeNames
Expand Down Expand Up @@ -251,8 +248,8 @@ AqlValue MMFilesAqlFunctions::Fulltext(

if (fulltextIndex == nullptr) {
// fiddle collection name into error message
RegisterWarning(query, "FULLTEXT", TRI_ERROR_QUERY_FULLTEXT_INDEX_MISSING);
return AqlValue(AqlValueHintNull());
THROW_ARANGO_EXCEPTION_PARAMS(TRI_ERROR_QUERY_FULLTEXT_INDEX_MISSING,
cname.c_str());
}

trx->pinData(cid);
Expand All @@ -261,8 +258,7 @@ AqlValue MMFilesAqlFunctions::Fulltext(
TRI_CreateQueryMMFilesFulltextIndex(TRI_FULLTEXT_SEARCH_MAX_WORDS, maxResults);

if (ft == nullptr) {
RegisterWarning(query, "FULLTEXT", TRI_ERROR_OUT_OF_MEMORY);
return AqlValue(AqlValueHintNull());
THROW_ARANGO_EXCEPTION(TRI_ERROR_OUT_OF_MEMORY);
}

bool isSubstringQuery = false;
Expand All @@ -271,8 +267,7 @@ AqlValue MMFilesAqlFunctions::Fulltext(

if (res != TRI_ERROR_NO_ERROR) {
TRI_FreeQueryMMFilesFulltextIndex(ft);
RegisterWarning(query, "FULLTEXT", res);
return AqlValue(AqlValueHintNull());
THROW_ARANGO_EXCEPTION(res);
}

// note: the following call will free "ft"!
Expand Down Expand Up @@ -412,7 +407,7 @@ void MMFilesAqlFunctions::registerResources() {
TRI_ASSERT(functions != nullptr);

// fulltext functions
functions->add({"FULLTEXT", ".h,.,.|.", true, false,
functions->add({"FULLTEXT", ".h,.,.|.", false, true,
false, true, &MMFilesAqlFunctions::Fulltext,
NotInCoordinator});
functions->add({"NEAR", ".h,.,.|.,.", false, true, false,
Expand Down
6 changes: 3 additions & 3 deletions arangod/MMFiles/MMFilesCollection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1966,7 +1966,7 @@ Result MMFilesCollection::read(transaction::Methods* trx, StringRef const& key,

bool MMFilesCollection::readDocument(transaction::Methods* trx,
LocalDocumentId const& documentId,
ManagedDocumentResult& result) {
ManagedDocumentResult& result) const {
uint8_t const* vpack = lookupDocumentVPack(documentId);
if (vpack != nullptr) {
result.setUnmanaged(vpack, documentId);
Expand All @@ -1977,7 +1977,7 @@ bool MMFilesCollection::readDocument(transaction::Methods* trx,

bool MMFilesCollection::readDocumentWithCallback(transaction::Methods* trx,
LocalDocumentId const& documentId,
IndexIterator::DocumentCallback const& cb) {
IndexIterator::DocumentCallback const& cb) const {
uint8_t const* vpack = lookupDocumentVPack(documentId);
if (vpack != nullptr) {
cb(documentId, VPackSlice(vpack));
Expand All @@ -1988,7 +1988,7 @@ bool MMFilesCollection::readDocumentWithCallback(transaction::Methods* trx,

size_t MMFilesCollection::readDocumentWithCallback(transaction::Methods* trx,
std::vector<std::pair<LocalDocumentId, uint8_t const*>>& documentIds,
IndexIterator::DocumentCallback const& cb) {
IndexIterator::DocumentCallback const& cb){
size_t count = 0;
batchLookupRevisionVPack(documentIds);
for (auto const& it : documentIds) {
Expand Down
4 changes: 2 additions & 2 deletions arangod/MMFiles/MMFilesCollection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,11 +340,11 @@ class MMFilesCollection final : public PhysicalCollection {

bool readDocument(transaction::Methods* trx,
LocalDocumentId const& documentId,
ManagedDocumentResult& result) override;
ManagedDocumentResult& result) const override;

bool readDocumentWithCallback(transaction::Methods* trx,
LocalDocumentId const& documentId,
IndexIterator::DocumentCallback const& cb) override;
IndexIterator::DocumentCallback const& cb) const override;

size_t readDocumentWithCallback(transaction::Methods* trx,
std::vector<std::pair<LocalDocumentId, uint8_t const*>>& doc 8000 umentIds,
Expand Down
42 changes: 21 additions & 21 deletions arangod/RocksDBEngine/RocksDBAqlFunctions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,35 +51,36 @@ static ExecutionCondition const NotInCoordinator = [] {
AqlValue RocksDBAqlFunctions::Fulltext(
arangodb::aql::Query* query, transaction::Methods* trx,
VPackFunctionParameters const& parameters) {
TRI_ASSERT(!ServerState::instance()->isCoordinator());
ValidateParameters(parameters, "FULLTEXT", 3, 4);

AqlValue collectionValue = ExtractFunctionParameterValue(trx, parameters, 0);
if (!collectionValue.isString()) {
RegisterWarning(query, "FULLTEXT", TRI_ERROR_QUERY_FUNCTION_ARGUMENT_TYPE_MISMATCH);
return AqlValue(AqlValueHintNull());
THROW_ARANGO_EXCEPTION_PARAMS(
TRI_ERROR_QUERY_FUNCTION_ARGUMENT_TYPE_MISMATCH, "FULLTEXT");
}
std::string const cname(collectionValue.slice().copyString());

AqlValue attribute = ExtractFunctionParameterValue(trx, parameters, 1);
if (!attribute.isString()) {
RegisterWarning(query, "FULLTEXT", TRI_ERROR_QUERY_FUNCTION_ARGUMENT_TYPE_MISMATCH);
return AqlValue(AqlValueHintNull());
THROW_ARANGO_EXCEPTION_PARAMS(
TRI_ERROR_QUERY_FUNCTION_ARGUMENT_TYPE_MISMATCH, "FULLTEXT");
}
std::string const attributeName(attribute.slice().copyString());

AqlValue queryValue = ExtractFunctionParameterValue(trx, parameters, 2);
if (!queryValue.isString()) {
RegisterWarning(query, "FULLTEXT", TRI_ERROR_QUERY_FUNCTION_ARGUMENT_TYPE_MISMATCH);
return AqlValue(AqlValueHintNull());
THROW_ARANGO_EXCEPTION_PARAMS(
TRI_ERROR_QUERY_FUNCTION_ARGUMENT_TYPE_MISMATCH, "FULLTEXT");
}
std::string const queryString = queryValue.slice().copyString();

size_t maxResults = 0; // 0 means "all results"
if (parameters.size() >= 4) {
AqlValue limit = ExtractFunctionParameterValue(trx, parameters, 3);
if (!limit.isNull(true) && !limit.isNumber()) {
RegisterWarning(query, "FULLTEXT", TRI_ERROR_QUERY_FUNCTION_ARGUMENT_TYPE_MISMATCH);
return AqlValue(AqlValueHintNull());
THROW_ARANGO_EXCEPTION_PARAMS(
TRI_ERROR_QUERY_FUNCTION_ARGUMENT_TYPE_MISMATCH, "FULLTEXT");
}
if (limit.isNumber()) {
int64_t value = limit.toInt64(trx);
Expand All @@ -89,15 +90,16 @@ AqlValue RocksDBAqlFunctions::Fulltext(
}
}

TRI_voc_cid_t cid = trx->resolver()->getCollectionIdLocal(cname);
if (cid == 0) {
THROW_ARANGO_EXCEPTION_FORMAT(TRI_ERROR_ARANGO_COLLECTION_NOT_FOUND, "%s",
cname.c_str());
}
// add the collection to the query for proper cache handling
query->collections()->add(cname, AccessMode::Type::READ);
TRI_voc_cid_t cid = trx->resolver()->getCollectionIdLocal(cname);
trx->addCollectionAtRuntime(cid, cname);
LogicalCollection* collection = trx->documentCollection(cid);
if (collection == nullptr) {
RegisterWarning(query, "FULLTEXT", TRI_ERROR_ARANGO_COLLECTION_NOT_FOUND);
return AqlValue(AqlValueHintNull());
}
LogicalCollection const* collection = trx->documentCollection(cid);
TRI_ASSERT(collection != nullptr);

// NOTE: The shared_ptr is protected by trx lock.
// It is save to use the raw pointer directly.
Expand Down Expand Up @@ -126,23 +128,21 @@ AqlValue RocksDBAqlFunctions::Fulltext(

if (fulltextIndex == nullptr) {
// fiddle collection name into error message
RegisterWarning(query, "FULLTEXT", TRI_ERROR_QUERY_FULLTEXT_INDEX_MISSING);
return AqlValue(AqlValueHintNull());
THROW_ARANGO_EXCEPTION_PARAMS(TRI_ERROR_QUERY_FULLTEXT_INDEX_MISSING,
cname.c_str());
}
// do we need this in rocksdb?
trx->pinData(cid);

FulltextQuery parsedQuery;
Result res = fulltextIndex->parseQueryString(queryString, parsedQuery);
if (res.fail()) {
RegisterWarning(query, "FULLTEXT", res.errorNumber());
return AqlValue(AqlValueHintNull());
THROW_ARANGO_EXCEPTION(res);
}
std::set<LocalDocumentId> results;
res = fulltextIndex->executeQuery(trx, parsedQuery, results);
if (res.fail()) {
RegisterWarning(query, "FULLTEXT", res.errorNumber());
return AqlValue(AqlValueHintNull());
THROW_ARANGO_EXCEPTION(res);
}

PhysicalCollection* physical = collection->getPhysical();
Expand Down Expand Up @@ -413,7 +413,7 @@ void RocksDBAqlFunctions::registerResources() {
TRI_ASSERT(functions != nullptr);

// fulltext functions
functions->add({"FULLTEXT", ".h,.,.|.", true, false,
functions->add({"FULLTEXT", ".h,.,.|.", false, true,
false, true, &RocksDBAqlFunctions::Fulltext,
NotInCoordinator});
functions->add({"NEAR", ".h,.,.|.,.", false, true, false,
Expand Down
4 changes: 2 additions & 2 deletions arangod/RocksDBEngine/RocksDBCollection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -792,7 +792,7 @@ Result RocksDBCollection::read(transaction::Methods* trx,
// read using a token!
bool RocksDBCollection::readDocument(transaction::Methods* trx,
LocalDocumentId const& documentId,
ManagedDocumentResult& result) {
ManagedDocumentResult& result) const {
if (documentId.isSet()) {
auto res = lookupDocumentVPack(documentId, trx, result, true);
return res.ok();
Expand All @@ -803,7 +803,7 @@ bool RocksDBCollection::readDocument(transaction::Methods* trx,
// read using a token!
bool RocksDBCollection::readDocumentWithCallback(
transaction::Methods* trx, LocalDocumentId const& documentId,
IndexIterator::DocumentCallback const& cb) {
IndexIterator::DocumentCallback const& cb) const {
if (documentId.isSet()) {
auto res = lookupDocumentVPack(documentId, trx, cb, true);
return res.ok();
Expand Down
4 changes: 2 additions & 2 deletions arangod/RocksDBEngine/RocksDBCollection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,11 +139,11 @@ class RocksDBCollection final : public PhysicalCollection {

bool readDocument(transaction::Methods* trx,
LocalDocumentId const& token,
ManagedDocumentResult& result) override;
ManagedDocumentResult& result) const override;

bool readDocumentWithCallback(
transaction::Methods* trx, LocalDocumentId const& token,
IndexIterator::DocumentCallback const& cb) override;
IndexIterator::DocumentCallback const& cb) const override;

Result insert(arangodb::transaction::Methods* trx,
arangodb::velocypack::Slice const newSlice,
Expand Down
Loading
0