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

5185 Commits

Author SHA1 Message Date
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