Bug fix 3.5/internal issue #651 #10388
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Dronplane
suggested changes
Nov 12, 2019
| 8000 | } | |
| arangodb::Result res; | ||
| for (auto const& coord : coords) { | ||
| res = {}; |
There was a problem hiding this comment.
Looks like there is no need to reinit res on each iteration. It will be overwritten by timeout error or by resultVisitor without current res value check.
| for (auto& request: requests) { | ||
| if (TRI_ERROR_ARANGO_DATA_SOURCE_NOT_FOUND == request.result.errorCode) { | ||
| continue; // treat missing collection as if there are no analyzers | ||
| if (TRI_ERROR_CLUSTER_TIMEOUT == request.result.errorCode) { |
There was a problem hiding this comment.
Should we check for TRI_ERROR_ARANGO_DATA_SOURCE_NOT_FOUND here same way as in non DBServer branch below ?
| /// @param defaultVocbase fallback vocbase for analyzer name normalization | ||
| /// nullptr == do not normalize | ||
| /// @param usedAnalyzers add to this map analyzers used in meta, | ||
| /// @param values to ignore always |
There was a problem hiding this comment.
Suggested change
| /// @param values to ignore always | |
| /// @param mask values to ignore always |
Dronplane
approved these changes
Nov 12, 2019
KVS85
approved these changes
Nov 12, 2019
|
Tests blue. |
gnusi
added a commit
that referenced
this pull request
Nov 13, 2019
* extract recursive part of IResearchLinkMeta * avoid saving analyzer definition during link meta initialization * add tests to check cluster deadlock * cleanup * code cleanup * add moar tests * mooooaaar checks * make jslint happy * backport fix for cluster startup from 3.5.2 branch * backport changes from 3.5.2 * fix tests * fix tests * moar fixes * refactor analyzer definitions tracking * add some tests * extend dump tests * add tests for replication * fix tests * more fixes * address jslint errors * address review comments * address test failures * reflect changes in changelog # Conflicts: # arangod/IResearch/IResearchAnalyzerFeature.cpp # arangod/IResearch/IResearchFilterFactory.cpp # arangod/IResearch/IResearchLink.cpp # arangod/IResearch/IResearchLinkMeta.cpp # tests/IResearch/IResearchAnalyzerFeature-test.cpp # tests/IResearch/IResearchDocument-test.cpp # tests/IResearch/IResearchFilterBoolean-test.cpp # tests/IResearch/IResearchFilterCompare-test.cpp # tests/IResearch/IResearchFilterFunction-test.cpp # tests/IResearch/IResearchFilterIn-test.cpp # tests/IResearch/IResearchLinkHelper-test.cpp # tests/IResearch/IResearchLinkMeta-test.cpp # tests/IResearch/IResearchView-test.cpp # tests/V8Server/v8-analyzers-test.cpp
gnusi
added a commit
that referenced
this pull request
Nov 13, 2019
* Bug fix 3.5/internal issue #651 (#10388) * extract recursive part of IResearchLinkMeta * avoid saving analyzer definition during link meta initialization * add tests to check cluster deadlock * cleanup * code cleanup * add moar tests * mooooaaar checks * make jslint happy * backport fix for cluster startup from 3.5.2 branch * backport changes from 3.5.2 * fix tests * fix tests * moar fixes * refactor analyzer definitions tracking * add some tests * extend dump tests * add tests for replication * fix tests * more fixes * address jslint errors * address review comments * address test failures * reflect changes in changelog # Conflicts: # arangod/IResearch/IResearchAnalyzerFeature.cpp # arangod/IResearch/IResearchFilterFactory.cpp # arangod/IResearch/IResearchLink.cpp # arangod/IResearch/IResearchLinkMeta.cpp # tests/IResearch/IResearchAnalyzerFeature-test.cpp # tests/IResearch/IResearchDocument-test.cpp # tests/IResearch/IResearchFilterBoolean-test.cpp # tests/IResearch/IResearchFilterCompare-test.cpp # tests/IResearch/IResearchFilterFunction-test.cpp # tests/IResearch/IResearchFilterIn-test.cpp # tests/IResearch/IResearchLinkHelper-test.cpp # tests/IResearch/IResearchLinkMeta-test.cpp # tests/IResearch/IResearchView-test.cpp # tests/V8Server/v8-analyzers-test.cpp * fix tests * fix tests * Fix tests * fix replication tests
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR fixes issues with custom analyzers in a cluster environment