Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
20,248 Commits 358 Branches 495 Tags 994 MiB
Commit Graph

5475 Commits

Author SHA1 Message Date
Jan Steemann c18ff7f300 use-index-for-sort rule can now remove sorts in more cases 2015-02-02 22:53:25 +01:00
Jan Steemann e30ddf0df3 fixed indexing test 2015-02-02 20:33:45 +01:00
Jan Steemann 875a695b22 selectivity estimates 2015-02-02 20:14:36 +01:00
Jan Steemann 423d22ed71 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-02-02 18:56:17 +01:00
Frank Celler 23e66107a5 moved try/catch into a block 2015-02-02 17:07:31 +01:00
Jan Steemann 39603ebaf4 added selectivity estimates for some index types 2015-01-30 23:04:46 +01:00
Willi Goesgens 2333d8d3ad Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2015-01-30 16:47:12 +01:00
Willi Goesgens 5e1720132f Stacktraces & asserts for windows too. 2015-01-30 16:46:56 +01:00
Max Neunhoeffer 600cef8ec4 Merge branch 'devel' of ssh://github.com/arangodb/arangodb into devel 2015-01-30 15:25:16 +01:00
Max Neunhoeffer 45903b0c79 Silence a few unnecessary error logs. 2015-01-30 15:24:34 +01:00
Max Neunhoeffer a5728d6793 Get rid of unnecessary warning about _lockedShards. 2015-01-30 15:04:39 +01:00
Jan Steemann 8273970856 fixed leak 2015-01-30 12:37:31 +01:00
Jan Steemann e13092168d added optimizer tests 
Conflicts:
	arangod/Aql/ExecutionBlock.cpp
 2015-01-29 21:40:43 +01:00
Willi Goesgens ba387a0483 Initialize the platform pointer. 2015-01-29 19:02:31 +01:00
Willi Goesgens e666fd6dfc Properly shut down V8 to make Valgrind happy 2015-01-29 17:31:30 +01:00
Jan Steemann 2ad6f4179f fixed leak 2015-01-29 15:37:23 +01:00
Jan Steemann bac987ea00 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2015-01-29 15:32:27 +01:00
Jan Steemann ddc8e52a59 fixed leak 2015-01-29 15:31:55 +01:00
Frank Celler a03ce44254 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2015-01-29 15:21:21 +01:00
Frank Celler 7aa4591678 arangod/Aql/Expression.cpp 2015-01-29 15:21:14 +01:00
Frank Celler 94884d3f5a silenced warning 2015-01-29 15:19:28 +01:00
Jan Steemann 4142169526 fixed spurious errors when accessing a local collection from a cluster DB server 
Conflicts:
	arangod/Aql/Collection.cpp
	arangod/Aql/ExecutionBlock.cpp
	arangod/Aql/Index.h
 2015-01-29 13:06:01 +01:00
Jan Steemann 39d72b1530 more sanity checks on startup & shutdown 2015-01-29 09:51:11 +01:00
Willi Goesgens b4ba07f765 If arangod doesn't successfully initialise ICU on startup it will now abort. 2015-01-28 17:32:59 +01:00
Thomas Schmidts f21a26c2c1 Merge pull request #1228 from stackmagic/tickdoc 
replication dump response doc detail
 2015-01-28 16:37:00 +01:00
Max Neunhoeffer e24278828c Changes to cluster startup for mesos cooperation. 
This simplifies the cluster startup by introducing a further agency
lookup step using "local info" to find the "id". This allows an external
discovery process (see scripts/discover.js as an example) to configure
a new server in the cluster dynamically when it starts up.

New GNUmakefile targets
  pack-tar-config
  pack-tar
 2015-01-28 12:58:24 +01:00
