Feature/aql blocks by line dan sort #8143
Merged
Conversation
This file contains 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
ghost
assigned 
dhly-etc
suggested changes
Feb 11, 2019
dhly-etc
reviewed
Feb 12, 2019
dhly-etc
approved these changes
Feb 12, 2019
|
next jenkins run after simplification: |
Preconditions or invariants the functions rely on are broken. Therefore the functions can not be used. This is asserted in maintainer mode.
|
THe red tests in jenkins are from base branch, so this is good |
ObiWahn
added a commit
that referenced
this pull request
Feb 14, 2019
… feature/aql-blocks-by-line-executor-modification * origin/feature/aql-blocks-by-line: (52 commits) Feature/aql blocks by line dan sort (#8143) Properly translate cluster comm errors (#8151) fix while loop in in-iterator (#8153) issue #8137: NULL input field generates U_ILLEGAL_ARGUMENT_ERROR (#8140) remove useless while true issue 466.6: remove unused code, remove hardcoded view meta values (#8130) fixed typo in version check added run-time openssl version (#8121) issue 466.5: switch to using WAL markers instead of FlushThread for recovery (#8124) Make single server key generators lockfree. (#8118) fix warnings 🚨 Fix clang warnings (#8123) fix issue #8108 (#8122) Fix isInSubQuery for non-singleton nodes. try to fix subqueries added a warning if compiled in maintainer mode (#8116) Fix race in supervised scheduler (#8117) Doc - Note that ArangoSearch views cannot be used as edge collections in traversals. (#8099) Doc - Production Checklist Improvements (#8110) Fixed non-maintainer build ...
mchacki
pushed a commit
that referenced
this pull request
Feb 14, 2019
* Fixed hidden merge conflict * Added BlockFetcher, added a minimal test for SingleRowFetcher * move RegInfo in types.h * fix getSomeLogic * Added the AqlItemMatrix implementation. Not yet tested! * Fixed nr called => Waiting ratio in AllBlocksFetcherMock * fix compiling * add RegInfo to produceRow * BlockFetcherHelper now returns a matrix * pass RegInfo as requested into AqlItemRow ctor I would still keep it out as the ItemRow should be a thin view. * allow to change the AqlItemRows cheaper / remove _sourceRow member * implement copyRow for AqlItemRow * organize cleanup for outputblock used in getsome / shrink if necessary * Added tests for SingleRowFetcher, cleanup in AqlItemRow * start mocking * Added test helpers, began work on a more complex test for SingleRowFetcher * Re-added RegInfo again to AqlItemRow * helper, added test case for FilterExecutor * merge fixed compile * Removed trx name where it is actually not used * Made some functions TEST_VIRTUAL for mocking. * implemented Sort executor * Fixed the BlockFetcherHelper API, to always return a matrix if it is not waiting * Implemented a SortExecutor test with data * disable borken test * Fixed test on SortExecutor. Green now, needs some more testing * change a bit how the AqlItemRow is used in a test * Added another test for the SingleRowFetcher * Added more tests for SingleRowFetcher * fix getRegisterInfo * Moved RegInfo into ExecutorInfos. Also now use the FilterExecutor implementation in production code instead of FilterBlock. Starting integration testing. * add more asserts * Fixed undefined behaviour in TestCode. * Do not shrink an empty output block * switch to block pointers in AqlItemRow * return blocks in the row fetcher * Updated grammar.cpp * Updated (fixed) tests to verify returnBlock * Improved const-ness * Changed BlockFetcher constructor in order to make it mockable * Implemented BlockFetcherMock and rewrote some tests with it * Updated a comment * Updated comments * init commit - EnumerateListExecutor, including EnumerateListExecutorInfos * add potential fix for ItemMatrix * Replaced fakeit with BlockFetcherMock in another GIVEN block * Replaced the last fakeit mocks with BlockFetcherMock and removed fakeit * Updated function definition * included missing arary included * Renamed AqlItemRow to InputAqlItemRow * Split AqlItemRow into Input~ and Output~ classes * EnumerateListExecutor + Tests * Added tests for AqlItemRows * Added test file for AqlItemRows... * Made the ostream operator for AqlItemBlocks available to Logger and Catch info * build error * Added a second test for AqlItemRows. Need to make input space invalid now, sth. acidential referencing will show up * Introduce a block ID in the InputAqlItemRow * Copy output values correctly, avoid InputAqlItemRow pointers * Added a test for registerClearout * Fixed tests * Added a test for adding new values * Added a test for an incomplete row write to not count as produced. * Fixed getSome and a test * Added a test for larger AQL values in AqlItemRows * Fixed compile error in hidden merge conflict * Added tests for Filter counter in FilterExecutor * OutputAqlItemRow now takes responsibility of the block * Handed responsibility of blocks in ExecutionBlockImpl to OutputAqlItemRow * EnumerateListExecutor should be close to its finish. Tests need to be fixed, not ready yet. * better swap * OutputAqlItemRow now takes ExecutorInfos - added several assert - implemented a more strict and safe produced() logic * enum list test * Added a more specific error message * Removed OutputAqlItemRow.changeRow() * fix invalid block freeing * changed order of input/output registers * Fixed a test * Fixed matrix width in test * fix failure tests * finished enumlist tests * Implemented AllRowsFetcher and tests for it * Bugfix in skipSome stub * insert sort and enumerate list executors into exectuion nodes' create functions * fixed singlerowfetcherhelper, added tests * small fixes * add missing Infos * restore accidentally deleted scorer * make it compile * fix executor info creation / usage * make use of output var in EnumarateListNode * Added Executor::Stats and FilterStats * Extended FilterExecutor tests with stats, added node tracing to getSome * Fixed Sort-&EnumerateList- Executor to use the new return type with stats * Fixed compile error in tests * Changed *ExecutorInfo constructors and classes to contain the necessary register informations * Made an ExecutorInfo construction more readable * Updated comments * Fixed checks in OutputAqlItemRow::setValue() * Add comparison method to SortRegister. Forbid construction without one. * Implemented ExecutionBlockImpl::initializeCursor * more mocking inside ExecutionBlockImplTest * Minor changes * Avoid AqlValueGuard destroying the value copied into the output block * Disabled failure tests that do not apply to the new Sort implementation * further mocking of test modules * Removed constexpr for compatibility with outdated gcc versions * add some failure tests - getsome works differently therefor we do not test the old behavior * fix sort node * clean up alq item matrix * Removed the transaction methods from read-only access to AqlValues (get and at) and repliced by CollectionNameResolver where necessary. Still left: some calls extract VPackOptions from the Transaction. Compare needs a BuilderLeaser only. * textexecutionhelper, execimpl test * Eliminated FilterBlock * Eliminated the EnumerateListBlock * first successful running test of executorblockimpl * Eliminated SortBlock * fixed testexecutor helper * Made the ExecutorInfos private to the executors again. * Implement and use AqlItemBlockShell (#6562) * Added AqlItemBlockShell * Minor changes * Mostly replaced AqlItemBlock with ~Shell. Current state: - arangod compiles - OutputAqlItemRow has yet to be changed - catch tests have yet to be fixed * Use AqlItemBlockShell in OutputAqlItemRow * Added registersToKeep to AqlItemBlockShell * Removed ExecutorInfos from OutputAqlItemRow * Split AqlItemBlockShell into Input~ and Output~ * Changed tests so they compile again - they're still not yet working. * Fixed tests * fixed building, modified impl test * Removed now superfluous BlockFetcherMock functions * more execimpl testing * Removed block IDs * more impl testing * Reduced dependencies of BlockFetcher construction * Bugfix, cleared documentation * Removed debug-output * Adressed minor code review remarks * Moved method definitions into .cpp files to avoid includes * Added assertions * Added comments * Addressed several more review comments * Added missing includes * more testing, not finalized yet * added missing header file * added a test for execution block impl * removed old comment * Improved lookup algorithm to identify correct block/row combination in AqlItemMatrix * added test for ExecutionBlockImpl * move utility to the right position * Bugfix and a TODO note * Bugfix: use a uniform ResourceMonitor in tests * Made OutputAqlItemRow::setValue clone by default and copy on move * Replaced the getRow lookup with a binary search * enumerate tests * Disable emplacing of AqlValues in ItemBlock * Reenabled std::enable_if will warn until oskar is using c++17 as standard. * Add helper function to create a shared pointer of an unordered_map<RegisterId> * CalculationExecutor (#6570) * add CalculationExecutor skeleton * first shot of CalculationExecutor * fix minor bugs * handle references * use new shared pointers * commit to share work * fix failure test * reformat with clang-format * add test for CalculationExecutor * fix CalcualtionExecutor test * clean up * Removes unused code * clean up includes * fix/remove comments * add changes requrested by hacki * ReturnExecutor (#7932) * add skeleton to CMakeLists.txt * build most parts of the ReturnExecutor * This commit removes ReturnBlock and adds some debug messages removed inheritRegisters functionality * finish ReturnExecutor * add test for return executor * remove unused code * add stats and clean up includes * verify result in ReturnExecutorTest and move *Stats to "Aql/Stats.h" * Fixed algorithm to find correct row in a MultiRow Input * fix full count and failure tests (#7969) * fix full count and failure tests * fix filter test * WIP: fixes * fixed * NoResultsExecutor (#7953) * add NoResultsExecutor * clean up * some review changes * fix test * fix * fix WAIT -> DONE * remove unused code (#7995) * create skeleton for SingletonExecutor (#7957) * create skeleton for SingletonExecutor * WIP: continue implementation * WIP: add fetcher skel * WIP: add inject function to ConstFetcher * rename SingletonExecutor to IdExecutor * WIP: replace singleton node * WIP: More Debugging on IdExecutor * WIP: IdExecutor * WIP: add failure tests * make iresarch test work but not pass * WIP: add ConstFetcherHelper * fix test * fix tests * fix iresearch tests * fix wording * add review changes * add review change to SingleRowFetcher as well * fix test * fix error when increasing index * temporarily remove fold-expression * clean up * Fix gcc compile error * Feature/aql limit executor (#7982) * limit executor * removed not needed tri assert * rm _invariable in limitnode * find out if we are in a subquery * queryDepth in limit infos * added missing queryDepth * finalizing limit executor * added more tests, fixed a condition * add assert to test * added missing fullcount check * typo * minor changes, fixed test * test * wrong check * fixed tests * false merge * remove basic blocks * remove basic block includes * include sort order * removed not needed basic blocks * removed not needed basic blocks * fix test * Feature/remove input output shells (#8090) * Added template parameters to allow for block pass-through to be chosen at compile time * Adapted the tests to match the new template parameters * Adapted ConstFetcher and IdExecutor to match the new templated fetcher * Implemented pass-through, fixed SingleRowFetcherTest * Fixed implicit merge conflicts * Fix assumptions that are violated by block pass-through * Added 2 regression tests * Fixed test expected data * Fix nullptr dereference * Fix handling of non-invalidated input variables * Fix nullptr dereference * Fix handling of non-invalidated input variables * Fixed compile error * Fixed a useless and leaking allocation * Try a less implicit fix * Allow IdExecutor and ConstFetcher to be used with pass-through * Performance patches from @mchacki * Fixed merge conflicts, and bugs in ConstFetcher * Fixed atMost pass-through, and blocks that call their parents too often * Removed InputAqlItemBlockShell (except from tests) * Removed OutputAqlItemBlockShell (except for tests) * Moved implementations of OutputAqlItemRow methods in the header * Moved SingleRowFetcher::fetchRow to the header to allow inlining * Reenabled returnInheritedResults optimization * Enable passThrough for ReturnExecutor with inherited results * Specialized CalculationExecutor to avoid unneccessary conditional jumps * Made tests compile again (but are currently broken) * Fixed ReturnExecutor test * Move created InputRows out of AqlItemMatrix * Limit- and EnumerateList Executors no longer fetch from upstream after DONE * Added comments * Added experimental AqlItemBlock optimizations * Removed _numEntries, added comments * Allow executors to pass an "atMost"-limit to the SingleRowFetcher (for LIMIT) * Let the LimitExecutor pass atMost upstream * Bugfix for FullCount * Feature/aql enumeratecollection executor (#8028) * initial commit * enum coll executor * buildable version of enumeratecollectionexecutor * wrong usage of outVariable * Added template parameters to allow for block pass-through to be chosen at compile time * Adapted the tests to match the new template parameters * Adapted ConstFetcher and IdExecutor to match the new templated fetcher * more fixes, still some tests failing * Implemented pass-through, fixed SingleRowFetcherTest * Fixed implicit merge conflicts * adding missing set value (remember optimize todo), optimized constructor * removed old enumerate collection blocks * Fix assumptions that are violated by block pass-through * Added 2 regression tests * Fixed test expected data * Fix nullptr dereference * Fix handling of non-invalidated input variables * Fix nullptr dereference * Fix handling of non-invalidated input variables * Fixed compile error * Fixed a useless and leaking allocation * added broken uncompilable executor test * Try a less implicit fix * fix mocking * enumerate collection executor test * remove class, use only static function. * clean up test after merging with main branch * Allow IdExecutor and ConstFetcher to be used with pass-through * Performance patches from @mchacki * Fixed merge conflicts, and bugs in ConstFetcher * Fixed atMost pass-through, and blocks that call their parents too often * Removed InputAqlItemBlockShell (except from tests) * Removed OutputAqlItemBlockShell (except for tests) * Moved implementations of OutputAqlItemRow methods in the header * Moved SingleRowFetcher::fetchRow to the header to allow inlining * Reenabled returnInheritedResults optimization * Enable passThrough for ReturnExecutor with inherited results * Specialized CalculationExecutor to avoid unneccessary conditional jumps * Made tests compile again (but are currently broken) * Fixed ReturnExecutor test * Limit- and EnumerateList Executors no longer fetch from upstream after DONE * Removed an assertion which seems to be incorrect during bootstrap. * Inlined AQL ItemMatrix and removed unused elements in other Executors * Now inline + Move in AqlItemMatrix, seems to be overall best performing * Bugfix: Do not returnInheritedResults on DBServers * Fixed LIMIT test, and made it more thorough. * Fixed createion of NoResultBlock creation in IResearch Nodes. Also relaxed an assertion * Reactivated failure point, now identical with anotherone in OutputRow, need to unified * Bug fix: do not mutate the offset in the LimitExecutor (#8109) * Introduced test * Fixed LimitExecutor to not mutate its infos, so it works correctly in subqueries * Fixed crashes in CatchTests * Fixed non-maintainer build * try to fix subqueries * Fix isInSubQuery for non-singleton nodes. * remove useless while true * Feature/aql blocks by line dan sort (#8143) * Add SortNode::SorterType to SortExecutorInfoss. * prepare imple of sort executor * WIP: add some code for dan sort * WIP: working at pushRows * WIP - try to add Dan's heap-sort * re add missing test * 2 fixes * fix * Dan's tests are working * remove unused variable * remove SortBlock.cpp from CMakeLists.txt * remove hack and provide an extra method to set the _baseIndex * Simplified ContrainedSortExecutor. * fix forgotten variable * update doc * Assert that we do not use functions that might return wrong results. Preconditions or invariants the functions rely on are broken. Therefore the functions can not be used. This is asserted in maintainer mode. * add function to restore row invariant * do not emplace and pop_back if not necessary * Use clear registers in case we can move the rows. * WIndows opst zirkus * Actually destroy AqlItemValue * Feature/traversal executor by line (#8000) * Added stubs for TraversalExecutor, no implementation, not compiled in yet * Included production code of TraversalExecutor and made it compile. Now implement * Implemented production code for trivial tests, if no row is reaching the traverser. * Fixed TraversalExecutor code to pull all rows from above and added tests. No traversal yet, this is next * Intermediate blind commit might not work * Fixed compile issue in test code * Created a shared place for Mocks in tests and moved the StorageEngineMock there, also started a shared place for mock servers, most test will need the same server in order to work. * Fixed travesalExecutor tests. Now able to create tests with actual input. * Added successful test in TraversalExecutor, that Traverser as started with correct start vertices (by inputRegister) * Further test cases * Added stubs for TraversalExecutor, no implementation, not compiled in yet * Included production code of TraversalExecutor and made it compile. Now implement * Implemented production code for trivial tests, if no row is reaching the traverser. * Fixed TraversalExecutor code to pull all rows from above and added tests. No traversal yet, this is next * Intermediate blind commit might not work * Fixed compile issue in test code * Created a shared place for Mocks in tests and moved the StorageEngineMock there, also started a shared place for mock servers, most test will need the same server in order to work. * Fixed travesalExecutor tests. Now able to create tests with actual input. * Added successful test in TraversalExecutor, that Traverser as started with correct start vertices (by inputRegister) * Fixed leftovers from rebase * Refixed mocks in different folder * Fixed Mock import * Fixed Calculators Exector Test to use the unified mocked server. * Implemented logic for the TraversalExecutor. Also added tests for it. Not fully complete though * Added validation of result values * Added usage of constant register in traversal executor * Included filter variables in traersal executor. Added test for const input. And moved MMDR into base traverser class for simplicity * Added ostream operators on AQLValue and AqlInputRow. Not 100% done yet but good enough * Added a shutdownable ExecutionBlock. Some blocks need to implement a specific shutdown still. I added this class to make it easier to eliminate them when the time is due. * Removed ostream operator for INPUT row again, does for some reason not compile on Linux0o * Fixed initialization order * Removed classwrapper for shutdown. * Applied review changes * Refixed failing tests, API is not subject to change * Fixed CatchTest (wrong usage of string literal in test case) * Feature/shortest path executor (#8042) * Added stubs for TraversalExecutor, no implementation, not compiled in yet * Included production code of TraversalExecutor and made it compile. Now implement * Implemented production code for trivial tests, if no row is reaching the traverser. * Fixed TraversalExecutor code to pull all rows from above and added tests. No traversal yet, this is next * Intermediate blind commit might not work * Fixed compile issue in test code * Created a shared place for Mocks in tests and moved the StorageEngineMock there, also started a shared place for mock servers, most test will need the same server in order to work. * Fixed travesalExecutor tests. Now able to create tests with actual input. * Added successful test in TraversalExecutor, that Traverser as started with correct start vertices (by inputRegister) * Further test cases * Added stubs for TraversalExecutor, no implementation, not compiled in yet * Included production code of TraversalExecutor and made it compile. Now implement * Implemented production code for trivial tests, if no row is reaching the traverser. * Fixed TraversalExecutor code to pull all rows from above and added tests. No traversal yet, this is next * Intermediate blind commit might not work * Fixed compile issue in test code * Created a shared place for Mocks in tests and moved the StorageEngineMock there, also started a shared place for mock servers, most test will need the same server in order to work. * Fixed travesalExecutor tests. Now able to create tests with actual input. * Added successful test in TraversalExecutor, that Traverser as started with correct start vertices (by inputRegister) * Fixed leftovers from rebase * Refixed mocks in different folder * Fixed Mock import * Fixed Calculators Exector Test to use the unified mocked server. * Implemented logic for the TraversalExecutor. Also added tests for it. Not fully complete though * Added validation of result values * Added usage of constant register in traversal executor * Included filter variables in traersal executor. Added test for const input. And moved MMDR into base traverser class for simplicity * Added ostream operators on AQLValue and AqlInputRow. Not 100% done yet but good enough * Added a shutdownable ExecutionBlock. Some blocks need to implement a specific shutdown still. I added this class to make it easier to eliminate them when the time is due. * Removed ostream operator for INPUT row again, does for some reason not compile on Linux0o * Fixed initialization order * First draft of shortest path executor * Fixed logic bugs, Local AQL tests succeed * Added first version of ShortestPathExecutor tests. Edge output tests are missing yet. * Added EDGE output tests * Replaced TraversalStats with NoStats, they have never been tracked... * Removed obsolete ShortestPathBlock. * Removed classwrapper for shutdown. * Applied review changes * Refixed failing tests, API is not subject to change * windows macro opst circus * Clear registers per block, not per row (#8164) * Fixed compilation under linux again...
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.
No description provided.