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

12873 Commits

Author SHA1 Message Date
jsteemann deb0ff1110 fix stringification of keys with _id type 2017-02-21 13:43:07 +01:00
jsteemann 511d0b29c7 deactive plan cache as final step before merge 2017-02-21 13:06:34 +01:00
jsteemann ed3a230939 some final cleanup 2017-02-21 13:04:24 +01:00
jsteemann c0c9fa4b19 Merge branch 'devel' of https://github.com/arangodb/arangodb into plan-cache 2017-02-21 12:18:55 +01:00
jsteemann f5c8932744 initial version of query execution plan cache, still very rough 2017-02-21 11:58:38 +01:00
jsteemann 12f1a7af29 fixed issue #2315 2017-02-21 09:11:50 +01:00
Kaveh Vahedipour 4cc830b0df merge from 3.1 2017-02-20 20:05:52 +01:00
Wilfried Goesgens 110e548a9a streamline import process; fix arangoexport 2017-02-20 15:35:34 +01:00
jsteemann 8ce7f6558d simplifications 2017-02-20 09:51:40 +01:00
Michael Hackstein fea2dbad79 Fixed compiler warning in Query.cpp 2017-02-20 09:21:54 +01:00
jsteemann be8d6b0a9e simplifications 2017-02-17 20:55:52 +01:00
jsteemann ea87cc52b7 simplifications 2017-02-17 17:10:13 +01:00
jsteemann 535eca3ae0 make ctor explicit 2017-02-17 15:56:55 +01:00
jsteemann 10ddb52964 remove unused property 2017-02-17 15:41:45 +01:00
jsteemann 3e7432ccd6 clean up write lockers a bit 2017-02-16 15:44:45 +01:00
jsteemann af17235242 fix too early closing of sockets 2017-02-16 15:42:13 +01:00
Max Neunhoeffer e00cf05e08 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2017-02-16 13:43:14 +01:00
Max Neunhoeffer 38812fa9d2 Lower log level to debug in shutdown message. 2017-02-16 13:40:45 +01:00
Jan Christoph Uhde 6ac5aa9691 fix spelling 2017-02-16 13:39:15 +01:00
jsteemann e7a0b181e6 fix potential deadlock 2017-02-16 12:04:36 +01:00
jsteemann a743ec4320 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into devel 2017-02-15 16:55:35 +01:00
Michael Hackstein 94fbfaa453 Moved the entire logic of open() to the Physical collection. It is different for each StorageEngine. 2017-02-15 16:26:55 +01:00
Andreas Streichardt 8de9941df5 Also remove from includes 2017-02-15 16:18:41 +01:00
Andreas Streichardt c8302bc50d Remove useless methods 2017-02-15 16:16:16 +01:00
Michael Hackstein d82e72f7fc Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-15 15:48:39 +01:00
Michael Hackstein c3ff82f4e1 Moved version management to MMFiles collection. Logical does not need to know it. Removed PhysicalCollection inclode from logicical collection. Now we should rebuild less code whan changing sth in storage engine. 2017-02-15 15:48:33 +01:00
jsteemann 97728e51c1 simplifications 2017-02-15 15:19:40 +01:00
jsteemann ce853ffa64 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-15 14:46:58 +01:00
Michael Hackstein 71a004492a Merge branch 'devel' of github.com:arangodb/arangodb into engine-api 2017-02-15 14:35:34 +01:00
Andreas Streichardt 43692a97a2 Fixed unused variable 2017-02-15 14:10:44 +01:00
jsteemann e8a9d1347e attempt to fix build with picky compilers 2017-02-15 13:59:03 +01:00
jsteemann 3f34efc1bb remove _resolver property 2017-02-15 13:13:43 +01:00
jsteemann 09da6bea7f simplify internal APIs 2017-02-15 12:57:43 +01:00
jsteemann 7ff2e19abb Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-15 12:46:06 +01:00
jsteemann 45eb3eb1fd Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-02-15 12:42:19 +01:00
jsteemann d49c5c3fc0 simplified internal APIs a bit 2017-02-15 12:42:07 +01:00
Michael Hackstein cc999641a5 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-15 12:36:53 +01:00
Jan Christoph Uhde be89cac445 move path from logical to physical 2017-02-15 11:43:38 +01:00
jsteemann 112d07f6c2 protect all properties of TransactionState 2017-02-15 11:37:35 +01:00
Michael Hackstein d49cbffc46 Moved revision handling from Logical to MMFiles collection. That is only relevant for MMFiles. 2017-02-15 11:26:58 +01:00
jsteemann f68a793174 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-15 11:15:15 +01:00
jsteemann b6173827c9 remove unused method 2017-02-15 11:15:07 +01:00
jsteemann c69eb0a7d5 protect some properties 2017-02-15 11:14:56 +01:00
Jan Christoph Uhde 174c9543ca disable rocksdb engine in arangod 2017-02-15 11:07:56 +01:00
jsteemann b4027dc02c make property protected 2017-02-15 10:41:34 +01:00
jsteemann ffa5e2aa54 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-02-15 10:26:11 +01:00
jsteemann df3a3eff9f refactoring 2017-02-15 10:26:05 +01:00
Michael Hackstein 9e41a7a6bb Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-15 10:09:55 +01:00
Michael Hackstein 089816a353 Moved Rollback Operation and InsertIntoIndexes from Logical to MMFilesCollection. This is marker/index specific code. 2017-02-15 10:09:51 +01:00
jsteemann 328ff8a09e Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-15 00:09:42 +01:00