Jan Steemann
|
dfb1905035
|
fixed tests
|
2014-10-14 12:03:25 +02:00 |
James
|
3442f298ea
|
Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel
|
2014-10-14 10:19:38 +01:00 |
James
|
602f03e4e3
|
adding distribute-in-cluster optimizer rule.
|
2014-10-14 10:19:27 +01:00 |
Jan Steemann
|
f3e72a80dc
|
fixed compile warnings
|
2014-10-14 11:13:01 +02:00 |
Jan Steemann
|
3886d6ef09
|
fixes for Visual Studio
|
2014-10-14 11:04:28 +02:00 |
James
|
362dc083cc
|
Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel
|
2014-10-14 09:22:20 +01:00 |
James
|
60e85ccc7e
|
proper toJsonHelper method for DistributeNode.
|
2014-10-14 09:21:40 +01:00 |
Jan Steemann
|
7be268c07c
|
changed AQL optimizer to not throw
|
2014-10-14 10:14:40 +02:00 |
Jan Steemann
|
69e9d12955
|
fixed race in synchronizer
|
2014-10-13 15:41:22 +02:00 |
Jan Steemann
|
d151088a94
|
fixed invariant
|
2014-10-13 14:24:29 +02:00 |
Jan Steemann
|
9d02516e19
|
potential fix for issue #1041
|
2014-10-11 21:42:58 +02:00 |
Jan Steemann
|
ce8ac10f59
|
optimized memory usage of multi hash index
|
2014-10-11 18:38:22 +02:00 |
Jan Steemann
|
fefd527b9f
|
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
|
2014-10-10 22:00:15 +02:00 |
Jan Steemann
|
77ff3642c9
|
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
|
2014-10-10 18:58:07 +02:00 |
Jan Steemann
|
23e692e7fa
|
added FIND_FIRST, not yet documented
|
2014-10-10 18:57:57 +02:00 |
Jan Steemann
|
17c45db8bb
|
changed implementation to use freelists
|
2014-10-10 18:57:42 +02:00 |
Jan Steemann
|
5604008ce4
|
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
|
2014-10-10 18:06:14 +02:00 |
Jan Steemann
|
4c366dad63
|
issue #1038: use linked lists for collisions
|
2014-10-10 18:05:23 +02:00 |
Willi Goesgens
|
3a7a03a51f
|
Don't add intermediate calculationnodes for LET-statements to forward the results of subqueries. Instead adjust the outvariable of the subquerynode.
|
2014-10-10 17:00:49 +02:00 |
Jan Steemann
|
5abfa7fdbd
|
whitespace
|
2014-10-10 13:42:20 +02:00 |
James
|
10f7feeede
|
added comment to Query.cpp about comparison of serialised/deserialised plans.
|
2014-10-10 10:23:59 +01:00 |
James
|
9334547583
|
Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel
|
2014-10-10 08:31:28 +01:00 |
James
|
c0c3f627bb
|
proper initialisation and shutdown of distribute block.
|
2014-10-10 08:31:19 +01:00 |
Jan Steemann
|
39c98c87f5
|
fixed memleak
|
2014-10-09 18:06:21 +02:00 |
James
|
a346e257bb
|
Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel
Conflicts:
arangod/Aql/ExecutionBlock.cpp
arangod/Aql/ExecutionBlock.h
|
2014-10-09 10:46:49 +01:00 |
James
|
92e0d1e459
|
abstract class BlockWithClients to contain Scatter/DistributeBlocks
|
2014-10-09 10:39:50 +01:00 |
Jan Steemann
|
7966c8d044
|
fixed compile warning
|
2014-10-09 10:52:08 +02:00 |
Jan Steemann
|
081a62c6e4
|
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
|
2014-10-09 10:45:40 +02:00 |
Jan Steemann
|
6cdaaa1b85
|
fixes for Visual Studio
|
2014-10-09 10:45:31 +02:00 |
James
|
084078f61f
|
fixed tests for remove-unnecessary-remote-scatter and undistribute-remove-after-enum-coll, renamed distributeInCluster to scatterInCluster.
|
2014-10-09 08:45:34 +01:00 |
Jan Steemann
|
8294e54f32
|
faster import
|
2014-10-08 17:01:45 +02:00 |
Jan Steemann
|
999d8ffd1d
|
small optimizations
|
2014-10-08 16:10:27 +02:00 |
Jan Steemann
|
ff80fafba5
|
fixed cached lookups of collections on the server, which may have caused spurious problems after collection rename operations
|
2014-10-08 14:59:02 +02:00 |
James
|
d2b86de370
|
fixed tyopo in comment
|
2014-10-08 10:55:58 +01:00 |
James
|
2ec03d57e3
|
Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel
|
2014-10-08 10:26:19 +01:00 |
James
|
2ed7fb13b2
|
DistributeBlock getOrSkipSome done as far as possible.
|
2014-10-08 10:26:04 +01:00 |
Jan Steemann
|
fe6ea548db
|
fixed reading run lengths with empty values
|
2014-10-07 14:04:12 +02:00 |
Jan Steemann
|
c2f0265d7d
|
fixed optimizer rule remove-unnecessary-remote-scatter
|
2014-10-07 13:21:05 +02:00 |
Jan Steemann
|
aef384da1a
|
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
|
2014-10-07 12:36:36 +02:00 |
Jan Steemann
|
e5d8414865
|
fixed more queries
|
2014-10-07 12:36:17 +02:00 |
James
|
e17a43f66e
|
Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel
|
2014-10-07 11:19:25 +01:00 |
Jan Steemann
|
4ff58364f1
|
fixed cloning of plans
|
2014-10-07 12:00:37 +02:00 |
James
|
4a8ef130f5
|
DistributeBlock getOrSkipSome method minus the hard part.
|
2014-10-07 10:33:37 +01:00 |
Jan Steemann
|
a62d83603e
|
fixed missing register planning
|
2014-10-06 18:43:50 +02:00 |
Jan Steemann
|
0f83d8132f
|
fixed some transaction threading errors
|
2014-10-06 18:39:01 +02:00 |
Willi Goesgens
|
7dac9d8cc7
|
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
|
2014-10-06 14:16:39 +02:00 |
Willi Goesgens
|
48c5ff938e
|
If we clone an ExecutionNode for the same AST we also have to copy the evaluation members, but we don't need a deep-copy.
|
2014-10-06 14:15:41 +02:00 |
James
|
5af60d121e
|
Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel
|
2014-10-06 12:57:17 +01:00 |
James
|
95fd279a52
|
distribution node/block declarations etc.
|
2014-10-06 12:57:09 +01:00 |
Willi Goesgens
|
8f74eeff97
|
Assert whether we have a varoverview.
|
2014-10-06 13:20:31 +02:00 |
Willi Goesgens
|
287b6dfb37
|
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
|
2014-10-06 11:55:27 +02:00 |
Willi Goesgens
|
c01e31c404
|
when de-serializing nodes don't create new variables, but look up the ones we already have.
|
2014-10-06 11:55:11 +02:00 |
Willi Goesgens
|
4509a0f2b0
|
call findVarUsage before serialising the json, and not after deserializing it.
|
2014-10-06 11:53:23 +02:00 |
James
|
032e5d085e
|
reset _initializeCursorOrShutdown in shutdown method, renaming test file.
|
2014-10-06 10:35:50 +01:00 |
James
|
aee0605742
|
better initialiseCursor and shutdown for ScatterBlock
|
2014-10-06 10:30:28 +01:00 |
Jan Steemann
|
577593ed55
|
shutdown transactions
|
2014-10-06 11:23:39 +02:00 |
Jan Steemann
|
bf31161ef5
|
activated if-statement
|
2014-10-06 10:40:04 +02:00 |
Jan Steemann
|
5959a5e6da
|
fixed segfaults during node cloning
|
2014-10-06 10:31:15 +02:00 |
James
|
029e443b12
|
removing debug output
|
2014-10-04 12:21:34 +01:00 |
James
|
8bd3a9718c
|
undistributeRemoveAfterEnumColl now more or less works for REMOVE x._key in coll
|
2014-10-03 11:32:40 +01:00 |
James
|
c6c0387e50
|
undistributeRemoveAfterEnumColl optmizer rule now working
|
2014-10-03 10:13:11 +01:00 |
James
|
5a070a4e0a
|
remove const-qualified types in VarInfo struct to allow compilation.
|
2014-10-03 09:27:35 +01:00 |
Jan Steemann
|
0e103d33dc
|
added assertion
|
2014-10-03 01:37:04 +02:00 |
Jan Steemann
|
d8934a025f
|
make parseDocumentId more strict again
|
2014-10-03 01:23:07 +02:00 |
Jan Steemann
|
4d488b3734
|
don't fail on forced shutdown
|
2014-10-03 00:50:05 +02:00 |
Jan Steemann
|
7a4c8f69db
|
speed up parseDocumentId
|
2014-10-03 00:49:46 +02:00 |
Jan Steemann
|
81ec1a2754
|
indentation
|
2014-10-03 00:12:00 +02:00 |
Willi Goesgens
|
e1efab6fb5
|
Fix cloning to other ASTs - dereference pointers to IDs and look up the items on the new lists
|
2014-10-02 18:41:13 +02:00 |
Jan Steemann
|
a2e9fadc7d
|
moved assignment into constructor
|
2014-10-02 18:38:36 +02:00 |
Jan Steemann
|
66d2fc570f
|
move register assignment into constructor
|
2014-10-02 18:27:53 +02:00 |
Jan Steemann
|
f44599644c
|
moved register assignment into constructor
|
2014-10-02 17:52:45 +02:00 |
Jan Steemann
|
31005892d2
|
assign register in constructor
|
2014-10-02 17:35:43 +02:00 |
Jan Steemann
|
eae877b1be
|
return variables on explain
|
2014-10-02 17:34:59 +02:00 |
Jan Steemann
|
573d837561
|
off-by-one fix
|
2014-10-02 17:06:12 +02:00 |
Jan Steemann
|
873d8291db
|
fixed race condition in getCurrentDBServers
|
2014-10-02 15:50:04 +02:00 |
Jan Steemann
|
1d1ce39d50
|
fixed warning
|
2014-10-02 15:35:43 +02:00 |
Jan Steemann
|
24be855c8d
|
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
|
2014-10-02 15:34:57 +02:00 |
Jan Steemann
|
e28ad821b0
|
fixed spuriously occurring "database not found" error
|
2014-10-02 15:34:38 +02:00 |
Willi Goesgens
|
b8491932db
|
Command the cluster node not to do optimizations.
|
2014-10-02 14:45:10 +02:00 |
Willi Goesgens
|
97e83b491d
|
Try to stop the transaction when catching an exception
|
2014-10-02 14:44:38 +02:00 |
Willi Goesgens
|
dc6dba1ef4
|
Cluster Communication: serialize a global set of the currently available variables.
|
2014-10-02 13:15:02 +02:00 |
Willi Goesgens
|
d7d6ce65db
|
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
|
2014-10-02 11:08:02 +02:00 |
Willi Goesgens
|
6f4e5c4fd7
|
When creating the copy for the clusternodes we also need to copy the properties.
|
2014-10-02 11:07:31 +02:00 |
James
|
16d54d6694
|
snapshot
|
2014-10-02 10:06:45 +01:00 |
James
|
8e8c5c9934
|
Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel
|
2014-10-02 10:03:28 +01:00 |
James
|
2f887e197e
|
adding remainingForShard to ScatterBlock
|
2014-10-02 10:03:08 +01:00 |
Jan Steemann
|
ef15f1bb5d
|
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
|
2014-10-02 10:41:20 +02:00 |
Willi Goesgens
|
f63e90e08b
|
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
|
2014-10-02 10:41:12 +02:00 |
Willi Goesgens
|
bc627dda7b
|
Also copy the varoverview to the clone.
|
2014-10-02 10:40:09 +02:00 |
Jan Steemann
|
67873e5edd
|
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
|
2014-10-02 10:34:33 +02:00 |
Jan Steemann
|
992bc5264b
|
debug output
|
2014-10-02 10:34:27 +02:00 |
Jan Steemann
|
7f9da1c397
|
asserts
|
2014-10-02 10:34:08 +02:00 |
Max Neunhoeffer
|
d021bcf720
|
Sort out shardId for ScatterBlock and HTTP API.
|
2014-10-02 10:24:47 +02:00 |
Max Neunhoeffer
|
a59d1e4448
|
Start to sort out ScatterBlock's special API.
|
2014-10-02 09:55:15 +02:00 |
Max Neunhoeffer
|
25d588b858
|
Set _varUsageValid flag in Json constructor.
|
2014-10-02 09:28:00 +02:00 |
Max Neunhoeffer
|
8a0d5c021a
|
Start adapting RestAqlHandler to ScatterBlock.
|
2014-10-02 00:34:32 +02:00 |
Max Neunhoeffer
|
e043deb13b
|
Rename StaticAnalysisDebugger into RegisterPlanningDebugger.
|
2014-10-02 00:13:49 +02:00 |
Max Neunhoeffer
|
be07d39457
|
Rename staticAnalysis -> planRegisters.
|
2014-10-02 00:11:15 +02:00 |
Jan Steemann
|
5b0b1f0af5
|
indenting
|
2014-10-01 19:06:29 +02:00 |
Jan Steemann
|
38d43a2fb3
|
print error message in cases AqlHandler fails
|
2014-10-01 17:47:43 +02:00 |
Jan Steemann
|
f2c115fa25
|
do not crash when using an index
|
2014-10-01 16:16:38 +02:00 |
Jan Steemann
|
d381031972
|
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
|
2014-10-01 15:35:26 +02:00 |
Jan Steemann
|
0d9cdfc87c
|
struct Index
|
2014-10-01 15:35:16 +02:00 |
Willi Goesgens
|
6df55bcb0a
|
Don't reuse "empty" json objects, they are undefined after first use.
|
2014-10-01 15:00:02 +02:00 |
Willi Goesgens
|
4b399236f1
|
Make the Transaction a smart pointer living inside of Query.
|
2014-10-01 14:30:53 +02:00 |
Jan Steemann
|
49237ef55a
|
fixed some cluster internal communication
|
2014-10-01 14:06:00 +02:00 |
Jan Steemann
|
98733660c8
|
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
|
2014-10-01 12:21:45 +02:00 |
Jan Steemann
|
f8cf3d1951
|
fixed memleak
|
2014-10-01 12:21:37 +02:00 |
James
|
7a34d065b5
|
cleaning up and registering undistributeRemoveAfterEnumColl.
|
2014-10-01 10:43:54 +01:00 |
James
|
3569bfdebf
|
Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel
|
2014-10-01 10:18:00 +01:00 |
James
|
2fd8c2b185
|
prelim version of undistributeRemoveAfterEnumColl
|
2014-10-01 10:17:36 +01:00 |
Willi Goesgens
|
eb2f815d26
|
Add json de/serialization of new ExecutionNode members.
|
2014-10-01 09:59:50 +02:00 |
Jan Steemann
|
ee49d712a6
|
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
|
2014-09-30 23:46:36 +02:00 |
Jan Steemann
|
672d540609
|
removed some debug output
|
2014-09-30 23:46:17 +02:00 |
Max Neunhoeffer
|
a688636ce1
|
Merge branch 'verpflanzung' into devel
|
2014-09-30 23:31:30 +02:00 |
Max Neunhoeffer
|
993a89fea2
|
Fix compilation again.
|
2014-09-30 23:30:55 +02:00 |
Max Neunhoeffer
|
4b21832bba
|
Take out unnecessary friend class declarations.
|
2014-09-30 23:23:46 +02:00 |
Max Neunhoeffer
|
8bffb3daa3
|
Finish transplantation.
|
2014-09-30 23:20:51 +02:00 |
Jan Steemann
|
03790a75f2
|
hold logs for slightly shorter time
|
2014-09-30 23:20:43 +02:00 |
Max Neunhoeffer
|
5676e82872
|
Make it compile using friend classes.
|
2014-09-30 20:14:39 +02:00 |
Max Neunhoeffer
|
40d7dec7bc
|
Snapshot.
|
2014-09-30 16:49:12 +02:00 |
Max Neunhoeffer
|
5dbcac8efe
|
Start transplantation of _varOverview to ExecutionNodes.
|
2014-09-30 16:44:01 +02:00 |
Jan Steemann
|
f50f041bda
|
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
arangod/Aql/ExecutionEngine.cpp
arangod/Aql/Query.cpp
|
2014-09-30 15:50:28 +02:00 |
Jan Steemann
|
c4ce98a442
|
fixed some bugs in distributed plan instanciation
|
2014-09-30 15:19:44 +02:00 |
Willi Goesgens
|
22f2753d62
|
Properly generate the new plan with the new query
|
2014-09-30 14:50:31 +02:00 |
Jan Steemann
|
b78f54d94e
|
lookup function for keys
|
2014-09-30 14:47:58 +02:00 |
Willi Goesgens
|
3f566f6289
|
Enable node* clone functions to produce deep copies which live on a specified query.
|
2014-09-30 14:09:12 +02:00 |
James
|
1d6637eedf
|
Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel
|
2014-09-30 10:10:13 +01:00 |
James
|
22597af5ac
|
version of removeUnnecessaryRemoteScatter which changes the plan in place.
|
2014-09-30 10:10:03 +01:00 |
Willi Goesgens
|
60dd21802b
|
Clone the query, move the memory kept in the AST over to the query so all memory is kept in one location.
|
2014-09-30 10:18:13 +02:00 |
James
|
3daaaad855
|
fixing last
|
2014-09-30 08:48:29 +01:00 |
James
|
301ccddf83
|
Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel
|
2014-09-30 08:29:36 +01:00 |
James
|
d204ce4019
|
adding registration of the remove unnecessary remote scatter optimizer rule.
|
2014-09-30 08:29:21 +01:00 |
Jan Steemann
|
3a2e13b910
|
pass queryId to remote servers
|
2014-09-29 17:35:10 +02:00 |
Jan Steemann
|
f3186fa065
|
cppcheck
|
2014-09-29 17:02:40 +02:00 |
Jan Steemann
|
f3015bd70a
|
fixed indentation
|
2014-09-29 16:52:45 +02:00 |
Jan Steemann
|
b31987fea7
|
pass data to RemoteNode
|
2014-09-29 16:36:52 +02:00 |
Jan Steemann
|
691e9f315c
|
cas adjustment for @mchacki
|
2014-09-29 16:09:45 +02:00 |
Jan Steemann
|
ec1e6552ca
|
clone plan for DBServers
|
2014-09-29 15:57:53 +02:00 |
Jan Steemann
|
db0fdf24ec
|
less string operations during batch request header parsing
|
2014-09-29 13:56:45 +02:00 |
Jan Steemann
|
ec02ed2ccf
|
nullptr
|
2014-09-29 13:56:37 +02:00 |
Jan Steemann
|
3ac25ad56f
|
fixed some issues with remote queries
|
2014-09-29 12:14:03 +02:00 |
Jan Steemann
|
643ffa104d
|
moved isCoordinator to function of its own
|
2014-09-29 09:38:15 +02:00 |
Jan Steemann
|
188fe0c43c
|
accidently committed local modifications. revert
|
2014-09-29 09:31:27 +02:00 |
Jan Steemann
|
0d075dca3f
|
pass queryRegistry into the AQL functions
|
2014-09-29 09:30:32 +02:00 |
Jan Steemann
|
d177bc110c
|
comments
|
2014-09-29 09:06:06 +02:00 |
Jan Steemann
|
166179c6d5
|
fixed compile warnings
|
2014-09-29 09:05:15 +02:00 |
Max Neunhoeffer
|
8fbe9bda98
|
Remove some unnecessary and fatal destructors.
|
2014-09-29 08:42:30 +02:00 |
James
|
d53da7ce4a
|
Optimiser rule to get rid of a RemoteNode->ScatterNode combination
|
2014-09-27 16:43:08 +01:00 |
James
|
bfd8ff5f3a
|
finished looking at ExecutionBlock destructors.
|
2014-09-27 15:06:09 +01:00 |
James
|
5264fa2612
|
remove unnecessary and incorrect renewal of ourLessThan.
|
2014-09-27 14:32:34 +01:00 |
James
|
8c1f9f5095
|
fixed arithmetic in GatherBlock::skipSome
|
2014-09-27 14:27:56 +01:00 |
James
|
4d0b3360cb
|
fixing arithmetic in available in GatherBlock.
|
2014-09-27 14:14:03 +01:00 |
James
|
75df1bff15
|
destructor for SubqueryBlock, deletes private data
|
2014-09-27 13:19:58 +01:00 |
James
|
b0ff6d1712
|
destructor for CaluculationBlock, deletes local data.
|
2014-09-27 13:17:45 +01:00 |
James
|
0c98677b16
|
destructor fo EnumerateListBlock, deletes local data
|
2014-09-27 13:13:30 +01:00 |
James
|
144ee7a8f0
|
destructor for IndexRangeBlock, deletes private data
|
2014-09-27 13:10:14 +01:00 |
James
|
ae5b96bc5d
|
destructor for EnumCollBlock that deletes local data.
|
2014-09-27 13:04:59 +01:00 |
James
|
1c52127cc1
|
destructor for GatherBlock, deletes _gatherBlockBuffer
|
2014-09-27 12:53:27 +01:00 |
James
|
68f48d0cd4
|
proper initializeCursor method for GatherBlock.
|
2014-09-27 12:48:48 +01:00 |
James
|
dd716301ab
|
moving _sortRegisters from initCursor to initialize.
|
2014-09-27 12:41:59 +01:00 |
James
|
f04b25f3ea
|
correcting comment.
|
2014-09-27 12:37:27 +01:00 |
James
|
bcebeb4dd0
|
comments for ScatterBlock and some reordering
|
2014-09-27 12:31:12 +01:00 |
James
|
69f2cfd5a5
|
cleaning up, and comments in .cpp for GatherBlock
|
2014-09-27 12:12:50 +01:00 |
James
|
14eaac044c
|
comments before GatherBlock in header, renamed _buffer, _pos which are
non-standard
|
2014-09-27 12:03:55 +01:00 |
Max Neunhoeffer
|
45b900913c
|
Some adjustments to code in GatherBlock.
Finish first version of RemoteBlock.
|
2014-09-27 01:45:05 +02:00 |
Jan Steemann
|
f229253e24
|
fixed redundant if / else if
|
2014-09-26 21:26:26 +02:00 |
Jan Steemann
|
9e47f3ca27
|
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
arangod/Aql/ExecutionNode.h
|
2014-09-26 20:23:52 +02:00 |
Jan Steemann
|
c3ce45e0dd
|
added block instanciation for coordinator, v0.0.0
|
2014-09-26 20:17:42 +02:00 |
Max Neunhoeffer
|
5f5cf84641
|
Refactor getSome for RemoteBlock.
|
2014-09-26 16:49:26 +02:00 |
Max Neunhoeffer
|
dbed62392f
|
Implement skipSome method for RemoteBlock.
|
2014-09-26 16:30:30 +02:00 |
Max Neunhoeffer
|
d2a9632710
|
Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel
|
2014-09-26 16:20:17 +02:00 |
Max Neunhoeffer
|
046d4f524d
|
Implement getSome for RemoteBlock.
|
2014-09-26 16:19:25 +02:00 |
Max Neunhoeffer
|
865d513dd0
|
Add skipSome to HTTP API and to ExecutionEngine.
|
2014-09-26 16:18:47 +02:00 |
Willi Goesgens
|
d003eecac1
|
We need to pass a reference since we want to return values onto this; and return const references to not duplicate the memory.
|
2014-09-26 15:22:41 +02:00 |
Max Neunhoeffer
|
5f24e603fe
|
Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel
|
2014-09-26 14:51:14 +02:00 |
Max Neunhoeffer
|
95264a82ab
|
initializeCursor and shutdown methods for HTTP API for queries.
|
2014-09-26 14:50:52 +02:00 |
Max Neunhoeffer
|
25ee17c075
|
initializeCursor and shutdown methods for ExecutionEngine.
|
2014-09-26 14:50:28 +02:00 |
Jan Steemann
|
578d22c95b
|
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
|
2014-09-26 13:58:16 +02:00 |
Jan Steemann
|
f462c5f620
|
add database and collection info to gather nodes
|
2014-09-26 13:58:02 +02:00 |
Willi Goesgens
|
41fb15d462
|
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
|
2014-09-26 13:44:16 +02:00 |
Willi Goesgens
|
14eda3e348
|
- create type for SortElements to be used instead of stacked templates
- abstract json parsing of SortElemnts into an own function
- implement deserialisation of Scatter/GatherNode
|
2014-09-26 13:42:26 +02:00 |
Max Neunhoeffer
|
5c7d058043
|
Add stubs for RemoteBlock.
|
2014-09-26 13:34:08 +02:00 |
Max Neunhoeffer
|
e9bac83e67
|
Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel
|
2014-09-26 13:23:33 +02:00 |
Max Neunhoeffer
|
c4fd3e7553
|
First steps towards RemoteBlock.
|
2014-09-26 13:23:21 +02:00 |
Jan Steemann
|
cb3d138507
|
fixed compiler warning
|
2014-09-26 13:09:38 +02:00 |
Willi Goesgens
|
53ee658be0
|
Implement moving of sortnode into the clusterable part of the query; add elements to the json serialisation of the gather node
|
2014-09-26 12:35:58 +02:00 |
James
|
9ae0879ba4
|
Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel
|
2014-09-26 11:34:18 +01:00 |
James
|
53b3abeee0
|
ScatterBlock uses shardId strings instead of clientId numbers.
|
2014-09-26 11:34:07 +01:00 |
Jan Steemann
|
3afadfdefa
|
fixed compile warnings
|
2014-09-26 12:30:42 +02:00 |
Jan Steemann
|
8fa141e31b
|
removed invalid sequence from file
|
2014-09-26 12:09:01 +02:00 |
Jan Steemann
|
6eca3d6cc4
|
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
|
2014-09-26 12:07:20 +02:00 |
Jan Steemann
|
5c250d9ec7
|
fixed compile warning
|
2014-09-26 12:07:11 +02:00 |
Jan Steemann
|
046d2586ae
|
added temporary function for @mchacki
|
2014-09-26 12:06:57 +02:00 |
Thomas Schmidts
|
2e151f7ab0
|
Added type definition to db._create documentation
|
2014-09-26 11:53:44 +02:00 |
James
|
de19d4441b
|
Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel
|
2014-09-26 10:40:43 +01:00 |
James
|
e8dc7694e3
|
shutdown method for GatherBlock and initializeCursor for ScatterBlock
|
2014-09-26 10:40:05 +01:00 |
Max Neunhoeffer
|
8a6c2f22b5
|
Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel
|
2014-09-26 11:18:31 +02:00 |
Max Neunhoeffer
|
06d039d3a0
|
Fix a deserialisation bug for AqlItemBlocks.
|
2014-09-26 11:18:17 +02:00 |
James
|
2070175a51
|
getOrSkipSomeForClient method for ScatterBlock.
|
2014-09-26 09:32:39 +01:00 |
James
|
e9f8d5ac99
|
fixed bug in ScatterBlock::getSomeForClient.
|
2014-09-26 08:51:11 +01:00 |
Willi Goesgens
|
6c81f630a3
|
Add filter rule which moves Filters & Calculations into the parts of a Plan that is distributed to clusters.
|
2014-09-25 17:08:20 +02:00 |
Max Neunhoeffer
|
b9f9a55fbf
|
Move on with AqlItemBlock deserialisation. Not working yet.
|
2014-09-25 16:52:42 +02:00 |
James
|
3423db77e6
|
Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel
|
2014-09-25 11:09:15 +01:00 |
James
|
b9d27bee42
|
preliminary methods for ScatterBlock.
|
2014-09-25 11:08:47 +01:00 |
Max Neunhoeffer
|
f80f67f18b
|
Remove unused variable.
|
2014-09-25 12:06:09 +02:00 |
Max Neunhoeffer
|
85b2e7bfe3
|
Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel
|
2014-09-25 11:57:06 +02:00 |
Max Neunhoeffer
|
f1483a4ea0
|
Optimize/debug HTTP API for queries and AqlItemBlock serialisation.
|
2014-09-25 11:47:50 +02:00 |
James
|
3d6dc1eddc
|
added missing hasMore method to GatherBlock, starting for ScatterBlock.
|
2014-09-25 09:41:27 +01:00 |
James
|
a953ff8bcd
|
skipSome method for GatherBlock.
|
2014-09-25 08:56:43 +01:00 |
Max Neunhoeffer
|
9079ba3971
|
Finish HTTP API.
|
2014-09-25 00:14:57 +02:00 |
Max Neunhoeffer
|
f6b1e0060e
|
Expose AQL_PARSE via HTTP API under /_api/aql/parse
|
2014-09-25 00:01:07 +02:00 |
Max Neunhoeffer
|
bd02e70e41
|
Expose AQL_EXPLAIN via HTTP API under /_api/aql/explain.
|
2014-09-24 23:49:55 +02:00 |
Max Neunhoeffer
|
20f345ccdd
|
Fix automatic expiry of queries.
|
2014-09-24 23:12:23 +02:00 |
Jan Steemann
|
dd53bc295a
|
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
|
2014-09-24 17:14:50 +02:00 |
Jan Steemann
|
9fe3fedb45
|
unique_ptr
|
2014-09-24 17:14:37 +02:00 |
Max Neunhoeffer
|
bfc8b14a87
|
More HTTP methods for queries. Expire queries.
|
2014-09-24 16:51:35 +02:00 |
Max Neunhoeffer
|
85ce0f0674
|
Remove some empty comments.
|
2014-09-24 16:27:45 +02:00 |
Max Neunhoeffer
|
37894bc628
|
Fix expireQueries.
|
2014-09-24 16:27:02 +02:00 |
Max Neunhoeffer
|
afc54a07a9
|
Implement expireQueries in QueryRegistry.
|
2014-09-24 16:26:31 +02:00 |
Max Neunhoeffer
|
784a299ab8
|
Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel
|
2014-09-24 16:17:44 +02:00 |
Max Neunhoeffer
|
cf5e1be91e
|
Version version of HTTP API done.
|
2014-09-24 16:17:18 +02:00 |
Jan Steemann
|
c8fba4c9be
|
fixes for Visual Studio
|
2014-09-24 15:41:26 +02:00 |
Jan Steemann
|
0320366612
|
fixed compile warnings
|
2014-09-24 13:35:26 +02:00 |
Jan Steemann
|
72f5ce8ddc
|
Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into devel
|
2014-09-24 13:34:06 +02:00 |
Jan Steemann
|
d5fb057603
|
less locking
|
2014-09-24 13:32:39 +02:00 |
Jan Steemann
|
1e66c86d08
|
fixed invalid document access
|
2014-09-24 12:27:36 +02:00 |
James
|
c1742a9949
|
GatherBlock non-simple case implemented.
|
2014-09-24 11:17:05 +01:00 |
Jan Steemann
|
dbf964e204
|
small optimizations
|
2014-09-24 12:09:13 +02:00 |
James
|
37cfa73081
|
first attempt at GatherBlock::nextValue
|
2014-09-24 10:21:08 +01:00 |
Jan Steemann
|
ddfb5c965d
|
merged experimental features
|
2014-09-24 09:42:16 +02:00 |
James
|
b4f0df3caf
|
Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2
|
2014-09-24 08:31:01 +01:00 |
James
|
26e1f40b32
|
fixing count/remaining for GatherBlock.
|
2014-09-24 08:30:42 +01:00 |
Max Neunhoeffer
|
e8e60106f3
|
Add quotes for id attribute and add closeTransaction.
|
2014-09-24 00:27:12 +02:00 |
Max Neunhoeffer
|
063665162e
|
Add closing and reopening of transactions.
|
2014-09-24 00:26:56 +02:00 |
Max Neunhoeffer
|
ce041b63d4
|
Add Json-serialisation of AqlItemBlocks.
|
2014-09-24 00:26:17 +02:00 |
James
|
5362ff3203
|
adding skipSome method for GatherBlock.
|
2014-09-23 18:06:08 +01:00 |
James
|
838290381b
|
cleaning up.
|
2014-09-23 17:46:08 +01:00 |
James
|
d9725b037b
|
about to delete some junk
|
2014-09-23 17:35:41 +01:00 |
James
|
b7a1247252
|
adding variables/sort direction in _elements to GatherNode.
|
2014-09-23 17:31:27 +01:00 |
James
|
6f8516e818
|
Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2
|
2014-09-23 17:22:31 +01:00 |
Max Neunhoeffer
|
1f74a64b58
|
Implement POST for HTTP API for queries.
|
2014-09-23 16:51:03 +02:00 |
Max Neunhoeffer
|
cd36c00712
|
Cleanup the cleanup of a failed query preparation execution.
|
2014-09-23 15:31:42 +02:00 |
Max Neunhoeffer
|
36e8ab4608
|
Fix handling of plans in explain()
|
2014-09-23 15:29:14 +02:00 |
Max Neunhoeffer
|
5238686ee3
|
Make Queries preparable and then executable separately.
|
2014-09-23 15:23:10 +02:00 |
Max Neunhoeffer
|
6732913e71
|
Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2
|
2014-09-23 13:16:24 +02:00 |
Max Neunhoeffer
|
067dd690f9
|
More progress with HTTP API for queries.
|
2014-09-23 13:16:10 +02:00 |
Jan Steemann
|
f8599b0f0f
|
removed unused instance variable
|
2014-09-23 13:14:53 +02:00 |
James
|
54e8caba4d
|
interim commit.
|
2014-09-23 11:27:25 +01:00 |
James
|
42ab416497
|
count, remaining, getBlock for GatherBlock.
|
2014-09-23 10:10:24 +01:00 |
James
|
6bf9c1d461
|
stub for GatherBlock.
|
2014-09-23 09:14:33 +01:00 |
Jan Steemann
|
009396f7b0
|
Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2
Conflicts:
arangod/V8Server/v8-wrapshapedjson.cpp
|
2014-09-23 08:35:32 +02:00 |
Jan Steemann
|
80f18ad4b9
|
fixed copy-on-write for shaped json
|
2014-09-23 00:07:46 +02:00 |
Jan Steemann
|
92f87c19ce
|
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2
Conflicts:
arangod/V8Server/v8-vocbase.cpp
|
2014-09-22 23:51:16 +02:00 |
Max Neunhoeffer
|
591f7acb8b
|
Fix problems with variable bounds.
|
2014-09-22 23:30:22 +02:00 |
Thomas Schmidts
|
e99a12c339
|
Fixed error in Documentation and changed visualization of deprecated chapters
|
2014-09-22 17:44:52 +02:00 |
Jan Steemann
|
b75af455e4
|
fixed property query
|
2014-09-22 17:22:01 +02:00 |
Jan Steemann
|
79c584d362
|
less memory usage for ShapedJson documents
|
2014-09-22 16:43:31 +02:00 |
Jan Steemann
|
067f253dd5
|
changed interface for locking
Conflicts:
arangod/VocBase/transaction.cpp
|
2014-09-22 09:25:49 +02:00 |
Max Neunhoeffer
|
5e534261e2
|
Change _equality detection.
ATTENTION: This is still not right, yet.
Pondering about solution...
|
2014-09-22 08:40:21 +02:00 |
Jan Steemann
|
74c9653f6f
|
fixed range-info equality flag after fusing
|
2014-09-19 22:07:06 +02:00 |
Jan Steemann
|
38fdaa4066
|
removed unused function parameter
|
2014-09-19 20:28:41 +02:00 |
Jan Steemann
|
50e17b8c4f
|
disabled optimization due to failing tests
|
2014-09-19 19:30:57 +02:00 |
Jan Steemann
|
a58c8661b5
|
added some query statistics
|
2014-09-19 18:47:33 +02:00 |
Jan Steemann
|
9699091466
|
optimize IN and NOT IN with one or no members
|
2014-09-19 18:22:01 +02:00 |
Jan Steemann
|
ae5f454bfc
|
added unary operator
|
2014-09-19 17:46:36 +02:00 |
Jan Steemann
|
9f08e441fd
|
Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2
|
2014-09-19 17:41:13 +02:00 |
Jan Steemann
|
92e46b8191
|
use SimpleExpression for more types of expressions
|
2014-09-19 17:40:47 +02:00 |
Max Neunhoeffer
|
51aff683d9
|
Some more code for HTTP API for AQL.
|
2014-09-19 16:49:55 +02:00 |
Jan Steemann
|
3d686d4028
|
test
|
2014-09-19 16:07:22 +02:00 |
Jan Steemann
|
9a6dfa1db2
|
execute several types of expressions in C++
|
2014-09-19 15:21:01 +02:00 |
Max Neunhoeffer
|
94bcd23070
|
Set up relevant HTTP methods for AQL.
|
2014-09-19 14:28:54 +02:00 |
Max Neunhoeffer
|
c5f5cb322a
|
Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2
|
2014-09-19 13:59:05 +02:00 |
Max Neunhoeffer
|
697dc64b58
|
Add a QueryRegistry in the ArangoServer and hand it on.
|
2014-09-19 13:56:46 +02:00 |
Max Neunhoeffer
|
0466873092
|
First step towards correct setup of HTTP API for AQL.
|
2014-09-19 13:14:19 +02:00 |
Max Neunhoeffer
|
28818a1f3d
|
Remove debugging output.
|
2014-09-19 13:00:46 +02:00 |
Jan Steemann
|
64f5b22e4f
|
changed interface for locking
|
2014-09-19 12:45:29 +02:00 |
Jan Steemann
|
109941207f
|
reserve more memory for result set
|
2014-09-19 12:45:08 +02:00 |
Jan Steemann
|
1d87957b40
|
reserve enough memory for simple lists & arrays
|
2014-09-19 12:44:46 +02:00 |
Jan Steemann
|
76aaed94a0
|
make interface more user-friendly
|
2014-09-19 12:44:29 +02:00 |
Jan Steemann
|
1ed4e20ba1
|
nullptr
|
2014-09-19 12:02:34 +02:00 |
Jan Steemann
|
b10c45af3e
|
fixed compile warning
|
2014-09-19 09:22:55 +02:00 |
Jan Steemann
|
95c9a0ccba
|
fixed compile warnings
|
2014-09-19 09:15:26 +02:00 |
Jan Steemann
|
68232715f1
|
fixed compile warning
|
2014-09-19 09:05:52 +02:00 |
Jan Steemann
|
f782e81661
|
Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2
|
2014-09-19 01:02:51 +02:00 |
Jan Steemann
|
6f4e799ccc
|
added `profile` option
|
2014-09-19 01:02:39 +02:00 |
Max Neunhoeffer
|
327c5264c5
|
Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2
|
2014-09-19 00:37:17 +02:00 |
Max Neunhoeffer
|
68f246a09f
|
Add a REST handler for AQL (queries/cursors).
|
2014-09-19 00:36:57 +02:00 |
Jan Steemann
|
a2ac4e5be6
|
Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2
|
2014-09-18 23:56:51 +02:00 |
Jan Steemann
|
0b5c5ae3df
|
added `maxNumberOfPlans` option
|
2014-09-18 23:56:09 +02:00 |
Max Neunhoeffer
|
05be135afe
|
Add explicit namespace for template specialisation.
|
2014-09-18 23:32:33 +02:00 |
Jan Steemann
|
d03faffc53
|
remove subqueries that produce results that are not used in a query
|
2014-09-18 23:03:43 +02:00 |
Jan Steemann
|
3f5259d50c
|
removed unnecessary trampoline functions
|
2014-09-18 22:26:04 +02:00 |
Jan Steemann
|
1fff0ecac2
|
optimization for recovery of collections that are going to be dropped anyway
|
2014-09-18 18:20:56 +02:00 |
Jan Steemann
|
2fe6d8f554
|
Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2
|
2014-09-18 17:48:17 +02:00 |
Jan Steemann
|
1016debd2e
|
more robust recovery
|
2014-09-18 17:47:37 +02:00 |
Max Neunhoeffer
|
7b3764125c
|
Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2
|
2014-09-18 16:51:09 +02:00 |
Max Neunhoeffer
|
b4af145317
|
Add QueryRegistry.
|
2014-09-18 16:50:59 +02:00 |
Jan Steemann
|
4a2693cebd
|
removed #if
|
2014-09-18 13:23:38 +02:00 |
Jan Steemann
|
50571f84db
|
changed node detection for cluster
|
2014-09-18 13:21:58 +02:00 |
Max Neunhoeffer
|
60dc29ef43
|
Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2
|
2014-09-18 11:26:48 +02:00 |
Max Neunhoeffer
|
f36187b052
|
Do some changes suggested by people in the C++ UG DUS.
|
2014-09-18 11:07:44 +02:00 |
Jan Steemann
|
0a89693345
|
unique_ptr
|
2014-09-18 09:58:35 +02:00 |
Max Neunhoeffer
|
ce2f822521
|
Merge branch 'aql1' of ssh://github.com/triAGENS/ArangoDB into aql2
|
2014-09-18 09:12:25 +02:00 |
Jan Steemann
|
5c552d4137
|
optimizer rule for scatter / gather
|
2014-09-17 17:29:36 +02:00 |
Max Neunhoeffer
|
ae5d231c5d
|
Add a comment.
|
2014-09-17 16:43:40 +02:00 |
Max Neunhoeffer
|
e054b738c9
|
Take out some debugging messages.
|
2014-09-17 16:41:49 +02:00 |
Jan Steemann
|
2202d672e7
|
fixed memleak
|
2014-09-17 16:01:06 +02:00 |
Jan Steemann
|
bd62c36771
|
scatter / gather 0.0
|
2014-09-17 16:00:54 +02:00 |
Jan Steemann
|
be81bef10c
|
Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2
|
2014-09-17 14:31:51 +02:00 |
Jan Steemann
|
db70b9bfcb
|
added not-yet used nodes for remote, scatter and gather
|
2014-09-17 14:31:37 +02:00 |
Max Neunhoeffer
|
3c675fee44
|
Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2
|
2014-09-17 14:08:18 +02:00 |
Max Neunhoeffer
|
2cdc5f4cd7
|
Fix skiplistback-ung and usage in AQL.
|
2014-09-17 14:07:23 +02:00 |
Jan Steemann
|
e5e2cfe4da
|
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2
Conflicts:
arangod/V8Server/v8-vocbase.cpp
|
2014-09-17 11:50:42 +02:00 |
Jan Steemann
|
d3f4f05df1
|
issue #1020
|
2014-09-17 11:42:01 +02:00 |
Jan Steemann
|
b9f140e044
|
removed unused code
|
2014-09-17 11:31:05 +02:00 |
Jan Steemann
|
ebb7db28d1
|
removed unused code
|
2014-09-17 11:25:06 +02:00 |
Jan Steemann
|
654c2ba0fe
|
backwards iteration, not yet working
|
2014-09-17 00:40:24 +02:00 |
Jan Steemann
|
93ed0f2255
|
added reverse iteration for skiplists
|
2014-09-16 22:23:40 +02:00 |
Jan Steemann
|
85c96f2113
|
simplified hash index functions
|
2014-09-16 20:22:12 +02:00 |
Jan Steemann
|
5f91c8852b
|
consistency
|
2014-09-16 19:56:31 +02:00 |
Jan Steemann
|
3c0723e244
|
slight speedup for hash index
|
2014-09-16 19:46:24 +02:00 |
Willi Goesgens
|
c71d142b51
|
We missed to output the modification options vector.
|
2014-09-16 18:25:41 +02:00 |
Max Neunhoeffer
|
fcab5b9357
|
Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2
|
2014-09-16 17:03:58 +02:00 |
Jan Steemann
|
5c820cea34
|
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2
Conflicts:
arangod/V8Server/v8-vocbase.cpp
|
2014-09-16 16:33:47 +02:00 |
Jan Steemann
|
f0b2a9e946
|
removed index_iterator
|
2014-09-16 16:23:55 +02:00 |
Max Neunhoeffer
|
0d5a1bf354
|
Merge branch 'skiplistback' into aql2
|
2014-09-16 16:16:22 +02:00 |
Max Neunhoeffer
|
7b100ef30a
|
Unuse index-iterator.h
|
2014-09-16 16:15:55 +02:00 |
Jan Steemann
|
992ac23450
|
fixed ranges
|
2014-09-16 15:48:33 +02:00 |
Jan Steemann
|
83819407ba
|
Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2
|
2014-09-16 15:10:59 +02:00 |
Jan Steemann
|
54b5e7b034
|
slightly improved access to dynamic bounds
|
2014-09-16 15:10:43 +02:00 |
Max Neunhoeffer
|
aa584e6c86
|
Merge branch 'aql2' into skiplistback
|
2014-09-16 14:57:35 +02:00 |
Max Neunhoeffer
|
2b18e0379f
|
C++-ize skip lists and introduce a backward link.
|
2014-09-16 14:57:16 +02:00 |
Willi Goesgens
|
0d376ab37a
|
Errormessages: show which execution state we're in so the user can better tell appart runtime from syntax errors.
|
2014-09-16 11:05:43 +02:00 |
Max Neunhoeffer
|
23dc7ef617
|
Fix the AqlValue Range type leak.
|
2014-09-16 10:25:25 +02:00 |
Frank Celler
|
b7278820ce
|
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
|
2014-09-15 23:18:35 +02:00 |
Frank Celler
|
c577193ae4
|
added log of exception
|
2014-09-15 23:18:10 +02:00 |
Jan Steemann
|
6fad76928d
|
Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2
|
2014-09-15 18:17:53 +02:00 |
Jan Steemann
|
677e681b23
|
adjusted test
|
2014-09-15 18:17:42 +02:00 |
Jan Steemann
|
60f2136b8d
|
fixed reporting error position in queries with newlines
|
2014-09-15 18:17:20 +02:00 |
Willi Goesgens
|
7e44fa03d0
|
Try to add a human readable representation to an expression if it throws.
|
2014-09-15 16:44:55 +02:00 |
Max Neunhoeffer
|
6cf8b0cf75
|
Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2
|
2014-09-15 16:16:33 +02:00 |
Max Neunhoeffer
|
855a695764
|
Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2
Conflicts:
arangod/Aql/ExecutionBlock.cpp
arangod/Aql/RangeInfo.cpp
arangod/Aql/RangeInfo.h
|
2014-09-15 16:16:21 +02:00 |
Jan Steemann
|
bc7c7c5c60
|
fixed construction of bounds from json
|
2014-09-15 16:11:59 +02:00 |
Max Neunhoeffer
|
77d6f41b5c
|
Fix more bugs in variable bounds.
|
2014-09-15 16:10:54 +02:00 |
Max Neunhoeffer
|
7e09d9a39e
|
Make more const.
|
2014-09-15 16:10:47 +02:00 |
Max Neunhoeffer
|
e0cc389f23
|
Make more const.
|
2014-09-15 16:08:00 +02:00 |
Jan Steemann
|
2571d075b7
|
Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2
|
2014-09-15 15:29:02 +02:00 |
Jan Steemann
|
a31cb2af30
|
disable sort optimizations under certain conditions
|
2014-09-15 15:28:41 +02:00 |
Willi Goesgens
|
215e9bf1b4
|
Use 'list' in plural variables
|
2014-09-15 15:06:38 +02:00 |