Patrick Huber 387c7686e7 document how the http status code and lastincluded http headers relate to each other 2015-01-28 11:04:18 +01:00
Willi Goesgens 293a3fe7d3 Differenciate whether we fail to locate or execute a script in error messages. 2015-01-27 12:25:40 +01:00
Jan Steemann 7af624e2f0 selectivty, try 0 2015-01-27 09:34:04 +01:00
Jan Steemann 8a5d7d9085 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2015-01-27 09:25:02 +01:00
Jan Steemann 9c8af4f751 shutdown order 2015-01-26 16:43:22 +01:00
Jan Steemann eb5b379a55 lookup by id, too 2015-01-26 10:27:30 +01:00
Jan Steemann c49986d0e8 preparation for conditions 2015-01-25 10:40:13 +01:00
Jan Steemann 844582865f more accurate subquery cost estimation 2015-01-24 16:47:09 +01:00
Jan Steemann 02af05c50a use different cluster test methods 2015-01-24 14:08:16 +01:00
Jan Steemann a327016312 added method for cluster test 2015-01-24 14:07:06 +01:00
Jan Steemann 6a433177c0 use Escape 2015-01-24 14:06:20 +01:00
Jan Steemann ef61b53184 use TRI_AddressVector 2015-01-24 14:05:38 +01:00
Jan Steemann f732dce7b5 changed assertion types 2015-01-24 14:04:27 +01:00
Jan Steemann 81a74f4c7f use TRI_AddressVector 2015-01-24 14:03:41 +01:00
Jan Steemann 5aa3d09085 fixed wrong comment 2015-01-24 14:03:12 +01:00
Jan Steemann 0d8bf44215 gc adjustment 2015-01-23 20:51:42 +01:00
Jan Steemann 0f94293efd shutdown time 2015-01-23 18:56:01 +01:00
Jan Steemann 5d12a3da3b garbage collection 2015-01-23 16:45:00 +01:00
Jan Steemann 7db19894ca do not pass name in TRI_ERROR_ARANGO_ILLEGAL_NAME 2015-01-23 12:38:40 +01:00
Jan Steemann 81db41763f foxx file upload 2015-01-23 11:23:58 +01:00
Jan Steemann d348f60e59 added AQL optimizer rule "move-calculations-down" 2015-01-22 20:36:38 +01:00
Jan Steemann a5ff6aa05e more accurate cost estimation for EnumerateListNode 
fixed typos
 2015-01-22 19:35:21 +01:00
Jan Steemann fd3e123253 optimizations for AST node flagging and V8 object creation 2015-01-22 19:35:20 +01:00
Jan Steemann bdb50d873e fixed method comments 2015-01-22 19:35:20 +01:00
Willi Goesgens bdbfeb9a15 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2015-01-22 18:08:32 +01:00
Jan Steemann 87b1f7fde3 enable indexes in even more cases 2015-01-22 17:24:47 +01:00
Jan Steemann 70fba85a67 enforce an error code 2015-01-22 15:20:57 +01:00
Jan Steemann 1c935b6ab2 added tests for filter order, not optimization etc. 2015-01-22 14:16:58 +01:00
Jan Steemann 8aeded5c86 fixed documentation 2015-01-22 13:36:01 +01:00
Jan Steemann f75e4dfbb3 issue #1219: /_api/replication/logger-state clients field 2015-01-22 11:06:55 +01:00
Willi Goesgens ab29510f44 Add the collection names which we didn't find to the exception message. 2015-01-21 15:06:13 +01:00
Willi Goesgens 854f733c49 Exceptions: 
- Assert that the associated errorcode has format options so if you call a THROW-macro with parameters these don't get lost unheard.
  - Add new macro which offers format strings, so you can throw standard errors with custom messages.
 2015-01-21 15:03:21 +01:00
Jan Steemann 14e82da2b0 fixed leak 2015-01-19 22:25:16 +01:00
Willi Goesgens b1f881254d Upgrade V8 to 3.31.74.1 2015-01-19 19:29:31 +01:00
Jan Steemann d534a41e21 recovery tests 
Conflicts:
	arangod/Wal/LogfileManager.cpp

Conflicts:
	arangod/Wal/LogfileManager.cpp
 2015-01-19 18:14:03 +01:00
