1
0
Fork 0
Commit Graph

217 Commits

Author SHA1 Message Date
jsteemann 42fccb69c6 remove dependency on MMFilesLogfileManager 2017-03-01 15:50:10 +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 ae751e7360 create engine-specific transaction context data 2017-02-27 17:05:30 +01:00
Jan Christoph Uhde 3467031cb9 remove transferMarkers from StorageEngine.h 2017-02-21 16:00:37 +01:00
Jan Christoph Uhde d73d25a310 remove some includes 2017-02-21 14:43:21 +01:00
Jan Christoph Uhde 21cb8e3217 Merge branch 'engine-api' of github.com:arangodb/arangodb into obi-engine-api
* 'engine-api' of github.com:arangodb/arangodb:
  Removed readRevision from LogicalCollection. You only get readDocument with a token. Moved it's logic into MMFilesCollection. removed the ignoreWal parameter from readDocumentConditional. It was always true anyways...
  Moved pre-commit document modifications out of logical-collection into the physical collection. They are only relevant when actually writing to disc.
  Moved useSecondaryIndexes check from Logical to MMFiles collection
  Some cleanup in Logical collection imports
  Moved index filling into the MMFiles collection
  changelog
  grunt build
  css
  ui: queries now using cursors api - issue #2065
  remove crosscompile hack - it doesn't work anymore
  updated CHANGELOG
  add changlog entry for stacktrace log messages
  clean up write lockers a bit
  fix too early closing of sockets
  Moved restoreIndex to Physical collection.
  Fix a shell script used during build.
  Lower log level to debug in shutdown message.
  fix spelling
  Moved saveIndex logic into the physical collection
  fix potential deadlock

Conflicts:
	arangod/MMFiles/MMFilesCollection.cpp
	arangod/MMFiles/MMFilesCollection.h
	arangod/VocBase/LogicalCollection.cpp
2017-02-18 19:10:45 +01:00
Jan Christoph Uhde 2d5e74f7f6 move journaize() to PhysicalCollection
MMFilesCollection ctor might be buggy
2017-02-17 20:06:47 +01:00
jsteemann c652a313da Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-17 14:03:59 +01:00
jsteemann 3e7432ccd6 clean up write lockers a bit 2017-02-16 15:44:45 +01:00
Michael Hackstein a3aae2e43b Moved saveIndex logic into the physical collection 2017-02-16 12:53:05 +01:00
jsteemann fbd7f5d265 simplfied APIs 2017-02-16 10:00:46 +01:00
jsteemann d49c5c3fc0 simplified internal APIs a bit 2017-02-15 12:42:07 +01:00
jsteemann 112d07f6c2 protect all properties of TransactionState 2017-02-15 11:37:35 +01:00
jsteemann c69eb0a7d5 protect some properties 2017-02-15 11:14:56 +01:00
jsteemann b4027dc02c make property protected 2017-02-15 10:41:34 +01:00
jsteemann df3a3eff9f refactoring 2017-02-15 10:26:05 +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 a184697072 move RocksDB-specific transactions into engine 2017-02-13 16:53:58 +01:00
jsteemann 7e690a0c61 renaming 2017-02-13 15:18:40 +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
jsteemann f09ec85127 renaming 2017-02-13 12:27:26 +01:00
Michael Hackstein 4b604d798f Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-02-13 10:49:36 +01:00
Jan Christoph Uhde 6249055f56 remove RocksDBEngine from EngineSelectorFeature 2017-02-13 10:44:13 +01:00
jsteemann 8b273b5eaf Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-13 08:37:41 +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 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 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
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 2c9e220f03 refactoring 2017-02-07 14:36:03 +01:00
jsteemann 600af50bb1 added convenience method collectionName 2017-02-07 12:05:36 +01:00
jsteemann 4fccb56f93 make TransactionState a class and privatize some of its internals 2017-02-07 11:58:34 +01:00
jsteemann 4a7c3734e0 remove friend class declaration 2017-02-07 11:45:50 +01:00
jsteemann 3b1e3fac52 make TransactionCollection more engine-specific 2017-02-07 11:24:58 +01:00
Michael Hackstein a3aa963743 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-06 17:44:53 +01:00
Michael Hackstein 44647f2392 Moved Fulltext and geo functions into MMFiles StorageEngine and allowed the engines to register specific functions. 2017-02-06 17:44:17 +01:00
Jan Christoph Uhde eddfaa9e83 add some comment and inspect interface 2017-02-06 16:14:04 +01:00
jsteemann e2a312450f fix out-of-memory handling at startup 2017-02-01 13:00:05 +01:00