8000 issue 505.1: move index json comparison into index-type-specific implementations to address issue with incorrect definition comparison by vasiliy-arangodb · Pull Request #7430 · arangodb/arangodb · GitHub
[go: up one dir, main page]
Skip to content

issue 505.1: move index json comparison into index-type-specific implementations to address issue with incorrect definition comparison #7430

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 4 commits into from
Dec 3, 2018
Merged

issue 505.1: move index json comparison into index-type-specific implementations to address issue with incorrect definition comparison #7430

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
13c9621
issue 505: move index json comparison into index-type-specific implem…
vasiliy-arangodb Nov 22, 2018
629549d
remove commented-out code
vasiliy-arangodb Nov 22, 2018
ccae6cd
fix typo
vasiliy-arangodb Nov 22, 2018
e810459
backport: add additional logging and fix typo
vasiliy-arangodb Nov 23, 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
Prev Previous commit
backport: add additional logging and fix typo
  • Loading branch information
@vasiliy-arangodb
vasiliy-arangodb committed Nov 23, 2018
8000
commit e8104595bc45b10fc518777f3fe0f5bf6d83ced7
4 changes: 2 additions & 2 deletions arangod/IResearch/IResearchLinkHelper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@ namespace iresearch {
// one is a prefix of the other up to the `/`
if (ls.empty() ||
ls.back() != '/' ||
!ls.compare(rs.substr(0, ls.size()))) {
ls.compare(rs.substr(0, ls.size()))) {
return false;
}
}
Expand Down Expand Up @@ -701,4 +701,4 @@ namespace iresearch {

// -----------------------------------------------------------------------------
// --SECTION-- END-OF-FILE
// -----------------------------------------------------------------------------
// -----------------------------------------------------------------------------
4 changes: 4 additions & 0 deletions arangod/Indexes/IndexFactory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,12 +181,16 @@ std::shared_ptr<Index> IndexFactory::prepareIndexFromSlice(

if (!res.ok()) {
TRI_set_errno(res.errorNumber());
LOG_TOPIC(ERR, arangodb::Logger::ENGINES)
<< "failed to instantiate index, error: " << res.errorNumber() << " " << res.errorMessage();

return nullptr;
}

if (!index) {
TRI_set_errno(TRI_ERROR_INTERNAL);
LOG_TOPIC(ERR, arangodb::Logger::ENGINES)
<< "failed to instantiate index, factory returned null instance";

return nullptr;
}
Expand Down
0