Jan Steemann ee51a8ebfd added more tests for indexes 2015-01-19 11:10:57 +01:00
Jan Steemann 86716e1834 fix subquery optimization 2015-01-19 11:01:32 +01:00
Jan Steemann 7d41861fed constified methods 2015-01-18 21:11:22 +01:00
Jan Steemann 63bf4c888a flush WAL status file after collection to shorten recovery 2015-01-18 21:06:57 +01:00
Jan Steemann 1003e52cf7 some cleanup 2015-01-18 16:41:48 +01:00
Jan Steemann 958ae69479 added tests 2015-01-18 15:34:35 +01:00
Jan Steemann a7538ca6e3 lazy hash index iteration 2015-01-18 03:25:06 +01:00
Jan Steemann cacaddd5e0 less copying hash index results 2015-01-18 00:52:41 +01:00
Jan Steemann 9b66ab3a61 added AQL functions MD5, SHA1, and RANDOM_TOKEN 2015-01-17 22:40:47 +01:00
Jan Steemann 685d03f0d7 some cleanup 2015-01-17 19:35:11 +01:00
Jan Steemann 18467b0d66 less memory allocations when parsing AQL queries 2015-01-17 18:12:56 +01:00
Jan Steemann 823369c815 disable the use of indexes in certain unsafe situations 2015-01-17 17:45:36 +01:00
Jan Steemann eac7ce5d13 removed unused define 2015-01-16 21:58:13 +01:00
Jan Steemann 5ce1735372 use TRI_UNKNOWN_MEM_ZONE 2015-01-16 20:40:08 +01:00
Jan Steemann ba783a4584 allow specifying minLength and maxLengths for PATHS AQL function 2015-01-16 12:34:11 +01:00
Jan Steemann 578afe98d9 removed documentation for removed methods 2015-01-15 23:06:04 +01:00
Jan Steemann b9c52dca9e fix for intermittent 404 errors in Foxx and other actions 2015-01-15 23:06:04 +01:00
Jan Steemann 957fa189d2 better diagnostics for arangoimp 2015-01-15 13:42:31 +01:00
Jan Steemann 2d7a7b87aa move variable declarations to usage 2015-01-13 20:46:33 +01:00
Jan Steemann b54dfae96f removed several JSON functions 2015-01-13 01:31:04 +01:00
Jan Steemann 44bbc2164c less string allocation when parsing numbers 2015-01-12 23:42:24 +01:00
Jan Steemann e5b0c11234 preallocate string buffer 2015-01-12 23:40:33 +01:00
Jan Steemann 691623e905 less code 2015-01-12 19:45:08 +01:00
Jan Steemann 04bdf59ca3 fixed memleaks 2015-01-12 18:19:35 +01:00
Jan Steemann 2cbc278e6c finally 2015-01-12 14:23:26 +01:00
Jan Steemann d02de8d7e0 more tests 2015-01-12 11:59:19 +01:00
Max Neunhoeffer 892f11d2e8 Clarify code for cluster modififying AQL. 2015-01-12 10:37:06 +01:00
Jan Steemann 2d0a37d826 automatically create _keys in DistributeNode on insert 2015-01-12 10:33:05 +01:00
Jan Steemann 2de9760820 fixed empty error message 2015-01-09 23:29:36 +01:00
Jan Steemann cba74d0803 fixed memleaks 2015-01-09 18:27:59 +01:00
Jan Steemann 25d30c2b96 indentation 2015-01-09 16:51:00 +01:00
Jan Steemann 99fd370ebd added missing arguments in constructor 2015-01-09 14:15:44 +01:00
Jan Steemann 5e48769311 fixed crash on test shutdown 2015-01-09 14:12:24 +01:00
Jan Steemann 080c66cfe9 fixed invalid member access 2015-01-09 10:40:33 +01:00
Jan Steemann 8683b1f613 documentation for data-modification operations with return values 2015-01-08 23:16:37 +01:00
Willi Goesgens a145d2bd9d Ups, if we don't throw but break, we mustn't leave the context twice. 2015-01-08 18:18:46 +01:00
Willi Goesgens aa1cdc09e2 Make shure we leave all contexts we open in the propper sequence. 2015-01-08 17:53:13 +01:00
Jan Steemann ec1c671d20 added derived file 2015-01-08 17:23:02 +01:00
Jan Steemann 0aa4ac137a fixed compile warning 2015-01-08 17:22:47 +01:00
Jan Steemann 1e32056ce5 change precedence of NOT IN 2015-01-08 17:22:33 +01:00
Jan Steemann 5498ab0aeb added derived file 2015-01-08 16:41:30 +01:00
Jan Steemann 5f4fe21681 added asserts for context locker 2015-01-08 16:41:12 +01:00
Jan Steemann 08df3e503a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2015-01-08 16:36:15 +01:00
Jan Steemann f2590881f1 return old or new values in data-modification operations 2015-01-08 16:35:54 +01:00
Willi Goesgens 9e26914696 After freeing the locker, null its struct member so we remain to know its gone. 2015-01-08 16:20:30 +01:00
Jan Steemann 74bb6b6dc3 fix isolates and contexts 2015-01-07 18:15:29 +01:00
Jan Steemann 8fa9341d7d added derived files 2015-01-07 17:44:32 +01:00
Jan Steemann 064d066462 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2015-01-07 17:41:09 +01:00
Jan Steemann 9cb3feefc6 propertly cast 2015-01-07 17:40:58 +01:00
Jan Steemann be4512fad3 removed duplicate method 2015-01-07 17:40:40 +01:00
Willi Goesgens e2f206fd2c Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	arangod/Aql/grammar.cpp
 2015-01-07 15:50:44 +01:00
