1
0
Fork 0
arangodb/arangod/MMFiles
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
..
MMFilesAllocatorThread.cpp
MMFilesAllocatorThread.h
MMFilesAqlFunctions.cpp moved helper classes into their own file 2017-02-14 12:35:34 +01:00
MMFilesAqlFunctions.h renaming 2017-02-13 15:18:40 +01:00
MMFilesCleanupThread.cpp
MMFilesCleanupThread.h
MMFilesCollection.cpp Merge branch 'obi-storage' into devel 2017-02-14 16:14:25 +01:00
MMFilesCollection.h Merge branch 'obi-storage' into devel 2017-02-14 16:14:25 +01:00
MMFilesCollectorCache.h
MMFilesCollectorThread.cpp Merge branch 'obi-storage' into devel 2017-02-14 16:14:25 +01:00
MMFilesCollectorThread.h
MMFilesCompactorThread.cpp Merge branch 'obi-storage' into devel 2017-02-14 16:14:25 +01:00
MMFilesCompactorThread.h renaming 2017-02-13 15:18:40 +01:00
MMFilesDatafile.cpp move encoding functions into their own file 2017-02-14 12:57:15 +01:00
MMFilesDatafile.h
MMFilesDatafileHelper.h move encoding functions into their own file 2017-02-14 12:57:15 +01:00
MMFilesDatafileStatistics.cpp
MMFilesDatafileStatistics.h
MMFilesDocumentOperation.cpp renaming 2017-02-13 15:18:40 +01:00
MMFilesDocumentOperation.h renaming 2017-02-13 15:18:40 +01:00
MMFilesDocumentPosition.h
MMFilesEdgeIndex.cpp moved helper classes into their own file 2017-02-14 12:35:34 +01:00
MMFilesEdgeIndex.h renaming 2017-02-13 15:18:40 +01:00
MMFilesEngine.cpp move encoding functions into their own file 2017-02-14 12:57:15 +01:00
MMFilesEngine.h
MMFilesFulltextIndex.cpp renaming 2017-02-13 15:18:40 +01:00
MMFilesFulltextIndex.h renaming 2017-02-13 15:18:40 +01:00
MMFilesGeoIndex.cpp renaming 2017-02-13 15:18:40 +01:00
MMFilesGeoIndex.h renaming 2017-02-13 15:18:40 +01:00
MMFilesHashIndex.cpp moved helper classes into their own file 2017-02-14 12:35:34 +01:00
MMFilesHashIndex.h moved helper classes into their own file 2017-02-14 12:35:34 +01:00
MMFilesIndexElement.cpp
MMFilesIndexElement.h
MMFilesIndexFactory.cpp
MMFilesIndexFactory.h
MMFilesLogfileManager.cpp
MMFilesLogfileManager.h
MMFilesPathBasedIndex.cpp
MMFilesPathBasedIndex.h
MMFilesPersistentIndex.cpp renamed feature 2017-02-14 12:35:54 +01:00
MMFilesPersistentIndex.h renaming 2017-02-13 15:18:40 +01:00
MMFilesPersistentIndexFeature.cpp renamed feature 2017-02-14 12:35:54 +01:00
MMFilesPersistentIndexFeature.h renamed feature 2017-02-14 12:35:54 +01:00
MMFilesPersistentIndexKeyComparator.cpp
MMFilesPersistentIndexKeyComparator.h
MMFilesPrimaryIndex.cpp moved helper classes into their own file 2017-02-14 12:35:34 +01:00
MMFilesPrimaryIndex.h renaming 2017-02-13 15:18:40 +01:00
MMFilesRemoverThread.cpp
MMFilesRemoverThread.h
MMFilesRevisionsCache.cpp
MMFilesRevisionsCache.h
MMFilesSkiplist.h
MMFilesSkiplistIndex.cpp moved helper classes into their own file 2017-02-14 12:35:34 +01:00
MMFilesSkiplistIndex.h moved helper classes into their own file 2017-02-14 12:35:34 +01:00
MMFilesSynchronizerThread.cpp
MMFilesSynchronizerThread.h
MMFilesToken.h
MMFilesTransactionCollection.cpp Merge branch 'obi-storage' into devel 2017-02-14 16:14:25 +01:00
MMFilesTransactionCollection.h renaming 2017-02-13 15:18:40 +01:00
MMFilesTransactionState.cpp renamed feature 2017-02-14 12:35:54 +01:00
MMFilesTransactionState.h moved transaction status into its own file 2017-02-13 17:28:02 +01:00
MMFilesWalLogfile.cpp move encoding functions into their own file 2017-02-14 12:57:15 +01:00
MMFilesWalLogfile.h
MMFilesWalMarker.h move encoding functions into their own file 2017-02-14 12:57:15 +01:00
MMFilesWalRecoverState.cpp renamed feature 2017-02-14 12:35:54 +01:00
MMFilesWalRecoverState.h
MMFilesWalRecoveryFeature.cpp
MMFilesWalRecoveryFeature.h
MMFilesWalSlot.cpp
MMFilesWalSlot.h
MMFilesWalSlots.cpp move encoding functions into their own file 2017-02-14 12:57:15 +01:00
MMFilesWalSlots.h
MMFilesWalSyncRegion.h
fulltext-common.h
fulltext-handles.cpp
fulltext-handles.h
fulltext-index.cpp
fulltext-index.h
fulltext-list.cpp
fulltext-list.h
fulltext-query.cpp
fulltext-query.h
fulltext-result.cpp
fulltext-result.h
geo-index.cpp
geo-index.h