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

317 Commits

Author SHA1 Message Date
jsteemann 1c43920bfc preparations for revision() 2017-04-05 13:40:18 +02:00
jsteemann 81dcfbbe3d pass trx into numberDocuments 2017-03-31 11:33:16 +02:00
jsteemann f728fcdbb8 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-29 02:41:00 +02:00
jsteemann e1aef394d8 delete useless DEV_TIMERS, fix rwlockcpp11 2017-03-28 22:38:27 +02:00
jsteemann 7bd6bd6e45 slightly adjusted index creation 2017-03-28 08:46:01 +02:00
jsteemann 2c54a6ac1e added some basic transaction handling 2017-03-24 17:23:32 +01:00
jsteemann b8e011eee5 move attributes into engine 2017-03-21 10:31:50 +01:00
jsteemann 1932fd1975 moved files 2017-03-16 16:45:02 +01:00
Simon Grätzer 1c5c616875 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-15 14:12:18 +01:00
Michael Hackstein 1ebf562c4e Moved MMFiles out of vocbase.cpp 2017-03-14 10:29:17 +01:00
Simon Grätzer 7b35f75b23 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	arangod/CMakeLists.txt
#	arangod/GeneralServer/GeneralServerFeature.cpp
 2017-03-13 12:25:28 +01:00
Michael Hackstein 83663c47b2 Deleted CollectionResult. It is identical to arangodb::Result introduced later. 2017-03-10 17:18:12 +02:00
Michael Hackstein 046793815c Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-03-09 16:37:51 +02:00
Michael Hackstein a7965945d9 Just comment fixes 2017-03-09 12:20:22 +01:00
Michael Hackstein 90b4876d3c Moved WriteMarker code Vocbase => MMFilesEngine. Also removed the decission to write a marker out of Vocbase-API 2017-03-09 11:12:39 +01:00
Simon Grätzer 67066c64ad Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-08 18:20:44 +01:00
jsteemann 3ed19e291d added "shardIds" option for AQL queries to restrict queries to specific shards 2017-03-08 15:07:10 +01:00
Michael Hackstein 580d2a4336 Moved indexes down into the physical collections 2017-03-08 11:03:45 +01:00
Simon Grätzer 2c77f42486 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-07 15:08:06 +01:00
Michael Hackstein e6ab0afb50 Moved indexBuckets from Logical => MMFiles collection. 2017-03-07 14:07:32 +01:00
Michael Hackstein 31df7eb527 Fixed error in recovery for duplicate collection name 2017-03-06 17:34:54 +01:00
Simon Grätzer 080048b080 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-01 15:05:25 +01:00
Simon Grätzer 27c617fe10 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	3rdParty/V8/v8
#	arangod/Transaction/Methods.h
#	arangod/Utils/UserTransaction.h
#	arangod/V8Server/v8-collection.cpp
 2017-03-01 14:52:35 +01:00
Michael Hackstein 26d95cfe80 Fixed dead-lock situation in dump tests 2017-03-01 11:10:51 +01:00
Michael Hackstein 7950270134 Removed obsolete code in LogicalCollection. 2017-02-28 16:08:54 +01:00
Michael Hackstein 900b15dd3a API cleanup in LogicalCollection. Removed some unused exposed toVelocypack functions. Removed toVelocyPack with maxTick variant. That is available in the StorageEngine instead 2017-02-28 15:35:31 +01:00
Michael Hackstein cac32a4d1d Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-28 14:59:13 +01:00
Michael Hackstein df4eadac75 Replaced several specialized toVelocyPack functions of LogicalCollection by toVelocyPackIgnore(). Fixed distributeLike bug that occured through this. 2017-02-28 14:54:32 +01:00
jsteemann 5e0fd0c8b2 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-27 22:27:51 +01:00
jsteemann b872aa59fd simplified performance logging 2017-02-27 22:22:41 +01:00
jsteemann e37e94adbe Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-02-27 14:38:35 +01:00
jsteemann 666b2f8da9 renaming 2017-02-27 14:38:27 +01:00
Michael Hackstein ae14ae99a5 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-27 13:01:12 +01:00
Michael Hackstein a884ee2bfb Intermediate commit. Moved many toVPack functions of LogicalCollection to a unified vpack + ignore-keys alternative. This commit is used to run all tests everywhere. May be red 2017-02-27 13:01:07 +01:00
jsteemann d0df1952e8 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-24 17:51:59 +01:00
Michael Hackstein c8f03d16e3 updateProperties now returns an CollectionResult container with errorMessage and code. Moved error reporting logic for cluster-case into this function. 2017-02-24 17:00:41 +01:00
Michael Hackstein 076198106d Now also the cluster variant of collection properties uses the shared toVPackVariant 2017-02-23 16:40:33 +01:00
Michael Hackstein cc78b0131f v8-collection-properties now reuses propertiesVPack on logical collection (SingleServerCase) 2017-02-23 15:31:13 +01:00
Michael Hackstein de31c68539 Moved isVolatile into MMfiles collection. 2017-02-23 14:56:54 +01:00
jsteemann 3679050a31 fixed a race when renaming collections 2017-02-23 13:41:48 +01:00
Michael Hackstein daf7cc73e9 Added a propertiesVPack to PhysicalCollection / MMFiles collection for engine specific properties 2017-02-23 11:27:16 +01:00
Michael Hackstein 853394da79 Moved keyGenerator into physicalCollection. Only used when actually storing data. 2017-02-23 11:10:58 +01:00
Michael Hackstein df59411710 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-22 14:43:10 +01:00
Jan Christoph Uhde 3a201b4362 add persistProperties() to PysicalCollection 2017-02-22 12:47:03 +01:00
Michael Hackstein a359424af0 Moved logic of write Marker out of the dropIndex API from Logical collection. Can be derived from the engine internally. 2017-02-22 12:32:54 +01:00
Jan Christoph Uhde 711a71ac4d add LogicalCollection::invokeOnAllElements() 
and remove MMFilesPrimaryIndex.h from Transaction/Methods.cpp
 2017-02-22 10:40:27 +01:00
Jan Christoph Uhde fcfe66e254 add getAll/AnyIterator to LogicalCollection 2017-02-22 09:24:38 +01:00
Jan Christoph Uhde d73d25a310 remove some includes 2017-02-21 14:43:21 +01:00
Michael Hackstein 0f7d50765d Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-21 14:12:16 +01:00
Michael Hackstein fbdbfdcb6d Moved primaryIndex knowledge out of Logical Collection. Also moved logic for close into MMFiles 2017-02-21 14:12:07 +01:00