8000 Feature/aql subquery splicing with gather by goedderz · Pull Request #10341 · arangodb/arangodb · GitHub
[go: up one dir, main page]
Skip to content

Feature/aql subquery splicing with gather #10341

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
8000

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 28 commits into from
Nov 18, 2019
Merged

Feature/aql subquery splicing with gather #10341

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
8a9f104
Cleanup
goedderz Oct 30, 2019
5ba1ebe
Implemented UnsortingGatherExecutor - no skip and expectedNumberOfRow…
goedderz Oct 30, 2019
69cbbbf
Added some comments, cleanup
goedderz Oct 30, 2019
fb79080
Enable spliced subqueries when GATHER or REMOTE blocks are present
goedderz Oct 30, 2019
1a7f5e5
Minor changes
goedderz Oct 30, 2019
9c05709
Implemented scattering ShadowRows in DistributeExecutor
goedderz Oct 30, 2019
f9775a6
Set "isSplicedInSubquery" for additional nodes
goedderz Oct 30, 2019
7ef8fd8
Duplicated subquery test for spliced subqueries
goedderz Oct 30, 2019
1a6fc8c
Merge branch 'devel' of github.com:arangodb/arangodb into feature/aql…
goedderz Oct 30, 2019
06324e1
Moved AqlValueMaterializer into a separate file
goedderz Oct 31, 2019
2ec46d6
Pass just VPackOptions rather than a whole transaction around
goedderz Nov 14, 2019
c0a5f13
Remove more transaction pointers in favour of vpack options
goedderz Nov 14, 2019
2edc1f1
Fixed build errors
goedderz Nov 14, 2019
998b5a8
Merge branch 'devel' of github.com:arangodb/arangodb into feature/aql…
goedderz Nov 14, 2019
7c421ff
Fixed merge conflicts
goedderz Nov 14, 2019
fab5cda
Cleanup in AqlValueMaterializer
goedderz Nov 14, 2019
9901fe7
Fixed nullptr deref in basic tests
goedderz Nov 15, 2019
0299cbb
Suppress deprecated warnings on windows
goedderz Nov 15, 2019
58fede8
Per default, do not warn about deprecated functions
goedderz Nov 15, 2019
fb37db0
Fix pure virtual method call with fakeit
goedderz Nov 15, 2019
60f3c0d
Merge branch 'devel' of github.com:arangodb/arangodb into feature/aql… 8000
goedderz Nov 15, 2019
f67e632
Revert all non-critical changes in order to move them into another PR
goedderz Nov 15, 2019
13e8a1d
Fixed Geo* tests
goedderz Nov 15, 2019
8090998
Added some comments
goedderz Nov 15, 2019
e1cbf79
Implemented UnsortingGatherExecutor::skipSome
goedderz Nov 15, 2019
8e66433
Re-enabled some tests
goedderz Nov 15, 2019
3f4d015
Fixed profiler tests
goedderz Nov 15, 2019
7f57b98
Removed unused code
goedderz Nov 15, 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
Prev Previous commit
Next Next commit
Fixed Geo* tests
  • Loading branch information
@goedderz
goedderz committed Nov 15, 2019
commit 13e8a1d24c792f9a5f79c8606ba4b1b9c9cda350
11 changes: 10 additions & 1 deletion tests/Geo/GeoConstructorTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
#include "Aql/Functions.h"
#include "Aql/Query.h"
#include "Containers/SmallVector.h"
#include "Transaction/Context.h"
#include "Transaction/Methods.h"

#include <velocypack/Builder.h>
Expand All @@ -57,12 +58,20 @@ class GeoConstructorTest : public ::testing::Test {

fakeit::Mock<transaction::Methods> trxMock;
transaction::Methods& trx;
fakeit::Mock<transaction::Context> contextMock;
transaction::Context& context;

SmallVector<AqlValue>::allocator_type::arena_type arena;
SmallVector<AqlValue> params;

GeoConstructorTest()
: expressionContext(expressionContextMock.get()), trx(trxMock.get()), params{arena} {}
: expressionContext(expressionContextMock.get()),
trx(trxMock.get()),
context(contextMock.get()),
params{arena} {
fakeit::When(Method(trxMock, transactionContextPtr)).AlwaysReturn(&context);
fakeit::When(Method(contextMock, getVPackOptions)).AlwaysReturn(&velocypack::Options::Defaults);
}
};

namespace geo_point {
Expand Down
18 changes: 14 additions & 4 deletions tests/Geo/GeoFunctionsTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
#include "Aql/Functions.h"
#include "Aql/Query.h"
#include "Containers/SmallVector.h"
#include "Transaction/Context.h"
#include "Transaction/Methods.h"

#include <velocypack/Builder.h>
Expand Down Expand Up @@ -64,16 +65,25 @@ class GeoEqualsTest : public ::testing::Test {

fakeit::Mock<transaction::Methods> trxMock;
transaction::Methods& trx;
fakeit::Mock<transaction::Context> contextMock;
transaction::Context& context;

SmallVector<AqlValue>::allocator_type::arena_type arena;
SmallVector<AqlValue> paramsA;
SmallVector<AqlValue> paramsB;
SmallVector<AqlValue> paramsC;

GeoEqualsTest() : expressionContext(expressionContextMock.get()),
trx(trxMock.get()), paramsA{arena}, paramsB{arena}, paramsC{arena} {

GeoEqualsTest()
: expressionContext(expressionContextMock.get()),
trx(trxMock.get()),
context(contextMock.get()),
paramsA{arena},
paramsB{arena},
paramsC{arena} {
fakeit::When(Method(trxMock, transactionContextPtr)).AlwaysReturn(&context);
fakeit::When(Method(contextMock, getVPackOptions)).AlwaysReturn(&velocypack::Options::Defaults);
}

~GeoEqualsTest() {
clearVector(paramsA);
clearVector(paramsB);
Expand Down
0