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

95 Commits

Author SHA1 Message Date
Jan Christoph Uhde ce3b1ff9b5 Merge branch 'obi-storage' into devel 
* obi-storage:
  move compation locking / figures out of logical collection

Conflicts:
	arangod/MMFiles/MMFilesCollection.h
	arangod/VocBase/LogicalCollection.h
 2017-02-14 16:14:25 +01:00
jsteemann 8a2e353f3d move encoding functions into their own file 2017-02-14 12:57:15 +01:00
jsteemann cbe8ee1172 renamed feature 2017-02-14 12:35:54 +01:00
jsteemann 80be198a39 moved helper classes into their own file 2017-02-14 12:35:34 +01:00
Jan Christoph Uhde 071d147c5f move compation locking / figures out of logical collection 2017-02-14 12:34:46 +01:00
Michael Hackstein 6605a01410 Moved lookupDocument form LogicalCollection into MMFilesCollection. It is SE specific. 2017-02-14 11:37:45 +01:00
Michael Hackstein 32bd15d098 Renamed collection->update() to update the properties of a collection to collection->updateProperties(). There is another update() which is used for the stored Documents. 2017-02-14 10:32:24 +01:00
Michael Hackstein c8757efc8e Moved engine specific logic of Document Remove from Logical To Physical Collection 2017-02-14 10:20:32 +01:00
Michael Hackstein 03e77aee4a Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-13 17:58:56 +01:00
Michael Hackstein 2824c349bb Moved EngineSpecific logic of update() from LogicalCollection to MMFilesCollection. 2017-02-13 17:45:33 +01:00
jsteemann 9efc1c7b61 moved transaction status into its own file 2017-02-13 17:28:02 +01:00
jsteemann 72fa7ac85d move _hasOperations flag into engine 2017-02-13 17:07:49 +01:00
jsteemann 2532627a80 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-02-13 16:54:13 +01:00
jsteemann a184697072 move RocksDB-specific transactions into engine 2017-02-13 16:53:58 +01:00
Michael Hackstein c42b358987 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-13 16:27:41 +01:00
Michael Hackstein 91a0d30122 Moved the engine specific parts of remove from LogicalCollection to Physical Collection. 2017-02-13 16:17:26 +01:00
jsteemann 1ce4d4a97e Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-13 15:29:59 +01:00
jsteemann 92f61416ca Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-02-13 15:25:17 +01:00
jsteemann 7e690a0c61 renaming 2017-02-13 15:18:40 +01:00
Michael Hackstein e0bdc5c122 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-13 14:58:54 +01:00
Michael Hackstein 0c30c290c6 Moved parts of LogicalCollection->insert() into the PhysicalCollectioN 2017-02-13 14:38:22 +01:00
jsteemann 16189aa969 moved TransactionHints.h 2017-02-13 14:36:27 +01:00
jsteemann eb73dbf960 renaming 2017-02-13 13:30:57 +01:00
Jan Christoph Uhde 27309d1de0 Merge branch 'devel' of github.com:arangodb/arangodb into devel 
* 'devel' of github.com:arangodb/arangodb: (47 commits)
  arangoexport: continue documentation
  arangoexport: documentation continued
  arangoexport: config for client package
  arangoexport: refix xml attribute escaping
  arangoexport: Documentation
  README_maintainers: mention pythons webserver to view generated documentation
  arangoexport: Documentation
  arangoexport: start documentation
  arangoexport: switch to LOG_TOPIC
  arangoexport: xgmml encode attribute values
  arangoexport: remove unnecessary xmlns declaration
  arangoexport: added stats http, written size
  arangoexport: take --xgmml-label-attribute into account
  arangoexport: xgmml set label attribute
  arangoexport: error msgs improvements, dont create file if collection or graph are 404
  added arangoexport to Documentation/CMakeLists
  updated ReleaseNotes and added NewFeatures32
  arangoexport: added manpage
  arangoexport: mention in CHANGELOG
  arangoexport: inital work on test
  ...
 2017-02-13 12:59:58 +01:00
jsteemann f09ec85127 renaming 2017-02-13 12:27:26 +01:00
Jan Christoph Uhde 163b3d45bf remove fullyCollected and friends from LogicalCollection 2017-02-13 11:47:22 +01:00
jsteemann 8b273b5eaf Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-13 08:37:41 +01:00
Michael Hackstein 5c7b971122 Removed the old slice based skiplist iterator and renamed SkiplistIterator2 => SkiplistIterator 2017-02-12 12:59:14 +01:00
Michael Hackstein 9be60be0b9 Removed AnyDirectionEdgeIndexIterator. Not used anymore, internally there is no ANY 2017-02-12 12:44:25 +01:00
Michael Hackstein 07154391a2 Removed iteratorForSlice on Indexes and adapted index scan on transaction, because it can now only be used for ANY or ALL scans. 2017-02-10 15:47:24 +01:00
Jan Christoph Uhde 929390cee1 move index marker creation to storage engine 
remove MMFilesLogfileManager from LogicalCollection

fix marker type
 2017-02-10 15:14:34 +01:00
Jan Christoph Uhde 9131cde18b Merge branch 'devel' of github.com:arangodb/arangodb into devel 
* 'devel' of github.com:arangodb/arangodb:
  fix another merge conflict
  fix compile error after merge
  remove logging for non-topics
  Destroy all traverser engines when AQL is shut down.
 2017-02-10 10:58:07 +01:00
Jan Christoph Uhde 7a66b0772a clean up headers 2017-02-10 10:57:51 +01:00
jsteemann 103ceec2f5 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-10 09:43:23 +01:00
jsteemann 23ed96b7a7 fix compile error after merge 2017-02-10 09:36:49 +01:00
jsteemann 0850e8293a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-02-10 09:34:55 +01:00
jsteemann d024a6d00a remove logging for non-topics 2017-02-10 09:32:50 +01:00
jsteemann c314b9fdd3 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-10 09:12:28 +01:00
Jan Christoph Uhde 714dd3ee3a rebase database-management 2017-02-09 18:47:20 +01:00
jsteemann ab21b0b1ff move functionality into engine 2017-02-09 14:50:41 +01:00
Michael Hackstein 5dfd652d64 Merge branch 'devel' of github.com:arangodb/arangodb into engine-api 2017-02-08 15:57:30 +01:00
Michael Hackstein dfc9f29e69 Moved FunctionDefinitions to an AqlFunctionFeature. This now has a defined startup ordering 2017-02-08 15:45:59 +01:00
Michael Hackstein 7cec7a4628 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-08 12:54:26 +01:00
Michael Hackstein d47298d518 Removed JS_NEAR, JS_FULLTEXT, JS_WITHIN entirely. They have been replaced by simple queries 2017-02-08 12:54:10 +01:00
Max Neunhoeffer bde48d524d Change undocumented behaviour in case of invalid rev in JS document ops. 
An invalid rev should lead to a 1200 ("conflict") error rather than a
1239 ("illegal document revision") error. This is more intuitive and
in line with the corresponding change in the HTTP API. No tests needed
adjustment.
 2017-02-08 10:59:04 +01:00
jsteemann 1555b0a453 move engine-specific things out of public API 2017-02-07 17:36:53 +01:00
jsteemann 5bc2a3680c move some MMFiles-specific things into MMFiles directory 2017-02-07 16:38:04 +01:00
jsteemann 072183a964 make ctor explicit 2017-02-07 14:48:08 +01:00
jsteemann 2c9e220f03 refactoring 2017-02-07 14:36:03 +01:00
jsteemann d468fffdcb fix problems with rollback 2017-02-07 13:04:27 +01:00