8000 try to work around some assertions by jsteemann · Pull Request #3296 · arangodb/arangodb · GitHub
[go: up one dir, main page]
Skip to content

try to work around some assertions #3296

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 12 commits into from
Sep 28, 2017
Merged

try to work around some assertions #3296

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ba3779d
try to work around some assertions
jsteemann Sep 20, 2017
1343fe4
Merge branch 'devel' of https://github.com/arangodb/arangodb into bug…
jsteemann Sep 21, 2017
533954a
put original assertions back in place
jsteemann Sep 21, 2017
59bb1fb
oops
jsteemann Sep 21, 2017
c694968
work around some other assertions
jsteemann Sep 21, 2017
1c5efbf
remove obsolete values from relative config
jsteemann Sep 21, 2017
5cdfb2b
warn about using obsolete config parameters
jsteemann Sep 21, 2017
50825a7
Merge branch 'devel' into bug-fix/fix-assertions
fceller Sep 26, 2017
2e784eb
Merge branch 'devel' of https://github.com/arangodb/arangodb into bug…
fceller Sep 26, 2017
a776d4d
try to fix compile error on MacOS
jsteemann Sep 26, 2017
4d6f74a
Merge branch 'devel' of https://github.com/arangodb/arangodb into bug…
fceller Sep 26, 2017
6e8c978
Merge branch 'devel' of https://github.com/arangodb/arangodb into bug…
fceller Sep 28, 2017
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
Next Next commit
try to fix compile error on MacOS
  • Loading branch information
@jsteemann
jsteemann committed Sep 26, 2017
commit a776d4d52ae01ce846a744a64c2e7fd124840797
4 changes: 2 additions & 2 deletions arangod/Graph/ClusterTraverserCache.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ aql::AqlValue ClusterTraverserCache::fetchVertexAqlResult(StringRef id) {
TRI_ASSERT(ServerState::instance()->isCoordinator());
auto it = _cache.find(id);
if (it == _cache.end()) {
LOG_TOPIC(ERR, Logger::GRAPHS) << __FUNCTION__ << " vertex '" << id << "' not found";
LOG_TOPIC(ERR, Logger::GRAPHS) << __FUNCTION__ << " vertex '" << id.toString() << "' not found";
// Document not found return NULL
return aql::AqlValue(aql::AqlValueHintNull());
}
Expand All @@ -78,7 +78,7 @@ void ClusterTraverserCache::insertVertexIntoResult(StringRef id,
VPackBuilder& result) {
auto it = _cache.find(id);
if (it == _cache.end()) {
LOG_TOPIC(ERR, Logger::GRAPHS) << __FUNCTION__ << " vertex '" << id << "' not found";
LOG_TOPIC(ERR, Logger::GRAPHS) << __FUNCTION__ << " vertex '" << id.toString() << "' not found";
// Document not found append NULL
result.add(VelocyPackHelper::NullValue());
} else {
Expand Down
0