Willi Goesgens f905123802 Implement REMOVE/INSERT/UPDATE/REPLACE return the changed values 2015-01-07 15:48:13 +01:00
Jan Steemann c591357dd3 slightly changed cost estimation for IndexRangeNode 2015-01-07 15:11:42 +01:00
Jan Steemann 2148e695f4 added derived files 2015-01-07 10:42:35 +01:00
Jan Steemann 89d9a538fc renamed tokens 2015-01-07 10:42:22 +01:00
Jan Steemann ad812c47db added derived file 2015-01-07 09:43:43 +01:00
Jan Steemann 62696b6984 prerequisites for further COLLECT optimizations 2015-01-07 09:42:46 +01:00
Jan Steemann ac0bb85c3d issue #1201: better error checking for fulltext index with multiple attributes 2015-01-05 09:41:56 +01:00
Jan Steemann f3b142849f fixed leaks during reverts 2015-01-03 01:28:23 +01:00
Jan Steemann 58edf3fee7 comments 2015-01-02 20:00:08 +01:00
Jan Steemann 8333591e3f issue #1199: Cannot unlink root node of plan 2015-01-02 17:38:33 +01:00
Jan Steemann cc0a4cdb4f issue #1200: fixed short-circuiting of [*] operator 
Conflicts:
	arangod/Aql/grammar.cpp

Conflicts:
	arangod/Aql/grammar.cpp
 2015-01-02 13:49:51 +01:00
Jan Steemann 0768c3cb38 fixed segfault 2015-01-02 09:10:28 +01:00
Max Neunhoeffer a976da2a07 Fix an issue in the cluster AQL where UPDATE d._key WITH ... did not work. 2014-12-24 01:23:48 +01:00
Max Neunhoeffer cf94935ebc Fix a bug in optimizer rule for DistributeNode. 2014-12-24 00:43:38 +01:00
Max Neunhoeffer 910f0d2e28 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-12-24 00:20:41 +01:00
Max Neunhoeffer 20424bd642 Fix a bug in modifying AQL when REPLACE/UPDATE uses DistributeNode. 2014-12-24 00:18:39 +01:00
Frank Celler 6c7a51127f Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-12-23 23:41:26 +01:00
Max Neunhoeffer 6fe1fb8568 Fix modifying AQL in cluster. 2014-12-23 22:44:01 +01:00
Max Neunhoeffer 1cdf439845 Broken version, errors not yet fixed. 2014-12-23 16:51:48 +01:00
Frank Celler 1748e403e4 added TRI_FORCE_ARMV6 2014-12-23 16:31:20 +01:00
Max Neunhoeffer 4634ad366e Take out some more debugging output. 2014-12-23 14:52:07 +01:00
Max Neunhoeffer 05c069f361 Another fix for the distributed locking problem in cluster AQL. 2014-12-23 14:35:19 +01:00
Max Neunhoeffer 1782039138 Fix cluster-wide locking for AQL. 2014-12-22 16:21:45 +01:00
Max Neunhoeffer 797c15b753 Fix two compiler warnings. 2014-12-22 14:51:28 +01:00
Max Neunhoeffer e50a705d9a Squashed commit of the following: organise locking in distributed AQL 
Locking is now done in an extra round after the query is fully
instanciated in the cluster. All participating shards are locked
in alphabetical order of their shard ID (local collection name).
For this to work there is a new action in the RestAqlHandler plus a
mechanism to prevent the usual locking from happening: Each thread has a
thread local static class variable of
  triagens::arango::Transaction::_makeNolockHeaders
which is of type std::unordered_set<std::string>*.
Whenever this is not equal to nullptr and a local collection name is
stored in there, no locking or unlocking takes place. This information
is forwarded by the X-Arango-Nolock HTTP header, whenever an HTTP
request is sent via ClusterComm to a shard.
 2014-12-22 14:40:22 +01:00
