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

1541 Commits

Author SHA1 Message Date
Jan Steemann f35f8d1643 fixed ranges, added tests 2014-12-16 13:54:46 +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 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
Willi Goesgens 1c4a72b106 The Big V8 upgrade Merge. 2014-12-15 17:30:56 +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
Jan Steemann 8f6193faa2 added optional COUNT clause for AQL COLLECT 2014-12-12 17:18:04 +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 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
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 0ccb6dd48c Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-12-08 15:37:37 +01:00
Max Neunhoeffer fc79c31661 More sensible plan management in useIndexRangeNode optimizer rule. 2014-12-08 15:37:01 +01:00
Jan Steemann 399e93c3ff issue #1155: allow bind parameter for sort order 
SORT what @order is now allowed
 2014-12-08 13:05:40 +01:00
Jan Steemann 5d9c8ef49a removed compile warnings 2014-12-08 12:54:44 +01:00
Jan Steemann cd17c393ab Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql-feature-index-or 
Conflicts:
	arangod/Aql/ExecutionBlock.cpp
	arangod/Aql/OptimizerRules.cpp
	arangod/Aql/grammar.cpp
 2014-12-08 12:37:13 +01:00
Jan Steemann b4a0443da7 fixed default behavior of merge 2014-12-08 11:23:05 +01:00
James dca2cc0c34 some further cleaning up 2014-12-06 20:44:56 +00:00
James b2ec5d6f1b more cleaning up 2014-12-06 20:25:14 +00:00
James 53c32616dc removing redundant files 2014-12-06 19:43:24 +00:00
James 37e059fb7a cleaning up 2014-12-06 19:40:04 +00:00
James 62411fa64a another memleak plugged 2014-12-06 19:24:47 +00:00
James ad211c83a5 memleaks 2014-12-06 19:01:16 +00:00
James 454ef10898 fixing last 2014-12-06 16:21:59 +00:00
James bf4b718019 memleaks 2014-12-06 16:18:39 +00:00
James aaacbcf9bb Jan's other patch 2014-12-06 14:23:13 +00:00
James f0bb73982c whitespace 2014-12-06 14:22:52 +00:00
James 8698a1da3d fixing bugs and updating tests 2014-12-06 14:02:50 +00:00
James caaa9435b9 cleaning up 2014-12-06 13:04:50 +00:00