8000 Bug fix/internal issue #586 by Dronplane · Pull Request #9401 · arangodb/arangodb · GitHub
[go: up one dir, main page]
Skip to content

Bug fix/internal issue #586 #9401

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.

Sig 8000 n 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 11 commits into from
Jul 4, 2019
Merged

Bug fix/internal issue #586 #9401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
454ac64
Removet lazy creation ob analyzers collection. Test fixes (added expl…
Dronplane Jul 1, 2019
07398fe
Merge branch 'devel' into bug-fix/internal-issue-#586
Dronplane Jul 1, 2019
10b6607
Merge branch 'devel' into bug-fix/internal-issue-#586
Dronplane Jul 1, 2019
3dc1830
Merge branch 'devel' into bug-fix/internal-issue-#586
Dronplane Jul 2, 2019
e2e7d8f
Fixed test runs. Removed cluster tests for analyzer DDL
Dronplane Jul 3, 2019
e7ad5ee
Analyzers collection name moved to tests common
Dronplane Jul 3, 2019
37cf2dc
Disbaled load_library in normalize calls
Dronplane Jul 3, 2019
1304d8b
Legacy code cleanup
Dronplane Jul 3, 2019
6be6bb9
added db analyzers collection checks in analyzer creation test to cov…
Dronplane Jul 3, 2019
1c29a3d
Merge branch 'devel' into bug-fix/internal-issue-#586
Dronplane Jul 3, 2019
54e6e3f
Reverted analyzer properties comparsion to non-utf8 as that must be b…
Dronplane Jul 3, 2019
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
67 changes: 30 additions & 37 deletions arangod/IResearch/IResearchAnalyzerFeature.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,8 @@ irs::analysis::analyzer::ptr text_vpack_builder(irs::string_ref const& args) noe
bool text_vpack_normalizer(const irs::string_ref& args, std::string& out) noexcept {
std::string tmp;
if (irs::analysis::analyzers::normalize(tmp, "text", irs::text_format::json,
arangodb::iresearch::slice<char>(args).toString())) {
arangodb::iresearch::slice<char>(args).toString(),
false)) {
auto vpack = VPackParser::fromJson(tmp);
out.resize(vpack->slice().byteSize());
std::memcpy(&out[0], vpack->slice().begin(), out.size());
Expand All @@ -327,7 +328,7 @@ namespace stem_vpack {
bool stem_vpack_normalizer(const irs::string_ref& args, std::string& out) noexcept {
std::string tmp;
if (irs::analysis::analyzers::normalize(tmp, "stem", irs::text_format::json,
arangodb::iresearch::slice<char>(args).toString())) {
arangodb::iresearch::slice<char>(args).toString(), false)) {
auto vpack = VPackParser::fromJson(tmp);
out.resize(vpack->slice().byteSize());
std::memcpy(&out[0], vpack->slice().begin(), out.size());
Expand All @@ -351,7 +352,7 @@ namespace norm_vpack {
bool norm_vpack_normalizer(const irs::string_ref& args, std::string& out) noexcept {
std::string tmp;
if (irs::analysis::analyzers::normalize(tmp, "norm", irs::text_format::json,
arangodb::iresearch::slice<char>(args).toString())) {
arangodb::iresearch::slice<char>(args).toString(), false)) {
auto vpack = VPackParser::fromJson(tmp);
out.resize(vpack->slice().byteSize());
std::memcpy(&out[0], vpack->slice().begin(), out.size());
Expand Down Expand Up @@ -500,6 +501,9 @@ bool equalAnalyzer(

if (!::normalize(normalizedProperties, type, properties)) {
// failed to normalize definition
LOG_TOPIC("dfac1", WARN, arangodb::iresearch::TOPIC)
<< "failed to normalize properties for analyzer type '" << type << "' properties '"
<< properties.toString() << "'";
return false;
}

Expand Down Expand Up @@ -1157,12 +1161,22 @@ arangodb::Result IResearchAnalyzerFeature::emplaceAnalyzer( // emplace

erase = false;
} else if (!equalAnalyzer(*analyzer, type, properties, features)) { // duplicate analyzer with different configuration
return arangodb::Result(
TRI_ERROR_BAD_PARAMETER,
"name collision detected while registering an arangosearch analizer name '" + std::string(name) +
"' type '" + std::string(type) + "' properties '" + properties.toString() +
"', previous registration type '" + std::string(analyzer->type()) +
"' properties '" + analyzer->properties().toString() + "'");
std::ostringstream errorText;
errorText << "name collision detected while registering an arangosearch analyzer name '" << name
<< "' type '" << type << "' properties '" << properties.toString()
<< "' features '";
for(auto feature : features) {
errorText << feature->name() << " ";
}
errorText << "', previous registration type '" << analyzer->type()
<< "' properties '" << analyzer->properties().toString() << "'"
<< " features '";
for(auto feature : analyzer->features()) {
errorText << feature->name() << " ";
}
errorText << "'";
return arangodb::Result(TRI_ERROR_BAD_PARAMETER, errorText.str());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wouldn't this rather be an error with code TRI_ERROR_ARANGO_CONFLICT?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Description for this error says: "Will be raised when updating or deleting a document and a conflict has been detected."
But at this point we have no conflicts with documents, Most propbably this situation means that user actually have misspelled some of analyzer properties (e.g used the same name twice)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok. For me "conflict" means "conflict", so I would have returned TRI_ERROR_ARANGO_CONFLICT. However, I can live with any other error code just fine.


}

result = itr;
Expand Down Expand Up @@ -2227,35 +2241,14 @@ arangodb::Result IResearchAnalyzerFeature::storeAnalyzer(AnalyzerPool& pool) {

try {
auto collection = getAnalyzerCollection(*vocbase);

if (!collection) {
auto collectionCallback = [&collection]( // store collection
std::shared_ptr<arangodb::LogicalCollection> const& col // args
)->void {
collection = col;
};
static auto const properties = // analyzer collection properties
arangodb::velocypack::Parser::fromJson("{ \"isSystem\": true }");
auto res = arangodb::methods::Collections::create( // create collection
*vocbase, // collection vocbase
ANALYZER_COLLECTION_NAME, // collection name
TRI_col_type_e::TRI_COL_TYPE_DOCUMENT, // collection type
properties->slice(), // collection properties
true, // waitsForSyncReplication same as UpgradeTasks::createSystemCollection(...)
true, // enforceReplicationFactor same as UpgradeTasks::createSystemCollection(...)
collectionCallback // callback if created
);

if (!res.ok()) {
return res;
}

if (!collection) {
return arangodb::Result( // result
TRI_ERROR_INTERNAL, // code
std::string("failure to create collection '") + ANALYZER_COLLECTION_NAME + "' in vocbase '" + vocbase->name() + "' vocbase while persising arangosearch analyzer '" + pool.name()+ "'"
);
}
return arangodb::Result( // result
TRI_ERROR_ARANGO_DATA_SOURCE_NOT_FOUND, // code
std::string("failure to find collection '") +
ANALYZER_COLLECTION_NAME +
"' in vocbase '" + vocbase->name() +
"' vocbase while persising arangosearch analyzer '" + pool.name()+ "'"
);
}

arangodb::SingleCollectionTransaction trx( // transaction
Expand Down
Loading
0