Jan Steemann 8412e3d89a removed sort expressions that are constants 2014-12-21 19:47:50 +01:00
Jan Steemann 6d6d67f06f activated optimizer rule remove-sort-rand 
fixed tests, updated documentation
 2014-12-21 18:50:50 +01:00
Jan Steemann d358b80080 ES6 2014-12-20 04:02:24 +01:00
Jan Steemann 19d2d6668f added random iteration for collections 2014-12-19 18:01:13 +01:00
Jan Steemann a82ac45190 fixed tests on ARM 2014-12-19 17:59:36 +01:00
Jan Steemann fd5a723f30 removed deprecated methods 2014-12-19 14:00:58 +01:00
Jan Steemann d92057dd03 the great rename: array => object, list => array 2014-12-18 22:33:23 +01:00
Jan Steemann 20e7fe7a7a the great rename: array => object, list => array 2014-12-18 21:07:06 +01:00
Jan Steemann 0c38d60732 less replacements in flex output 2014-12-17 17:26:37 +01:00
Jan Steemann a56ad5df36 fixed unintentionally broken tests 2014-12-17 14:44:18 +01:00
Willi Goesgens a6481cd1a7 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-12-17 14:32:35 +01:00
Willi Goesgens 807643f000 the context-cope exits the context for us - we don't need to do this anymore by ourselves. 2014-12-17 14:32:03 +01:00
Jan Steemann 2ab3aa998d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-12-17 14:21:37 +01:00
Jan Steemann db1ddb880b wait for sync thread outside of lock 2014-12-17 14:21:24 +01:00
Willi Goesgens fb3ec155a8 Re-Instanciate the context-scope guard were needed. 2014-12-17 13:59:56 +01:00
Jan Steemann dd60e53ce3 added more collect special cases 2014-12-16 22:52:33 +01:00
Jan Steemann 89402bdc79 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-12-16 13:54:59 +01:00
Jan Steemann f35f8d1643 fixed ranges, added tests 2014-12-16 13:54:46 +01:00
Max Neunhoeffer 45cecf44f9 Initialise a few variables to please gcc. 2014-12-16 10:48:07 +01:00
Max Neunhoeffer bf915da2e3 Use an unordered_map for JSBarriers. 2014-12-16 09:57:44 +01:00
Jan Steemann 4e5cde8443 Revert "release version 2.3.0" 
This reverts commit 35d4368ad6f3f4ef8f37a2f43ed18c6c9ae5ccc6.

Conflicts:
	CHANGELOG
	js/apps/system/aardvark/api-docs/batch.json
	js/apps/system/aardvark/api-docs/collection.json
	js/apps/system/aardvark/api-docs/cursor.json
	js/apps/system/aardvark/api-docs/database.json
	js/apps/system/aardvark/api-docs/document.json
	js/apps/system/aardvark/api-docs/edge.json
	js/apps/system/aardvark/api-docs/edges.json
	js/apps/system/aardvark/api-docs/endpoint.json
	js/apps/system/aardvark/api-docs/explain.json
	js/apps/system/aardvark/api-docs/graph.json
	js/apps/system/aardvark/api-docs/index.json
	js/apps/system/aardvark/api-docs/replication.json
	js/apps/system/aardvark/api-docs/simple.json
	js/apps/system/aardvark/api-docs/system.json
	js/apps/system/aardvark/api-docs/tasks.json
	js/apps/system/aardvark/api-docs/traversal.json
	js/apps/system/aardvark/api-docs/version.json
 2014-12-16 01:30:21 +01:00
Jan Steemann 4a60a62028 indentation 2014-12-16 00:30:55 +01:00
Jan Steemann 1a57d587e0 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql-feature-index-or 2014-12-16 00:25:42 +01:00
Jan Steemann 1c65c042a4 added tests, fixed exception 2014-12-16 00:20:40 +01:00
Jan Steemann bcdeabd3ab Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql-feature-index-or 
Conflicts:
	arangod/Aql/ExecutionBlock.cpp
 2014-12-15 21:53:51 +01:00
Jan Steemann ac9836421d removed todo 2014-12-15 21:48:49 +01:00
Jan Steemann 2e77d31d11 removed TODO 2014-12-15 21:47:01 +01:00
Jan Steemann a90ee78ae1 fixed segfault 2014-12-15 20:48:10 +01:00
Willi Goesgens 1c4a72b106 The Big V8 upgrade Merge. 2014-12-15 17:30:56 +01:00
Jan Steemann 04bcf3f362 issue #1184: use error codes more consistently 2014-12-15 16:22:18 +01:00
Jan Steemann 4b12897026 issue #1184: return error codes more consistently 2014-12-15 16:18:49 +01:00
Jan Steemann 5ce6489e7f Merge pull request #1186 from yojimbo87/devel 
Improve edge API docs.
 2014-12-15 09:33:48 +01:00
James f5763be5f4 final clean up 2014-12-13 19:09:18 +00:00
James 17ed7fbef4 sorting works, tests updated 2014-12-13 17:47:59 +00:00
James 0dee54ee6f more bugfixes more tests 2014-12-13 16:05:20 +00:00
James a7635abe41 fixed some bugs added some tests 2014-12-13 14:51:46 +00:00
Jan Steemann 1e83716c1d removed debug output 2014-12-13 12:48:09 +01:00
Jan Steemann 44a5db257d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-12-12 23:02:42 +01:00
Jan Steemann f4d7a57c19 changed `COLLECT...INTO x COUNT` to `COLLECT...WITH COUNT INTO x` 
allow executing subqueries without double brackets

jslint
 2014-12-12 23:02:24 +01:00
Willi Goesgens daeb46893f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-12-12 21:40:35 +01:00
Willi Goesgens 115f226385 Optimizer: Enable removing of filternodes if the index can handle the filter condition. 2014-12-12 21:39:35 +01:00
Tomas Bosak 32bc422ad5 Improve edge API docs. 
- create edge operation with 202 result is returned when waitForSync was
set to false
- add missing If-None-Match header parameter description to read head
operation
- add information about _key attribute in result for replace, update and
delete operations
 2014-12-12 17:33:30 +01:00
Jan Steemann 8f6193faa2 added optional COUNT clause for AQL COLLECT 2014-12-12 17:18:04 +01:00
Tomas Bosak 953d5efa7a Add 'mergeObjects' description to edge API docs. 
Description of 'mergeObjects' parameter was missing in edge update
(PATCH) operation.
 2014-12-10 23:24:32 +01:00
James 7ab57d64ec Merge branch 'aql-feature-index-or' of ssh://github.com/triAGENS/ArangoDB into aql-feature-index-or 2014-12-09 22:05:57 +00:00
Jan Steemann 22928c1bb5 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql-feature-index-or 
Conflicts:
	arangod/Aql/ExecutionBlock.cpp
	arangod/Aql/OptimizerRules.cpp
 2014-12-09 22:45:55 +01:00
James 3ce7164fb6 finally working again, and more tests 2014-12-09 20:15:38 +00:00
James 8601dd4424 working again 2014-12-09 16:54:34 +00:00
James 35be017bb3 snapshot 2014-12-09 16:44:02 +00:00
Jan Steemann 6aaa5f05a4 nullptr 2014-12-09 16:27:14 +01:00
Jan Steemann 2fbc53f711 fixed potential leaks 2014-12-09 16:27:05 +01:00
James 4fdd97c9a7 fixed another bug 2014-12-09 14:19:52 +00:00
Jan Steemann d638c1c0c9 fixed choicung 2014-12-09 15:18:53 +01:00
James afb960f60e fixed another bug and added a test for it. 2014-12-09 11:19:34 +00:00
James a4dcf1b9d3 Merge branch 'aql-feature-index-or' of ssh://github.com/triAGENS/ArangoDB into aql-feature-index-or 2014-12-09 10:23:07 +00:00
James 1467b34c5e fixing duplicates in dynamic bounds 2014-12-09 10:19:01 +00:00
Tomas Bosak d0b041842a Update document API description. 
Include information about _key attribute which is also returned along
with _id and _rev for replace, update and delete document operations.
 2014-12-09 10:50:06 +01:00
James 46fe461ca1 fixed bug and added test for it. 2014-12-09 09:40:40 +00:00
Max Neunhoeffer 2d810c27b2 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-12-09 09:59:23 +01:00
Max Neunhoeffer 368530dd5a Fix number of plan cap. 2014-12-09 09:59:07 +01:00
Jan Steemann 6ddaf08ccb fixed potential memleak 2014-12-09 09:47:28 +01:00
Max Neunhoeffer 62f03aa013 Choose skiplistIndex if in doubt. 2014-12-08 16:53:05 +01:00
Max Neunhoeffer f6324dd9ec Fix a comment. 2014-12-08 16:12:40 +01:00